Wireshark · Ethereal-dev: Re: [Ethereal-dev] Changed required automake to 1.6 and autoconf to2.53

[Joerg Mayer <jmayer@xxxxxxxxx>]

On Thu, Mar 04, 2004 at 01:17:47AM +0100, Olivier Biot wrote:
> Try commenting out some lines in your autogen.sh script. On my laptop
> I don't need to do this, but on my PC I *must* do so (and I dunno
> what's the cause of this). I have the following hack in my autogen.sh
> script:
> 
> #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
> 
> Maybe you should try the same with the glib-2.0.m4 macros too (that's
> the lines just above the ones quoted above).
> 

I'm too tired right now to touch any more code, but removing support for
automake 1.4 allows me to remove that ugly hack. Now if you like to run
untested code, I've attached a patch.

Good night

  Jörg
-- 
Joerg Mayer                                           <jmayer@xxxxxxxxx>
We are stuck with technology when what we really want is just stuff that
works. Some say that should read Microsoft instead of technology.

Index: aclocal-flags
===================================================================
RCS file: /usr/local/cvsroot/ethereal/aclocal-flags,v
retrieving revision 1.7
diff -p -u -r1.7 aclocal-flags
--- aclocal-flags	22 Jan 2003 15:58:33 -0000	1.7
+++ aclocal-flags	4 Mar 2004 00:28:00 -0000
@@ -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
Index: autogen.sh
===================================================================
RCS file: /usr/local/cvsroot/ethereal/autogen.sh,v
retrieving revision 1.27
diff -p -u -r1.27 autogen.sh
--- autogen.sh	3 Mar 2004 21:35:55 -0000	1.27
+++ autogen.sh	4 Mar 2004 00:28:00 -0000
@@ -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
   (