diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2004-12-06 04:29:22 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2004-12-06 04:29:22 +0000 |
| commit | b376375db1f6b51934bef8b04bd82bf212a9b3c6 (patch) | |
| tree | f5d7a997d5b3536454b5b3bee5359e58bbe44126 | |
| parent | minor touchup (diff) | |
| download | autotools-wrappers-b376375db1f6b51934bef8b04bd82bf212a9b3c6.tar.gz autotools-wrappers-b376375db1f6b51934bef8b04bd82bf212a9b3c6.tar.bz2 autotools-wrappers-b376375db1f6b51934bef8b04bd82bf212a9b3c6.zip | |
When guessing which version to run, dont try to use autoconf-2.1x if we are running automake-1.7 or better.ac-2
| -rwxr-xr-x | ac-wrapper.sh | 31 |
1 files changed, 18 insertions, 13 deletions
diff --git a/ac-wrapper.sh b/ac-wrapper.sh index dca23bc..97f559d 100755 --- a/ac-wrapper.sh +++ b/ac-wrapper.sh @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-wrapper/files/ac-wrapper-1.sh,v 1.2 2004/12/05 09:06:57 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/autoconf-wrapper/files/ac-wrapper-2.sh,v 1.1 2004/12/06 04:29:22 vapier Exp $ # Based on the ac-wrapper.pl script provided by MandrakeSoft # Rewritten in bash by Gregorio Guidi @@ -46,18 +46,23 @@ if [ "${WANT_AUTOCONF}" != "2.5" ] ; then exit 1 fi else - if [ -r "configure" ] ; then - confversion=$(awk \ - '{ - if (match($0, - "^# Generated (by (GNU )?Autoconf|automatically using autoconf version) ([0-9].[0-9])", - res)) - { print res[3]; exit } - }' configure) - fi - if [ "${confversion}" = "2.1" -a ! -f "configure.ac" ] ; then - binary="${binary_old}" - fi + # Automake-1.7 and better requie autoconf-2.5x + case "${WANT_AUTOMAKE}" in + 1.[7-9]) ;; + *) + if [ -r "configure" ] ; then + confversion=$(awk \ + '{ + if (match($0, + "^# Generated (by (GNU )?Autoconf|automatically using autoconf version) ([0-9].[0-9])", + res)) + { print res[3]; exit } + }' configure) + fi + if [ "${confversion}" = "2.1" -a ! -f "configure.ac" ] ; then + binary="${binary_old}" + fi + esac fi fi |