diff options
Diffstat (limited to 'libstdc++-v3/aclocal.m4')
| -rw-r--r-- | libstdc++-v3/aclocal.m4 | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/libstdc++-v3/aclocal.m4 b/libstdc++-v3/aclocal.m4 index 741b697a997..eda0f222c2b 100644 --- a/libstdc++-v3/aclocal.m4 +++ b/libstdc++-v3/aclocal.m4 @@ -1157,14 +1157,17 @@ AC_DEFUN(GLIBCPP_ENABLE_CLOCALE, [ esac fi + dnl Deal with gettext issues. + AC_ARG_ENABLE(nls, + [ --enable-nls use Native Language Support (default)], + , enable_nls=yes) + USE_NLS=no + dnl Set configure bits for specified locale package case x${enable_clocale_flag} in xgeneric) AC_MSG_RESULT(generic) - # Don't use gettext. - USE_NLS=no - CLOCALE_H=config/locale/generic/c_locale.h CLOCALE_CC=config/locale/generic/c_locale.cc CCODECVT_H=config/locale/generic/codecvt_specializations.h @@ -1183,9 +1186,12 @@ AC_DEFUN(GLIBCPP_ENABLE_CLOCALE, [ # languages. # For some reason, ALL_LINGUAS has to be before AM_GNU_GETTEXT ALL_LINGUAS="de fr" + # Don't call AM_GNU_GETTEXT here. Instead, assume glibc. - # Need to deal with MSGFMT, USE_NLS, and glibcpp_[P,M]OFILES - USE_NLS=yes + AC_CHECK_PROG(check_msgfmt, msgfmt, yes, no) + if test x"$check_msgfmt" = x"yes" && test x"$enable_nls" = x"yes"; then + USE_NLS=yes + fi # Export the build objects. for ling in $ALL_LINGUAS; do \ @@ -1209,9 +1215,6 @@ AC_DEFUN(GLIBCPP_ENABLE_CLOCALE, [ xieee_1003.1-2001) AC_MSG_RESULT(generic) - # Don't use gettext. - USE_NLS=no - CLOCALE_H=config/locale/ieee_1003.1-2001/c_locale.h CLOCALE_CC=config/locale/ieee_1003.1-2001/c_locale.cc CCODECVT_H=config/locale/ieee_1003.1-2001/codecvt_specializations.h |