diff options
| author | Thomas Schwinge <thomas@codesourcery.com> | 2012-11-03 19:26:31 +0100 |
|---|---|---|
| committer | Thomas Schwinge <thomas@codesourcery.com> | 2012-11-03 19:26:31 +0100 |
| commit | 312e9782a5178f45c1f0766f351401c276f285e7 (patch) | |
| tree | 371e9efc80bfae00e303b04f658235604be04b1c /aclocal.m4 | |
| parent | 1b1529faaa13c1460c43d4f66cc5bc8e948debe6 (diff) | |
| parent | 4a7fa7e43dfa3910664c02af588955137524c6ea (diff) | |
Merge branch 'baseline' into refs/top-bases/tschwinge/Roger_Whittaker
Conflicts:
ports/sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libc.abilist
sysdeps/mach/hurd/powerpc/init-first.c
sysdeps/mach/powerpc/machine-lock.h
sysdeps/mach/powerpc/machine-sp.h
sysdeps/mach/powerpc/thread_state.h
Diffstat (limited to 'aclocal.m4')
| -rw-r--r-- | aclocal.m4 | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/aclocal.m4 b/aclocal.m4 index a1cf6884fd..982d90e11c 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 |