diff options
| author | bkoz <bkoz@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-08-14 01:24:30 +0000 |
|---|---|---|
| committer | bkoz <bkoz@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-08-14 01:24:30 +0000 |
| commit | 241a90f27d58d9bb9f642efa4575a88016b8f854 (patch) | |
| tree | 85dc308155b42748fe84c14850bb3fa69079cada /libstdc++-v3/acinclude.m4 | |
| parent | 2bf0f58dabdef53f56d7e2a315fccaa227f7adfd (diff) | |
| download | gcc-241a90f27d58d9bb9f642efa4575a88016b8f854.tar.gz | |
2001-08-13 Benjamin Kosnik <bkoz@redhat.com>
* configure.in (libtool_VERSION): Add.
(VERSION): Change to
(release_VERSION): This.
* configure: Regenerate.
* src/Makefile.am (libstdc___la_LDFLAGS): Use -version-info with
libtool_VERSION.
* src/Makefile.in: Regenerate.
* intl/Makefile.am: Remove.
* intl/Makefile.in: Remove.
* intl: Remove.
* Makefile.am (SUBDIRS): Remove intl.
* po/Makefile.am (DISTFILES): Add string_literals.cc
(MSGFMT): Add.
* po/string_literals.cc: Add.
* po/POTFILES.in: Fix path.
* acinclude.m4 (GLIBCPP_ENABLE_CLOCALE): Don't call AM_GNU_GETTEXT.
* aclocal.m4: Regenerate.
* configure.in: Remove AC_OUTPUT of intl/Makefile.
* include/backward/backward_warning.h: Clarify message.
* testsuite_flags.in (--cxxflags): Use same debug flags for
library and testsuite.
* include/Makefile.am (c_compatibility): Remove.
* include/Makefile.in: Regenerate.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@44880 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/acinclude.m4')
| -rw-r--r-- | libstdc++-v3/acinclude.m4 | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4 index 5d2651e3266..585f0eb7ae6 100644 --- a/libstdc++-v3/acinclude.m4 +++ b/libstdc++-v3/acinclude.m4 @@ -1054,7 +1054,6 @@ AC_DEFUN(GLIBCPP_ENABLE_CLOCALE, [ # Don't use gettext. USE_NLS=no - AC_SUBST(USE_NLS) CLOCALE_H=config/locale/c_locale_generic.h CLOCALE_CC=config/locale/c_locale_generic.cc @@ -1069,13 +1068,17 @@ AC_DEFUN(GLIBCPP_ENABLE_CLOCALE, [ # languages. # For some reason, ALL_LINGUAS has to be before AM_GNU_GETTEXT ALL_LINGUAS="de fr" - AM_GNU_GETTEXT + # 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 # Export the build objects. for ling in $ALL_LINGUAS; do \ glibcpp_MOFILES="$glibcpp_MOFILES $ling.mo"; \ + glibcpp_POFILES="$glibcpp_POFILES $ling.po"; \ done AC_SUBST(glibcpp_MOFILES) + AC_SUBST(glibcpp_POFILES) CLOCALE_H=config/locale/c_locale_gnu.h CLOCALE_CC=config/locale/c_locale_gnu.cc @@ -1088,7 +1091,6 @@ AC_DEFUN(GLIBCPP_ENABLE_CLOCALE, [ # Don't use gettext. USE_NLS=no - AC_SUBST(USE_NLS) CLOCALE_H=config/locale/c_locale_ieee_1003.1-200x.h CLOCALE_CC=config/locale/c_locale_ieee_1003.1-200x.cc @@ -1107,6 +1109,7 @@ AC_DEFUN(GLIBCPP_ENABLE_CLOCALE, [ glibcpp_localedir=${glibcpp_builddir}/po/share/locale AC_SUBST(glibcpp_localedir) + AC_SUBST(USE_NLS) AC_SUBST(CLOCALE_H) AC_SUBST(CCODECVT_H) AC_SUBST(CMESSAGES_H) |