From 0ae44ada2ff697a3f93c69ca8db4baeb4a769fa5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Mayer?= <jmayer@loplof.de>
Date: Thu, 4 Mar 2004 08:25:23 +0000
Subject: Hackremoval: Automake newer than 1.4 survives if it finds more than
 one file for the same package.

svn path=/trunk/; revision=10298
---
 autogen.sh | 23 +----------------------
 1 file changed, 1 insertion(+), 22 deletions(-)

(limited to 'autogen.sh')

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
   (
-- 
cgit v1.2.3