From 49ce2554a692b0254aaf241b679e9e31afbef8f9 Mon Sep 17 00:00:00 2001
From: David MacKenzie <djm@djmnet.org>
Date: Tue, 12 Nov 1996 18:51:28 +0000
Subject: [PATCH] cosmetic tweaks
---
ChangeLog | 2 ++
NEWS | 5 +++--
acgeneral.m4 | 10 +++++-----
autoconf.texi | 4 ++--
config.guess | 2 +-
configure | 6 +++---
doc/autoconf.texi | 4 ++--
lib/autoconf/general.m4 | 10 +++++-----
testsuite/Makefile.in | 2 +-
9 files changed, 24 insertions(+), 21 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index ee8e3ca6..c62ec9db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
Tue Nov 12 00:06:14 1996 David J MacKenzie <djm@catapult.va.pubnix.com>
+ * Test release 2.10.2.
+
* acspecific.m4 (AC_PROG_CC, AC_PROG_CXX) [GCC]: Use -O2 instead
of -O. Suggested by fnf@ninemoons.com (Fred Fish).
diff --git a/NEWS b/NEWS
index 6b74dca9..3a0ee5f5 100644
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,7 @@
Issues to resolve before release:
1. sed command limitation.
-2. autoreconf problem with finding nested acconfig.h.
+2. autoreconf problem with finding subdirectory acconfig.h.
3. test the new features.
Major changes in release 2.11:
@@ -11,7 +11,8 @@ Major changes in release 2.11:
* AC_REPLACE_FUNCS defines HAVE_@var{function} if the system has the function.
* The argument to AC_CONFIG_HEADER can contain shell variables.
* New macros: AC_FUNC_FNMATCH, AC_FUNC_SETPGRP.
-* The source code for test programs that fail is saved in config.log.
+* The "checking..." messages and the source code for test programs that
+ fail are saved in config.log.
* config.sub and config.guess recognize more system types.
* autoheader.sh adds multiple-inclusion protection for config.h.
* Bug fixes.
diff --git a/acgeneral.m4 b/acgeneral.m4
index cd0028e3..22a3dd13 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.1)
+define(AC_ACVERSION, 2.10.2)
dnl Some old m4's don't support m4exit. But they provide
dnl equivalent functionality by core dumping because of the
@@ -1521,7 +1521,7 @@ if test -z "$ac_err"; then
$2])
else
echo "$ac_err" >&AC_FD_CC
- echo "configure: input program was:" >&AC_FD_CC
+ echo "configure: failed program was:" >&AC_FD_CC
cat conftest.$ac_ext >&AC_FD_CC
ifelse([$3], , , [ rm -rf conftest*
$3
@@ -1583,7 +1583,7 @@ if AC_TRY_EVAL(ac_compile); then
ifelse([$3], , :, [rm -rf conftest*
$3])
else
- echo "configure: input program was:" >&AC_FD_CC
+ echo "configure: failed program was:" >&AC_FD_CC
cat conftest.$ac_ext >&AC_FD_CC
ifelse([$4], , , [ rm -rf conftest*
$4
@@ -1622,7 +1622,7 @@ if AC_TRY_EVAL(ac_link) && test -s conftest; then
ifelse([$3], , :, [rm -rf conftest*
$3])
else
- echo "configure: input program was:" >&AC_FD_CC
+ echo "configure: failed program was:" >&AC_FD_CC
cat conftest.$ac_ext >&AC_FD_CC
ifelse([$4], , , [ rm -rf conftest*
$4
@@ -1666,7 +1666,7 @@ AC_TRY_EVAL(ac_link)
if test -s conftest && (./conftest; exit) 2>/dev/null; then
ifelse([$2], , :, [$2])
else
- echo "configure: input program was:" >&AC_FD_CC
+ echo "configure: failed program was:" >&AC_FD_CC
cat conftest.$ac_ext >&AC_FD_CC
ifelse([$3], , , [ rm -fr conftest*
$3
diff --git a/autoconf.texi b/autoconf.texi
index 5edc3057..54ae1046 100644
--- a/autoconf.texi
+++ b/autoconf.texi
@@ -6,8 +6,8 @@
@c @setchapternewpage odd
@c %**end of header
-@set EDITION 2.10.1
-@set VERSION 2.10.1
+@set EDITION 2.10.2
+@set VERSION 2.10.2
@set UPDATED November 1996
@iftex
diff --git a/config.guess b/config.guess
index 4de737d6..1f058143 100755
--- a/config.guess
+++ b/config.guess
@@ -564,7 +564,7 @@ main ()
#endif
int version;
version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
- printf ("%s-next-nextstep%s\n", __ARCHITECTURE__, version==2 ? "2" : "3");
+ printf ("%s-next-%s%d\n", __ARCHITECTURE__, version);
exit (0);
#endif
diff --git a/configure b/configure
index e2ef5989..6ea613a3 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.1
+# Generated automatically using autoconf version 2.10.2
# 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.1"
+ echo "configure generated by autoconf version 2.10.2"
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.1"
+ echo "$CONFIG_STATUS generated by autoconf version 2.10.2"
exit 0 ;;
-help | --help | --hel | --he | --h)
echo "\$ac_cs_usage"; exit 0 ;;
diff --git a/doc/autoconf.texi b/doc/autoconf.texi
index 5edc3057..54ae1046 100644
--- a/doc/autoconf.texi
+++ b/doc/autoconf.texi
@@ -6,8 +6,8 @@
@c @setchapternewpage odd
@c %**end of header
-@set EDITION 2.10.1
-@set VERSION 2.10.1
+@set EDITION 2.10.2
+@set VERSION 2.10.2
@set UPDATED November 1996
@iftex
diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4
index cd0028e3..22a3dd13 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.1)
+define(AC_ACVERSION, 2.10.2)
dnl Some old m4's don't support m4exit. But they provide
dnl equivalent functionality by core dumping because of the
@@ -1521,7 +1521,7 @@ if test -z "$ac_err"; then
$2])
else
echo "$ac_err" >&AC_FD_CC
- echo "configure: input program was:" >&AC_FD_CC
+ echo "configure: failed program was:" >&AC_FD_CC
cat conftest.$ac_ext >&AC_FD_CC
ifelse([$3], , , [ rm -rf conftest*
$3
@@ -1583,7 +1583,7 @@ if AC_TRY_EVAL(ac_compile); then
ifelse([$3], , :, [rm -rf conftest*
$3])
else
- echo "configure: input program was:" >&AC_FD_CC
+ echo "configure: failed program was:" >&AC_FD_CC
cat conftest.$ac_ext >&AC_FD_CC
ifelse([$4], , , [ rm -rf conftest*
$4
@@ -1622,7 +1622,7 @@ if AC_TRY_EVAL(ac_link) && test -s conftest; then
ifelse([$3], , :, [rm -rf conftest*
$3])
else
- echo "configure: input program was:" >&AC_FD_CC
+ echo "configure: failed program was:" >&AC_FD_CC
cat conftest.$ac_ext >&AC_FD_CC
ifelse([$4], , , [ rm -rf conftest*
$4
@@ -1666,7 +1666,7 @@ AC_TRY_EVAL(ac_link)
if test -s conftest && (./conftest; exit) 2>/dev/null; then
ifelse([$2], , :, [$2])
else
- echo "configure: input program was:" >&AC_FD_CC
+ echo "configure: failed program was:" >&AC_FD_CC
cat conftest.$ac_ext >&AC_FD_CC
ifelse([$3], , , [ rm -fr conftest*
$3
diff --git a/testsuite/Makefile.in b/testsuite/Makefile.in
index feab545c..b558f7ef 100644
--- a/testsuite/Makefile.in
+++ b/testsuite/Makefile.in
@@ -41,7 +41,7 @@ info:
dvi:
check: site.exp all
- @echo This only works if you have the DejaGNU runtest program installed...
+ @echo NOTE: This only works if you have the DejaGNU runtest program installed...
$(RUNTEST) $(RUNTESTFLAGS) --tool autoconf AUTOCONF=${AUTOCONF} \
AUTOCONFFLAGS="${AUTOCONFFLAGS}" --srcdir $(srcdir)