aboutsummaryrefslogtreecommitdiffstats
path: root/autogen.sh
diff options
context:
space:
mode:
authorJörg Mayer <jmayer@loplof.de>2004-03-04 08:25:23 +0000
committerJörg Mayer <jmayer@loplof.de>2004-03-04 08:25:23 +0000
commit0ae44ada2ff697a3f93c69ca8db4baeb4a769fa5 (patch)
tree80592ced147d3774b974356bfdd856e2bf494e7b /autogen.sh
parentde66318723566f2b0e0b8be7e2612d8f156fd7c1 (diff)
Hackremoval:
Automake newer than 1.4 survives if it finds more than one file for the same package. svn path=/trunk/; revision=10298
Diffstat (limited to 'autogen.sh')
-rwxr-xr-xautogen.sh23
1 files changed, 1 insertions, 22 deletions
diff --git a/autogen.sh b/autogen.sh
index 3659efc..b6b7455 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
(