2003-08-05 04:00:18 +02:00
|
|
|
|
|
acinclude.m4 (GLIBCXX_CONDITIONAL): New macro.
2003-08-27 Phil Edwards <pme@gcc.gnu.org>
* acinclude.m4 (GLIBCXX_CONDITIONAL): New macro. Wrap
AM_CONDITIONAL. Replace all calls to AM_CONDITIONAL with this one.
(GLIBCXX_ENABLE_HOSTED): New macro, sets new variable is_hosted,
used elsewhere in this file.
(GLIBCXX_EVALUATE_CONDITIONALS): New macro...
* configure.ac: ...called here to expand all conditionals.
* Makefile.am: Conditionalize SUBDIRS on GLIBCXX_HOSTED.
* include/Makefile.am: Remove redundant gxx_include_dir assignment.
(install-freestanding-headers): New target, a subset of
install-headers. Conditionalize install-data-local on GLIBCXX_HOSTED.
* aclocal.m4, configure, Makefile.in, include/Makefile.in,
libmath/Makefile.in, libsupc++/Makefile.in, po/Makefile.in,
src/Makefile.in, testsuite/Makefile.in: Regenerated.
From-SVN: r70854
2003-08-27 21:06:56 +02:00
|
|
|
|
dnl
|
|
|
|
|
dnl GLIBCXX_CONDITIONAL (NAME, SHELL-TEST)
|
|
|
|
|
dnl
|
|
|
|
|
dnl Exactly like AM_CONDITIONAL, but delays evaluation of the test until the
|
|
|
|
|
dnl end of configure. This lets tested variables be reassigned, and the
|
|
|
|
|
dnl conditional will depend on the final state of the variable. For a simple
|
|
|
|
|
dnl example of why this is needed, see GLIBCXX_ENABLE_HOSTED.
|
|
|
|
|
dnl
|
|
|
|
|
m4_define([_m4_divert(glibcxx_diversion)], 8000)dnl
|
2004-03-01 20:22:28 +01:00
|
|
|
|
AC_DEFUN([GLIBCXX_CONDITIONAL], [dnl
|
acinclude.m4 (GLIBCXX_CONDITIONAL): New macro.
2003-08-27 Phil Edwards <pme@gcc.gnu.org>
* acinclude.m4 (GLIBCXX_CONDITIONAL): New macro. Wrap
AM_CONDITIONAL. Replace all calls to AM_CONDITIONAL with this one.
(GLIBCXX_ENABLE_HOSTED): New macro, sets new variable is_hosted,
used elsewhere in this file.
(GLIBCXX_EVALUATE_CONDITIONALS): New macro...
* configure.ac: ...called here to expand all conditionals.
* Makefile.am: Conditionalize SUBDIRS on GLIBCXX_HOSTED.
* include/Makefile.am: Remove redundant gxx_include_dir assignment.
(install-freestanding-headers): New target, a subset of
install-headers. Conditionalize install-data-local on GLIBCXX_HOSTED.
* aclocal.m4, configure, Makefile.in, include/Makefile.in,
libmath/Makefile.in, libsupc++/Makefile.in, po/Makefile.in,
src/Makefile.in, testsuite/Makefile.in: Regenerated.
From-SVN: r70854
2003-08-27 21:06:56 +02:00
|
|
|
|
m4_divert_text([glibcxx_diversion],dnl
|
|
|
|
|
AM_CONDITIONAL([$1],[$2])
|
|
|
|
|
)dnl
|
|
|
|
|
])dnl
|
2004-03-01 20:22:28 +01:00
|
|
|
|
AC_DEFUN([GLIBCXX_EVALUATE_CONDITIONALS], [m4_undivert([glibcxx_diversion])])dnl
|
acinclude.m4 (GLIBCXX_CONDITIONAL): New macro.
2003-08-27 Phil Edwards <pme@gcc.gnu.org>
* acinclude.m4 (GLIBCXX_CONDITIONAL): New macro. Wrap
AM_CONDITIONAL. Replace all calls to AM_CONDITIONAL with this one.
(GLIBCXX_ENABLE_HOSTED): New macro, sets new variable is_hosted,
used elsewhere in this file.
(GLIBCXX_EVALUATE_CONDITIONALS): New macro...
* configure.ac: ...called here to expand all conditionals.
* Makefile.am: Conditionalize SUBDIRS on GLIBCXX_HOSTED.
* include/Makefile.am: Remove redundant gxx_include_dir assignment.
(install-freestanding-headers): New target, a subset of
install-headers. Conditionalize install-data-local on GLIBCXX_HOSTED.
* aclocal.m4, configure, Makefile.in, include/Makefile.in,
libmath/Makefile.in, libsupc++/Makefile.in, po/Makefile.in,
src/Makefile.in, testsuite/Makefile.in: Regenerated.
From-SVN: r70854
2003-08-27 21:06:56 +02:00
|
|
|
|
|
|
|
|
|
|
2003-08-05 04:00:18 +02:00
|
|
|
|
dnl
|
|
|
|
|
dnl Check to see what architecture and operating system we are compiling
|
|
|
|
|
dnl for. Also, if architecture- or OS-specific flags are required for
|
|
|
|
|
dnl compilation, pick them up here.
|
|
|
|
|
dnl
|
2004-03-01 20:22:28 +01:00
|
|
|
|
AC_DEFUN([GLIBCXX_CHECK_HOST], [
|
2003-08-05 04:00:18 +02:00
|
|
|
|
. $glibcxx_srcdir/configure.host
|
2004-03-01 20:22:28 +01:00
|
|
|
|
AC_MSG_NOTICE([CPU config directory is $cpu_include_dir])
|
|
|
|
|
AC_MSG_NOTICE([OS config directory is $os_include_dir])
|
2003-08-05 04:00:18 +02:00
|
|
|
|
])
|
|
|
|
|
|
|
|
|
|
dnl
|
|
|
|
|
dnl Initialize the rest of the library configury. At this point we have
|
|
|
|
|
dnl variables like $host.
|
2002-06-26 05:53:45 +02:00
|
|
|
|
dnl
|
2003-08-05 04:00:18 +02:00
|
|
|
|
dnl Sets:
|
|
|
|
|
dnl gcc_version (x.y.z format)
|
2003-08-27 02:38:28 +02:00
|
|
|
|
dnl SUBDIRS
|
2003-08-05 04:00:18 +02:00
|
|
|
|
dnl Substs:
|
|
|
|
|
dnl glibcxx_builddir (absolute path)
|
|
|
|
|
dnl glibcxx_srcdir (absolute path)
|
|
|
|
|
dnl toplevel_srcdir (absolute path)
|
|
|
|
|
dnl with_cross_host
|
|
|
|
|
dnl with_newlib
|
|
|
|
|
dnl with_target_subdir
|
|
|
|
|
dnl plus
|
|
|
|
|
dnl - the variables in GLIBCXX_CHECK_HOST / configure.host
|
|
|
|
|
dnl - default settings for all AM_CONFITIONAL test variables
|
|
|
|
|
dnl - lots of tools, like CC and CXX
|
2002-06-26 05:53:45 +02:00
|
|
|
|
dnl
|
2004-03-01 20:22:28 +01:00
|
|
|
|
AC_DEFUN([GLIBCXX_CONFIGURE], [
|
2003-08-27 02:38:28 +02:00
|
|
|
|
# Keep these sync'd with the list in Makefile.am. The first provides an
|
|
|
|
|
# expandable list at autoconf time; the second provides an expandable list
|
|
|
|
|
# (i.e., shell variable) at configure time.
|
|
|
|
|
m4_define([glibcxx_SUBDIRS],[include libmath libsupc++ src po testsuite])
|
|
|
|
|
SUBDIRS='glibcxx_SUBDIRS'
|
|
|
|
|
|
2002-03-18 22:41:02 +01:00
|
|
|
|
# These need to be absolute paths, yet at the same time need to
|
|
|
|
|
# canonicalize only relative paths, because then amd will not unmount
|
|
|
|
|
# drives. Thus the use of PWDCMD: set it to 'pawd' or 'amq -w' if using amd.
|
2003-07-05 06:05:45 +02:00
|
|
|
|
glibcxx_builddir=`${PWDCMD-pwd}`
|
2002-03-18 22:41:02 +01:00
|
|
|
|
case $srcdir in
|
2003-08-05 04:00:18 +02:00
|
|
|
|
[\\/$]* | ?:[\\/]*) glibcxx_srcdir=${srcdir} ;;
|
|
|
|
|
*) glibcxx_srcdir=`cd "$srcdir" && ${PWDCMD-pwd} || echo "$srcdir"` ;;
|
2002-03-18 22:41:02 +01:00
|
|
|
|
esac
|
2003-08-05 04:00:18 +02:00
|
|
|
|
toplevel_srcdir=${glibcxx_srcdir}/..
|
2003-07-05 06:05:45 +02:00
|
|
|
|
AC_SUBST(glibcxx_builddir)
|
|
|
|
|
AC_SUBST(glibcxx_srcdir)
|
2003-08-05 04:00:18 +02:00
|
|
|
|
AC_SUBST(toplevel_srcdir)
|
2002-03-18 22:41:02 +01:00
|
|
|
|
|
2003-08-05 04:00:18 +02:00
|
|
|
|
# We use these options to decide which functions to include. They are
|
|
|
|
|
# set from the top level.
|
|
|
|
|
AC_ARG_WITH([target-subdir],
|
|
|
|
|
AC_HELP_STRING([--with-target-subdir=SUBDIR],
|
|
|
|
|
[configuring in a subdirectory]))
|
|
|
|
|
|
|
|
|
|
AC_ARG_WITH([cross-host],
|
|
|
|
|
AC_HELP_STRING([--with-cross-host=HOST],
|
|
|
|
|
[configuring with a cross compiler]))
|
|
|
|
|
|
|
|
|
|
AC_ARG_WITH([newlib],
|
|
|
|
|
AC_HELP_STRING([--with-newlib],
|
|
|
|
|
[assume newlib as a system C library]))
|
|
|
|
|
|
|
|
|
|
# We're almost certainly being configured before anything else which uses
|
|
|
|
|
# C++, so all of our AC_PROG_* discoveries will be cached. It's vital that
|
|
|
|
|
# we not cache the value of CXX that we "discover" here, because it's set
|
|
|
|
|
# to something unique for us and libjava. Other target libraries need to
|
|
|
|
|
# find CXX for themselves. We yank the rug out from under the normal AC_*
|
|
|
|
|
# process by sneakily renaming the cache variable. This also lets us debug
|
|
|
|
|
# the value of "our" CXX in postmortems.
|
|
|
|
|
#
|
|
|
|
|
# We must also force CXX to /not/ be a precious variable, otherwise the
|
|
|
|
|
# wrong (non-multilib-adjusted) value will be used in multilibs. This
|
|
|
|
|
# little trick also affects CPPFLAGS, CXXFLAGS, and LDFLAGS. And as a side
|
|
|
|
|
# effect, CXXFLAGS is no longer automagically subst'd, so we have to do
|
2003-08-11 07:56:33 +02:00
|
|
|
|
# that ourselves. Un-preciousing AC_PROG_CC also affects CC and CFLAGS.
|
2003-08-05 04:00:18 +02:00
|
|
|
|
#
|
|
|
|
|
# -fno-builtin must be present here so that a non-conflicting form of
|
|
|
|
|
# std::exit can be guessed by AC_PROG_CXX, and used in later tests.
|
2003-08-11 07:26:58 +02:00
|
|
|
|
|
2003-08-05 04:00:18 +02:00
|
|
|
|
m4_define([ac_cv_prog_CXX],[glibcxx_cv_prog_CXX])
|
|
|
|
|
m4_rename([_AC_ARG_VAR_PRECIOUS],[glibcxx_PRECIOUS])
|
|
|
|
|
m4_define([_AC_ARG_VAR_PRECIOUS],[])
|
|
|
|
|
save_CXXFLAGS="$CXXFLAGS"
|
|
|
|
|
CXXFLAGS="$CXXFLAGS -fno-builtin"
|
2003-08-11 07:56:33 +02:00
|
|
|
|
AC_PROG_CC
|
2003-08-05 04:00:18 +02:00
|
|
|
|
AC_PROG_CXX
|
|
|
|
|
CXXFLAGS="$save_CXXFLAGS"
|
|
|
|
|
m4_rename([glibcxx_PRECIOUS],[_AC_ARG_VAR_PRECIOUS])
|
2003-08-11 07:56:33 +02:00
|
|
|
|
AC_SUBST(CFLAGS)
|
2003-08-05 04:00:18 +02:00
|
|
|
|
AC_SUBST(CXXFLAGS)
|
2000-04-21 22:33:34 +02:00
|
|
|
|
|
2002-07-02 08:39:04 +02:00
|
|
|
|
# For directory versioning (e.g., headers) and other variables.
|
|
|
|
|
AC_MSG_CHECKING([for GCC version number])
|
2003-08-05 04:00:18 +02:00
|
|
|
|
gcc_version=`$CXX -dumpversion`
|
2002-07-02 08:39:04 +02:00
|
|
|
|
AC_MSG_RESULT($gcc_version)
|
|
|
|
|
|
2003-08-05 04:00:18 +02:00
|
|
|
|
# Will set LN_S to either 'ln -s', 'ln', or 'cp -p' (if linking isn't
|
|
|
|
|
# available). Uncomment the next line to force a particular method.
|
|
|
|
|
AC_PROG_LN_S
|
|
|
|
|
#LN_S='cp -p'
|
|
|
|
|
|
2000-07-26 08:51:38 +02:00
|
|
|
|
AC_CHECK_TOOL(AS, as)
|
|
|
|
|
AC_CHECK_TOOL(AR, ar)
|
2001-04-11 20:52:31 +02:00
|
|
|
|
AC_CHECK_TOOL(RANLIB, ranlib, ranlib-not-found-in-path-error)
|
2000-04-21 22:33:34 +02:00
|
|
|
|
|
2000-07-26 08:51:38 +02:00
|
|
|
|
AM_MAINTAINER_MODE
|
2000-04-21 22:33:34 +02:00
|
|
|
|
|
acinclude.m4 (GLIBCXX_CONDITIONAL): New macro.
2003-08-27 Phil Edwards <pme@gcc.gnu.org>
* acinclude.m4 (GLIBCXX_CONDITIONAL): New macro. Wrap
AM_CONDITIONAL. Replace all calls to AM_CONDITIONAL with this one.
(GLIBCXX_ENABLE_HOSTED): New macro, sets new variable is_hosted,
used elsewhere in this file.
(GLIBCXX_EVALUATE_CONDITIONALS): New macro...
* configure.ac: ...called here to expand all conditionals.
* Makefile.am: Conditionalize SUBDIRS on GLIBCXX_HOSTED.
* include/Makefile.am: Remove redundant gxx_include_dir assignment.
(install-freestanding-headers): New target, a subset of
install-headers. Conditionalize install-data-local on GLIBCXX_HOSTED.
* aclocal.m4, configure, Makefile.in, include/Makefile.in,
libmath/Makefile.in, libsupc++/Makefile.in, po/Makefile.in,
src/Makefile.in, testsuite/Makefile.in: Regenerated.
From-SVN: r70854
2003-08-27 21:06:56 +02:00
|
|
|
|
# Set up safe default values for all subsequent AM_CONDITIONAL tests
|
|
|
|
|
# which are themselves conditionally expanded.
|
|
|
|
|
## (Right now, this only matters for enable_wchar_t, but nothing prevents
|
|
|
|
|
## other macros from doing the same. This should be automated.) -pme
|
2003-06-09 16:54:08 +02:00
|
|
|
|
need_libmath=no
|
|
|
|
|
enable_wchar_t=no
|
2003-08-05 04:00:18 +02:00
|
|
|
|
#enable_libstdcxx_debug=no
|
|
|
|
|
#enable_libstdcxx_pch=no
|
2003-06-09 16:54:08 +02:00
|
|
|
|
#enable_cheaders=c
|
|
|
|
|
#c_compatibility=no
|
2003-06-17 07:46:01 +02:00
|
|
|
|
#enable_abi_check=no
|
2003-06-09 16:54:08 +02:00
|
|
|
|
#enable_symvers=no
|
acinclude.m4 (GLIBCXX_CONDITIONAL): New macro.
2003-08-27 Phil Edwards <pme@gcc.gnu.org>
* acinclude.m4 (GLIBCXX_CONDITIONAL): New macro. Wrap
AM_CONDITIONAL. Replace all calls to AM_CONDITIONAL with this one.
(GLIBCXX_ENABLE_HOSTED): New macro, sets new variable is_hosted,
used elsewhere in this file.
(GLIBCXX_EVALUATE_CONDITIONALS): New macro...
* configure.ac: ...called here to expand all conditionals.
* Makefile.am: Conditionalize SUBDIRS on GLIBCXX_HOSTED.
* include/Makefile.am: Remove redundant gxx_include_dir assignment.
(install-freestanding-headers): New target, a subset of
install-headers. Conditionalize install-data-local on GLIBCXX_HOSTED.
* aclocal.m4, configure, Makefile.in, include/Makefile.in,
libmath/Makefile.in, libsupc++/Makefile.in, po/Makefile.in,
src/Makefile.in, testsuite/Makefile.in: Regenerated.
From-SVN: r70854
2003-08-27 21:06:56 +02:00
|
|
|
|
#enable_hosted_libstdcxx=yes
|
2003-06-09 16:54:08 +02:00
|
|
|
|
|
2003-08-05 04:00:18 +02:00
|
|
|
|
# Find platform-specific directories containing configuration info.
|
|
|
|
|
# Also possibly modify flags used elsewhere, as needed by the platform.
|
2003-07-05 06:05:45 +02:00
|
|
|
|
GLIBCXX_CHECK_HOST
|
2000-04-21 22:33:34 +02:00
|
|
|
|
])
|
|
|
|
|
|
|
|
|
|
|
2003-08-05 04:00:18 +02:00
|
|
|
|
m4_include([linkage.m4])
|
2003-08-27 21:28:57 +02:00
|
|
|
|
m4_include([../config/no-executables.m4])
|
2000-06-19 05:14:40 +02:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
dnl
|
2001-06-11 21:35:32 +02:00
|
|
|
|
dnl Tests for newer compiler features, or features that are present in newer
|
|
|
|
|
dnl compiler versions but not older compiler versions still in use, should
|
|
|
|
|
dnl be placed here.
|
2000-04-21 22:33:34 +02:00
|
|
|
|
dnl
|
2003-08-05 04:00:18 +02:00
|
|
|
|
dnl Defines:
|
|
|
|
|
dnl WERROR='-Werror' if requested and possible; g++'s that lack the
|
|
|
|
|
dnl new inlining code or the new system_header pragma will die on -Werror.
|
|
|
|
|
dnl Leave it out by default and use maint-mode to use it.
|
|
|
|
|
dnl SECTION_FLAGS='-ffunction-sections -fdata-sections' if
|
|
|
|
|
dnl compiler supports it and the user has not requested debug mode.
|
2001-03-25 01:16:58 +01:00
|
|
|
|
dnl
|
2004-03-01 20:22:28 +01:00
|
|
|
|
AC_DEFUN([GLIBCXX_CHECK_COMPILER_FEATURES], [
|
2000-05-24 20:35:37 +02:00
|
|
|
|
# All these tests are for C++; save the language and the compiler flags.
|
2001-06-11 21:35:32 +02:00
|
|
|
|
# The CXXFLAGS thing is suspicious, but based on similar bits previously
|
2003-07-05 06:05:45 +02:00
|
|
|
|
# found in GLIBCXX_CONFIGURE.
|
2000-05-24 20:35:37 +02:00
|
|
|
|
AC_LANG_SAVE
|
|
|
|
|
AC_LANG_CPLUSPLUS
|
|
|
|
|
ac_test_CXXFLAGS="${CXXFLAGS+set}"
|
|
|
|
|
ac_save_CXXFLAGS="$CXXFLAGS"
|
|
|
|
|
|
2000-09-08 00:40:17 +02:00
|
|
|
|
# Check for maintainer-mode bits.
|
|
|
|
|
if test x"$USE_MAINTAINER_MODE" = xno; then
|
|
|
|
|
WERROR=''
|
2000-05-19 21:55:50 +02:00
|
|
|
|
else
|
2000-09-08 00:40:17 +02:00
|
|
|
|
WERROR='-Werror'
|
2000-05-19 21:55:50 +02:00
|
|
|
|
fi
|
|
|
|
|
|
2000-06-19 05:14:40 +02:00
|
|
|
|
# Check for -ffunction-sections -fdata-sections
|
|
|
|
|
AC_MSG_CHECKING([for g++ that supports -ffunction-sections -fdata-sections])
|
[multiple changes]
2000-10-02 Steven King <sxking@uswest.net>
* mkcshadow: Fixed script to output proper include guard.
* bits/char_traits.h: Cleaned up types in char_traits<char> functions.
* libio/_G_config.h: Hacked to make work with shadow heraders.
* shadow/*: Hacked to make shadow headers work.
2000-10-02 Benjamin Kosnik <bkoz@purist.soma.redhat.com>
Self-compile with shadow headers.
* acconfig.h (_GLIBCPP_USE_SHADOW_HEADERS): Define. Eventually,
like _GLIBCPP_USE_NAMESPACES before it, this macro will die when
it becomes the default way the library is built.
* acinclude.m4 (GLIBCPP_ENABLE_SHADOW): New macro.
* config/gnu-linux/bits/ctype_base.h (ctype_base): Use it.
* config/gnu-linux/ctype.cc (ctype): Use it.
* src/localename.cc (locale::_Impl::_M_replace_categories): Remove
call to assert.
* src/locale.cc: Explicitly cast mbstate_t to void* in calls to
memset. This should not be necessary, but an ambiguous overload
with it in.
* shadow/bits/std_cwchar.h: Fix.
* shadow/wchar.h: Fix.
* config/gnu-linux/bits/ctype_base.h (ctype_base): Inject ctype
enums into namespace std:: for ctype_base enum. Other OS types
will have to do this as well.
* config/gnu-linux/ctype.cc (ctype): Inject ctype data into
namespace std, in particular __ctype_toupper, __ctype_tolower,
__ctype_b.
* shadow/iolibio.h: New file.
* shadow/bits/wrap_iolibio.h: New file.
* shadow/libioP.h: New file.
* shadow/bits/wrap_libioP.h: New file.
* shadow/bits/wrap_fcntl.h: New file.
* shadow/fcntl.h: New file.
* shadow/iconv.h: New file. Inject iconv names into the global
namespace, unmangled for the moment.
* shadow/bits/wrap_iconv.h: New file.
* shadow/unistd.h: Remove. Useless.
* shadow/bits/wrap_unistd.h: Remove.
* src/Makefile.am: Take out machine-ansi.h, add fcntl.h unistd.h.
* src/Makefile.in: Regenerate.
* config/c_io_libio.h (_IO_codecvt): Change to normal C++ decl.
* shadow/libio.h: Fix.
* shadow/bits/wrap_libio.h: Fix.
* shadow/bits/std_clocale.h: Remove typedef struct construct,
which will not compile.
* shadow/bits/std_ctime.h: Same.
* shadow/pthread.h: New file. Put pthreads types and functions
into global scope, which is probably not the correct long-term
solution but has to be done at the moment before libio wrappers
can even be started.
* shadow/bits/wrap_pthread.h: New file.
* bits/std_ios.h: Formatting tweak.
* shadow/bits/std_cstdio.h: Format. Remove extraneous bits.
* acinclude.m4 (GLIBCPP_CHECK_COMPILER_FEATURES): Add -Werror to
tests for compiler features.
* aclocal.m4: Regenerate.
* configure: Regenerate.
* config/c_io_libio.cc: Remove fcntl.h include, as SEEK_SET
redefined.
* libio/libioP.h: Comment out fcntl.h include.
* shadow/math.h: Add in float and long declarations, as per ISO C9X.
* bits/c++config: Define _ISOC99_SOURCE.
* acinclude.m4 (GLIBCPP_ENABLE_SHADOW): Add -fno-builtins to
CSHADOWFLAGS, as well as _ISOC99_SOURCE.
* aclocal.m4: Regenerate.
* configure: Regenerate.
* src/Makefile.am (CSHADOW_INCLUDES): Enable, again.
(CSHADOW_INCLUDES): Add -I$(top_srcdir)/std before shadow include dir.
(CXXCOMPILE): Remove $(DEFS), which searches $(top_srcdir) before
std or shadow directories.
(LTCXXCOMPILE): Same.
(INCLUDES): Add $(top_builddir) before $(top_srcdir).
(AC_CXXFLAGS): Add CSHADOWFLAGS.
* src/Makefile.in: Regenerate.
* src/complex.cc (FCT): Change ::name to name.
* src/complexl.cc (FCT): Same. Use _GLIBCPP_USE_LONG_LONG here.
* src/complexf.cc (FCT): Same.
* src/complexf.cc: Remove FCT define, as things are properly
overloaded in the std namespace with the shadow headers.
* src/complexl.cc: Same.
* src/complex.cc: Same.
From-SVN: r36707
2000-10-04 07:06:32 +02:00
|
|
|
|
CXXFLAGS='-Werror -ffunction-sections -fdata-sections'
|
2003-08-05 04:00:18 +02:00
|
|
|
|
AC_TRY_COMPILE(, [int foo;], [ac_fdsections=yes], [ac_fdsections=no])
|
2000-06-19 05:14:40 +02:00
|
|
|
|
if test "$ac_test_CXXFLAGS" = set; then
|
|
|
|
|
CXXFLAGS="$ac_save_CXXFLAGS"
|
|
|
|
|
else
|
|
|
|
|
# this is the suspicious part
|
|
|
|
|
CXXFLAGS=''
|
|
|
|
|
fi
|
2002-12-16 20:02:01 +01:00
|
|
|
|
if test x"$ac_fdsections" = x"yes"; then
|
2000-06-19 05:14:40 +02:00
|
|
|
|
SECTION_FLAGS='-ffunction-sections -fdata-sections'
|
|
|
|
|
fi
|
|
|
|
|
AC_MSG_RESULT($ac_fdsections)
|
|
|
|
|
|
2000-05-24 20:35:37 +02:00
|
|
|
|
AC_LANG_RESTORE
|
2000-05-19 21:55:50 +02:00
|
|
|
|
AC_SUBST(WERROR)
|
2000-06-19 05:14:40 +02:00
|
|
|
|
AC_SUBST(SECTION_FLAGS)
|
2000-04-21 22:33:34 +02:00
|
|
|
|
])
|
|
|
|
|
|
2000-06-19 05:14:40 +02:00
|
|
|
|
|
|
|
|
|
dnl
|
2000-07-26 23:30:45 +02:00
|
|
|
|
dnl If GNU ld is in use, check to see if tricky linker opts can be used. If
|
|
|
|
|
dnl the native linker is in use, all variables will be defined to something
|
|
|
|
|
dnl safe (like an empty string).
|
|
|
|
|
dnl
|
2003-08-05 04:00:18 +02:00
|
|
|
|
dnl Defines:
|
|
|
|
|
dnl SECTION_LDFLAGS='-Wl,--gc-sections' if possible
|
|
|
|
|
dnl OPT_LDFLAGS='-Wl,-O1' if possible
|
|
|
|
|
dnl LD (as a side effect of testing)
|
|
|
|
|
dnl Sets:
|
|
|
|
|
dnl with_gnu_ld
|
|
|
|
|
dnl glibcxx_gnu_ld_version (possibly)
|
|
|
|
|
dnl
|
|
|
|
|
dnl The last will be a single integer, e.g., version 1.23.45.0.67.89 will
|
|
|
|
|
dnl set glibcxx_gnu_ld_version to 12345. Zeros cause problems.
|
2000-06-19 05:14:40 +02:00
|
|
|
|
dnl
|
2004-03-01 20:22:28 +01:00
|
|
|
|
AC_DEFUN([GLIBCXX_CHECK_LINKER_FEATURES], [
|
2000-07-26 23:30:45 +02:00
|
|
|
|
# If we're not using GNU ld, then there's no point in even trying these
|
|
|
|
|
# tests. Check for that first. We should have already tested for gld
|
|
|
|
|
# by now (in libtool), but require it now just to be safe...
|
2002-01-17 08:33:29 +01:00
|
|
|
|
test -z "$SECTION_LDFLAGS" && SECTION_LDFLAGS=''
|
|
|
|
|
test -z "$OPT_LDFLAGS" && OPT_LDFLAGS=''
|
2000-07-26 23:30:45 +02:00
|
|
|
|
AC_REQUIRE([AC_PROG_LD])
|
2003-08-05 04:00:18 +02:00
|
|
|
|
AC_REQUIRE([AC_PROG_AWK])
|
2000-10-27 14:29:42 +02:00
|
|
|
|
|
2002-02-20 23:10:39 +01:00
|
|
|
|
# The name set by libtool depends on the version of libtool. Shame on us
|
|
|
|
|
# for depending on an impl detail, but c'est la vie. Older versions used
|
|
|
|
|
# ac_cv_prog_gnu_ld, but now it's lt_cv_prog_gnu_ld, and is copied back on
|
|
|
|
|
# top of with_gnu_ld (which is also set by --with-gnu-ld, so that actually
|
|
|
|
|
# makes sense). We'll test with_gnu_ld everywhere else, so if that isn't
|
|
|
|
|
# set (hence we're using an older libtool), then set it.
|
|
|
|
|
if test x${with_gnu_ld+set} != xset; then
|
|
|
|
|
if test x${ac_cv_prog_gnu_ld+set} != xset; then
|
|
|
|
|
# We got through "ac_require(ac_prog_ld)" and still not set? Huh?
|
|
|
|
|
with_gnu_ld=no
|
|
|
|
|
else
|
|
|
|
|
with_gnu_ld=$ac_cv_prog_gnu_ld
|
|
|
|
|
fi
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
# Start by getting the version number. I think the libtool test already
|
|
|
|
|
# does some of this, but throws away the result.
|
|
|
|
|
changequote(,)
|
|
|
|
|
ldver=`$LD --version 2>/dev/null | head -1 | \
|
|
|
|
|
sed -e 's/GNU ld version \([0-9.][0-9.]*\).*/\1/'`
|
|
|
|
|
changequote([,])
|
2003-07-05 06:05:45 +02:00
|
|
|
|
glibcxx_gnu_ld_version=`echo $ldver | \
|
2002-02-20 23:10:39 +01:00
|
|
|
|
$AWK -F. '{ if (NF<3) [$]3=0; print ([$]1*100+[$]2)*100+[$]3 }'`
|
|
|
|
|
|
2000-10-27 14:29:42 +02:00
|
|
|
|
# Set --gc-sections.
|
2002-02-20 23:10:39 +01:00
|
|
|
|
if test "$with_gnu_ld" = "notbroken"; then
|
2000-10-17 12:12:23 +02:00
|
|
|
|
# GNU ld it is! Joy and bunny rabbits!
|
2000-07-26 23:30:45 +02:00
|
|
|
|
|
|
|
|
|
# All these tests are for C++; save the language and the compiler flags.
|
|
|
|
|
# Need to do this so that g++ won't try to link in libstdc++
|
|
|
|
|
ac_test_CFLAGS="${CFLAGS+set}"
|
|
|
|
|
ac_save_CFLAGS="$CFLAGS"
|
2000-10-27 14:29:42 +02:00
|
|
|
|
CFLAGS='-x c++ -Wl,--gc-sections'
|
2000-07-26 23:30:45 +02:00
|
|
|
|
|
|
|
|
|
# Check for -Wl,--gc-sections
|
2003-08-05 04:00:18 +02:00
|
|
|
|
# XXX This test is broken at the moment, as symbols required for linking
|
|
|
|
|
# are now in libsupc++ (not built yet). In addition, this test has
|
|
|
|
|
# cored on solaris in the past. In addition, --gc-sections doesn't
|
|
|
|
|
# really work at the moment (keeps on discarding used sections, first
|
|
|
|
|
# .eh_frame and now some of the glibc sections for iconv).
|
|
|
|
|
# Bzzzzt. Thanks for playing, maybe next time.
|
2000-07-26 23:30:45 +02:00
|
|
|
|
AC_MSG_CHECKING([for ld that supports -Wl,--gc-sections])
|
|
|
|
|
AC_TRY_RUN([
|
2002-12-30 15:54:45 +01:00
|
|
|
|
int main(void)
|
2000-07-26 23:30:45 +02:00
|
|
|
|
{
|
2000-10-17 12:12:23 +02:00
|
|
|
|
try { throw 1; }
|
|
|
|
|
catch (...) { };
|
2000-07-26 23:30:45 +02:00
|
|
|
|
return 0;
|
|
|
|
|
}
|
2002-01-17 17:11:26 +01:00
|
|
|
|
], [ac_sectionLDflags=yes],[ac_sectionLDflags=no], [ac_sectionLDflags=yes])
|
2000-07-26 23:30:45 +02:00
|
|
|
|
if test "$ac_test_CFLAGS" = set; then
|
|
|
|
|
CFLAGS="$ac_save_CFLAGS"
|
|
|
|
|
else
|
|
|
|
|
# this is the suspicious part
|
|
|
|
|
CFLAGS=''
|
|
|
|
|
fi
|
|
|
|
|
if test "$ac_sectionLDflags" = "yes"; then
|
2002-01-17 08:33:29 +01:00
|
|
|
|
SECTION_LDFLAGS="-Wl,--gc-sections $SECTION_LDFLAGS"
|
2000-07-26 23:30:45 +02:00
|
|
|
|
fi
|
|
|
|
|
AC_MSG_RESULT($ac_sectionLDflags)
|
2000-10-27 14:29:42 +02:00
|
|
|
|
fi
|
2000-10-17 12:12:23 +02:00
|
|
|
|
|
2000-10-27 14:29:42 +02:00
|
|
|
|
# Set linker optimization flags.
|
2002-12-16 20:02:01 +01:00
|
|
|
|
if test x"$with_gnu_ld" = x"yes"; then
|
2002-01-17 08:33:29 +01:00
|
|
|
|
OPT_LDFLAGS="-Wl,-O1 $OPT_LDFLAGS"
|
2000-07-26 23:30:45 +02:00
|
|
|
|
fi
|
2000-10-27 14:29:42 +02:00
|
|
|
|
|
2000-06-19 05:14:40 +02:00
|
|
|
|
AC_SUBST(SECTION_LDFLAGS)
|
2000-07-26 23:30:45 +02:00
|
|
|
|
AC_SUBST(OPT_LDFLAGS)
|
2000-06-19 05:14:40 +02:00
|
|
|
|
])
|
|
|
|
|
|
|
|
|
|
|
2000-04-21 22:33:34 +02:00
|
|
|
|
dnl
|
2003-08-05 04:00:18 +02:00
|
|
|
|
dnl Check to see if this target can enable the wchar_t parts.
|
2000-10-25 14:50:06 +02:00
|
|
|
|
dnl If --disable-c-mbchar was given, no wchar_t stuff is enabled. (This
|
2003-08-05 04:00:18 +02:00
|
|
|
|
dnl must have been previously checked.) By default, wide characters are
|
|
|
|
|
dnl disabled.
|
2000-04-21 22:33:34 +02:00
|
|
|
|
dnl
|
2003-08-05 04:00:18 +02:00
|
|
|
|
dnl Defines:
|
|
|
|
|
dnl HAVE_MBSTATE_T if mbstate_t is not in wchar.h
|
|
|
|
|
dnl _GLIBCXX_USE_WCHAR_T if all the bits are found.
|
acinclude.m4 (GLIBCXX_CHECK_WCHAR_T_SUPPORT): Set LIBICONV, not libiconv.
2004-03-19 Phil Edwards <phil@codesourcery.com>
* acinclude.m4 (GLIBCXX_CHECK_WCHAR_T_SUPPORT): Set LIBICONV,
not libiconv. SUBST this variable as well.
* testsuite/Makefile.am (site.exp): New target, based on that
created by automake. Also set libiconv.
* configure, Makefile.in, include/Makefile.in, libmath/Makefile.in,
libsupc++/Makefile.in, po/Makefile.in, src/Makefile.in,
testsuite/Makefile.in: Regenerate.
From-SVN: r79678
2004-03-19 12:34:47 +01:00
|
|
|
|
dnl Substs:
|
|
|
|
|
dnl LIBICONV to a -l string containing the iconv library, if needed.
|
2000-04-21 22:33:34 +02:00
|
|
|
|
dnl
|
2004-03-01 20:22:28 +01:00
|
|
|
|
AC_DEFUN([GLIBCXX_CHECK_WCHAR_T_SUPPORT], [
|
2003-08-05 04:00:18 +02:00
|
|
|
|
# Test wchar.h for mbstate_t, which is needed for char_traits and
|
|
|
|
|
# others even if wchar_t support is not on.
|
2001-01-02 08:38:47 +01:00
|
|
|
|
AC_MSG_CHECKING([for mbstate_t])
|
|
|
|
|
AC_TRY_COMPILE([#include <wchar.h>],
|
2002-12-30 15:54:45 +01:00
|
|
|
|
[mbstate_t teststate;],
|
2001-01-02 08:38:47 +01:00
|
|
|
|
have_mbstate_t=yes, have_mbstate_t=no)
|
|
|
|
|
AC_MSG_RESULT($have_mbstate_t)
|
|
|
|
|
if test x"$have_mbstate_t" = xyes; then
|
|
|
|
|
AC_DEFINE(HAVE_MBSTATE_T)
|
|
|
|
|
fi
|
|
|
|
|
|
2003-08-05 04:00:18 +02:00
|
|
|
|
# Sanity check for existence of ISO C99 headers for extended encoding.
|
2001-01-02 08:38:47 +01:00
|
|
|
|
AC_CHECK_HEADERS(wchar.h, ac_has_wchar_h=yes, ac_has_wchar_h=no)
|
2002-03-12 03:42:11 +01:00
|
|
|
|
AC_CHECK_HEADERS(wctype.h, ac_has_wctype_h=yes, ac_has_wctype_h=no)
|
2002-12-30 15:54:45 +01:00
|
|
|
|
|
2003-08-05 04:00:18 +02:00
|
|
|
|
# Only continue checking if the ISO C99 headers exist and support is on.
|
2001-06-26 22:52:23 +02:00
|
|
|
|
if test x"$ac_has_wchar_h" = xyes &&
|
|
|
|
|
test x"$ac_has_wctype_h" = xyes &&
|
|
|
|
|
test x"$enable_c_mbchar" != xno; then
|
2002-12-30 15:54:45 +01:00
|
|
|
|
|
2003-08-05 04:00:18 +02:00
|
|
|
|
# Test wchar.h for WCHAR_MIN, WCHAR_MAX, which is needed before
|
|
|
|
|
# numeric_limits can instantiate type_traits<wchar_t>
|
2001-01-02 08:38:47 +01:00
|
|
|
|
AC_MSG_CHECKING([for WCHAR_MIN and WCHAR_MAX])
|
|
|
|
|
AC_TRY_COMPILE([#include <wchar.h>],
|
2002-12-30 15:54:45 +01:00
|
|
|
|
[int i = WCHAR_MIN; int j = WCHAR_MAX;],
|
2001-01-02 08:38:47 +01:00
|
|
|
|
has_wchar_minmax=yes, has_wchar_minmax=no)
|
|
|
|
|
AC_MSG_RESULT($has_wchar_minmax)
|
2002-12-30 15:54:45 +01:00
|
|
|
|
|
2003-08-05 04:00:18 +02:00
|
|
|
|
# Test wchar.h for WEOF, which is what we use to determine whether
|
|
|
|
|
# to specialize for char_traits<wchar_t> or not.
|
2001-01-02 08:38:47 +01:00
|
|
|
|
AC_MSG_CHECKING([for WEOF])
|
|
|
|
|
AC_TRY_COMPILE([
|
|
|
|
|
#include <wchar.h>
|
|
|
|
|
#include <stddef.h>],
|
|
|
|
|
[wint_t i = WEOF;],
|
|
|
|
|
has_weof=yes, has_weof=no)
|
|
|
|
|
AC_MSG_RESULT($has_weof)
|
2002-12-30 15:54:45 +01:00
|
|
|
|
|
2003-08-05 04:00:18 +02:00
|
|
|
|
# Tests for wide character functions used in char_traits<wchar_t>.
|
2001-06-11 06:36:59 +02:00
|
|
|
|
ac_wfuncs=yes
|
2003-08-05 04:00:18 +02:00
|
|
|
|
AC_CHECK_FUNCS([wcslen wmemchr wmemcmp wmemcpy wmemmove wmemset],
|
|
|
|
|
[],[ac_wfuncs=no])
|
2002-12-30 15:54:45 +01:00
|
|
|
|
|
2003-08-05 04:00:18 +02:00
|
|
|
|
# Checks for names injected into std:: by the c_std headers.
|
|
|
|
|
AC_CHECK_FUNCS([btowc wctob fgetwc fgetws fputwc fputws fwide \
|
2003-09-25 22:30:20 +02:00
|
|
|
|
fwprintf fwscanf swprintf swscanf vfwprintf vswprintf \
|
|
|
|
|
vwprintf wprintf wscanf getwc getwchar mbsinit mbrlen mbrtowc \
|
|
|
|
|
mbsrtowcs wcsrtombs putwc putwchar ungetwc wcrtomb wcstod wcstol \
|
2001-06-11 06:36:59 +02:00
|
|
|
|
wcstoul wcscpy wcsncpy wcscat wcsncat wcscmp wcscoll wcsncmp wcsxfrm \
|
2003-08-05 04:00:18 +02:00
|
|
|
|
wcscspn wcsspn wcstok wcsftime wcschr wcspbrk wcsrchr wcsstr],
|
|
|
|
|
[],[ac_wfuncs=no])
|
2001-06-09 08:49:13 +02:00
|
|
|
|
|
2003-09-25 22:30:20 +02:00
|
|
|
|
# Checks for wide character functions that are not required
|
|
|
|
|
# for basic wchar_t support. Don't disable support if they are missing.
|
|
|
|
|
# Injection of these is wrapped with guard macros.
|
|
|
|
|
AC_CHECK_FUNCS([vfwscanf vswscanf vwscanf wcstof iswblank],[],[])
|
|
|
|
|
|
2001-01-02 08:38:47 +01:00
|
|
|
|
AC_MSG_CHECKING([for ISO C99 wchar_t support])
|
2001-06-26 22:52:23 +02:00
|
|
|
|
if test x"$has_weof" = xyes &&
|
|
|
|
|
test x"$has_wchar_minmax" = xyes &&
|
2003-08-05 04:00:18 +02:00
|
|
|
|
test x"$ac_wfuncs" = xyes;
|
|
|
|
|
then
|
2001-01-02 08:38:47 +01:00
|
|
|
|
ac_isoC99_wchar_t=yes
|
|
|
|
|
else
|
|
|
|
|
ac_isoC99_wchar_t=no
|
|
|
|
|
fi
|
|
|
|
|
AC_MSG_RESULT($ac_isoC99_wchar_t)
|
2002-12-30 15:54:45 +01:00
|
|
|
|
|
2003-08-05 04:00:18 +02:00
|
|
|
|
# Use iconv for wchar_t to char conversions. As such, check for
|
|
|
|
|
# X/Open Portability Guide, version 2 features (XPG2).
|
2001-01-02 08:38:47 +01:00
|
|
|
|
AC_CHECK_HEADER(iconv.h, ac_has_iconv_h=yes, ac_has_iconv_h=no)
|
|
|
|
|
AC_CHECK_HEADER(langinfo.h, ac_has_langinfo_h=yes, ac_has_langinfo_h=no)
|
|
|
|
|
|
2003-08-05 04:00:18 +02:00
|
|
|
|
# Check for existence of libiconv.a providing XPG2 wchar_t support.
|
acinclude.m4 (GLIBCXX_CHECK_WCHAR_T_SUPPORT): Set LIBICONV, not libiconv.
2004-03-19 Phil Edwards <phil@codesourcery.com>
* acinclude.m4 (GLIBCXX_CHECK_WCHAR_T_SUPPORT): Set LIBICONV,
not libiconv. SUBST this variable as well.
* testsuite/Makefile.am (site.exp): New target, based on that
created by automake. Also set libiconv.
* configure, Makefile.in, include/Makefile.in, libmath/Makefile.in,
libsupc++/Makefile.in, po/Makefile.in, src/Makefile.in,
testsuite/Makefile.in: Regenerate.
From-SVN: r79678
2004-03-19 12:34:47 +01:00
|
|
|
|
AC_CHECK_LIB(iconv, iconv, LIBICONV="-liconv")
|
2001-01-02 08:38:47 +01:00
|
|
|
|
ac_save_LIBS="$LIBS"
|
acinclude.m4 (GLIBCXX_CHECK_WCHAR_T_SUPPORT): Set LIBICONV, not libiconv.
2004-03-19 Phil Edwards <phil@codesourcery.com>
* acinclude.m4 (GLIBCXX_CHECK_WCHAR_T_SUPPORT): Set LIBICONV,
not libiconv. SUBST this variable as well.
* testsuite/Makefile.am (site.exp): New target, based on that
created by automake. Also set libiconv.
* configure, Makefile.in, include/Makefile.in, libmath/Makefile.in,
libsupc++/Makefile.in, po/Makefile.in, src/Makefile.in,
testsuite/Makefile.in: Regenerate.
From-SVN: r79678
2004-03-19 12:34:47 +01:00
|
|
|
|
LIBS="$LIBS $LIBICONV"
|
|
|
|
|
AC_SUBST(LIBICONV)
|
2001-01-02 08:38:47 +01:00
|
|
|
|
|
2003-08-05 04:00:18 +02:00
|
|
|
|
AC_CHECK_FUNCS([iconv_open iconv_close iconv nl_langinfo],
|
|
|
|
|
[ac_XPG2funcs=yes], [ac_XPG2funcs=no])
|
2002-12-30 15:54:45 +01:00
|
|
|
|
|
2001-01-02 08:38:47 +01:00
|
|
|
|
LIBS="$ac_save_LIBS"
|
2000-11-14 18:23:49 +01:00
|
|
|
|
|
2001-01-02 08:38:47 +01:00
|
|
|
|
AC_MSG_CHECKING([for XPG2 wchar_t support])
|
2001-06-26 22:52:23 +02:00
|
|
|
|
if test x"$ac_has_iconv_h" = xyes &&
|
|
|
|
|
test x"$ac_has_langinfo_h" = xyes &&
|
2003-08-05 04:00:18 +02:00
|
|
|
|
test x"$ac_XPG2funcs" = xyes;
|
|
|
|
|
then
|
2001-01-02 08:38:47 +01:00
|
|
|
|
ac_XPG2_wchar_t=yes
|
|
|
|
|
else
|
|
|
|
|
ac_XPG2_wchar_t=no
|
|
|
|
|
fi
|
|
|
|
|
AC_MSG_RESULT($ac_XPG2_wchar_t)
|
2002-12-30 15:54:45 +01:00
|
|
|
|
|
2003-08-05 04:00:18 +02:00
|
|
|
|
# At the moment, only enable wchar_t specializations if all the
|
|
|
|
|
# above support is present.
|
|
|
|
|
if test x"$ac_isoC99_wchar_t" = xyes &&
|
|
|
|
|
test x"$ac_XPG2_wchar_t" = xyes;
|
|
|
|
|
then
|
2003-07-05 06:05:45 +02:00
|
|
|
|
AC_DEFINE(_GLIBCXX_USE_WCHAR_T)
|
2003-01-16 01:50:20 +01:00
|
|
|
|
enable_wchar_t=yes
|
2000-08-24 21:05:22 +02:00
|
|
|
|
fi
|
2000-04-21 22:33:34 +02:00
|
|
|
|
fi
|
2003-01-16 01:50:20 +01:00
|
|
|
|
AC_MSG_CHECKING([for enabled wchar_t specializations])
|
2003-08-05 04:00:18 +02:00
|
|
|
|
AC_MSG_RESULT($enable_wchar_t)
|
2000-04-21 22:33:34 +02:00
|
|
|
|
])
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
dnl
|
2003-08-05 04:00:18 +02:00
|
|
|
|
dnl Check for headers for, and arguments to, the setrlimit() function.
|
|
|
|
|
dnl Used only in testsuite_hooks.h. Called from GLIBCXX_CONFIGURE_TESTSUITE.
|
2002-12-16 20:02:01 +01:00
|
|
|
|
dnl
|
2003-08-05 04:00:18 +02:00
|
|
|
|
dnl Defines:
|
2004-04-01 11:16:36 +02:00
|
|
|
|
dnl _GLIBCXX_RES_LIMITS if we can set artificial resource limits
|
|
|
|
|
dnl various HAVE_LIMIT_* for individual limit names
|
2002-12-16 20:02:01 +01:00
|
|
|
|
dnl
|
2004-03-01 20:22:28 +01:00
|
|
|
|
AC_DEFUN([GLIBCXX_CHECK_SETRLIMIT_ancilliary], [
|
2003-08-05 04:00:18 +02:00
|
|
|
|
AC_TRY_COMPILE(
|
|
|
|
|
[#include <unistd.h>
|
|
|
|
|
#include <sys/time.h>
|
|
|
|
|
#include <sys/resource.h>
|
|
|
|
|
],
|
|
|
|
|
[ int f = RLIMIT_$1 ; ],
|
|
|
|
|
[glibcxx_mresult=1], [glibcxx_mresult=0])
|
2004-04-01 11:16:36 +02:00
|
|
|
|
AC_DEFINE_UNQUOTED(HAVE_LIMIT_$1, $glibcxx_mresult,
|
2003-08-05 04:00:18 +02:00
|
|
|
|
[Only used in build directory testsuite_hooks.h.])
|
|
|
|
|
])
|
|
|
|
|
|
2004-03-01 20:22:28 +01:00
|
|
|
|
AC_DEFUN([GLIBCXX_CHECK_SETRLIMIT], [
|
2003-08-05 04:00:18 +02:00
|
|
|
|
setrlimit_have_headers=yes
|
|
|
|
|
AC_CHECK_HEADERS(unistd.h sys/time.h sys/resource.h,
|
|
|
|
|
[],
|
|
|
|
|
[setrlimit_have_headers=no])
|
|
|
|
|
# If don't have the headers, then we can't run the tests now, and we
|
|
|
|
|
# won't be seeing any of these during testsuite compilation.
|
|
|
|
|
if test $setrlimit_have_headers = yes; then
|
|
|
|
|
# Can't do these in a loop, else the resulting syntax is wrong.
|
|
|
|
|
GLIBCXX_CHECK_SETRLIMIT_ancilliary(DATA)
|
|
|
|
|
GLIBCXX_CHECK_SETRLIMIT_ancilliary(RSS)
|
|
|
|
|
GLIBCXX_CHECK_SETRLIMIT_ancilliary(VMEM)
|
|
|
|
|
GLIBCXX_CHECK_SETRLIMIT_ancilliary(AS)
|
2004-04-01 11:16:36 +02:00
|
|
|
|
GLIBCXX_CHECK_SETRLIMIT_ancilliary(FSIZE)
|
2003-08-05 04:00:18 +02:00
|
|
|
|
|
|
|
|
|
# Check for rlimit, setrlimit.
|
|
|
|
|
AC_CACHE_VAL(ac_setrlimit, [
|
|
|
|
|
AC_TRY_COMPILE(
|
|
|
|
|
[#include <unistd.h>
|
|
|
|
|
#include <sys/time.h>
|
|
|
|
|
#include <sys/resource.h>
|
|
|
|
|
],
|
|
|
|
|
[struct rlimit r;
|
|
|
|
|
setrlimit(0, &r);],
|
|
|
|
|
[ac_setrlimit=yes], [ac_setrlimit=no])
|
|
|
|
|
])
|
|
|
|
|
fi
|
|
|
|
|
|
2004-04-01 11:16:36 +02:00
|
|
|
|
AC_MSG_CHECKING([for testsuite resource limits support])
|
2003-08-05 04:00:18 +02:00
|
|
|
|
if test $setrlimit_have_headers = yes && test $ac_setrlimit = yes; then
|
2004-04-01 11:16:36 +02:00
|
|
|
|
ac_res_limits=yes
|
|
|
|
|
AC_DEFINE(_GLIBCXX_RES_LIMITS)
|
2003-08-05 04:00:18 +02:00
|
|
|
|
else
|
2004-04-01 11:16:36 +02:00
|
|
|
|
ac_res_limits=no
|
2003-08-05 04:00:18 +02:00
|
|
|
|
fi
|
2004-04-01 11:16:36 +02:00
|
|
|
|
AC_MSG_RESULT($ac_res_limits)
|
2002-12-16 20:02:01 +01:00
|
|
|
|
])
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
dnl
|
2003-08-05 04:00:18 +02:00
|
|
|
|
dnl Check whether S_ISREG (Posix) or S_IFREG is available in <sys/stat.h>.
|
|
|
|
|
dnl Define HAVE_S_ISREG / HAVE_S_IFREG appropriately.
|
2002-12-16 20:02:01 +01:00
|
|
|
|
dnl
|
2004-03-01 20:22:28 +01:00
|
|
|
|
AC_DEFUN([GLIBCXX_CHECK_S_ISREG_OR_S_IFREG], [
|
2003-08-05 04:00:18 +02:00
|
|
|
|
AC_CACHE_VAL(glibcxx_cv_S_ISREG, [
|
|
|
|
|
AC_TRY_LINK(
|
|
|
|
|
[#include <sys/stat.h>],
|
|
|
|
|
[struct stat buffer;
|
|
|
|
|
fstat(0, &buffer);
|
|
|
|
|
S_ISREG(buffer.st_mode);],
|
|
|
|
|
[glibcxx_cv_S_ISREG=yes],
|
|
|
|
|
[glibcxx_cv_S_ISREG=no])
|
|
|
|
|
])
|
|
|
|
|
AC_CACHE_VAL(glibcxx_cv_S_IFREG, [
|
|
|
|
|
AC_TRY_LINK(
|
|
|
|
|
[#include <sys/stat.h>],
|
|
|
|
|
[struct stat buffer;
|
|
|
|
|
fstat(0, &buffer);
|
|
|
|
|
S_IFREG & buffer.st_mode;],
|
|
|
|
|
[glibcxx_cv_S_IFREG=yes],
|
|
|
|
|
[glibcxx_cv_S_IFREG=no])
|
|
|
|
|
])
|
|
|
|
|
if test $glibcxx_cv_S_ISREG = yes; then
|
|
|
|
|
AC_DEFINE(HAVE_S_ISREG)
|
|
|
|
|
elif test $glibcxx_cv_S_IFREG = yes; then
|
|
|
|
|
AC_DEFINE(HAVE_S_IFREG)
|
|
|
|
|
fi
|
2000-04-21 22:33:34 +02:00
|
|
|
|
])
|
|
|
|
|
|
|
|
|
|
|
2000-05-09 22:25:13 +02:00
|
|
|
|
dnl
|
2003-08-05 04:00:18 +02:00
|
|
|
|
dnl Check whether poll is available in <poll.h>, and define HAVE_POLL.
|
2000-05-09 22:25:13 +02:00
|
|
|
|
dnl
|
2004-03-01 20:22:28 +01:00
|
|
|
|
AC_DEFUN([GLIBCXX_CHECK_POLL], [
|
2003-08-05 04:00:18 +02:00
|
|
|
|
AC_CACHE_VAL(glibcxx_cv_POLL, [
|
2003-10-22 17:51:55 +02:00
|
|
|
|
AC_TRY_LINK(
|
2003-08-05 04:00:18 +02:00
|
|
|
|
[#include <poll.h>],
|
|
|
|
|
[struct pollfd pfd[1];
|
|
|
|
|
pfd[0].events = POLLIN;
|
|
|
|
|
poll(pfd, 1, 0);],
|
|
|
|
|
[glibcxx_cv_POLL=yes],
|
|
|
|
|
[glibcxx_cv_POLL=no])
|
|
|
|
|
])
|
|
|
|
|
if test $glibcxx_cv_POLL = yes; then
|
|
|
|
|
AC_DEFINE(HAVE_POLL)
|
|
|
|
|
fi
|
|
|
|
|
])
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
dnl
|
|
|
|
|
dnl Check whether writev is available in <sys/uio.h>, and define HAVE_WRITEV.
|
|
|
|
|
dnl
|
2004-03-01 20:22:28 +01:00
|
|
|
|
AC_DEFUN([GLIBCXX_CHECK_WRITEV], [
|
2003-08-05 04:00:18 +02:00
|
|
|
|
AC_CACHE_VAL(glibcxx_cv_WRITEV, [
|
2003-10-22 17:51:55 +02:00
|
|
|
|
AC_TRY_LINK(
|
2003-08-05 04:00:18 +02:00
|
|
|
|
[#include <sys/uio.h>],
|
|
|
|
|
[struct iovec iov[2];
|
|
|
|
|
writev(0, iov, 0);],
|
|
|
|
|
[glibcxx_cv_WRITEV=yes],
|
|
|
|
|
[glibcxx_cv_WRITEV=no])
|
|
|
|
|
])
|
|
|
|
|
if test $glibcxx_cv_WRITEV = yes; then
|
|
|
|
|
AC_DEFINE(HAVE_WRITEV)
|
|
|
|
|
fi
|
|
|
|
|
])
|
|
|
|
|
|
|
|
|
|
|
2003-10-22 17:51:55 +02:00
|
|
|
|
dnl
|
|
|
|
|
dnl Check whether int64_t is available in <stdint.h>, and define HAVE_INT64_T.
|
|
|
|
|
dnl
|
2004-03-01 20:22:28 +01:00
|
|
|
|
AC_DEFUN([GLIBCXX_CHECK_INT64_T], [
|
2003-10-22 17:51:55 +02:00
|
|
|
|
AC_CACHE_VAL(glibcxx_cv_INT64_T, [
|
|
|
|
|
AC_TRY_COMPILE(
|
|
|
|
|
[#include <stdint.h>],
|
|
|
|
|
[int64_t var;],
|
|
|
|
|
[glibcxx_cv_INT64_T=yes],
|
|
|
|
|
[glibcxx_cv_INT64_T=no])
|
|
|
|
|
])
|
|
|
|
|
if test $glibcxx_cv_INT64_T = yes; then
|
|
|
|
|
AC_DEFINE(HAVE_INT64_T)
|
|
|
|
|
fi
|
|
|
|
|
])
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
dnl
|
|
|
|
|
dnl Check whether LFS support is available.
|
|
|
|
|
dnl
|
2004-03-01 20:22:28 +01:00
|
|
|
|
AC_DEFUN([GLIBCXX_CHECK_LFS], [
|
2003-10-28 00:11:52 +01:00
|
|
|
|
AC_LANG_SAVE
|
2003-12-29 21:13:22 +01:00
|
|
|
|
AC_LANG_CPLUSPLUS
|
|
|
|
|
ac_save_CXXFLAGS="$CXXFLAGS"
|
|
|
|
|
CXXFLAGS="$CXXFLAGS -fno-exceptions"
|
2003-10-22 17:51:55 +02:00
|
|
|
|
AC_CACHE_VAL(glibcxx_cv_LFS, [
|
|
|
|
|
AC_TRY_LINK(
|
2003-10-28 00:11:52 +01:00
|
|
|
|
[#include <unistd.h>
|
|
|
|
|
#include <stdio.h>
|
|
|
|
|
],
|
2003-11-21 21:30:12 +01:00
|
|
|
|
[FILE* fp;
|
|
|
|
|
fopen64("t", "w");
|
|
|
|
|
fseeko64(fp, 0, SEEK_CUR);
|
|
|
|
|
ftello64(fp);
|
2003-10-22 17:51:55 +02:00
|
|
|
|
lseek64(1, 0, SEEK_CUR);],
|
|
|
|
|
[glibcxx_cv_LFS=yes],
|
|
|
|
|
[glibcxx_cv_LFS=no])
|
|
|
|
|
])
|
|
|
|
|
if test $glibcxx_cv_LFS = yes; then
|
|
|
|
|
AC_DEFINE(_GLIBCXX_USE_LFS)
|
|
|
|
|
fi
|
2003-12-29 21:13:22 +01:00
|
|
|
|
CXXFLAGS="$ac_save_CXXFLAGS"
|
|
|
|
|
AC_LANG_RESTORE
|
2003-10-22 17:51:55 +02:00
|
|
|
|
])
|
|
|
|
|
|
|
|
|
|
|
2003-08-05 04:00:18 +02:00
|
|
|
|
dnl
|
|
|
|
|
dnl Does any necessary configuration of the testsuite directory. Generates
|
|
|
|
|
dnl the testsuite_hooks.h header.
|
|
|
|
|
dnl
|
|
|
|
|
dnl GLIBCXX_ENABLE_SYMVERS and GLIBCXX_IS_NATIVE must be done before this.
|
|
|
|
|
dnl
|
|
|
|
|
dnl Sets:
|
|
|
|
|
dnl enable_abi_check / GLIBCXX_TEST_ABI
|
|
|
|
|
dnl Substs:
|
|
|
|
|
dnl baseline_dir
|
|
|
|
|
dnl
|
2004-03-01 20:22:28 +01:00
|
|
|
|
AC_DEFUN([GLIBCXX_CONFIGURE_TESTSUITE], [
|
acinclude.m4 (GLIBCXX_CONDITIONAL): New macro.
2003-08-27 Phil Edwards <pme@gcc.gnu.org>
* acinclude.m4 (GLIBCXX_CONDITIONAL): New macro. Wrap
AM_CONDITIONAL. Replace all calls to AM_CONDITIONAL with this one.
(GLIBCXX_ENABLE_HOSTED): New macro, sets new variable is_hosted,
used elsewhere in this file.
(GLIBCXX_EVALUATE_CONDITIONALS): New macro...
* configure.ac: ...called here to expand all conditionals.
* Makefile.am: Conditionalize SUBDIRS on GLIBCXX_HOSTED.
* include/Makefile.am: Remove redundant gxx_include_dir assignment.
(install-freestanding-headers): New target, a subset of
install-headers. Conditionalize install-data-local on GLIBCXX_HOSTED.
* aclocal.m4, configure, Makefile.in, include/Makefile.in,
libmath/Makefile.in, libsupc++/Makefile.in, po/Makefile.in,
src/Makefile.in, testsuite/Makefile.in: Regenerated.
From-SVN: r70854
2003-08-27 21:06:56 +02:00
|
|
|
|
if $GLIBCXX_IS_NATIVE && test $is_hosted = yes; then
|
2004-04-01 11:16:36 +02:00
|
|
|
|
# Do checks for resource limit functions.
|
2003-08-05 04:00:18 +02:00
|
|
|
|
GLIBCXX_CHECK_SETRLIMIT
|
|
|
|
|
|
|
|
|
|
# Look for setenv, so that extended locale tests can be performed.
|
|
|
|
|
GLIBCXX_CHECK_STDLIB_DECL_AND_LINKAGE_3(setenv)
|
2003-09-11 05:11:31 +02:00
|
|
|
|
|
|
|
|
|
if test $enable_symvers = no; then
|
|
|
|
|
enable_abi_check=no
|
|
|
|
|
else
|
|
|
|
|
case "$host" in
|
|
|
|
|
*-*-cygwin*)
|
|
|
|
|
enable_abi_check=no ;;
|
|
|
|
|
*)
|
|
|
|
|
enable_abi_check=yes ;;
|
|
|
|
|
esac
|
|
|
|
|
fi
|
|
|
|
|
else
|
|
|
|
|
# Only build this as native, since automake does not understand
|
|
|
|
|
# CXX_FOR_BUILD.
|
|
|
|
|
enable_abi_check=no
|
2003-08-05 04:00:18 +02:00
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
# Export file names for ABI checking.
|
|
|
|
|
baseline_dir="$glibcxx_srcdir/config/abi/${abi_baseline_pair}\$(MULTISUBDIR)"
|
|
|
|
|
AC_SUBST(baseline_dir)
|
|
|
|
|
|
acinclude.m4 (GLIBCXX_CONDITIONAL): New macro.
2003-08-27 Phil Edwards <pme@gcc.gnu.org>
* acinclude.m4 (GLIBCXX_CONDITIONAL): New macro. Wrap
AM_CONDITIONAL. Replace all calls to AM_CONDITIONAL with this one.
(GLIBCXX_ENABLE_HOSTED): New macro, sets new variable is_hosted,
used elsewhere in this file.
(GLIBCXX_EVALUATE_CONDITIONALS): New macro...
* configure.ac: ...called here to expand all conditionals.
* Makefile.am: Conditionalize SUBDIRS on GLIBCXX_HOSTED.
* include/Makefile.am: Remove redundant gxx_include_dir assignment.
(install-freestanding-headers): New target, a subset of
install-headers. Conditionalize install-data-local on GLIBCXX_HOSTED.
* aclocal.m4, configure, Makefile.in, include/Makefile.in,
libmath/Makefile.in, libsupc++/Makefile.in, po/Makefile.in,
src/Makefile.in, testsuite/Makefile.in: Regenerated.
From-SVN: r70854
2003-08-27 21:06:56 +02:00
|
|
|
|
GLIBCXX_CONDITIONAL(GLIBCXX_TEST_WCHAR_T, test $enable_wchar_t = yes)
|
|
|
|
|
GLIBCXX_CONDITIONAL(GLIBCXX_TEST_ABI, test $enable_abi_check = yes)
|
2003-08-05 04:00:18 +02:00
|
|
|
|
])
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
dnl
|
|
|
|
|
dnl Set up *_INCLUDES variables for all sundry Makefile.am's.
|
|
|
|
|
dnl
|
|
|
|
|
dnl Substs:
|
|
|
|
|
dnl GLIBCXX_INCLUDES
|
|
|
|
|
dnl TOPLEVEL_INCLUDES
|
|
|
|
|
dnl
|
2004-03-01 20:22:28 +01:00
|
|
|
|
AC_DEFUN([GLIBCXX_EXPORT_INCLUDES], [
|
acinclude.m4 (GLIBCXX_EXPORT_INCLUDES): Remove LIBMATH_INCLUDES and LIBSUPCXX_INCLUDES.
2003-08-17 Phil Edwards <pme@gcc.gnu.org>
* acinclude.m4 (GLIBCXX_EXPORT_INCLUDES): Remove LIBMATH_INCLUDES
and LIBSUPCXX_INCLUDES. Re-purpose TOPLEVEL_INCLUDES to refer to
things from the top level.
* configure.ac (GLIBCXX_IS_NATIVE): Determine earlier and re-order.
Comment out the conditionals for CANADIAN and GLIBCXX_BUILD_LIBMATH
(currently unused). Strip the fake-VPATH shell fragment from
automake-generated rules, if present.
* linkage.m4: Add comment.
* fragment.am: New file, containing factored-out common settings.
(AM_CPPFLAGS): Absorb the deprecated INCLUDES variable contents.
* Makefile.am: Include fragment.am. Remove common variables.
* include/Makefile.am: Likewise.
* libmath/Makefile.am: Likewise.
* libsupc++/Makefile.am: Likewise.
* po/Makefile.am: Likewise. Print rules during check.
* src/Makefile.am: Likewise.
* testsuite/Makefile.am: Likewise.
* aclocal.m4, configure, Makefile.in, include/Makefile.in,
libmath/Makefile.in, libsupc++/Makefile.in, po/Makefile.in,
src/Makefile.in, testsuite/Makefile.in: Regenerate.
From-SVN: r70522
2003-08-17 22:23:12 +02:00
|
|
|
|
# Used for every C++ compile we perform.
|
|
|
|
|
GLIBCXX_INCLUDES="\
|
|
|
|
|
-I$glibcxx_builddir/include/$host_alias \
|
|
|
|
|
-I$glibcxx_builddir/include \
|
|
|
|
|
-I$glibcxx_srcdir/libsupc++"
|
2003-08-05 04:00:18 +02:00
|
|
|
|
|
acinclude.m4 (GLIBCXX_EXPORT_INCLUDES): Remove LIBMATH_INCLUDES and LIBSUPCXX_INCLUDES.
2003-08-17 Phil Edwards <pme@gcc.gnu.org>
* acinclude.m4 (GLIBCXX_EXPORT_INCLUDES): Remove LIBMATH_INCLUDES
and LIBSUPCXX_INCLUDES. Re-purpose TOPLEVEL_INCLUDES to refer to
things from the top level.
* configure.ac (GLIBCXX_IS_NATIVE): Determine earlier and re-order.
Comment out the conditionals for CANADIAN and GLIBCXX_BUILD_LIBMATH
(currently unused). Strip the fake-VPATH shell fragment from
automake-generated rules, if present.
* linkage.m4: Add comment.
* fragment.am: New file, containing factored-out common settings.
(AM_CPPFLAGS): Absorb the deprecated INCLUDES variable contents.
* Makefile.am: Include fragment.am. Remove common variables.
* include/Makefile.am: Likewise.
* libmath/Makefile.am: Likewise.
* libsupc++/Makefile.am: Likewise.
* po/Makefile.am: Likewise. Print rules during check.
* src/Makefile.am: Likewise.
* testsuite/Makefile.am: Likewise.
* aclocal.m4, configure, Makefile.in, include/Makefile.in,
libmath/Makefile.in, libsupc++/Makefile.in, po/Makefile.in,
src/Makefile.in, testsuite/Makefile.in: Regenerate.
From-SVN: r70522
2003-08-17 22:23:12 +02:00
|
|
|
|
# For Canadian crosses, pick this up too.
|
2003-08-05 04:00:18 +02:00
|
|
|
|
if test $CANADIAN = yes; then
|
2003-08-27 22:26:22 +02:00
|
|
|
|
GLIBCXX_INCLUDES="$GLIBCXX_INCLUDES -I\${includedir}"
|
2003-08-05 04:00:18 +02:00
|
|
|
|
fi
|
|
|
|
|
|
acinclude.m4 (GLIBCXX_EXPORT_INCLUDES): Remove LIBMATH_INCLUDES and LIBSUPCXX_INCLUDES.
2003-08-17 Phil Edwards <pme@gcc.gnu.org>
* acinclude.m4 (GLIBCXX_EXPORT_INCLUDES): Remove LIBMATH_INCLUDES
and LIBSUPCXX_INCLUDES. Re-purpose TOPLEVEL_INCLUDES to refer to
things from the top level.
* configure.ac (GLIBCXX_IS_NATIVE): Determine earlier and re-order.
Comment out the conditionals for CANADIAN and GLIBCXX_BUILD_LIBMATH
(currently unused). Strip the fake-VPATH shell fragment from
automake-generated rules, if present.
* linkage.m4: Add comment.
* fragment.am: New file, containing factored-out common settings.
(AM_CPPFLAGS): Absorb the deprecated INCLUDES variable contents.
* Makefile.am: Include fragment.am. Remove common variables.
* include/Makefile.am: Likewise.
* libmath/Makefile.am: Likewise.
* libsupc++/Makefile.am: Likewise.
* po/Makefile.am: Likewise. Print rules during check.
* src/Makefile.am: Likewise.
* testsuite/Makefile.am: Likewise.
* aclocal.m4, configure, Makefile.in, include/Makefile.in,
libmath/Makefile.in, libsupc++/Makefile.in, po/Makefile.in,
src/Makefile.in, testsuite/Makefile.in: Regenerate.
From-SVN: r70522
2003-08-17 22:23:12 +02:00
|
|
|
|
# Stuff in the actual top level. Currently only used by libsupc++ to
|
|
|
|
|
# get unwind* headers from the gcc dir.
|
|
|
|
|
#TOPLEVEL_INCLUDES='-I$(toplevel_srcdir)/gcc -I$(toplevel_srcdir)/include'
|
|
|
|
|
TOPLEVEL_INCLUDES='-I$(toplevel_srcdir)/gcc'
|
2003-08-05 04:00:18 +02:00
|
|
|
|
|
|
|
|
|
# Now, export this to all the little Makefiles....
|
|
|
|
|
AC_SUBST(GLIBCXX_INCLUDES)
|
|
|
|
|
AC_SUBST(TOPLEVEL_INCLUDES)
|
|
|
|
|
])
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
dnl
|
|
|
|
|
dnl Set up *_FLAGS and *FLAGS variables for all sundry Makefile.am's.
|
|
|
|
|
dnl (SECTION_FLAGS is done under CHECK_COMPILER_FEATURES.)
|
|
|
|
|
dnl
|
|
|
|
|
dnl Substs:
|
|
|
|
|
dnl OPTIMIZE_CXXFLAGS
|
|
|
|
|
dnl WARN_FLAGS
|
|
|
|
|
dnl
|
2004-03-01 20:22:28 +01:00
|
|
|
|
AC_DEFUN([GLIBCXX_EXPORT_FLAGS], [
|
2003-08-05 04:00:18 +02:00
|
|
|
|
# Optimization flags that are probably a good idea for thrill-seekers. Just
|
|
|
|
|
# uncomment the lines below and make, everything else is ready to go...
|
|
|
|
|
# OPTIMIZE_CXXFLAGS = -O3 -fstrict-aliasing -fvtable-gc
|
|
|
|
|
OPTIMIZE_CXXFLAGS=
|
|
|
|
|
AC_SUBST(OPTIMIZE_CXXFLAGS)
|
|
|
|
|
|
2004-05-03 21:07:49 +02:00
|
|
|
|
WARN_FLAGS='-Wall -Wextra -Wwrite-strings -Wcast-qual'
|
2003-08-05 04:00:18 +02:00
|
|
|
|
AC_SUBST(WARN_FLAGS)
|
|
|
|
|
])
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
dnl
|
|
|
|
|
dnl All installation directory information is determined here.
|
|
|
|
|
dnl
|
|
|
|
|
dnl Substs:
|
|
|
|
|
dnl gxx_install_dir
|
|
|
|
|
dnl glibcxx_prefixdir
|
|
|
|
|
dnl glibcxx_toolexecdir
|
|
|
|
|
dnl glibcxx_toolexeclibdir
|
|
|
|
|
dnl
|
|
|
|
|
dnl Assumes cross_compiling bits already done, and with_cross_host in
|
|
|
|
|
dnl particular.
|
|
|
|
|
dnl
|
2004-03-01 20:22:28 +01:00
|
|
|
|
AC_DEFUN([GLIBCXX_EXPORT_INSTALL_INFO], [
|
2003-08-05 04:00:18 +02:00
|
|
|
|
glibcxx_toolexecdir=no
|
|
|
|
|
glibcxx_toolexeclibdir=no
|
|
|
|
|
glibcxx_prefixdir=$prefix
|
|
|
|
|
|
|
|
|
|
AC_MSG_CHECKING([for gxx-include-dir])
|
|
|
|
|
AC_ARG_WITH([gxx-include-dir],
|
|
|
|
|
AC_HELP_STRING([--with-gxx-include-dir=DIR],
|
|
|
|
|
[installation directory for include files]),
|
|
|
|
|
[case "$withval" in
|
|
|
|
|
yes) AC_MSG_ERROR([Missing directory for --with-gxx-include-dir]) ;;
|
|
|
|
|
no) gxx_include_dir=no ;;
|
|
|
|
|
*) gxx_include_dir=$withval ;;
|
|
|
|
|
esac],
|
|
|
|
|
[gxx_include_dir=no])
|
|
|
|
|
AC_MSG_RESULT($gxx_include_dir)
|
|
|
|
|
|
|
|
|
|
AC_MSG_CHECKING([for --enable-version-specific-runtime-libs])
|
|
|
|
|
AC_ARG_ENABLE([version-specific-runtime-libs],
|
|
|
|
|
AC_HELP_STRING([--enable-version-specific-runtime-libs],
|
|
|
|
|
[Specify that runtime libraries should be installed in a compiler-specific directory]),
|
|
|
|
|
[case "$enableval" in
|
|
|
|
|
yes) version_specific_libs=yes ;;
|
|
|
|
|
no) version_specific_libs=no ;;
|
|
|
|
|
*) AC_MSG_ERROR([Unknown argument to enable/disable version-specific libs]);;
|
|
|
|
|
esac],
|
|
|
|
|
[version_specific_libs=no])
|
|
|
|
|
AC_MSG_RESULT($version_specific_libs)
|
|
|
|
|
|
|
|
|
|
# Default case for install directory for include files.
|
|
|
|
|
if test $version_specific_libs = no && test $gxx_include_dir = no; then
|
|
|
|
|
gxx_include_dir='${prefix}'/include/c++/${gcc_version}
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
# Version-specific runtime libs processing.
|
|
|
|
|
if test $version_specific_libs = yes; then
|
|
|
|
|
# Need the gcc compiler version to know where to install libraries
|
|
|
|
|
# and header files if --enable-version-specific-runtime-libs option
|
2004-02-06 00:19:54 +01:00
|
|
|
|
# is selected. FIXME: these variables are misnamed, there are
|
|
|
|
|
# no executables installed in _toolexecdir or _toolexeclibdir.
|
2003-08-05 04:00:18 +02:00
|
|
|
|
if test x"$gxx_include_dir" = x"no"; then
|
2004-02-06 00:19:54 +01:00
|
|
|
|
gxx_include_dir='${libdir}/gcc/${host_alias}/'$gcc_version/include/c++
|
2003-08-05 04:00:18 +02:00
|
|
|
|
fi
|
2004-02-06 00:19:54 +01:00
|
|
|
|
glibcxx_toolexecdir='${libdir}/gcc/${host_alias}'
|
2003-08-11 07:26:58 +02:00
|
|
|
|
glibcxx_toolexeclibdir='${toolexecdir}/'$gcc_version'$(MULTISUBDIR)'
|
2003-08-05 04:00:18 +02:00
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
# Calculate glibcxx_toolexecdir, glibcxx_toolexeclibdir
|
|
|
|
|
# Install a library built with a cross compiler in tooldir, not libdir.
|
|
|
|
|
if test x"$glibcxx_toolexecdir" = x"no"; then
|
|
|
|
|
if test -n "$with_cross_host" &&
|
|
|
|
|
test x"$with_cross_host" != x"no"; then
|
2003-08-11 07:26:58 +02:00
|
|
|
|
glibcxx_toolexecdir='${exec_prefix}/${host_alias}'
|
|
|
|
|
glibcxx_toolexeclibdir='${toolexecdir}/lib'
|
2003-08-05 04:00:18 +02:00
|
|
|
|
else
|
2004-02-06 00:19:54 +01:00
|
|
|
|
glibcxx_toolexecdir='${libdir}/gcc/${host_alias}'
|
2003-08-11 07:26:58 +02:00
|
|
|
|
glibcxx_toolexeclibdir='${libdir}'
|
2003-08-05 04:00:18 +02:00
|
|
|
|
fi
|
2003-08-11 07:26:58 +02:00
|
|
|
|
multi_os_directory=`$CXX -print-multi-os-directory`
|
2003-08-05 04:00:18 +02:00
|
|
|
|
case $multi_os_directory in
|
|
|
|
|
.) ;; # Avoid trailing /.
|
|
|
|
|
*) glibcxx_toolexeclibdir=$glibcxx_toolexeclibdir/$multi_os_directory ;;
|
|
|
|
|
esac
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
AC_MSG_CHECKING([for install location])
|
|
|
|
|
AC_MSG_RESULT($gxx_include_dir)
|
|
|
|
|
|
|
|
|
|
AC_SUBST(glibcxx_prefixdir)
|
|
|
|
|
AC_SUBST(gxx_include_dir)
|
|
|
|
|
AC_SUBST(glibcxx_toolexecdir)
|
|
|
|
|
AC_SUBST(glibcxx_toolexeclibdir)
|
|
|
|
|
])
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
dnl
|
|
|
|
|
dnl GLIBCXX_ENABLE
|
|
|
|
|
dnl (FEATURE, DEFAULT, HELP-ARG, HELP-STRING)
|
|
|
|
|
dnl (FEATURE, DEFAULT, HELP-ARG, HELP-STRING, permit a|b|c)
|
|
|
|
|
dnl (FEATURE, DEFAULT, HELP-ARG, HELP-STRING, SHELL-CODE-HANDLER)
|
|
|
|
|
dnl
|
|
|
|
|
dnl See docs/html/17_intro/configury.html#enable for documentation.
|
|
|
|
|
dnl
|
|
|
|
|
m4_define([GLIBCXX_ENABLE],[dnl
|
|
|
|
|
m4_define([_g_switch],[--enable-$1])dnl
|
|
|
|
|
m4_define([_g_help],[AC_HELP_STRING(_g_switch$3,[$4 @<:@default=$2@:>@])])dnl
|
|
|
|
|
AC_ARG_ENABLE($1,_g_help,
|
|
|
|
|
m4_bmatch([$5],
|
|
|
|
|
[^permit ],
|
|
|
|
|
[[
|
|
|
|
|
case "$enableval" in
|
|
|
|
|
m4_bpatsubst([$5],[permit ])) ;;
|
|
|
|
|
*) AC_MSG_ERROR(Unknown argument to enable/disable $1) ;;
|
|
|
|
|
dnl Idea for future: generate a URL pointing to
|
|
|
|
|
dnl "onlinedocs/configopts.html#whatever"
|
|
|
|
|
esac
|
|
|
|
|
]],
|
|
|
|
|
[^$],
|
|
|
|
|
[[
|
|
|
|
|
case "$enableval" in
|
|
|
|
|
yes|no) ;;
|
|
|
|
|
*) AC_MSG_ERROR(Argument to enable/disable $1 must be yes or no) ;;
|
|
|
|
|
esac
|
|
|
|
|
]],
|
|
|
|
|
[[$5]]),
|
|
|
|
|
[enable_]m4_bpatsubst([$1],-,_)[=][$2])
|
|
|
|
|
m4_undefine([_g_switch])dnl
|
|
|
|
|
m4_undefine([_g_help])dnl
|
|
|
|
|
])
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
dnl
|
|
|
|
|
dnl Check for ISO/IEC 9899:1999 "C99" support.
|
|
|
|
|
dnl
|
|
|
|
|
dnl --enable-c99 defines _GLIBCXX_USE_C99
|
|
|
|
|
dnl --disable-c99 leaves _GLIBCXX_USE_C99 undefined
|
|
|
|
|
dnl + Usage: GLIBCXX_ENABLE_C99[(DEFAULT)]
|
|
|
|
|
dnl Where DEFAULT is either `yes' or `no'.
|
|
|
|
|
dnl + If 'C99' stuff is not available, ignores DEFAULT and sets `no'.
|
|
|
|
|
dnl
|
2004-03-01 20:22:28 +01:00
|
|
|
|
AC_DEFUN([GLIBCXX_ENABLE_C99], [
|
2003-08-05 04:00:18 +02:00
|
|
|
|
GLIBCXX_ENABLE(c99,$1,,[turns on ISO/IEC 9899:1999 support])
|
|
|
|
|
|
|
|
|
|
AC_LANG_SAVE
|
|
|
|
|
AC_LANG_CPLUSPLUS
|
|
|
|
|
|
|
|
|
|
# Check for the existence of <math.h> functions used if C99 is enabled.
|
|
|
|
|
ac_c99_math=yes;
|
|
|
|
|
AC_MSG_CHECKING([for ISO C99 support in <math.h>])
|
|
|
|
|
AC_TRY_COMPILE([#include <math.h>],[fpclassify(0.0);],, [ac_c99_math=no])
|
|
|
|
|
AC_TRY_COMPILE([#include <math.h>],[isfinite(0.0);],, [ac_c99_math=no])
|
|
|
|
|
AC_TRY_COMPILE([#include <math.h>],[isinf(0.0);],, [ac_c99_math=no])
|
|
|
|
|
AC_TRY_COMPILE([#include <math.h>],[isnan(0.0);],, [ac_c99_math=no])
|
|
|
|
|
AC_TRY_COMPILE([#include <math.h>],[isnormal(0.0);],, [ac_c99_math=no])
|
|
|
|
|
AC_TRY_COMPILE([#include <math.h>],[signbit(0.0);],, [ac_c99_math=no])
|
|
|
|
|
AC_TRY_COMPILE([#include <math.h>],[isgreater(0.0,0.0);],, [ac_c99_math=no])
|
|
|
|
|
AC_TRY_COMPILE([#include <math.h>],
|
|
|
|
|
[isgreaterequal(0.0,0.0);],, [ac_c99_math=no])
|
|
|
|
|
AC_TRY_COMPILE([#include <math.h>],[isless(0.0,0.0);],, [ac_c99_math=no])
|
|
|
|
|
AC_TRY_COMPILE([#include <math.h>],[islessequal(0.0,0.0);],,[ac_c99_math=no])
|
|
|
|
|
AC_TRY_COMPILE([#include <math.h>],
|
|
|
|
|
[islessgreater(0.0,0.0);],, [ac_c99_math=no])
|
|
|
|
|
AC_TRY_COMPILE([#include <math.h>],
|
|
|
|
|
[isunordered(0.0,0.0);],, [ac_c99_math=no])
|
|
|
|
|
AC_MSG_RESULT($ac_c99_math)
|
|
|
|
|
|
2003-12-29 20:26:16 +01:00
|
|
|
|
if test x"$ac_c99_math" = x"yes"; then
|
|
|
|
|
AC_DEFINE(_GLIBCXX_USE_C99_MATH)
|
|
|
|
|
fi
|
|
|
|
|
|
2003-08-05 04:00:18 +02:00
|
|
|
|
# Check for the existence in <stdio.h> of vscanf, et. al.
|
|
|
|
|
ac_c99_stdio=yes;
|
|
|
|
|
AC_MSG_CHECKING([for ISO C99 support in <stdio.h>])
|
|
|
|
|
AC_TRY_COMPILE([#include <stdio.h>],
|
|
|
|
|
[snprintf("12", 0, "%i");],, [ac_c99_stdio=no])
|
|
|
|
|
AC_TRY_COMPILE([#include <stdio.h>
|
|
|
|
|
#include <stdarg.h>
|
|
|
|
|
void foo(char* fmt, ...)
|
|
|
|
|
{va_list args; va_start(args, fmt);
|
|
|
|
|
vfscanf(stderr, "%i", args);}],
|
|
|
|
|
[],, [ac_c99_stdio=no])
|
|
|
|
|
AC_TRY_COMPILE([#include <stdio.h>
|
|
|
|
|
#include <stdarg.h>
|
|
|
|
|
void foo(char* fmt, ...)
|
|
|
|
|
{va_list args; va_start(args, fmt);
|
|
|
|
|
vscanf("%i", args);}],
|
|
|
|
|
[],, [ac_c99_stdio=no])
|
|
|
|
|
AC_TRY_COMPILE([#include <stdio.h>
|
|
|
|
|
#include <stdarg.h>
|
|
|
|
|
void foo(char* fmt, ...)
|
|
|
|
|
{va_list args; va_start(args, fmt);
|
|
|
|
|
vsnprintf(fmt, 0, "%i", args);}],
|
|
|
|
|
[],, [ac_c99_stdio=no])
|
|
|
|
|
AC_TRY_COMPILE([#include <stdio.h>
|
|
|
|
|
#include <stdarg.h>
|
|
|
|
|
void foo(char* fmt, ...)
|
|
|
|
|
{va_list args; va_start(args, fmt);
|
|
|
|
|
vsscanf(fmt, "%i", args);}],
|
|
|
|
|
[],, [ac_c99_stdio=no])
|
|
|
|
|
AC_MSG_RESULT($ac_c99_stdio)
|
|
|
|
|
|
|
|
|
|
# Check for the existence in <stdlib.h> of lldiv_t, et. al.
|
|
|
|
|
ac_c99_stdlib=yes;
|
|
|
|
|
AC_MSG_CHECKING([for lldiv_t declaration])
|
|
|
|
|
AC_CACHE_VAL(ac_c99_lldiv_t, [
|
|
|
|
|
AC_TRY_COMPILE([#include <stdlib.h>],
|
|
|
|
|
[ lldiv_t mydivt;],
|
|
|
|
|
[ac_c99_lldiv_t=yes], [ac_c99_lldiv_t=no])
|
|
|
|
|
])
|
|
|
|
|
AC_MSG_RESULT($ac_c99_lldiv_t)
|
|
|
|
|
|
|
|
|
|
AC_MSG_CHECKING([for ISO C99 support in <stdlib.h>])
|
|
|
|
|
AC_TRY_COMPILE([#include <stdlib.h>],
|
|
|
|
|
[char* tmp; strtof("gnu", &tmp);],, [ac_c99_stdlib=no])
|
|
|
|
|
AC_TRY_COMPILE([#include <stdlib.h>],
|
|
|
|
|
[char* tmp; strtold("gnu", &tmp);],, [ac_c99_stdlib=no])
|
|
|
|
|
AC_TRY_COMPILE([#include <stdlib.h>], [llabs(10);],, [ac_c99_stdlib=no])
|
|
|
|
|
AC_TRY_COMPILE([#include <stdlib.h>], [lldiv(10,1);],, [ac_c99_stdlib=no])
|
|
|
|
|
AC_TRY_COMPILE([#include <stdlib.h>], [atoll("10");],, [ac_c99_stdlib=no])
|
|
|
|
|
AC_TRY_COMPILE([#include <stdlib.h>], [_Exit(0);],, [ac_c99_stdlib=no])
|
|
|
|
|
if test x"$ac_c99_lldiv_t" = x"no"; then
|
|
|
|
|
ac_c99_stdlib=no;
|
|
|
|
|
fi;
|
|
|
|
|
AC_MSG_RESULT($ac_c99_stdlib)
|
|
|
|
|
|
|
|
|
|
# Check for the existence of <wchar.h> functions used if C99 is enabled.
|
|
|
|
|
# XXX the wchar.h checks should be rolled into the general C99 bits.
|
|
|
|
|
ac_c99_wchar=yes;
|
|
|
|
|
AC_MSG_CHECKING([for additional ISO C99 support in <wchar.h>])
|
|
|
|
|
AC_TRY_COMPILE([#include <wchar.h>],
|
|
|
|
|
[wcstold(L"10.0", NULL);],, [ac_c99_wchar=no])
|
|
|
|
|
AC_TRY_COMPILE([#include <wchar.h>],
|
|
|
|
|
[wcstoll(L"10", NULL, 10);],, [ac_c99_wchar=no])
|
|
|
|
|
AC_TRY_COMPILE([#include <wchar.h>],
|
|
|
|
|
[wcstoull(L"10", NULL, 10);],, [ac_c99_wchar=no])
|
|
|
|
|
AC_MSG_RESULT($ac_c99_wchar)
|
|
|
|
|
|
|
|
|
|
AC_MSG_CHECKING([for enabled ISO C99 support])
|
|
|
|
|
if test x"$ac_c99_math" = x"no" ||
|
|
|
|
|
test x"$ac_c99_stdio" = x"no" ||
|
|
|
|
|
test x"$ac_c99_stdlib" = x"no" ||
|
|
|
|
|
test x"$ac_c99_wchar" = x"no"; then
|
|
|
|
|
enable_c99=no;
|
|
|
|
|
fi;
|
|
|
|
|
AC_MSG_RESULT($enable_c99)
|
|
|
|
|
|
2003-12-29 20:26:16 +01:00
|
|
|
|
if test x"$ac_99_math" = x"yes"; then
|
|
|
|
|
AC_DEFINE(_GLIBCXX_USE_C99_MATH)
|
|
|
|
|
fi
|
|
|
|
|
|
2003-08-05 04:00:18 +02:00
|
|
|
|
# Option parsed, now set things appropriately
|
|
|
|
|
if test x"$enable_c99" = x"yes"; then
|
|
|
|
|
AC_DEFINE(_GLIBCXX_USE_C99)
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
AC_LANG_RESTORE
|
2000-05-09 22:25:13 +02:00
|
|
|
|
])
|
|
|
|
|
|
|
|
|
|
|
Preliminary named locales.
2001-01-29 Benjamin Kosnik <bkoz@redhat.com>
Preliminary named locales.
* acinclude.m4 (GLIBCPP_ENABLE_CLOCALE): New macro.
* aclocal.m4: Regenerate.
* configure.in: Use it.
* configure: Regerate.
* src/Makefile.am (sources): Add c++locale.cc.
(build_headers): Add c++locale.h.
* src/Makefile.in: Regenerate.
* config/c_locale_gnu.h: New file.
* config/c_locale_gnu.cc: New file. Non-inline member functions
for named locales, gnu-specific.
* config/c_locale_generic.h: New file.
* config/c_locale_generic.cc: New file. Non-inline member
functions for named locales, generic version.
* docs/html/configopts.html: Add documentation on new options.
* include/bits/locale_facets.h (class _Messages): Remove.
(class _Moneypunct): Remove.
* src/locale-inst.cc: Remove.
* include/bits/locale_facets.h (class _Collate): Remove.
* src/locale-inst.cc (std): Remove.
* src/locale.cc: And here.
* include/bits/localefwd.h (locale::_M_coalesce): New
function. Correctly put together multi-name locales.
(_Impl(const _Impl&, category, size_t)): Remove.
* include/bits/localefwd.h (locale::_Impl): Remove _M_construct_*
member functions.
(_M_normalize_category_names): Remove.
(_M_replace_categories): Fix.
* src/localename.cc (locale::_Impl::_M_construct_collate): Remove.
(locale::_Impl::_M_construct_ctype): Remove.
(locale::_Impl::_M_construct_monetary): Remove.
(locale::_Impl::_M_construct_numeric): Remove.
(locale::_Impl::_M_construct_time): Remove.
(locale::_Impl::_M_construct_messages): Remove.
* include/bits/locale_facets.h (_Bad_use_facet): Remove.
(_Use_facet_failure_handle): Remove.
* src/locale.cc: Remove definitions.
* src/locale-inst.cc: And here.
* testsuite/22_locale/ctor_copy_dtor.cc (test01): Fixup. Add tests.
* src/localename.cc (locale::facet::_S_create_c_locale): Properly
create and error-check underlying locale object.
(locale::facet::_S_destroy_c_locale): Add, take care of properly
tearing down underlying locale object.
* include/bits/localefwd.h (locale::facet): Declare.
* testsuite/22_locale/members.cc: Don't test "fr_FR" locale for
correctness, as glibc apparently has incorrect info in it. Test
with it when it works again.....
* include/bits/localefwd.h (locale::_Impl::__vec_string):
Remove. Number of categories is fixed at six, so just simplify and
make this an array of strings.
(locale::_Impl::_M_has_name): Remove.
(locale::_Impl::_M_name): Remove.
(locale::_Impl::_M_category_names): Turns into...
(locale::_Impl::_M_names): ...this.
(locale::_Impl::_M_has_same_name()): New function.
* src/localename.cc (locale::_Impl::~_Impl()): Remove here.
(locale::_Impl::_Impl(size_t __refs, string __str)): Simplify
signature.
* src/locale.cc (locale::name()): Construct mangled name
accurately reflecting combined locale categories.
* src/locale.cc (locale::classic()): Don't initialize here.
* src/localename.cc (locale::_Impl::_Impl(size_t __num, size_t
__refs, bool __has_name, string __str): Do it here.
* include/bits/localefwd.h: _S_categories_num to
_S_num_categories. _S_facets_num to _S_num_facets.
(locale::id::id()): Explicitly set _M_index to zero.
* src/locale.cc: Same.
* src/locale.cc: (locale::locale(const char*)): Construct named
locales uniquely.
* src/locale.cc: Remove numpunct_byname ctors.
* testsuite/22_locale/numpunct_byname.cc: New file.
* testsuite/22_locale/numpunct.cc: New file.
* include/bits/localefwd.h (class locale): Change data members to
protected, from private.
(_Impl::_M_get_c_locale): Add member function.
(locale::facet::_M_get_global_impl()): Add member function.
* include/bits/locale_facets.h (numpunct::_M_init): Change to take
a __c_locale pointer.
(numpunct::numpunct( __c_locale*, size_t)): Add additonal ctor for
named locales.
* testsuite/22_locale/members.cc: New file, test name and combine.
* include/bits/locale_facets.h (class numpunct): Remove class
_Punct and _Numpunct. Rewrite class numpunct to be correct for
named locales.
* include/bits/localefwd.h (locale::_Imp::_M_c_locale): Add.
* src/localename.cc (_Impl::~_Impl()): Call __frelocale.
(_Imp::_Impl(size_t, size_t, bool, string)) Initialize _M_c_locale.
* src/locale-inst.cc: Remove _Numpunct, _Punct instantiations.
* testsuite/22_locale/numpunct_char_members.cc: New file.
From-SVN: r39347
2001-01-30 10:18:51 +01:00
|
|
|
|
dnl
|
2003-08-05 04:00:18 +02:00
|
|
|
|
dnl Check for what type of C headers to use.
|
|
|
|
|
dnl
|
|
|
|
|
dnl --enable-cheaders= [does stuff].
|
|
|
|
|
dnl --disable-cheaders [does not do anything, really].
|
|
|
|
|
dnl + Usage: GLIBCXX_ENABLE_CHEADERS[(DEFAULT)]
|
|
|
|
|
dnl Where DEFAULT is either `c' or `c_std'.
|
|
|
|
|
dnl
|
2004-03-01 20:22:28 +01:00
|
|
|
|
AC_DEFUN([GLIBCXX_ENABLE_CHEADERS], [
|
2003-08-05 04:00:18 +02:00
|
|
|
|
GLIBCXX_ENABLE(cheaders,$1,[=KIND],
|
|
|
|
|
[construct "C" headers for g++], [permit c|c_std])
|
|
|
|
|
AC_MSG_NOTICE("C" header strategy set to $enable_cheaders)
|
|
|
|
|
|
|
|
|
|
C_INCLUDE_DIR='${glibcxx_srcdir}/include/'$enable_cheaders
|
|
|
|
|
|
|
|
|
|
AC_SUBST(C_INCLUDE_DIR)
|
acinclude.m4 (GLIBCXX_CONDITIONAL): New macro.
2003-08-27 Phil Edwards <pme@gcc.gnu.org>
* acinclude.m4 (GLIBCXX_CONDITIONAL): New macro. Wrap
AM_CONDITIONAL. Replace all calls to AM_CONDITIONAL with this one.
(GLIBCXX_ENABLE_HOSTED): New macro, sets new variable is_hosted,
used elsewhere in this file.
(GLIBCXX_EVALUATE_CONDITIONALS): New macro...
* configure.ac: ...called here to expand all conditionals.
* Makefile.am: Conditionalize SUBDIRS on GLIBCXX_HOSTED.
* include/Makefile.am: Remove redundant gxx_include_dir assignment.
(install-freestanding-headers): New target, a subset of
install-headers. Conditionalize install-data-local on GLIBCXX_HOSTED.
* aclocal.m4, configure, Makefile.in, include/Makefile.in,
libmath/Makefile.in, libsupc++/Makefile.in, po/Makefile.in,
src/Makefile.in, testsuite/Makefile.in: Regenerated.
From-SVN: r70854
2003-08-27 21:06:56 +02:00
|
|
|
|
GLIBCXX_CONDITIONAL(GLIBCXX_C_HEADERS_C, test $enable_cheaders = c)
|
|
|
|
|
GLIBCXX_CONDITIONAL(GLIBCXX_C_HEADERS_C_STD, test $enable_cheaders = c_std)
|
|
|
|
|
GLIBCXX_CONDITIONAL(GLIBCXX_C_HEADERS_COMPATIBILITY, test $c_compatibility = yes)
|
2003-08-05 04:00:18 +02:00
|
|
|
|
])
|
|
|
|
|
|
|
|
|
|
|
Preliminary named locales.
2001-01-29 Benjamin Kosnik <bkoz@redhat.com>
Preliminary named locales.
* acinclude.m4 (GLIBCPP_ENABLE_CLOCALE): New macro.
* aclocal.m4: Regenerate.
* configure.in: Use it.
* configure: Regerate.
* src/Makefile.am (sources): Add c++locale.cc.
(build_headers): Add c++locale.h.
* src/Makefile.in: Regenerate.
* config/c_locale_gnu.h: New file.
* config/c_locale_gnu.cc: New file. Non-inline member functions
for named locales, gnu-specific.
* config/c_locale_generic.h: New file.
* config/c_locale_generic.cc: New file. Non-inline member
functions for named locales, generic version.
* docs/html/configopts.html: Add documentation on new options.
* include/bits/locale_facets.h (class _Messages): Remove.
(class _Moneypunct): Remove.
* src/locale-inst.cc: Remove.
* include/bits/locale_facets.h (class _Collate): Remove.
* src/locale-inst.cc (std): Remove.
* src/locale.cc: And here.
* include/bits/localefwd.h (locale::_M_coalesce): New
function. Correctly put together multi-name locales.
(_Impl(const _Impl&, category, size_t)): Remove.
* include/bits/localefwd.h (locale::_Impl): Remove _M_construct_*
member functions.
(_M_normalize_category_names): Remove.
(_M_replace_categories): Fix.
* src/localename.cc (locale::_Impl::_M_construct_collate): Remove.
(locale::_Impl::_M_construct_ctype): Remove.
(locale::_Impl::_M_construct_monetary): Remove.
(locale::_Impl::_M_construct_numeric): Remove.
(locale::_Impl::_M_construct_time): Remove.
(locale::_Impl::_M_construct_messages): Remove.
* include/bits/locale_facets.h (_Bad_use_facet): Remove.
(_Use_facet_failure_handle): Remove.
* src/locale.cc: Remove definitions.
* src/locale-inst.cc: And here.
* testsuite/22_locale/ctor_copy_dtor.cc (test01): Fixup. Add tests.
* src/localename.cc (locale::facet::_S_create_c_locale): Properly
create and error-check underlying locale object.
(locale::facet::_S_destroy_c_locale): Add, take care of properly
tearing down underlying locale object.
* include/bits/localefwd.h (locale::facet): Declare.
* testsuite/22_locale/members.cc: Don't test "fr_FR" locale for
correctness, as glibc apparently has incorrect info in it. Test
with it when it works again.....
* include/bits/localefwd.h (locale::_Impl::__vec_string):
Remove. Number of categories is fixed at six, so just simplify and
make this an array of strings.
(locale::_Impl::_M_has_name): Remove.
(locale::_Impl::_M_name): Remove.
(locale::_Impl::_M_category_names): Turns into...
(locale::_Impl::_M_names): ...this.
(locale::_Impl::_M_has_same_name()): New function.
* src/localename.cc (locale::_Impl::~_Impl()): Remove here.
(locale::_Impl::_Impl(size_t __refs, string __str)): Simplify
signature.
* src/locale.cc (locale::name()): Construct mangled name
accurately reflecting combined locale categories.
* src/locale.cc (locale::classic()): Don't initialize here.
* src/localename.cc (locale::_Impl::_Impl(size_t __num, size_t
__refs, bool __has_name, string __str): Do it here.
* include/bits/localefwd.h: _S_categories_num to
_S_num_categories. _S_facets_num to _S_num_facets.
(locale::id::id()): Explicitly set _M_index to zero.
* src/locale.cc: Same.
* src/locale.cc: (locale::locale(const char*)): Construct named
locales uniquely.
* src/locale.cc: Remove numpunct_byname ctors.
* testsuite/22_locale/numpunct_byname.cc: New file.
* testsuite/22_locale/numpunct.cc: New file.
* include/bits/localefwd.h (class locale): Change data members to
protected, from private.
(_Impl::_M_get_c_locale): Add member function.
(locale::facet::_M_get_global_impl()): Add member function.
* include/bits/locale_facets.h (numpunct::_M_init): Change to take
a __c_locale pointer.
(numpunct::numpunct( __c_locale*, size_t)): Add additonal ctor for
named locales.
* testsuite/22_locale/members.cc: New file, test name and combine.
* include/bits/locale_facets.h (class numpunct): Remove class
_Punct and _Numpunct. Rewrite class numpunct to be correct for
named locales.
* include/bits/localefwd.h (locale::_Imp::_M_c_locale): Add.
* src/localename.cc (_Impl::~_Impl()): Call __frelocale.
(_Imp::_Impl(size_t, size_t, bool, string)) Initialize _M_c_locale.
* src/locale-inst.cc: Remove _Numpunct, _Punct instantiations.
* testsuite/22_locale/numpunct_char_members.cc: New file.
From-SVN: r39347
2001-01-30 10:18:51 +01:00
|
|
|
|
dnl
|
2003-08-05 04:00:18 +02:00
|
|
|
|
dnl Check for which locale library to use. The choice is mapped to
|
|
|
|
|
dnl a subdirectory of config/locale.
|
2002-12-30 15:54:45 +01:00
|
|
|
|
dnl
|
2003-08-05 04:00:18 +02:00
|
|
|
|
dnl Default is generic.
|
Preliminary named locales.
2001-01-29 Benjamin Kosnik <bkoz@redhat.com>
Preliminary named locales.
* acinclude.m4 (GLIBCPP_ENABLE_CLOCALE): New macro.
* aclocal.m4: Regenerate.
* configure.in: Use it.
* configure: Regerate.
* src/Makefile.am (sources): Add c++locale.cc.
(build_headers): Add c++locale.h.
* src/Makefile.in: Regenerate.
* config/c_locale_gnu.h: New file.
* config/c_locale_gnu.cc: New file. Non-inline member functions
for named locales, gnu-specific.
* config/c_locale_generic.h: New file.
* config/c_locale_generic.cc: New file. Non-inline member
functions for named locales, generic version.
* docs/html/configopts.html: Add documentation on new options.
* include/bits/locale_facets.h (class _Messages): Remove.
(class _Moneypunct): Remove.
* src/locale-inst.cc: Remove.
* include/bits/locale_facets.h (class _Collate): Remove.
* src/locale-inst.cc (std): Remove.
* src/locale.cc: And here.
* include/bits/localefwd.h (locale::_M_coalesce): New
function. Correctly put together multi-name locales.
(_Impl(const _Impl&, category, size_t)): Remove.
* include/bits/localefwd.h (locale::_Impl): Remove _M_construct_*
member functions.
(_M_normalize_category_names): Remove.
(_M_replace_categories): Fix.
* src/localename.cc (locale::_Impl::_M_construct_collate): Remove.
(locale::_Impl::_M_construct_ctype): Remove.
(locale::_Impl::_M_construct_monetary): Remove.
(locale::_Impl::_M_construct_numeric): Remove.
(locale::_Impl::_M_construct_time): Remove.
(locale::_Impl::_M_construct_messages): Remove.
* include/bits/locale_facets.h (_Bad_use_facet): Remove.
(_Use_facet_failure_handle): Remove.
* src/locale.cc: Remove definitions.
* src/locale-inst.cc: And here.
* testsuite/22_locale/ctor_copy_dtor.cc (test01): Fixup. Add tests.
* src/localename.cc (locale::facet::_S_create_c_locale): Properly
create and error-check underlying locale object.
(locale::facet::_S_destroy_c_locale): Add, take care of properly
tearing down underlying locale object.
* include/bits/localefwd.h (locale::facet): Declare.
* testsuite/22_locale/members.cc: Don't test "fr_FR" locale for
correctness, as glibc apparently has incorrect info in it. Test
with it when it works again.....
* include/bits/localefwd.h (locale::_Impl::__vec_string):
Remove. Number of categories is fixed at six, so just simplify and
make this an array of strings.
(locale::_Impl::_M_has_name): Remove.
(locale::_Impl::_M_name): Remove.
(locale::_Impl::_M_category_names): Turns into...
(locale::_Impl::_M_names): ...this.
(locale::_Impl::_M_has_same_name()): New function.
* src/localename.cc (locale::_Impl::~_Impl()): Remove here.
(locale::_Impl::_Impl(size_t __refs, string __str)): Simplify
signature.
* src/locale.cc (locale::name()): Construct mangled name
accurately reflecting combined locale categories.
* src/locale.cc (locale::classic()): Don't initialize here.
* src/localename.cc (locale::_Impl::_Impl(size_t __num, size_t
__refs, bool __has_name, string __str): Do it here.
* include/bits/localefwd.h: _S_categories_num to
_S_num_categories. _S_facets_num to _S_num_facets.
(locale::id::id()): Explicitly set _M_index to zero.
* src/locale.cc: Same.
* src/locale.cc: (locale::locale(const char*)): Construct named
locales uniquely.
* src/locale.cc: Remove numpunct_byname ctors.
* testsuite/22_locale/numpunct_byname.cc: New file.
* testsuite/22_locale/numpunct.cc: New file.
* include/bits/localefwd.h (class locale): Change data members to
protected, from private.
(_Impl::_M_get_c_locale): Add member function.
(locale::facet::_M_get_global_impl()): Add member function.
* include/bits/locale_facets.h (numpunct::_M_init): Change to take
a __c_locale pointer.
(numpunct::numpunct( __c_locale*, size_t)): Add additonal ctor for
named locales.
* testsuite/22_locale/members.cc: New file, test name and combine.
* include/bits/locale_facets.h (class numpunct): Remove class
_Punct and _Numpunct. Rewrite class numpunct to be correct for
named locales.
* include/bits/localefwd.h (locale::_Imp::_M_c_locale): Add.
* src/localename.cc (_Impl::~_Impl()): Call __frelocale.
(_Imp::_Impl(size_t, size_t, bool, string)) Initialize _M_c_locale.
* src/locale-inst.cc: Remove _Numpunct, _Punct instantiations.
* testsuite/22_locale/numpunct_char_members.cc: New file.
From-SVN: r39347
2001-01-30 10:18:51 +01:00
|
|
|
|
dnl
|
2004-03-01 20:22:28 +01:00
|
|
|
|
AC_DEFUN([GLIBCXX_ENABLE_CLOCALE], [
|
2003-08-05 04:00:18 +02:00
|
|
|
|
AC_MSG_CHECKING([for C locale to use])
|
|
|
|
|
GLIBCXX_ENABLE(clocale,auto,[@<:@=MODEL@:>@],
|
|
|
|
|
[use MODEL for target locale package],
|
|
|
|
|
[permit generic|gnu|ieee_1003.1-2001|yes|no|auto])
|
|
|
|
|
|
|
|
|
|
# If they didn't use this option switch, or if they specified --enable
|
|
|
|
|
# with no specific model, we'll have to look for one. If they
|
|
|
|
|
# specified --disable (???), do likewise.
|
|
|
|
|
if test $enable_clocale = no || test $enable_clocale = yes; then
|
|
|
|
|
enable_clocale=auto
|
|
|
|
|
fi
|
Preliminary named locales.
2001-01-29 Benjamin Kosnik <bkoz@redhat.com>
Preliminary named locales.
* acinclude.m4 (GLIBCPP_ENABLE_CLOCALE): New macro.
* aclocal.m4: Regenerate.
* configure.in: Use it.
* configure: Regerate.
* src/Makefile.am (sources): Add c++locale.cc.
(build_headers): Add c++locale.h.
* src/Makefile.in: Regenerate.
* config/c_locale_gnu.h: New file.
* config/c_locale_gnu.cc: New file. Non-inline member functions
for named locales, gnu-specific.
* config/c_locale_generic.h: New file.
* config/c_locale_generic.cc: New file. Non-inline member
functions for named locales, generic version.
* docs/html/configopts.html: Add documentation on new options.
* include/bits/locale_facets.h (class _Messages): Remove.
(class _Moneypunct): Remove.
* src/locale-inst.cc: Remove.
* include/bits/locale_facets.h (class _Collate): Remove.
* src/locale-inst.cc (std): Remove.
* src/locale.cc: And here.
* include/bits/localefwd.h (locale::_M_coalesce): New
function. Correctly put together multi-name locales.
(_Impl(const _Impl&, category, size_t)): Remove.
* include/bits/localefwd.h (locale::_Impl): Remove _M_construct_*
member functions.
(_M_normalize_category_names): Remove.
(_M_replace_categories): Fix.
* src/localename.cc (locale::_Impl::_M_construct_collate): Remove.
(locale::_Impl::_M_construct_ctype): Remove.
(locale::_Impl::_M_construct_monetary): Remove.
(locale::_Impl::_M_construct_numeric): Remove.
(locale::_Impl::_M_construct_time): Remove.
(locale::_Impl::_M_construct_messages): Remove.
* include/bits/locale_facets.h (_Bad_use_facet): Remove.
(_Use_facet_failure_handle): Remove.
* src/locale.cc: Remove definitions.
* src/locale-inst.cc: And here.
* testsuite/22_locale/ctor_copy_dtor.cc (test01): Fixup. Add tests.
* src/localename.cc (locale::facet::_S_create_c_locale): Properly
create and error-check underlying locale object.
(locale::facet::_S_destroy_c_locale): Add, take care of properly
tearing down underlying locale object.
* include/bits/localefwd.h (locale::facet): Declare.
* testsuite/22_locale/members.cc: Don't test "fr_FR" locale for
correctness, as glibc apparently has incorrect info in it. Test
with it when it works again.....
* include/bits/localefwd.h (locale::_Impl::__vec_string):
Remove. Number of categories is fixed at six, so just simplify and
make this an array of strings.
(locale::_Impl::_M_has_name): Remove.
(locale::_Impl::_M_name): Remove.
(locale::_Impl::_M_category_names): Turns into...
(locale::_Impl::_M_names): ...this.
(locale::_Impl::_M_has_same_name()): New function.
* src/localename.cc (locale::_Impl::~_Impl()): Remove here.
(locale::_Impl::_Impl(size_t __refs, string __str)): Simplify
signature.
* src/locale.cc (locale::name()): Construct mangled name
accurately reflecting combined locale categories.
* src/locale.cc (locale::classic()): Don't initialize here.
* src/localename.cc (locale::_Impl::_Impl(size_t __num, size_t
__refs, bool __has_name, string __str): Do it here.
* include/bits/localefwd.h: _S_categories_num to
_S_num_categories. _S_facets_num to _S_num_facets.
(locale::id::id()): Explicitly set _M_index to zero.
* src/locale.cc: Same.
* src/locale.cc: (locale::locale(const char*)): Construct named
locales uniquely.
* src/locale.cc: Remove numpunct_byname ctors.
* testsuite/22_locale/numpunct_byname.cc: New file.
* testsuite/22_locale/numpunct.cc: New file.
* include/bits/localefwd.h (class locale): Change data members to
protected, from private.
(_Impl::_M_get_c_locale): Add member function.
(locale::facet::_M_get_global_impl()): Add member function.
* include/bits/locale_facets.h (numpunct::_M_init): Change to take
a __c_locale pointer.
(numpunct::numpunct( __c_locale*, size_t)): Add additonal ctor for
named locales.
* testsuite/22_locale/members.cc: New file, test name and combine.
* include/bits/locale_facets.h (class numpunct): Remove class
_Punct and _Numpunct. Rewrite class numpunct to be correct for
named locales.
* include/bits/localefwd.h (locale::_Imp::_M_c_locale): Add.
* src/localename.cc (_Impl::~_Impl()): Call __frelocale.
(_Imp::_Impl(size_t, size_t, bool, string)) Initialize _M_c_locale.
* src/locale-inst.cc: Remove _Numpunct, _Punct instantiations.
* testsuite/22_locale/numpunct_char_members.cc: New file.
From-SVN: r39347
2001-01-30 10:18:51 +01:00
|
|
|
|
|
2003-08-05 04:00:18 +02:00
|
|
|
|
# Either a known package, or "auto"
|
Preliminary named locales.
2001-01-29 Benjamin Kosnik <bkoz@redhat.com>
Preliminary named locales.
* acinclude.m4 (GLIBCPP_ENABLE_CLOCALE): New macro.
* aclocal.m4: Regenerate.
* configure.in: Use it.
* configure: Regerate.
* src/Makefile.am (sources): Add c++locale.cc.
(build_headers): Add c++locale.h.
* src/Makefile.in: Regenerate.
* config/c_locale_gnu.h: New file.
* config/c_locale_gnu.cc: New file. Non-inline member functions
for named locales, gnu-specific.
* config/c_locale_generic.h: New file.
* config/c_locale_generic.cc: New file. Non-inline member
functions for named locales, generic version.
* docs/html/configopts.html: Add documentation on new options.
* include/bits/locale_facets.h (class _Messages): Remove.
(class _Moneypunct): Remove.
* src/locale-inst.cc: Remove.
* include/bits/locale_facets.h (class _Collate): Remove.
* src/locale-inst.cc (std): Remove.
* src/locale.cc: And here.
* include/bits/localefwd.h (locale::_M_coalesce): New
function. Correctly put together multi-name locales.
(_Impl(const _Impl&, category, size_t)): Remove.
* include/bits/localefwd.h (locale::_Impl): Remove _M_construct_*
member functions.
(_M_normalize_category_names): Remove.
(_M_replace_categories): Fix.
* src/localename.cc (locale::_Impl::_M_construct_collate): Remove.
(locale::_Impl::_M_construct_ctype): Remove.
(locale::_Impl::_M_construct_monetary): Remove.
(locale::_Impl::_M_construct_numeric): Remove.
(locale::_Impl::_M_construct_time): Remove.
(locale::_Impl::_M_construct_messages): Remove.
* include/bits/locale_facets.h (_Bad_use_facet): Remove.
(_Use_facet_failure_handle): Remove.
* src/locale.cc: Remove definitions.
* src/locale-inst.cc: And here.
* testsuite/22_locale/ctor_copy_dtor.cc (test01): Fixup. Add tests.
* src/localename.cc (locale::facet::_S_create_c_locale): Properly
create and error-check underlying locale object.
(locale::facet::_S_destroy_c_locale): Add, take care of properly
tearing down underlying locale object.
* include/bits/localefwd.h (locale::facet): Declare.
* testsuite/22_locale/members.cc: Don't test "fr_FR" locale for
correctness, as glibc apparently has incorrect info in it. Test
with it when it works again.....
* include/bits/localefwd.h (locale::_Impl::__vec_string):
Remove. Number of categories is fixed at six, so just simplify and
make this an array of strings.
(locale::_Impl::_M_has_name): Remove.
(locale::_Impl::_M_name): Remove.
(locale::_Impl::_M_category_names): Turns into...
(locale::_Impl::_M_names): ...this.
(locale::_Impl::_M_has_same_name()): New function.
* src/localename.cc (locale::_Impl::~_Impl()): Remove here.
(locale::_Impl::_Impl(size_t __refs, string __str)): Simplify
signature.
* src/locale.cc (locale::name()): Construct mangled name
accurately reflecting combined locale categories.
* src/locale.cc (locale::classic()): Don't initialize here.
* src/localename.cc (locale::_Impl::_Impl(size_t __num, size_t
__refs, bool __has_name, string __str): Do it here.
* include/bits/localefwd.h: _S_categories_num to
_S_num_categories. _S_facets_num to _S_num_facets.
(locale::id::id()): Explicitly set _M_index to zero.
* src/locale.cc: Same.
* src/locale.cc: (locale::locale(const char*)): Construct named
locales uniquely.
* src/locale.cc: Remove numpunct_byname ctors.
* testsuite/22_locale/numpunct_byname.cc: New file.
* testsuite/22_locale/numpunct.cc: New file.
* include/bits/localefwd.h (class locale): Change data members to
protected, from private.
(_Impl::_M_get_c_locale): Add member function.
(locale::facet::_M_get_global_impl()): Add member function.
* include/bits/locale_facets.h (numpunct::_M_init): Change to take
a __c_locale pointer.
(numpunct::numpunct( __c_locale*, size_t)): Add additonal ctor for
named locales.
* testsuite/22_locale/members.cc: New file, test name and combine.
* include/bits/locale_facets.h (class numpunct): Remove class
_Punct and _Numpunct. Rewrite class numpunct to be correct for
named locales.
* include/bits/localefwd.h (locale::_Imp::_M_c_locale): Add.
* src/localename.cc (_Impl::~_Impl()): Call __frelocale.
(_Imp::_Impl(size_t, size_t, bool, string)) Initialize _M_c_locale.
* src/locale-inst.cc: Remove _Numpunct, _Punct instantiations.
* testsuite/22_locale/numpunct_char_members.cc: New file.
From-SVN: r39347
2001-01-30 10:18:51 +01:00
|
|
|
|
enable_clocale_flag=$enable_clocale
|
|
|
|
|
|
2003-08-05 04:00:18 +02:00
|
|
|
|
# Probe for locale support if no specific model is specified.
|
|
|
|
|
# Default to "generic".
|
|
|
|
|
if test $enable_clocale_flag = auto; then
|
2004-07-11 09:46:21 +02:00
|
|
|
|
case ${target_os} in
|
|
|
|
|
linux* | gnu* | kfreebsd*-gnu | knetbsd*-gnu)
|
2003-08-05 04:00:18 +02:00
|
|
|
|
AC_EGREP_CPP([_GLIBCXX_ok], [
|
2001-12-15 19:58:49 +01:00
|
|
|
|
#include <features.h>
|
2002-12-30 15:54:45 +01:00
|
|
|
|
#if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2)
|
2003-07-05 06:05:45 +02:00
|
|
|
|
_GLIBCXX_ok
|
2001-12-15 19:58:49 +01:00
|
|
|
|
#endif
|
|
|
|
|
], enable_clocale_flag=gnu, enable_clocale_flag=generic)
|
2001-12-18 22:12:23 +01:00
|
|
|
|
|
2003-08-05 04:00:18 +02:00
|
|
|
|
# Test for bugs early in glibc-2.2.x series
|
2004-07-11 09:46:21 +02:00
|
|
|
|
if test $enable_clocale_flag = gnu; then
|
2003-08-05 04:00:18 +02:00
|
|
|
|
AC_TRY_RUN([
|
|
|
|
|
#define _GNU_SOURCE 1
|
|
|
|
|
#include <locale.h>
|
|
|
|
|
#include <string.h>
|
|
|
|
|
#if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2)
|
|
|
|
|
extern __typeof(newlocale) __newlocale;
|
|
|
|
|
extern __typeof(duplocale) __duplocale;
|
|
|
|
|
extern __typeof(strcoll_l) __strcoll_l;
|
|
|
|
|
#endif
|
|
|
|
|
int main()
|
|
|
|
|
{
|
|
|
|
|
const char __one[] = "<22>uglein Augmen";
|
|
|
|
|
const char __two[] = "<22>uglein";
|
|
|
|
|
int i;
|
|
|
|
|
int j;
|
|
|
|
|
__locale_t loc;
|
|
|
|
|
__locale_t loc_dup;
|
|
|
|
|
loc = __newlocale(1 << LC_ALL, "de_DE", 0);
|
|
|
|
|
loc_dup = __duplocale(loc);
|
|
|
|
|
i = __strcoll_l(__one, __two, loc);
|
|
|
|
|
j = __strcoll_l(__one, __two, loc_dup);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
],
|
|
|
|
|
[enable_clocale_flag=gnu],[enable_clocale_flag=generic],
|
|
|
|
|
[enable_clocale_flag=generic])
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
# ... at some point put __strxfrm_l tests in as well.
|
2001-12-15 19:58:49 +01:00
|
|
|
|
;;
|
|
|
|
|
*)
|
2003-08-05 04:00:18 +02:00
|
|
|
|
enable_clocale_flag=generic
|
|
|
|
|
;;
|
2001-12-15 19:58:49 +01:00
|
|
|
|
esac
|
|
|
|
|
fi
|
|
|
|
|
|
2003-08-05 04:00:18 +02:00
|
|
|
|
# Deal with gettext issues. Default to not using it (=no) until we detect
|
|
|
|
|
# support for it later. Let the user turn it off via --e/d, but let that
|
|
|
|
|
# default to on for easier handling.
|
2002-04-02 04:41:50 +02:00
|
|
|
|
USE_NLS=no
|
2003-08-05 04:00:18 +02:00
|
|
|
|
AC_ARG_ENABLE(nls,
|
|
|
|
|
AC_HELP_STRING([--enable-nls],[use Native Language Support (default)]),
|
|
|
|
|
[],
|
|
|
|
|
[enable_nls=yes])
|
2002-04-02 04:41:50 +02:00
|
|
|
|
|
2003-08-05 04:00:18 +02:00
|
|
|
|
# Set configure bits for specified locale package
|
|
|
|
|
case ${enable_clocale_flag} in
|
|
|
|
|
generic)
|
2001-08-08 04:49:01 +02:00
|
|
|
|
AC_MSG_RESULT(generic)
|
|
|
|
|
|
2002-03-09 03:16:36 +01:00
|
|
|
|
CLOCALE_H=config/locale/generic/c_locale.h
|
|
|
|
|
CLOCALE_CC=config/locale/generic/c_locale.cc
|
|
|
|
|
CCODECVT_H=config/locale/generic/codecvt_specializations.h
|
2002-09-11 05:36:45 +02:00
|
|
|
|
CCODECVT_CC=config/locale/generic/codecvt_members.cc
|
2002-03-09 03:16:36 +01:00
|
|
|
|
CCOLLATE_CC=config/locale/generic/collate_members.cc
|
|
|
|
|
CCTYPE_CC=config/locale/generic/ctype_members.cc
|
|
|
|
|
CMESSAGES_H=config/locale/generic/messages_members.h
|
|
|
|
|
CMESSAGES_CC=config/locale/generic/messages_members.cc
|
|
|
|
|
CMONEY_CC=config/locale/generic/monetary_members.cc
|
|
|
|
|
CNUMERIC_CC=config/locale/generic/numeric_members.cc
|
2003-01-06 22:23:00 +01:00
|
|
|
|
CTIME_H=config/locale/generic/time_members.h
|
2002-03-09 03:16:36 +01:00
|
|
|
|
CTIME_CC=config/locale/generic/time_members.cc
|
2002-09-05 09:46:17 +02:00
|
|
|
|
CLOCALE_INTERNAL_H=config/locale/generic/c++locale_internal.h
|
2001-08-08 04:49:01 +02:00
|
|
|
|
;;
|
2003-08-05 04:00:18 +02:00
|
|
|
|
gnu)
|
Preliminary named locales.
2001-01-29 Benjamin Kosnik <bkoz@redhat.com>
Preliminary named locales.
* acinclude.m4 (GLIBCPP_ENABLE_CLOCALE): New macro.
* aclocal.m4: Regenerate.
* configure.in: Use it.
* configure: Regerate.
* src/Makefile.am (sources): Add c++locale.cc.
(build_headers): Add c++locale.h.
* src/Makefile.in: Regenerate.
* config/c_locale_gnu.h: New file.
* config/c_locale_gnu.cc: New file. Non-inline member functions
for named locales, gnu-specific.
* config/c_locale_generic.h: New file.
* config/c_locale_generic.cc: New file. Non-inline member
functions for named locales, generic version.
* docs/html/configopts.html: Add documentation on new options.
* include/bits/locale_facets.h (class _Messages): Remove.
(class _Moneypunct): Remove.
* src/locale-inst.cc: Remove.
* include/bits/locale_facets.h (class _Collate): Remove.
* src/locale-inst.cc (std): Remove.
* src/locale.cc: And here.
* include/bits/localefwd.h (locale::_M_coalesce): New
function. Correctly put together multi-name locales.
(_Impl(const _Impl&, category, size_t)): Remove.
* include/bits/localefwd.h (locale::_Impl): Remove _M_construct_*
member functions.
(_M_normalize_category_names): Remove.
(_M_replace_categories): Fix.
* src/localename.cc (locale::_Impl::_M_construct_collate): Remove.
(locale::_Impl::_M_construct_ctype): Remove.
(locale::_Impl::_M_construct_monetary): Remove.
(locale::_Impl::_M_construct_numeric): Remove.
(locale::_Impl::_M_construct_time): Remove.
(locale::_Impl::_M_construct_messages): Remove.
* include/bits/locale_facets.h (_Bad_use_facet): Remove.
(_Use_facet_failure_handle): Remove.
* src/locale.cc: Remove definitions.
* src/locale-inst.cc: And here.
* testsuite/22_locale/ctor_copy_dtor.cc (test01): Fixup. Add tests.
* src/localename.cc (locale::facet::_S_create_c_locale): Properly
create and error-check underlying locale object.
(locale::facet::_S_destroy_c_locale): Add, take care of properly
tearing down underlying locale object.
* include/bits/localefwd.h (locale::facet): Declare.
* testsuite/22_locale/members.cc: Don't test "fr_FR" locale for
correctness, as glibc apparently has incorrect info in it. Test
with it when it works again.....
* include/bits/localefwd.h (locale::_Impl::__vec_string):
Remove. Number of categories is fixed at six, so just simplify and
make this an array of strings.
(locale::_Impl::_M_has_name): Remove.
(locale::_Impl::_M_name): Remove.
(locale::_Impl::_M_category_names): Turns into...
(locale::_Impl::_M_names): ...this.
(locale::_Impl::_M_has_same_name()): New function.
* src/localename.cc (locale::_Impl::~_Impl()): Remove here.
(locale::_Impl::_Impl(size_t __refs, string __str)): Simplify
signature.
* src/locale.cc (locale::name()): Construct mangled name
accurately reflecting combined locale categories.
* src/locale.cc (locale::classic()): Don't initialize here.
* src/localename.cc (locale::_Impl::_Impl(size_t __num, size_t
__refs, bool __has_name, string __str): Do it here.
* include/bits/localefwd.h: _S_categories_num to
_S_num_categories. _S_facets_num to _S_num_facets.
(locale::id::id()): Explicitly set _M_index to zero.
* src/locale.cc: Same.
* src/locale.cc: (locale::locale(const char*)): Construct named
locales uniquely.
* src/locale.cc: Remove numpunct_byname ctors.
* testsuite/22_locale/numpunct_byname.cc: New file.
* testsuite/22_locale/numpunct.cc: New file.
* include/bits/localefwd.h (class locale): Change data members to
protected, from private.
(_Impl::_M_get_c_locale): Add member function.
(locale::facet::_M_get_global_impl()): Add member function.
* include/bits/locale_facets.h (numpunct::_M_init): Change to take
a __c_locale pointer.
(numpunct::numpunct( __c_locale*, size_t)): Add additonal ctor for
named locales.
* testsuite/22_locale/members.cc: New file, test name and combine.
* include/bits/locale_facets.h (class numpunct): Remove class
_Punct and _Numpunct. Rewrite class numpunct to be correct for
named locales.
* include/bits/localefwd.h (locale::_Imp::_M_c_locale): Add.
* src/localename.cc (_Impl::~_Impl()): Call __frelocale.
(_Imp::_Impl(size_t, size_t, bool, string)) Initialize _M_c_locale.
* src/locale-inst.cc: Remove _Numpunct, _Punct instantiations.
* testsuite/22_locale/numpunct_char_members.cc: New file.
From-SVN: r39347
2001-01-30 10:18:51 +01:00
|
|
|
|
AC_MSG_RESULT(gnu)
|
2001-08-08 04:49:01 +02:00
|
|
|
|
|
|
|
|
|
# Declare intention to use gettext, and add support for specific
|
|
|
|
|
# languages.
|
2002-05-27 16:55:57 +02:00
|
|
|
|
# For some reason, ALL_LINGUAS has to be before AM-GNU-GETTEXT
|
2001-08-08 04:49:01 +02:00
|
|
|
|
ALL_LINGUAS="de fr"
|
2002-04-02 04:41:50 +02:00
|
|
|
|
|
2002-05-27 16:55:57 +02:00
|
|
|
|
# Don't call AM-GNU-GETTEXT here. Instead, assume glibc.
|
2002-04-02 04:41:50 +02:00
|
|
|
|
AC_CHECK_PROG(check_msgfmt, msgfmt, yes, no)
|
|
|
|
|
if test x"$check_msgfmt" = x"yes" && test x"$enable_nls" = x"yes"; then
|
2003-08-05 04:00:18 +02:00
|
|
|
|
USE_NLS=yes
|
2002-04-02 04:41:50 +02:00
|
|
|
|
fi
|
2001-08-08 04:49:01 +02:00
|
|
|
|
# Export the build objects.
|
|
|
|
|
for ling in $ALL_LINGUAS; do \
|
2003-07-05 06:05:45 +02:00
|
|
|
|
glibcxx_MOFILES="$glibcxx_MOFILES $ling.mo"; \
|
|
|
|
|
glibcxx_POFILES="$glibcxx_POFILES $ling.po"; \
|
2001-08-08 04:49:01 +02:00
|
|
|
|
done
|
2003-07-05 06:05:45 +02:00
|
|
|
|
AC_SUBST(glibcxx_MOFILES)
|
|
|
|
|
AC_SUBST(glibcxx_POFILES)
|
2001-08-08 04:49:01 +02:00
|
|
|
|
|
2002-03-09 03:16:36 +01:00
|
|
|
|
CLOCALE_H=config/locale/gnu/c_locale.h
|
|
|
|
|
CLOCALE_CC=config/locale/gnu/c_locale.cc
|
|
|
|
|
CCODECVT_H=config/locale/ieee_1003.1-2001/codecvt_specializations.h
|
2002-09-11 05:36:45 +02:00
|
|
|
|
CCODECVT_CC=config/locale/gnu/codecvt_members.cc
|
2002-03-09 03:16:36 +01:00
|
|
|
|
CCOLLATE_CC=config/locale/gnu/collate_members.cc
|
|
|
|
|
CCTYPE_CC=config/locale/gnu/ctype_members.cc
|
|
|
|
|
CMESSAGES_H=config/locale/gnu/messages_members.h
|
|
|
|
|
CMESSAGES_CC=config/locale/gnu/messages_members.cc
|
|
|
|
|
CMONEY_CC=config/locale/gnu/monetary_members.cc
|
|
|
|
|
CNUMERIC_CC=config/locale/gnu/numeric_members.cc
|
2003-01-06 22:23:00 +01:00
|
|
|
|
CTIME_H=config/locale/gnu/time_members.h
|
2002-03-09 03:16:36 +01:00
|
|
|
|
CTIME_CC=config/locale/gnu/time_members.cc
|
2002-09-05 09:46:17 +02:00
|
|
|
|
CLOCALE_INTERNAL_H=config/locale/gnu/c++locale_internal.h
|
Preliminary named locales.
2001-01-29 Benjamin Kosnik <bkoz@redhat.com>
Preliminary named locales.
* acinclude.m4 (GLIBCPP_ENABLE_CLOCALE): New macro.
* aclocal.m4: Regenerate.
* configure.in: Use it.
* configure: Regerate.
* src/Makefile.am (sources): Add c++locale.cc.
(build_headers): Add c++locale.h.
* src/Makefile.in: Regenerate.
* config/c_locale_gnu.h: New file.
* config/c_locale_gnu.cc: New file. Non-inline member functions
for named locales, gnu-specific.
* config/c_locale_generic.h: New file.
* config/c_locale_generic.cc: New file. Non-inline member
functions for named locales, generic version.
* docs/html/configopts.html: Add documentation on new options.
* include/bits/locale_facets.h (class _Messages): Remove.
(class _Moneypunct): Remove.
* src/locale-inst.cc: Remove.
* include/bits/locale_facets.h (class _Collate): Remove.
* src/locale-inst.cc (std): Remove.
* src/locale.cc: And here.
* include/bits/localefwd.h (locale::_M_coalesce): New
function. Correctly put together multi-name locales.
(_Impl(const _Impl&, category, size_t)): Remove.
* include/bits/localefwd.h (locale::_Impl): Remove _M_construct_*
member functions.
(_M_normalize_category_names): Remove.
(_M_replace_categories): Fix.
* src/localename.cc (locale::_Impl::_M_construct_collate): Remove.
(locale::_Impl::_M_construct_ctype): Remove.
(locale::_Impl::_M_construct_monetary): Remove.
(locale::_Impl::_M_construct_numeric): Remove.
(locale::_Impl::_M_construct_time): Remove.
(locale::_Impl::_M_construct_messages): Remove.
* include/bits/locale_facets.h (_Bad_use_facet): Remove.
(_Use_facet_failure_handle): Remove.
* src/locale.cc: Remove definitions.
* src/locale-inst.cc: And here.
* testsuite/22_locale/ctor_copy_dtor.cc (test01): Fixup. Add tests.
* src/localename.cc (locale::facet::_S_create_c_locale): Properly
create and error-check underlying locale object.
(locale::facet::_S_destroy_c_locale): Add, take care of properly
tearing down underlying locale object.
* include/bits/localefwd.h (locale::facet): Declare.
* testsuite/22_locale/members.cc: Don't test "fr_FR" locale for
correctness, as glibc apparently has incorrect info in it. Test
with it when it works again.....
* include/bits/localefwd.h (locale::_Impl::__vec_string):
Remove. Number of categories is fixed at six, so just simplify and
make this an array of strings.
(locale::_Impl::_M_has_name): Remove.
(locale::_Impl::_M_name): Remove.
(locale::_Impl::_M_category_names): Turns into...
(locale::_Impl::_M_names): ...this.
(locale::_Impl::_M_has_same_name()): New function.
* src/localename.cc (locale::_Impl::~_Impl()): Remove here.
(locale::_Impl::_Impl(size_t __refs, string __str)): Simplify
signature.
* src/locale.cc (locale::name()): Construct mangled name
accurately reflecting combined locale categories.
* src/locale.cc (locale::classic()): Don't initialize here.
* src/localename.cc (locale::_Impl::_Impl(size_t __num, size_t
__refs, bool __has_name, string __str): Do it here.
* include/bits/localefwd.h: _S_categories_num to
_S_num_categories. _S_facets_num to _S_num_facets.
(locale::id::id()): Explicitly set _M_index to zero.
* src/locale.cc: Same.
* src/locale.cc: (locale::locale(const char*)): Construct named
locales uniquely.
* src/locale.cc: Remove numpunct_byname ctors.
* testsuite/22_locale/numpunct_byname.cc: New file.
* testsuite/22_locale/numpunct.cc: New file.
* include/bits/localefwd.h (class locale): Change data members to
protected, from private.
(_Impl::_M_get_c_locale): Add member function.
(locale::facet::_M_get_global_impl()): Add member function.
* include/bits/locale_facets.h (numpunct::_M_init): Change to take
a __c_locale pointer.
(numpunct::numpunct( __c_locale*, size_t)): Add additonal ctor for
named locales.
* testsuite/22_locale/members.cc: New file, test name and combine.
* include/bits/locale_facets.h (class numpunct): Remove class
_Punct and _Numpunct. Rewrite class numpunct to be correct for
named locales.
* include/bits/localefwd.h (locale::_Imp::_M_c_locale): Add.
* src/localename.cc (_Impl::~_Impl()): Call __frelocale.
(_Imp::_Impl(size_t, size_t, bool, string)) Initialize _M_c_locale.
* src/locale-inst.cc: Remove _Numpunct, _Punct instantiations.
* testsuite/22_locale/numpunct_char_members.cc: New file.
From-SVN: r39347
2001-01-30 10:18:51 +01:00
|
|
|
|
;;
|
2003-08-05 04:00:18 +02:00
|
|
|
|
ieee_1003.1-2001)
|
2003-04-30 00:47:03 +02:00
|
|
|
|
AC_MSG_RESULT(IEEE 1003.1)
|
2001-08-08 04:49:01 +02:00
|
|
|
|
|
2002-03-09 03:16:36 +01:00
|
|
|
|
CLOCALE_H=config/locale/ieee_1003.1-2001/c_locale.h
|
|
|
|
|
CLOCALE_CC=config/locale/ieee_1003.1-2001/c_locale.cc
|
|
|
|
|
CCODECVT_H=config/locale/ieee_1003.1-2001/codecvt_specializations.h
|
2002-09-11 05:36:45 +02:00
|
|
|
|
CCODECVT_CC=config/locale/generic/codecvt_members.cc
|
2002-03-09 03:16:36 +01:00
|
|
|
|
CCOLLATE_CC=config/locale/generic/collate_members.cc
|
|
|
|
|
CCTYPE_CC=config/locale/generic/ctype_members.cc
|
|
|
|
|
CMESSAGES_H=config/locale/ieee_1003.1-2001/messages_members.h
|
|
|
|
|
CMESSAGES_CC=config/locale/ieee_1003.1-2001/messages_members.cc
|
|
|
|
|
CMONEY_CC=config/locale/generic/monetary_members.cc
|
|
|
|
|
CNUMERIC_CC=config/locale/generic/numeric_members.cc
|
2003-01-06 22:23:00 +01:00
|
|
|
|
CTIME_H=config/locale/generic/time_members.h
|
2002-03-09 03:16:36 +01:00
|
|
|
|
CTIME_CC=config/locale/generic/time_members.cc
|
2002-09-05 09:46:17 +02:00
|
|
|
|
CLOCALE_INTERNAL_H=config/locale/generic/c++locale_internal.h
|
Preliminary named locales.
2001-01-29 Benjamin Kosnik <bkoz@redhat.com>
Preliminary named locales.
* acinclude.m4 (GLIBCPP_ENABLE_CLOCALE): New macro.
* aclocal.m4: Regenerate.
* configure.in: Use it.
* configure: Regerate.
* src/Makefile.am (sources): Add c++locale.cc.
(build_headers): Add c++locale.h.
* src/Makefile.in: Regenerate.
* config/c_locale_gnu.h: New file.
* config/c_locale_gnu.cc: New file. Non-inline member functions
for named locales, gnu-specific.
* config/c_locale_generic.h: New file.
* config/c_locale_generic.cc: New file. Non-inline member
functions for named locales, generic version.
* docs/html/configopts.html: Add documentation on new options.
* include/bits/locale_facets.h (class _Messages): Remove.
(class _Moneypunct): Remove.
* src/locale-inst.cc: Remove.
* include/bits/locale_facets.h (class _Collate): Remove.
* src/locale-inst.cc (std): Remove.
* src/locale.cc: And here.
* include/bits/localefwd.h (locale::_M_coalesce): New
function. Correctly put together multi-name locales.
(_Impl(const _Impl&, category, size_t)): Remove.
* include/bits/localefwd.h (locale::_Impl): Remove _M_construct_*
member functions.
(_M_normalize_category_names): Remove.
(_M_replace_categories): Fix.
* src/localename.cc (locale::_Impl::_M_construct_collate): Remove.
(locale::_Impl::_M_construct_ctype): Remove.
(locale::_Impl::_M_construct_monetary): Remove.
(locale::_Impl::_M_construct_numeric): Remove.
(locale::_Impl::_M_construct_time): Remove.
(locale::_Impl::_M_construct_messages): Remove.
* include/bits/locale_facets.h (_Bad_use_facet): Remove.
(_Use_facet_failure_handle): Remove.
* src/locale.cc: Remove definitions.
* src/locale-inst.cc: And here.
* testsuite/22_locale/ctor_copy_dtor.cc (test01): Fixup. Add tests.
* src/localename.cc (locale::facet::_S_create_c_locale): Properly
create and error-check underlying locale object.
(locale::facet::_S_destroy_c_locale): Add, take care of properly
tearing down underlying locale object.
* include/bits/localefwd.h (locale::facet): Declare.
* testsuite/22_locale/members.cc: Don't test "fr_FR" locale for
correctness, as glibc apparently has incorrect info in it. Test
with it when it works again.....
* include/bits/localefwd.h (locale::_Impl::__vec_string):
Remove. Number of categories is fixed at six, so just simplify and
make this an array of strings.
(locale::_Impl::_M_has_name): Remove.
(locale::_Impl::_M_name): Remove.
(locale::_Impl::_M_category_names): Turns into...
(locale::_Impl::_M_names): ...this.
(locale::_Impl::_M_has_same_name()): New function.
* src/localename.cc (locale::_Impl::~_Impl()): Remove here.
(locale::_Impl::_Impl(size_t __refs, string __str)): Simplify
signature.
* src/locale.cc (locale::name()): Construct mangled name
accurately reflecting combined locale categories.
* src/locale.cc (locale::classic()): Don't initialize here.
* src/localename.cc (locale::_Impl::_Impl(size_t __num, size_t
__refs, bool __has_name, string __str): Do it here.
* include/bits/localefwd.h: _S_categories_num to
_S_num_categories. _S_facets_num to _S_num_facets.
(locale::id::id()): Explicitly set _M_index to zero.
* src/locale.cc: Same.
* src/locale.cc: (locale::locale(const char*)): Construct named
locales uniquely.
* src/locale.cc: Remove numpunct_byname ctors.
* testsuite/22_locale/numpunct_byname.cc: New file.
* testsuite/22_locale/numpunct.cc: New file.
* include/bits/localefwd.h (class locale): Change data members to
protected, from private.
(_Impl::_M_get_c_locale): Add member function.
(locale::facet::_M_get_global_impl()): Add member function.
* include/bits/locale_facets.h (numpunct::_M_init): Change to take
a __c_locale pointer.
(numpunct::numpunct( __c_locale*, size_t)): Add additonal ctor for
named locales.
* testsuite/22_locale/members.cc: New file, test name and combine.
* include/bits/locale_facets.h (class numpunct): Remove class
_Punct and _Numpunct. Rewrite class numpunct to be correct for
named locales.
* include/bits/localefwd.h (locale::_Imp::_M_c_locale): Add.
* src/localename.cc (_Impl::~_Impl()): Call __frelocale.
(_Imp::_Impl(size_t, size_t, bool, string)) Initialize _M_c_locale.
* src/locale-inst.cc: Remove _Numpunct, _Punct instantiations.
* testsuite/22_locale/numpunct_char_members.cc: New file.
From-SVN: r39347
2001-01-30 10:18:51 +01:00
|
|
|
|
;;
|
|
|
|
|
esac
|
|
|
|
|
|
2001-08-08 04:49:01 +02:00
|
|
|
|
# This is where the testsuite looks for locale catalogs, using the
|
|
|
|
|
# -DLOCALEDIR define during testsuite compilation.
|
2003-07-05 06:05:45 +02:00
|
|
|
|
glibcxx_localedir=${glibcxx_builddir}/po/share/locale
|
|
|
|
|
AC_SUBST(glibcxx_localedir)
|
2001-08-08 04:49:01 +02:00
|
|
|
|
|
2003-04-30 00:47:03 +02:00
|
|
|
|
# A standalone libintl (e.g., GNU libintl) may be in use.
|
|
|
|
|
if test $USE_NLS = yes; then
|
2003-05-02 04:53:28 +02:00
|
|
|
|
AC_CHECK_HEADERS([libintl.h], [], USE_NLS=no)
|
|
|
|
|
AC_SEARCH_LIBS(gettext, intl, [], USE_NLS=no)
|
|
|
|
|
fi
|
|
|
|
|
if test $USE_NLS = yes; then
|
2003-07-05 06:05:45 +02:00
|
|
|
|
AC_DEFINE(_GLIBCXX_USE_NLS)
|
2003-04-30 00:47:03 +02:00
|
|
|
|
fi
|
|
|
|
|
|
2001-08-14 03:24:30 +02:00
|
|
|
|
AC_SUBST(USE_NLS)
|
2001-07-13 18:47:56 +02:00
|
|
|
|
AC_SUBST(CLOCALE_H)
|
2001-08-08 04:49:01 +02:00
|
|
|
|
AC_SUBST(CCODECVT_H)
|
|
|
|
|
AC_SUBST(CMESSAGES_H)
|
2002-12-16 20:02:01 +01:00
|
|
|
|
AC_SUBST(CCODECVT_CC)
|
|
|
|
|
AC_SUBST(CCOLLATE_CC)
|
|
|
|
|
AC_SUBST(CCTYPE_CC)
|
|
|
|
|
AC_SUBST(CMESSAGES_CC)
|
|
|
|
|
AC_SUBST(CMONEY_CC)
|
|
|
|
|
AC_SUBST(CNUMERIC_CC)
|
2003-01-06 22:23:00 +01:00
|
|
|
|
AC_SUBST(CTIME_H)
|
2002-12-16 20:02:01 +01:00
|
|
|
|
AC_SUBST(CTIME_CC)
|
|
|
|
|
AC_SUBST(CLOCALE_CC)
|
|
|
|
|
AC_SUBST(CLOCALE_INTERNAL_H)
|
Preliminary named locales.
2001-01-29 Benjamin Kosnik <bkoz@redhat.com>
Preliminary named locales.
* acinclude.m4 (GLIBCPP_ENABLE_CLOCALE): New macro.
* aclocal.m4: Regenerate.
* configure.in: Use it.
* configure: Regerate.
* src/Makefile.am (sources): Add c++locale.cc.
(build_headers): Add c++locale.h.
* src/Makefile.in: Regenerate.
* config/c_locale_gnu.h: New file.
* config/c_locale_gnu.cc: New file. Non-inline member functions
for named locales, gnu-specific.
* config/c_locale_generic.h: New file.
* config/c_locale_generic.cc: New file. Non-inline member
functions for named locales, generic version.
* docs/html/configopts.html: Add documentation on new options.
* include/bits/locale_facets.h (class _Messages): Remove.
(class _Moneypunct): Remove.
* src/locale-inst.cc: Remove.
* include/bits/locale_facets.h (class _Collate): Remove.
* src/locale-inst.cc (std): Remove.
* src/locale.cc: And here.
* include/bits/localefwd.h (locale::_M_coalesce): New
function. Correctly put together multi-name locales.
(_Impl(const _Impl&, category, size_t)): Remove.
* include/bits/localefwd.h (locale::_Impl): Remove _M_construct_*
member functions.
(_M_normalize_category_names): Remove.
(_M_replace_categories): Fix.
* src/localename.cc (locale::_Impl::_M_construct_collate): Remove.
(locale::_Impl::_M_construct_ctype): Remove.
(locale::_Impl::_M_construct_monetary): Remove.
(locale::_Impl::_M_construct_numeric): Remove.
(locale::_Impl::_M_construct_time): Remove.
(locale::_Impl::_M_construct_messages): Remove.
* include/bits/locale_facets.h (_Bad_use_facet): Remove.
(_Use_facet_failure_handle): Remove.
* src/locale.cc: Remove definitions.
* src/locale-inst.cc: And here.
* testsuite/22_locale/ctor_copy_dtor.cc (test01): Fixup. Add tests.
* src/localename.cc (locale::facet::_S_create_c_locale): Properly
create and error-check underlying locale object.
(locale::facet::_S_destroy_c_locale): Add, take care of properly
tearing down underlying locale object.
* include/bits/localefwd.h (locale::facet): Declare.
* testsuite/22_locale/members.cc: Don't test "fr_FR" locale for
correctness, as glibc apparently has incorrect info in it. Test
with it when it works again.....
* include/bits/localefwd.h (locale::_Impl::__vec_string):
Remove. Number of categories is fixed at six, so just simplify and
make this an array of strings.
(locale::_Impl::_M_has_name): Remove.
(locale::_Impl::_M_name): Remove.
(locale::_Impl::_M_category_names): Turns into...
(locale::_Impl::_M_names): ...this.
(locale::_Impl::_M_has_same_name()): New function.
* src/localename.cc (locale::_Impl::~_Impl()): Remove here.
(locale::_Impl::_Impl(size_t __refs, string __str)): Simplify
signature.
* src/locale.cc (locale::name()): Construct mangled name
accurately reflecting combined locale categories.
* src/locale.cc (locale::classic()): Don't initialize here.
* src/localename.cc (locale::_Impl::_Impl(size_t __num, size_t
__refs, bool __has_name, string __str): Do it here.
* include/bits/localefwd.h: _S_categories_num to
_S_num_categories. _S_facets_num to _S_num_facets.
(locale::id::id()): Explicitly set _M_index to zero.
* src/locale.cc: Same.
* src/locale.cc: (locale::locale(const char*)): Construct named
locales uniquely.
* src/locale.cc: Remove numpunct_byname ctors.
* testsuite/22_locale/numpunct_byname.cc: New file.
* testsuite/22_locale/numpunct.cc: New file.
* include/bits/localefwd.h (class locale): Change data members to
protected, from private.
(_Impl::_M_get_c_locale): Add member function.
(locale::facet::_M_get_global_impl()): Add member function.
* include/bits/locale_facets.h (numpunct::_M_init): Change to take
a __c_locale pointer.
(numpunct::numpunct( __c_locale*, size_t)): Add additonal ctor for
named locales.
* testsuite/22_locale/members.cc: New file, test name and combine.
* include/bits/locale_facets.h (class numpunct): Remove class
_Punct and _Numpunct. Rewrite class numpunct to be correct for
named locales.
* include/bits/localefwd.h (locale::_Imp::_M_c_locale): Add.
* src/localename.cc (_Impl::~_Impl()): Call __frelocale.
(_Imp::_Impl(size_t, size_t, bool, string)) Initialize _M_c_locale.
* src/locale-inst.cc: Remove _Numpunct, _Punct instantiations.
* testsuite/22_locale/numpunct_char_members.cc: New file.
From-SVN: r39347
2001-01-30 10:18:51 +01:00
|
|
|
|
])
|
|
|
|
|
|
|
|
|
|
|
2004-03-13 07:54:25 +01:00
|
|
|
|
dnl
|
|
|
|
|
dnl Check for which std::allocator base class to use. The choice is
|
|
|
|
|
dnl mapped from a subdirectory of include/ext.
|
|
|
|
|
dnl
|
|
|
|
|
dnl Default is new.
|
|
|
|
|
dnl
|
|
|
|
|
AC_DEFUN([GLIBCXX_ENABLE_ALLOCATOR], [
|
|
|
|
|
AC_MSG_CHECKING([for std::allocator base class to use])
|
|
|
|
|
GLIBCXX_ENABLE(libstdcxx-allocator,auto,[=KIND],
|
|
|
|
|
[use KIND for target std::allocator base],
|
2004-03-22 14:07:13 +01:00
|
|
|
|
[permit new|malloc|mt|bitmap|pool|yes|no|auto])
|
2004-07-11 09:46:21 +02:00
|
|
|
|
|
2004-03-13 07:54:25 +01:00
|
|
|
|
# If they didn't use this option switch, or if they specified --enable
|
|
|
|
|
# with no specific model, we'll have to look for one. If they
|
|
|
|
|
# specified --disable (???), do likewise.
|
2004-07-11 09:46:21 +02:00
|
|
|
|
if test $enable_libstdcxx_allocator = no ||
|
|
|
|
|
test $enable_libstdcxx_allocator = yes;
|
|
|
|
|
then
|
2004-03-13 07:54:25 +01:00
|
|
|
|
enable_libstdcxx_allocator=auto
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
# Either a known package, or "auto"
|
|
|
|
|
enable_libstdcxx_allocator_flag=$enable_libstdcxx_allocator
|
|
|
|
|
|
|
|
|
|
# Probe for host-specific support if no specific model is specified.
|
|
|
|
|
# Default to "new".
|
|
|
|
|
if test $enable_libstdcxx_allocator_flag = auto; then
|
|
|
|
|
case ${target_os} in
|
|
|
|
|
*)
|
|
|
|
|
enable_libstdcxx_allocator_flag=new
|
|
|
|
|
;;
|
|
|
|
|
esac
|
|
|
|
|
fi
|
|
|
|
|
AC_MSG_RESULT($enable_libstdcxx_allocator_flag)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# Set configure bits for specified locale package
|
|
|
|
|
case ${enable_libstdcxx_allocator_flag} in
|
|
|
|
|
bitmap)
|
|
|
|
|
ALLOCATOR_H=config/allocator/bitmap_allocator_base.h
|
|
|
|
|
ALLOCATOR_NAME=__gnu_cxx::bitmap_allocator
|
|
|
|
|
;;
|
|
|
|
|
malloc)
|
|
|
|
|
ALLOCATOR_H=config/allocator/malloc_allocator_base.h
|
|
|
|
|
ALLOCATOR_NAME=__gnu_cxx::malloc_allocator
|
|
|
|
|
;;
|
|
|
|
|
mt)
|
|
|
|
|
ALLOCATOR_H=config/allocator/mt_allocator_base.h
|
|
|
|
|
ALLOCATOR_NAME=__gnu_cxx::__mt_alloc
|
|
|
|
|
;;
|
|
|
|
|
new)
|
|
|
|
|
ALLOCATOR_H=config/allocator/new_allocator_base.h
|
|
|
|
|
ALLOCATOR_NAME=__gnu_cxx::new_allocator
|
|
|
|
|
;;
|
2004-03-22 14:07:13 +01:00
|
|
|
|
pool)
|
|
|
|
|
ALLOCATOR_H=config/allocator/pool_allocator_base.h
|
|
|
|
|
ALLOCATOR_NAME=__gnu_cxx::__pool_alloc
|
|
|
|
|
;;
|
2004-03-13 07:54:25 +01:00
|
|
|
|
esac
|
|
|
|
|
|
|
|
|
|
AC_SUBST(ALLOCATOR_H)
|
|
|
|
|
AC_SUBST(ALLOCATOR_NAME)
|
|
|
|
|
])
|
|
|
|
|
|
|
|
|
|
|
2000-04-21 22:33:34 +02:00
|
|
|
|
dnl
|
2003-08-05 04:00:18 +02:00
|
|
|
|
dnl Check for whether the Boost-derived checks should be turned on.
|
|
|
|
|
dnl
|
|
|
|
|
dnl --enable-concept-checks turns them on.
|
|
|
|
|
dnl --disable-concept-checks leaves them off.
|
|
|
|
|
dnl + Usage: GLIBCXX_ENABLE_CONCEPT_CHECKS[(DEFAULT)]
|
|
|
|
|
dnl Where DEFAULT is either `yes' or `no'.
|
|
|
|
|
dnl
|
2004-03-01 20:22:28 +01:00
|
|
|
|
AC_DEFUN([GLIBCXX_ENABLE_CONCEPT_CHECKS], [
|
2003-08-05 04:00:18 +02:00
|
|
|
|
GLIBCXX_ENABLE(concept-checks,$1,,[use Boost-derived template checks])
|
|
|
|
|
if test $enable_concept_checks = yes; then
|
|
|
|
|
AC_DEFINE(_GLIBCXX_CONCEPT_CHECKS)
|
|
|
|
|
fi
|
|
|
|
|
])
|
|
|
|
|
|
|
|
|
|
|
2000-04-21 22:33:34 +02:00
|
|
|
|
dnl
|
2003-08-05 04:00:18 +02:00
|
|
|
|
dnl Check for which I/O library to use: stdio, or something specific.
|
2002-12-30 15:54:45 +01:00
|
|
|
|
dnl
|
2003-08-05 04:00:18 +02:00
|
|
|
|
dnl Default is stdio.
|
2000-04-21 22:33:34 +02:00
|
|
|
|
dnl
|
2004-03-01 20:22:28 +01:00
|
|
|
|
AC_DEFUN([GLIBCXX_ENABLE_CSTDIO], [
|
2003-08-05 04:00:18 +02:00
|
|
|
|
AC_MSG_CHECKING([for underlying I/O to use])
|
|
|
|
|
GLIBCXX_ENABLE(cstdio,stdio,[=PACKAGE],
|
|
|
|
|
[use target-specific I/O package], [permit stdio])
|
|
|
|
|
|
|
|
|
|
# Now that libio has been removed, you can have any color you want as long
|
|
|
|
|
# as it's black. This is one big no-op until other packages are added, but
|
|
|
|
|
# showing the framework never hurts.
|
|
|
|
|
case ${enable_cstdio} in
|
|
|
|
|
stdio)
|
2001-08-08 04:49:01 +02:00
|
|
|
|
CSTDIO_H=config/io/c_io_stdio.h
|
|
|
|
|
BASIC_FILE_H=config/io/basic_file_stdio.h
|
|
|
|
|
BASIC_FILE_CC=config/io/basic_file_stdio.cc
|
2000-11-01 22:38:32 +01:00
|
|
|
|
AC_MSG_RESULT(stdio)
|
2000-07-19 02:57:38 +02:00
|
|
|
|
;;
|
2000-04-21 22:33:34 +02:00
|
|
|
|
esac
|
2003-07-04 09:14:54 +02:00
|
|
|
|
|
2001-07-13 18:47:56 +02:00
|
|
|
|
AC_SUBST(CSTDIO_H)
|
|
|
|
|
AC_SUBST(BASIC_FILE_H)
|
2002-12-16 20:02:01 +01:00
|
|
|
|
AC_SUBST(BASIC_FILE_CC)
|
2000-04-21 22:33:34 +02:00
|
|
|
|
])
|
|
|
|
|
|
|
|
|
|
|
2003-04-17 05:27:05 +02:00
|
|
|
|
dnl
|
2003-08-05 04:00:18 +02:00
|
|
|
|
dnl Check for "unusual" flags to pass to the compiler while building.
|
2003-04-17 05:27:05 +02:00
|
|
|
|
dnl
|
2003-08-05 04:00:18 +02:00
|
|
|
|
dnl --enable-cxx-flags='-foo -bar -baz' is a general method for passing
|
|
|
|
|
dnl experimental flags such as -fpch, -fIMI, -Dfloat=char, etc.
|
|
|
|
|
dnl --disable-cxx-flags passes nothing.
|
|
|
|
|
dnl + See http://gcc.gnu.org/ml/libstdc++/2000-q2/msg00131.html
|
|
|
|
|
dnl http://gcc.gnu.org/ml/libstdc++/2000-q2/msg00284.html
|
|
|
|
|
dnl http://gcc.gnu.org/ml/libstdc++/2000-q1/msg00035.html
|
|
|
|
|
dnl + Usage: GLIBCXX_ENABLE_CXX_FLAGS(default flags)
|
|
|
|
|
dnl If "default flags" is an empty string, the effect is the same
|
|
|
|
|
dnl as --disable or --enable=no.
|
2003-06-30 19:40:13 +02:00
|
|
|
|
dnl
|
2004-03-01 20:22:28 +01:00
|
|
|
|
AC_DEFUN([GLIBCXX_ENABLE_CXX_FLAGS], [dnl
|
2003-08-05 04:00:18 +02:00
|
|
|
|
AC_MSG_CHECKING([for extra compiler flags for building])
|
|
|
|
|
GLIBCXX_ENABLE(cxx-flags,$1,[=FLAGS],
|
|
|
|
|
[pass compiler FLAGS when building library],
|
|
|
|
|
[case "x$enable_cxx_flags" in
|
|
|
|
|
xno | x) enable_cxx_flags= ;;
|
|
|
|
|
x-*) ;;
|
|
|
|
|
*) AC_MSG_ERROR(_g_switch needs compiler flags as arguments) ;;
|
|
|
|
|
esac])
|
|
|
|
|
|
|
|
|
|
# Run through flags (either default or command-line) and set anything
|
|
|
|
|
# extra (e.g., #defines) that must accompany particular g++ options.
|
|
|
|
|
if test -n "$enable_cxx_flags"; then
|
|
|
|
|
for f in $enable_cxx_flags; do
|
|
|
|
|
case "$f" in
|
|
|
|
|
-fhonor-std) ;;
|
|
|
|
|
-*) ;;
|
|
|
|
|
*) # and we're trying to pass /what/ exactly?
|
|
|
|
|
AC_MSG_ERROR([compiler flags start with a -]) ;;
|
|
|
|
|
esac
|
|
|
|
|
done
|
2003-06-30 19:40:13 +02:00
|
|
|
|
fi
|
|
|
|
|
|
2003-08-05 04:00:18 +02:00
|
|
|
|
EXTRA_CXX_FLAGS="$enable_cxx_flags"
|
|
|
|
|
AC_MSG_RESULT($EXTRA_CXX_FLAGS)
|
|
|
|
|
AC_SUBST(EXTRA_CXX_FLAGS)
|
2003-04-17 05:27:05 +02:00
|
|
|
|
])
|
|
|
|
|
|
2003-08-05 04:00:18 +02:00
|
|
|
|
|
2000-04-21 22:33:34 +02:00
|
|
|
|
dnl
|
2003-08-05 04:00:18 +02:00
|
|
|
|
dnl Check for wide character support. Has the same effect as the option
|
|
|
|
|
dnl in gcc's configure, but in a form that autoconf can mess with.
|
2000-04-21 22:33:34 +02:00
|
|
|
|
dnl
|
2003-08-05 04:00:18 +02:00
|
|
|
|
dnl --enable-c-mbchar requests all the wchar_t stuff.
|
|
|
|
|
dnl --disable-c-mbchar doesn't.
|
|
|
|
|
dnl + Usage: GLIBCXX_ENABLE_C_MBCHAR[(DEFAULT)]
|
|
|
|
|
dnl Where DEFAULT is either `yes' or `no'.
|
|
|
|
|
dnl
|
2004-03-01 20:22:28 +01:00
|
|
|
|
AC_DEFUN([GLIBCXX_ENABLE_C_MBCHAR], [
|
2003-08-05 04:00:18 +02:00
|
|
|
|
GLIBCXX_ENABLE(c-mbchar,$1,,[enable multibyte (wide) characters])
|
|
|
|
|
# Option parsed, now other scripts can test enable_c_mbchar for yes/no.
|
|
|
|
|
])
|
2000-04-21 22:33:34 +02:00
|
|
|
|
|
2001-07-13 18:47:56 +02:00
|
|
|
|
|
2003-08-05 04:00:18 +02:00
|
|
|
|
dnl
|
|
|
|
|
dnl Check to see if debugging libraries are to be built.
|
|
|
|
|
dnl
|
|
|
|
|
dnl --enable-libstdcxx-debug
|
|
|
|
|
dnl builds a separate set of debugging libraries in addition to the
|
|
|
|
|
dnl normal (shared, static) libstdc++ binaries.
|
|
|
|
|
dnl
|
|
|
|
|
dnl --disable-libstdcxx-debug
|
|
|
|
|
dnl builds only one (non-debug) version of libstdc++.
|
|
|
|
|
dnl
|
|
|
|
|
dnl --enable-libstdcxx-debug-flags=FLAGS
|
|
|
|
|
dnl iff --enable-debug == yes, then use FLAGS to build the debug library.
|
|
|
|
|
dnl
|
|
|
|
|
dnl + Usage: GLIBCXX_ENABLE_DEBUG[(DEFAULT)]
|
|
|
|
|
dnl Where DEFAULT is either `yes' or `no'.
|
|
|
|
|
dnl
|
2004-03-01 20:22:28 +01:00
|
|
|
|
AC_DEFUN([GLIBCXX_ENABLE_DEBUG], [
|
2003-08-05 04:00:18 +02:00
|
|
|
|
AC_MSG_CHECKING([for additional debug build])
|
|
|
|
|
GLIBCXX_ENABLE(libstdcxx-debug,$1,,[build extra debug library])
|
|
|
|
|
AC_MSG_RESULT($enable_libstdcxx_debug)
|
acinclude.m4 (GLIBCXX_CONDITIONAL): New macro.
2003-08-27 Phil Edwards <pme@gcc.gnu.org>
* acinclude.m4 (GLIBCXX_CONDITIONAL): New macro. Wrap
AM_CONDITIONAL. Replace all calls to AM_CONDITIONAL with this one.
(GLIBCXX_ENABLE_HOSTED): New macro, sets new variable is_hosted,
used elsewhere in this file.
(GLIBCXX_EVALUATE_CONDITIONALS): New macro...
* configure.ac: ...called here to expand all conditionals.
* Makefile.am: Conditionalize SUBDIRS on GLIBCXX_HOSTED.
* include/Makefile.am: Remove redundant gxx_include_dir assignment.
(install-freestanding-headers): New target, a subset of
install-headers. Conditionalize install-data-local on GLIBCXX_HOSTED.
* aclocal.m4, configure, Makefile.in, include/Makefile.in,
libmath/Makefile.in, libsupc++/Makefile.in, po/Makefile.in,
src/Makefile.in, testsuite/Makefile.in: Regenerated.
From-SVN: r70854
2003-08-27 21:06:56 +02:00
|
|
|
|
GLIBCXX_CONDITIONAL(GLIBCXX_BUILD_DEBUG, test $enable_libstdcxx_debug = yes)
|
2000-04-21 22:33:34 +02:00
|
|
|
|
])
|
|
|
|
|
|
|
|
|
|
|
2001-03-28 13:04:51 +02:00
|
|
|
|
dnl
|
2003-08-05 04:00:18 +02:00
|
|
|
|
dnl Check for explicit debug flags.
|
2001-03-28 13:04:51 +02:00
|
|
|
|
dnl
|
2003-08-05 04:00:18 +02:00
|
|
|
|
dnl --enable-libstdcxx-debug-flags='-O1'
|
|
|
|
|
dnl is a general method for passing flags to be used when
|
|
|
|
|
dnl building debug libraries with --enable-debug.
|
2001-03-28 13:04:51 +02:00
|
|
|
|
dnl
|
2003-08-05 04:00:18 +02:00
|
|
|
|
dnl --disable-libstdcxx-debug-flags does nothing.
|
|
|
|
|
dnl + Usage: GLIBCXX_ENABLE_DEBUG_FLAGS(default flags)
|
|
|
|
|
dnl If "default flags" is an empty string, the effect is the same
|
|
|
|
|
dnl as --disable or --enable=no.
|
|
|
|
|
dnl
|
2004-03-01 20:22:28 +01:00
|
|
|
|
AC_DEFUN([GLIBCXX_ENABLE_DEBUG_FLAGS], [
|
2003-08-05 04:00:18 +02:00
|
|
|
|
GLIBCXX_ENABLE(libstdcxx-debug-flags,[$1],[=FLAGS],
|
|
|
|
|
[pass compiler FLAGS when building debug library],
|
|
|
|
|
[case "x$enable_libstdcxx_debug_flags" in
|
|
|
|
|
xno | x) enable_libstdcxx_debug_flags= ;;
|
|
|
|
|
x-*) ;;
|
|
|
|
|
*) AC_MSG_ERROR(_g_switch needs compiler flags as arguments) ;;
|
|
|
|
|
esac])
|
|
|
|
|
|
|
|
|
|
# Option parsed, now set things appropriately
|
|
|
|
|
DEBUG_FLAGS="$enable_libstdcxx_debug_flags"
|
|
|
|
|
AC_SUBST(DEBUG_FLAGS)
|
|
|
|
|
|
|
|
|
|
AC_MSG_NOTICE([Debug build flags set to $DEBUG_FLAGS])
|
2001-03-28 13:04:51 +02:00
|
|
|
|
])
|
|
|
|
|
|
|
|
|
|
|
acinclude.m4 (GLIBCXX_CONDITIONAL): New macro.
2003-08-27 Phil Edwards <pme@gcc.gnu.org>
* acinclude.m4 (GLIBCXX_CONDITIONAL): New macro. Wrap
AM_CONDITIONAL. Replace all calls to AM_CONDITIONAL with this one.
(GLIBCXX_ENABLE_HOSTED): New macro, sets new variable is_hosted,
used elsewhere in this file.
(GLIBCXX_EVALUATE_CONDITIONALS): New macro...
* configure.ac: ...called here to expand all conditionals.
* Makefile.am: Conditionalize SUBDIRS on GLIBCXX_HOSTED.
* include/Makefile.am: Remove redundant gxx_include_dir assignment.
(install-freestanding-headers): New target, a subset of
install-headers. Conditionalize install-data-local on GLIBCXX_HOSTED.
* aclocal.m4, configure, Makefile.in, include/Makefile.in,
libmath/Makefile.in, libsupc++/Makefile.in, po/Makefile.in,
src/Makefile.in, testsuite/Makefile.in: Regenerated.
From-SVN: r70854
2003-08-27 21:06:56 +02:00
|
|
|
|
dnl
|
|
|
|
|
dnl Check if the user only wants a freestanding library implementation.
|
|
|
|
|
dnl
|
|
|
|
|
dnl --disable-hosted-libstdcxx will turn off most of the library build,
|
|
|
|
|
dnl installing only the headers required by [17.4.1.3] and the language
|
|
|
|
|
dnl support library. More than that will be built (to keep the Makefiles
|
|
|
|
|
dnl conveniently clean), but not installed.
|
|
|
|
|
dnl
|
|
|
|
|
dnl Sets:
|
|
|
|
|
dnl is_hosted (yes/no)
|
|
|
|
|
dnl
|
2003-09-02 20:46:54 +02:00
|
|
|
|
dnl Defines:
|
|
|
|
|
dnl _GLIBCXX_HOSTED (always defined, either to 1 or 0)
|
|
|
|
|
dnl
|
2004-03-01 20:22:28 +01:00
|
|
|
|
AC_DEFUN([GLIBCXX_ENABLE_HOSTED], [
|
acinclude.m4 (GLIBCXX_CONDITIONAL): New macro.
2003-08-27 Phil Edwards <pme@gcc.gnu.org>
* acinclude.m4 (GLIBCXX_CONDITIONAL): New macro. Wrap
AM_CONDITIONAL. Replace all calls to AM_CONDITIONAL with this one.
(GLIBCXX_ENABLE_HOSTED): New macro, sets new variable is_hosted,
used elsewhere in this file.
(GLIBCXX_EVALUATE_CONDITIONALS): New macro...
* configure.ac: ...called here to expand all conditionals.
* Makefile.am: Conditionalize SUBDIRS on GLIBCXX_HOSTED.
* include/Makefile.am: Remove redundant gxx_include_dir assignment.
(install-freestanding-headers): New target, a subset of
install-headers. Conditionalize install-data-local on GLIBCXX_HOSTED.
* aclocal.m4, configure, Makefile.in, include/Makefile.in,
libmath/Makefile.in, libsupc++/Makefile.in, po/Makefile.in,
src/Makefile.in, testsuite/Makefile.in: Regenerated.
From-SVN: r70854
2003-08-27 21:06:56 +02:00
|
|
|
|
AC_ARG_ENABLE([hosted-libstdcxx],
|
|
|
|
|
AC_HELP_STRING([--disable-hosted-libstdcxx],
|
|
|
|
|
[only build freestanding C++ runtime support]),,
|
|
|
|
|
[enable_hosted_libstdcxx=yes])
|
|
|
|
|
if test "$enable_hosted_libstdcxx" = no; then
|
|
|
|
|
AC_MSG_NOTICE([Only freestanding libraries will be built])
|
|
|
|
|
is_hosted=no
|
2003-09-02 20:46:54 +02:00
|
|
|
|
hosted_define=0
|
acinclude.m4 (GLIBCXX_CONDITIONAL): New macro.
2003-08-27 Phil Edwards <pme@gcc.gnu.org>
* acinclude.m4 (GLIBCXX_CONDITIONAL): New macro. Wrap
AM_CONDITIONAL. Replace all calls to AM_CONDITIONAL with this one.
(GLIBCXX_ENABLE_HOSTED): New macro, sets new variable is_hosted,
used elsewhere in this file.
(GLIBCXX_EVALUATE_CONDITIONALS): New macro...
* configure.ac: ...called here to expand all conditionals.
* Makefile.am: Conditionalize SUBDIRS on GLIBCXX_HOSTED.
* include/Makefile.am: Remove redundant gxx_include_dir assignment.
(install-freestanding-headers): New target, a subset of
install-headers. Conditionalize install-data-local on GLIBCXX_HOSTED.
* aclocal.m4, configure, Makefile.in, include/Makefile.in,
libmath/Makefile.in, libsupc++/Makefile.in, po/Makefile.in,
src/Makefile.in, testsuite/Makefile.in: Regenerated.
From-SVN: r70854
2003-08-27 21:06:56 +02:00
|
|
|
|
enable_abi_check=no
|
|
|
|
|
enable_libstdcxx_pch=no
|
|
|
|
|
else
|
|
|
|
|
is_hosted=yes
|
2003-09-02 20:46:54 +02:00
|
|
|
|
hosted_define=1
|
acinclude.m4 (GLIBCXX_CONDITIONAL): New macro.
2003-08-27 Phil Edwards <pme@gcc.gnu.org>
* acinclude.m4 (GLIBCXX_CONDITIONAL): New macro. Wrap
AM_CONDITIONAL. Replace all calls to AM_CONDITIONAL with this one.
(GLIBCXX_ENABLE_HOSTED): New macro, sets new variable is_hosted,
used elsewhere in this file.
(GLIBCXX_EVALUATE_CONDITIONALS): New macro...
* configure.ac: ...called here to expand all conditionals.
* Makefile.am: Conditionalize SUBDIRS on GLIBCXX_HOSTED.
* include/Makefile.am: Remove redundant gxx_include_dir assignment.
(install-freestanding-headers): New target, a subset of
install-headers. Conditionalize install-data-local on GLIBCXX_HOSTED.
* aclocal.m4, configure, Makefile.in, include/Makefile.in,
libmath/Makefile.in, libsupc++/Makefile.in, po/Makefile.in,
src/Makefile.in, testsuite/Makefile.in: Regenerated.
From-SVN: r70854
2003-08-27 21:06:56 +02:00
|
|
|
|
fi
|
|
|
|
|
GLIBCXX_CONDITIONAL(GLIBCXX_HOSTED, test $is_hosted = yes)
|
2003-09-02 20:46:54 +02:00
|
|
|
|
AC_DEFINE_UNQUOTED(_GLIBCXX_HOSTED, $hosted_define,
|
|
|
|
|
[Define to 1 if a full hosted library is built, or 0 if freestanding.])
|
acinclude.m4 (GLIBCXX_CONDITIONAL): New macro.
2003-08-27 Phil Edwards <pme@gcc.gnu.org>
* acinclude.m4 (GLIBCXX_CONDITIONAL): New macro. Wrap
AM_CONDITIONAL. Replace all calls to AM_CONDITIONAL with this one.
(GLIBCXX_ENABLE_HOSTED): New macro, sets new variable is_hosted,
used elsewhere in this file.
(GLIBCXX_EVALUATE_CONDITIONALS): New macro...
* configure.ac: ...called here to expand all conditionals.
* Makefile.am: Conditionalize SUBDIRS on GLIBCXX_HOSTED.
* include/Makefile.am: Remove redundant gxx_include_dir assignment.
(install-freestanding-headers): New target, a subset of
install-headers. Conditionalize install-data-local on GLIBCXX_HOSTED.
* aclocal.m4, configure, Makefile.in, include/Makefile.in,
libmath/Makefile.in, libsupc++/Makefile.in, po/Makefile.in,
src/Makefile.in, testsuite/Makefile.in: Regenerated.
From-SVN: r70854
2003-08-27 21:06:56 +02:00
|
|
|
|
])
|
|
|
|
|
|
|
|
|
|
|
2001-04-21 00:26:55 +02:00
|
|
|
|
dnl
|
|
|
|
|
dnl Check for template specializations for the 'long long' type extension.
|
2001-11-02 23:31:03 +01:00
|
|
|
|
dnl The result determines only whether 'long long' I/O is enabled; things
|
|
|
|
|
dnl like numeric_limits<> specializations are always available.
|
2001-04-21 00:26:55 +02:00
|
|
|
|
dnl
|
2003-07-05 06:05:45 +02:00
|
|
|
|
dnl --enable-long-long defines _GLIBCXX_USE_LONG_LONG
|
|
|
|
|
dnl --disable-long-long leaves _GLIBCXX_USE_LONG_LONG undefined
|
|
|
|
|
dnl + Usage: GLIBCXX_ENABLE_LONG_LONG[(DEFAULT)]
|
2003-08-05 04:00:18 +02:00
|
|
|
|
dnl Where DEFAULT is either `yes' or `no'.
|
2001-04-21 00:26:55 +02:00
|
|
|
|
dnl
|
2004-03-01 20:22:28 +01:00
|
|
|
|
AC_DEFUN([GLIBCXX_ENABLE_LONG_LONG], [
|
2003-08-05 04:00:18 +02:00
|
|
|
|
GLIBCXX_ENABLE(long-long,$1,,[enables I/O support for 'long long'])
|
|
|
|
|
if test $enable_long_long = yes; then
|
2003-07-05 06:05:45 +02:00
|
|
|
|
AC_DEFINE(_GLIBCXX_USE_LONG_LONG)
|
2001-04-21 00:26:55 +02:00
|
|
|
|
fi
|
|
|
|
|
])
|
|
|
|
|
|
|
|
|
|
|
2000-05-16 19:06:39 +02:00
|
|
|
|
dnl
|
2003-08-05 04:00:18 +02:00
|
|
|
|
dnl Check to see if building and using a C++ precompiled header can be done.
|
2001-02-07 02:54:21 +01:00
|
|
|
|
dnl
|
2003-08-05 04:00:18 +02:00
|
|
|
|
dnl --enable-libstdcxx-pch=yes
|
|
|
|
|
dnl default, this shows intent to use stdc++.h.gch If it looks like it
|
|
|
|
|
dnl may work, after some light-hearted attempts to puzzle out compiler
|
|
|
|
|
dnl support, flip bits on in include/Makefile.am
|
2001-02-06 07:32:01 +01:00
|
|
|
|
dnl
|
2003-08-05 04:00:18 +02:00
|
|
|
|
dnl --disable-libstdcxx-pch
|
|
|
|
|
dnl turns off attempts to use or build stdc++.h.gch.
|
2001-08-07 05:38:33 +02:00
|
|
|
|
dnl
|
2003-08-05 04:00:18 +02:00
|
|
|
|
dnl Substs:
|
|
|
|
|
dnl glibcxx_PCHFLAGS
|
2001-08-07 05:38:33 +02:00
|
|
|
|
dnl
|
2004-03-01 20:22:28 +01:00
|
|
|
|
AC_DEFUN([GLIBCXX_ENABLE_PCH], [
|
2003-08-05 04:00:18 +02:00
|
|
|
|
AC_MSG_CHECKING([for enabled PCH])
|
|
|
|
|
GLIBCXX_ENABLE(libstdcxx-pch,$1,,[build pre-compiled libstdc++ headers])
|
|
|
|
|
AC_MSG_RESULT([$enable_libstdcxx_pch])
|
2003-06-17 07:46:01 +02:00
|
|
|
|
|
2003-08-05 04:00:18 +02:00
|
|
|
|
if test $enable_libstdcxx_pch = yes; then
|
|
|
|
|
AC_CACHE_CHECK([for compiler with PCH support],
|
|
|
|
|
[glibcxx_cv_prog_CXX_pch],
|
|
|
|
|
[ac_save_CXXFLAGS="$CXXFLAGS"
|
|
|
|
|
CXXFLAGS="$CXXFLAGS -Werror -Winvalid-pch -Wno-deprecated"
|
|
|
|
|
AC_LANG_SAVE
|
|
|
|
|
AC_LANG_CPLUSPLUS
|
|
|
|
|
echo '#include <math.h>' > conftest.h
|
|
|
|
|
if $CXX $CXXFLAGS $CPPFLAGS -x c++-header conftest.h \
|
|
|
|
|
-o conftest.h.gch 1>&5 2>&1 &&
|
|
|
|
|
echo '#error "pch failed"' > conftest.h &&
|
|
|
|
|
echo '#include "conftest.h"' > conftest.cc &&
|
|
|
|
|
$CXX -c $CXXFLAGS $CPPFLAGS conftest.cc 1>&5 2>&1 ;
|
|
|
|
|
then
|
|
|
|
|
glibcxx_cv_prog_CXX_pch=yes
|
|
|
|
|
else
|
|
|
|
|
glibcxx_cv_prog_CXX_pch=no
|
|
|
|
|
fi
|
|
|
|
|
rm -f conftest*
|
|
|
|
|
CXXFLAGS=$ac_save_CXXFLAGS
|
|
|
|
|
AC_LANG_RESTORE
|
|
|
|
|
])
|
|
|
|
|
enable_libstdcxx_pch=$glibcxx_cv_prog_CXX_pch
|
2003-06-17 07:46:01 +02:00
|
|
|
|
fi
|
2002-08-22 22:06:01 +02:00
|
|
|
|
|
acinclude.m4 (GLIBCXX_CONDITIONAL): New macro.
2003-08-27 Phil Edwards <pme@gcc.gnu.org>
* acinclude.m4 (GLIBCXX_CONDITIONAL): New macro. Wrap
AM_CONDITIONAL. Replace all calls to AM_CONDITIONAL with this one.
(GLIBCXX_ENABLE_HOSTED): New macro, sets new variable is_hosted,
used elsewhere in this file.
(GLIBCXX_EVALUATE_CONDITIONALS): New macro...
* configure.ac: ...called here to expand all conditionals.
* Makefile.am: Conditionalize SUBDIRS on GLIBCXX_HOSTED.
* include/Makefile.am: Remove redundant gxx_include_dir assignment.
(install-freestanding-headers): New target, a subset of
install-headers. Conditionalize install-data-local on GLIBCXX_HOSTED.
* aclocal.m4, configure, Makefile.in, include/Makefile.in,
libmath/Makefile.in, libsupc++/Makefile.in, po/Makefile.in,
src/Makefile.in, testsuite/Makefile.in: Regenerated.
From-SVN: r70854
2003-08-27 21:06:56 +02:00
|
|
|
|
GLIBCXX_CONDITIONAL(GLIBCXX_BUILD_PCH, test $enable_libstdcxx_pch = yes)
|
2003-08-05 04:00:18 +02:00
|
|
|
|
if test $enable_libstdcxx_pch = yes; then
|
|
|
|
|
glibcxx_PCHFLAGS="-include bits/stdc++.h"
|
2003-06-17 07:46:01 +02:00
|
|
|
|
else
|
2003-08-05 04:00:18 +02:00
|
|
|
|
glibcxx_PCHFLAGS=""
|
2003-03-28 19:28:47 +01:00
|
|
|
|
fi
|
2003-08-05 04:00:18 +02:00
|
|
|
|
AC_SUBST(glibcxx_PCHFLAGS)
|
2003-03-28 19:28:47 +01:00
|
|
|
|
])
|
|
|
|
|
|
2001-04-20 10:59:25 +02:00
|
|
|
|
|
2003-07-14 20:23:12 +02:00
|
|
|
|
dnl
|
2003-08-05 04:00:18 +02:00
|
|
|
|
dnl Check for exception handling support. If an explicit enable/disable
|
|
|
|
|
dnl sjlj exceptions is given, we don't have to detect. Otherwise the
|
|
|
|
|
dnl target may or may not support call frame exceptions.
|
2003-07-14 20:23:12 +02:00
|
|
|
|
dnl
|
2003-08-05 04:00:18 +02:00
|
|
|
|
dnl --enable-sjlj-exceptions forces the use of builtin setjmp.
|
|
|
|
|
dnl --disable-sjlj-exceptions forces the use of call frame unwinding.
|
2003-08-05 22:54:43 +02:00
|
|
|
|
dnl Neither one forces an attempt at detection.
|
2001-11-01 16:46:48 +01:00
|
|
|
|
dnl
|
2003-08-05 04:00:18 +02:00
|
|
|
|
dnl Defines:
|
|
|
|
|
dnl _GLIBCXX_SJLJ_EXCEPTIONS if the compiler is configured for it
|
2001-11-01 16:46:48 +01:00
|
|
|
|
dnl
|
2004-03-01 20:22:28 +01:00
|
|
|
|
AC_DEFUN([GLIBCXX_ENABLE_SJLJ_EXCEPTIONS], [
|
2003-08-05 04:00:18 +02:00
|
|
|
|
AC_MSG_CHECKING([for exception model to use])
|
|
|
|
|
AC_LANG_SAVE
|
|
|
|
|
AC_LANG_CPLUSPLUS
|
2003-08-05 22:54:43 +02:00
|
|
|
|
GLIBCXX_ENABLE(sjlj-exceptions,auto,,
|
2003-08-05 04:00:18 +02:00
|
|
|
|
[force use of builtin_setjmp for exceptions],
|
2003-08-05 22:54:43 +02:00
|
|
|
|
[permit yes|no|auto])
|
|
|
|
|
|
|
|
|
|
if test $enable_sjlj_exceptions = auto; then
|
|
|
|
|
# Botheration. Now we've got to detect the exception model. Link tests
|
|
|
|
|
# against libgcc.a are problematic since we've not been given proper -L
|
|
|
|
|
# bits for single-tree newlib and libgloss.
|
|
|
|
|
#
|
|
|
|
|
# Fake what AC_TRY_COMPILE does. XXX Look at redoing this new-style.
|
|
|
|
|
cat > conftest.$ac_ext << EOF
|
2003-08-05 04:00:18 +02:00
|
|
|
|
[#]line __oline__ "configure"
|
|
|
|
|
struct S { ~S(); };
|
|
|
|
|
void bar();
|
|
|
|
|
void foo()
|
|
|
|
|
{
|
|
|
|
|
S s;
|
|
|
|
|
bar();
|
|
|
|
|
}
|
|
|
|
|
EOF
|
2003-08-05 22:54:43 +02:00
|
|
|
|
old_CXXFLAGS="$CXXFLAGS"
|
|
|
|
|
CXXFLAGS=-S
|
|
|
|
|
if AC_TRY_EVAL(ac_compile); then
|
|
|
|
|
if grep _Unwind_SjLj_Resume conftest.s >/dev/null 2>&1 ; then
|
|
|
|
|
enable_sjlj_exceptions=yes
|
|
|
|
|
elif grep _Unwind_Resume conftest.s >/dev/null 2>&1 ; then
|
|
|
|
|
enable_sjlj_exceptions=no
|
|
|
|
|
fi
|
|
|
|
|
fi
|
|
|
|
|
CXXFLAGS="$old_CXXFLAGS"
|
|
|
|
|
rm -f conftest*
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
# This is a tad weird, for hysterical raisins. We have to map enable/disable
|
|
|
|
|
# to two different models.
|
|
|
|
|
case $enable_sjlj_exceptions in
|
|
|
|
|
yes)
|
|
|
|
|
AC_DEFINE(_GLIBCXX_SJLJ_EXCEPTIONS, 1,
|
|
|
|
|
[Define if the compiler is configured for setjmp/longjmp exceptions.])
|
|
|
|
|
ac_exception_model_name=sjlj
|
|
|
|
|
;;
|
|
|
|
|
no)
|
|
|
|
|
ac_exception_model_name="call frame"
|
|
|
|
|
;;
|
|
|
|
|
*)
|
|
|
|
|
AC_MSG_ERROR([unable to detect exception model])
|
|
|
|
|
;;
|
|
|
|
|
esac
|
2003-08-05 04:00:18 +02:00
|
|
|
|
AC_LANG_RESTORE
|
|
|
|
|
AC_MSG_RESULT($ac_exception_model_name)
|
2001-11-01 16:46:48 +01:00
|
|
|
|
])
|
|
|
|
|
|
|
|
|
|
|
2002-02-14 19:24:13 +01:00
|
|
|
|
dnl
|
|
|
|
|
dnl Add version tags to symbols in shared library (or not), additionally
|
|
|
|
|
dnl marking other symbols as private/local (or not).
|
|
|
|
|
dnl
|
2002-02-20 23:10:39 +01:00
|
|
|
|
dnl --enable-symvers=style adds a version script to the linker call when
|
|
|
|
|
dnl creating the shared library. The choice of version script is
|
|
|
|
|
dnl controlled by 'style'.
|
2002-02-14 19:24:13 +01:00
|
|
|
|
dnl --disable-symvers does not.
|
2003-07-05 06:05:45 +02:00
|
|
|
|
dnl + Usage: GLIBCXX_ENABLE_SYMVERS[(DEFAULT)]
|
2003-08-05 04:00:18 +02:00
|
|
|
|
dnl Where DEFAULT is either 'yes' or 'no'. Passing `yes' tries to
|
|
|
|
|
dnl choose a default style based on linker characteristics. Passing
|
|
|
|
|
dnl 'no' disables versioning.
|
|
|
|
|
dnl
|
2004-03-01 20:22:28 +01:00
|
|
|
|
AC_DEFUN([GLIBCXX_ENABLE_SYMVERS], [
|
2003-08-05 04:00:18 +02:00
|
|
|
|
|
|
|
|
|
GLIBCXX_ENABLE(symvers,$1,[=STYLE],
|
|
|
|
|
[enables symbol versioning of the shared library],
|
|
|
|
|
[permit yes|no|gnu])
|
2002-02-20 23:10:39 +01:00
|
|
|
|
|
2003-07-05 06:05:45 +02:00
|
|
|
|
# If we never went through the GLIBCXX_CHECK_LINKER_FEATURES macro, then we
|
2002-12-30 15:54:45 +01:00
|
|
|
|
# don't know enough about $LD to do tricks...
|
2003-08-05 04:00:18 +02:00
|
|
|
|
AC_REQUIRE([GLIBCXX_CHECK_LINKER_FEATURES])
|
|
|
|
|
# FIXME The following test is too strict, in theory.
|
|
|
|
|
if test $enable_shared = no ||
|
|
|
|
|
test "x$LD" = x ||
|
|
|
|
|
test x$glibcxx_gnu_ld_version = x; then
|
2002-02-22 12:36:26 +01:00
|
|
|
|
enable_symvers=no
|
2002-02-14 19:24:13 +01:00
|
|
|
|
fi
|
2002-02-20 23:10:39 +01:00
|
|
|
|
|
2002-02-22 12:36:26 +01:00
|
|
|
|
# Check to see if libgcc_s exists, indicating that shared libgcc is possible.
|
2002-06-18 21:07:12 +02:00
|
|
|
|
if test $enable_symvers != no; then
|
|
|
|
|
AC_MSG_CHECKING([for shared libgcc])
|
|
|
|
|
ac_save_CFLAGS="$CFLAGS"
|
|
|
|
|
CFLAGS=' -lgcc_s'
|
2003-08-05 04:00:18 +02:00
|
|
|
|
AC_TRY_LINK(, [return 0;], glibcxx_shared_libgcc=yes, glibcxx_shared_libgcc=no)
|
2002-06-18 21:07:12 +02:00
|
|
|
|
CFLAGS="$ac_save_CFLAGS"
|
2003-07-05 06:05:45 +02:00
|
|
|
|
AC_MSG_RESULT($glibcxx_shared_libgcc)
|
2002-06-18 21:07:12 +02:00
|
|
|
|
fi
|
2002-02-22 12:36:26 +01:00
|
|
|
|
|
2003-07-11 06:04:49 +02:00
|
|
|
|
# For GNU ld, we need at least this version. The format is described in
|
|
|
|
|
# GLIBCXX_CHECK_LINKER_FEATURES above.
|
2003-07-06 06:07:36 +02:00
|
|
|
|
glibcxx_min_gnu_ld_version=21400
|
2003-08-05 04:00:18 +02:00
|
|
|
|
# XXXXXXXXXXX glibcxx_gnu_ld_version=21390
|
2002-02-20 23:10:39 +01:00
|
|
|
|
|
2003-07-11 06:04:49 +02:00
|
|
|
|
# Check to see if unspecified "yes" value can win, given results above.
|
|
|
|
|
# Change "yes" into either "no" or a style name.
|
2003-08-05 04:00:18 +02:00
|
|
|
|
if test $enable_symvers = yes; then
|
2002-02-22 12:36:26 +01:00
|
|
|
|
if test $with_gnu_ld = yes &&
|
2003-08-05 04:00:18 +02:00
|
|
|
|
test $glibcxx_shared_libgcc = yes;
|
2002-02-22 12:36:26 +01:00
|
|
|
|
then
|
2003-07-05 06:05:45 +02:00
|
|
|
|
if test $glibcxx_gnu_ld_version -ge $glibcxx_min_gnu_ld_version ; then
|
2003-07-06 22:30:55 +02:00
|
|
|
|
enable_symvers=gnu
|
2002-03-05 22:12:17 +01:00
|
|
|
|
else
|
2003-07-06 22:30:55 +02:00
|
|
|
|
# The right tools, the right setup, but too old. Fallbacks?
|
2003-07-11 06:04:49 +02:00
|
|
|
|
AC_MSG_WARN(=== Linker version $glibcxx_gnu_ld_version is too old for)
|
|
|
|
|
AC_MSG_WARN(=== full symbol versioning support in this release of GCC.)
|
|
|
|
|
AC_MSG_WARN(=== You would need to upgrade your binutils to version)
|
|
|
|
|
AC_MSG_WARN(=== $glibcxx_min_gnu_ld_version or later and rebuild GCC.)
|
2003-08-05 04:00:18 +02:00
|
|
|
|
if test $glibcxx_gnu_ld_version -ge 21200 ; then
|
|
|
|
|
# Globbing fix is present, proper block support is not.
|
|
|
|
|
dnl AC_MSG_WARN([=== Dude, you are soooo close. Maybe we can fake it.])
|
|
|
|
|
dnl enable_symvers=???
|
|
|
|
|
AC_MSG_WARN([=== Symbol versioning will be disabled.])
|
|
|
|
|
enable_symvers=no
|
|
|
|
|
else
|
|
|
|
|
# 2.11 or older.
|
|
|
|
|
AC_MSG_WARN([=== Symbol versioning will be disabled.])
|
|
|
|
|
enable_symvers=no
|
|
|
|
|
fi
|
2002-03-05 22:12:17 +01:00
|
|
|
|
fi
|
2002-02-22 12:36:26 +01:00
|
|
|
|
else
|
|
|
|
|
# just fail for now
|
2003-07-11 06:04:49 +02:00
|
|
|
|
AC_MSG_WARN([=== You have requested some kind of symbol versioning, but])
|
|
|
|
|
AC_MSG_WARN([=== either you are not using a supported linker, or you are])
|
|
|
|
|
AC_MSG_WARN([=== not building a shared libgcc_s (which is required).])
|
|
|
|
|
AC_MSG_WARN([=== Symbol versioning will be disabled.])
|
2002-02-22 12:36:26 +01:00
|
|
|
|
enable_symvers=no
|
|
|
|
|
fi
|
|
|
|
|
fi
|
|
|
|
|
|
2003-08-05 04:00:18 +02:00
|
|
|
|
# Everything parsed; figure out what file to use.
|
2002-02-20 23:10:39 +01:00
|
|
|
|
case $enable_symvers in
|
2002-02-22 12:36:26 +01:00
|
|
|
|
no)
|
2003-08-05 04:00:18 +02:00
|
|
|
|
SYMVER_MAP=config/linker-map.dummy
|
|
|
|
|
;;
|
2002-02-20 23:10:39 +01:00
|
|
|
|
gnu)
|
2003-08-05 04:00:18 +02:00
|
|
|
|
SYMVER_MAP=config/linker-map.gnu
|
|
|
|
|
AC_DEFINE(_GLIBCXX_SYMVER)
|
|
|
|
|
;;
|
2002-02-20 23:10:39 +01:00
|
|
|
|
esac
|
|
|
|
|
|
2002-12-16 20:02:01 +01:00
|
|
|
|
AC_SUBST(SYMVER_MAP)
|
2003-07-11 06:04:49 +02:00
|
|
|
|
AC_SUBST(port_specific_symbol_files)
|
acinclude.m4 (GLIBCXX_CONDITIONAL): New macro.
2003-08-27 Phil Edwards <pme@gcc.gnu.org>
* acinclude.m4 (GLIBCXX_CONDITIONAL): New macro. Wrap
AM_CONDITIONAL. Replace all calls to AM_CONDITIONAL with this one.
(GLIBCXX_ENABLE_HOSTED): New macro, sets new variable is_hosted,
used elsewhere in this file.
(GLIBCXX_EVALUATE_CONDITIONALS): New macro...
* configure.ac: ...called here to expand all conditionals.
* Makefile.am: Conditionalize SUBDIRS on GLIBCXX_HOSTED.
* include/Makefile.am: Remove redundant gxx_include_dir assignment.
(install-freestanding-headers): New target, a subset of
install-headers. Conditionalize install-data-local on GLIBCXX_HOSTED.
* aclocal.m4, configure, Makefile.in, include/Makefile.in,
libmath/Makefile.in, libsupc++/Makefile.in, po/Makefile.in,
src/Makefile.in, testsuite/Makefile.in: Regenerated.
From-SVN: r70854
2003-08-27 21:06:56 +02:00
|
|
|
|
GLIBCXX_CONDITIONAL(GLIBCXX_BUILD_VERSIONED_SHLIB, test $enable_symvers != no)
|
2003-08-05 04:00:18 +02:00
|
|
|
|
AC_MSG_NOTICE(versioning on shared library symbols is $enable_symvers)
|
|
|
|
|
])
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
dnl
|
|
|
|
|
dnl Setup to use the gcc gthr.h thread-specific memory and mutex model.
|
|
|
|
|
dnl We must stage the required headers so that they will be installed
|
|
|
|
|
dnl with the library (unlike libgcc, the STL implementation is provided
|
|
|
|
|
dnl solely within headers). Since we must not inject random user-space
|
|
|
|
|
dnl macro names into user-provided C++ code, we first stage into <file>-in
|
|
|
|
|
dnl and process to <file> with an output command. The reason for a two-
|
|
|
|
|
dnl stage process here is to correctly handle $srcdir!=$objdir without
|
|
|
|
|
dnl having to write complex code (the sed commands to clean the macro
|
|
|
|
|
dnl namespace are complex and fragile enough as it is). We must also
|
|
|
|
|
dnl add a relative path so that -I- is supported properly.
|
|
|
|
|
dnl
|
|
|
|
|
dnl Substs:
|
|
|
|
|
dnl glibcxx_thread_h
|
|
|
|
|
dnl
|
|
|
|
|
dnl Defines:
|
|
|
|
|
dnl HAVE_GTHR_DEFAULT
|
|
|
|
|
dnl
|
2004-03-01 20:22:28 +01:00
|
|
|
|
AC_DEFUN([GLIBCXX_ENABLE_THREADS], [
|
2003-08-05 04:00:18 +02:00
|
|
|
|
AC_MSG_CHECKING([for thread model used by GCC])
|
2003-08-11 07:26:58 +02:00
|
|
|
|
target_thread_file=`$CXX -v 2>&1 | sed -n 's/^Thread model: //p'`
|
2003-08-05 04:00:18 +02:00
|
|
|
|
AC_MSG_RESULT([$target_thread_file])
|
|
|
|
|
|
|
|
|
|
if test $target_thread_file != single; then
|
|
|
|
|
AC_DEFINE(HAVE_GTHR_DEFAULT)
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
glibcxx_thread_h=gthr-$target_thread_file.h
|
|
|
|
|
AC_SUBST(glibcxx_thread_h)
|
|
|
|
|
])
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# Check whether LC_MESSAGES is available in <locale.h>.
|
|
|
|
|
# Ulrich Drepper <drepper@cygnus.com>, 1995.
|
|
|
|
|
#
|
|
|
|
|
# This file file be copied and used freely without restrictions. It can
|
|
|
|
|
# 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.
|
|
|
|
|
# Please note that the actual code is *not* freely available.
|
|
|
|
|
|
|
|
|
|
# serial 1
|
2004-03-01 20:22:28 +01:00
|
|
|
|
AC_DEFUN([AC_LC_MESSAGES], [
|
2003-08-05 04:00:18 +02:00
|
|
|
|
AC_CHECK_HEADER(locale.h, [
|
|
|
|
|
AC_CACHE_CHECK([for LC_MESSAGES], ac_cv_val_LC_MESSAGES,
|
|
|
|
|
[AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
|
|
|
|
|
ac_cv_val_LC_MESSAGES=yes, ac_cv_val_LC_MESSAGES=no)])
|
|
|
|
|
if test $ac_cv_val_LC_MESSAGES = yes; then
|
|
|
|
|
AC_DEFINE(HAVE_LC_MESSAGES)
|
|
|
|
|
fi
|
|
|
|
|
])
|
|
|
|
|
])
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
sinclude([../libtool.m4])
|
|
|
|
|
dnl The lines below arrange for aclocal not to bring an installed
|
|
|
|
|
dnl libtool.m4 into aclocal.m4, while still arranging for automake to
|
|
|
|
|
dnl add a definition of LIBTOOL to Makefile.in.
|
|
|
|
|
ifelse(,,,[AC_SUBST(LIBTOOL)
|
|
|
|
|
AC_DEFUN([AM_PROG_LIBTOOL])
|
|
|
|
|
AC_DEFUN([AC_LIBTOOL_DLOPEN])
|
|
|
|
|
AC_DEFUN([AC_PROG_LD])
|
2002-02-14 19:24:13 +01:00
|
|
|
|
])
|
|
|
|
|
|
2003-08-05 04:00:18 +02:00
|
|
|
|
dnl vim:et:ts=2:sw=2
|