mirror of git://gcc.gnu.org/git/gcc.git
c_locale_generic.cc: Move to...
2002-03-08 Benjamin Kosnik <bkoz@redhat.com> * c_locale_generic.cc: Move to... * generic/c_locale.cc * c_locale_generic.h: Move to... * generic/c_locale.h * codecvt_specializations_generic.h: Move to... * generic/codecvt_specializations.h * collate_members_generic.cc: Move to... * generic/collate_members.cc * ctype_members_generic.cc: Move to... * generic/ctype_members.cc * messages_members_generic.cc: Move to... * generic/messages_members.cc * messages_members_generic.h: Move to... * generic/messages_members.h * moneypunct_members_generic.cc: Move to... * generic/monetary_members.cc * numpunct_members_generic.cc: Move to... * generic/numeric_members.cc * time_members_generic.cc: Move to... * generic/time_members.cc * c_locale_gnu.cc: Move to... * gnu/c_locale.cc * c_locale_gnu.h: Move to... * gnu/c_locale.h * collate_members_gnu.cc: Move to... * gnu/collate_members.cc * ctype_members_gnu.cc: Move to... * gnu/ctype_members.cc * messages_members_gnu.cc: Move to... * gnu/messages_members.cc * messages_members_gnu.h: Move to... * gnu/messages_members.h * moneypunct_members_gnu.cc: Move to... * gnu/monetary_members.cc * numpunct_members_gnu.cc: Move to... * gnu/numeric_members.cc * time_members_gnu.cc: Move to... * gnu/time_members.cc * c_locale_ieee_1003.1-200x.cc: Move to... * ieee_1003.1-2001/c_locale.cc * c_locale_ieee_1003.1-200x.h: Move to... * ieee_1003.1-2001/c_locale.h * codecvt_specializations_ieee_1003.1-200x.h: Move to... * ieee_1003.1-2001/codecvt_specializations.h * messages_members_ieee_1003.1-200x.cc: Move to... * ieee_1003.1-2001/messages_members.cc * messages_members_ieee_1003.1-200x.h: Move to... * ieee_1003.1-2001/messages_members.h * acinclude.m4 (GLIBCPP_ENABLE_CLOCALE): Make consistent. * aclocal.m4: Regenerate. * configure: Regenerate. * src/Makefile.am (sources): Change to monetary and numeric. * src/Makefile.in: Regenerate. * docs/html/configopts.html: Update to ieee_1003.1-2001. From-SVN: r50472
This commit is contained in:
Benjamin Kosnik
Benjamin Kosnik
parent
44087988dc
commit
1fa4bed7b5
|
|
@ -1,3 +1,61 @@
|
||||||
|
2002-03-08 Benjamin Kosnik <bkoz@redhat.com>
|
||||||
|
|
||||||
|
* c_locale_generic.cc: Move to...
|
||||||
|
* generic/c_locale.cc
|
||||||
|
* c_locale_generic.h: Move to...
|
||||||
|
* generic/c_locale.h
|
||||||
|
* codecvt_specializations_generic.h: Move to...
|
||||||
|
* generic/codecvt_specializations.h
|
||||||
|
* collate_members_generic.cc: Move to...
|
||||||
|
* generic/collate_members.cc
|
||||||
|
* ctype_members_generic.cc: Move to...
|
||||||
|
* generic/ctype_members.cc
|
||||||
|
* messages_members_generic.cc: Move to...
|
||||||
|
* generic/messages_members.cc
|
||||||
|
* messages_members_generic.h: Move to...
|
||||||
|
* generic/messages_members.h
|
||||||
|
* moneypunct_members_generic.cc: Move to...
|
||||||
|
* generic/monetary_members.cc
|
||||||
|
* numpunct_members_generic.cc: Move to...
|
||||||
|
* generic/numeric_members.cc
|
||||||
|
* time_members_generic.cc: Move to...
|
||||||
|
* generic/time_members.cc
|
||||||
|
* c_locale_gnu.cc: Move to...
|
||||||
|
* gnu/c_locale.cc
|
||||||
|
* c_locale_gnu.h: Move to...
|
||||||
|
* gnu/c_locale.h
|
||||||
|
* collate_members_gnu.cc: Move to...
|
||||||
|
* gnu/collate_members.cc
|
||||||
|
* ctype_members_gnu.cc: Move to...
|
||||||
|
* gnu/ctype_members.cc
|
||||||
|
* messages_members_gnu.cc: Move to...
|
||||||
|
* gnu/messages_members.cc
|
||||||
|
* messages_members_gnu.h: Move to...
|
||||||
|
* gnu/messages_members.h
|
||||||
|
* moneypunct_members_gnu.cc: Move to...
|
||||||
|
* gnu/monetary_members.cc
|
||||||
|
* numpunct_members_gnu.cc: Move to...
|
||||||
|
* gnu/numeric_members.cc
|
||||||
|
* time_members_gnu.cc: Move to...
|
||||||
|
* gnu/time_members.cc
|
||||||
|
* c_locale_ieee_1003.1-200x.cc: Move to...
|
||||||
|
* ieee_1003.1-2001/c_locale.cc
|
||||||
|
* c_locale_ieee_1003.1-200x.h: Move to...
|
||||||
|
* ieee_1003.1-2001/c_locale.h
|
||||||
|
* codecvt_specializations_ieee_1003.1-200x.h: Move to...
|
||||||
|
* ieee_1003.1-2001/codecvt_specializations.h
|
||||||
|
* messages_members_ieee_1003.1-200x.cc: Move to...
|
||||||
|
* ieee_1003.1-2001/messages_members.cc
|
||||||
|
* messages_members_ieee_1003.1-200x.h: Move to...
|
||||||
|
* ieee_1003.1-2001/messages_members.h
|
||||||
|
|
||||||
|
* acinclude.m4 (GLIBCPP_ENABLE_CLOCALE): Make consistent.
|
||||||
|
* aclocal.m4: Regenerate.
|
||||||
|
* configure: Regenerate.
|
||||||
|
* src/Makefile.am (sources): Change to monetary and numeric.
|
||||||
|
* src/Makefile.in: Regenerate.
|
||||||
|
* docs/html/configopts.html: Update to ieee_1003.1-2001.
|
||||||
|
|
||||||
2002-03-08 scott snyder <snyder@fnal.gov>
|
2002-03-08 scott snyder <snyder@fnal.gov>
|
||||||
|
|
||||||
libstdc++/5875
|
libstdc++/5875
|
||||||
|
|
|
||||||
|
|
@ -1127,16 +1127,16 @@ AC_DEFUN(GLIBCPP_ENABLE_CLOCALE, [
|
||||||
# Don't use gettext.
|
# Don't use gettext.
|
||||||
USE_NLS=no
|
USE_NLS=no
|
||||||
|
|
||||||
CLOCALE_H=config/locale/c_locale_generic.h
|
CLOCALE_H=config/locale/generic/c_locale.h
|
||||||
CLOCALE_CC=config/locale/c_locale_generic.cc
|
CLOCALE_CC=config/locale/generic/c_locale.cc
|
||||||
CCODECVT_H=config/locale/codecvt_specializations_generic.h
|
CCODECVT_H=config/locale/generic/codecvt_specializations.h
|
||||||
CCOLLATE_CC=config/locale/collate_members_generic.cc
|
CCOLLATE_CC=config/locale/generic/collate_members.cc
|
||||||
CCTYPE_CC=config/locale/ctype_members_generic.cc
|
CCTYPE_CC=config/locale/generic/ctype_members.cc
|
||||||
CMESSAGES_H=config/locale/messages_members_generic.h
|
CMESSAGES_H=config/locale/generic/messages_members.h
|
||||||
CMESSAGES_CC=config/locale/messages_members_generic.cc
|
CMESSAGES_CC=config/locale/generic/messages_members.cc
|
||||||
CMONEY_CC=config/locale/moneypunct_members_generic.cc
|
CMONEY_CC=config/locale/generic/monetary_members.cc
|
||||||
CNUMERIC_CC=config/locale/numpunct_members_generic.cc
|
CNUMERIC_CC=config/locale/generic/numeric_members.cc
|
||||||
CTIME_CC=config/locale/time_members_generic.cc
|
CTIME_CC=config/locale/generic/time_members.cc
|
||||||
;;
|
;;
|
||||||
xgnu)
|
xgnu)
|
||||||
AC_MSG_RESULT(gnu)
|
AC_MSG_RESULT(gnu)
|
||||||
|
|
@ -1157,33 +1157,33 @@ AC_DEFUN(GLIBCPP_ENABLE_CLOCALE, [
|
||||||
AC_SUBST(glibcpp_MOFILES)
|
AC_SUBST(glibcpp_MOFILES)
|
||||||
AC_SUBST(glibcpp_POFILES)
|
AC_SUBST(glibcpp_POFILES)
|
||||||
|
|
||||||
CLOCALE_H=config/locale/c_locale_gnu.h
|
CLOCALE_H=config/locale/gnu/c_locale.h
|
||||||
CLOCALE_CC=config/locale/c_locale_gnu.cc
|
CLOCALE_CC=config/locale/gnu/c_locale.cc
|
||||||
CCODECVT_H=config/locale/codecvt_specializations_ieee_1003.1-200x.h
|
CCODECVT_H=config/locale/ieee_1003.1-2001/codecvt_specializations.h
|
||||||
CCOLLATE_CC=config/locale/collate_members_gnu.cc
|
CCOLLATE_CC=config/locale/gnu/collate_members.cc
|
||||||
CCTYPE_CC=config/locale/ctype_members_gnu.cc
|
CCTYPE_CC=config/locale/gnu/ctype_members.cc
|
||||||
CMESSAGES_H=config/locale/messages_members_gnu.h
|
CMESSAGES_H=config/locale/gnu/messages_members.h
|
||||||
CMESSAGES_CC=config/locale/messages_members_gnu.cc
|
CMESSAGES_CC=config/locale/gnu/messages_members.cc
|
||||||
CMONEY_CC=config/locale/moneypunct_members_gnu.cc
|
CMONEY_CC=config/locale/gnu/monetary_members.cc
|
||||||
CNUMERIC_CC=config/locale/numpunct_members_gnu.cc
|
CNUMERIC_CC=config/locale/gnu/numeric_members.cc
|
||||||
CTIME_CC=config/locale/time_members_gnu.cc
|
CTIME_CC=config/locale/gnu/time_members.cc
|
||||||
;;
|
;;
|
||||||
xieee_1003.1)
|
xieee_1003.1-2001)
|
||||||
AC_MSG_RESULT(generic)
|
AC_MSG_RESULT(generic)
|
||||||
|
|
||||||
# Don't use gettext.
|
# Don't use gettext.
|
||||||
USE_NLS=no
|
USE_NLS=no
|
||||||
|
|
||||||
CLOCALE_H=config/locale/c_locale_ieee_1003.1-200x.h
|
CLOCALE_H=config/locale/ieee_1003.1-2001/c_locale.h
|
||||||
CLOCALE_CC=config/locale/c_locale_ieee_1003.1-200x.cc
|
CLOCALE_CC=config/locale/ieee_1003.1-2001/c_locale.cc
|
||||||
CCODECVT_H=config/locale/codecvt_specializations_ieee_1003.1-200x.h
|
CCODECVT_H=config/locale/ieee_1003.1-2001/codecvt_specializations.h
|
||||||
CCOLLATE_CC=config/locale/collate_members_generic.cc
|
CCOLLATE_CC=config/locale/generic/collate_members.cc
|
||||||
CCTYPE_CC=config/locale/ctype_members_generic.cc
|
CCTYPE_CC=config/locale/generic/ctype_members.cc
|
||||||
CMESSAGES_H=config/locale/messages_members_ieee_1003.1-200x.h
|
CMESSAGES_H=config/locale/ieee_1003.1-2001/messages_members.h
|
||||||
CMESSAGES_CC=config/locale/messages_members_ieee_1003.1-200x.cc
|
CMESSAGES_CC=config/locale/ieee_1003.1-2001/messages_members.cc
|
||||||
CMONEY_CC=config/locale/moneypunct_members_generic.cc
|
CMONEY_CC=config/locale/generic/monetary_members.cc
|
||||||
CNUMERIC_CC=config/locale/numpunct_members_generic.cc
|
CNUMERIC_CC=config/locale/generic/numeric_members.cc
|
||||||
CTIME_CC=config/locale/time_members_generic.cc
|
CTIME_CC=config/locale/generic/time_members.cc
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
echo "$enable_clocale is an unknown locale package" 1>&2
|
echo "$enable_clocale is an unknown locale package" 1>&2
|
||||||
|
|
@ -1204,8 +1204,8 @@ AC_DEFUN(GLIBCPP_ENABLE_CLOCALE, [
|
||||||
AC_LINK_FILES($CCOLLATE_CC, src/collate.cc)
|
AC_LINK_FILES($CCOLLATE_CC, src/collate.cc)
|
||||||
AC_LINK_FILES($CCTYPE_CC, src/ctype.cc)
|
AC_LINK_FILES($CCTYPE_CC, src/ctype.cc)
|
||||||
AC_LINK_FILES($CMESSAGES_CC, src/messages.cc)
|
AC_LINK_FILES($CMESSAGES_CC, src/messages.cc)
|
||||||
AC_LINK_FILES($CMONEY_CC, src/moneypunct.cc)
|
AC_LINK_FILES($CMONEY_CC, src/monetary.cc)
|
||||||
AC_LINK_FILES($CNUMERIC_CC, src/numpunct.cc)
|
AC_LINK_FILES($CNUMERIC_CC, src/numeric.cc)
|
||||||
AC_LINK_FILES($CTIME_CC, src/time.cc)
|
AC_LINK_FILES($CTIME_CC, src/time.cc)
|
||||||
])
|
])
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
dnl aclocal.m4 generated automatically by aclocal 1.4
|
dnl aclocal.m4 generated automatically by aclocal 1.4-p5
|
||||||
|
|
||||||
dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
|
dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
|
||||||
dnl This file is free software; the Free Software Foundation
|
dnl This file is free software; the Free Software Foundation
|
||||||
dnl gives unlimited permission to copy and/or distribute it,
|
dnl gives unlimited permission to copy and/or distribute it,
|
||||||
dnl with or without modifications, as long as this notice is preserved.
|
dnl with or without modifications, as long as this notice is preserved.
|
||||||
|
|
@ -1139,16 +1139,16 @@ AC_DEFUN(GLIBCPP_ENABLE_CLOCALE, [
|
||||||
# Don't use gettext.
|
# Don't use gettext.
|
||||||
USE_NLS=no
|
USE_NLS=no
|
||||||
|
|
||||||
CLOCALE_H=config/locale/c_locale_generic.h
|
CLOCALE_H=config/locale/generic/c_locale.h
|
||||||
CLOCALE_CC=config/locale/c_locale_generic.cc
|
CLOCALE_CC=config/locale/generic/c_locale.cc
|
||||||
CCODECVT_H=config/locale/codecvt_specializations_generic.h
|
CCODECVT_H=config/locale/generic/codecvt_specializations.h
|
||||||
CCOLLATE_CC=config/locale/collate_members_generic.cc
|
CCOLLATE_CC=config/locale/generic/collate_members.cc
|
||||||
CCTYPE_CC=config/locale/ctype_members_generic.cc
|
CCTYPE_CC=config/locale/generic/ctype_members.cc
|
||||||
CMESSAGES_H=config/locale/messages_members_generic.h
|
CMESSAGES_H=config/locale/generic/messages_members.h
|
||||||
CMESSAGES_CC=config/locale/messages_members_generic.cc
|
CMESSAGES_CC=config/locale/generic/messages_members.cc
|
||||||
CMONEY_CC=config/locale/moneypunct_members_generic.cc
|
CMONEY_CC=config/locale/generic/monetary_members.cc
|
||||||
CNUMERIC_CC=config/locale/numpunct_members_generic.cc
|
CNUMERIC_CC=config/locale/generic/numeric_members.cc
|
||||||
CTIME_CC=config/locale/time_members_generic.cc
|
CTIME_CC=config/locale/generic/time_members.cc
|
||||||
;;
|
;;
|
||||||
xgnu)
|
xgnu)
|
||||||
AC_MSG_RESULT(gnu)
|
AC_MSG_RESULT(gnu)
|
||||||
|
|
@ -1169,16 +1169,16 @@ AC_DEFUN(GLIBCPP_ENABLE_CLOCALE, [
|
||||||
AC_SUBST(glibcpp_MOFILES)
|
AC_SUBST(glibcpp_MOFILES)
|
||||||
AC_SUBST(glibcpp_POFILES)
|
AC_SUBST(glibcpp_POFILES)
|
||||||
|
|
||||||
CLOCALE_H=config/locale/c_locale_gnu.h
|
CLOCALE_H=config/locale/gnu/c_locale.h
|
||||||
CLOCALE_CC=config/locale/c_locale_gnu.cc
|
CLOCALE_CC=config/locale/gnu/c_locale.cc
|
||||||
CCODECVT_H=config/locale/codecvt_specializations_ieee_1003.1-200x.h
|
CCODECVT_H=config/locale/ieee_1003.1-2001/codecvt_specializations.h
|
||||||
CCOLLATE_CC=config/locale/collate_members_gnu.cc
|
CCOLLATE_CC=config/locale/gnu/collate_members.cc
|
||||||
CCTYPE_CC=config/locale/ctype_members_gnu.cc
|
CCTYPE_CC=config/locale/gnu/ctype_members.cc
|
||||||
CMESSAGES_H=config/locale/messages_members_gnu.h
|
CMESSAGES_H=config/locale/gnu/messages_members.h
|
||||||
CMESSAGES_CC=config/locale/messages_members_gnu.cc
|
CMESSAGES_CC=config/locale/gnu/messages_members.cc
|
||||||
CMONEY_CC=config/locale/moneypunct_members_gnu.cc
|
CMONEY_CC=config/locale/gnu/monetary_members.cc
|
||||||
CNUMERIC_CC=config/locale/numpunct_members_gnu.cc
|
CNUMERIC_CC=config/locale/gnu/numeric_members.cc
|
||||||
CTIME_CC=config/locale/time_members_gnu.cc
|
CTIME_CC=config/locale/gnu/time_members.cc
|
||||||
;;
|
;;
|
||||||
xieee_1003.1)
|
xieee_1003.1)
|
||||||
AC_MSG_RESULT(generic)
|
AC_MSG_RESULT(generic)
|
||||||
|
|
@ -1186,16 +1186,16 @@ AC_DEFUN(GLIBCPP_ENABLE_CLOCALE, [
|
||||||
# Don't use gettext.
|
# Don't use gettext.
|
||||||
USE_NLS=no
|
USE_NLS=no
|
||||||
|
|
||||||
CLOCALE_H=config/locale/c_locale_ieee_1003.1-200x.h
|
CLOCALE_H=config/locale/ieee_1003.1-2001/c_locale.h
|
||||||
CLOCALE_CC=config/locale/c_locale_ieee_1003.1-200x.cc
|
CLOCALE_CC=config/locale/ieee_1003.1-2001/c_locale.cc
|
||||||
CCODECVT_H=config/locale/codecvt_specializations_ieee_1003.1-200x.h
|
CCODECVT_H=config/locale/ieee_1003.1-2001/codecvt_specializations.h
|
||||||
CCOLLATE_CC=config/locale/collate_members_generic.cc
|
CCOLLATE_CC=config/locale/generic/collate_members.cc
|
||||||
CCTYPE_CC=config/locale/ctype_members_generic.cc
|
CCTYPE_CC=config/locale/generic/ctype_members.cc
|
||||||
CMESSAGES_H=config/locale/messages_members_ieee_1003.1-200x.h
|
CMESSAGES_H=config/locale/ieee_1003.1-2001/messages_members.h
|
||||||
CMESSAGES_CC=config/locale/messages_members_ieee_1003.1-200x.cc
|
CMESSAGES_CC=config/locale/ieee_1003.1-2001/messages_members.cc
|
||||||
CMONEY_CC=config/locale/moneypunct_members_generic.cc
|
CMONEY_CC=config/locale/generic/monetary_members.cc
|
||||||
CNUMERIC_CC=config/locale/numpunct_members_generic.cc
|
CNUMERIC_CC=config/locale/generic/numeric_members.cc
|
||||||
CTIME_CC=config/locale/time_members_generic.cc
|
CTIME_CC=config/locale/generic/time_members.cc
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
echo "$enable_clocale is an unknown locale package" 1>&2
|
echo "$enable_clocale is an unknown locale package" 1>&2
|
||||||
|
|
@ -1216,8 +1216,8 @@ AC_DEFUN(GLIBCPP_ENABLE_CLOCALE, [
|
||||||
AC_LINK_FILES($CCOLLATE_CC, src/collate.cc)
|
AC_LINK_FILES($CCOLLATE_CC, src/collate.cc)
|
||||||
AC_LINK_FILES($CCTYPE_CC, src/ctype.cc)
|
AC_LINK_FILES($CCTYPE_CC, src/ctype.cc)
|
||||||
AC_LINK_FILES($CMESSAGES_CC, src/messages.cc)
|
AC_LINK_FILES($CMESSAGES_CC, src/messages.cc)
|
||||||
AC_LINK_FILES($CMONEY_CC, src/moneypunct.cc)
|
AC_LINK_FILES($CMONEY_CC, src/monetary.cc)
|
||||||
AC_LINK_FILES($CNUMERIC_CC, src/numpunct.cc)
|
AC_LINK_FILES($CNUMERIC_CC, src/numeric.cc)
|
||||||
AC_LINK_FILES($CTIME_CC, src/time.cc)
|
AC_LINK_FILES($CTIME_CC, src/time.cc)
|
||||||
])
|
])
|
||||||
|
|
||||||
|
|
@ -2139,12 +2139,30 @@ AC_MSG_RESULT($enable_symvers)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
#serial 1
|
||||||
|
# This test replaces the one in autoconf.
|
||||||
|
# Currently this macro should have the same name as the autoconf macro
|
||||||
|
# because gettext's gettext.m4 (distributed in the automake package)
|
||||||
|
# still uses it. Otherwise, the use in gettext.m4 makes autoheader
|
||||||
|
# give these diagnostics:
|
||||||
|
# configure.in:556: AC_TRY_COMPILE was called before AC_ISC_POSIX
|
||||||
|
# configure.in:556: AC_TRY_RUN was called before AC_ISC_POSIX
|
||||||
|
|
||||||
|
undefine([AC_ISC_POSIX])
|
||||||
|
|
||||||
|
AC_DEFUN([AC_ISC_POSIX],
|
||||||
|
[
|
||||||
|
dnl This test replaces the obsolescent AC_ISC_POSIX kludge.
|
||||||
|
AC_CHECK_LIB(cposix, strerror, [LIBS="$LIBS -lcposix"])
|
||||||
|
]
|
||||||
|
)
|
||||||
|
|
||||||
# Add --enable-maintainer-mode option to configure.
|
# Add --enable-maintainer-mode option to configure.
|
||||||
# From Jim Meyering
|
# From Jim Meyering
|
||||||
|
|
||||||
# serial 1
|
# serial 1
|
||||||
|
|
||||||
AC_DEFUN(AM_MAINTAINER_MODE,
|
AC_DEFUN([AM_MAINTAINER_MODE],
|
||||||
[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
|
[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
|
||||||
dnl maintainer-mode is disabled by default
|
dnl maintainer-mode is disabled by default
|
||||||
AC_ARG_ENABLE(maintainer-mode,
|
AC_ARG_ENABLE(maintainer-mode,
|
||||||
|
|
@ -2161,7 +2179,7 @@ AC_DEFUN(AM_MAINTAINER_MODE,
|
||||||
|
|
||||||
# Define a conditional.
|
# Define a conditional.
|
||||||
|
|
||||||
AC_DEFUN(AM_CONDITIONAL,
|
AC_DEFUN([AM_CONDITIONAL],
|
||||||
[AC_SUBST($1_TRUE)
|
[AC_SUBST($1_TRUE)
|
||||||
AC_SUBST($1_FALSE)
|
AC_SUBST($1_FALSE)
|
||||||
if $2; then
|
if $2; then
|
||||||
|
|
@ -2175,14 +2193,42 @@ fi])
|
||||||
# Macro to add for using GNU gettext.
|
# Macro to add for using GNU gettext.
|
||||||
# Ulrich Drepper <drepper@cygnus.com>, 1995.
|
# Ulrich Drepper <drepper@cygnus.com>, 1995.
|
||||||
#
|
#
|
||||||
# This file file be copied and used freely without restrictions. It can
|
# This file can be copied and used freely without restrictions. It can
|
||||||
# be used in projects which are not available under the GNU Public License
|
# be used in projects which are not available under the GNU Public License
|
||||||
# but which still want to provide support for the GNU gettext functionality.
|
# but which still want to provide support for the GNU gettext functionality.
|
||||||
# Please note that the actual code is *not* freely available.
|
# Please note that the actual code is *not* freely available.
|
||||||
|
|
||||||
# serial 3
|
# serial 9
|
||||||
|
|
||||||
AC_DEFUN(AM_WITH_NLS,
|
dnl Usage: AM_WITH_NLS([TOOLSYMBOL], [NEEDSYMBOL], [LIBDIR]).
|
||||||
|
dnl If TOOLSYMBOL is specified and is 'use-libtool', then a libtool library
|
||||||
|
dnl $(top_builddir)/intl/libintl.la will be created (shared and/or static,
|
||||||
|
dnl depending on --{enable,disable}-{shared,static} and on the presence of
|
||||||
|
dnl AM-DISABLE-SHARED). Otherwise, a static library
|
||||||
|
dnl $(top_builddir)/intl/libintl.a will be created.
|
||||||
|
dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext
|
||||||
|
dnl implementations (in libc or libintl) without the ngettext() function
|
||||||
|
dnl will be ignored.
|
||||||
|
dnl LIBDIR is used to find the intl libraries. If empty,
|
||||||
|
dnl the value `$(top_builddir)/intl/' is used.
|
||||||
|
dnl
|
||||||
|
dnl The result of the configuration is one of three cases:
|
||||||
|
dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled
|
||||||
|
dnl and used.
|
||||||
|
dnl Catalog format: GNU --> install in $(datadir)
|
||||||
|
dnl Catalog extension: .mo after installation, .gmo in source tree
|
||||||
|
dnl 2) GNU gettext has been found in the system's C library.
|
||||||
|
dnl Catalog format: GNU --> install in $(datadir)
|
||||||
|
dnl Catalog extension: .mo after installation, .gmo in source tree
|
||||||
|
dnl 3) No internationalization, always use English msgid.
|
||||||
|
dnl Catalog format: none
|
||||||
|
dnl Catalog extension: none
|
||||||
|
dnl The use of .gmo is historical (it was needed to avoid overwriting the
|
||||||
|
dnl GNU format catalogs when building on a platform with an X/Open gettext),
|
||||||
|
dnl but we keep it in order not to force irrelevant filename changes on the
|
||||||
|
dnl maintainers.
|
||||||
|
dnl
|
||||||
|
AC_DEFUN([AM_WITH_NLS],
|
||||||
[AC_MSG_CHECKING([whether NLS is requested])
|
[AC_MSG_CHECKING([whether NLS is requested])
|
||||||
dnl Default is enabled NLS
|
dnl Default is enabled NLS
|
||||||
AC_ARG_ENABLE(nls,
|
AC_ARG_ENABLE(nls,
|
||||||
|
|
@ -2191,11 +2237,15 @@ AC_DEFUN(AM_WITH_NLS,
|
||||||
AC_MSG_RESULT($USE_NLS)
|
AC_MSG_RESULT($USE_NLS)
|
||||||
AC_SUBST(USE_NLS)
|
AC_SUBST(USE_NLS)
|
||||||
|
|
||||||
|
BUILD_INCLUDED_LIBINTL=no
|
||||||
USE_INCLUDED_LIBINTL=no
|
USE_INCLUDED_LIBINTL=no
|
||||||
|
INTLLIBS=
|
||||||
|
|
||||||
dnl If we use NLS figure out what method
|
dnl If we use NLS figure out what method
|
||||||
if test "$USE_NLS" = "yes"; then
|
if test "$USE_NLS" = "yes"; then
|
||||||
AC_DEFINE(ENABLE_NLS)
|
AC_DEFINE(ENABLE_NLS, 1,
|
||||||
|
[Define to 1 if translation of program messages to the user's native language
|
||||||
|
is requested.])
|
||||||
AC_MSG_CHECKING([whether included gettext is requested])
|
AC_MSG_CHECKING([whether included gettext is requested])
|
||||||
AC_ARG_WITH(included-gettext,
|
AC_ARG_WITH(included-gettext,
|
||||||
[ --with-included-gettext use the GNU gettext library included here],
|
[ --with-included-gettext use the GNU gettext library included here],
|
||||||
|
|
@ -2206,85 +2256,74 @@ AC_DEFUN(AM_WITH_NLS,
|
||||||
nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
|
nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
|
||||||
if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
|
if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
|
||||||
dnl User does not insist on using GNU NLS library. Figure out what
|
dnl User does not insist on using GNU NLS library. Figure out what
|
||||||
dnl to use. If gettext or catgets are available (in this order) we
|
dnl to use. If GNU gettext is available we use this. Else we have
|
||||||
dnl use this. Else we have to fall back to GNU NLS library.
|
dnl to fall back to GNU NLS library.
|
||||||
dnl catgets is only used if permitted by option --with-catgets.
|
|
||||||
nls_cv_header_intl=
|
|
||||||
nls_cv_header_libgt=
|
|
||||||
CATOBJEXT=NONE
|
CATOBJEXT=NONE
|
||||||
|
|
||||||
AC_CHECK_HEADER(libintl.h,
|
dnl Add a version number to the cache macros.
|
||||||
[AC_CACHE_CHECK([for gettext in libc], gt_cv_func_gettext_libc,
|
define(gt_cv_func_gnugettext_libc, [gt_cv_func_gnugettext]ifelse([$2], need-ngettext, 2, 1)[_libc])
|
||||||
[AC_TRY_LINK([#include <libintl.h>], [return (int) gettext ("")],
|
define(gt_cv_func_gnugettext_libintl, [gt_cv_func_gnugettext]ifelse([$2], need-ngettext, 2, 1)[_libintl])
|
||||||
gt_cv_func_gettext_libc=yes, gt_cv_func_gettext_libc=no)])
|
|
||||||
|
|
||||||
if test "$gt_cv_func_gettext_libc" != "yes"; then
|
AC_CHECK_HEADER(libintl.h,
|
||||||
AC_CHECK_LIB(intl, bindtextdomain,
|
[AC_CACHE_CHECK([for GNU gettext in libc], gt_cv_func_gnugettext_libc,
|
||||||
[AC_CACHE_CHECK([for gettext in libintl],
|
[AC_TRY_LINK([#include <libintl.h>
|
||||||
gt_cv_func_gettext_libintl,
|
extern int _nl_msg_cat_cntr;],
|
||||||
[AC_TRY_LINK([], [return (int) gettext ("")],
|
[bindtextdomain ("", "");
|
||||||
gt_cv_func_gettext_libintl=yes,
|
return (int) gettext ("")]ifelse([$2], need-ngettext, [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr],
|
||||||
gt_cv_func_gettext_libintl=no)])])
|
gt_cv_func_gnugettext_libc=yes,
|
||||||
|
gt_cv_func_gnugettext_libc=no)])
|
||||||
|
|
||||||
|
if test "$gt_cv_func_gnugettext_libc" != "yes"; then
|
||||||
|
AC_CACHE_CHECK([for GNU gettext in libintl],
|
||||||
|
gt_cv_func_gnugettext_libintl,
|
||||||
|
[gt_save_LIBS="$LIBS"
|
||||||
|
LIBS="$LIBS -lintl $LIBICONV"
|
||||||
|
AC_TRY_LINK([#include <libintl.h>
|
||||||
|
extern int _nl_msg_cat_cntr;],
|
||||||
|
[bindtextdomain ("", "");
|
||||||
|
return (int) gettext ("")]ifelse([$2], need-ngettext, [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr],
|
||||||
|
gt_cv_func_gnugettext_libintl=yes,
|
||||||
|
gt_cv_func_gnugettext_libintl=no)
|
||||||
|
LIBS="$gt_save_LIBS"])
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test "$gt_cv_func_gettext_libc" = "yes" \
|
dnl If an already present or preinstalled GNU gettext() is found,
|
||||||
|| test "$gt_cv_func_gettext_libintl" = "yes"; then
|
dnl use it. But if this macro is used in GNU gettext, and GNU
|
||||||
AC_DEFINE(HAVE_GETTEXT)
|
dnl gettext is already preinstalled in libintl, we update this
|
||||||
AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
|
dnl libintl. (Cf. the install rule in intl/Makefile.in.)
|
||||||
[test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl
|
if test "$gt_cv_func_gnugettext_libc" = "yes" \
|
||||||
if test "$MSGFMT" != "no"; then
|
|| { test "$gt_cv_func_gnugettext_libintl" = "yes" \
|
||||||
AC_CHECK_FUNCS(dcgettext)
|
&& test "$PACKAGE" != gettext; }; then
|
||||||
AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
|
AC_DEFINE(HAVE_GETTEXT, 1,
|
||||||
AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
|
[Define if the GNU gettext() function is already present or preinstalled.])
|
||||||
[test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
|
|
||||||
AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
|
if test "$gt_cv_func_gnugettext_libintl" = "yes"; then
|
||||||
return _nl_msg_cat_cntr],
|
dnl If iconv() is in a separate libiconv library, then anyone
|
||||||
[CATOBJEXT=.gmo
|
dnl linking with libintl{.a,.so} also needs to link with
|
||||||
DATADIRNAME=share],
|
dnl libiconv.
|
||||||
[CATOBJEXT=.mo
|
INTLLIBS="-lintl $LIBICONV"
|
||||||
DATADIRNAME=lib])
|
fi
|
||||||
INSTOBJEXT=.mo
|
|
||||||
fi
|
gt_save_LIBS="$LIBS"
|
||||||
fi
|
LIBS="$LIBS $INTLLIBS"
|
||||||
|
AC_CHECK_FUNCS(dcgettext)
|
||||||
|
LIBS="$gt_save_LIBS"
|
||||||
|
|
||||||
|
AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
|
||||||
|
[test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl
|
||||||
|
if test "$MSGFMT" != "no"; then
|
||||||
|
AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
|
||||||
|
fi
|
||||||
|
|
||||||
|
AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
|
||||||
|
[test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
|
||||||
|
|
||||||
|
CATOBJEXT=.gmo
|
||||||
|
fi
|
||||||
])
|
])
|
||||||
|
|
||||||
if test "$CATOBJEXT" = "NONE"; then
|
if test "$CATOBJEXT" = "NONE"; then
|
||||||
AC_MSG_CHECKING([whether catgets can be used])
|
dnl GNU gettext is not found in the C library.
|
||||||
AC_ARG_WITH(catgets,
|
|
||||||
[ --with-catgets use catgets functions if available],
|
|
||||||
nls_cv_use_catgets=$withval, nls_cv_use_catgets=no)
|
|
||||||
AC_MSG_RESULT($nls_cv_use_catgets)
|
|
||||||
|
|
||||||
if test "$nls_cv_use_catgets" = "yes"; then
|
|
||||||
dnl No gettext in C library. Try catgets next.
|
|
||||||
AC_CHECK_LIB(i, main)
|
|
||||||
AC_CHECK_FUNC(catgets,
|
|
||||||
[AC_DEFINE(HAVE_CATGETS)
|
|
||||||
INTLOBJS="\$(CATOBJS)"
|
|
||||||
AC_PATH_PROG(GENCAT, gencat, no)dnl
|
|
||||||
if test "$GENCAT" != "no"; then
|
|
||||||
AC_PATH_PROG(GMSGFMT, gmsgfmt, no)
|
|
||||||
if test "$GMSGFMT" = "no"; then
|
|
||||||
AM_PATH_PROG_WITH_TEST(GMSGFMT, msgfmt,
|
|
||||||
[test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)
|
|
||||||
fi
|
|
||||||
AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
|
|
||||||
[test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
|
|
||||||
USE_INCLUDED_LIBINTL=yes
|
|
||||||
CATOBJEXT=.cat
|
|
||||||
INSTOBJEXT=.cat
|
|
||||||
DATADIRNAME=lib
|
|
||||||
INTLDEPS='$(top_builddir)/intl/libintl.a'
|
|
||||||
INTLLIBS=$INTLDEPS
|
|
||||||
LIBS=`echo $LIBS | sed -e 's/-lintl//'`
|
|
||||||
nls_cv_header_intl=intl/libintl.h
|
|
||||||
nls_cv_header_libgt=intl/libgettext.h
|
|
||||||
fi])
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test "$CATOBJEXT" = "NONE"; then
|
|
||||||
dnl Neither gettext nor catgets in included in the C library.
|
|
||||||
dnl Fall back on GNU gettext library.
|
dnl Fall back on GNU gettext library.
|
||||||
nls_cv_use_gnu_gettext=yes
|
nls_cv_use_gnu_gettext=yes
|
||||||
fi
|
fi
|
||||||
|
|
@ -2299,15 +2338,11 @@ AC_DEFUN(AM_WITH_NLS,
|
||||||
AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
|
AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
|
||||||
[test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
|
[test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
|
||||||
AC_SUBST(MSGFMT)
|
AC_SUBST(MSGFMT)
|
||||||
|
BUILD_INCLUDED_LIBINTL=yes
|
||||||
USE_INCLUDED_LIBINTL=yes
|
USE_INCLUDED_LIBINTL=yes
|
||||||
CATOBJEXT=.gmo
|
CATOBJEXT=.gmo
|
||||||
INSTOBJEXT=.mo
|
INTLLIBS="ifelse([$3],[],\$(top_builddir)/intl,[$3])/libintl.ifelse([$1], use-libtool, [l], [])a $LIBICONV"
|
||||||
DATADIRNAME=share
|
LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
|
||||||
INTLDEPS='$(top_builddir)/intl/libintl.a'
|
|
||||||
INTLLIBS=$INTLDEPS
|
|
||||||
LIBS=`echo $LIBS | sed -e 's/-lintl//'`
|
|
||||||
nls_cv_header_intl=intl/libintl.h
|
|
||||||
nls_cv_header_libgt=intl/libgettext.h
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
dnl Test whether we really found GNU xgettext.
|
dnl Test whether we really found GNU xgettext.
|
||||||
|
|
@ -2318,24 +2353,78 @@ AC_DEFUN(AM_WITH_NLS,
|
||||||
: ;
|
: ;
|
||||||
else
|
else
|
||||||
AC_MSG_RESULT(
|
AC_MSG_RESULT(
|
||||||
[found xgettext programs is not GNU xgettext; ignore it])
|
[found xgettext program is not GNU xgettext; ignore it])
|
||||||
XGETTEXT=":"
|
XGETTEXT=":"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# We need to process the po/ directory.
|
dnl We need to process the po/ directory.
|
||||||
POSUB=po
|
POSUB=po
|
||||||
else
|
fi
|
||||||
DATADIRNAME=share
|
AC_OUTPUT_COMMANDS(
|
||||||
nls_cv_header_intl=intl/libintl.h
|
[for ac_file in $CONFIG_FILES; do
|
||||||
nls_cv_header_libgt=intl/libgettext.h
|
# Support "outfile[:infile[:infile...]]"
|
||||||
|
case "$ac_file" in
|
||||||
|
*:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
|
||||||
|
esac
|
||||||
|
# PO directories have a Makefile.in generated from Makefile.in.in.
|
||||||
|
case "$ac_file" in */Makefile.in)
|
||||||
|
# Adjust a relative srcdir.
|
||||||
|
ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
|
||||||
|
ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
|
||||||
|
ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
|
||||||
|
case "$ac_given_srcdir" in
|
||||||
|
.) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
|
||||||
|
/*) top_srcdir="$ac_given_srcdir" ;;
|
||||||
|
*) top_srcdir="$ac_dots$ac_given_srcdir" ;;
|
||||||
|
esac
|
||||||
|
if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
|
||||||
|
rm -f "$ac_dir/POTFILES"
|
||||||
|
echo creating "$ac_dir/POTFILES"
|
||||||
|
sed -e "/^#/d" -e "/^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," -e "\$s/\(.*\) \\\\/\1/" < "$ac_given_srcdir/$ac_dir/POTFILES.in" > "$ac_dir/POTFILES"
|
||||||
|
echo creating "$ac_dir/Makefile"
|
||||||
|
sed -e "/POTFILES =/r $ac_dir/POTFILES" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
|
||||||
|
fi
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
done])
|
||||||
|
|
||||||
|
|
||||||
|
dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL
|
||||||
|
dnl to 'yes' because some of the testsuite requires it.
|
||||||
|
if test "$PACKAGE" = gettext; then
|
||||||
|
BUILD_INCLUDED_LIBINTL=yes
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# If this is used in GNU gettext we have to set USE_NLS to `yes'
|
dnl intl/plural.c is generated from intl/plural.y. It requires bison,
|
||||||
# because some of the sources are only built for this goal.
|
dnl because plural.y uses bison specific features. It requires at least
|
||||||
if test "$PACKAGE" = gettext; then
|
dnl bison-1.26 because earlier versions generate a plural.c that doesn't
|
||||||
USE_NLS=yes
|
dnl compile.
|
||||||
USE_INCLUDED_LIBINTL=yes
|
dnl bison is only needed for the maintainer (who touches plural.y). But in
|
||||||
|
dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put
|
||||||
|
dnl the rule in general Makefile. Now, some people carelessly touch the
|
||||||
|
dnl files or have a broken "make" program, hence the plural.c rule will
|
||||||
|
dnl sometimes fire. To avoid an error, defines BISON to ":" if it is not
|
||||||
|
dnl present or too old.
|
||||||
|
AC_CHECK_PROGS([INTLBISON], [bison])
|
||||||
|
if test -z "$INTLBISON"; then
|
||||||
|
ac_verc_fail=yes
|
||||||
|
else
|
||||||
|
dnl Found it, now check the version.
|
||||||
|
AC_MSG_CHECKING([version of bison])
|
||||||
|
changequote(<<,>>)dnl
|
||||||
|
ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison .* \([0-9]*\.[0-9.]*\).*$/\1/p'`
|
||||||
|
case $ac_prog_version in
|
||||||
|
'') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
|
||||||
|
1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*)
|
||||||
|
changequote([,])dnl
|
||||||
|
ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
|
||||||
|
*) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
|
||||||
|
esac
|
||||||
|
AC_MSG_RESULT([$ac_prog_version])
|
||||||
|
fi
|
||||||
|
if test $ac_verc_fail = yes; then
|
||||||
|
INTLBISON=:
|
||||||
fi
|
fi
|
||||||
|
|
||||||
dnl These rules are solely for the distribution goal. While doing this
|
dnl These rules are solely for the distribution goal. While doing this
|
||||||
|
|
@ -2347,22 +2436,38 @@ AC_DEFUN(AM_WITH_NLS,
|
||||||
done
|
done
|
||||||
|
|
||||||
dnl Make all variables we use known to autoconf.
|
dnl Make all variables we use known to autoconf.
|
||||||
|
AC_SUBST(BUILD_INCLUDED_LIBINTL)
|
||||||
AC_SUBST(USE_INCLUDED_LIBINTL)
|
AC_SUBST(USE_INCLUDED_LIBINTL)
|
||||||
AC_SUBST(CATALOGS)
|
AC_SUBST(CATALOGS)
|
||||||
AC_SUBST(CATOBJEXT)
|
AC_SUBST(CATOBJEXT)
|
||||||
AC_SUBST(DATADIRNAME)
|
|
||||||
AC_SUBST(GMOFILES)
|
AC_SUBST(GMOFILES)
|
||||||
AC_SUBST(INSTOBJEXT)
|
|
||||||
AC_SUBST(INTLDEPS)
|
|
||||||
AC_SUBST(INTLLIBS)
|
AC_SUBST(INTLLIBS)
|
||||||
AC_SUBST(INTLOBJS)
|
AC_SUBST(INTLOBJS)
|
||||||
AC_SUBST(POFILES)
|
AC_SUBST(POFILES)
|
||||||
AC_SUBST(POSUB)
|
AC_SUBST(POSUB)
|
||||||
|
|
||||||
|
dnl For backward compatibility. Some configure.ins may be using this.
|
||||||
|
nls_cv_header_intl=
|
||||||
|
nls_cv_header_libgt=
|
||||||
|
|
||||||
|
dnl For backward compatibility. Some Makefiles may be using this.
|
||||||
|
DATADIRNAME=share
|
||||||
|
AC_SUBST(DATADIRNAME)
|
||||||
|
|
||||||
|
dnl For backward compatibility. Some Makefiles may be using this.
|
||||||
|
INSTOBJEXT=.mo
|
||||||
|
AC_SUBST(INSTOBJEXT)
|
||||||
|
|
||||||
|
dnl For backward compatibility. Some Makefiles may be using this.
|
||||||
|
GENCAT=gencat
|
||||||
|
AC_SUBST(GENCAT)
|
||||||
])
|
])
|
||||||
|
|
||||||
AC_DEFUN(AM_GNU_GETTEXT,
|
dnl Usage: Just like AM_WITH_NLS, which see.
|
||||||
|
AC_DEFUN([AM_GNU_GETTEXT],
|
||||||
[AC_REQUIRE([AC_PROG_MAKE_SET])dnl
|
[AC_REQUIRE([AC_PROG_MAKE_SET])dnl
|
||||||
AC_REQUIRE([AC_PROG_CC])dnl
|
AC_REQUIRE([AC_PROG_CC])dnl
|
||||||
|
AC_REQUIRE([AC_CANONICAL_HOST])dnl
|
||||||
AC_REQUIRE([AC_PROG_RANLIB])dnl
|
AC_REQUIRE([AC_PROG_RANLIB])dnl
|
||||||
AC_REQUIRE([AC_ISC_POSIX])dnl
|
AC_REQUIRE([AC_ISC_POSIX])dnl
|
||||||
AC_REQUIRE([AC_HEADER_STDC])dnl
|
AC_REQUIRE([AC_HEADER_STDC])dnl
|
||||||
|
|
@ -2372,21 +2477,18 @@ AC_DEFUN(AM_GNU_GETTEXT,
|
||||||
AC_REQUIRE([AC_TYPE_SIZE_T])dnl
|
AC_REQUIRE([AC_TYPE_SIZE_T])dnl
|
||||||
AC_REQUIRE([AC_FUNC_ALLOCA])dnl
|
AC_REQUIRE([AC_FUNC_ALLOCA])dnl
|
||||||
AC_REQUIRE([AC_FUNC_MMAP])dnl
|
AC_REQUIRE([AC_FUNC_MMAP])dnl
|
||||||
|
AC_REQUIRE([jm_GLIBC21])dnl
|
||||||
|
|
||||||
AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h string.h \
|
AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h stddef.h \
|
||||||
unistd.h values.h sys/param.h])
|
stdlib.h string.h unistd.h sys/param.h])
|
||||||
AC_CHECK_FUNCS([getcwd munmap putenv setenv setlocale strchr strcasecmp \
|
AC_CHECK_FUNCS([feof_unlocked fgets_unlocked getcwd getegid geteuid \
|
||||||
__argz_count __argz_stringify __argz_next])
|
getgid getuid mempcpy munmap putenv setenv setlocale stpcpy strchr strcasecmp \
|
||||||
|
strdup strtoul tsearch __argz_count __argz_stringify __argz_next])
|
||||||
if test "${ac_cv_func_stpcpy+set}" != "set"; then
|
|
||||||
AC_CHECK_FUNCS(stpcpy)
|
|
||||||
fi
|
|
||||||
if test "${ac_cv_func_stpcpy}" = "yes"; then
|
|
||||||
AC_DEFINE(HAVE_STPCPY)
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
AM_ICONV
|
||||||
|
AM_LANGINFO_CODESET
|
||||||
AM_LC_MESSAGES
|
AM_LC_MESSAGES
|
||||||
AM_WITH_NLS
|
AM_WITH_NLS([$1],[$2],[$3])
|
||||||
|
|
||||||
if test "x$CATOBJEXT" != "x"; then
|
if test "x$CATOBJEXT" != "x"; then
|
||||||
if test "x$ALL_LINGUAS" = "x"; then
|
if test "x$ALL_LINGUAS" = "x"; then
|
||||||
|
|
@ -2394,10 +2496,21 @@ __argz_count __argz_stringify __argz_next])
|
||||||
else
|
else
|
||||||
AC_MSG_CHECKING(for catalogs to be installed)
|
AC_MSG_CHECKING(for catalogs to be installed)
|
||||||
NEW_LINGUAS=
|
NEW_LINGUAS=
|
||||||
for lang in ${LINGUAS=$ALL_LINGUAS}; do
|
for presentlang in $ALL_LINGUAS; do
|
||||||
case "$ALL_LINGUAS" in
|
useit=no
|
||||||
*$lang*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;;
|
for desiredlang in ${LINGUAS-$ALL_LINGUAS}; do
|
||||||
esac
|
# Use the presentlang catalog if desiredlang is
|
||||||
|
# a. equal to presentlang, or
|
||||||
|
# b. a variant of presentlang (because in this case,
|
||||||
|
# presentlang can be used as a fallback for messages
|
||||||
|
# which are not translated in the desiredlang catalog).
|
||||||
|
case "$desiredlang" in
|
||||||
|
"$presentlang"*) useit=yes;;
|
||||||
|
esac
|
||||||
|
done
|
||||||
|
if test $useit = yes; then
|
||||||
|
NEW_LINGUAS="$NEW_LINGUAS $presentlang"
|
||||||
|
fi
|
||||||
done
|
done
|
||||||
LINGUAS=$NEW_LINGUAS
|
LINGUAS=$NEW_LINGUAS
|
||||||
AC_MSG_RESULT($LINGUAS)
|
AC_MSG_RESULT($LINGUAS)
|
||||||
|
|
@ -2409,47 +2522,8 @@ __argz_count __argz_stringify __argz_next])
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
dnl The reference to <locale.h> in the installed <libintl.h> file
|
|
||||||
dnl must be resolved because we cannot expect the users of this
|
|
||||||
dnl to define HAVE_LOCALE_H.
|
|
||||||
if test $ac_cv_header_locale_h = yes; then
|
|
||||||
INCLUDE_LOCALE_H="#include <locale.h>"
|
|
||||||
else
|
|
||||||
INCLUDE_LOCALE_H="\
|
|
||||||
/* The system does not provide the header <locale.h>. Take care yourself. */"
|
|
||||||
fi
|
|
||||||
AC_SUBST(INCLUDE_LOCALE_H)
|
|
||||||
|
|
||||||
dnl Determine which catalog format we have (if any is needed)
|
|
||||||
dnl For now we know about two different formats:
|
|
||||||
dnl Linux libc-5 and the normal X/Open format
|
|
||||||
test -d intl || mkdir intl
|
|
||||||
if test "$CATOBJEXT" = ".cat"; then
|
|
||||||
AC_CHECK_HEADER(linux/version.h, msgformat=linux, msgformat=xopen)
|
|
||||||
|
|
||||||
dnl Transform the SED scripts while copying because some dumb SEDs
|
|
||||||
dnl cannot handle comments.
|
|
||||||
sed -e '/^#/d' $srcdir/intl/$msgformat-msg.sed > intl/po2msg.sed
|
|
||||||
fi
|
|
||||||
dnl po2tbl.sed is always needed.
|
|
||||||
sed -e '/^#.*[^\\]$/d' -e '/^#$/d' \
|
|
||||||
$srcdir/intl/po2tbl.sed.in > intl/po2tbl.sed
|
|
||||||
|
|
||||||
dnl In the intl/Makefile.in we have a special dependency which makes
|
|
||||||
dnl only sense for gettext. We comment this out for non-gettext
|
|
||||||
dnl packages.
|
|
||||||
if test "$PACKAGE" = "gettext"; then
|
|
||||||
GT_NO="#NO#"
|
|
||||||
GT_YES=
|
|
||||||
else
|
|
||||||
GT_NO=
|
|
||||||
GT_YES="#YES#"
|
|
||||||
fi
|
|
||||||
AC_SUBST(GT_NO)
|
|
||||||
AC_SUBST(GT_YES)
|
|
||||||
|
|
||||||
dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
|
dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
|
||||||
dnl find the mkinstalldirs script in another subdir but ($top_srcdir).
|
dnl find the mkinstalldirs script in another subdir but $(top_srcdir).
|
||||||
dnl Try to locate is.
|
dnl Try to locate is.
|
||||||
MKINSTALLDIRS=
|
MKINSTALLDIRS=
|
||||||
if test -n "$ac_aux_dir"; then
|
if test -n "$ac_aux_dir"; then
|
||||||
|
|
@ -2460,31 +2534,15 @@ __argz_count __argz_stringify __argz_next])
|
||||||
fi
|
fi
|
||||||
AC_SUBST(MKINSTALLDIRS)
|
AC_SUBST(MKINSTALLDIRS)
|
||||||
|
|
||||||
dnl *** For now the libtool support in intl/Makefile is not for real.
|
dnl Enable libtool support if the surrounding package wishes it.
|
||||||
l=
|
INTL_LIBTOOL_SUFFIX_PREFIX=ifelse([$1], use-libtool, [l], [])
|
||||||
AC_SUBST(l)
|
AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX)
|
||||||
|
|
||||||
dnl Generate list of files to be processed by xgettext which will
|
|
||||||
dnl be included in po/Makefile.
|
|
||||||
test -d po || mkdir po
|
|
||||||
if test "x$srcdir" != "x."; then
|
|
||||||
if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
|
|
||||||
posrcprefix="$srcdir/"
|
|
||||||
else
|
|
||||||
posrcprefix="../$srcdir/"
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
posrcprefix="../"
|
|
||||||
fi
|
|
||||||
rm -f po/POTFILES
|
|
||||||
sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
|
|
||||||
< $srcdir/po/POTFILES.in > po/POTFILES
|
|
||||||
])
|
])
|
||||||
|
|
||||||
# Search path for a program which passes the given test.
|
# Search path for a program which passes the given test.
|
||||||
# Ulrich Drepper <drepper@cygnus.com>, 1996.
|
# Ulrich Drepper <drepper@cygnus.com>, 1996.
|
||||||
#
|
#
|
||||||
# This file file be copied and used freely without restrictions. It can
|
# This file can be copied and used freely without restrictions. It can
|
||||||
# be used in projects which are not available under the GNU Public License
|
# be used in projects which are not available under the GNU Public License
|
||||||
# but which still want to provide support for the GNU gettext functionality.
|
# but which still want to provide support for the GNU gettext functionality.
|
||||||
# Please note that the actual code is *not* freely available.
|
# Please note that the actual code is *not* freely available.
|
||||||
|
|
@ -2493,7 +2551,7 @@ __argz_count __argz_stringify __argz_next])
|
||||||
|
|
||||||
dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
|
dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
|
||||||
dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
|
dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
|
||||||
AC_DEFUN(AM_PATH_PROG_WITH_TEST,
|
AC_DEFUN([AM_PATH_PROG_WITH_TEST],
|
||||||
[# Extract the first word of "$2", so it can be a program name with args.
|
[# Extract the first word of "$2", so it can be a program name with args.
|
||||||
set dummy $2; ac_word=[$]2
|
set dummy $2; ac_word=[$]2
|
||||||
AC_MSG_CHECKING([for $ac_word])
|
AC_MSG_CHECKING([for $ac_word])
|
||||||
|
|
@ -2529,24 +2587,139 @@ fi
|
||||||
AC_SUBST($1)dnl
|
AC_SUBST($1)dnl
|
||||||
])
|
])
|
||||||
|
|
||||||
|
#serial 2
|
||||||
|
|
||||||
|
# Test for the GNU C Library, version 2.1 or newer.
|
||||||
|
# From Bruno Haible.
|
||||||
|
|
||||||
|
AC_DEFUN([jm_GLIBC21],
|
||||||
|
[
|
||||||
|
AC_CACHE_CHECK(whether we are using the GNU C Library 2.1 or newer,
|
||||||
|
ac_cv_gnu_library_2_1,
|
||||||
|
[AC_EGREP_CPP([Lucky GNU user],
|
||||||
|
[
|
||||||
|
#include <features.h>
|
||||||
|
#ifdef __GNU_LIBRARY__
|
||||||
|
#if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2)
|
||||||
|
Lucky GNU user
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
],
|
||||||
|
ac_cv_gnu_library_2_1=yes,
|
||||||
|
ac_cv_gnu_library_2_1=no)
|
||||||
|
]
|
||||||
|
)
|
||||||
|
AC_SUBST(GLIBC21)
|
||||||
|
GLIBC21="$ac_cv_gnu_library_2_1"
|
||||||
|
]
|
||||||
|
)
|
||||||
|
|
||||||
|
#serial AM2
|
||||||
|
|
||||||
|
dnl From Bruno Haible.
|
||||||
|
|
||||||
|
AC_DEFUN([AM_ICONV],
|
||||||
|
[
|
||||||
|
dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
|
||||||
|
dnl those with the standalone portable GNU libiconv installed).
|
||||||
|
|
||||||
|
AC_ARG_WITH([libiconv-prefix],
|
||||||
|
[ --with-libiconv-prefix=DIR search for libiconv in DIR/include and DIR/lib], [
|
||||||
|
for dir in `echo "$withval" | tr : ' '`; do
|
||||||
|
if test -d $dir/include; then CPPFLAGS="$CPPFLAGS -I$dir/include"; fi
|
||||||
|
if test -d $dir/lib; then LDFLAGS="$LDFLAGS -L$dir/lib"; fi
|
||||||
|
done
|
||||||
|
])
|
||||||
|
|
||||||
|
AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [
|
||||||
|
am_cv_func_iconv="no, consider installing GNU libiconv"
|
||||||
|
am_cv_lib_iconv=no
|
||||||
|
AC_TRY_LINK([#include <stdlib.h>
|
||||||
|
#include <iconv.h>],
|
||||||
|
[iconv_t cd = iconv_open("","");
|
||||||
|
iconv(cd,NULL,NULL,NULL,NULL);
|
||||||
|
iconv_close(cd);],
|
||||||
|
am_cv_func_iconv=yes)
|
||||||
|
if test "$am_cv_func_iconv" != yes; then
|
||||||
|
am_save_LIBS="$LIBS"
|
||||||
|
LIBS="$LIBS -liconv"
|
||||||
|
AC_TRY_LINK([#include <stdlib.h>
|
||||||
|
#include <iconv.h>],
|
||||||
|
[iconv_t cd = iconv_open("","");
|
||||||
|
iconv(cd,NULL,NULL,NULL,NULL);
|
||||||
|
iconv_close(cd);],
|
||||||
|
am_cv_lib_iconv=yes
|
||||||
|
am_cv_func_iconv=yes)
|
||||||
|
LIBS="$am_save_LIBS"
|
||||||
|
fi
|
||||||
|
])
|
||||||
|
if test "$am_cv_func_iconv" = yes; then
|
||||||
|
AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.])
|
||||||
|
AC_MSG_CHECKING([for iconv declaration])
|
||||||
|
AC_CACHE_VAL(am_cv_proto_iconv, [
|
||||||
|
AC_TRY_COMPILE([
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <iconv.h>
|
||||||
|
extern
|
||||||
|
#ifdef __cplusplus
|
||||||
|
"C"
|
||||||
|
#endif
|
||||||
|
#if defined(__STDC__) || defined(__cplusplus)
|
||||||
|
size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
|
||||||
|
#else
|
||||||
|
size_t iconv();
|
||||||
|
#endif
|
||||||
|
], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const")
|
||||||
|
am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"])
|
||||||
|
am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
|
||||||
|
AC_MSG_RESULT([$]{ac_t:-
|
||||||
|
}[$]am_cv_proto_iconv)
|
||||||
|
AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1,
|
||||||
|
[Define as const if the declaration of iconv() needs const.])
|
||||||
|
fi
|
||||||
|
LIBICONV=
|
||||||
|
if test "$am_cv_lib_iconv" = yes; then
|
||||||
|
LIBICONV="-liconv"
|
||||||
|
fi
|
||||||
|
AC_SUBST(LIBICONV)
|
||||||
|
])
|
||||||
|
|
||||||
|
#serial AM1
|
||||||
|
|
||||||
|
dnl From Bruno Haible.
|
||||||
|
|
||||||
|
AC_DEFUN([AM_LANGINFO_CODESET],
|
||||||
|
[
|
||||||
|
AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset,
|
||||||
|
[AC_TRY_LINK([#include <langinfo.h>],
|
||||||
|
[char* cs = nl_langinfo(CODESET);],
|
||||||
|
am_cv_langinfo_codeset=yes,
|
||||||
|
am_cv_langinfo_codeset=no)
|
||||||
|
])
|
||||||
|
if test $am_cv_langinfo_codeset = yes; then
|
||||||
|
AC_DEFINE(HAVE_LANGINFO_CODESET, 1,
|
||||||
|
[Define if you have <langinfo.h> and nl_langinfo(CODESET).])
|
||||||
|
fi
|
||||||
|
])
|
||||||
|
|
||||||
# Check whether LC_MESSAGES is available in <locale.h>.
|
# Check whether LC_MESSAGES is available in <locale.h>.
|
||||||
# Ulrich Drepper <drepper@cygnus.com>, 1995.
|
# Ulrich Drepper <drepper@cygnus.com>, 1995.
|
||||||
#
|
#
|
||||||
# This file file be copied and used freely without restrictions. It can
|
# This file can be copied and used freely without restrictions. It can
|
||||||
# be used in projects which are not available under the GNU Public License
|
# be used in projects which are not available under the GNU Public License
|
||||||
# but which still want to provide support for the GNU gettext functionality.
|
# but which still want to provide support for the GNU gettext functionality.
|
||||||
# Please note that the actual code is *not* freely available.
|
# Please note that the actual code is *not* freely available.
|
||||||
|
|
||||||
# serial 1
|
# serial 2
|
||||||
|
|
||||||
AC_DEFUN(AM_LC_MESSAGES,
|
AC_DEFUN([AM_LC_MESSAGES],
|
||||||
[if test $ac_cv_header_locale_h = yes; then
|
[if test $ac_cv_header_locale_h = yes; then
|
||||||
AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
|
AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
|
||||||
[AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
|
[AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
|
||||||
am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
|
am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
|
||||||
if test $am_cv_val_LC_MESSAGES = yes; then
|
if test $am_cv_val_LC_MESSAGES = yes; then
|
||||||
AC_DEFINE(HAVE_LC_MESSAGES, 1,
|
AC_DEFINE(HAVE_LC_MESSAGES, 1,
|
||||||
[Define if your locale.h file contains LC_MESSAGES.])
|
[Define if your <locale.h> file defines LC_MESSAGES.])
|
||||||
fi
|
fi
|
||||||
fi])
|
fi])
|
||||||
|
|
||||||
|
|
@ -2559,7 +2732,7 @@ AC_DEFUN(AM_LC_MESSAGES,
|
||||||
dnl Usage:
|
dnl Usage:
|
||||||
dnl AM_INIT_AUTOMAKE(package,version, [no-define])
|
dnl AM_INIT_AUTOMAKE(package,version, [no-define])
|
||||||
|
|
||||||
AC_DEFUN(AM_INIT_AUTOMAKE,
|
AC_DEFUN([AM_INIT_AUTOMAKE],
|
||||||
[AC_REQUIRE([AC_PROG_INSTALL])
|
[AC_REQUIRE([AC_PROG_INSTALL])
|
||||||
PACKAGE=[$1]
|
PACKAGE=[$1]
|
||||||
AC_SUBST(PACKAGE)
|
AC_SUBST(PACKAGE)
|
||||||
|
|
@ -2587,7 +2760,7 @@ AC_REQUIRE([AC_PROG_MAKE_SET])])
|
||||||
# Check to make sure that the build environment is sane.
|
# Check to make sure that the build environment is sane.
|
||||||
#
|
#
|
||||||
|
|
||||||
AC_DEFUN(AM_SANITY_CHECK,
|
AC_DEFUN([AM_SANITY_CHECK],
|
||||||
[AC_MSG_CHECKING([whether build environment is sane])
|
[AC_MSG_CHECKING([whether build environment is sane])
|
||||||
# Just in case
|
# Just in case
|
||||||
sleep 1
|
sleep 1
|
||||||
|
|
@ -2628,7 +2801,7 @@ AC_MSG_RESULT(yes)])
|
||||||
|
|
||||||
dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
|
dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
|
||||||
dnl The program must properly implement --version.
|
dnl The program must properly implement --version.
|
||||||
AC_DEFUN(AM_MISSING_PROG,
|
AC_DEFUN([AM_MISSING_PROG],
|
||||||
[AC_MSG_CHECKING(for working $2)
|
[AC_MSG_CHECKING(for working $2)
|
||||||
# Run test in a subshell; some versions of sh will print an error if
|
# Run test in a subshell; some versions of sh will print an error if
|
||||||
# an executable is not found, even if stderr is redirected.
|
# an executable is not found, even if stderr is redirected.
|
||||||
|
|
@ -2644,7 +2817,7 @@ AC_SUBST($1)])
|
||||||
|
|
||||||
# Like AC_CONFIG_HEADER, but automatically create stamp file.
|
# Like AC_CONFIG_HEADER, but automatically create stamp file.
|
||||||
|
|
||||||
AC_DEFUN(AM_CONFIG_HEADER,
|
AC_DEFUN([AM_CONFIG_HEADER],
|
||||||
[AC_PREREQ([2.12])
|
[AC_PREREQ([2.12])
|
||||||
AC_CONFIG_HEADER([$1])
|
AC_CONFIG_HEADER([$1])
|
||||||
dnl When config.status generates a header, we must update the stamp-h file.
|
dnl When config.status generates a header, we must update the stamp-h file.
|
||||||
|
|
|
||||||
|
|
@ -77,10 +77,3 @@
|
||||||
void
|
void
|
||||||
messages<_CharT>::do_close(catalog) const
|
messages<_CharT>::do_close(catalog) const
|
||||||
{ }
|
{ }
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -3076,16 +3076,16 @@ fi
|
||||||
# Don't use gettext.
|
# Don't use gettext.
|
||||||
USE_NLS=no
|
USE_NLS=no
|
||||||
|
|
||||||
CLOCALE_H=config/locale/c_locale_generic.h
|
CLOCALE_H=config/locale/generic/c_locale.h
|
||||||
CLOCALE_CC=config/locale/c_locale_generic.cc
|
CLOCALE_CC=config/locale/generic/c_locale.cc
|
||||||
CCODECVT_H=config/locale/codecvt_specializations_generic.h
|
CCODECVT_H=config/locale/generic/codecvt_specializations.h
|
||||||
CCOLLATE_CC=config/locale/collate_members_generic.cc
|
CCOLLATE_CC=config/locale/generic/collate_members.cc
|
||||||
CCTYPE_CC=config/locale/ctype_members_generic.cc
|
CCTYPE_CC=config/locale/generic/ctype_members.cc
|
||||||
CMESSAGES_H=config/locale/messages_members_generic.h
|
CMESSAGES_H=config/locale/generic/messages_members.h
|
||||||
CMESSAGES_CC=config/locale/messages_members_generic.cc
|
CMESSAGES_CC=config/locale/generic/messages_members.cc
|
||||||
CMONEY_CC=config/locale/moneypunct_members_generic.cc
|
CMONEY_CC=config/locale/generic/monetary_members.cc
|
||||||
CNUMERIC_CC=config/locale/numpunct_members_generic.cc
|
CNUMERIC_CC=config/locale/generic/numeric_members.cc
|
||||||
CTIME_CC=config/locale/time_members_generic.cc
|
CTIME_CC=config/locale/generic/time_members.cc
|
||||||
;;
|
;;
|
||||||
xgnu)
|
xgnu)
|
||||||
echo "$ac_t""gnu" 1>&6
|
echo "$ac_t""gnu" 1>&6
|
||||||
|
|
@ -3106,16 +3106,16 @@ fi
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
CLOCALE_H=config/locale/c_locale_gnu.h
|
CLOCALE_H=config/locale/gnu/c_locale.h
|
||||||
CLOCALE_CC=config/locale/c_locale_gnu.cc
|
CLOCALE_CC=config/locale/gnu/c_locale.cc
|
||||||
CCODECVT_H=config/locale/codecvt_specializations_ieee_1003.1-200x.h
|
CCODECVT_H=config/locale/ieee_1003.1-2001/codecvt_specializations.h
|
||||||
CCOLLATE_CC=config/locale/collate_members_gnu.cc
|
CCOLLATE_CC=config/locale/gnu/collate_members.cc
|
||||||
CCTYPE_CC=config/locale/ctype_members_gnu.cc
|
CCTYPE_CC=config/locale/gnu/ctype_members.cc
|
||||||
CMESSAGES_H=config/locale/messages_members_gnu.h
|
CMESSAGES_H=config/locale/gnu/messages_members.h
|
||||||
CMESSAGES_CC=config/locale/messages_members_gnu.cc
|
CMESSAGES_CC=config/locale/gnu/messages_members.cc
|
||||||
CMONEY_CC=config/locale/moneypunct_members_gnu.cc
|
CMONEY_CC=config/locale/gnu/monetary_members.cc
|
||||||
CNUMERIC_CC=config/locale/numpunct_members_gnu.cc
|
CNUMERIC_CC=config/locale/gnu/numeric_members.cc
|
||||||
CTIME_CC=config/locale/time_members_gnu.cc
|
CTIME_CC=config/locale/gnu/time_members.cc
|
||||||
;;
|
;;
|
||||||
xieee_1003.1)
|
xieee_1003.1)
|
||||||
echo "$ac_t""generic" 1>&6
|
echo "$ac_t""generic" 1>&6
|
||||||
|
|
@ -3123,16 +3123,16 @@ fi
|
||||||
# Don't use gettext.
|
# Don't use gettext.
|
||||||
USE_NLS=no
|
USE_NLS=no
|
||||||
|
|
||||||
CLOCALE_H=config/locale/c_locale_ieee_1003.1-200x.h
|
CLOCALE_H=config/locale/ieee_1003.1-2001/c_locale.h
|
||||||
CLOCALE_CC=config/locale/c_locale_ieee_1003.1-200x.cc
|
CLOCALE_CC=config/locale/ieee_1003.1-2001/c_locale.cc
|
||||||
CCODECVT_H=config/locale/codecvt_specializations_ieee_1003.1-200x.h
|
CCODECVT_H=config/locale/ieee_1003.1-2001/codecvt_specializations.h
|
||||||
CCOLLATE_CC=config/locale/collate_members_generic.cc
|
CCOLLATE_CC=config/locale/generic/collate_members.cc
|
||||||
CCTYPE_CC=config/locale/ctype_members_generic.cc
|
CCTYPE_CC=config/locale/generic/ctype_members.cc
|
||||||
CMESSAGES_H=config/locale/messages_members_ieee_1003.1-200x.h
|
CMESSAGES_H=config/locale/ieee_1003.1-2001/messages_members.h
|
||||||
CMESSAGES_CC=config/locale/messages_members_ieee_1003.1-200x.cc
|
CMESSAGES_CC=config/locale/ieee_1003.1-2001/messages_members.cc
|
||||||
CMONEY_CC=config/locale/moneypunct_members_generic.cc
|
CMONEY_CC=config/locale/generic/monetary_members.cc
|
||||||
CNUMERIC_CC=config/locale/numpunct_members_generic.cc
|
CNUMERIC_CC=config/locale/generic/numeric_members.cc
|
||||||
CTIME_CC=config/locale/time_members_generic.cc
|
CTIME_CC=config/locale/generic/time_members.cc
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
echo "$enable_clocale is an unknown locale package" 1>&2
|
echo "$enable_clocale is an unknown locale package" 1>&2
|
||||||
|
|
@ -19362,14 +19362,14 @@ if test $enable_symvers = yes ; then
|
||||||
echo 'FOO { global: f[a-z]o; local: *; };' > conftest.map
|
echo 'FOO { global: f[a-z]o; local: *; };' > conftest.map
|
||||||
|
|
||||||
cat > conftest.$ac_ext <<EOF
|
cat > conftest.$ac_ext <<EOF
|
||||||
#line 19344 "configure"
|
#line 19366 "configure"
|
||||||
#include "confdefs.h"
|
#include "confdefs.h"
|
||||||
int foo;
|
int foo;
|
||||||
int main() {
|
int main() {
|
||||||
|
|
||||||
; return 0; }
|
; return 0; }
|
||||||
EOF
|
EOF
|
||||||
if { (eval echo configure:19351: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
if { (eval echo configure:19373: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
|
||||||
rm -rf conftest*
|
rm -rf conftest*
|
||||||
enable_symvers=gnu
|
enable_symvers=gnu
|
||||||
else
|
else
|
||||||
|
|
@ -19411,7 +19411,7 @@ else
|
||||||
GLIBCPP_BUILD_VERSIONED_SHLIB_FALSE=
|
GLIBCPP_BUILD_VERSIONED_SHLIB_FALSE=
|
||||||
fi
|
fi
|
||||||
echo $ac_n "checking versioning on shared library symbols""... $ac_c" 1>&6
|
echo $ac_n "checking versioning on shared library symbols""... $ac_c" 1>&6
|
||||||
echo "configure:19383: checking versioning on shared library symbols" >&5
|
echo "configure:19415: checking versioning on shared library symbols" >&5
|
||||||
echo "$ac_t""$enable_symvers" 1>&6
|
echo "$ac_t""$enable_symvers" 1>&6
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -19501,13 +19501,13 @@ glibcpp_toolexeclibdir=no
|
||||||
glibcpp_prefixdir=${prefix}
|
glibcpp_prefixdir=${prefix}
|
||||||
|
|
||||||
echo $ac_n "checking for interface version number""... $ac_c" 1>&6
|
echo $ac_n "checking for interface version number""... $ac_c" 1>&6
|
||||||
echo "configure:19473: checking for interface version number" >&5
|
echo "configure:19505: checking for interface version number" >&5
|
||||||
libstdcxx_interface=$INTERFACE
|
libstdcxx_interface=$INTERFACE
|
||||||
echo "$ac_t""$libstdcxx_interface" 1>&6
|
echo "$ac_t""$libstdcxx_interface" 1>&6
|
||||||
|
|
||||||
# Process the option --with-gxx-include-dir=<path to include-files directory>
|
# Process the option --with-gxx-include-dir=<path to include-files directory>
|
||||||
echo $ac_n "checking for --with-gxx-include-dir""... $ac_c" 1>&6
|
echo $ac_n "checking for --with-gxx-include-dir""... $ac_c" 1>&6
|
||||||
echo "configure:19479: checking for --with-gxx-include-dir" >&5
|
echo "configure:19511: checking for --with-gxx-include-dir" >&5
|
||||||
# Check whether --with-gxx-include-dir or --without-gxx-include-dir was given.
|
# Check whether --with-gxx-include-dir or --without-gxx-include-dir was given.
|
||||||
if test "${with_gxx_include_dir+set}" = set; then
|
if test "${with_gxx_include_dir+set}" = set; then
|
||||||
withval="$with_gxx_include_dir"
|
withval="$with_gxx_include_dir"
|
||||||
|
|
@ -19531,7 +19531,7 @@ echo "$ac_t""$gxx_include_dir" 1>&6
|
||||||
|
|
||||||
# Process the option "--enable-version-specific-runtime-libs"
|
# Process the option "--enable-version-specific-runtime-libs"
|
||||||
echo $ac_n "checking for --enable-version-specific-runtime-libs""... $ac_c" 1>&6
|
echo $ac_n "checking for --enable-version-specific-runtime-libs""... $ac_c" 1>&6
|
||||||
echo "configure:19503: checking for --enable-version-specific-runtime-libs" >&5
|
echo "configure:19535: checking for --enable-version-specific-runtime-libs" >&5
|
||||||
# Check whether --enable-version-specific-runtime-libs or --disable-version-specific-runtime-libs was given.
|
# Check whether --enable-version-specific-runtime-libs or --disable-version-specific-runtime-libs was given.
|
||||||
if test "${enable_version_specific_runtime_libs+set}" = set; then
|
if test "${enable_version_specific_runtime_libs+set}" = set; then
|
||||||
enableval="$enable_version_specific_runtime_libs"
|
enableval="$enable_version_specific_runtime_libs"
|
||||||
|
|
@ -19578,7 +19578,7 @@ if test x"$glibcpp_toolexecdir" = x"no"; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo $ac_n "checking for install location""... $ac_c" 1>&6
|
echo $ac_n "checking for install location""... $ac_c" 1>&6
|
||||||
echo "configure:19550: checking for install location" >&5
|
echo "configure:19582: checking for install location" >&5
|
||||||
echo "$ac_t""$gxx_include_dir" 1>&6
|
echo "$ac_t""$gxx_include_dir" 1>&6
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -20088,7 +20088,7 @@ EOF
|
||||||
|
|
||||||
cat >> $CONFIG_STATUS <<EOF
|
cat >> $CONFIG_STATUS <<EOF
|
||||||
ac_sources="$BASIC_FILE_CC $CLOCALE_CC $CCOLLATE_CC $CCTYPE_CC $CMESSAGES_CC $CMONEY_CC $CNUMERIC_CC $CTIME_CC $LINKER_MAP"
|
ac_sources="$BASIC_FILE_CC $CLOCALE_CC $CCOLLATE_CC $CCTYPE_CC $CMESSAGES_CC $CMONEY_CC $CNUMERIC_CC $CTIME_CC $LINKER_MAP"
|
||||||
ac_dests="src/basic_file.cc src/c++locale.cc src/collate.cc src/ctype.cc src/messages.cc src/moneypunct.cc src/numpunct.cc src/time.cc src/linker.map"
|
ac_dests="src/basic_file.cc src/c++locale.cc src/collate.cc src/ctype.cc src/messages.cc src/monetary.cc src/numeric.cc src/time.cc src/linker.map"
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
cat >> $CONFIG_STATUS <<\EOF
|
cat >> $CONFIG_STATUS <<\EOF
|
||||||
|
|
|
||||||
|
|
@ -85,8 +85,8 @@ options</a></h1>
|
||||||
|
|
||||||
<dt><code>--enable-clocale=MODEL </code>
|
<dt><code>--enable-clocale=MODEL </code>
|
||||||
<dd><p>Select a target-specific underlying locale package. The
|
<dd><p>Select a target-specific underlying locale package. The
|
||||||
choices are 'ieee_1003.1' to specify an X/Open, Standard Unix
|
choices are 'ieee_1003.1-2001' to specify an X/Open, Standard Unix
|
||||||
(IEEE Std. 1003.1-200x) model based on langinfo/iconv/catgets,
|
(IEEE Std. 1003.1-2001) model based on langinfo/iconv/catgets,
|
||||||
'gnu' to specify a model based on functionality from the GNU C
|
'gnu' to specify a model based on functionality from the GNU C
|
||||||
library (langinfo/iconv/gettext) (from <A
|
library (langinfo/iconv/gettext) (from <A
|
||||||
href="http://sources.redhat.com/glibc/">glibc</a>, the GNU C
|
href="http://sources.redhat.com/glibc/">glibc</a>, the GNU C
|
||||||
|
|
|
||||||
|
|
@ -68,6 +68,7 @@ AS = @AS@
|
||||||
ATOMICITY_INC_SRCDIR = @ATOMICITY_INC_SRCDIR@
|
ATOMICITY_INC_SRCDIR = @ATOMICITY_INC_SRCDIR@
|
||||||
AWK = @AWK@
|
AWK = @AWK@
|
||||||
BASIC_FILE_H = @BASIC_FILE_H@
|
BASIC_FILE_H = @BASIC_FILE_H@
|
||||||
|
BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@
|
||||||
CATALOGS = @CATALOGS@
|
CATALOGS = @CATALOGS@
|
||||||
CATOBJEXT = @CATOBJEXT@
|
CATOBJEXT = @CATOBJEXT@
|
||||||
CC = @CC@
|
CC = @CC@
|
||||||
|
|
@ -89,17 +90,17 @@ EXTRA_CXX_FLAGS = @EXTRA_CXX_FLAGS@
|
||||||
GCJ = @GCJ@
|
GCJ = @GCJ@
|
||||||
GCJFLAGS = @GCJFLAGS@
|
GCJFLAGS = @GCJFLAGS@
|
||||||
GENCAT = @GENCAT@
|
GENCAT = @GENCAT@
|
||||||
|
GLIBC21 = @GLIBC21@
|
||||||
GLIBCPP_INCLUDES = @GLIBCPP_INCLUDES@
|
GLIBCPP_INCLUDES = @GLIBCPP_INCLUDES@
|
||||||
GLIBCPP_IS_CROSS_COMPILING = @GLIBCPP_IS_CROSS_COMPILING@
|
GLIBCPP_IS_CROSS_COMPILING = @GLIBCPP_IS_CROSS_COMPILING@
|
||||||
GMOFILES = @GMOFILES@
|
GMOFILES = @GMOFILES@
|
||||||
GMSGFMT = @GMSGFMT@
|
GMSGFMT = @GMSGFMT@
|
||||||
GT_NO = @GT_NO@
|
|
||||||
GT_YES = @GT_YES@
|
|
||||||
INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
|
|
||||||
INSTOBJEXT = @INSTOBJEXT@
|
INSTOBJEXT = @INSTOBJEXT@
|
||||||
INTLDEPS = @INTLDEPS@
|
INTLBISON = @INTLBISON@
|
||||||
INTLLIBS = @INTLLIBS@
|
INTLLIBS = @INTLLIBS@
|
||||||
INTLOBJS = @INTLOBJS@
|
INTLOBJS = @INTLOBJS@
|
||||||
|
INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@
|
||||||
|
LIBICONV = @LIBICONV@
|
||||||
LIBIO_INCLUDES = @LIBIO_INCLUDES@
|
LIBIO_INCLUDES = @LIBIO_INCLUDES@
|
||||||
LIBMATHOBJS = @LIBMATHOBJS@
|
LIBMATHOBJS = @LIBMATHOBJS@
|
||||||
LIBMATH_INCLUDES = @LIBMATH_INCLUDES@
|
LIBMATH_INCLUDES = @LIBMATH_INCLUDES@
|
||||||
|
|
@ -141,7 +142,6 @@ glibcpp_prefixdir = @glibcpp_prefixdir@
|
||||||
glibcpp_toolexecdir = @glibcpp_toolexecdir@
|
glibcpp_toolexecdir = @glibcpp_toolexecdir@
|
||||||
glibcpp_toolexeclibdir = @glibcpp_toolexeclibdir@
|
glibcpp_toolexeclibdir = @glibcpp_toolexeclibdir@
|
||||||
ifGNUmake = @ifGNUmake@
|
ifGNUmake = @ifGNUmake@
|
||||||
l = @l@
|
|
||||||
libio_la = @libio_la@
|
libio_la = @libio_la@
|
||||||
libtool_VERSION = @libtool_VERSION@
|
libtool_VERSION = @libtool_VERSION@
|
||||||
release_VERSION = @release_VERSION@
|
release_VERSION = @release_VERSION@
|
||||||
|
|
@ -159,52 +159,278 @@ glibcpp_builddir = @glibcpp_builddir@
|
||||||
|
|
||||||
bits_srcdir = ${glibcpp_srcdir}/include/bits
|
bits_srcdir = ${glibcpp_srcdir}/include/bits
|
||||||
bits_builddir = ./bits
|
bits_builddir = ./bits
|
||||||
bits_headers = ${bits_srcdir}/basic_ios.h ${bits_srcdir}/basic_ios.tcc ${bits_srcdir}/basic_string.h ${bits_srcdir}/basic_string.tcc ${bits_srcdir}/boost_concept_check.h ${bits_srcdir}/char_traits.h ${bits_srcdir}/codecvt.h ${bits_srcdir}/concept_check.h ${bits_srcdir}/cpp_type_traits.h ${bits_srcdir}/fpos.h ${bits_srcdir}/fstream.tcc ${bits_srcdir}/functexcept.h ${bits_srcdir}/generic_shadow.h ${bits_srcdir}/gslice.h ${bits_srcdir}/gslice_array.h ${bits_srcdir}/indirect_array.h ${bits_srcdir}/ios_base.h ${bits_srcdir}/istream.tcc ${bits_srcdir}/locale_facets.h ${bits_srcdir}/locale_facets.tcc ${bits_srcdir}/localefwd.h ${bits_srcdir}/mask_array.h ${bits_srcdir}/ostream.tcc ${bits_srcdir}/pthread_allocimpl.h ${bits_srcdir}/stream_iterator.h ${bits_srcdir}/streambuf_iterator.h ${bits_srcdir}/slice.h ${bits_srcdir}/slice_array.h ${bits_srcdir}/sstream.tcc ${bits_srcdir}/stl_algo.h ${bits_srcdir}/stl_algobase.h ${bits_srcdir}/stl_alloc.h ${bits_srcdir}/stl_bvector.h ${bits_srcdir}/stl_construct.h ${bits_srcdir}/stl_deque.h ${bits_srcdir}/stl_function.h ${bits_srcdir}/stl_heap.h ${bits_srcdir}/stl_iterator.h ${bits_srcdir}/stl_iterator_base_funcs.h ${bits_srcdir}/stl_iterator_base_types.h ${bits_srcdir}/stl_list.h ${bits_srcdir}/stl_map.h ${bits_srcdir}/stl_multimap.h ${bits_srcdir}/stl_multiset.h ${bits_srcdir}/stl_numeric.h ${bits_srcdir}/stl_pair.h ${bits_srcdir}/stl_pthread_alloc.h ${bits_srcdir}/stl_queue.h ${bits_srcdir}/stl_raw_storage_iter.h ${bits_srcdir}/stl_relops.h ${bits_srcdir}/stl_set.h ${bits_srcdir}/stl_stack.h ${bits_srcdir}/stl_tempbuf.h ${bits_srcdir}/stl_threads.h ${bits_srcdir}/stl_tree.h ${bits_srcdir}/stl_uninitialized.h ${bits_srcdir}/stl_vector.h ${bits_srcdir}/streambuf.tcc ${bits_srcdir}/stringfwd.h ${bits_srcdir}/type_traits.h ${bits_srcdir}/valarray_array.h ${bits_srcdir}/valarray_array.tcc ${bits_srcdir}/valarray_meta.h
|
bits_headers = \
|
||||||
|
${bits_srcdir}/basic_ios.h \
|
||||||
|
${bits_srcdir}/basic_ios.tcc \
|
||||||
|
${bits_srcdir}/basic_string.h \
|
||||||
|
${bits_srcdir}/basic_string.tcc \
|
||||||
|
${bits_srcdir}/boost_concept_check.h \
|
||||||
|
${bits_srcdir}/char_traits.h \
|
||||||
|
${bits_srcdir}/codecvt.h \
|
||||||
|
${bits_srcdir}/concept_check.h \
|
||||||
|
${bits_srcdir}/cpp_type_traits.h \
|
||||||
|
${bits_srcdir}/fpos.h \
|
||||||
|
${bits_srcdir}/fstream.tcc \
|
||||||
|
${bits_srcdir}/functexcept.h \
|
||||||
|
${bits_srcdir}/generic_shadow.h \
|
||||||
|
${bits_srcdir}/gslice.h \
|
||||||
|
${bits_srcdir}/gslice_array.h \
|
||||||
|
${bits_srcdir}/indirect_array.h \
|
||||||
|
${bits_srcdir}/ios_base.h \
|
||||||
|
${bits_srcdir}/istream.tcc \
|
||||||
|
${bits_srcdir}/locale_facets.h \
|
||||||
|
${bits_srcdir}/locale_facets.tcc \
|
||||||
|
${bits_srcdir}/localefwd.h \
|
||||||
|
${bits_srcdir}/mask_array.h \
|
||||||
|
${bits_srcdir}/ostream.tcc \
|
||||||
|
${bits_srcdir}/pthread_allocimpl.h \
|
||||||
|
${bits_srcdir}/stream_iterator.h \
|
||||||
|
${bits_srcdir}/streambuf_iterator.h \
|
||||||
|
${bits_srcdir}/slice.h \
|
||||||
|
${bits_srcdir}/slice_array.h \
|
||||||
|
${bits_srcdir}/sstream.tcc \
|
||||||
|
${bits_srcdir}/stl_algo.h \
|
||||||
|
${bits_srcdir}/stl_algobase.h \
|
||||||
|
${bits_srcdir}/stl_alloc.h \
|
||||||
|
${bits_srcdir}/stl_bvector.h \
|
||||||
|
${bits_srcdir}/stl_construct.h \
|
||||||
|
${bits_srcdir}/stl_deque.h \
|
||||||
|
${bits_srcdir}/stl_function.h \
|
||||||
|
${bits_srcdir}/stl_heap.h \
|
||||||
|
${bits_srcdir}/stl_iterator.h \
|
||||||
|
${bits_srcdir}/stl_iterator_base_funcs.h \
|
||||||
|
${bits_srcdir}/stl_iterator_base_types.h \
|
||||||
|
${bits_srcdir}/stl_list.h \
|
||||||
|
${bits_srcdir}/stl_map.h \
|
||||||
|
${bits_srcdir}/stl_multimap.h \
|
||||||
|
${bits_srcdir}/stl_multiset.h \
|
||||||
|
${bits_srcdir}/stl_numeric.h \
|
||||||
|
${bits_srcdir}/stl_pair.h \
|
||||||
|
${bits_srcdir}/stl_pthread_alloc.h \
|
||||||
|
${bits_srcdir}/stl_queue.h \
|
||||||
|
${bits_srcdir}/stl_raw_storage_iter.h \
|
||||||
|
${bits_srcdir}/stl_relops.h \
|
||||||
|
${bits_srcdir}/stl_set.h \
|
||||||
|
${bits_srcdir}/stl_stack.h \
|
||||||
|
${bits_srcdir}/stl_tempbuf.h \
|
||||||
|
${bits_srcdir}/stl_threads.h \
|
||||||
|
${bits_srcdir}/stl_tree.h \
|
||||||
|
${bits_srcdir}/stl_uninitialized.h \
|
||||||
|
${bits_srcdir}/stl_vector.h \
|
||||||
|
${bits_srcdir}/streambuf.tcc \
|
||||||
|
${bits_srcdir}/stringfwd.h \
|
||||||
|
${bits_srcdir}/type_traits.h \
|
||||||
|
${bits_srcdir}/valarray_array.h \
|
||||||
|
${bits_srcdir}/valarray_array.tcc \
|
||||||
|
${bits_srcdir}/valarray_meta.h
|
||||||
|
|
||||||
|
|
||||||
backward_srcdir = ${glibcpp_srcdir}/include/backward
|
backward_srcdir = ${glibcpp_srcdir}/include/backward
|
||||||
backward_builddir = ./backward
|
backward_builddir = ./backward
|
||||||
backward_headers = ${backward_srcdir}/complex.h ${backward_srcdir}/iomanip.h ${backward_srcdir}/istream.h ${backward_srcdir}/ostream.h ${backward_srcdir}/stream.h ${backward_srcdir}/streambuf.h ${backward_srcdir}/algo.h ${backward_srcdir}/algobase.h ${backward_srcdir}/alloc.h ${backward_srcdir}/bvector.h ${backward_srcdir}/defalloc.h ${backward_srcdir}/deque.h ${backward_srcdir}/function.h ${backward_srcdir}/hash_map.h ${backward_srcdir}/hash_set.h ${backward_srcdir}/hashtable.h ${backward_srcdir}/heap.h ${backward_srcdir}/iostream.h ${backward_srcdir}/iterator.h ${backward_srcdir}/list.h ${backward_srcdir}/map.h ${backward_srcdir}/multimap.h ${backward_srcdir}/new.h ${backward_srcdir}/multiset.h ${backward_srcdir}/pair.h ${backward_srcdir}/queue.h ${backward_srcdir}/rope.h ${backward_srcdir}/set.h ${backward_srcdir}/slist.h ${backward_srcdir}/stack.h ${backward_srcdir}/tempbuf.h ${backward_srcdir}/tree.h ${backward_srcdir}/vector.h ${backward_srcdir}/fstream.h ${backward_srcdir}/strstream.h ${backward_srcdir}/strstream ${backward_srcdir}/backward_warning.h
|
backward_headers = \
|
||||||
|
${backward_srcdir}/complex.h \
|
||||||
|
${backward_srcdir}/iomanip.h \
|
||||||
|
${backward_srcdir}/istream.h \
|
||||||
|
${backward_srcdir}/ostream.h \
|
||||||
|
${backward_srcdir}/stream.h \
|
||||||
|
${backward_srcdir}/streambuf.h \
|
||||||
|
${backward_srcdir}/algo.h \
|
||||||
|
${backward_srcdir}/algobase.h \
|
||||||
|
${backward_srcdir}/alloc.h \
|
||||||
|
${backward_srcdir}/bvector.h \
|
||||||
|
${backward_srcdir}/defalloc.h \
|
||||||
|
${backward_srcdir}/deque.h \
|
||||||
|
${backward_srcdir}/function.h \
|
||||||
|
${backward_srcdir}/hash_map.h \
|
||||||
|
${backward_srcdir}/hash_set.h \
|
||||||
|
${backward_srcdir}/hashtable.h \
|
||||||
|
${backward_srcdir}/heap.h \
|
||||||
|
${backward_srcdir}/iostream.h \
|
||||||
|
${backward_srcdir}/iterator.h \
|
||||||
|
${backward_srcdir}/list.h \
|
||||||
|
${backward_srcdir}/map.h \
|
||||||
|
${backward_srcdir}/multimap.h \
|
||||||
|
${backward_srcdir}/new.h \
|
||||||
|
${backward_srcdir}/multiset.h \
|
||||||
|
${backward_srcdir}/pair.h \
|
||||||
|
${backward_srcdir}/queue.h \
|
||||||
|
${backward_srcdir}/rope.h \
|
||||||
|
${backward_srcdir}/set.h \
|
||||||
|
${backward_srcdir}/slist.h \
|
||||||
|
${backward_srcdir}/stack.h \
|
||||||
|
${backward_srcdir}/tempbuf.h \
|
||||||
|
${backward_srcdir}/tree.h \
|
||||||
|
${backward_srcdir}/vector.h \
|
||||||
|
${backward_srcdir}/fstream.h \
|
||||||
|
${backward_srcdir}/strstream.h \
|
||||||
|
${backward_srcdir}/strstream \
|
||||||
|
${backward_srcdir}/backward_warning.h
|
||||||
|
|
||||||
|
|
||||||
ext_srcdir = ${glibcpp_srcdir}/include/ext
|
ext_srcdir = ${glibcpp_srcdir}/include/ext
|
||||||
ext_builddir = ./ext
|
ext_builddir = ./ext
|
||||||
ext_headers = ${ext_srcdir}/algorithm ${ext_srcdir}/functional ${ext_srcdir}/hash_map ${ext_srcdir}/hash_set ${ext_srcdir}/iterator ${ext_srcdir}/memory ${ext_srcdir}/numeric ${ext_srcdir}/rb_tree ${ext_srcdir}/rope ${ext_srcdir}/ropeimpl.h ${ext_srcdir}/slist ${ext_srcdir}/stl_hash_fun.h ${ext_srcdir}/stl_hashtable.h ${ext_srcdir}/stl_rope.h
|
ext_headers = \
|
||||||
|
${ext_srcdir}/algorithm \
|
||||||
|
${ext_srcdir}/functional \
|
||||||
|
${ext_srcdir}/hash_map \
|
||||||
|
${ext_srcdir}/hash_set \
|
||||||
|
${ext_srcdir}/iterator \
|
||||||
|
${ext_srcdir}/memory \
|
||||||
|
${ext_srcdir}/numeric \
|
||||||
|
${ext_srcdir}/rb_tree \
|
||||||
|
${ext_srcdir}/rope \
|
||||||
|
${ext_srcdir}/ropeimpl.h \
|
||||||
|
${ext_srcdir}/slist \
|
||||||
|
${ext_srcdir}/stl_hash_fun.h \
|
||||||
|
${ext_srcdir}/stl_hashtable.h \
|
||||||
|
${ext_srcdir}/stl_rope.h
|
||||||
|
|
||||||
|
|
||||||
# This is the common subset of files that all three "C" header models use.
|
# This is the common subset of files that all three "C" header models use.
|
||||||
c_base_srcdir = @C_INCLUDE_DIR@
|
c_base_srcdir = @C_INCLUDE_DIR@
|
||||||
c_base_builddir = .
|
c_base_builddir = .
|
||||||
c_base_headers = ${c_base_srcdir}/std_cassert.h ${c_base_srcdir}/std_cctype.h ${c_base_srcdir}/std_cerrno.h ${c_base_srcdir}/std_cfloat.h ${c_base_srcdir}/std_ciso646.h ${c_base_srcdir}/std_climits.h ${c_base_srcdir}/std_clocale.h ${c_base_srcdir}/std_cmath.h ${c_base_srcdir}/std_csetjmp.h ${c_base_srcdir}/std_csignal.h ${c_base_srcdir}/std_cstdarg.h ${c_base_srcdir}/std_cstddef.h ${c_base_srcdir}/std_cstdio.h ${c_base_srcdir}/std_cstdlib.h ${c_base_srcdir}/std_cstring.h ${c_base_srcdir}/std_ctime.h ${c_base_srcdir}/std_cwchar.h ${c_base_srcdir}/std_cwctype.h
|
c_base_headers = \
|
||||||
|
${c_base_srcdir}/std_cassert.h \
|
||||||
|
${c_base_srcdir}/std_cctype.h \
|
||||||
|
${c_base_srcdir}/std_cerrno.h \
|
||||||
|
${c_base_srcdir}/std_cfloat.h \
|
||||||
|
${c_base_srcdir}/std_ciso646.h \
|
||||||
|
${c_base_srcdir}/std_climits.h \
|
||||||
|
${c_base_srcdir}/std_clocale.h \
|
||||||
|
${c_base_srcdir}/std_cmath.h \
|
||||||
|
${c_base_srcdir}/std_csetjmp.h \
|
||||||
|
${c_base_srcdir}/std_csignal.h \
|
||||||
|
${c_base_srcdir}/std_cstdarg.h \
|
||||||
|
${c_base_srcdir}/std_cstddef.h \
|
||||||
|
${c_base_srcdir}/std_cstdio.h \
|
||||||
|
${c_base_srcdir}/std_cstdlib.h \
|
||||||
|
${c_base_srcdir}/std_cstring.h \
|
||||||
|
${c_base_srcdir}/std_ctime.h \
|
||||||
|
${c_base_srcdir}/std_cwchar.h \
|
||||||
|
${c_base_srcdir}/std_cwctype.h
|
||||||
|
|
||||||
# Some of the "C" headers need extra files.
|
# Some of the "C" headers need extra files.
|
||||||
c_base_headers_extra = ${c_base_srcdir}/cmath.tcc
|
c_base_headers_extra = \
|
||||||
|
${c_base_srcdir}/cmath.tcc
|
||||||
|
|
||||||
c_base_headers_rename = cassert cctype cerrno cfloat ciso646 climits clocale cmath csetjmp csignal cstdarg cstddef cstdio cstdlib cstring ctime cwchar cwctype
|
c_base_headers_rename = \
|
||||||
|
cassert \
|
||||||
|
cctype \
|
||||||
|
cerrno \
|
||||||
|
cfloat \
|
||||||
|
ciso646 \
|
||||||
|
climits \
|
||||||
|
clocale \
|
||||||
|
cmath \
|
||||||
|
csetjmp \
|
||||||
|
csignal \
|
||||||
|
cstdarg \
|
||||||
|
cstddef \
|
||||||
|
cstdio \
|
||||||
|
cstdlib \
|
||||||
|
cstring \
|
||||||
|
ctime \
|
||||||
|
cwchar \
|
||||||
|
cwctype
|
||||||
|
|
||||||
|
|
||||||
std_srcdir = ${glibcpp_srcdir}/include/std
|
std_srcdir = ${glibcpp_srcdir}/include/std
|
||||||
std_builddir = .
|
std_builddir = .
|
||||||
std_headers = ${std_srcdir}/std_algorithm.h ${std_srcdir}/std_bitset.h ${std_srcdir}/std_complex.h ${std_srcdir}/std_deque.h ${std_srcdir}/std_fstream.h ${std_srcdir}/std_functional.h ${std_srcdir}/std_iomanip.h ${std_srcdir}/std_ios.h ${std_srcdir}/std_iosfwd.h ${std_srcdir}/std_iostream.h ${std_srcdir}/std_istream.h ${std_srcdir}/std_iterator.h ${std_srcdir}/std_limits.h ${std_srcdir}/std_list.h ${std_srcdir}/std_locale.h ${std_srcdir}/std_map.h ${std_srcdir}/std_memory.h ${std_srcdir}/std_numeric.h ${std_srcdir}/std_ostream.h ${std_srcdir}/std_queue.h ${std_srcdir}/std_set.h ${std_srcdir}/std_sstream.h ${std_srcdir}/std_stack.h ${std_srcdir}/std_stdexcept.h ${std_srcdir}/std_streambuf.h ${std_srcdir}/std_string.h ${std_srcdir}/std_utility.h ${std_srcdir}/std_valarray.h ${std_srcdir}/std_vector.h
|
std_headers = \
|
||||||
|
${std_srcdir}/std_algorithm.h \
|
||||||
|
${std_srcdir}/std_bitset.h \
|
||||||
|
${std_srcdir}/std_complex.h \
|
||||||
|
${std_srcdir}/std_deque.h \
|
||||||
|
${std_srcdir}/std_fstream.h \
|
||||||
|
${std_srcdir}/std_functional.h \
|
||||||
|
${std_srcdir}/std_iomanip.h \
|
||||||
|
${std_srcdir}/std_ios.h \
|
||||||
|
${std_srcdir}/std_iosfwd.h \
|
||||||
|
${std_srcdir}/std_iostream.h \
|
||||||
|
${std_srcdir}/std_istream.h \
|
||||||
|
${std_srcdir}/std_iterator.h \
|
||||||
|
${std_srcdir}/std_limits.h \
|
||||||
|
${std_srcdir}/std_list.h \
|
||||||
|
${std_srcdir}/std_locale.h \
|
||||||
|
${std_srcdir}/std_map.h \
|
||||||
|
${std_srcdir}/std_memory.h \
|
||||||
|
${std_srcdir}/std_numeric.h \
|
||||||
|
${std_srcdir}/std_ostream.h \
|
||||||
|
${std_srcdir}/std_queue.h \
|
||||||
|
${std_srcdir}/std_set.h \
|
||||||
|
${std_srcdir}/std_sstream.h \
|
||||||
|
${std_srcdir}/std_stack.h \
|
||||||
|
${std_srcdir}/std_stdexcept.h \
|
||||||
|
${std_srcdir}/std_streambuf.h \
|
||||||
|
${std_srcdir}/std_string.h \
|
||||||
|
${std_srcdir}/std_utility.h \
|
||||||
|
${std_srcdir}/std_valarray.h \
|
||||||
|
${std_srcdir}/std_vector.h
|
||||||
|
|
||||||
# Renamed at build time.
|
# Renamed at build time.
|
||||||
std_headers_rename = algorithm bitset complex deque fstream functional iomanip ios iosfwd iostream istream iterator limits list locale map memory numeric ostream queue set sstream stack stdexcept streambuf string utility valarray vector
|
std_headers_rename = \
|
||||||
|
algorithm \
|
||||||
|
bitset \
|
||||||
|
complex \
|
||||||
|
deque \
|
||||||
|
fstream \
|
||||||
|
functional \
|
||||||
|
iomanip \
|
||||||
|
ios \
|
||||||
|
iosfwd \
|
||||||
|
iostream \
|
||||||
|
istream \
|
||||||
|
iterator \
|
||||||
|
limits \
|
||||||
|
list \
|
||||||
|
locale \
|
||||||
|
map \
|
||||||
|
memory \
|
||||||
|
numeric \
|
||||||
|
ostream \
|
||||||
|
queue \
|
||||||
|
set \
|
||||||
|
sstream \
|
||||||
|
stack \
|
||||||
|
stdexcept \
|
||||||
|
streambuf \
|
||||||
|
string \
|
||||||
|
utility \
|
||||||
|
valarray \
|
||||||
|
vector
|
||||||
|
|
||||||
|
|
||||||
target_srcdir = ${glibcpp_srcdir}/@OS_INC_SRCDIR@
|
target_srcdir = ${glibcpp_srcdir}/@OS_INC_SRCDIR@
|
||||||
target_builddir = ./${target_alias}/bits
|
target_builddir = ./${target_alias}/bits
|
||||||
target_headers = ${target_srcdir}/ctype_base.h ${target_srcdir}/ctype_inline.h ${target_srcdir}/ctype_noninline.h ${target_srcdir}/os_defines.h ${glibcpp_srcdir}/@ATOMICITY_INC_SRCDIR@/atomicity.h ${glibcpp_srcdir}/@CPU_LIMITS_INC_SRCDIR@/cpu_limits.h
|
target_headers = \
|
||||||
|
${target_srcdir}/ctype_base.h \
|
||||||
|
${target_srcdir}/ctype_inline.h \
|
||||||
|
${target_srcdir}/ctype_noninline.h \
|
||||||
|
${target_srcdir}/os_defines.h \
|
||||||
|
${glibcpp_srcdir}/@ATOMICITY_INC_SRCDIR@/atomicity.h \
|
||||||
|
${glibcpp_srcdir}/@CPU_LIMITS_INC_SRCDIR@/cpu_limits.h
|
||||||
|
|
||||||
# These extra_target_headers files are all built with ad hoc naming rules.
|
# These extra_target_headers files are all built with ad hoc naming rules.
|
||||||
extra_target_headers = ${target_builddir}/basic_file.h ${target_builddir}/c++config.h ${target_builddir}/c++io.h ${target_builddir}/c++locale.h ${target_builddir}/messages_members.h ${target_builddir}/codecvt_specializations.h
|
extra_target_headers = \
|
||||||
|
${target_builddir}/basic_file.h \
|
||||||
|
${target_builddir}/c++config.h \
|
||||||
|
${target_builddir}/c++io.h \
|
||||||
|
${target_builddir}/c++locale.h \
|
||||||
|
${target_builddir}/messages_members.h \
|
||||||
|
${target_builddir}/codecvt_specializations.h
|
||||||
|
|
||||||
|
|
||||||
thread_target_headers = ${target_builddir}/gthr.h ${target_builddir}/gthr-single.h ${target_builddir}/gthr-posix.h ${target_builddir}/gthr-default.h
|
thread_target_headers = \
|
||||||
|
${target_builddir}/gthr.h \
|
||||||
|
${target_builddir}/gthr-single.h \
|
||||||
|
${target_builddir}/gthr-posix.h \
|
||||||
|
${target_builddir}/gthr-default.h
|
||||||
|
|
||||||
|
|
||||||
# List of all timestamp files. By keeping only one copy of this list, both
|
# List of all timestamp files. By keeping only one copy of this list, both
|
||||||
# CLEANFILES and all-local are kept up-to-date.
|
# CLEANFILES and all-local are kept up-to-date.
|
||||||
allstamps = stamp-std stamp-bits stamp-c_base stamp-backward stamp-ext ${target_builddir}/stamp-target
|
allstamps = stamp-std stamp-bits stamp-c_base stamp-backward stamp-ext \
|
||||||
|
${target_builddir}/stamp-target
|
||||||
|
|
||||||
|
|
||||||
# Target includes for threads
|
# Target includes for threads
|
||||||
|
|
@ -227,7 +453,7 @@ DIST_COMMON = Makefile.am Makefile.in
|
||||||
|
|
||||||
DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
|
DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
|
||||||
|
|
||||||
TAR = tar
|
TAR = gtar
|
||||||
GZIP_ENV = --best
|
GZIP_ENV = --best
|
||||||
all: all-redirect
|
all: all-redirect
|
||||||
.SUFFIXES:
|
.SUFFIXES:
|
||||||
|
|
|
||||||
|
|
@ -66,7 +66,7 @@ sources = \
|
||||||
cmath.cc bitset.cc \
|
cmath.cc bitset.cc \
|
||||||
functexcept.cc stdexcept.cc vterminate.cc \
|
functexcept.cc stdexcept.cc vterminate.cc \
|
||||||
c++locale.cc locale.cc localename.cc codecvt.cc \
|
c++locale.cc locale.cc localename.cc codecvt.cc \
|
||||||
collate.cc ctype.cc messages.cc moneypunct.cc numpunct.cc time.cc \
|
collate.cc ctype.cc messages.cc monetary.cc numeric.cc time.cc \
|
||||||
concept-inst.cc locale-inst.cc misc-inst.cc stl-inst.cc \
|
concept-inst.cc locale-inst.cc misc-inst.cc stl-inst.cc \
|
||||||
string-inst.cc wstring-inst.cc valarray-inst.cc ext-inst.cc
|
string-inst.cc wstring-inst.cc valarray-inst.cc ext-inst.cc
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -191,7 +191,7 @@ sources = \
|
||||||
cmath.cc bitset.cc \
|
cmath.cc bitset.cc \
|
||||||
functexcept.cc stdexcept.cc vterminate.cc \
|
functexcept.cc stdexcept.cc vterminate.cc \
|
||||||
c++locale.cc locale.cc localename.cc codecvt.cc \
|
c++locale.cc locale.cc localename.cc codecvt.cc \
|
||||||
collate.cc ctype.cc messages.cc moneypunct.cc numpunct.cc time.cc \
|
collate.cc ctype.cc messages.cc monetary.cc numeric.cc time.cc \
|
||||||
concept-inst.cc locale-inst.cc misc-inst.cc stl-inst.cc \
|
concept-inst.cc locale-inst.cc misc-inst.cc stl-inst.cc \
|
||||||
string-inst.cc wstring-inst.cc valarray-inst.cc ext-inst.cc
|
string-inst.cc wstring-inst.cc valarray-inst.cc ext-inst.cc
|
||||||
|
|
||||||
|
|
@ -271,7 +271,7 @@ LIBS = @LIBS@
|
||||||
libstdc___la_OBJECTS = globals.lo limits.lo basic_file.lo complex_io.lo \
|
libstdc___la_OBJECTS = globals.lo limits.lo basic_file.lo complex_io.lo \
|
||||||
ios.lo strstream.lo cmath.lo bitset.lo functexcept.lo stdexcept.lo \
|
ios.lo strstream.lo cmath.lo bitset.lo functexcept.lo stdexcept.lo \
|
||||||
vterminate.lo c++locale.lo locale.lo localename.lo codecvt.lo \
|
vterminate.lo c++locale.lo locale.lo localename.lo codecvt.lo \
|
||||||
collate.lo ctype.lo messages.lo moneypunct.lo numpunct.lo time.lo \
|
collate.lo ctype.lo messages.lo monetary.lo numeric.lo time.lo \
|
||||||
concept-inst.lo locale-inst.lo misc-inst.lo stl-inst.lo string-inst.lo \
|
concept-inst.lo locale-inst.lo misc-inst.lo stl-inst.lo string-inst.lo \
|
||||||
wstring-inst.lo valarray-inst.lo ext-inst.lo
|
wstring-inst.lo valarray-inst.lo ext-inst.lo
|
||||||
CXXFLAGS = @CXXFLAGS@
|
CXXFLAGS = @CXXFLAGS@
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue