[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Automake-commit] [SCM] GNU Automake branch, branch-1.11, updated. v1.11
|
From: |
Ralf Wildenhues |
|
Subject: |
[Automake-commit] [SCM] GNU Automake branch, branch-1.11, updated. v1.11-64-gc50afc2 |
|
Date: |
Tue, 08 Dec 2009 22:12:28 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".
http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=c50afc2d4c270062309accbff218ef9aa12aaaa7
The branch, branch-1.11 has been updated
via c50afc2d4c270062309accbff218ef9aa12aaaa7 (commit)
via 7f0330c035422f5575d12d4688d3b9c37a4aa047 (commit)
via e6caa5aee56982ef907d74232bc6a8505b9cfcb8 (commit)
via f818dcbb6a7d3c9abc65566f316a64e873e0cdc8 (commit)
via fe73f8c2c8d21301e338c9f4d246bc9a652f596a (commit)
via e05a5c2e270b160ef210d9e10556e90cb01ccb84 (commit)
via df834b02d49220bdb3dcff82f6564d5c2c41e8d6 (commit)
from a9281e35162a942da545cb5f283f116ada2e3ee8 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit c50afc2d4c270062309accbff218ef9aa12aaaa7
Author: Ralf Wildenhues <address@hidden>
Date: Tue Dec 8 22:05:46 2009 +0100
Post-release version bump.
* configure.ac, NEWS: Bump version to 1.11.1a.
Signed-off-by: Ralf Wildenhues <address@hidden>
commit 7f0330c035422f5575d12d4688d3b9c37a4aa047
Author: Ralf Wildenhues <address@hidden>
Date: Sun Dec 6 16:35:08 2009 +0100
Version 1.11.1.
* configure.ac, NEWS: Bump version to 1.11.1.
* doc/automake.texi (Releases): Add line for 1.10.3 and 1.11.1.
Signed-off-by: Ralf Wildenhues <address@hidden>
commit e6caa5aee56982ef907d74232bc6a8505b9cfcb8
Author: Ralf Wildenhues <address@hidden>
Date: Sun Dec 6 16:34:11 2009 +0100
Sync auxiliary files from upstream.
* INSTALL, lib/INSTALL, lib/config.guess, lib/config.sub:
Sync from upstream.
Signed-off-by: Ralf Wildenhues <address@hidden>
commit f818dcbb6a7d3c9abc65566f316a64e873e0cdc8
Merge: e05a5c2e270b160ef210d9e10556e90cb01ccb84
fe73f8c2c8d21301e338c9f4d246bc9a652f596a
Author: Ralf Wildenhues <address@hidden>
Date: Sun Dec 6 16:32:48 2009 +0100
Merge branch 'sanity-sleep-fix' into branch-1.11
* sanity-sleep-fix:
Revert "Avoid sleeping for one second most of the time in sanity check."
commit fe73f8c2c8d21301e338c9f4d246bc9a652f596a
Author: Ralf Wildenhues <address@hidden>
Date: Sun Dec 6 16:26:45 2009 +0100
Revert "Avoid sleeping for one second most of the time in sanity check."
Not sleeping in the configure sanity check breaks several tests
on systems that provide sub-second time stamps, when only some
of the tools support them, some truncate them, and other round
them.
Report by Peter Breitenlohner and others.
This reverts commit f6b3f7fb620580356865ebedfbaf76af3e534369.
Signed-off-by: Ralf Wildenhues <address@hidden>
commit e05a5c2e270b160ef210d9e10556e90cb01ccb84
Merge: a9281e35162a942da545cb5f283f116ada2e3ee8
df834b02d49220bdb3dcff82f6564d5c2c41e8d6
Author: Ralf Wildenhues <address@hidden>
Date: Sun Dec 6 16:25:47 2009 +0100
Merge branch 'maint' into branch-1.11
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 23 ++++++++++++++
INSTALL | 37 ++++++++++++-----------
Makefile.in | 2 +-
NEWS | 14 +++++++-
aclocal.m4 | 2 +-
configure | 64 ++++++++++++++++++---------------------
configure.ac | 2 +-
doc/Makefile.in | 2 +-
doc/automake.texi | 2 +
lib/Automake/Makefile.in | 2 +-
lib/Automake/tests/Makefile.in | 2 +-
lib/INSTALL | 37 ++++++++++++-----------
lib/Makefile.in | 2 +-
lib/am/Makefile.in | 2 +-
lib/config.guess | 25 ++++++++++-----
lib/config.sub | 11 +++++--
m4/Makefile.in | 2 +-
m4/amversion.m4 | 4 +-
m4/sanity.m4 | 46 +++++++++++++---------------
tests/Makefile.in | 2 +-
20 files changed, 162 insertions(+), 121 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index cbeae03..0de082c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,26 @@
+2009-12-08 Ralf Wildenhues <address@hidden>
+
+ Post-release version bump.
+ * configure.ac, NEWS: Bump version to 1.11.1a.
+
+2009-12-06 Ralf Wildenhues <address@hidden>
+
+ * configure.ac, NEWS: Bump version to 1.11.1.
+ * doc/automake.texi (Releases): Add line for 1.10.3 and 1.11.1.
+
+ * INSTALL, lib/INSTALL, lib/config.guess, lib/config.sub:
+ Sync from upstream.
+
+ Revert "Avoid sleeping for one second most of the time in sanity check."
+ Not sleeping in the configure sanity check breaks several tests
+ on systems that provide sub-second time stamps, when only some
+ of the tools support them, some truncate them, and other round
+ them.
+ * m4/sanity.m4 (AM_SANITY_CHECK): Do sleep for a second.
+ Report by Peter Breitenlohner and others.
+
+ * NEWS: Update.
+
2009-12-05 Antonio Diaz Diaz <address@hidden>
Replace unlzma, gunzip, bunzip2 with pack tool -d invocation.
diff --git a/INSTALL b/INSTALL
index 35602c2..7d1c323 100644
--- a/INSTALL
+++ b/INSTALL
@@ -69,6 +69,10 @@ of `autoconf'.
5. Optionally, type `make installcheck' to repeat any self-tests, but
this time using the binaries in their final installed location.
+ This target does not install anything. Running this target as a
+ regular user, particularly if the prior `make install' required
+ root privileges, verifies that the installation completed
+ correctly.
6. You can remove the program binaries and object files from the
source code directory by typing `make clean'. To also remove the
@@ -141,7 +145,7 @@ Installation Names
`/usr/local/bin', include files under `/usr/local/include', etc. You
can specify an installation prefix other than `/usr/local' by giving
`configure' the option `--prefix=PREFIX', where PREFIX must be an
-absolute path.
+absolute file name.
You can specify separate installation prefixes for
architecture-specific files and architecture-independent files. If you
@@ -155,7 +159,7 @@ kinds of files. Run `configure --help' for a list of the
directories
you can set and what kinds of files go in them. In general, the
default for these options is expressed in terms of `${prefix}', so that
specifying just `--prefix' will affect all of the other directory
-specifications.
+specifications that were not explicitly provided.
The most portable way to affect installation locations is to pass the
correct locations to `configure'; however, many packages provide one or
@@ -165,28 +169,25 @@ having to reconfigure or recompile.
The first method involves providing an override variable for each
affected directory. For example, `make install
-prefix=/path/to/alternate' will choose an alternate location, as well as
-influencing all other directory configuration variables that were
-expressed in terms of `${prefix}' (or, put another way, all directories
-specified during `configure' but not in terms of the common prefix must
-each be overridden at install time for the entire installation to be
-relocated). The approach of makefile variable overrides for each
-directory variable is required by the GNU Coding Standards, and ideally
-causes no recompilation. However, some platforms have known
-limitations with the semantics of shared libraries that end up
-requiring recompilation when using this method, particularly noticeable
-in packages that use GNU Libtool.
+prefix=/alternate/directory' will choose an alternate location for all
+directory configuration variables that were expressed in terms of
+`${prefix}'. Any directories that were specified during `configure',
+but not in terms of `${prefix}', must each be overridden at install
+time for the entire installation to be relocated. The approach of
+makefile variable overrides for each directory variable is required by
+the GNU Coding Standards, and ideally causes no recompilation.
+However, some platforms have known limitations with the semantics of
+shared libraries that end up requiring recompilation when using this
+method, particularly noticeable in packages that use GNU Libtool.
The second method involves providing the `DESTDIR' variable. For
-example, `make install DESTDIR=/path/to/alternate' will prepend
-`/path/to/alternate' before all installation paths. The approach of
+example, `make install DESTDIR=/alternate/directory' will prepend
+`/alternate/directory' before all installation names. The approach of
`DESTDIR' overrides is not required by the GNU Coding Standards, and
does not work on platforms that have drive letters. On the other hand,
it does better at avoiding recompilation issues, and works well even
when some directory options were not specified in terms of `${prefix}'
-at `configure' time. For packages which support `DESTDIR', the
-variable should remain undefined during `configure' and `make all', and
-only be specified during `make install'.
+at `configure' time.
Optional Features
=================
diff --git a/Makefile.in b/Makefile.in
index 5dc307e..141d351 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.0a from Makefile.am.
+# Makefile.in generated by automake 1.11.1a from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/NEWS b/NEWS
index cd427fb..2835c85 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,11 @@
-New in 1.11.0a:
+New in 1.11.1a:
-Bugs fixed in 1.11.0a:
+Bugs fixed in 1.11.1a:
+
+
+Bugs fixed in 1.11.1:
+
+ - Lots of minor bugfixes.
* Bugs introduced by 1.11:
@@ -21,6 +26,11 @@ Bugs fixed in 1.11.0a:
- AM_PROG_GCJ uses AC_CHECK_TOOLS to look for `gcj' now, so that prefixed
tools are preferred in a cross-compile setup.
+ - The distribution is tarred up with mode 755 now by the `dist*' targets.
+ This fixes a race condition where untrusted users could modify files
+ in the $(PACKAGE)-$(VERSION) distdir before packing if the toplevel
+ build directory was world-searchable. This is CVE-2009-4029.
+
New in 1.11:
diff --git a/aclocal.m4 b/aclocal.m4
index ef310f0..0c3c37d 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.11.0a -*- Autoconf -*-
+# generated automatically by aclocal 1.11.1a -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
diff --git a/configure b/configure
index 3132159..ac51f2d 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.65 for GNU Automake 1.11.0a.
+# Generated by GNU Autoconf 2.65 for GNU Automake 1.11.1a.
#
# Report bugs to <address@hidden>.
#
@@ -552,8 +552,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='GNU Automake'
PACKAGE_TARNAME='automake'
-PACKAGE_VERSION='1.11.0a'
-PACKAGE_STRING='GNU Automake 1.11.0a'
+PACKAGE_VERSION='1.11.1a'
+PACKAGE_STRING='GNU Automake 1.11.1a'
PACKAGE_BUGREPORT='address@hidden'
PACKAGE_URL='http://www.gnu.org/software/automake/'
@@ -1187,7 +1187,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.11.0a to adapt to many kinds of systems.
+\`configure' configures GNU Automake 1.11.1a to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1256,7 +1256,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of GNU Automake 1.11.0a:";;
+ short | recursive ) echo "Configuration of GNU Automake 1.11.1a:";;
esac
cat <<\_ACEOF
@@ -1325,7 +1325,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-GNU Automake configure 1.11.0a
+GNU Automake configure 1.11.1a
generated by GNU Autoconf 2.65
Copyright (C) 2009 Free Software Foundation, Inc.
@@ -1342,7 +1342,7 @@ cat >config.log <<_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.11.0a, which was
+It was created by GNU Automake $as_me 1.11.1a, which was
generated by GNU Autoconf 2.65. Invocation command line was
$ $0 $@
@@ -1859,6 +1859,9 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m
644'
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is
sane" >&5
$as_echo_n "checking whether build environment is sane... " >&6; }
+# Just in case
+sleep 1
+echo timestamp > conftest.file
# Reject unsafe characters in $srcdir or the absolute working directory
# name. Accept space and tab only in the latter.
am_lf='
@@ -1878,30 +1881,23 @@ esac
# (eg FreeBSD returns the mod time of the symlink's containing
# directory).
if (
- for am_try in 1 2; do
- echo timestamp > conftest.file
- set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
- if test "$*" = "X"; then
- # -L didn't work.
- set X `ls -t "$srcdir/configure" conftest.file`
- fi
- rm -f conftest.file
- if test "$*" != "X $srcdir/configure conftest.file" \
- && test "$*" != "X conftest.file $srcdir/configure"; then
-
- # If neither matched, then we have a broken ls. This can happen
- # if, for instance, CONFIG_SHELL is bash and it inherits a
- # broken ls alias from the environment. This has actually
- # happened. Such a system could not be considered "sane".
- as_fn_error "ls -t appears to fail. Make sure there is not a broken
- alias in your environment" "$LINENO" 5
- fi
- if test "$2" = conftest.file || test $am_try -eq 2; then
- break
- fi
- # Just in case.
- sleep 1
- done
+ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+ if test "$*" = "X"; then
+ # -L didn't work.
+ set X `ls -t "$srcdir/configure" conftest.file`
+ fi
+ rm -f conftest.file
+ if test "$*" != "X $srcdir/configure conftest.file" \
+ && test "$*" != "X conftest.file $srcdir/configure"; then
+
+ # If neither matched, then we have a broken ls. This can happen
+ # if, for instance, CONFIG_SHELL is bash and it inherits a
+ # broken ls alias from the environment. This has actually
+ # happened. Such a system could not be considered "sane".
+ as_fn_error "ls -t appears to fail. Make sure there is not a broken
+alias in your environment" "$LINENO" 5
+ fi
+
test "$2" = conftest.file
)
then
@@ -2204,7 +2200,7 @@ fi
# Define the identity of the package.
PACKAGE='automake'
- VERSION='1.11.0a'
+ VERSION='1.11.1a'
cat >>confdefs.h <<_ACEOF
@@ -3280,7 +3276,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by GNU Automake $as_me 1.11.0a, which was
+This file was extended by GNU Automake $as_me 1.11.1a, which was
generated by GNU Autoconf 2.65. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3335,7 +3331,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-GNU Automake config.status 1.11.0a
+GNU Automake config.status 1.11.1a
configured by $0, generated by GNU Autoconf 2.65,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index 3d36a01..5216338 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,7 +16,7 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-AC_INIT([GNU Automake], [1.11.0a], address@hidden)
+AC_INIT([GNU Automake], [1.11.1a], address@hidden)
AC_CONFIG_SRCDIR(automake.in)
AC_CONFIG_AUX_DIR(lib)
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 8883af3..756bb1c 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.0a from Makefile.am.
+# Makefile.in generated by automake 1.11.1a from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/doc/automake.texi b/doc/automake.texi
index 5cc5e51..3e158b5 100644
--- a/doc/automake.texi
+++ b/doc/automake.texi
@@ -12795,6 +12795,8 @@ parentheses is the number of generated test cases.
@item 2008-01-19 @tab 1.10.1 @tab 7870 @tab 1089 @tab 8025 @tab 3520 (40) @tab
1499 (34) @tab 173 @tab 617
@item 2008-11-23 @tab 1.10.2 @tab 7882 @tab 1089 @tab 8027 @tab 3540 (40) @tab
1509 (34) @tab 176 @tab 628
@item 2009-05-17 @tab 1.11 @tab 8721 @tab 1092 @tab 8289 @tab 4164 (42) @tab
1714 (37) @tab 181 @tab 732 (20)
address@hidden 2009-12-07 @tab 1.10.3 @tab 7892 @tab 1089 @tab 8027 @tab 3566
(40) @tab 1535 (34) @tab 174 @tab 636
address@hidden 2009-12-07 @tab 1.11.1 @tab 8722 @tab 1092 @tab 8292 @tab 4162
(42) @tab 1730 (37) @tab 181 @tab 739 (20)
@end multitable
diff --git a/lib/Automake/Makefile.in b/lib/Automake/Makefile.in
index 7cb9760..79d768e 100644
--- a/lib/Automake/Makefile.in
+++ b/lib/Automake/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.0a from Makefile.am.
+# Makefile.in generated by automake 1.11.1a from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/lib/Automake/tests/Makefile.in b/lib/Automake/tests/Makefile.in
index 67105e4..f7e40c1 100644
--- a/lib/Automake/tests/Makefile.in
+++ b/lib/Automake/tests/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.0a from Makefile.am.
+# Makefile.in generated by automake 1.11.1a from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/lib/INSTALL b/lib/INSTALL
index 35602c2..7d1c323 100644
--- a/lib/INSTALL
+++ b/lib/INSTALL
@@ -69,6 +69,10 @@ of `autoconf'.
5. Optionally, type `make installcheck' to repeat any self-tests, but
this time using the binaries in their final installed location.
+ This target does not install anything. Running this target as a
+ regular user, particularly if the prior `make install' required
+ root privileges, verifies that the installation completed
+ correctly.
6. You can remove the program binaries and object files from the
source code directory by typing `make clean'. To also remove the
@@ -141,7 +145,7 @@ Installation Names
`/usr/local/bin', include files under `/usr/local/include', etc. You
can specify an installation prefix other than `/usr/local' by giving
`configure' the option `--prefix=PREFIX', where PREFIX must be an
-absolute path.
+absolute file name.
You can specify separate installation prefixes for
architecture-specific files and architecture-independent files. If you
@@ -155,7 +159,7 @@ kinds of files. Run `configure --help' for a list of the
directories
you can set and what kinds of files go in them. In general, the
default for these options is expressed in terms of `${prefix}', so that
specifying just `--prefix' will affect all of the other directory
-specifications.
+specifications that were not explicitly provided.
The most portable way to affect installation locations is to pass the
correct locations to `configure'; however, many packages provide one or
@@ -165,28 +169,25 @@ having to reconfigure or recompile.
The first method involves providing an override variable for each
affected directory. For example, `make install
-prefix=/path/to/alternate' will choose an alternate location, as well as
-influencing all other directory configuration variables that were
-expressed in terms of `${prefix}' (or, put another way, all directories
-specified during `configure' but not in terms of the common prefix must
-each be overridden at install time for the entire installation to be
-relocated). The approach of makefile variable overrides for each
-directory variable is required by the GNU Coding Standards, and ideally
-causes no recompilation. However, some platforms have known
-limitations with the semantics of shared libraries that end up
-requiring recompilation when using this method, particularly noticeable
-in packages that use GNU Libtool.
+prefix=/alternate/directory' will choose an alternate location for all
+directory configuration variables that were expressed in terms of
+`${prefix}'. Any directories that were specified during `configure',
+but not in terms of `${prefix}', must each be overridden at install
+time for the entire installation to be relocated. The approach of
+makefile variable overrides for each directory variable is required by
+the GNU Coding Standards, and ideally causes no recompilation.
+However, some platforms have known limitations with the semantics of
+shared libraries that end up requiring recompilation when using this
+method, particularly noticeable in packages that use GNU Libtool.
The second method involves providing the `DESTDIR' variable. For
-example, `make install DESTDIR=/path/to/alternate' will prepend
-`/path/to/alternate' before all installation paths. The approach of
+example, `make install DESTDIR=/alternate/directory' will prepend
+`/alternate/directory' before all installation names. The approach of
`DESTDIR' overrides is not required by the GNU Coding Standards, and
does not work on platforms that have drive letters. On the other hand,
it does better at avoiding recompilation issues, and works well even
when some directory options were not specified in terms of `${prefix}'
-at `configure' time. For packages which support `DESTDIR', the
-variable should remain undefined during `configure' and `make all', and
-only be specified during `make install'.
+at `configure' time.
Optional Features
=================
diff --git a/lib/Makefile.in b/lib/Makefile.in
index 0b1226d..e255f67 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.0a from Makefile.am.
+# Makefile.in generated by automake 1.11.1a from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/lib/am/Makefile.in b/lib/am/Makefile.in
index bd50699..540fdc3 100644
--- a/lib/am/Makefile.in
+++ b/lib/am/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.0a from Makefile.am.
+# Makefile.in generated by automake 1.11.1a from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/lib/config.guess b/lib/config.guess
index e792aac..dc84c68 100755
--- a/lib/config.guess
+++ b/lib/config.guess
@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
# Free Software Foundation, Inc.
-timestamp='2009-09-18'
+timestamp='2009-11-20'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -333,6 +333,9 @@ case
"${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
+ i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
+ echo i386-pc-auroraux${UNAME_RELEASE}
+ exit ;;
i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
eval $set_cc_for_build
SUN_ARCH="i386"
@@ -807,12 +810,12 @@ EOF
i*:PW*:*)
echo ${UNAME_MACHINE}-pc-pw32
exit ;;
- *:Interix*:[3456]*)
+ *:Interix*:*)
case ${UNAME_MACHINE} in
x86)
echo i586-pc-interix${UNAME_RELEASE}
exit ;;
- EM64T | authenticamd | genuineintel)
+ authenticamd | genuineintel | EM64T)
echo x86_64-unknown-interix${UNAME_RELEASE}
exit ;;
IA64)
@@ -891,7 +894,15 @@ EOF
echo frv-unknown-linux-gnu
exit ;;
i*86:Linux:*:*)
- echo ${UNAME_MACHINE}-pc-linux-gnu
+ LIBC=gnu
+ eval $set_cc_for_build
+ sed 's/^ //' << EOF >$dummy.c
+ #ifdef __dietlibc__
+ LIBC=dietlibc
+ #endif
+EOF
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+ echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
exit ;;
ia64:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -918,11 +929,7 @@ EOF
#endif
#endif
EOF
- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
- /^CPU/{
- s: ::g
- p
- }'`"
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
;;
or32:Linux:*:*)
diff --git a/lib/config.sub b/lib/config.sub
index 5ecc18b..2a55a50 100755
--- a/lib/config.sub
+++ b/lib/config.sub
@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
# Free Software Foundation, Inc.
-timestamp='2009-10-07'
+timestamp='2009-11-20'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -295,6 +295,7 @@ case $basic_machine in
| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
| spu | strongarm \
| tahoe | thumb | tic4x | tic80 | tron \
+ | ubicom32 \
| v850 | v850e \
| we32k \
| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
@@ -381,6 +382,7 @@ case $basic_machine in
| tahoe-* | thumb-* \
| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
| tron-* \
+ | ubicom32-* \
| v850-* | v850e-* | vax-* \
| we32k-* \
| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
@@ -1254,6 +1256,9 @@ case $os in
# First match some system type aliases
# that might get confused with valid system types.
# -solaris* is a basic system type, with this one exception.
+ -auroraux)
+ os=-auroraux
+ ;;
-solaris1 | -solaris1.*)
os=`echo $os | sed -e 's|solaris1|sunos4|'`
;;
@@ -1275,8 +1280,8 @@ case $os in
# -sysv* is not here because it comes later, after sysvr4.
-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
| -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos |
-sunos[34]*\
- | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
- | -kopensolaris* \
+ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* |
-solaris* \
+ | -sym* | -kopensolaris* \
| -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
| -aos* | -aros* \
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
diff --git a/m4/Makefile.in b/m4/Makefile.in
index eeaeff2..fe19c23 100644
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.0a from Makefile.am.
+# Makefile.in generated by automake 1.11.1a from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/m4/amversion.m4 b/m4/amversion.m4
index 10fb525..9f7c991 100644
--- a/m4/amversion.m4
+++ b/m4/amversion.m4
@@ -15,7 +15,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.11'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.11.0a], [],
+m4_if([$1], [1.11.1a], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -31,7 +31,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.11.0a])dnl
+[AM_AUTOMAKE_VERSION([1.11.1a])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
diff --git a/m4/sanity.m4 b/m4/sanity.m4
index db87c8b..3d2f304 100644
--- a/m4/sanity.m4
+++ b/m4/sanity.m4
@@ -1,18 +1,21 @@
# Check to make sure that the build environment is sane. -*- Autoconf -*-
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008, 2009
+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
# Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 6
+# serial 5
# AM_SANITY_CHECK
# ---------------
AC_DEFUN([AM_SANITY_CHECK],
[AC_MSG_CHECKING([whether build environment is sane])
+# Just in case
+sleep 1
+echo timestamp > conftest.file
# Reject unsafe characters in $srcdir or the absolute working directory
# name. Accept space and tab only in the latter.
am_lf='
@@ -32,30 +35,23 @@ esac
# (eg FreeBSD returns the mod time of the symlink's containing
# directory).
if (
- for am_try in 1 2; do
- echo timestamp > conftest.file
- set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
- if test "$[*]" = "X"; then
- # -L didn't work.
- set X `ls -t "$srcdir/configure" conftest.file`
- fi
- rm -f conftest.file
- if test "$[*]" != "X $srcdir/configure conftest.file" \
- && test "$[*]" != "X conftest.file $srcdir/configure"; then
+ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+ if test "$[*]" = "X"; then
+ # -L didn't work.
+ set X `ls -t "$srcdir/configure" conftest.file`
+ fi
+ rm -f conftest.file
+ if test "$[*]" != "X $srcdir/configure conftest.file" \
+ && test "$[*]" != "X conftest.file $srcdir/configure"; then
+
+ # If neither matched, then we have a broken ls. This can happen
+ # if, for instance, CONFIG_SHELL is bash and it inherits a
+ # broken ls alias from the environment. This has actually
+ # happened. Such a system could not be considered "sane".
+ AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
+alias in your environment])
+ fi
- # If neither matched, then we have a broken ls. This can happen
- # if, for instance, CONFIG_SHELL is bash and it inherits a
- # broken ls alias from the environment. This has actually
- # happened. Such a system could not be considered "sane".
- AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
- alias in your environment])
- fi
- if test "$[2]" = conftest.file || test $am_try -eq 2; then
- break
- fi
- # Just in case.
- sleep 1
- done
test "$[2]" = conftest.file
)
then
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 9c9ac74..88ccee0 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11.0a from Makefile.am.
+# Makefile.in generated by automake 1.11.1a from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
hooks/post-receive
--
GNU Automake
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Automake-commit] [SCM] GNU Automake branch, branch-1.11, updated. v1.11-64-gc50afc2,
Ralf Wildenhues <=