summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--aclocal.m43
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 7002206427..3a47cbcaa8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-10-31 Joseph Myers <joseph@codesourcery.com>
+
+ * aclocal.m4 (GLIBC_AUTOCONF_VERSION): Mention need to update
+ install.texi in comment.
+
2014-10-31 Torvald Riegel <triegel@redhat.com>
* sysdeps/powerpc/bits/atomic.h (atomic_write_barrier): Remove and...
diff --git a/aclocal.m4 b/aclocal.m4
index 23569b65f7..abc34d2315 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,6 +1,7 @@
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.
+dnl match those expected by the fragments. When changing this version,
+dnl install.texi also needs to be updated.
m4_define([GLIBC_AUTOCONF_VERSION], [2.69])
m4_if(m4_defn([AC_AUTOCONF_VERSION]), GLIBC_AUTOCONF_VERSION, [],
[m4_fatal(m4_flatten(