* autogen.sh: Allow env variables to override the auto* tool

names.  Suggested by Simon Josefsson.
This commit is contained in:
Werner Koch 2002-10-17 14:03:11 +00:00
parent be9b626c1d
commit 36bf36b2de
2 changed files with 20 additions and 14 deletions

View File

@ -1,3 +1,8 @@
2002-10-17 Werner Koch <wk@gnupg.org>
* autogen.sh: Allow env variables to override the auto* tool
names. Suggested by Simon Josefsson.
2002-09-11 Werner Koch <wk@gnupg.org>
* distfiles: Include mk-w32-dist.
@ -278,5 +283,3 @@ Wed Oct 14 09:55:25 1998 Werner Koch (wk@isil.d.shuttle.de)
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.

View File

@ -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\"."