aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xaclocal-flags4
-rw-r--r--aclocal-missing/dummy2
-rwxr-xr-xautogen.sh23
3 files changed, 3 insertions, 26 deletions
diff --git a/aclocal-flags b/aclocal-flags
index 98b8f5b66d..a10531aded 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.7 2003/01/22 15:58:33 gerald Exp $
+# $Id: aclocal-flags,v 1.8 2004/03/04 08:25:23 jmayer Exp $
#
#
@@ -42,7 +42,7 @@ else
fi
ac_missing_dir=`dirname $0`
-echo "-I $ac_missing_dir/aclocal-missing" | tr -d '\012' | tr -d '\015'
+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
diff --git a/aclocal-missing/dummy b/aclocal-missing/dummy
deleted file mode 100644
index b8abf3cb9a..0000000000
--- a/aclocal-missing/dummy
+++ /dev/null
@@ -1,2 +0,0 @@
-The existence of the file is a hack: I don't know how to teach
-'make dist-gzip' to include the (empty) aclocal-missing directory.
diff --git a/autogen.sh b/autogen.sh
index 3659efc218..b6b7455e34 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -2,7 +2,7 @@
#
# Run this to generate all the initial makefiles.
#
-# $Id: autogen.sh,v 1.28 2004/03/04 06:43:34 guy Exp $
+# $Id: autogen.sh,v 1.29 2004/03/04 08:25:22 jmayer Exp $
DIE=true
PROJECT="Ethereal"
@@ -99,27 +99,6 @@ rm -f config.guess config.sub
mv config.guess.save-libtool config.guess
mv config.sub.save-libtool config.sub
-if glib-config --version >/dev/null 2>&1 ; then
- rm -f aclocal-missing/glib.m4
-else
- cp aclocal-fallback/glib.m4 aclocal-missing/
-fi
-if gtk-config --version >/dev/null 2>&1 ; then
- rm -f aclocal-missing/gtk.m4
-else
- cp aclocal-fallback/gtk.m4 aclocal-missing/
-fi
-if pkg-config glib-2.0 >/dev/null 2>&1 ; then
- rm -f aclocal-missing/glib-2.0.m4
-else
- cp aclocal-fallback/glib-2.0.m4 aclocal-missing/
-fi
-if pkg-config gtk+-2.0 >/dev/null 2>&1 ; then
- rm -f aclocal-missing/gtk-2.0.m4
-else
- cp aclocal-fallback/gtk-2.0.m4 aclocal-missing/
-fi
-
for dir in . epan wiretap ; do
echo processing $dir
(