From 443507505d3a8bac2b5dc2e8578af2006f68cc80 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Thu, 5 Apr 2012 08:43:41 +0000 Subject: [PATCH] * configure.in (AC_CHECK_FUNCS): Add setlocale. (AM_LC_MESSAGES): Add. * aclocal.m4: Regenerate. * config.in: Regenerate. * configure: Regenerate. --- binutils/ChangeLog | 8 ++++++++ binutils/aclocal.m4 | 1 + binutils/config.in | 6 ++++++ binutils/configure | 36 +++++++++++++++++++++++++++++++++++- binutils/configure.in | 4 +++- gas/ChangeLog | 8 ++++++++ gas/aclocal.m4 | 1 + gas/config.in | 6 ++++++ gas/configure | 45 +++++++++++++++++++++++++++++++++++++++++++++ gas/configure.in | 3 +++ gold/ChangeLog | 8 ++++++++ gold/aclocal.m4 | 1 + gold/config.in | 6 ++++++ gold/configure | 45 +++++++++++++++++++++++++++++++++++++++++++++ gold/configure.ac | 3 +++ ld/ChangeLog | 8 ++++++++ ld/aclocal.m4 | 1 + ld/config.in | 6 ++++++ ld/configure | 40 +++++++++++++++++++++++++++++++++++++--- ld/configure.in | 4 +++- 20 files changed, 234 insertions(+), 6 deletions(-) diff --git a/binutils/ChangeLog b/binutils/ChangeLog index 749378f..4b1321a 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,11 @@ +2012-04-05 Nick Clifton + + * configure.in (AC_CHECK_FUNCS): Add setlocale. + (AM_LC_MESSAGES): Add. + * aclocal.m4: Regenerate. + * config.in: Regenerate. + * configure: Regenerate. + 2012-03-30 Nick Clifton PR binutils/13925 diff --git a/binutils/aclocal.m4 b/binutils/aclocal.m4 index ce11677..1ad8c31 100644 --- a/binutils/aclocal.m4 +++ b/binutils/aclocal.m4 @@ -995,6 +995,7 @@ m4_include([../config/depstand.m4]) m4_include([../config/gettext-sister.m4]) m4_include([../config/iconv.m4]) m4_include([../config/largefile.m4]) +m4_include([../config/lcmessage.m4]) m4_include([../config/lead-dot.m4]) m4_include([../config/lib-ld.m4]) m4_include([../config/lib-link.m4]) diff --git a/binutils/config.in b/binutils/config.in index 62bdfa1..88e7b1b 100644 --- a/binutils/config.in +++ b/binutils/config.in @@ -85,6 +85,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_INTTYPES_H +/* Define if your file defines LC_MESSAGES. */ +#undef HAVE_LC_MESSAGES + /* Define to 1 if you have the header file. */ #undef HAVE_LIMITS_H @@ -100,6 +103,9 @@ /* Define to 1 if you have the `sbrk' function. */ #undef HAVE_SBRK +/* Define to 1 if you have the `setlocale' function. */ +#undef HAVE_SETLOCALE + /* Define to 1 if you have the `setmode' function. */ #undef HAVE_SETMODE diff --git a/binutils/configure b/binutils/configure index 8d324e4..a78e4ef 100755 --- a/binutils/configure +++ b/binutils/configure @@ -12681,7 +12681,7 @@ _ACEOF fi -for ac_func in sbrk utimes setmode getc_unlocked strcoll +for ac_func in sbrk utimes setmode getc_unlocked strcoll setlocale do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" @@ -12767,6 +12767,40 @@ if test "$ac_res" != no; then : fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LC_MESSAGES" >&5 +$as_echo_n "checking for LC_MESSAGES... " >&6; } +if test "${am_cv_val_LC_MESSAGES+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +return LC_MESSAGES + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + am_cv_val_LC_MESSAGES=yes +else + am_cv_val_LC_MESSAGES=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_val_LC_MESSAGES" >&5 +$as_echo "$am_cv_val_LC_MESSAGES" >&6; } + if test $am_cv_val_LC_MESSAGES = yes; then + +$as_echo "#define HAVE_LC_MESSAGES 1" >>confdefs.h + + fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for time_t in time.h" >&5 $as_echo_n "checking for time_t in time.h... " >&6; } if test "${bu_cv_decl_time_t_time_h+set}" = set; then : diff --git a/binutils/configure.in b/binutils/configure.in index d0443cf..3941a0b 100644 --- a/binutils/configure.in +++ b/binutils/configure.in @@ -92,7 +92,7 @@ AC_SUBST(DEMANGLER_NAME) AC_CHECK_HEADERS(string.h strings.h stdlib.h unistd.h fcntl.h sys/file.h limits.h sys/param.h) AC_HEADER_SYS_WAIT AC_FUNC_ALLOCA -AC_CHECK_FUNCS(sbrk utimes setmode getc_unlocked strcoll) +AC_CHECK_FUNCS(sbrk utimes setmode getc_unlocked strcoll setlocale) AC_CHECK_FUNC([mkstemp], AC_DEFINE([HAVE_MKSTEMP], 1, [Define to 1 if you have the `mkstemp' function.])) @@ -103,6 +103,8 @@ AC_CHECK_FUNC([mkdtemp], # Some systems have frexp only in -lm, not in -lc. AC_SEARCH_LIBS(frexp, m) +AM_LC_MESSAGES + AC_MSG_CHECKING(for time_t in time.h) AC_CACHE_VAL(bu_cv_decl_time_t_time_h, [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include ], [time_t i;])], diff --git a/gas/ChangeLog b/gas/ChangeLog index ebe0cfb..2a7d051 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,11 @@ +2012-04-05 Nick Clifton + + * configure.in (AC_CHECK_FUNCS): Add setlocale. + (AM_LC_MESSAGES): Add. + * aclocal.m4: Regenerate. + * config.in: Regenerate. + * configure: Regenerate. + 2012-04-03 DJ Delorie * config/rx-parse.y: Make the .L optional for ADC and SBB. diff --git a/gas/aclocal.m4 b/gas/aclocal.m4 index cd39ba4..c5287c5 100644 --- a/gas/aclocal.m4 +++ b/gas/aclocal.m4 @@ -994,6 +994,7 @@ m4_include([../bfd/warning.m4]) m4_include([../config/depstand.m4]) m4_include([../config/gettext-sister.m4]) m4_include([../config/largefile.m4]) +m4_include([../config/lcmessage.m4]) m4_include([../config/lead-dot.m4]) m4_include([../config/nls.m4]) m4_include([../config/override.m4]) diff --git a/gas/config.in b/gas/config.in index c63b1c6..8bd5298 100644 --- a/gas/config.in +++ b/gas/config.in @@ -66,6 +66,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_INTTYPES_H +/* Define if your file defines LC_MESSAGES. */ +#undef HAVE_LC_MESSAGES + /* Define to 1 if you have the header file. */ #undef HAVE_LIMITS_H @@ -84,6 +87,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_STDLIB_H +/* Define to 1 if you have the `setlocale' function. */ +#undef HAVE_SETLOCALE + /* Define to 1 if you have the header file. */ #undef HAVE_STRINGS_H diff --git a/gas/configure b/gas/configure index 6b4d11c..148ce78 100755 --- a/gas/configure +++ b/gas/configure @@ -13457,6 +13457,51 @@ fi done +for ac_func in setlocale +do : + ac_fn_c_check_func "$LINENO" "setlocale" "ac_cv_func_setlocale" +if test "x$ac_cv_func_setlocale" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_SETLOCALE 1 +_ACEOF + +fi +done + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LC_MESSAGES" >&5 +$as_echo_n "checking for LC_MESSAGES... " >&6; } +if test "${am_cv_val_LC_MESSAGES+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +return LC_MESSAGES + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + am_cv_val_LC_MESSAGES=yes +else + am_cv_val_LC_MESSAGES=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_val_LC_MESSAGES" >&5 +$as_echo "$am_cv_val_LC_MESSAGES" >&6; } + if test $am_cv_val_LC_MESSAGES = yes; then + +$as_echo "#define HAVE_LC_MESSAGES 1" >>confdefs.h + + fi + + # do we need the math library? case "${need_libm}" in yes) diff --git a/gas/configure.in b/gas/configure.in index acdd105..90faf66 100644 --- a/gas/configure.in +++ b/gas/configure.in @@ -657,6 +657,9 @@ AC_CHECK_FUNCS(unlink remove, break) # Some systems don't have sbrk(). AC_CHECK_FUNCS(sbrk) +AC_CHECK_FUNCS(setlocale) +AM_LC_MESSAGES + # do we need the math library? case "${need_libm}" in yes) diff --git a/gold/ChangeLog b/gold/ChangeLog index 9d63bba..cc00632 100644 --- a/gold/ChangeLog +++ b/gold/ChangeLog @@ -1,3 +1,11 @@ +2012-04-05 Nick Clifton + + * configure.ac (AC_CHECK_FUNCS): Add setlocale. + (AM_LC_MESSAGES): Add. + * aclocal.m4: Regenerate. + * config.in: Regenerate. + * configure: Regenerate. + 2012-03-21 Cary Coutant * Makefile.am: Add gdb-index.cc, gdb-index.h. diff --git a/gold/aclocal.m4 b/gold/aclocal.m4 index ded4d60..00cc0f8 100644 --- a/gold/aclocal.m4 +++ b/gold/aclocal.m4 @@ -982,6 +982,7 @@ AC_SUBST([am__untar]) m4_include([../config/depstand.m4]) m4_include([../config/gettext-sister.m4]) +m4_include([../config/lcmessage.m4]) m4_include([../config/lead-dot.m4]) m4_include([../config/nls.m4]) m4_include([../config/override.m4]) diff --git a/gold/config.in b/gold/config.in index 2854620..68ea1f6 100644 --- a/gold/config.in +++ b/gold/config.in @@ -81,6 +81,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_INTTYPES_H +/* Define if your file defines LC_MESSAGES. */ +#undef HAVE_LC_MESSAGES + /* Define to 1 if you have the `mallinfo' function. */ #undef HAVE_MALLINFO @@ -114,6 +117,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_STDLIB_H +/* Define to 1 if you have the `setlocale' function. */ +#undef HAVE_SETLOCALE + /* Define to 1 if you have the header file. */ #undef HAVE_STRINGS_H diff --git a/gold/configure b/gold/configure index b1744a8..04dd11e 100755 --- a/gold/configure +++ b/gold/configure @@ -7336,6 +7336,51 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu +for ac_func in setlocale +do : + ac_fn_c_check_func "$LINENO" "setlocale" "ac_cv_func_setlocale" +if test "x$ac_cv_func_setlocale" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_SETLOCALE 1 +_ACEOF + +fi +done + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LC_MESSAGES" >&5 +$as_echo_n "checking for LC_MESSAGES... " >&6; } +if test "${am_cv_val_LC_MESSAGES+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +return LC_MESSAGES + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + am_cv_val_LC_MESSAGES=yes +else + am_cv_val_LC_MESSAGES=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_val_LC_MESSAGES" >&5 +$as_echo "$am_cv_val_LC_MESSAGES" >&6; } + if test $am_cv_val_LC_MESSAGES = yes; then + +$as_echo "#define HAVE_LC_MESSAGES 1" >>confdefs.h + + fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } diff --git a/gold/configure.ac b/gold/configure.ac index edc5917..a6d1a59 100644 --- a/gold/configure.ac +++ b/gold/configure.ac @@ -536,6 +536,9 @@ fi AC_LANG_POP(C++) +AC_CHECK_FUNCS(setlocale) +AM_LC_MESSAGES + AM_MAINTAINER_MODE AC_OUTPUT(Makefile testsuite/Makefile po/Makefile.in:po/Make-in) diff --git a/ld/ChangeLog b/ld/ChangeLog index 1d5e511..cd3e4cc 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,11 @@ +2012-04-05 Nick Clifton + + * configure.in (AC_CHECK_FUNCS): Add setlocale. + (AM_LC_MESSAGES): Add. + * aclocal.m4: Regenerate. + * config.in: Regenerate. + * configure: Regenerate. + 2012-04-03 Roland McGrath * configure.tgt (i[3-7]86-*-nacl*, x86_64-*-nacl*): Handle them. diff --git a/ld/aclocal.m4 b/ld/aclocal.m4 index 2f88266..6585160 100644 --- a/ld/aclocal.m4 +++ b/ld/aclocal.m4 @@ -995,6 +995,7 @@ m4_include([../config/acx.m4]) m4_include([../config/depstand.m4]) m4_include([../config/gettext-sister.m4]) m4_include([../config/largefile.m4]) +m4_include([../config/lcmessage.m4]) m4_include([../config/lead-dot.m4]) m4_include([../config/nls.m4]) m4_include([../config/override.m4]) diff --git a/ld/config.in b/ld/config.in index a3867f3..fc013fa 100644 --- a/ld/config.in +++ b/ld/config.in @@ -67,6 +67,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_INTTYPES_H +/* Define if your file defines LC_MESSAGES. */ +#undef HAVE_LC_MESSAGES + /* Define to 1 if you have the header file. */ #undef HAVE_LIMITS_H @@ -97,6 +100,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_STDLIB_H +/* Define to 1 if you have the `setlocale' function. */ +#undef HAVE_SETLOCALE + /* Define to 1 if you have the header file. */ #undef HAVE_STRINGS_H diff --git a/ld/configure b/ld/configure index 4e62427..a41921c 100755 --- a/ld/configure +++ b/ld/configure @@ -4713,6 +4713,40 @@ fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LC_MESSAGES" >&5 +$as_echo_n "checking for LC_MESSAGES... " >&6; } +if test "${am_cv_val_LC_MESSAGES+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +return LC_MESSAGES + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + am_cv_val_LC_MESSAGES=yes +else + am_cv_val_LC_MESSAGES=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_val_LC_MESSAGES" >&5 +$as_echo "$am_cv_val_LC_MESSAGES" >&6; } + if test $am_cv_val_LC_MESSAGES = yes; then + +$as_echo "#define HAVE_LC_MESSAGES 1" >>confdefs.h + + fi + + ac_config_headers="$ac_config_headers config.h:config.in" @@ -12140,7 +12174,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12143 "configure" +#line 12177 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12246,7 +12280,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12249 "configure" +#line 12283 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -16182,7 +16216,7 @@ fi done -for ac_func in glob mkstemp realpath sbrk waitpid +for ac_func in glob mkstemp realpath sbrk setlocale waitpid do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" diff --git a/ld/configure.in b/ld/configure.in index a5df0fa..99648cf 100644 --- a/ld/configure.in +++ b/ld/configure.in @@ -120,6 +120,8 @@ esac AM_BINUTILS_WARNINGS +AM_LC_MESSAGES + AC_CONFIG_HEADERS([config.h:config.in]) if test -z "$target" ; then @@ -162,7 +164,7 @@ AC_SUBST(NATIVE_LIB_DIRS) AC_CHECK_HEADERS(string.h strings.h stdlib.h unistd.h elf-hints.h limits.h sys/param.h) AC_CHECK_HEADERS(fcntl.h sys/file.h sys/time.h sys/stat.h) -AC_CHECK_FUNCS(glob mkstemp realpath sbrk waitpid) +AC_CHECK_FUNCS(glob mkstemp realpath sbrk setlocale waitpid) AC_CHECK_FUNCS(open lseek close) AC_HEADER_DIRENT -- 2.7.4