aboutsummaryrefslogtreecommitdiffstats
path: root/aclocal-flags
diff options
context:
space:
mode:
authorgram <gram@f5534014-38df-0310-8fa8-9805f1628bb7>2000-11-22 04:03:22 +0000
committergram <gram@f5534014-38df-0310-8fa8-9805f1628bb7>2000-11-22 04:03:22 +0000
commit9f8965bca676427bcc173931695e57ceb6a05dda (patch)
tree88d99ad52fcd6fbe1d48401aa08a85e8d64a22d0 /aclocal-flags
parent4ab44dd0c6ae0595b2b33f9e1d06b59fa4af5c7a (diff)
Enable the building of any combination of ethereal, tethereal, and editcap.
If GTK+ is not detected, then ethereal is not built. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@2695 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'aclocal-flags')
-rwxr-xr-xaclocal-flags11
1 files changed, 9 insertions, 2 deletions
diff --git a/aclocal-flags b/aclocal-flags
index 85ed1410f2..c58d2e1ac2 100755
--- 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: aclocal-flags,v 1.2 2000/11/22 04:03:22 gram Exp $
#
#
@@ -32,7 +32,14 @@ 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`
+
+if [ -z "$gtk_prefix" ]
+then
+ gtk_aclocal_dir=""
+else
+ gtk_aclocal_dir=$gtk_prefix/share/aclocal
+fi
#
# If there's no "aclocal", the former will be empty; if there's no