diff options
| author | Werner Koch <[email protected]> | 2002-10-17 14:03:11 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2002-10-17 14:03:11 +0000 |
| commit | 36bf36b2de84fab7b6e55670a5067290386e8646 (patch) | |
| tree | d177ea1a655f291fe43492ba69d6b34fc1e18d55 | |
| parent | * pkclist.c (do_edit_ownertrust): Show all user IDs. This should (diff) | |
| download | gnupg-36bf36b2de84fab7b6e55670a5067290386e8646.tar.gz gnupg-36bf36b2de84fab7b6e55670a5067290386e8646.zip | |
* autogen.sh: Allow env variables to override the auto* tool
names. Suggested by Simon Josefsson.
Diffstat (limited to '')
| -rw-r--r-- | scripts/ChangeLog | 7 | ||||
| -rwxr-xr-x | scripts/autogen.sh | 27 |
2 files changed, 20 insertions, 14 deletions
diff --git a/scripts/ChangeLog b/scripts/ChangeLog index 0c809384b..1a6ec032b 100644 --- a/scripts/ChangeLog +++ b/scripts/ChangeLog @@ -1,3 +1,8 @@ +2002-10-17 Werner Koch <[email protected]> + + * autogen.sh: Allow env variables to override the auto* tool + names. Suggested by Simon Josefsson. + 2002-09-11 Werner Koch <[email protected]> * distfiles: Include mk-w32-dist. @@ -278,5 +283,3 @@ Wed Oct 14 09:55:25 1998 Werner Koch ([email protected]) This file is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY, to the extent permitted by law; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - - diff --git a/scripts/autogen.sh b/scripts/autogen.sh index 5dfe1c6a6..07ce852ef 100755 --- a/scripts/autogen.sh +++ b/scripts/autogen.sh @@ -1,7 +1,7 @@ #!/bin/sh # Run this to generate all the initial makefiles, etc. # -# Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc. +# Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. # # This file is free software; as a special exception the author gives # unlimited permission to copy and/or distribute it, with or without @@ -17,7 +17,10 @@ autoconf_vers=2.52 automake_vers=1.6 aclocal_vers=1.6 - +ACLOCAL=${ACLOCAL:-aclocal} +AUTOCONF=${AUTOCONF:-autoconf} +AUTOMAKE=${AUTOMAKE:-automake} +AUTOHEADER=${AUTOHEADER:-autoheader} DIE=no if test "$1" = "--build-w32"; then tmp=`dirname $0` @@ -72,8 +75,8 @@ fi -if (autoconf --version) < /dev/null > /dev/null 2>&1 ; then - if (autoconf --version | awk 'NR==1 { if( $3 >= '$autoconf_vers') \ +if ($AUTOCONF --version) < /dev/null > /dev/null 2>&1 ; then + if ($AUTOCONF --version | awk 'NR==1 { if( $3 >= '$autoconf_vers') \ exit 1; exit 0; }'); then echo "**Error**: "\`autoconf\'" is too old." @@ -87,16 +90,16 @@ else DIE="yes" fi -if (automake --version) < /dev/null > /dev/null 2>&1 ; then - if (automake --version | awk 'NR==1 { if( $4 >= '$automake_vers') \ +if ($AUTOMAKE --version) < /dev/null > /dev/null 2>&1 ; then + if ($AUTOMAKE --version | awk 'NR==1 { if( $4 >= '$automake_vers') \ exit 1; exit 0; }'); then echo "**Error**: "\`automake\'" is too old." echo ' (version ' $automake_vers ' or newer is required)' DIE="yes" fi - if (aclocal --version) < /dev/null > /dev/null 2>&1; then - if (aclocal --version | awk 'NR==1 { if( $4 >= '$aclocal_vers' ) \ + if ($ACLOCAL --version) < /dev/null > /dev/null 2>&1; then + if ($ACLOCAL --version | awk 'NR==1 { if( $4 >= '$aclocal_vers' ) \ exit 1; exit 0; }' ); then echo "**Error**: "\`aclocal\'" is too old." @@ -133,13 +136,13 @@ if test "$DIE" = "yes"; then fi echo "Running aclocal..." -aclocal +$ACLOCAL echo "Running autoheader..." -autoheader +$AUTOHEADER echo "Running automake --gnu ..." -automake --gnu; +$AUTOMAKE --gnu; echo "Running autoconf..." -autoconf +$AUTOCONF echo "You can now run \"./configure --enable-maintainer-mode\" and then \"make\"." |