diff options
| author | James Henstridge <james@daa.com.au> | 2003-02-21 00:39:11 +0000 |
|---|---|---|
| committer | James Henstridge <jamesh@src.gnome.org> | 2003-02-21 00:39:11 +0000 |
| commit | dce92737640e5452d0a86965d0d00899a50b8a5f (patch) | |
| tree | c5280fd64caa7fdc7ad8fb8cbb17dbb717106961 | |
| parent | 1f27af8b45f8f8f0a075de58010fceeab5ded2a2 (diff) | |
| download | shared-mime-info-dce92737640e5452d0a86965d0d00899a50b8a5f.tar.gz | |
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
| -rw-r--r-- | macros2/ChangeLog | 7 | ||||
| -rw-r--r-- | macros2/autogen.sh | 8 |
2 files changed, 14 insertions, 1 deletions
diff --git a/macros2/ChangeLog b/macros2/ChangeLog index d3a95135..5ba090ba 100644 --- 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 48e9f56e..54a3b93b 100644 --- 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/` |