Merge remote-tracking branch 'origin/master' into 0.11

[platform/upstream/gstreamer.git] / tools / gst-indent

diff --git a/tools/gst-indent b/tools/gst-indent
index 7c150bf..9309ed3 100755 (executable)
--- a/tools/gst-indent
+++ b/tools/gst-indent
@@ -1,16 +1,40 @@
 #!/bin/sh
-indent \
+
+version=`gnuindent --version 2>/dev/null`
+if test "x$version" = "x"; then
+  version=`indent --version 2>/dev/null`
+  if test "x$version" = "x"; then
+    echo "GStreamer git pre-commit hook:"
+    echo "Did not find GNU indent, please install it before continuing."
+    exit 1
+  fi
+  INDENT=indent
+else
+  INDENT=gnuindent
+fi
+
+case `$INDENT --version` in
+  GNU*)
+      ;;
+  default)
+      echo "Did not find GNU indent, please install it before continuing."
+      echo "(Found $INDENT, but it doesn't seem to be GNU indent)"
+      exit 1
+      ;;
+esac
+
+$INDENT \
   --braces-on-if-line \
-  --blank-lines-after-declarations \
   --case-brace-indentation0 \
   --case-indentation2 \
   --braces-after-struct-decl-line \
   --line-length80 \
-  --use-tabs \
+  --no-tabs \
   --cuddle-else \
   --dont-line-up-parentheses \
   --continuation-indentation4 \
   --honour-newlines \
   --tab-size8 \
   --indent-level2 \
+  --leave-preprocessor-space \
   $*