Skip to content

R
riscv-gcc-1
Commit 501e321e by Benjamin Kosnik Committed by Benjamin Kosnik
Options

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
parent efe44c60
Showing with 39 additions and 18 deletions
libstdc++-v3/ChangeLog
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> 2002-04-01 Phil Edwards <pme@gcc.gnu.org>
* libsupc++/exception (__verbose_terminate_handler): Point to docs. * libsupc++/exception (__verbose_terminate_handler): Point to docs.
......
libstdc++-v3/Makefile.in
...@@ -132,6 +132,7 @@ USE_NLS = @USE_NLS@ ...@@ -132,6 +132,7 @@ USE_NLS = @USE_NLS@
VERSION = @VERSION@ VERSION = @VERSION@
WARN_FLAGS = @WARN_FLAGS@ WARN_FLAGS = @WARN_FLAGS@
WERROR = @WERROR@ WERROR = @WERROR@
check_msgfmt = @check_msgfmt@
enable_shared = @enable_shared@ enable_shared = @enable_shared@
enable_static = @enable_static@ enable_static = @enable_static@
glibcpp_CXX = @glibcpp_CXX@ glibcpp_CXX = @glibcpp_CXX@
......
libstdc++-v3/acinclude.m4
...@@ -1145,14 +1145,17 @@ AC_DEFUN(GLIBCPP_ENABLE_CLOCALE, [ ...@@ -1145,14 +1145,17 @@ AC_DEFUN(GLIBCPP_ENABLE_CLOCALE, [
esac esac
fi 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 dnl Set configure bits for specified locale package
case x${enable_clocale_flag} in case x${enable_clocale_flag} in
xgeneric) xgeneric)
AC_MSG_RESULT(generic) AC_MSG_RESULT(generic)
# Don't use gettext.
USE_NLS=no
CLOCALE_H=config/locale/generic/c_locale.h CLOCALE_H=config/locale/generic/c_locale.h
CLOCALE_CC=config/locale/generic/c_locale.cc CLOCALE_CC=config/locale/generic/c_locale.cc
CCODECVT_H=config/locale/generic/codecvt_specializations.h CCODECVT_H=config/locale/generic/codecvt_specializations.h
...@@ -1171,9 +1174,12 @@ AC_DEFUN(GLIBCPP_ENABLE_CLOCALE, [ ...@@ -1171,9 +1174,12 @@ AC_DEFUN(GLIBCPP_ENABLE_CLOCALE, [
# languages. # languages.
# For some reason, ALL_LINGUAS has to be before AM_GNU_GETTEXT # For some reason, ALL_LINGUAS has to be before AM_GNU_GETTEXT
ALL_LINGUAS="de fr" ALL_LINGUAS="de fr"
# Don't call AM_GNU_GETTEXT here. Instead, assume glibc. # Don't call AM_GNU_GETTEXT here. Instead, assume glibc.
# Need to deal with MSGFMT, USE_NLS, and glibcpp_[P,M]OFILES AC_CHECK_PROG(check_msgfmt, msgfmt, yes, no)
USE_NLS=yes if test x"$check_msgfmt" = x"yes" && test x"$enable_nls" = x"yes"; then
USE_NLS=yes
fi
# Export the build objects. # Export the build objects.
for ling in $ALL_LINGUAS; do \ for ling in $ALL_LINGUAS; do \
...@@ -1197,9 +1203,6 @@ AC_DEFUN(GLIBCPP_ENABLE_CLOCALE, [ ...@@ -1197,9 +1203,6 @@ AC_DEFUN(GLIBCPP_ENABLE_CLOCALE, [
xieee_1003.1-2001) xieee_1003.1-2001)
AC_MSG_RESULT(generic) AC_MSG_RESULT(generic)
# Don't use gettext.
USE_NLS=no
CLOCALE_H=config/locale/ieee_1003.1-2001/c_locale.h CLOCALE_H=config/locale/ieee_1003.1-2001/c_locale.h
CLOCALE_CC=config/locale/ieee_1003.1-2001/c_locale.cc CLOCALE_CC=config/locale/ieee_1003.1-2001/c_locale.cc
CCODECVT_H=config/locale/ieee_1003.1-2001/codecvt_specializations.h CCODECVT_H=config/locale/ieee_1003.1-2001/codecvt_specializations.h
......
libstdc++-v3/aclocal.m4
...@@ -1157,14 +1157,17 @@ AC_DEFUN(GLIBCPP_ENABLE_CLOCALE, [ ...@@ -1157,14 +1157,17 @@ AC_DEFUN(GLIBCPP_ENABLE_CLOCALE, [
esac esac
fi 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 dnl Set configure bits for specified locale package
case x${enable_clocale_flag} in case x${enable_clocale_flag} in
xgeneric) xgeneric)
AC_MSG_RESULT(generic) AC_MSG_RESULT(generic)
# Don't use gettext.
USE_NLS=no
CLOCALE_H=config/locale/generic/c_locale.h CLOCALE_H=config/locale/generic/c_locale.h
CLOCALE_CC=config/locale/generic/c_locale.cc CLOCALE_CC=config/locale/generic/c_locale.cc
CCODECVT_H=config/locale/generic/codecvt_specializations.h CCODECVT_H=config/locale/generic/codecvt_specializations.h
...@@ -1183,9 +1186,12 @@ AC_DEFUN(GLIBCPP_ENABLE_CLOCALE, [ ...@@ -1183,9 +1186,12 @@ AC_DEFUN(GLIBCPP_ENABLE_CLOCALE, [
# languages. # languages.
# For some reason, ALL_LINGUAS has to be before AM_GNU_GETTEXT # For some reason, ALL_LINGUAS has to be before AM_GNU_GETTEXT
ALL_LINGUAS="de fr" ALL_LINGUAS="de fr"
# Don't call AM_GNU_GETTEXT here. Instead, assume glibc. # Don't call AM_GNU_GETTEXT here. Instead, assume glibc.
# Need to deal with MSGFMT, USE_NLS, and glibcpp_[P,M]OFILES AC_CHECK_PROG(check_msgfmt, msgfmt, yes, no)
USE_NLS=yes if test x"$check_msgfmt" = x"yes" && test x"$enable_nls" = x"yes"; then
USE_NLS=yes
fi
# Export the build objects. # Export the build objects.
for ling in $ALL_LINGUAS; do \ for ling in $ALL_LINGUAS; do \
...@@ -1209,9 +1215,6 @@ AC_DEFUN(GLIBCPP_ENABLE_CLOCALE, [ ...@@ -1209,9 +1215,6 @@ AC_DEFUN(GLIBCPP_ENABLE_CLOCALE, [
xieee_1003.1-2001) xieee_1003.1-2001)
AC_MSG_RESULT(generic) AC_MSG_RESULT(generic)
# Don't use gettext.
USE_NLS=no
CLOCALE_H=config/locale/ieee_1003.1-2001/c_locale.h CLOCALE_H=config/locale/ieee_1003.1-2001/c_locale.h
CLOCALE_CC=config/locale/ieee_1003.1-2001/c_locale.cc CLOCALE_CC=config/locale/ieee_1003.1-2001/c_locale.cc
CCODECVT_H=config/locale/ieee_1003.1-2001/codecvt_specializations.h CCODECVT_H=config/locale/ieee_1003.1-2001/codecvt_specializations.h
......
libstdc++-v3/configure
This source diff could not be displayed because it is too large. You can view the blob instead.
libstdc++-v3/include/Makefile.in
...@@ -131,6 +131,7 @@ USE_NLS = @USE_NLS@ ...@@ -131,6 +131,7 @@ USE_NLS = @USE_NLS@
VERSION = @VERSION@ VERSION = @VERSION@
WARN_FLAGS = @WARN_FLAGS@ WARN_FLAGS = @WARN_FLAGS@
WERROR = @WERROR@ WERROR = @WERROR@
check_msgfmt = @check_msgfmt@
enable_shared = @enable_shared@ enable_shared = @enable_shared@
enable_static = @enable_static@ enable_static = @enable_static@
glibcpp_CXX = @glibcpp_CXX@ glibcpp_CXX = @glibcpp_CXX@
......
libstdc++-v3/libio/Makefile.in
...@@ -129,6 +129,7 @@ USE_NLS = @USE_NLS@ ...@@ -129,6 +129,7 @@ USE_NLS = @USE_NLS@
VERSION = @VERSION@ VERSION = @VERSION@
WARN_FLAGS = @WARN_FLAGS@ WARN_FLAGS = @WARN_FLAGS@
WERROR = @WERROR@ WERROR = @WERROR@
check_msgfmt = @check_msgfmt@
enable_shared = @enable_shared@ enable_shared = @enable_shared@
enable_static = @enable_static@ enable_static = @enable_static@
glibcpp_CXX = @glibcpp_CXX@ glibcpp_CXX = @glibcpp_CXX@
......
libstdc++-v3/libmath/Makefile.in
...@@ -131,6 +131,7 @@ USE_NLS = @USE_NLS@ ...@@ -131,6 +131,7 @@ USE_NLS = @USE_NLS@
VERSION = @VERSION@ VERSION = @VERSION@
WARN_FLAGS = @WARN_FLAGS@ WARN_FLAGS = @WARN_FLAGS@
WERROR = @WERROR@ WERROR = @WERROR@
check_msgfmt = @check_msgfmt@
enable_shared = @enable_shared@ enable_shared = @enable_shared@
enable_static = @enable_static@ enable_static = @enable_static@
glibcpp_CXX = @glibcpp_CXX@ glibcpp_CXX = @glibcpp_CXX@
......
libstdc++-v3/libsupc++/Makefile.in
# 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 # This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it, # gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved. # with or without modifications, as long as this notice is preserved.
...@@ -127,6 +127,7 @@ USE_NLS = @USE_NLS@ ...@@ -127,6 +127,7 @@ USE_NLS = @USE_NLS@
VERSION = @VERSION@ VERSION = @VERSION@
WARN_FLAGS = @WARN_FLAGS@ WARN_FLAGS = @WARN_FLAGS@
WERROR = @WERROR@ WERROR = @WERROR@
check_msgfmt = @check_msgfmt@
enable_shared = @enable_shared@ enable_shared = @enable_shared@
enable_static = @enable_static@ enable_static = @enable_static@
glibcpp_CXX = @glibcpp_CXX@ glibcpp_CXX = @glibcpp_CXX@
......
libstdc++-v3/po/Makefile.in
...@@ -130,6 +130,7 @@ USE_NLS = @USE_NLS@ ...@@ -130,6 +130,7 @@ USE_NLS = @USE_NLS@
VERSION = @VERSION@ VERSION = @VERSION@
WARN_FLAGS = @WARN_FLAGS@ WARN_FLAGS = @WARN_FLAGS@
WERROR = @WERROR@ WERROR = @WERROR@
check_msgfmt = @check_msgfmt@
enable_shared = @enable_shared@ enable_shared = @enable_shared@
enable_static = @enable_static@ enable_static = @enable_static@
glibcpp_CXX = @glibcpp_CXX@ glibcpp_CXX = @glibcpp_CXX@
......
libstdc++-v3/src/Makefile.in
...@@ -124,6 +124,7 @@ USE_NLS = @USE_NLS@ ...@@ -124,6 +124,7 @@ USE_NLS = @USE_NLS@
VERSION = @VERSION@ VERSION = @VERSION@
WARN_FLAGS = @WARN_FLAGS@ WARN_FLAGS = @WARN_FLAGS@
WERROR = @WERROR@ WERROR = @WERROR@
check_msgfmt = @check_msgfmt@
enable_shared = @enable_shared@ enable_shared = @enable_shared@
enable_static = @enable_static@ enable_static = @enable_static@
glibcpp_CXX = @glibcpp_CXX@ glibcpp_CXX = @glibcpp_CXX@
......
libstdc++-v3/testsuite/Makefile.in
...@@ -132,6 +132,7 @@ USE_NLS = @USE_NLS@ ...@@ -132,6 +132,7 @@ USE_NLS = @USE_NLS@
VERSION = @VERSION@ VERSION = @VERSION@
WARN_FLAGS = @WARN_FLAGS@ WARN_FLAGS = @WARN_FLAGS@
WERROR = @WERROR@ WERROR = @WERROR@
check_msgfmt = @check_msgfmt@
enable_shared = @enable_shared@ enable_shared = @enable_shared@
enable_static = @enable_static@ enable_static = @enable_static@
glibcpp_CXX = @glibcpp_CXX@ glibcpp_CXX = @glibcpp_CXX@
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment