diff options
| author | bkoz <bkoz@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-04-02 02:41:50 +0000 |
|---|---|---|
| committer | bkoz <bkoz@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-04-02 02:41:50 +0000 |
| commit | a15552704bad94598ed925622d3df140cdefaa73 (patch) | |
| tree | 575f392be322920b504b7593940ad3ce028e81d2 /libstdc++-v3/acinclude.m4 | |
| parent | 62315b9c0522256ff9f606151c7bc74f4a291bb7 (diff) | |
| download | gcc-a15552704bad94598ed925622d3df140cdefaa73.tar.gz | |
2002-04-01 Benjamin Kosnik <bkoz@redhat.com>
libstdc++/5542
* acinclude: More extensive checks for msgfmt, --enable-nls.
* aclocal.m4: Regenerate.
* configure: Regenerate.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@51732 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/acinclude.m4')
| -rw-r--r-- | libstdc++-v3/acinclude.m4 | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4 index d7279705d48..412a0a917db 100644 --- a/libstdc++-v3/acinclude.m4 +++ b/libstdc++-v3/acinclude.m4 @@ -1145,14 +1145,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 @@ -1171,9 +1174,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 \ @@ -1197,9 +1203,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 |