From 4ecef17a072703c7719395e9d7a33d9db06b339f Mon Sep 17 00:00:00 2001 From: David MacKenzie Date: Wed, 13 Nov 1996 17:24:58 +0000 Subject: [PATCH] tweaks; test release 2.10.3 --- ChangeLog | 8 ++++++++ NEWS | 7 +++---- TODO | 8 ++++++++ acgeneral.m4 | 2 +- autoconf.texi | 7 ++++--- autoheader.in | 6 ------ autoheader.sh | 6 ------ bin/autoheader.in | 6 ------ configure | 8 ++++---- doc/autoconf.texi | 7 ++++--- lib/autoconf/general.m4 | 2 +- testsuite/Makefile.in | 9 +++++++-- 12 files changed, 40 insertions(+), 36 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6242aa37..2cbd5044 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Wed Nov 13 10:07:14 1996 David J MacKenzie + + * Test release 2.10.3. + + * testsuite/Makefile.in (dejacheck): New target, suggested by Tom + Tromey . + (check): Depend on dejacheck. + Tue Nov 12 00:06:14 1996 David J MacKenzie * acgeneral.m4 (AC_OUTPUT_FILES): Split the list of sed commands in diff --git a/NEWS b/NEWS index 658b2536..63a3b6e5 100644 --- a/NEWS +++ b/NEWS @@ -1,9 +1,8 @@ Issues to resolve before release: -1. autoreconf problem with finding subdirectory acconfig.h. -2. test the new features: AC_PROG_CC_WORKS on Solaris, AC_FUNC_MMAP -on HP-UX, AC_CACHE_SAVE on HP-UX, AC_FUNC_SETPGRP, AC_PATH_XTRA on -Solaris and BSDI 2.1, sed command splitting on HP-UX, AC_FUNC_FNMATCH. +Test the new features: AC_PROG_CC_WORKS on Solaris, AC_CACHE_SAVE +with spaces in var values on HP-UX, AC_FUNC_SETPGRP, AC_PATH_XTRA on +Solaris, sed command splitting on HP-UX (many AC_SUBST's), AC_FUNC_FNMATCH. Major changes in release 2.11: diff --git a/TODO b/TODO index e913ffb6..16d4a0d3 100644 --- a/TODO +++ b/TODO @@ -449,3 +449,11 @@ check for c89 before cc if it can't find gcc? hpa@yggdrasil.com (H. Peter Anvin) ------------------------------------------------------------------------------ + +Modify the meaning of autoheader --localdir to add an additional +directory to look for acconfig.h instead of replacing the directory +containing configure.in. + +Marc Horowitz + +------------------------------------------------------------------------------ diff --git a/acgeneral.m4 b/acgeneral.m4 index 73f08829..89a3b9fc 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.10.2) +define(AC_ACVERSION, 2.10.3) dnl Some old m4's don't support m4exit. But they provide dnl equivalent functionality by core dumping because of the diff --git a/autoconf.texi b/autoconf.texi index 54ae1046..13db27f2 100644 --- a/autoconf.texi +++ b/autoconf.texi @@ -6,8 +6,8 @@ @c @setchapternewpage odd @c %**end of header -@set EDITION 2.10.2 -@set VERSION 2.10.2 +@set EDITION 2.10.3 +@set VERSION 2.10.3 @set UPDATED November 1996 @iftex @@ -703,7 +703,8 @@ newer than their input files (@file{configure.in} and, if present, @item --localdir=@var{dir} @itemx -l @var{dir} -Look for the package files @file{aclocal.m4} and @file{acconfig.h} (but +Have @code{autoconf} and @code{autoheader} look for the package files +@file{aclocal.m4} and (@code{autoheader} only) @file{acconfig.h} (but not @file{@var{file}.top} and @file{@var{file}.bot}) in directory @var{dir} instead of in the directory containing each @file{configure.in}. diff --git a/autoheader.in b/autoheader.in index 07f495b0..03ca1f2b 100644 --- a/autoheader.in +++ b/autoheader.in @@ -86,12 +86,6 @@ if test $show_version = yes; then fi TEMPLATES="${AC_MACRODIR}/acconfig.h" -# Disabled until I figure out whether it's really right. -#if test "$localdir" != .; then - # When running autoheader from autoreconf, this is how we get - # subdirectories' acconfig.h files. - #test -r ./acconfig.h && TEMPLATES="${TEMPLATES} ./acconfig.h" -#fi test -r $localdir/acconfig.h && TEMPLATES="${TEMPLATES} $localdir/acconfig.h" case $# in diff --git a/autoheader.sh b/autoheader.sh index 07f495b0..03ca1f2b 100644 --- a/autoheader.sh +++ b/autoheader.sh @@ -86,12 +86,6 @@ if test $show_version = yes; then fi TEMPLATES="${AC_MACRODIR}/acconfig.h" -# Disabled until I figure out whether it's really right. -#if test "$localdir" != .; then - # When running autoheader from autoreconf, this is how we get - # subdirectories' acconfig.h files. - #test -r ./acconfig.h && TEMPLATES="${TEMPLATES} ./acconfig.h" -#fi test -r $localdir/acconfig.h && TEMPLATES="${TEMPLATES} $localdir/acconfig.h" case $# in diff --git a/bin/autoheader.in b/bin/autoheader.in index 07f495b0..03ca1f2b 100644 --- a/bin/autoheader.in +++ b/bin/autoheader.in @@ -86,12 +86,6 @@ if test $show_version = yes; then fi TEMPLATES="${AC_MACRODIR}/acconfig.h" -# Disabled until I figure out whether it's really right. -#if test "$localdir" != .; then - # When running autoheader from autoreconf, this is how we get - # subdirectories' acconfig.h files. - #test -r ./acconfig.h && TEMPLATES="${TEMPLATES} ./acconfig.h" -#fi test -r $localdir/acconfig.h && TEMPLATES="${TEMPLATES} $localdir/acconfig.h" case $# in diff --git a/configure b/configure index b839f748..60671a28 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.10.2 +# Generated automatically using autoconf version 2.10.3 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. # # This configure script is free software; the Free Software Foundation @@ -330,7 +330,7 @@ EOF verbose=yes ;; -version | --version | --versio | --versi | --vers) - echo "configure generated by autoconf version 2.10.2" + echo "configure generated by autoconf version 2.10.3" exit 0 ;; -with-* | --with-*) @@ -816,7 +816,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.10.2" + echo "$CONFIG_STATUS generated by autoconf version 2.10.3" exit 0 ;; -help | --help | --hel | --he | --h) echo "\$ac_cs_usage"; exit 0 ;; @@ -885,7 +885,7 @@ while $ac_more_lines; do else sed "${ac_end}q" conftest.subs > conftest.s$ac_file fi - if ! test -s conftest.s$ac_file; then + if test ! -s conftest.s$ac_file; then ac_more_lines=false rm -f conftest.s$ac_file else diff --git a/doc/autoconf.texi b/doc/autoconf.texi index 54ae1046..13db27f2 100644 --- a/doc/autoconf.texi +++ b/doc/autoconf.texi @@ -6,8 +6,8 @@ @c @setchapternewpage odd @c %**end of header -@set EDITION 2.10.2 -@set VERSION 2.10.2 +@set EDITION 2.10.3 +@set VERSION 2.10.3 @set UPDATED November 1996 @iftex @@ -703,7 +703,8 @@ newer than their input files (@file{configure.in} and, if present, @item --localdir=@var{dir} @itemx -l @var{dir} -Look for the package files @file{aclocal.m4} and @file{acconfig.h} (but +Have @code{autoconf} and @code{autoheader} look for the package files +@file{aclocal.m4} and (@code{autoheader} only) @file{acconfig.h} (but not @file{@var{file}.top} and @file{@var{file}.bot}) in directory @var{dir} instead of in the directory containing each @file{configure.in}. diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4 index 73f08829..89a3b9fc 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.10.2) +define(AC_ACVERSION, 2.10.3) dnl Some old m4's don't support m4exit. But they provide dnl equivalent functionality by core dumping because of the diff --git a/testsuite/Makefile.in b/testsuite/Makefile.in index b558f7ef..7c958601 100644 --- a/testsuite/Makefile.in +++ b/testsuite/Makefile.in @@ -40,8 +40,13 @@ all: info: dvi: -check: site.exp all - @echo NOTE: This only works if you have the DejaGNU runtest program installed... +dejacheck: + @if $(SHELL) -c 'runtest --version' > /dev/null 2>&1; then :; else \ + echo ERROR: the autoconf tests require the DejaGNU runtest program; \ + exit 1; \ + fi + +check: dejacheck site.exp all $(RUNTEST) $(RUNTESTFLAGS) --tool autoconf AUTOCONF=${AUTOCONF} \ AUTOCONFFLAGS="${AUTOCONFFLAGS}" --srcdir $(srcdir)