Remove svn:executable

[obnox/wireshark/wip.git] / aclocal-flags

diff --git a/aclocal-flags b/aclocal-flags
old mode 100755 (executable)
new mode 100644 (file)
index 3c0d25a..3de5290
--- a/aclocal-flags
+++ b/aclocal-flags
@@ -21,7 +21,7 @@
 # "aclocal" will look in that directory twice, and get well and truly
 # confused, reporting a ton of duplicate macro definitions.)
 #
-# $Id: aclocal-flags,v 1.3 2002/03/06 06:33:37 itojun Exp $
+# $Id$
 #
 
 #
@@ -32,7 +32,7 @@ aclocal_dir=`aclocal --print-ac-dir`
 #
 # And where do we want to make sure it looks?
 #
-gtk_prefix=`gtk-config --prefix`
+gtk_prefix=`gtk-config --prefix 2>/dev/null`
 
 if [ -z "$gtk_prefix" ]
 then
@@ -41,6 +41,9 @@ else
        gtk_aclocal_dir=$gtk_prefix/share/aclocal
 fi
 
+ac_missing_dir=`dirname $0`
+echo "-I $ac_missing_dir/aclocal-fallback" | tr -d '\012' | tr -d '\015'
+
 #
 # If there's no "aclocal", the former will be empty; if there's no
 # "gtk-config", the latter will be empty.
@@ -48,9 +51,10 @@ fi
 # Add the "-I" flag only if neither of those strings are empty, and
 # they're different.
 #
-#if [ ! -z "$aclocal_dir" -a ! -z "$gtk_aclocal_dir" \
-#    -a "$aclocal_dir" != "$gtk_aclocal_dir" ]
-#then
-#      echo "-I $gtk_aclocal_dir"
-#fi
+if [ ! -z "$aclocal_dir" -a ! -z "$gtk_aclocal_dir" \
+    -a "$aclocal_dir" != "$gtk_aclocal_dir" ]
+then
+       echo " -I $gtk_aclocal_dir" | tr -d '\012' | tr -d '\015'
+fi
+echo
 exit 0