further code cleanup: don't use the term "marked" for the color filters, the right...

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

diff --git a/aclocal-flags b/aclocal-flags
index 85ed1410f2404fc072743904f61326fa5d8ad867..3de5290449127f0c29f954628ac64e5764291340 100755 (executable)
--- 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.1 2000/07/26 08:03:40 guy Exp $
+# $Id$
 #
 
 #
@@ -32,7 +32,17 @@ aclocal_dir=`aclocal --print-ac-dir`
 #
 # And where do we want to make sure it looks?
 #
-gtk_aclocal_dir=`gtk-config --prefix`/share/aclocal
+gtk_prefix=`gtk-config --prefix 2>/dev/null`
+
+if [ -z "$gtk_prefix" ]
+then
+       gtk_aclocal_dir=""
+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
@@ -44,6 +54,7 @@ gtk_aclocal_dir=`gtk-config --prefix`/share/aclocal
 if [ ! -z "$aclocal_dir" -a ! -z "$gtk_aclocal_dir" \
     -a "$aclocal_dir" != "$gtk_aclocal_dir" ]
 then
-       echo "-I $gtk_aclocal_dir"
+       echo " -I $gtk_aclocal_dir" | tr -d '\012' | tr -d '\015'
 fi
+echo
 exit 0