diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2016-08-20 20:54:39 +0200 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2016-08-20 20:54:39 +0200 |
| commit | 29af7775cfef6ed3b466b92e44387574122ed61b (patch) | |
| tree | c968738daba6d87d69dc4e8b4cb1445a7b6420cb /aclocal.m4 | |
| parent | 4893e0ed57daaff901442bacc10ae09cd3e1850f (diff) | |
| parent | f76453c31593957fec1a99b986bfa5506618b79c (diff) | |
Merge branch 'baseline' into refs/top-bases/tschwinge/Roger_Whittaker
Diffstat (limited to 'aclocal.m4')
| -rw-r--r-- | aclocal.m4 | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/aclocal.m4 b/aclocal.m4 index d847f8f01b..1f60ebd5f3 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,7 +1,8 @@ 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]) +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( Exactly version GLIBC_AUTOCONF_VERSION of Autoconf is required but you have @@ -282,3 +283,21 @@ else $5 fi AC_MSG_RESULT($libc_compiler_builtin_inlined)]) + +dnl Default to slibdir named SLIBDIR instead of "lib", and rtlddir +dnl named RTLDDIR instead of "lib". This is used to put 64-bit +dnl libraries in /lib64. +dnl LIBC_SLIBDIR_RTLDDIR([slibdir], [rtlddir]) +AC_DEFUN([LIBC_SLIBDIR_RTLDDIR], +[test -n "$libc_cv_slibdir" || +case "$prefix" in +/usr | /usr/) + libc_cv_slibdir=/$1 + libc_cv_rtlddir=/$2 + if test "$libdir" = '${exec_prefix}/lib'; then + libdir='${exec_prefix}/$1'; + # Locale data can be shared between 32-bit and 64-bit libraries. + libc_cv_localedir='${exec_prefix}/lib/locale' + fi + ;; +esac]) |