acinclude: More extensive checks for msgfmt, --enable-nls.
2002-04-01 Benjamin Kosnik <bkoz@redhat.com> libstdc++/5542 * acinclude: More extensive checks for msgfmt, --enable-nls. * aclocal.m4: Regenerate. * configure: Regenerate. From-SVN: r51732
This commit is contained in:
parent
efe44c60eb
commit
501e321e0d
12 changed files with 1214 additions and 1154 deletions
|
@ -1,3 +1,10 @@
|
|||
2002-04-01 Benjamin Kosnik <bkoz@redhat.com>
|
||||
|
||||
libstdc++/5542
|
||||
* acinclude: More extensive checks for msgfmt, --enable-nls.
|
||||
* aclocal.m4: Regenerate.
|
||||
* configure: Regenerate.
|
||||
|
||||
2002-04-01 Phil Edwards <pme@gcc.gnu.org>
|
||||
|
||||
* libsupc++/exception (__verbose_terminate_handler): Point to docs.
|
||||
|
|
|
@ -132,6 +132,7 @@ USE_NLS = @USE_NLS@
|
|||
VERSION = @VERSION@
|
||||
WARN_FLAGS = @WARN_FLAGS@
|
||||
WERROR = @WERROR@
|
||||
check_msgfmt = @check_msgfmt@
|
||||
enable_shared = @enable_shared@
|
||||
enable_static = @enable_static@
|
||||
glibcpp_CXX = @glibcpp_CXX@
|
||||
|
|
|
@ -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
|
||||
|
|
19
libstdc++-v3/aclocal.m4
vendored
19
libstdc++-v3/aclocal.m4
vendored
|
@ -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
|
||||
|
|
2311
libstdc++-v3/configure
vendored
2311
libstdc++-v3/configure
vendored
File diff suppressed because it is too large
Load diff
|
@ -131,6 +131,7 @@ USE_NLS = @USE_NLS@
|
|||
VERSION = @VERSION@
|
||||
WARN_FLAGS = @WARN_FLAGS@
|
||||
WERROR = @WERROR@
|
||||
check_msgfmt = @check_msgfmt@
|
||||
enable_shared = @enable_shared@
|
||||
enable_static = @enable_static@
|
||||
glibcpp_CXX = @glibcpp_CXX@
|
||||
|
|
|
@ -129,6 +129,7 @@ USE_NLS = @USE_NLS@
|
|||
VERSION = @VERSION@
|
||||
WARN_FLAGS = @WARN_FLAGS@
|
||||
WERROR = @WERROR@
|
||||
check_msgfmt = @check_msgfmt@
|
||||
enable_shared = @enable_shared@
|
||||
enable_static = @enable_static@
|
||||
glibcpp_CXX = @glibcpp_CXX@
|
||||
|
|
|
@ -131,6 +131,7 @@ USE_NLS = @USE_NLS@
|
|||
VERSION = @VERSION@
|
||||
WARN_FLAGS = @WARN_FLAGS@
|
||||
WERROR = @WERROR@
|
||||
check_msgfmt = @check_msgfmt@
|
||||
enable_shared = @enable_shared@
|
||||
enable_static = @enable_static@
|
||||
glibcpp_CXX = @glibcpp_CXX@
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
# Makefile.in generated automatically by automake 1.4 from Makefile.am
|
||||
# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
|
||||
|
||||
# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
|
||||
# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
|
||||
# This Makefile.in is free software; the Free Software Foundation
|
||||
# gives unlimited permission to copy and/or distribute it,
|
||||
# with or without modifications, as long as this notice is preserved.
|
||||
|
@ -127,6 +127,7 @@ USE_NLS = @USE_NLS@
|
|||
VERSION = @VERSION@
|
||||
WARN_FLAGS = @WARN_FLAGS@
|
||||
WERROR = @WERROR@
|
||||
check_msgfmt = @check_msgfmt@
|
||||
enable_shared = @enable_shared@
|
||||
enable_static = @enable_static@
|
||||
glibcpp_CXX = @glibcpp_CXX@
|
||||
|
|
|
@ -130,6 +130,7 @@ USE_NLS = @USE_NLS@
|
|||
VERSION = @VERSION@
|
||||
WARN_FLAGS = @WARN_FLAGS@
|
||||
WERROR = @WERROR@
|
||||
check_msgfmt = @check_msgfmt@
|
||||
enable_shared = @enable_shared@
|
||||
enable_static = @enable_static@
|
||||
glibcpp_CXX = @glibcpp_CXX@
|
||||
|
|
|
@ -124,6 +124,7 @@ USE_NLS = @USE_NLS@
|
|||
VERSION = @VERSION@
|
||||
WARN_FLAGS = @WARN_FLAGS@
|
||||
WERROR = @WERROR@
|
||||
check_msgfmt = @check_msgfmt@
|
||||
enable_shared = @enable_shared@
|
||||
enable_static = @enable_static@
|
||||
glibcpp_CXX = @glibcpp_CXX@
|
||||
|
|
|
@ -132,6 +132,7 @@ USE_NLS = @USE_NLS@
|
|||
VERSION = @VERSION@
|
||||
WARN_FLAGS = @WARN_FLAGS@
|
||||
WERROR = @WERROR@
|
||||
check_msgfmt = @check_msgfmt@
|
||||
enable_shared = @enable_shared@
|
||||
enable_static = @enable_static@
|
||||
glibcpp_CXX = @glibcpp_CXX@
|
||||
|
|
Loading…
Add table
Reference in a new issue