Re: gnome-common patch

[James Henstridge <james daa com au>]

Christophe Fergeau wrote:

> Hi,
>
> The new gnome-common autogen.sh script is really cool, but I had a small
> issue with it: in debian, autoconf 2.57 is named autoconf2.50 which
> prevents gnome-common from finding it. 
> The attached patch fixes that. I also added the possibility to define
> AUTOMAKE and AUTOCONF variables for people wanting to override the
> name/location of their automake/autoconf. 
>
> Does it sound like a good thing ? Or should I just commit the
> autoconf2.50 part ?
>  
I checked in a slightly different version of your patch.  I altered the 
version_check function so that if the variable (AUTOCONF, AUTOMAKE, etc) 
is set before autogen.sh is run to just trust that version.  Also, I 
just added autoconf2.50 as the first autoconf executable to test (may as 
well make things work by default for Debian users).  Below is what I 
checked in:

Index: autogen.sh
===================================================================
RCS file: /cvs/gnome/gnome-common/macros2/autogen.sh,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- autogen.sh  18 Feb 2003 15:09:45 -0000      1.21
+++ autogen.sh  21 Feb 2003 00:39:11 -0000      1.22
@@ -73,6 +73,12 @@ version_check() {
    source=$5
    status=1

+    checkprog=`eval echo "\\$$variable"`
+    if [ -n "$checkprog" ]; then
+       printbold "using $checkprog for $package"
+       return 0
+    fi
+
    printbold "checking for $package >= $min_version..."
    for checkprog in $checkprogs; do
       echo -n "  testing $checkprog... "
@@ -192,7 +198,7 @@ done

DIE=0

-version_check autoconf AUTOCONF 'autoconf autoconf-2.53' 
$REQUIRED_AUTOCONF_VERSION \
+version_check autoconf AUTOCONF 'autoconf2.50 autoconf autoconf-2.53' 
$REQUIRED_AUTOCONF_VERSION \
    
"http://ftp.gnu.org/pub/gnu/autoconf/autoconf-$REQUIRED_AUTOCONF_VERSION.tar.gz"; 
|| DIE=1
AUTOHEADER=`echo $AUTOCONF | sed s/autoconf/autoheader/`


James.

--
Email: james daa com au
WWW:   http://www.daa.com.au/~james/