"ssn_range" needs to be a copy of "global_ssn_range", so that it's not

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

diff --git a/aclocal-flags b/aclocal-flags
index fdf750da8ff90a99a32e9f96807eacc3bc477781..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.)
 #
 # "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.5 2003/01/22 00:19:00 jmayer Exp $
+# $Id$

 #
 
 #
 #
 
 #


@@ -32,7 +32,7 @@ aclocal_dir=`aclocal --print-ac-dir`
 #
 # And where do we want to make sure it looks?
 #
 #
 # 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
 
 if [ -z "$gtk_prefix" ]
 then


@@ -42,7 +42,7 @@ else
 fi
 
 ac_missing_dir=`dirname $0`
 fi
 
 ac_missing_dir=`dirname $0`

-echo -n "-I $ac_missing_dir/aclocal-missing"
+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
 
 #
 # If there's no "aclocal", the former will be empty; if there's no


@@ -54,7 +54,7 @@ echo -n "-I $ac_missing_dir/aclocal-missing"
 if [ ! -z "$aclocal_dir" -a ! -z "$gtk_aclocal_dir" \
     -a "$aclocal_dir" != "$gtk_aclocal_dir" ]
 then
 if [ ! -z "$aclocal_dir" -a ! -z "$gtk_aclocal_dir" \
     -a "$aclocal_dir" != "$gtk_aclocal_dir" ]
 then

-       echo -n " $gtk_aclocal_dir"
+       echo " -I $gtk_aclocal_dir" | tr -d '\012' | tr -d '\015'

 fi
 echo
 exit 0
 fi
 echo
 exit 0