summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandre Duret-Lutz <adl@gnu.org>2003-07-04 22:54:17 +0000
committerAlexandre Duret-Lutz <adl@gnu.org>2003-07-04 22:54:17 +0000
commitef37658cd6ab705718a0154c5b473021916f214a (patch)
tree8d4a3110023b050fd6322a3fabeb42c07bc5764e
parentc0033404103d0246cd692b2aecaab35e3993496f (diff)
downloadautomake-ef37658cd6ab705718a0154c5b473021916f214a.tar.gz
* configure.ac: Bump vesion to 1.7.5b.Release-1-7-5b
* NEWS: Update for 1.7.5b.
-rw-r--r--ChangeLog3
-rw-r--r--Makefile.in2
-rw-r--r--NEWS9
-rw-r--r--aclocal.m433
-rwxr-xr-xconfigure20
-rw-r--r--configure.in2
-rw-r--r--lib/Automake/Makefile.in2
-rw-r--r--lib/Makefile.in2
-rw-r--r--lib/am/Makefile.in2
-rw-r--r--m4/Makefile.in2
-rw-r--r--stamp-vti4
-rw-r--r--tests/Makefile.in2
-rw-r--r--version.texi4
13 files changed, 57 insertions, 30 deletions
diff --git a/ChangeLog b/ChangeLog
index 1aa18f675..6675c4eb4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2003-07-05 Alexandre Duret-Lutz <adl@gnu.org>
+ * configure.ac: Bump vesion to 1.7.5b.
+ * NEWS: Update for 1.7.5b.
+
* lib/config.guess, lib/config.sub: New upstream version.
2003-07-04 Alexandre Duret-Lutz <adl@gnu.org>
diff --git a/Makefile.in b/Makefile.in
index bc4990f09..f6c9e1532 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.5a from Makefile.am.
+# Makefile.in generated by automake 1.7.5b from Makefile.am.
# @configure_input@
# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
diff --git a/NEWS b/NEWS
index ed08bab48..fda5c16f3 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,12 @@
+Bugs fixed in 1.7.5b:
+* Fix depcomp's icc mode for ICC 7.1.
+* Diagnose calls to AC_CONFIG_FILES and friends with not enough arguments.
+* Fix maintainer-clean's removal of autom4te.cache in VPATH builds.
+* Fix AM_PATH_LISPDIR to work with POSIXLY_CORRECT=1.
+* Fix the location reported in some diagnostics related to AUTOMAKE_OPTIONS.
+* Remove Latin-1 characters from elisp-comp.
+* Update the manual's @dircategory to match the Free Software Directory.
+
Bugs fixed in 1.7.5:
* Update install-sh's license to remove an advertising clause.
(Debian bug #191717)
diff --git a/aclocal.m4 b/aclocal.m4
index 7e8d8c9cd..36a274882 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.7.5a -*- Autoconf -*-
+# generated automatically by aclocal 1.7.5b -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002
# Free Software Foundation, Inc.
@@ -163,7 +163,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.7"])
# Call AM_AUTOMAKE_VERSION so it can be traced.
# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
- [AM_AUTOMAKE_VERSION([1.7.5a])])
+ [AM_AUTOMAKE_VERSION([1.7.5b])])
# Helper functions for option handling. -*- Autoconf -*-
@@ -545,18 +545,32 @@ AC_CACHE_CHECK([dependency style of $depcc],
# using a relative directory.
cp "$am_depcomp" conftest.dir
cd conftest.dir
+ # We will build objects and dependencies in a subdirectory because
+ # it helps to detect inapplicable dependency modes. For instance
+ # both Tru64's cc and ICC support -MD to output dependencies as a
+ # side effect of compilation, but ICC will put the dependencies in
+ # the current directory while Tru64 will put them in the object
+ # directory.
+ mkdir sub
am_cv_$1_dependencies_compiler_type=none
if test "$am_compiler_list" = ""; then
am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
fi
for depmode in $am_compiler_list; do
+ # Setup a source with many dependencies, because some compilers
+ # like to wrap large dependency lists on column 80 (with \), and
+ # we should not choose a depcomp mode which is confused by this.
+ #
# We need to recreate these files for each test, as the compiler may
# overwrite some of them when testing with obscure command lines.
# This happens at least with the AIX C compiler.
- echo '#include "conftest.h"' > conftest.c
- echo 'int i;' > conftest.h
- echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf
+ : > sub/conftest.c
+ for i in 1 2 3 4 5 6; do
+ echo '#include "conftst'$i'.h"' >> sub/conftest.c
+ : > sub/conftst$i.h
+ done
+ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
case $depmode in
nosideeffect)
@@ -574,11 +588,12 @@ AC_CACHE_CHECK([dependency style of $depcc],
# mode. It turns out that the SunPro C++ compiler does not properly
# handle `-M -o', and we need to detect this.
if depmode=$depmode \
- source=conftest.c object=conftest.o \
- depfile=conftest.Po tmpdepfile=conftest.TPo \
- $SHELL ./depcomp $depcc -c -o conftest.o conftest.c \
+ source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
+ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
>/dev/null 2>conftest.err &&
- grep conftest.h conftest.Po > /dev/null 2>&1 &&
+ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
# icc doesn't choke on unknown options, it will just issue warnings
# (even with -Werror). So we grep stderr for any message
diff --git a/configure b/configure
index 9fed0db54..ad0d513a7 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.57a for GNU Automake 1.7.5a.
+# Generated by GNU Autoconf 2.57a for GNU Automake 1.7.5b.
#
# Report bugs to <bug-automake@gnu.org>.
#
@@ -267,8 +267,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='GNU Automake'
PACKAGE_TARNAME='automake'
-PACKAGE_VERSION='1.7.5a'
-PACKAGE_STRING='GNU Automake 1.7.5a'
+PACKAGE_VERSION='1.7.5b'
+PACKAGE_STRING='GNU Automake 1.7.5b'
PACKAGE_BUGREPORT='bug-automake@gnu.org'
ac_unique_file="automake.in"
@@ -721,7 +721,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures GNU Automake 1.7.5a to adapt to many kinds of systems.
+\`configure' configures GNU Automake 1.7.5b to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -783,7 +783,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of GNU Automake 1.7.5a:";;
+ short | recursive ) echo "Configuration of GNU Automake 1.7.5b:";;
esac
cat <<\_ACEOF
@@ -850,7 +850,7 @@ fi
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-GNU Automake configure 1.7.5a
+GNU Automake configure 1.7.5b
generated by GNU Autoconf 2.57a
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -864,7 +864,7 @@ cat >&5 <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by GNU Automake $as_me 1.7.5a, which was
+It was created by GNU Automake $as_me 1.7.5b, which was
generated by GNU Autoconf 2.57a. Invocation command line was
$ $0 $@
@@ -1483,7 +1483,7 @@ fi
# Define the identity of the package.
PACKAGE='automake'
- VERSION='1.7.5a'
+ VERSION='1.7.5b'
cat >>confdefs.h <<_ACEOF
@@ -2186,7 +2186,7 @@ _ASBOX
} >&5
cat >&5 <<_CSEOF
-This file was extended by GNU Automake $as_me 1.7.5a, which was
+This file was extended by GNU Automake $as_me 1.7.5b, which was
generated by GNU Autoconf 2.57a. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -2241,7 +2241,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-GNU Automake config.status 1.7.5a
+GNU Automake config.status 1.7.5b
configured by $0, generated by GNU Autoconf 2.57a,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
diff --git a/configure.in b/configure.in
index bbd383c10..8c085c481 100644
--- a/configure.in
+++ b/configure.in
@@ -19,7 +19,7 @@
# 02111-1307, USA.
AC_PREREQ(2.54)
-AC_INIT([GNU Automake], [1.7.5a], [bug-automake@gnu.org])
+AC_INIT([GNU Automake], [1.7.5b], [bug-automake@gnu.org])
AC_CONFIG_SRCDIR(automake.in)
AC_CONFIG_AUX_DIR(lib)
diff --git a/lib/Automake/Makefile.in b/lib/Automake/Makefile.in
index 3cf637988..372840c72 100644
--- a/lib/Automake/Makefile.in
+++ b/lib/Automake/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.5a from Makefile.am.
+# Makefile.in generated by automake 1.7.5b from Makefile.am.
# @configure_input@
# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
diff --git a/lib/Makefile.in b/lib/Makefile.in
index 527cac1b4..14da9a75b 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.5a from Makefile.am.
+# Makefile.in generated by automake 1.7.5b from Makefile.am.
# @configure_input@
# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
diff --git a/lib/am/Makefile.in b/lib/am/Makefile.in
index 047c02a40..1ae37d1e4 100644
--- a/lib/am/Makefile.in
+++ b/lib/am/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.5a from Makefile.am.
+# Makefile.in generated by automake 1.7.5b from Makefile.am.
# @configure_input@
# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
diff --git a/m4/Makefile.in b/m4/Makefile.in
index b3ae4b01f..ee86a387d 100644
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.5a from Makefile.am.
+# Makefile.in generated by automake 1.7.5b from Makefile.am.
# @configure_input@
# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
diff --git a/stamp-vti b/stamp-vti
index 82f6bf791..8cfba1fe5 100644
--- a/stamp-vti
+++ b/stamp-vti
@@ -1,4 +1,4 @@
@set UPDATED 5 July 2003
@set UPDATED-MONTH July 2003
-@set EDITION 1.7.5a
-@set VERSION 1.7.5a
+@set EDITION 1.7.5b
+@set VERSION 1.7.5b
diff --git a/tests/Makefile.in b/tests/Makefile.in
index a5465dca5..ebb86cc64 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.5a from Makefile.am.
+# Makefile.in generated by automake 1.7.5b from Makefile.am.
# @configure_input@
# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
diff --git a/version.texi b/version.texi
index 82f6bf791..8cfba1fe5 100644
--- a/version.texi
+++ b/version.texi
@@ -1,4 +1,4 @@
@set UPDATED 5 July 2003
@set UPDATED-MONTH July 2003
-@set EDITION 1.7.5a
-@set VERSION 1.7.5a
+@set EDITION 1.7.5b
+@set VERSION 1.7.5b