if $variable is set, then assume it is correct and skip the version check.

2003-02-21  James Henstridge  <james@daa.com.au>

    * autogen.sh (version_check): if $variable is set, then assume
    it is correct and skip the version check.
    (autoconf): check for autoconf2.50 first, so we don't trigger
    Debian's sometimes broken autoconf version sniffer.

svn path=/trunk/; revision=2777

diff --git a/macros2/ChangeLog b/macros2/ChangeLog
index d3a9513..5ba090b 100644 (file)
--- a/macros2/ChangeLog
+++ b/macros2/ChangeLog
@@ -1,3 +1,10 @@
+2003-02-21  James Henstridge  <james@daa.com.au>
+
+       * autogen.sh (version_check): if $variable is set, then assume
+       it is correct and skip the version check.
+       (autoconf): check for autoconf2.50 first, so we don't trigger
+       Debian's sometimes broken autoconf version sniffer.
+
 2003-02-19  James Henstridge  <james@daa.com.au>
 
        * Makefile.am (GNOME2_MACROS): remove check-utmp.m4 (copied it to

diff --git a/macros2/autogen.sh b/macros2/autogen.sh
index 48e9f56..54a3b93 100644 (file)
--- a/macros2/autogen.sh
+++ b/macros2/autogen.sh
@@ -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/`