From: David MacKenzie Date: Wed, 11 Dec 1996 00:49:47 +0000 (+0000) Subject: fix a couple of bugs X-Git-Tag: fsf-origin~70 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=660963952f30e312301a117dd64a86d2fdd572bd;p=thirdparty%2Fautoconf.git fix a couple of bugs --- diff --git a/COPYING b/COPYING index a43ea212..a3f6b12e 100644 --- a/COPYING +++ b/COPYING @@ -2,7 +2,8 @@ Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 675 Mass Ave, Cambridge, MA 02139, USA + 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -305,7 +306,7 @@ the "copyright" line and a pointer to where the full notice is found. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. Also add information on how to contact you by electronic and paper mail. diff --git a/ChangeLog b/ChangeLog index 3ec8c582..d06d7520 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,19 @@ +Tue Dec 10 19:38:59 1996 David J MacKenzie + + * acgeneral.m4 (AC_CACHE_SAVE): Use grep to prevent overflowing + HP-UX 9.05 /bin/sh buffer in case statement. From Eric Backus + . + +Mon Dec 9 23:39:17 1996 David J MacKenzie + + * acspecific.m4 (AC_FUNC_GETLOADAVG): Add a semicolon between + shell variable assignments; the evaluation order varies between + implementations. + +Tue Nov 26 13:00:28 1996 David J MacKenzie + + * Version 2.12. + Wed Nov 20 13:00:21 1996 David J MacKenzie * Test release 2.11.2. diff --git a/acgeneral.m4 b/acgeneral.m4 index 8574a46d..d04be6d0 100644 --- a/acgeneral.m4 +++ b/acgeneral.m4 @@ -52,7 +52,7 @@ dnl divert(-1)dnl Throw away output until AC_INIT is called. changequote([, ]) -define(AC_ACVERSION, 2.11.2) +define(AC_ACVERSION, 2.12) dnl Some old m4's don't support m4exit. But they provide dnl equivalent functionality by core dumping because of the @@ -1063,7 +1063,7 @@ dnl Allow a site initialization script to override cache values. # and sets the high bit in the cache file unless we assign to the vars. changequote(, )dnl (set) 2>&1 | - case `(ac_space=' '; set) 2>&1` in + case `(ac_space=' '; set | grep ac_space) 2>&1` in *ac_space=\ *) # `set' does not quote correctly, so add quotes (double-quote substitution # turns \\\\ into \\, and sed turns \\ into \). diff --git a/acspecific.m4 b/acspecific.m4 index 622d1078..75235b17 100644 --- a/acspecific.m4 +++ b/acspecific.m4 @@ -1306,7 +1306,7 @@ AC_CHECK_LIB(util, getloadavg, if test $ac_have_func = no; then # There is a commonly available library for RS/6000 AIX. # Since it is not a standard part of AIX, it might be installed locally. - ac_getloadavg_LIBS="$LIBS" LIBS="-L/usr/local/lib $LIBS" + ac_getloadavg_LIBS="$LIBS"; LIBS="-L/usr/local/lib $LIBS" AC_CHECK_LIB(getloadavg, getloadavg, LIBS="-lgetloadavg $LIBS", LIBS="$ac_getloadavg_LIBS") fi diff --git a/autoconf.texi b/autoconf.texi index 5b750d42..d0ba46df 100644 --- a/autoconf.texi +++ b/autoconf.texi @@ -6,8 +6,8 @@ @c @setchapternewpage odd @c %**end of header -@set EDITION 2.11.2 -@set VERSION 2.11.2 +@set EDITION 2.12 +@set VERSION 2.12 @set UPDATED November 1996 @iftex diff --git a/configure b/configure index 88807e18..54089a50 100755 --- a/configure +++ b/configure @@ -1,7 +1,7 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated automatically using autoconf version 2.11.2 +# Generated automatically using autoconf version 2.12 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. # # This configure script is free software; the Free Software Foundation @@ -332,7 +332,7 @@ EOF verbose=yes ;; -version | --version | --versio | --versi | --vers) - echo "configure generated by autoconf version 2.11.2" + echo "configure generated by autoconf version 2.12" exit 0 ;; -with-* | --with-*) @@ -835,7 +835,7 @@ do echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion" exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;; -version | --version | --versio | --versi | --vers | --ver | --ve | --v) - echo "$CONFIG_STATUS generated by autoconf version 2.11.2" + echo "$CONFIG_STATUS generated by autoconf version 2.12" exit 0 ;; -help | --help | --hel | --he | --h) echo "\$ac_cs_usage"; exit 0 ;; diff --git a/doc/autoconf.texi b/doc/autoconf.texi index 5b750d42..d0ba46df 100644 --- a/doc/autoconf.texi +++ b/doc/autoconf.texi @@ -6,8 +6,8 @@ @c @setchapternewpage odd @c %**end of header -@set EDITION 2.11.2 -@set VERSION 2.11.2 +@set EDITION 2.12 +@set VERSION 2.12 @set UPDATED November 1996 @iftex diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4 index 8574a46d..d04be6d0 100644 --- a/lib/autoconf/general.m4 +++ b/lib/autoconf/general.m4 @@ -52,7 +52,7 @@ dnl divert(-1)dnl Throw away output until AC_INIT is called. changequote([, ]) -define(AC_ACVERSION, 2.11.2) +define(AC_ACVERSION, 2.12) dnl Some old m4's don't support m4exit. But they provide dnl equivalent functionality by core dumping because of the @@ -1063,7 +1063,7 @@ dnl Allow a site initialization script to override cache values. # and sets the high bit in the cache file unless we assign to the vars. changequote(, )dnl (set) 2>&1 | - case `(ac_space=' '; set) 2>&1` in + case `(ac_space=' '; set | grep ac_space) 2>&1` in *ac_space=\ *) # `set' does not quote correctly, so add quotes (double-quote substitution # turns \\\\ into \\, and sed turns \\ into \). diff --git a/lib/autoconf/specific.m4 b/lib/autoconf/specific.m4 index 622d1078..75235b17 100644 --- a/lib/autoconf/specific.m4 +++ b/lib/autoconf/specific.m4 @@ -1306,7 +1306,7 @@ AC_CHECK_LIB(util, getloadavg, if test $ac_have_func = no; then # There is a commonly available library for RS/6000 AIX. # Since it is not a standard part of AIX, it might be installed locally. - ac_getloadavg_LIBS="$LIBS" LIBS="-L/usr/local/lib $LIBS" + ac_getloadavg_LIBS="$LIBS"; LIBS="-L/usr/local/lib $LIBS" AC_CHECK_LIB(getloadavg, getloadavg, LIBS="-lgetloadavg $LIBS", LIBS="$ac_getloadavg_LIBS") fi