GNU C Library master sources branch master updated. glibc-2.16-ports-merge-596-gf7934be

[roland at sourceware dot org]

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 C Library master sources".

The branch, master has been updated
       via  f7934be8f6bb5f47def626af7bd9098e8fb3e950 (commit)
      from  d7d08bdedeecf168ef58c7e2bdbb4c39c1939aba (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 -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=f7934be8f6bb5f47def626af7bd9098e8fb3e950

commit f7934be8f6bb5f47def626af7bd9098e8fb3e950
Author: Roland McGrath <roland@hack.frob.com>
Date:   Fri Nov 2 11:19:27 2012 -0700

    Require an exact Autoconf version.

diff --git a/ChangeLog b/ChangeLog
index d85ffee..a762760 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-11-02  Roland McGrath  <roland@hack.frob.com>
+
+	* aclocal.m4 (GLIBC_AUTOCONF_VERSION): New macro.
+	Check that AC_AUTOCONF_VERSION matches it and m4_fatal at
+	autoconf-time if not.
+	* configure.in: Remove AC_PREREQ.
+
 2012-11-02  Tulio Magno Quites Machado Filho  <tuliom@linux.vnet.ibm.com>
 
 	* sysdeps/powerpc/sys/platform/ppc.h (__ppc_get_timebase): Use
diff --git a/aclocal.m4 b/aclocal.m4
index 60a5fea..3e61dc8 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,3 +1,13 @@
+dnl We require that everyone use exactly the same Autoconf version so that
+dnl the internal functions defined and used by the main configure script
+dnl match those expected by the fragments.
+m4_define([GLIBC_AUTOCONF_VERSION], [2.68])
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), GLIBC_AUTOCONF_VERSION, [],
+      [m4_fatal(m4_flatten(
+Exactly version GLIBC_AUTOCONF_VERSION of Autoconf is required but you have
+m4_defn([AC_AUTOCONF_VERSION])
+), [63])])dnl
+dnl
 dnl We define the macro GLIBC_PROVIDES to do an AC_PROVIDE for each macro
 dnl which appears in configure.in before the sysdep configure scripts are run.
 dnl Each sysdep configure.in does GLIBC_PROVIDES first, to avoid any
diff --git a/configure.in b/configure.in
index 928b7b6..5e35b98 100644
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.53)dnl		dnl Minimum Autoconf version required.
+dnl Note we do not use AC_PREREQ here!  See aclocal.m4 for what we use instead.
 AC_INIT([GNU C Library], [(see version.h)], [http://sourceware.org/bugzilla/], [glibc])
 AC_CONFIG_SRCDIR([include/features.h])
 AC_CONFIG_HEADERS([config.h])

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog    |    7 +++++++
 aclocal.m4   |   10 ++++++++++
 configure.in |    2 +-
 3 files changed, 18 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources