2001-12-03 23:28:57 +01:00
|
|
|
dnl aclocal.m4 generated automatically by aclocal 1.4-p5
|
2000-04-21 22:33:34 +02:00
|
|
|
|
2001-12-03 23:28:57 +01:00
|
|
|
dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
|
2000-04-21 22:33:34 +02:00
|
|
|
dnl This file is free software; the Free Software Foundation
|
|
|
|
dnl gives unlimited permission to copy and/or distribute it,
|
|
|
|
dnl with or without modifications, as long as this notice is preserved.
|
|
|
|
|
|
|
|
dnl This program is distributed in the hope that it will be useful,
|
|
|
|
dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
|
|
|
|
dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
|
|
|
|
dnl PARTICULAR PURPOSE.
|
|
|
|
|
|
|
|
dnl
|
|
|
|
dnl Initialize configure bits.
|
|
|
|
dnl
|
|
|
|
dnl GLIBCPP_CONFIGURE
|
|
|
|
AC_DEFUN(GLIBCPP_CONFIGURE, [
|
|
|
|
dnl Default to --enable-multilib
|
|
|
|
AC_ARG_ENABLE(multilib,
|
|
|
|
[ --enable-multilib build hella library versions (default)],
|
|
|
|
[case "${enableval}" in
|
|
|
|
yes) multilib=yes ;;
|
|
|
|
no) multilib=no ;;
|
|
|
|
*) AC_MSG_ERROR(bad value ${enableval} for multilib option) ;;
|
|
|
|
esac], [multilib=yes])dnl
|
|
|
|
|
2001-08-08 04:49:01 +02:00
|
|
|
# When building with srcdir == objdir, links to the source files will
|
|
|
|
# be created in directories within the target_subdir. We have to
|
|
|
|
# adjust toplevel_srcdir accordingly, so that configure finds
|
|
|
|
# install-sh and other auxiliary files that live in the top-level
|
|
|
|
# source directory.
|
|
|
|
if test "${srcdir}" = "."; then
|
|
|
|
if test -z "${with_target_subdir}"; then
|
|
|
|
toprel=".."
|
|
|
|
else
|
|
|
|
if test "${with_target_subdir}" != "."; then
|
|
|
|
toprel="${with_multisrctop}../.."
|
|
|
|
else
|
|
|
|
toprel="${with_multisrctop}.."
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
else
|
|
|
|
toprel=".."
|
|
|
|
fi
|
|
|
|
AC_CONFIG_AUX_DIR(${srcdir}/$toprel)
|
|
|
|
toplevel_srcdir=\${top_srcdir}/$toprel
|
|
|
|
AC_SUBST(toplevel_srcdir)
|
|
|
|
|
|
|
|
# Export build and source directories.
|
|
|
|
# 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.
|
|
|
|
glibcpp_builddir=`pwd`
|
|
|
|
case $srcdir in
|
|
|
|
[\\/$]* | ?:[\\/]*) glibcpp_srcdir=${srcdir} ;;
|
|
|
|
*) glibcpp_srcdir=`cd "$srcdir" && ${PWDCMD-pwd} || echo "$srcdir"` ;;
|
|
|
|
esac
|
|
|
|
AC_SUBST(glibcpp_builddir)
|
|
|
|
AC_SUBST(glibcpp_srcdir)
|
|
|
|
|
|
|
|
dnl This is here just to satisfy automake.
|
|
|
|
ifelse(not,equal,[AC_CONFIG_AUX_DIR(..)])
|
|
|
|
|
|
|
|
# Will set LN_S to either 'ln -s' or 'ln'. With autoconf 2.50+, can also
|
|
|
|
# be 'cp -p' if linking isn't available.
|
|
|
|
#ac_cv_prog_LN_S='cp -p'
|
|
|
|
AC_PROG_LN_S
|
|
|
|
|
|
|
|
# We use these options to decide which functions to include.
|
|
|
|
AC_ARG_WITH(target-subdir,
|
|
|
|
[ --with-target-subdir=SUBDIR
|
|
|
|
configuring in a subdirectory])
|
|
|
|
AC_ARG_WITH(cross-host,
|
|
|
|
[ --with-cross-host=HOST configuring with a cross compiler])
|
|
|
|
|
2001-06-14 10:45:38 +02:00
|
|
|
glibcpp_basedir=$srcdir/$toprel/$1/libstdc++-v3
|
2000-04-21 22:33:34 +02:00
|
|
|
AC_SUBST(glibcpp_basedir)
|
|
|
|
|
2000-07-26 22:55:48 +02:00
|
|
|
# Never versions of autoconf add an underscore to these functions.
|
|
|
|
# Prevent future problems ...
|
|
|
|
ifdef([AC_PROG_CC_G],[],[define([AC_PROG_CC_G],defn([_AC_PROG_CC_G]))])
|
|
|
|
ifdef([AC_PROG_CC_GNU],[],[define([AC_PROG_CC_GNU],defn([_AC_PROG_CC_GNU]))])
|
|
|
|
ifdef([AC_PROG_CXX_G],[],[define([AC_PROG_CXX_G],defn([_AC_PROG_CXX_G]))])
|
|
|
|
ifdef([AC_PROG_CXX_GNU],[],[define([AC_PROG_CXX_GNU],defn([_AC_PROG_CXX_GNU]))])
|
2000-07-26 08:51:38 +02:00
|
|
|
|
|
|
|
# AC_PROG_CC
|
|
|
|
|
2000-04-21 22:33:34 +02:00
|
|
|
# FIXME: We temporarily define our own version of AC_PROG_CC. This is
|
|
|
|
# copied from autoconf 2.12, but does not call AC_PROG_CC_WORKS. We
|
|
|
|
# are probably using a cross compiler, which will not be able to fully
|
|
|
|
# link an executable. This should really be fixed in autoconf
|
|
|
|
# itself.
|
|
|
|
|
|
|
|
AC_DEFUN(LIB_AC_PROG_CC,
|
|
|
|
[AC_BEFORE([$0], [AC_PROG_CPP])dnl
|
|
|
|
dnl Fool anybody using AC_PROG_CC.
|
|
|
|
AC_PROVIDE([AC_PROG_CC])
|
|
|
|
AC_CHECK_PROG(CC, gcc, gcc)
|
|
|
|
if test -z "$CC"; then
|
|
|
|
AC_CHECK_PROG(CC, cc, cc, , , /usr/ucb/cc)
|
|
|
|
test -z "$CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH])
|
|
|
|
fi
|
|
|
|
|
|
|
|
AC_PROG_CC_GNU
|
|
|
|
|
|
|
|
if test $ac_cv_prog_gcc = yes; then
|
|
|
|
GCC=yes
|
|
|
|
dnl Check whether -g works, even if CFLAGS is set, in case the package
|
|
|
|
dnl plays around with CFLAGS (such as to build both debugging and
|
|
|
|
dnl normal versions of a library), tasteless as that idea is.
|
|
|
|
ac_test_CFLAGS="${CFLAGS+set}"
|
|
|
|
ac_save_CFLAGS="$CFLAGS"
|
|
|
|
CFLAGS=
|
|
|
|
AC_PROG_CC_G
|
|
|
|
if test "$ac_test_CFLAGS" = set; then
|
|
|
|
CFLAGS="$ac_save_CFLAGS"
|
|
|
|
elif test $ac_cv_prog_cc_g = yes; then
|
|
|
|
CFLAGS="-g -O2"
|
|
|
|
else
|
|
|
|
CFLAGS="-O2"
|
|
|
|
fi
|
|
|
|
else
|
|
|
|
GCC=
|
|
|
|
test "${CFLAGS+set}" = set || CFLAGS="-g"
|
|
|
|
fi
|
|
|
|
])
|
|
|
|
|
|
|
|
LIB_AC_PROG_CC
|
|
|
|
|
2000-07-26 08:51:38 +02:00
|
|
|
# Can't just call these here as g++ requires libstc++ to be built....
|
|
|
|
# AC_PROG_CXX
|
|
|
|
|
2000-04-21 22:33:34 +02:00
|
|
|
# Likewise for AC_PROG_CXX.
|
|
|
|
AC_DEFUN(LIB_AC_PROG_CXX,
|
|
|
|
[AC_BEFORE([$0], [AC_PROG_CXXCPP])dnl
|
|
|
|
dnl Fool anybody using AC_PROG_CXX.
|
|
|
|
AC_PROVIDE([AC_PROG_CXX])
|
2001-04-11 20:52:31 +02:00
|
|
|
# Use glibcpp_CXX so that we do not cause CXX to be cached with the
|
2000-11-04 08:07:38 +01:00
|
|
|
# flags that come in CXX while configuring libstdc++. They're different
|
2000-11-05 03:38:53 +01:00
|
|
|
# from those used for all other target libraries. If CXX is set in
|
|
|
|
# the environment, respect that here.
|
2001-04-11 20:52:31 +02:00
|
|
|
glibcpp_CXX=$CXX
|
|
|
|
AC_CHECK_PROGS(glibcpp_CXX, $CCC c++ g++ gcc CC cxx cc++, gcc)
|
|
|
|
AC_SUBST(glibcpp_CXX)
|
2001-04-23 21:50:00 +02:00
|
|
|
CXX=$glibcpp_CXX
|
2001-04-11 20:52:31 +02:00
|
|
|
test -z "$glibcpp_CXX" && AC_MSG_ERROR([no acceptable c++ found in \$PATH])
|
2000-04-21 22:33:34 +02:00
|
|
|
|
|
|
|
AC_PROG_CXX_GNU
|
|
|
|
|
|
|
|
if test $ac_cv_prog_gxx = yes; then
|
|
|
|
GXX=yes
|
|
|
|
dnl Check whether -g works, even if CXXFLAGS is set, in case the package
|
|
|
|
dnl plays around with CXXFLAGS (such as to build both debugging and
|
|
|
|
dnl normal versions of a library), tasteless as that idea is.
|
|
|
|
ac_test_CXXFLAGS="${CXXFLAGS+set}"
|
|
|
|
ac_save_CXXFLAGS="$CXXFLAGS"
|
|
|
|
CXXFLAGS=
|
|
|
|
AC_PROG_CXX_G
|
|
|
|
if test "$ac_test_CXXFLAGS" = set; then
|
|
|
|
CXXFLAGS="$ac_save_CXXFLAGS"
|
|
|
|
elif test $ac_cv_prog_cxx_g = yes; then
|
|
|
|
CXXFLAGS="-g -O2"
|
|
|
|
else
|
|
|
|
CXXFLAGS="-O2"
|
|
|
|
fi
|
|
|
|
else
|
|
|
|
GXX=
|
|
|
|
test "${CXXFLAGS+set}" = set || CXXFLAGS="-g"
|
|
|
|
fi
|
|
|
|
])
|
|
|
|
|
|
|
|
LIB_AC_PROG_CXX
|
|
|
|
|
2001-08-08 04:49:01 +02:00
|
|
|
# For some reason, gettext needs this.
|
|
|
|
AC_ISC_POSIX
|
|
|
|
|
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-07-26 08:51:38 +02:00
|
|
|
AC_PROG_INSTALL
|
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
|
|
|
|
2000-07-26 08:51:38 +02:00
|
|
|
# We need AC_EXEEXT to keep automake happy in cygnus mode. However,
|
|
|
|
# at least currently, we never actually build a program, so we never
|
|
|
|
# need to use $(EXEEXT). Moreover, the test for EXEEXT normally
|
|
|
|
# fails, because we are probably configuring with a cross compiler
|
ChangeLog, [...]: Fix spelling errors.
* ChangeLog, docs/doxygen/maint.cfg.in, docs/doxygen/user.cfg.in,
docs/doxygen/doxygroups.cc, docs/doxygen/Intro.3,
docs/html/17_intro/BUGS, docs/html/17_intro/C++STYLE,
docs/html/17_intro/CHECKLIST, docs/html/17_intro/DESIGN,
docs/html/17_intro/howto.html, docs/html/17_intro/porting.html,
docs/html/17_intro/porting.texi, docs/html/18_support/howto.html,
docs/html/19_diagnostics/howto.html, docs/html/20_util/howto.html,
docs/html/21_strings/howto.html,
docs/html/23_containers/howto.html,
docs/html/26_numerics/howto.html, docs/html/27_io/howto.html,
docs/html/27_io/binary_iostreams_kuehl.txt,
docs/html/ext/sgiexts.html, docs/html/faq/index.html,
docs/html/faq/index.txt, testsuite/24_iterators/iterator.cc,
include/bits/basic_file.h, include/bits/locale_facets.h,
include/bits/locale_facets.tcc, include/bits/std_sstream.h,
include/ext/ropeimpl.h, include/ext/stl_rope.h,
libsupc++/tinfo.cc, libsupc++/cxxabi.h, libsupc++/typeinfo,
libsupc++/eh_throw.cc, acinclude.m4, aclocal.m4, configure,
configure.target, ChangeLog-2000: Fix spelling errors.
From-SVN: r47291
2001-11-23 17:29:02 +01:00
|
|
|
# which can't create executables. So we include AC_EXEEXT to keep
|
|
|
|
# automake happy, but we don't execute it, since we don't care about
|
2000-07-26 08:51:38 +02:00
|
|
|
# the result.
|
|
|
|
if false; then
|
2001-06-11 01:26:34 +02:00
|
|
|
# autoconf 2.50 runs AC_EXEEXT by default, and the macro expands
|
|
|
|
# to nothing, so nothing would remain between `then' and `fi' if it
|
|
|
|
# were not for the `:' below.
|
|
|
|
:
|
2000-07-26 08:51:38 +02:00
|
|
|
AC_EXEEXT
|
|
|
|
fi
|
2000-04-21 22:33:34 +02:00
|
|
|
|
2000-07-26 08:51:38 +02:00
|
|
|
. [$]{glibcpp_basedir}/configure.host
|
|
|
|
|
|
|
|
case [$]{glibcpp_basedir} in
|
2001-01-12 20:39:07 +01:00
|
|
|
/* | [A-Za-z]:[\\/]*) libgcj_flagbasedir=[$]{glibcpp_basedir} ;;
|
2000-07-26 08:51:38 +02:00
|
|
|
*) glibcpp_flagbasedir='[$](top_builddir)/'[$]{glibcpp_basedir} ;;
|
|
|
|
esac
|
2000-04-21 22:33:34 +02:00
|
|
|
|
2000-11-14 00:49:41 +01:00
|
|
|
# This does for the target what configure.host does for the host. In
|
2001-02-28 19:42:47 +01:00
|
|
|
# addition to possibly modifying the same flags, it also sets up symlinks.
|
2000-11-14 00:49:41 +01:00
|
|
|
GLIBCPP_CHECK_TARGET
|
2001-08-08 04:49:01 +02:00
|
|
|
|
|
|
|
#
|
2000-04-21 22:33:34 +02:00
|
|
|
])
|
|
|
|
|
|
|
|
|
|
|
|
dnl
|
2000-05-19 21:55:50 +02:00
|
|
|
dnl Check to see if g++ can compile this library, and if so, if any version-
|
2000-06-19 05:14:40 +02:00
|
|
|
dnl specific precautions need to be taken.
|
|
|
|
dnl
|
|
|
|
dnl GLIBCPP_CHECK_COMPILER_VERSION
|
|
|
|
AC_DEFUN(GLIBCPP_CHECK_COMPILER_VERSION, [
|
2000-11-27 01:05:39 +01:00
|
|
|
if test ! -f stamp-sanity-compiler; then
|
|
|
|
AC_MSG_CHECKING([for g++ that will successfully compile libstdc++-v3])
|
|
|
|
AC_LANG_SAVE
|
|
|
|
AC_LANG_CPLUSPLUS
|
2001-06-13 01:00:39 +02:00
|
|
|
AC_TRY_COMPILE(, [
|
|
|
|
#if __GNUC__ < 3
|
|
|
|
not_ok
|
2000-06-19 05:14:40 +02:00
|
|
|
#endif
|
2001-02-26 22:48:01 +01:00
|
|
|
], gpp_satisfactory=yes, AC_MSG_ERROR([please upgrade to GCC 3.0 or above]))
|
2000-11-27 01:05:39 +01:00
|
|
|
AC_LANG_RESTORE
|
2000-06-19 05:14:40 +02:00
|
|
|
AC_MSG_RESULT($gpp_satisfactory)
|
2000-11-27 01:05:39 +01:00
|
|
|
touch stamp-sanity-compiler
|
|
|
|
fi
|
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
|
2000-09-08 00:40:17 +02:00
|
|
|
dnl Define 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.
|
2000-04-21 22:33:34 +02:00
|
|
|
dnl
|
2000-06-19 05:14:40 +02:00
|
|
|
dnl Define SECTION_FLAGS='-ffunction-sections -fdata-sections' if
|
2001-03-25 01:16:58 +01:00
|
|
|
dnl compiler supports it and the user has not requested debug mode.
|
|
|
|
dnl
|
2000-06-19 05:14:40 +02:00
|
|
|
dnl GLIBCPP_CHECK_COMPILER_FEATURES
|
|
|
|
AC_DEFUN(GLIBCPP_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
|
2000-05-24 20:35:37 +02:00
|
|
|
# found in GLIBCPP_CONFIGURE.
|
|
|
|
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'
|
2000-06-19 05:14:40 +02:00
|
|
|
AC_TRY_COMPILE(, [int foo;
|
|
|
|
], [ac_fdsections=yes], [ac_fdsections=no])
|
|
|
|
if test "$ac_test_CXXFLAGS" = set; then
|
|
|
|
CXXFLAGS="$ac_save_CXXFLAGS"
|
|
|
|
else
|
|
|
|
# this is the suspicious part
|
|
|
|
CXXFLAGS=''
|
|
|
|
fi
|
2001-06-26 22:52:23 +02:00
|
|
|
if test x"$ac_fdsections" = x"yes" &&
|
|
|
|
test x"$enable_debug" = x"no"; 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
|
|
|
|
dnl Define SECTION_LDFLAGS='-Wl,--gc-sections' if possible.
|
|
|
|
dnl Define OPT_LDFLAGS='-Wl,-O1' if possible.
|
2000-06-19 05:14:40 +02:00
|
|
|
dnl
|
|
|
|
dnl GLIBCPP_CHECK_LINKER_FEATURES
|
|
|
|
AC_DEFUN(GLIBCPP_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...
|
2000-10-17 12:12:23 +02:00
|
|
|
SECTION_LDFLAGS=''
|
|
|
|
OPT_LDFLAGS=''
|
2000-07-26 23:30:45 +02:00
|
|
|
AC_REQUIRE([AC_PROG_LD])
|
2000-10-27 14:31:37 +02:00
|
|
|
|
|
|
|
# Set --gc-sections.
|
2000-12-05 23:03:19 +01:00
|
|
|
if test "$ac_cv_prog_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:31:37 +02:00
|
|
|
CFLAGS='-x c++ -Wl,--gc-sections'
|
2000-07-26 23:30:45 +02:00
|
|
|
|
|
|
|
# Check for -Wl,--gc-sections
|
2000-10-12 13:45:23 +02:00
|
|
|
# XXX This test is broken at the moment, as symbols required for
|
|
|
|
# linking are now in libsupc++ (not built yet.....). In addition,
|
2000-10-17 12:12:23 +02:00
|
|
|
# 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([
|
|
|
|
int main(void)
|
|
|
|
{
|
2000-10-17 12:12:23 +02:00
|
|
|
try { throw 1; }
|
|
|
|
catch (...) { };
|
2000-07-26 23:30:45 +02:00
|
|
|
return 0;
|
|
|
|
}
|
2000-10-12 13:45:23 +02:00
|
|
|
], [ac_sectionLDflags=yes],[ac_sectionLFflags=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
|
2000-10-27 14:31:37 +02:00
|
|
|
SECTION_LDFLAGS='-Wl,--gc-sections'
|
2000-07-26 23:30:45 +02:00
|
|
|
fi
|
|
|
|
AC_MSG_RESULT($ac_sectionLDflags)
|
2000-10-27 14:31:37 +02:00
|
|
|
fi
|
2000-10-17 12:12:23 +02:00
|
|
|
|
2000-10-27 14:31:37 +02:00
|
|
|
# Set linker optimization flags.
|
2001-06-26 22:52:23 +02:00
|
|
|
if test x"$ac_cv_prog_gnu_ld" = x"yes" &&
|
|
|
|
test x"$enable_debug" = x"no"; then
|
2000-07-26 23:30:45 +02:00
|
|
|
OPT_LDFLAGS='-Wl,-O1'
|
|
|
|
fi
|
2000-10-27 14:31:37 +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
|
2000-06-23 01:59:04 +02:00
|
|
|
dnl Check to see if the (math function) argument passed is
|
2001-02-06 08:06:15 +01:00
|
|
|
dnl declared when using the c++ compiler
|
2000-06-22 08:19:44 +02:00
|
|
|
dnl ASSUMES argument is a math function with ONE parameter
|
|
|
|
dnl
|
2001-02-06 08:06:15 +01:00
|
|
|
dnl GLIBCPP_CHECK_MATH_DECL_1
|
|
|
|
AC_DEFUN(GLIBCPP_CHECK_MATH_DECL_1, [
|
2000-06-22 08:19:44 +02:00
|
|
|
AC_MSG_CHECKING([for $1 declaration])
|
2000-12-06 22:44:50 +01:00
|
|
|
if test x${glibcpp_cv_func_$1_use+set} != xset; then
|
|
|
|
AC_CACHE_VAL(glibcpp_cv_func_$1_use, [
|
|
|
|
AC_LANG_SAVE
|
|
|
|
AC_LANG_CPLUSPLUS
|
2001-02-16 02:39:06 +01:00
|
|
|
AC_TRY_COMPILE([#include <math.h>
|
|
|
|
#ifdef HAVE_IEEEFP_H
|
|
|
|
#include <ieeefp.h>
|
|
|
|
#endif
|
|
|
|
],
|
2000-12-06 22:44:50 +01:00
|
|
|
[ $1(0);],
|
|
|
|
[glibcpp_cv_func_$1_use=yes], [glibcpp_cv_func_$1_use=no])
|
|
|
|
AC_LANG_RESTORE
|
|
|
|
])
|
|
|
|
fi
|
2000-07-26 23:30:45 +02:00
|
|
|
AC_MSG_RESULT($glibcpp_cv_func_$1_use)
|
2001-02-06 08:06:15 +01:00
|
|
|
])
|
|
|
|
|
|
|
|
dnl
|
|
|
|
dnl Check to see if the (math function) argument passed is
|
|
|
|
dnl 1) declared when using the c++ compiler
|
|
|
|
dnl 2) has "C" linkage
|
|
|
|
dnl 3) if not, see if 1) and 2) for argument prepended with '_'
|
|
|
|
dnl
|
|
|
|
dnl Define HAVE_CARGF etc if "cargf" is declared and links
|
|
|
|
dnl
|
|
|
|
dnl argument 1 is name of function to check
|
|
|
|
dnl
|
|
|
|
dnl ASSUMES argument is a math function with ONE parameter
|
|
|
|
dnl
|
|
|
|
dnl GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1
|
|
|
|
AC_DEFUN(GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1, [
|
|
|
|
GLIBCPP_CHECK_MATH_DECL_1($1)
|
2000-07-26 23:30:45 +02:00
|
|
|
if test x$glibcpp_cv_func_$1_use = x"yes"; then
|
2000-06-22 08:19:44 +02:00
|
|
|
AC_CHECK_FUNCS($1)
|
2001-02-06 08:06:15 +01:00
|
|
|
else
|
|
|
|
GLIBCPP_CHECK_MATH_DECL_1(_$1)
|
|
|
|
if test x$glibcpp_cv_func__$1_use = x"yes"; then
|
|
|
|
AC_CHECK_FUNCS(_$1)
|
2001-06-26 22:52:23 +02:00
|
|
|
fi
|
2000-06-22 08:19:44 +02:00
|
|
|
fi
|
|
|
|
])
|
|
|
|
|
2001-02-06 08:06:15 +01:00
|
|
|
|
2001-01-23 09:57:34 +01:00
|
|
|
dnl
|
|
|
|
dnl Like GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1, but does a bunch of
|
|
|
|
dnl of functions at once. It's an all-or-nothing check -- either
|
2001-01-23 18:02:28 +01:00
|
|
|
dnl HAVE_XYZ is defined for each of the functions, or for none of them.
|
2001-01-23 09:57:34 +01:00
|
|
|
dnl Doing it this way saves significant configure time.
|
|
|
|
AC_DEFUN(GLIBCPP_CHECK_MATH_DECLS_AND_LINKAGES_1, [
|
|
|
|
AC_MSG_CHECKING([for $1 functions])
|
|
|
|
AC_CACHE_VAL(glibcpp_cv_func_$2_use, [
|
|
|
|
AC_LANG_SAVE
|
|
|
|
AC_LANG_CPLUSPLUS
|
|
|
|
AC_TRY_COMPILE([#include <math.h>],
|
|
|
|
[ `for x in $3; do echo "$x (0);"; done` ],
|
2001-01-23 18:02:28 +01:00
|
|
|
[glibcpp_cv_func_$2_use=yes],
|
|
|
|
[glibcpp_cv_func_$2_use=no])
|
2001-01-23 09:57:34 +01:00
|
|
|
AC_LANG_RESTORE])
|
|
|
|
AC_MSG_RESULT($glibcpp_cv_func_$2_use)
|
|
|
|
if test x$glibcpp_cv_func_$2_use = x"yes"; then
|
|
|
|
AC_CHECK_FUNCS($3)
|
|
|
|
fi
|
|
|
|
])
|
2000-06-22 08:19:44 +02:00
|
|
|
|
|
|
|
dnl
|
2000-06-23 01:59:04 +02:00
|
|
|
dnl Check to see if the (math function) argument passed is
|
2001-02-06 08:06:15 +01:00
|
|
|
dnl declared when using the c++ compiler
|
2001-06-11 21:35:32 +02:00
|
|
|
dnl ASSUMES argument is a math function with TWO parameters
|
2000-06-22 08:19:44 +02:00
|
|
|
dnl
|
2001-02-06 08:06:15 +01:00
|
|
|
dnl GLIBCPP_CHECK_MATH_DECL_2
|
|
|
|
AC_DEFUN(GLIBCPP_CHECK_MATH_DECL_2, [
|
2000-06-22 08:19:44 +02:00
|
|
|
AC_MSG_CHECKING([for $1 declaration])
|
2000-12-06 22:44:50 +01:00
|
|
|
if test x${glibcpp_cv_func_$1_use+set} != xset; then
|
|
|
|
AC_CACHE_VAL(glibcpp_cv_func_$1_use, [
|
|
|
|
AC_LANG_SAVE
|
|
|
|
AC_LANG_CPLUSPLUS
|
|
|
|
AC_TRY_COMPILE([#include <math.h>],
|
|
|
|
[ $1(0, 0);],
|
|
|
|
[glibcpp_cv_func_$1_use=yes], [glibcpp_cv_func_$1_use=no])
|
|
|
|
AC_LANG_RESTORE
|
|
|
|
])
|
|
|
|
fi
|
2000-07-26 23:30:45 +02:00
|
|
|
AC_MSG_RESULT($glibcpp_cv_func_$1_use)
|
2000-06-22 08:19:44 +02:00
|
|
|
])
|
|
|
|
|
|
|
|
dnl
|
2000-06-23 01:59:04 +02:00
|
|
|
dnl Check to see if the (math function) argument passed is
|
2000-06-22 08:19:44 +02:00
|
|
|
dnl 1) declared when using the c++ compiler
|
|
|
|
dnl 2) has "C" linkage
|
|
|
|
dnl
|
|
|
|
dnl Define HAVE_CARGF etc if "cargf" is declared and links
|
|
|
|
dnl
|
|
|
|
dnl argument 1 is name of function to check
|
|
|
|
dnl
|
2001-02-06 08:06:15 +01:00
|
|
|
dnl ASSUMES argument is a math function with TWO parameters
|
2000-06-22 08:19:44 +02:00
|
|
|
dnl
|
2001-02-06 08:06:15 +01:00
|
|
|
dnl GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2
|
|
|
|
AC_DEFUN(GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2, [
|
|
|
|
GLIBCPP_CHECK_MATH_DECL_2($1)
|
|
|
|
if test x$glibcpp_cv_func_$1_use = x"yes"; then
|
|
|
|
AC_CHECK_FUNCS($1)
|
|
|
|
else
|
|
|
|
GLIBCPP_CHECK_MATH_DECL_2(_$1)
|
|
|
|
if test x$glibcpp_cv_func__$1_use = x"yes"; then
|
|
|
|
AC_CHECK_FUNCS(_$1)
|
2001-06-26 22:52:23 +02:00
|
|
|
fi
|
2001-02-06 08:06:15 +01:00
|
|
|
fi
|
|
|
|
])
|
|
|
|
|
|
|
|
|
|
|
|
dnl
|
|
|
|
dnl Check to see if the (math function) argument passed is
|
|
|
|
dnl declared when using the c++ compiler
|
2001-06-11 21:35:32 +02:00
|
|
|
dnl ASSUMES argument is a math function with THREE parameters
|
2001-02-06 08:06:15 +01:00
|
|
|
dnl
|
|
|
|
dnl GLIBCPP_CHECK_MATH_DECL_3
|
|
|
|
AC_DEFUN(GLIBCPP_CHECK_MATH_DECL_3, [
|
2000-06-22 08:19:44 +02:00
|
|
|
AC_MSG_CHECKING([for $1 declaration])
|
2000-12-06 22:44:50 +01:00
|
|
|
if test x${glibcpp_cv_func_$1_use+set} != xset; then
|
|
|
|
AC_CACHE_VAL(glibcpp_cv_func_$1_use, [
|
|
|
|
AC_LANG_SAVE
|
|
|
|
AC_LANG_CPLUSPLUS
|
|
|
|
AC_TRY_COMPILE([#include <math.h>],
|
|
|
|
[ $1(0, 0, 0);],
|
|
|
|
[glibcpp_cv_func_$1_use=yes], [glibcpp_cv_func_$1_use=no])
|
|
|
|
AC_LANG_RESTORE
|
|
|
|
])
|
|
|
|
fi
|
2000-07-26 23:30:45 +02:00
|
|
|
AC_MSG_RESULT($glibcpp_cv_func_$1_use)
|
2001-02-06 08:06:15 +01:00
|
|
|
])
|
|
|
|
|
|
|
|
dnl
|
|
|
|
dnl Check to see if the (math function) argument passed is
|
|
|
|
dnl 1) declared when using the c++ compiler
|
|
|
|
dnl 2) has "C" linkage
|
|
|
|
dnl
|
|
|
|
dnl Define HAVE_CARGF etc if "cargf" is declared and links
|
|
|
|
dnl
|
|
|
|
dnl argument 1 is name of function to check
|
|
|
|
dnl
|
|
|
|
dnl ASSUMES argument is a math function with THREE parameters
|
|
|
|
dnl
|
|
|
|
dnl GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_3
|
|
|
|
AC_DEFUN(GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_3, [
|
|
|
|
GLIBCPP_CHECK_MATH_DECL_3($1)
|
2000-07-26 23:30:45 +02:00
|
|
|
if test x$glibcpp_cv_func_$1_use = x"yes"; then
|
2000-06-22 08:19:44 +02:00
|
|
|
AC_CHECK_FUNCS($1)
|
2001-02-06 08:06:15 +01:00
|
|
|
else
|
|
|
|
GLIBCPP_CHECK_MATH_DECL_3(_$1)
|
|
|
|
if test x$glibcpp_cv_func__$1_use = x"yes"; then
|
|
|
|
AC_CHECK_FUNCS(_$1)
|
2001-06-26 22:52:23 +02:00
|
|
|
fi
|
2000-06-22 08:19:44 +02:00
|
|
|
fi
|
|
|
|
])
|
|
|
|
|
|
|
|
|
2000-10-27 14:31:37 +02:00
|
|
|
dnl
|
|
|
|
dnl Check to see if the (stdlib function) argument passed is
|
|
|
|
dnl 1) declared when using the c++ compiler
|
|
|
|
dnl 2) has "C" linkage
|
|
|
|
dnl
|
|
|
|
dnl argument 1 is name of function to check
|
|
|
|
dnl
|
|
|
|
dnl ASSUMES argument is a math function with TWO parameters
|
|
|
|
dnl
|
|
|
|
dnl GLIBCPP_CHECK_STDLIB_DECL_AND_LINKAGE_2
|
|
|
|
AC_DEFUN(GLIBCPP_CHECK_STDLIB_DECL_AND_LINKAGE_2, [
|
|
|
|
AC_MSG_CHECKING([for $1 declaration])
|
2000-12-06 22:44:50 +01:00
|
|
|
if test x${glibcpp_cv_func_$1_use+set} != xset; then
|
|
|
|
AC_CACHE_VAL(glibcpp_cv_func_$1_use, [
|
|
|
|
AC_LANG_SAVE
|
|
|
|
AC_LANG_CPLUSPLUS
|
|
|
|
AC_TRY_COMPILE([#include <stdlib.h>],
|
|
|
|
[ $1(0, 0);],
|
|
|
|
[glibcpp_cv_func_$1_use=yes], [glibcpp_cv_func_$1_use=no])
|
|
|
|
AC_LANG_RESTORE
|
|
|
|
])
|
|
|
|
fi
|
2000-10-27 14:31:37 +02:00
|
|
|
AC_MSG_RESULT($glibcpp_cv_func_$1_use)
|
|
|
|
if test x$glibcpp_cv_func_$1_use = x"yes"; then
|
|
|
|
AC_CHECK_FUNCS($1)
|
|
|
|
fi
|
|
|
|
])
|
|
|
|
|
|
|
|
|
2000-06-23 01:59:04 +02:00
|
|
|
dnl
|
|
|
|
dnl Because the builtins are picky picky picky about the arguments they take,
|
|
|
|
dnl do an explict linkage tests here.
|
|
|
|
dnl Check to see if the (math function) argument passed is
|
|
|
|
dnl 1) declared when using the c++ compiler
|
|
|
|
dnl 2) has "C" linkage
|
|
|
|
dnl
|
|
|
|
dnl Define HAVE_CARGF etc if "cargf" is declared and links
|
|
|
|
dnl
|
|
|
|
dnl argument 1 is name of function to check
|
|
|
|
dnl
|
|
|
|
dnl ASSUMES argument is a math function with ONE parameter
|
|
|
|
dnl
|
|
|
|
dnl GLIBCPP_CHECK_BUILTIN_MATH_DECL_LINKAGE_1
|
|
|
|
AC_DEFUN(GLIBCPP_CHECK_BUILTIN_MATH_DECL_AND_LINKAGE_1, [
|
|
|
|
AC_MSG_CHECKING([for $1 declaration])
|
2000-12-06 22:44:50 +01:00
|
|
|
if test x${glibcpp_cv_func_$1_use+set} != xset; then
|
|
|
|
AC_CACHE_VAL(glibcpp_cv_func_$1_use, [
|
|
|
|
AC_LANG_SAVE
|
|
|
|
AC_LANG_CPLUSPLUS
|
|
|
|
AC_TRY_COMPILE([#include <math.h>],
|
|
|
|
[ $1(0);],
|
|
|
|
[glibcpp_cv_func_$1_use=yes], [glibcpp_cv_func_$1_use=no])
|
|
|
|
AC_LANG_RESTORE
|
|
|
|
])
|
|
|
|
fi
|
2000-07-26 23:30:45 +02:00
|
|
|
AC_MSG_RESULT($glibcpp_cv_func_$1_use)
|
|
|
|
if test x$glibcpp_cv_func_$1_use = x"yes"; then
|
2000-06-23 01:59:04 +02:00
|
|
|
AC_MSG_CHECKING([for $1 linkage])
|
2000-12-06 22:44:50 +01:00
|
|
|
if test x${glibcpp_cv_func_$1_link+set} != xset; then
|
|
|
|
AC_CACHE_VAL(glibcpp_cv_func_$1_link, [
|
|
|
|
AC_TRY_LINK([#include <math.h>],
|
|
|
|
[ $1(0);],
|
|
|
|
[glibcpp_cv_func_$1_link=yes], [glibcpp_cv_func_$1_link=no])
|
|
|
|
])
|
|
|
|
fi
|
2000-07-26 23:30:45 +02:00
|
|
|
AC_MSG_RESULT($glibcpp_cv_func_$1_link)
|
|
|
|
if test x$glibcpp_cv_func_$1_link = x"yes"; then
|
2000-06-23 01:59:04 +02:00
|
|
|
ac_tr_func=HAVE_`echo $1 | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
|
|
|
|
AC_DEFINE_UNQUOTED(${ac_tr_func})
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
])
|
|
|
|
|
|
|
|
|
|
|
|
dnl
|
|
|
|
dnl Check to see what builtin math functions are supported
|
|
|
|
dnl
|
|
|
|
dnl check for __builtin_abs
|
|
|
|
dnl check for __builtin_fabsf
|
|
|
|
dnl check for __builtin_fabs
|
|
|
|
dnl check for __builtin_fabl
|
|
|
|
dnl check for __builtin_labs
|
|
|
|
dnl check for __builtin_sqrtf
|
|
|
|
dnl check for __builtin_sqrtl
|
2001-12-14 22:06:35 +01:00
|
|
|
dnl check for __builtin_sqrt
|
2000-06-23 01:59:04 +02:00
|
|
|
dnl check for __builtin_sinf
|
|
|
|
dnl check for __builtin_sin
|
|
|
|
dnl check for __builtin_sinl
|
|
|
|
dnl check for __builtin_cosf
|
|
|
|
dnl check for __builtin_cos
|
|
|
|
dnl check for __builtin_cosl
|
|
|
|
dnl
|
|
|
|
dnl GLIBCPP_CHECK_BUILTIN_MATH_SUPPORT
|
|
|
|
AC_DEFUN(GLIBCPP_CHECK_BUILTIN_MATH_SUPPORT, [
|
|
|
|
dnl Test for builtin math functions.
|
|
|
|
dnl These are made in gcc/c-common.c
|
|
|
|
GLIBCPP_CHECK_BUILTIN_MATH_DECL_AND_LINKAGE_1(__builtin_abs)
|
|
|
|
GLIBCPP_CHECK_BUILTIN_MATH_DECL_AND_LINKAGE_1(__builtin_fabsf)
|
|
|
|
GLIBCPP_CHECK_BUILTIN_MATH_DECL_AND_LINKAGE_1(__builtin_fabs)
|
|
|
|
GLIBCPP_CHECK_BUILTIN_MATH_DECL_AND_LINKAGE_1(__builtin_fabsl)
|
|
|
|
GLIBCPP_CHECK_BUILTIN_MATH_DECL_AND_LINKAGE_1(__builtin_labs)
|
|
|
|
|
|
|
|
GLIBCPP_CHECK_BUILTIN_MATH_DECL_AND_LINKAGE_1(__builtin_sqrtf)
|
2001-12-14 22:06:35 +01:00
|
|
|
GLIBCPP_CHECK_BUILTIN_MATH_DECL_AND_LINKAGE_1(__builtin_sqrt)
|
2000-06-23 01:59:04 +02:00
|
|
|
GLIBCPP_CHECK_BUILTIN_MATH_DECL_AND_LINKAGE_1(__builtin_sqrtl)
|
|
|
|
|
|
|
|
GLIBCPP_CHECK_BUILTIN_MATH_DECL_AND_LINKAGE_1(__builtin_sinf)
|
|
|
|
GLIBCPP_CHECK_BUILTIN_MATH_DECL_AND_LINKAGE_1(__builtin_sin)
|
|
|
|
GLIBCPP_CHECK_BUILTIN_MATH_DECL_AND_LINKAGE_1(__builtin_sinl)
|
|
|
|
|
|
|
|
GLIBCPP_CHECK_BUILTIN_MATH_DECL_AND_LINKAGE_1(__builtin_cosf)
|
|
|
|
GLIBCPP_CHECK_BUILTIN_MATH_DECL_AND_LINKAGE_1(__builtin_cos)
|
|
|
|
GLIBCPP_CHECK_BUILTIN_MATH_DECL_AND_LINKAGE_1(__builtin_cosl)
|
|
|
|
|
|
|
|
dnl There is, without a doubt, a more elegant way to have these
|
|
|
|
dnl names exported so that they won't be stripped out of acconfig.h by
|
|
|
|
dnl autoheader. I leave this as an exercise to somebody less frustrated
|
|
|
|
dnl than I.... please email the libstdc++ list if you can figure out a
|
|
|
|
dnl more elegant approach (see autoconf/acgen.m4 and specifically
|
|
|
|
dnl AC_CHECK_FUNC for things to steal.)
|
|
|
|
dummyvar=no
|
|
|
|
if test x$dummyvar = x"yes"; then
|
|
|
|
AC_DEFINE(HAVE___BUILTIN_ABS)
|
|
|
|
AC_DEFINE(HAVE___BUILTIN_LABS)
|
|
|
|
AC_DEFINE(HAVE___BUILTIN_COS)
|
|
|
|
AC_DEFINE(HAVE___BUILTIN_COSF)
|
|
|
|
AC_DEFINE(HAVE___BUILTIN_COSL)
|
|
|
|
AC_DEFINE(HAVE___BUILTIN_FABS)
|
|
|
|
AC_DEFINE(HAVE___BUILTIN_FABSF)
|
|
|
|
AC_DEFINE(HAVE___BUILTIN_FABSL)
|
|
|
|
AC_DEFINE(HAVE___BUILTIN_SIN)
|
|
|
|
AC_DEFINE(HAVE___BUILTIN_SINF)
|
|
|
|
AC_DEFINE(HAVE___BUILTIN_SINL)
|
2001-12-14 22:06:35 +01:00
|
|
|
AC_DEFINE(HAVE___BUILTIN_SQRT)
|
2000-06-23 01:59:04 +02:00
|
|
|
AC_DEFINE(HAVE___BUILTIN_SQRTF)
|
|
|
|
AC_DEFINE(HAVE___BUILTIN_SQRTL)
|
|
|
|
fi
|
|
|
|
])
|
|
|
|
|
|
|
|
|
2000-10-27 14:31:37 +02:00
|
|
|
dnl
|
|
|
|
dnl Check to see what the underlying c library
|
|
|
|
dnl These checks need to do two things:
|
|
|
|
dnl 1) make sure the name is declared when using the c++ compiler
|
|
|
|
dnl 2) make sure the name has "C" linkage
|
|
|
|
dnl This might seem like overkill but experience has shown that it's not...
|
|
|
|
dnl
|
2001-04-20 10:59:25 +02:00
|
|
|
dnl Define HAVE_STRTOLD if "strtold" is declared and links
|
|
|
|
dnl Define HAVE_STRTOF if "strtof" is declared and links
|
|
|
|
dnl Define HAVE_DRAND48 if "drand48" is declared and links
|
2000-10-27 14:31:37 +02:00
|
|
|
dnl
|
|
|
|
dnl GLIBCPP_CHECK_STDLIB_SUPPORT
|
|
|
|
AC_DEFUN(GLIBCPP_CHECK_STDLIB_SUPPORT, [
|
|
|
|
ac_test_CXXFLAGS="${CXXFLAGS+set}"
|
|
|
|
ac_save_CXXFLAGS="$CXXFLAGS"
|
|
|
|
CXXFLAGS='-fno-builtins -D_GNU_SOURCE'
|
|
|
|
|
|
|
|
GLIBCPP_CHECK_STDLIB_DECL_AND_LINKAGE_2(strtold)
|
2001-04-20 10:59:25 +02:00
|
|
|
AC_CHECK_FUNCS(drand48)
|
2000-10-27 14:31:37 +02:00
|
|
|
|
|
|
|
CXXFLAGS="$ac_save_CXXFLAGS"
|
|
|
|
])
|
|
|
|
|
|
|
|
|
2000-06-20 00:20:15 +02:00
|
|
|
dnl
|
|
|
|
dnl Check to see what the underlying c library or math library is like.
|
2000-06-22 08:19:44 +02:00
|
|
|
dnl These checks need to do two things:
|
|
|
|
dnl 1) make sure the name is declared when using the c++ compiler
|
|
|
|
dnl 2) make sure the name has "C" linkage
|
|
|
|
dnl This might seem like overkill but experience has shown that it's not...
|
2000-06-20 00:20:15 +02:00
|
|
|
dnl
|
|
|
|
dnl Define HAVE_CARGF etc if "cargf" is found.
|
|
|
|
dnl
|
|
|
|
dnl GLIBCPP_CHECK_MATH_SUPPORT
|
|
|
|
AC_DEFUN(GLIBCPP_CHECK_MATH_SUPPORT, [
|
2000-06-22 08:19:44 +02:00
|
|
|
ac_test_CXXFLAGS="${CXXFLAGS+set}"
|
|
|
|
ac_save_CXXFLAGS="$CXXFLAGS"
|
2000-06-23 19:57:04 +02:00
|
|
|
CXXFLAGS='-fno-builtins -D_GNU_SOURCE'
|
2000-06-20 01:43:19 +02:00
|
|
|
|
|
|
|
dnl Check libm
|
2000-06-20 00:20:15 +02:00
|
|
|
AC_CHECK_LIB(m, sin, libm="-lm")
|
2000-06-22 08:19:44 +02:00
|
|
|
ac_save_LIBS="$LIBS"
|
2000-06-20 00:20:15 +02:00
|
|
|
LIBS="$LIBS $libm"
|
|
|
|
|
2000-06-22 08:19:44 +02:00
|
|
|
dnl Check to see if certain C math functions exist.
|
|
|
|
GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(isinf)
|
|
|
|
GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(isnan)
|
|
|
|
GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(finite)
|
|
|
|
GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2(copysign)
|
|
|
|
GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_3(sincos)
|
|
|
|
GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(fpclass)
|
|
|
|
GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(qfpclass)
|
2001-07-25 10:06:47 +02:00
|
|
|
GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2(hypot)
|
2000-06-22 08:19:44 +02:00
|
|
|
|
|
|
|
dnl Check to see if basic C math functions have float versions.
|
2001-01-23 09:57:34 +01:00
|
|
|
GLIBCPP_CHECK_MATH_DECLS_AND_LINKAGES_1(float trig,
|
2001-01-23 18:02:28 +01:00
|
|
|
float_trig,
|
|
|
|
acosf asinf atanf \
|
2001-01-23 09:57:34 +01:00
|
|
|
cosf sinf tanf \
|
2001-01-23 18:02:28 +01:00
|
|
|
coshf sinhf tanhf)
|
2001-01-23 09:57:34 +01:00
|
|
|
GLIBCPP_CHECK_MATH_DECLS_AND_LINKAGES_1(float round,
|
2001-01-23 18:02:28 +01:00
|
|
|
float_round,
|
2001-01-23 09:57:34 +01:00
|
|
|
ceilf floorf)
|
2000-06-22 08:19:44 +02:00
|
|
|
GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(isnanf)
|
|
|
|
GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(isinff)
|
2001-07-25 10:06:47 +02:00
|
|
|
GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2(atan2f)
|
2000-06-22 08:19:44 +02:00
|
|
|
GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(fabsf)
|
|
|
|
GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2(fmodf)
|
|
|
|
GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2(frexpf)
|
2001-07-25 10:06:47 +02:00
|
|
|
GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2(hypotf)
|
2000-06-22 08:19:44 +02:00
|
|
|
GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2(ldexpf)
|
|
|
|
GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(logf)
|
|
|
|
GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(log10f)
|
|
|
|
GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2(modff)
|
|
|
|
GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2(powf)
|
|
|
|
GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(sqrtf)
|
|
|
|
GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_3(sincosf)
|
|
|
|
GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(finitef)
|
|
|
|
|
|
|
|
dnl Check to see if basic C math functions have long double versions.
|
2001-01-23 09:57:34 +01:00
|
|
|
GLIBCPP_CHECK_MATH_DECLS_AND_LINKAGES_1(long double trig,
|
2001-01-23 18:02:28 +01:00
|
|
|
long_double_trig,
|
|
|
|
acosl asinl atanl \
|
2001-01-23 09:57:34 +01:00
|
|
|
cosl sinl tanl \
|
2001-01-23 18:02:28 +01:00
|
|
|
coshl sinhl tanhl)
|
2001-01-23 09:57:34 +01:00
|
|
|
GLIBCPP_CHECK_MATH_DECLS_AND_LINKAGES_1(long double round,
|
2001-01-23 18:02:28 +01:00
|
|
|
long_double_round,
|
2001-01-23 09:57:34 +01:00
|
|
|
ceill floorl)
|
2000-06-22 08:19:44 +02:00
|
|
|
GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(isnanl)
|
|
|
|
GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(isinfl)
|
2000-06-23 01:59:04 +02:00
|
|
|
GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2(copysignl)
|
2000-06-22 08:19:44 +02:00
|
|
|
GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2(atan2l)
|
|
|
|
GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(expl)
|
|
|
|
GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(fabsl)
|
|
|
|
GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2(fmodl)
|
|
|
|
GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2(frexpl)
|
2001-07-25 10:06:47 +02:00
|
|
|
GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2(hypotl)
|
2000-06-22 08:19:44 +02:00
|
|
|
GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2(ldexpl)
|
|
|
|
GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(logl)
|
|
|
|
GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(log10l)
|
|
|
|
GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2(modfl)
|
|
|
|
GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2(powl)
|
|
|
|
GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(sqrtl)
|
|
|
|
GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_3(sincosl)
|
|
|
|
GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1(finitel)
|
|
|
|
|
|
|
|
dnl Some runtimes have these functions with a preceding underscore. Please
|
|
|
|
dnl keep this sync'd with the one above. And if you add any new symbol,
|
|
|
|
dnl please add the corresponding block in the @BOTTOM@ section of acconfig.h.
|
|
|
|
dnl Check to see if certain C math functions exist.
|
|
|
|
|
|
|
|
dnl Check to see if basic C math functions have float versions.
|
2001-01-23 09:57:34 +01:00
|
|
|
GLIBCPP_CHECK_MATH_DECLS_AND_LINKAGES_1(_float trig,
|
2001-01-23 18:02:28 +01:00
|
|
|
_float_trig,
|
|
|
|
_acosf _asinf _atanf \
|
2001-01-23 09:57:34 +01:00
|
|
|
_cosf _sinf _tanf \
|
2001-01-23 18:02:28 +01:00
|
|
|
_coshf _sinhf _tanhf)
|
2001-01-23 09:57:34 +01:00
|
|
|
GLIBCPP_CHECK_MATH_DECLS_AND_LINKAGES_1(_float round,
|
2001-01-23 18:02:28 +01:00
|
|
|
_float_round,
|
2001-01-23 09:57:34 +01:00
|
|
|
_ceilf _floorf)
|
2000-06-22 08:19:44 +02:00
|
|
|
|
|
|
|
dnl Check to see if basic C math functions have long double versions.
|
2001-01-23 09:57:34 +01:00
|
|
|
GLIBCPP_CHECK_MATH_DECLS_AND_LINKAGES_1(_long double trig,
|
2001-01-23 18:02:28 +01:00
|
|
|
_long_double_trig,
|
|
|
|
_acosl _asinl _atanl \
|
2001-01-23 09:57:34 +01:00
|
|
|
_cosl _sinl _tanl \
|
2001-01-23 18:02:28 +01:00
|
|
|
_coshl _sinhl _tanhl)
|
2001-01-23 09:57:34 +01:00
|
|
|
GLIBCPP_CHECK_MATH_DECLS_AND_LINKAGES_1(_long double round,
|
2001-01-23 18:02:28 +01:00
|
|
|
_long_double_round,
|
2001-01-23 09:57:34 +01:00
|
|
|
_ceill _floorl)
|
2000-06-22 08:19:44 +02:00
|
|
|
|
|
|
|
LIBS="$ac_save_LIBS"
|
|
|
|
CXXFLAGS="$ac_save_CXXFLAGS"
|
2000-06-20 00:20:15 +02:00
|
|
|
])
|
|
|
|
|
|
|
|
|
|
|
|
dnl
|
|
|
|
dnl Check to see if there is native support for complex
|
|
|
|
dnl
|
|
|
|
dnl Don't compile bits in math/* if native support exits.
|
|
|
|
dnl
|
2001-07-25 10:06:47 +02:00
|
|
|
dnl Define USE_COMPLEX_LONG_DOUBLE etc if "copysignl" is found.
|
2000-06-20 00:20:15 +02:00
|
|
|
dnl
|
|
|
|
dnl GLIBCPP_CHECK_COMPLEX_MATH_SUPPORT
|
|
|
|
AC_DEFUN(GLIBCPP_CHECK_COMPLEX_MATH_SUPPORT, [
|
|
|
|
dnl Check for complex versions of math functions of platform.
|
2000-10-30 22:30:30 +01:00
|
|
|
AC_CHECK_LIB(m, main)
|
2001-07-25 10:06:47 +02:00
|
|
|
AC_REPLACE_MATHFUNCS(nan copysignf)
|
2000-06-23 01:59:04 +02:00
|
|
|
|
|
|
|
dnl Compile the long double complex functions only if the function
|
|
|
|
dnl provides the non-complex long double functions that are needed.
|
2001-07-25 10:06:47 +02:00
|
|
|
dnl Currently this includes copysignl, which should be
|
2000-06-23 01:59:04 +02:00
|
|
|
dnl cached from the GLIBCPP_CHECK_MATH_SUPPORT macro, above.
|
|
|
|
USE_COMPLEX_LONG_DOUBLE=no
|
2001-07-25 10:06:47 +02:00
|
|
|
if test x$ac_cv_func_copysignl = x"yes"; then
|
2000-06-23 01:59:04 +02:00
|
|
|
USE_COMPLEX_LONG_DOUBLE=yes
|
2001-07-25 10:06:47 +02:00
|
|
|
AC_REPLACE_MATHFUNCS(signbitl)
|
2000-06-23 01:59:04 +02:00
|
|
|
fi
|
|
|
|
|
2000-06-20 00:20:15 +02:00
|
|
|
AC_SUBST(USE_COMPLEX_LONG_DOUBLE)
|
|
|
|
])
|
|
|
|
|
2000-06-06 22:26:13 +02:00
|
|
|
|
2000-11-14 00:49:41 +01:00
|
|
|
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.
|
2000-10-07 20:54:08 +02:00
|
|
|
dnl
|
2000-11-14 00:49:41 +01:00
|
|
|
dnl GLIBCPP_CHECK_TARGET
|
|
|
|
AC_DEFUN(GLIBCPP_CHECK_TARGET, [
|
|
|
|
. [$]{glibcpp_basedir}/configure.target
|
|
|
|
AC_MSG_RESULT(CPU config directory is $cpu_include_dir)
|
|
|
|
AC_MSG_RESULT(OS config directory is $os_include_dir)
|
2000-10-07 20:54:08 +02:00
|
|
|
])
|
|
|
|
|
|
|
|
|
2000-04-21 22:33:34 +02:00
|
|
|
dnl
|
|
|
|
dnl Check to see if this target can enable the wchar_t parts of libstdc++.
|
2000-10-25 14:50:06 +02:00
|
|
|
dnl If --disable-c-mbchar was given, no wchar_t stuff is enabled. (This
|
|
|
|
dnl must have been previously checked.)
|
2000-04-21 22:33:34 +02:00
|
|
|
dnl
|
|
|
|
dnl Define _GLIBCPP_USE_WCHAR_T if all the bits are found
|
2001-01-02 08:38:47 +01:00
|
|
|
dnl Define HAVE_MBSTATE_T if mbstate_t is not in wchar.h
|
2000-04-21 22:33:34 +02:00
|
|
|
dnl
|
|
|
|
dnl GLIBCPP_CHECK_WCHAR_T_SUPPORT
|
|
|
|
AC_DEFUN(GLIBCPP_CHECK_WCHAR_T_SUPPORT, [
|
2001-01-02 08:38:47 +01:00
|
|
|
|
|
|
|
dnl Test wchar.h for mbstate_t, which is needed for char_traits and
|
|
|
|
dnl others even if wchar_t support is not on.
|
|
|
|
AC_MSG_CHECKING([for mbstate_t])
|
|
|
|
AC_TRY_COMPILE([#include <wchar.h>],
|
|
|
|
[mbstate_t teststate;],
|
|
|
|
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
|
|
|
|
|
|
|
|
dnl Sanity check for existence of ISO C99 headers for extended encoding.
|
|
|
|
AC_CHECK_HEADERS(wchar.h, ac_has_wchar_h=yes, ac_has_wchar_h=no)
|
|
|
|
AC_CHECK_HEADER(wctype.h, ac_has_wctype_h=yes, ac_has_wctype_h=no)
|
2000-04-21 22:33:34 +02:00
|
|
|
|
2001-01-02 08:38:47 +01:00
|
|
|
dnl 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
|
2001-01-02 08:38:47 +01:00
|
|
|
|
|
|
|
dnl Test wchar.h for WCHAR_MIN, WCHAR_MAX, which is needed before
|
|
|
|
dnl numeric_limits can instantiate type_traits<wchar_t>
|
|
|
|
AC_MSG_CHECKING([for WCHAR_MIN and WCHAR_MAX])
|
|
|
|
AC_TRY_COMPILE([#include <wchar.h>],
|
|
|
|
[int i = WCHAR_MIN; int j = WCHAR_MAX;],
|
|
|
|
has_wchar_minmax=yes, has_wchar_minmax=no)
|
|
|
|
AC_MSG_RESULT($has_wchar_minmax)
|
2000-10-25 14:50:06 +02:00
|
|
|
|
2001-01-02 08:38:47 +01:00
|
|
|
dnl Test wchar.h for WEOF, which is what we use to determine whether
|
|
|
|
dnl to specialize for char_traits<wchar_t> or not.
|
|
|
|
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)
|
2000-10-25 14:50:06 +02:00
|
|
|
|
2001-01-02 08:38:47 +01:00
|
|
|
dnl Tests for wide character functions used in char_traits<wchar_t>.
|
2001-06-11 06:36:59 +02:00
|
|
|
ac_wfuncs=yes
|
|
|
|
AC_CHECK_FUNCS(wcslen wmemchr wmemcmp wmemcpy wmemmove wmemset,, \
|
|
|
|
ac_wfuncs=no)
|
2000-10-25 14:50:06 +02:00
|
|
|
|
2001-06-11 06:36:59 +02:00
|
|
|
dnl Checks for names injected into std:: by the c_std headers.
|
|
|
|
AC_CHECK_FUNCS(btowc wctob fgetwc fgetwc fgetws fputwc fputws fwide \
|
|
|
|
fwprintf fwscanf swprintf swscanf vfwprintf vfwscanf vswprintf vswscanf \
|
|
|
|
vwprintf vwscanf wprintf wscanf getwc getwchar mbsinit mbrlen mbrtowc \
|
|
|
|
mbsrtowcs wcsrtombs putwc putwchar ungetwc wcrtomb wcstod wcstof wcstol \
|
|
|
|
wcstoul wcscpy wcsncpy wcscat wcsncat wcscmp wcscoll wcsncmp wcsxfrm \
|
|
|
|
wcscspn wcsspn wcstok wcsftime wcschr wcspbrk wcsrchr wcsstr,, \
|
|
|
|
ac_wfuncs=no)
|
2001-06-09 08:49:13 +02:00
|
|
|
|
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 &&
|
|
|
|
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)
|
2000-10-25 14:50:06 +02:00
|
|
|
|
2001-01-02 08:38:47 +01:00
|
|
|
dnl Use iconv for wchar_t to char conversions. As such, check for
|
|
|
|
dnl X/Open Portability Guide, version 2 features (XPG2).
|
|
|
|
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)
|
|
|
|
|
|
|
|
dnl Check for existence of libiconv.a providing XPG2 wchar_t support.
|
|
|
|
AC_CHECK_LIB(iconv, iconv, libiconv="-liconv")
|
|
|
|
ac_save_LIBS="$LIBS"
|
|
|
|
LIBS="$LIBS $libiconv"
|
|
|
|
|
|
|
|
AC_CHECK_FUNCS(iconv_open iconv_close iconv nl_langinfo, \
|
|
|
|
ac_XPG2funcs=yes, ac_XPG2funcs=no)
|
2000-10-25 14:50:06 +02: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 &&
|
|
|
|
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)
|
2000-04-21 22:33:34 +02:00
|
|
|
|
2001-01-02 08:38:47 +01:00
|
|
|
dnl At the moment, only enable wchar_t specializations if all the
|
|
|
|
dnl above support is present.
|
|
|
|
AC_MSG_CHECKING([for enabled wchar_t specializations])
|
2001-06-26 22:52:23 +02:00
|
|
|
if test x"$ac_isoC99_wchar_t" = xyes &&
|
|
|
|
test x"$ac_XPG2_wchar_t" = xyes; then
|
2001-01-02 08:38:47 +01:00
|
|
|
AC_DEFINE(_GLIBCPP_USE_WCHAR_T)
|
|
|
|
AC_MSG_RESULT("yes")
|
2000-06-02 09:24:15 +02:00
|
|
|
else
|
2001-01-02 08:38:47 +01:00
|
|
|
AC_MSG_RESULT("no")
|
2000-06-02 09:24:15 +02:00
|
|
|
fi
|
2000-04-21 22:33:34 +02:00
|
|
|
else
|
2001-01-02 08:38:47 +01:00
|
|
|
dnl Wide characters disabled by the user.
|
|
|
|
AC_MSG_WARN([wchar_t support disabled.])
|
2000-04-21 22:33:34 +02:00
|
|
|
fi
|
|
|
|
])
|
|
|
|
|
|
|
|
|
|
|
|
dnl
|
2000-05-19 21:55:50 +02:00
|
|
|
dnl Check for special debugging mode; not for production use.
|
2000-04-21 22:33:34 +02:00
|
|
|
dnl
|
|
|
|
dnl GLIBCPP_ENABLE_DEBUG
|
2000-10-31 02:56:19 +01:00
|
|
|
dnl --enable-debug sets '-ggdb3 -O0'.
|
2000-04-21 22:33:34 +02:00
|
|
|
dnl --disable-debug sets '-g' and whatever optimization options the
|
|
|
|
dnl compiler can handle.
|
2000-09-08 00:40:17 +02:00
|
|
|
dnl + --enable-maintainer-mode automatically defaults this to on.
|
2000-04-21 22:33:34 +02:00
|
|
|
dnl + Perhaps -D/-U of NDEBUG, DEBUG, DEBUG_ASSERT, ...?
|
|
|
|
dnl + Usage: GLIBCPP_ENABLE_DEBUG[(DEFAULT)]
|
|
|
|
dnl Where DEFAULT is either `yes' or `no'. If ommitted, it
|
|
|
|
dnl defaults to `no'.
|
|
|
|
AC_DEFUN(GLIBCPP_ENABLE_DEBUG, [dnl
|
|
|
|
define([GLIBCPP_ENABLE_DEBUG_DEFAULT], ifelse($1, yes, yes, no))dnl
|
|
|
|
AC_ARG_ENABLE(debug,
|
|
|
|
changequote(<<, >>)dnl
|
|
|
|
<< --enable-debug extra debugging, turn off optimization [default=>>GLIBCPP_ENABLE_DEBUG_DEFAULT],
|
|
|
|
changequote([, ])dnl
|
2000-07-26 08:51:38 +02:00
|
|
|
[case "${enableval}" in
|
2000-04-21 22:33:34 +02:00
|
|
|
yes) enable_debug=yes ;;
|
|
|
|
no) enable_debug=no ;;
|
|
|
|
*) AC_MSG_ERROR([Unknown argument to enable/disable extra debugging]) ;;
|
|
|
|
esac],
|
|
|
|
enable_debug=GLIBCPP_ENABLE_DEBUG_DEFAULT)dnl
|
2000-07-26 08:51:38 +02:00
|
|
|
|
2000-04-21 22:33:34 +02:00
|
|
|
dnl Option parsed, now set things appropriately
|
2000-07-26 08:51:38 +02:00
|
|
|
case "${enable_debug}" in
|
2000-05-02 01:47:31 +02:00
|
|
|
yes)
|
2000-10-31 02:56:19 +01:00
|
|
|
DEBUG_FLAGS='-O0 -ggdb3'
|
2000-12-20 09:39:55 +01:00
|
|
|
;;
|
2000-04-28 04:50:55 +02:00
|
|
|
no)
|
2000-10-25 14:50:06 +02:00
|
|
|
DEBUG_FLAGS='-g'
|
2000-04-28 04:50:55 +02:00
|
|
|
;;
|
2000-04-21 22:33:34 +02:00
|
|
|
esac
|
2000-06-19 05:14:40 +02:00
|
|
|
AC_SUBST(DEBUG_FLAGS)
|
2000-04-21 22:33:34 +02:00
|
|
|
])
|
|
|
|
|
|
|
|
|
2000-05-09 22:25:13 +02:00
|
|
|
dnl
|
|
|
|
dnl Check for "unusual" flags to pass to the compiler while building.
|
|
|
|
dnl
|
|
|
|
dnl GLIBCPP_ENABLE_CXX_FLAGS
|
|
|
|
dnl --enable-cxx-flags='-foo -bar -baz' is a general method for passing
|
|
|
|
dnl experimental flags such as -fhonor-std, -fsquangle, -Dfloat=char, etc.
|
|
|
|
dnl Somehow this same set of flags must be passed when [re]building
|
|
|
|
dnl libgcc.
|
|
|
|
dnl --disable-cxx-flags passes nothing.
|
acinclude.m4, [...]: Change sourceware.cygnus.com and sources.redhat.com URLs for libstdc++ web...
* acinclude.m4, configure.in, mkcheck.in,
testsuite/21_strings/ctor_copy_dtor.cc,
testsuite/21_strings/inserters_extractors.cc,
testsuite/23_containers/map_operators.cc,
testsuite/23_containers/vector_element_access.cc,
testsuite/25_algorithms/lower_bound.cc,
testsuite/27_io/ifstream_members.cc,
testsuite/27_io/istream_extractor_arith.cc,
testsuite/27_io/istream_unformatted.cc,
testsuite/27_io/ofstream_members.cc,
testsuite/27_io/ostream_inserter_char.cc,
testsuite/27_io/ostream_inserter_other.cc,
testsuite/27_io/ostream_manip.cc, testsuite/27_io/streambuf.cc:
Change sourceware.cygnus.com and sources.redhat.com URLs for
libstdc++ web pages and list archives to point to gcc.gnu.org
* aclocal.m4, configure: Regenerate.
From-SVN: r38428
2000-12-21 23:08:39 +01:00
|
|
|
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
|
2000-05-09 22:25:13 +02:00
|
|
|
dnl + Usage: GLIBCPP_ENABLE_CXX_FLAGS(default flags)
|
2000-05-11 21:52:00 +02:00
|
|
|
dnl If "default flags" is an empty string (or "none"), the effect is
|
|
|
|
dnl the same as --disable or --enable=no.
|
2000-05-09 22:25:13 +02:00
|
|
|
AC_DEFUN(GLIBCPP_ENABLE_CXX_FLAGS, [dnl
|
|
|
|
define([GLIBCPP_ENABLE_CXX_FLAGS_DEFAULT], ifelse($1,,, $1))dnl
|
|
|
|
AC_ARG_ENABLE(cxx-flags,
|
|
|
|
changequote(<<, >>)dnl
|
|
|
|
<< --enable-cxx-flags=FLAGS pass compiler FLAGS when building library;
|
|
|
|
[default=>>GLIBCPP_ENABLE_CXX_FLAGS_DEFAULT],
|
|
|
|
changequote([, ])dnl
|
|
|
|
[case "x$enableval" in
|
2000-07-26 08:51:38 +02:00
|
|
|
xyes)
|
2000-10-25 14:50:06 +02:00
|
|
|
AC_MSG_ERROR([--enable-cxx-flags needs compiler flags as arguments]) ;;
|
2000-07-26 08:51:38 +02:00
|
|
|
xno|x)
|
2000-10-25 14:50:06 +02:00
|
|
|
enable_cxx_flags='' ;;
|
2000-07-26 08:51:38 +02:00
|
|
|
*)
|
2000-10-25 14:50:06 +02:00
|
|
|
enable_cxx_flags="$enableval" ;;
|
2000-05-09 22:25:13 +02:00
|
|
|
esac],
|
2000-07-26 08:51:38 +02:00
|
|
|
enable_cxx_flags='GLIBCPP_ENABLE_CXX_FLAGS_DEFAULT')
|
|
|
|
|
2000-05-11 21:52:00 +02:00
|
|
|
dnl Thinko on my part during design. This kludge is the workaround.
|
2000-07-26 08:51:38 +02:00
|
|
|
if test "$enable_cxx_flags" = "none"; then
|
|
|
|
enable_cxx_flags='';
|
|
|
|
fi
|
|
|
|
|
2000-05-11 21:52:00 +02:00
|
|
|
dnl Run through flags (either default or command-line) and set anything
|
|
|
|
dnl extra (e.g., #defines) that must accompany particular g++ options.
|
2000-05-09 22:25:13 +02:00
|
|
|
if test -n "$enable_cxx_flags"; then
|
|
|
|
for f in $enable_cxx_flags; do
|
|
|
|
case "$f" in
|
2000-05-11 04:40:34 +02:00
|
|
|
-fhonor-std) ;;
|
2000-05-09 22:25:13 +02:00
|
|
|
-*) ;;
|
|
|
|
*) # and we're trying to pass /what/ exactly?
|
|
|
|
AC_MSG_ERROR([compiler flags start with a -]) ;;
|
|
|
|
esac
|
|
|
|
done
|
|
|
|
fi
|
|
|
|
EXTRA_CXX_FLAGS="$enable_cxx_flags"
|
|
|
|
AC_SUBST(EXTRA_CXX_FLAGS)
|
|
|
|
])
|
|
|
|
|
|
|
|
|
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
|
|
|
|
dnl Check for which locale library to use: gnu or generic.
|
|
|
|
dnl
|
|
|
|
dnl GLIBCPP_ENABLE_CLOCALE
|
2001-08-08 04:49:01 +02:00
|
|
|
dnl --enable-clocale=gnu sets config/locale/c_locale_gnu.cc and friends
|
|
|
|
dnl --enable-clocale=generic sets config/locale/c_locale_generic.cc and friends
|
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
|
|
|
|
dnl default is generic
|
|
|
|
dnl
|
|
|
|
AC_DEFUN(GLIBCPP_ENABLE_CLOCALE, [
|
|
|
|
AC_MSG_CHECKING([for clocale to use])
|
|
|
|
AC_ARG_ENABLE(clocale,
|
2001-05-19 22:27:36 +02:00
|
|
|
[ --enable-clocale enable model for target locale package.
|
|
|
|
--enable-clocale=MODEL use MODEL target-speific locale package. [default=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
|
|
|
],
|
|
|
|
if test x$enable_clocale = xno; then
|
2001-12-15 19:58:49 +01:00
|
|
|
enable_clocale=no
|
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
|
|
|
fi,
|
2001-12-15 19:58:49 +01:00
|
|
|
enable_clocale=no)
|
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
|
|
|
|
|
2001-12-15 19:58:49 +01:00
|
|
|
dnl Probe for locale support if no specific model is specified.
|
|
|
|
dnl Default to "generic"
|
|
|
|
if test x$enable_clocale_flag = xno; then
|
|
|
|
case x${target_os} in
|
|
|
|
xlinux* | xgnu*)
|
|
|
|
AC_EGREP_CPP([ok], [
|
|
|
|
#include <features.h>
|
|
|
|
#if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2)
|
|
|
|
ok
|
|
|
|
#endif
|
|
|
|
], enable_clocale_flag=gnu, enable_clocale_flag=generic)
|
|
|
|
;;
|
|
|
|
*)
|
|
|
|
enable_clocale_flag=generic
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
fi
|
|
|
|
|
|
|
|
dnl Set configure bits for specified locale package
|
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
|
|
|
case x${enable_clocale_flag} in
|
2001-08-08 04:49:01 +02:00
|
|
|
xgeneric)
|
|
|
|
AC_MSG_RESULT(generic)
|
|
|
|
|
|
|
|
# Don't use gettext.
|
|
|
|
USE_NLS=no
|
|
|
|
|
|
|
|
CLOCALE_H=config/locale/c_locale_generic.h
|
|
|
|
CLOCALE_CC=config/locale/c_locale_generic.cc
|
|
|
|
CCODECVT_H=config/locale/codecvt_specializations_generic.h
|
2001-08-28 08:19:35 +02:00
|
|
|
CCOLLATE_CC=config/locale/collate_members_generic.cc
|
2001-12-15 08:05:04 +01:00
|
|
|
CCTYPE_CC=config/locale/ctype_members_generic.cc
|
2001-08-08 04:49:01 +02:00
|
|
|
CMESSAGES_H=config/locale/messages_members_generic.h
|
|
|
|
CMESSAGES_CC=config/locale/messages_members_generic.cc
|
2001-08-28 08:19:35 +02:00
|
|
|
CMONEY_CC=config/locale/moneypunct_members_generic.cc
|
|
|
|
CNUMERIC_CC=config/locale/numpunct_members_generic.cc
|
2001-09-29 01:44:48 +02:00
|
|
|
CTIME_CC=config/locale/time_members_generic.cc
|
2001-08-08 04:49:01 +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
|
|
|
xgnu)
|
|
|
|
AC_MSG_RESULT(gnu)
|
2001-08-08 04:49:01 +02:00
|
|
|
|
|
|
|
# Declare intention to use gettext, and add support for specific
|
|
|
|
# languages.
|
|
|
|
# For some reason, ALL_LINGUAS has to be before AM_GNU_GETTEXT
|
|
|
|
ALL_LINGUAS="de fr"
|
2001-08-14 03:24:30 +02:00
|
|
|
# Don't call AM_GNU_GETTEXT here. Instead, assume glibc.
|
|
|
|
# Need to deal with MSGFMT, USE_NLS, and glibcpp_[P,M]OFILES
|
|
|
|
USE_NLS=yes
|
2001-08-08 04:49:01 +02:00
|
|
|
|
|
|
|
# Export the build objects.
|
|
|
|
for ling in $ALL_LINGUAS; do \
|
|
|
|
glibcpp_MOFILES="$glibcpp_MOFILES $ling.mo"; \
|
2001-08-14 03:24:30 +02:00
|
|
|
glibcpp_POFILES="$glibcpp_POFILES $ling.po"; \
|
2001-08-08 04:49:01 +02:00
|
|
|
done
|
|
|
|
AC_SUBST(glibcpp_MOFILES)
|
2001-08-14 03:24:30 +02:00
|
|
|
AC_SUBST(glibcpp_POFILES)
|
2001-08-08 04:49:01 +02:00
|
|
|
|
|
|
|
CLOCALE_H=config/locale/c_locale_gnu.h
|
|
|
|
CLOCALE_CC=config/locale/c_locale_gnu.cc
|
|
|
|
CCODECVT_H=config/locale/codecvt_specializations_ieee_1003.1-200x.h
|
2001-08-28 08:19:35 +02:00
|
|
|
CCOLLATE_CC=config/locale/collate_members_gnu.cc
|
2001-12-15 08:05:04 +01:00
|
|
|
CCTYPE_CC=config/locale/ctype_members_gnu.cc
|
2001-08-08 04:49:01 +02:00
|
|
|
CMESSAGES_H=config/locale/messages_members_gnu.h
|
|
|
|
CMESSAGES_CC=config/locale/messages_members_gnu.cc
|
2001-08-28 08:19:35 +02:00
|
|
|
CMONEY_CC=config/locale/moneypunct_members_gnu.cc
|
|
|
|
CNUMERIC_CC=config/locale/numpunct_members_gnu.cc
|
2001-09-29 01:44:48 +02:00
|
|
|
CTIME_CC=config/locale/time_members_gnu.cc
|
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
|
|
|
;;
|
2001-08-08 04:49:01 +02:00
|
|
|
xieee_1003.1)
|
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(generic)
|
2001-08-08 04:49:01 +02:00
|
|
|
|
|
|
|
# Don't use gettext.
|
|
|
|
USE_NLS=no
|
|
|
|
|
|
|
|
CLOCALE_H=config/locale/c_locale_ieee_1003.1-200x.h
|
|
|
|
CLOCALE_CC=config/locale/c_locale_ieee_1003.1-200x.cc
|
|
|
|
CCODECVT_H=config/locale/codecvt_specializations_ieee_1003.1-200x.h
|
2001-08-28 08:19:35 +02:00
|
|
|
CCOLLATE_CC=config/locale/collate_members_generic.cc
|
2001-12-15 08:05:04 +01:00
|
|
|
CCTYPE_CC=config/locale/ctype_members_generic.cc
|
2001-08-08 04:49:01 +02:00
|
|
|
CMESSAGES_H=config/locale/messages_members_ieee_1003.1-200x.h
|
|
|
|
CMESSAGES_CC=config/locale/messages_members_ieee_1003.1-200x.cc
|
2001-08-28 08:19:35 +02:00
|
|
|
CMONEY_CC=config/locale/moneypunct_members_generic.cc
|
|
|
|
CNUMERIC_CC=config/locale/numpunct_members_generic.cc
|
2001-09-29 01:44:48 +02:00
|
|
|
CTIME_CC=config/locale/time_members_generic.cc
|
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
|
|
|
;;
|
|
|
|
*)
|
|
|
|
echo "$enable_clocale is an unknown locale package" 1>&2
|
|
|
|
exit 1
|
|
|
|
;;
|
|
|
|
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.
|
|
|
|
glibcpp_localedir=${glibcpp_builddir}/po/share/locale
|
|
|
|
AC_SUBST(glibcpp_localedir)
|
|
|
|
|
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)
|
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_LINK_FILES($CLOCALE_CC, src/c++locale.cc)
|
2001-08-18 04:53:13 +02:00
|
|
|
AC_LINK_FILES($CCOLLATE_CC, src/collate.cc)
|
2001-12-15 08:05:04 +01:00
|
|
|
AC_LINK_FILES($CCTYPE_CC, src/ctype.cc)
|
2001-08-28 08:19:35 +02:00
|
|
|
AC_LINK_FILES($CMESSAGES_CC, src/messages.cc)
|
|
|
|
AC_LINK_FILES($CMONEY_CC, src/moneypunct.cc)
|
|
|
|
AC_LINK_FILES($CNUMERIC_CC, src/numpunct.cc)
|
2001-09-29 01:44:48 +02:00
|
|
|
AC_LINK_FILES($CTIME_CC, src/time.cc)
|
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
|
|
|
])
|
|
|
|
|
|
|
|
|
2000-04-21 22:33:34 +02:00
|
|
|
dnl
|
2000-05-19 21:55:50 +02:00
|
|
|
dnl Check for which I/O library to use: libio, or something specific.
|
2000-04-21 22:33:34 +02:00
|
|
|
dnl
|
|
|
|
dnl GLIBCPP_ENABLE_CSTDIO
|
2001-08-08 04:49:01 +02:00
|
|
|
dnl --enable-cstdio=libio sets config/io/c_io_libio.h and friends
|
2000-04-21 22:33:34 +02:00
|
|
|
dnl
|
2000-11-17 23:38:49 +01:00
|
|
|
dnl default is stdio
|
2000-04-21 22:33:34 +02:00
|
|
|
dnl
|
|
|
|
AC_DEFUN(GLIBCPP_ENABLE_CSTDIO, [
|
|
|
|
AC_MSG_CHECKING([for cstdio to use])
|
|
|
|
AC_ARG_ENABLE(cstdio,
|
2001-05-19 22:27:36 +02:00
|
|
|
[ --enable-cstdio enable stdio for target io package.
|
|
|
|
--enable-cstdio=LIB use LIB target-speific io package. [default=stdio]
|
2001-01-03 16:53:28 +01:00
|
|
|
],
|
2000-04-21 22:33:34 +02:00
|
|
|
if test x$enable_cstdio = xno; then
|
2000-11-17 23:38:49 +01:00
|
|
|
enable_cstdio=stdio
|
2000-04-21 22:33:34 +02:00
|
|
|
fi,
|
2000-11-17 23:38:49 +01:00
|
|
|
enable_cstdio=stdio)
|
2000-04-21 22:33:34 +02:00
|
|
|
|
|
|
|
enable_cstdio_flag=$enable_cstdio
|
|
|
|
|
2000-10-25 14:50:06 +02:00
|
|
|
dnl Check if a valid I/O package
|
2000-04-21 22:33:34 +02:00
|
|
|
case x${enable_cstdio_flag} in
|
2000-11-17 02:04:02 +01:00
|
|
|
xlibio)
|
2001-08-08 04:49:01 +02:00
|
|
|
CSTDIO_H=config/io/c_io_libio.h
|
|
|
|
BASIC_FILE_H=config/io/basic_file_libio.h
|
|
|
|
BASIC_FILE_CC=config/io/basic_file_libio.cc
|
2000-07-19 02:57:38 +02:00
|
|
|
AC_MSG_RESULT(libio)
|
|
|
|
|
|
|
|
# see if we are on a system with libio native (ie, linux)
|
|
|
|
AC_CHECK_HEADER(libio.h, has_libio=yes, has_libio=no)
|
|
|
|
|
|
|
|
# Need to check and see what version of glibc is being used. If
|
|
|
|
# it's not glibc-2.2 or higher, then we'll need to go ahead and
|
|
|
|
# compile most of libio for linux systems.
|
|
|
|
if test x$has_libio = x"yes"; then
|
|
|
|
case "$target" in
|
|
|
|
*-*-linux*)
|
2000-10-25 14:50:06 +02:00
|
|
|
AC_MSG_CHECKING([for glibc version >= 2.2])
|
|
|
|
AC_EGREP_CPP([ok], [
|
|
|
|
#include <features.h>
|
|
|
|
#if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2)
|
|
|
|
ok
|
|
|
|
#endif
|
|
|
|
], glibc_satisfactory=yes, glibc_satisfactory=no)
|
|
|
|
AC_MSG_RESULT($glibc_satisfactory)
|
|
|
|
;;
|
2000-07-19 02:57:38 +02:00
|
|
|
esac
|
|
|
|
|
2000-10-25 14:50:06 +02:00
|
|
|
# XXX at the moment, admit defeat and force the recompilation
|
2000-09-07 03:02:01 +02:00
|
|
|
# XXX of glibc even on glibc-2.2 systems, because libio is not synched.
|
2000-10-25 14:50:06 +02:00
|
|
|
glibc_satisfactory=no
|
|
|
|
|
|
|
|
if test x$glibc_satisfactory = x"yes"; then
|
|
|
|
need_libio=no
|
|
|
|
need_wlibio=no
|
|
|
|
else
|
|
|
|
need_libio=yes
|
|
|
|
# bkoz XXX need to add checks to enable this
|
|
|
|
# pme XXX here's a first pass at such a check
|
|
|
|
if test x$enable_c_mbchar != xno; then
|
|
|
|
need_wlibio=yes
|
|
|
|
else
|
|
|
|
need_wlibio=no
|
|
|
|
fi
|
|
|
|
fi
|
2000-07-19 02:57:38 +02:00
|
|
|
|
|
|
|
else
|
2000-10-27 14:31:37 +02:00
|
|
|
# Using libio, but <libio.h> doesn't exist on the target system. . .
|
2000-10-25 14:50:06 +02:00
|
|
|
need_libio=yes
|
|
|
|
# bkoz XXX need to add checks to enable this
|
|
|
|
# pme XXX here's a first pass at such a check
|
|
|
|
if test x$enable_c_mbchar != xno; then
|
|
|
|
need_wlibio=yes
|
|
|
|
else
|
|
|
|
need_wlibio=no
|
|
|
|
fi
|
2000-07-19 02:57:38 +02:00
|
|
|
fi
|
|
|
|
;;
|
2000-11-17 02:04:02 +01:00
|
|
|
xstdio | x | xno | xnone | xyes)
|
|
|
|
# default
|
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-11-17 02:04:02 +01:00
|
|
|
# We're not using stdio.
|
2000-07-19 02:57:38 +02:00
|
|
|
need_libio=no
|
2000-11-17 02:04:02 +01:00
|
|
|
need_wlibio=no
|
2000-07-19 02:57:38 +02:00
|
|
|
;;
|
|
|
|
*)
|
|
|
|
echo "$enable_cstdio is an unknown io package" 1>&2
|
|
|
|
exit 1
|
|
|
|
;;
|
2000-04-21 22:33:34 +02:00
|
|
|
esac
|
2001-07-13 18:47:56 +02:00
|
|
|
AC_SUBST(CSTDIO_H)
|
|
|
|
AC_SUBST(BASIC_FILE_H)
|
2001-02-28 04:20:36 +01:00
|
|
|
AC_LINK_FILES($BASIC_FILE_CC, src/basic_file.cc)
|
2000-08-09 09:33:39 +02:00
|
|
|
|
|
|
|
# 2000-08-04 bkoz hack
|
2001-08-08 04:49:01 +02:00
|
|
|
CCODECVT_C=config/io/c_io_libio_codecvt.c
|
2001-07-13 18:47:56 +02:00
|
|
|
AC_SUBST(CCODECVT_C)
|
2000-08-09 09:33:39 +02:00
|
|
|
# 2000-08-04 bkoz hack
|
2000-10-25 14:50:06 +02:00
|
|
|
|
2000-12-08 23:26:49 +01:00
|
|
|
AM_CONDITIONAL(GLIBCPP_BUILD_LIBIO,
|
|
|
|
test "$need_libio" = yes || test "$need_wlibio" = yes)
|
2000-04-21 22:33:34 +02:00
|
|
|
AM_CONDITIONAL(GLIBCPP_NEED_LIBIO, test "$need_libio" = yes)
|
2000-07-02 04:16:35 +02:00
|
|
|
AM_CONDITIONAL(GLIBCPP_NEED_WLIBIO, test "$need_wlibio" = yes)
|
2000-11-16 02:44:03 +01:00
|
|
|
if test "$need_libio" = yes || test "$need_wlibio" = yes; then
|
2000-12-20 22:37:57 +01:00
|
|
|
libio_la=../libio/libio.la
|
2000-11-16 02:44:03 +01:00
|
|
|
else
|
2000-12-20 22:37:57 +01:00
|
|
|
libio_la=
|
2000-11-16 02:44:03 +01:00
|
|
|
fi
|
|
|
|
AC_SUBST(libio_la)
|
2000-04-21 22:33:34 +02:00
|
|
|
])
|
|
|
|
|
|
|
|
|
|
|
|
dnl
|
2001-06-08 05:53:35 +02:00
|
|
|
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
|
2001-07-02 23:30:30 +02:00
|
|
|
dnl namespace are complex and fragile enough as it is). We must also
|
|
|
|
dnl add a relative path so that -I- is supported properly.
|
2000-04-21 22:33:34 +02:00
|
|
|
dnl
|
|
|
|
AC_DEFUN(GLIBCPP_ENABLE_THREADS, [
|
2001-04-26 06:29:15 +02:00
|
|
|
AC_MSG_CHECKING([for thread model used by GCC])
|
|
|
|
target_thread_file=`$CC -v 2>&1 | sed -n 's/^Thread model: //p'`
|
|
|
|
AC_MSG_RESULT([$target_thread_file])
|
2000-04-21 22:33:34 +02:00
|
|
|
|
2001-06-08 05:53:35 +02:00
|
|
|
if test $target_thread_file != single; then
|
|
|
|
AC_DEFINE(HAVE_GTHR_DEFAULT)
|
|
|
|
AC_DEFINE(_GLIBCPP_SUPPORTS_WEAK, __GXX_WEAK__)
|
2000-10-25 14:50:06 +02:00
|
|
|
fi
|
2001-07-13 18:47:56 +02:00
|
|
|
|
|
|
|
glibcpp_thread_h=gthr-$target_thread_file.h
|
|
|
|
AC_SUBST(glibcpp_thread_h)
|
2000-04-21 22:33:34 +02:00
|
|
|
])
|
|
|
|
|
|
|
|
|
2001-03-28 13:04:51 +02:00
|
|
|
dnl
|
|
|
|
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.
|
|
|
|
dnl
|
|
|
|
dnl GLIBCPP_ENABLE_SJLJ_EXCEPTIONS
|
|
|
|
dnl --enable-sjlj-exceptions forces the use of builtin setjmp.
|
|
|
|
dnl --disable-sjlj-exceptions forces the use of call frame unwinding.
|
|
|
|
dnl
|
|
|
|
dnl Define _GLIBCPP_SJLJ_EXCEPTIONS if the compiler is configured for it.
|
|
|
|
dnl
|
|
|
|
AC_DEFUN(GLIBCPP_ENABLE_SJLJ_EXCEPTIONS, [
|
|
|
|
AC_MSG_CHECKING([for exception model to use])
|
|
|
|
AC_LANG_SAVE
|
|
|
|
AC_LANG_CPLUSPLUS
|
|
|
|
AC_ARG_ENABLE(sjlj-exceptions,
|
|
|
|
[ --enable-sjlj-exceptions force use of builtin_setjmp for exceptions],
|
|
|
|
[:],
|
|
|
|
[dnl Botheration. Now we've got to detect the exception model.
|
|
|
|
dnl Link tests against libgcc.a are problematic since -- at least
|
|
|
|
dnl as of this writing -- we've not been given proper -L bits for
|
|
|
|
dnl single-tree newlib and libgloss.
|
|
|
|
dnl
|
|
|
|
dnl This is what AC_TRY_COMPILE would do if it didn't delete the
|
|
|
|
dnl conftest files before we got a change to grep them first.
|
|
|
|
cat > conftest.$ac_ext << EOF
|
|
|
|
[#]line __oline__ "configure"
|
|
|
|
struct S { ~S(); };
|
|
|
|
void bar();
|
|
|
|
void foo()
|
|
|
|
{
|
|
|
|
S s;
|
|
|
|
bar();
|
|
|
|
}
|
|
|
|
EOF
|
|
|
|
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*])
|
|
|
|
if test x$enable_sjlj_exceptions = xyes; then
|
|
|
|
AC_DEFINE(_GLIBCPP_SJLJ_EXCEPTIONS, 1,
|
2001-06-26 22:52:23 +02:00
|
|
|
[Define if the compiler is configured for setjmp/longjmp exceptions.])
|
2001-03-28 13:04:51 +02:00
|
|
|
ac_exception_model_name=sjlj
|
|
|
|
elif test x$enable_sjlj_exceptions = xno; then
|
|
|
|
ac_exception_model_name="call frame"
|
|
|
|
else
|
|
|
|
AC_MSG_ERROR([unable to detect exception model])
|
|
|
|
fi
|
|
|
|
AC_LANG_RESTORE
|
|
|
|
AC_MSG_RESULT($ac_exception_model_name)
|
|
|
|
])
|
|
|
|
|
|
|
|
|
2001-04-20 10:59:25 +02:00
|
|
|
dnl
|
|
|
|
dnl Check for ISO/IEC 9899:1999 "C99" support.
|
|
|
|
dnl
|
|
|
|
dnl GLIBCPP_ENABLE_C99
|
|
|
|
dnl --enable-c99 defines _GLIBCPP_USE_C99
|
|
|
|
dnl --disable-c99 leaves _GLIBCPP_USE_C99 undefined
|
|
|
|
dnl + Usage: GLIBCPP_ENABLE_C99[(DEFAULT)]
|
|
|
|
dnl Where DEFAULT is either `yes' or `no'. If omitted, it
|
|
|
|
dnl defaults to `no'.
|
|
|
|
dnl + If 'C99' stuff is not available, ignores DEFAULT and sets `no'.
|
|
|
|
dnl
|
|
|
|
dnl GLIBCPP_ENABLE_C99
|
|
|
|
AC_DEFUN(GLIBCPP_ENABLE_C99, [dnl
|
|
|
|
define([GLIBCPP_ENABLE_C99_DEFAULT], ifelse($1, yes, yes, no))dnl
|
2000-06-01 02:56:37 +02:00
|
|
|
|
2001-04-20 10:59:25 +02:00
|
|
|
AC_ARG_ENABLE(c99,
|
|
|
|
changequote(<<, >>)dnl
|
2001-11-01 16:46:48 +01:00
|
|
|
<<--enable-c99 turns on 'ISO/IEC 9899:1999 support' [default=>>GLIBCPP_ENABLE_C99_DEFAULT],
|
2001-04-20 10:59:25 +02:00
|
|
|
changequote([, ])dnl
|
|
|
|
[case "$enableval" in
|
|
|
|
yes) enable_c99=yes ;;
|
|
|
|
no) enable_c99=no ;;
|
|
|
|
*) AC_MSG_ERROR([Unknown argument to enable/disable C99]) ;;
|
|
|
|
esac],
|
|
|
|
enable_c99=GLIBCPP_ENABLE_C99_DEFAULT)dnl
|
|
|
|
|
|
|
|
AC_LANG_SAVE
|
|
|
|
AC_LANG_CPLUSPLUS
|
2000-06-01 02:56:37 +02:00
|
|
|
|
2001-04-20 10:59:25 +02:00
|
|
|
# Check for the existence of <math.h> functions used if C99 is enabled.
|
2001-05-25 23:53:51 +02:00
|
|
|
ac_c99_math=yes;
|
2001-05-30 19:05:02 +02:00
|
|
|
AC_MSG_CHECKING([for ISO C99 support in <math.h>])
|
2001-04-20 10:59:25 +02:00
|
|
|
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])
|
2001-04-23 21:50:00 +02:00
|
|
|
AC_TRY_COMPILE([#include <math.h>],[isgreater(0.0,0.0);],, [ac_c99_math=no])
|
|
|
|
AC_TRY_COMPILE([#include <math.h>],
|
2001-05-25 23:53:51 +02:00
|
|
|
[isgreaterequal(0.0,0.0);],, [ac_c99_math=no])
|
2001-04-23 21:50:00 +02:00
|
|
|
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>],
|
2001-05-25 23:53:51 +02:00
|
|
|
[islessgreater(0.0,0.0);],, [ac_c99_math=no])
|
2001-04-23 21:50:00 +02:00
|
|
|
AC_TRY_COMPILE([#include <math.h>],
|
2001-05-25 23:53:51 +02:00
|
|
|
[isunordered(0.0,0.0);],, [ac_c99_math=no])
|
|
|
|
AC_MSG_RESULT($ac_c99_math)
|
2001-04-20 10:59:25 +02:00
|
|
|
|
2001-06-11 01:26:34 +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);}],
|
2001-06-26 22:52:23 +02:00
|
|
|
[],, [ac_c99_stdio=no])
|
2001-06-11 01:26:34 +02:00
|
|
|
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)
|
|
|
|
|
2001-04-20 10:59:25 +02:00
|
|
|
# Check for the existence in <stdlib.h> of lldiv_t, et. al.
|
2001-05-25 23:53:51 +02:00
|
|
|
ac_c99_stdlib=yes;
|
2000-12-05 23:03:19 +01:00
|
|
|
AC_MSG_CHECKING([for lldiv_t declaration])
|
2001-04-20 10:59:25 +02:00
|
|
|
AC_CACHE_VAL(ac_c99_lldiv_t, [
|
|
|
|
AC_TRY_COMPILE([#include <stdlib.h>],
|
2000-12-05 23:03:19 +01:00
|
|
|
[ lldiv_t mydivt;],
|
2001-04-20 10:59:25 +02:00
|
|
|
[ac_c99_lldiv_t=yes], [ac_c99_lldiv_t=no])
|
2000-12-05 23:03:19 +01:00
|
|
|
])
|
2001-04-20 10:59:25 +02:00
|
|
|
AC_MSG_RESULT($ac_c99_lldiv_t)
|
2001-05-30 19:05:02 +02:00
|
|
|
|
|
|
|
AC_MSG_CHECKING([for ISO C99 support in <stdlib.h>])
|
2001-06-11 01:26:34 +02:00
|
|
|
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])
|
2001-05-30 19:05:02 +02:00
|
|
|
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])
|
2001-06-11 01:26:34 +02:00
|
|
|
AC_TRY_COMPILE([#include <stdlib.h>], [_Exit(0);],, [ac_c99_stdlib=no])
|
2001-04-20 10:59:25 +02:00
|
|
|
if test x"$ac_c99_lldiv_t" = x"no"; then
|
|
|
|
ac_c99_stdlib=no;
|
|
|
|
fi;
|
2001-05-25 23:53:51 +02:00
|
|
|
AC_MSG_RESULT($ac_c99_stdlib)
|
2001-04-20 10:59:25 +02:00
|
|
|
|
|
|
|
# Check for the existence of <wchar.h> functions used if C99 is enabled.
|
2001-06-11 06:36:59 +02:00
|
|
|
# XXX the wchar.h checks should be rolled into the general C99 bits.
|
2001-05-25 23:53:51 +02:00
|
|
|
ac_c99_wchar=yes;
|
2001-06-11 06:36:59 +02:00
|
|
|
AC_MSG_CHECKING([for additional ISO C99 support in <wchar.h>])
|
2001-05-25 23:53:51 +02:00
|
|
|
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)
|
2000-12-05 23:03:19 +01:00
|
|
|
|
2001-04-20 10:59:25 +02:00
|
|
|
AC_MSG_CHECKING([for enabled ISO C99 support])
|
2001-06-26 22:52:23 +02:00
|
|
|
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
|
2001-04-20 10:59:25 +02:00
|
|
|
enable_c99=no;
|
2000-06-02 09:24:15 +02:00
|
|
|
fi;
|
2001-04-20 10:59:25 +02:00
|
|
|
AC_MSG_RESULT($enable_c99)
|
2000-06-02 09:24:15 +02:00
|
|
|
|
2000-12-05 23:03:19 +01:00
|
|
|
# Option parsed, now set things appropriately
|
2001-04-20 10:59:25 +02:00
|
|
|
if test x"$enable_c99" = x"yes"; then
|
|
|
|
AC_DEFINE(_GLIBCPP_USE_C99)
|
2000-10-24 19:00:59 +02:00
|
|
|
fi
|
2000-12-20 22:37:57 +01:00
|
|
|
|
2001-04-20 10:59:25 +02:00
|
|
|
AC_LANG_RESTORE
|
2000-04-21 22:33:34 +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
|
|
|
|
dnl GLIBCPP_ENABLE_LONG_LONG
|
|
|
|
dnl --enable-long-long defines _GLIBCPP_USE_LONG_LONG
|
|
|
|
dnl --disable-long-long leaves _GLIBCPP_USE_LONG_LONG undefined
|
|
|
|
dnl + Usage: GLIBCPP_ENABLE_LONG_LONG[(DEFAULT)]
|
|
|
|
dnl Where DEFAULT is either `yes' or `no'. If omitted, it
|
|
|
|
dnl defaults to `no'.
|
|
|
|
dnl + If 'long long' stuff is not available, ignores DEFAULT and sets `no'.
|
|
|
|
dnl
|
|
|
|
dnl GLIBCPP_ENABLE_LONG_LONG
|
|
|
|
AC_DEFUN(GLIBCPP_ENABLE_LONG_LONG, [dnl
|
|
|
|
define([GLIBCPP_ENABLE_LONG_LONG_DEFAULT], ifelse($1, yes, yes, no))dnl
|
|
|
|
|
|
|
|
AC_ARG_ENABLE(long-long,
|
|
|
|
changequote(<<, >>)dnl
|
|
|
|
<<--enable-long-long turns on 'long long' [default=>>GLIBCPP_ENABLE_LONG_LONG_DEFAULT],
|
|
|
|
changequote([, ])dnl
|
|
|
|
[case "$enableval" in
|
|
|
|
yes) enable_long_long=yes ;;
|
|
|
|
no) enable_long_long=no ;;
|
|
|
|
*) AC_MSG_ERROR([Unknown argument to enable/disable long long]) ;;
|
|
|
|
esac],
|
|
|
|
enable_long_long=GLIBCPP_ENABLE_LONG_LONG_DEFAULT)dnl
|
|
|
|
|
2001-11-06 23:50:50 +01:00
|
|
|
AC_LANG_SAVE
|
|
|
|
AC_LANG_CPLUSPLUS
|
2001-11-02 23:31:03 +01:00
|
|
|
|
2001-11-06 23:50:50 +01:00
|
|
|
AC_MSG_CHECKING([for enabled long long I/O support])
|
2001-11-02 23:31:03 +01:00
|
|
|
# iostreams require strtoll, strtoull to compile
|
|
|
|
AC_TRY_COMPILE([#include <stdlib.h>],
|
|
|
|
[char* tmp; strtoll("gnu", &tmp, 10);],,[enable_long_long=no])
|
|
|
|
AC_TRY_COMPILE([#include <stdlib.h>],
|
|
|
|
[char* tmp; strtoull("gnu", &tmp, 10);],,[enable_long_long=no])
|
2001-04-21 00:26:55 +02:00
|
|
|
|
|
|
|
# Option parsed, now set things appropriately
|
|
|
|
if test x"$enable_long_long" = xyes; then
|
|
|
|
AC_DEFINE(_GLIBCPP_USE_LONG_LONG)
|
|
|
|
fi
|
|
|
|
AC_MSG_RESULT($enable_long_long)
|
2001-11-06 23:50:50 +01:00
|
|
|
|
|
|
|
AC_LANG_RESTORE
|
2001-04-21 00:26:55 +02:00
|
|
|
])
|
|
|
|
|
|
|
|
|
2000-05-16 19:06:39 +02:00
|
|
|
dnl
|
2000-12-21 23:52:51 +01:00
|
|
|
dnl Check for what kind of C headers to use.
|
|
|
|
dnl
|
|
|
|
dnl GLIBCPP_ENABLE_CHEADERS
|
|
|
|
dnl --enable-cheaders= [does stuff].
|
|
|
|
dnl --disable-cheaders [does not do anything, really].
|
|
|
|
dnl + This will eventually need to be 'c_shadow' by default.
|
|
|
|
dnl + Usage: GLIBCPP_ENABLE_CHEADERS[(DEFAULT)]
|
|
|
|
dnl Where DEFAULT is either `c' or `c_std' or 'c_shadow'.
|
|
|
|
dnl If ommitted, it defaults to `c_std'.
|
|
|
|
AC_DEFUN(GLIBCPP_ENABLE_CHEADERS, [dnl
|
|
|
|
define([GLIBCPP_ENABLE_CHEADERS_DEFAULT], ifelse($1, c_std, c_std, c_std))dnl
|
|
|
|
AC_MSG_CHECKING([for c header strategy to use])
|
|
|
|
AC_ARG_ENABLE(cheaders,
|
2000-05-16 19:06:39 +02:00
|
|
|
changequote(<<, >>)dnl
|
2001-05-19 22:27:36 +02:00
|
|
|
<< --enable-cheaders construct "C" header files for g++ [default=>>GLIBCPP_ENABLE_CHEADERS_DEFAULT],
|
2000-07-26 08:51:38 +02:00
|
|
|
changequote([, ])
|
|
|
|
[case "$enableval" in
|
2000-12-21 23:52:51 +01:00
|
|
|
c)
|
2001-01-23 18:02:28 +01:00
|
|
|
enable_cheaders=c
|
2000-10-25 14:50:06 +02:00
|
|
|
;;
|
2000-12-21 23:52:51 +01:00
|
|
|
c_std)
|
2001-01-23 18:02:28 +01:00
|
|
|
enable_cheaders=c_std
|
2000-10-25 14:50:06 +02:00
|
|
|
;;
|
2000-12-21 23:52:51 +01:00
|
|
|
c_shadow)
|
2001-01-23 18:02:28 +01:00
|
|
|
enable_cheaders=c_shadow
|
2000-12-21 23:52:51 +01:00
|
|
|
;;
|
|
|
|
*) AC_MSG_ERROR([Unknown argument to enable/disable "C" headers])
|
2000-10-25 14:50:06 +02:00
|
|
|
;;
|
2000-07-26 08:51:38 +02:00
|
|
|
esac],
|
2000-12-21 23:52:51 +01:00
|
|
|
enable_cheaders=GLIBCPP_ENABLE_CHEADERS_DEFAULT)
|
|
|
|
AC_MSG_RESULT($enable_cheaders)
|
2000-07-26 08:51:38 +02:00
|
|
|
|
|
|
|
dnl Option parsed, now set things appropriately
|
2000-12-21 23:52:51 +01:00
|
|
|
case "$enable_cheaders" in
|
|
|
|
c_shadow)
|
2000-10-25 14:50:06 +02:00
|
|
|
CSHADOW_FLAGS="-fno-builtin"
|
2001-07-16 19:43:54 +02:00
|
|
|
C_INCLUDE_DIR='${glibcpp_srcdir}/include/c_shadow'
|
[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
|
|
|
AC_DEFINE(_GLIBCPP_USE_SHADOW_HEADERS)
|
2000-10-25 14:50:06 +02:00
|
|
|
;;
|
2000-12-21 23:52:51 +01:00
|
|
|
c_std)
|
|
|
|
CSHADOW_FLAGS=""
|
2001-07-16 19:43:54 +02:00
|
|
|
C_INCLUDE_DIR='${glibcpp_srcdir}/include/c_std'
|
2000-12-21 23:52:51 +01:00
|
|
|
;;
|
|
|
|
c)
|
2000-10-25 14:50:06 +02:00
|
|
|
CSHADOW_FLAGS=""
|
2001-07-16 19:43:54 +02:00
|
|
|
C_INCLUDE_DIR='${glibcpp_srcdir}/include/c'
|
2000-05-16 19:06:39 +02:00
|
|
|
;;
|
2000-07-26 08:51:38 +02:00
|
|
|
esac
|
2000-05-25 15:09:01 +02:00
|
|
|
|
2000-10-12 13:45:23 +02:00
|
|
|
AC_SUBST(CSHADOW_FLAGS)
|
|
|
|
AC_SUBST(C_INCLUDE_DIR)
|
2000-12-21 23:52:51 +01:00
|
|
|
AM_CONDITIONAL(GLIBCPP_USE_CSHADOW, test "$enable_cheaders" = c_shadow)
|
2000-05-16 19:06:39 +02:00
|
|
|
])
|
2000-04-21 22:33:34 +02:00
|
|
|
|
2000-10-25 14:50:06 +02:00
|
|
|
|
|
|
|
dnl
|
|
|
|
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.
|
|
|
|
dnl
|
|
|
|
dnl GLIBCPP_ENABLE_C_MBCHAR
|
|
|
|
dnl --enable-c-mbchar requests all the wchar_t stuff.
|
|
|
|
dnl --disable-c-mbchar doesn't.
|
|
|
|
dnl + Usage: GLIBCPP_ENABLE_C_MBCHAR[(DEFAULT)]
|
|
|
|
dnl Where DEFAULT is either `yes' or `no'. If ommitted, it
|
|
|
|
dnl defaults to `no'.
|
|
|
|
AC_DEFUN(GLIBCPP_ENABLE_C_MBCHAR, [dnl
|
|
|
|
define([GLIBCPP_ENABLE_C_MBCHAR_DEFAULT], ifelse($1, yes, yes, no))dnl
|
|
|
|
AC_ARG_ENABLE(c-mbchar,
|
|
|
|
changequote(<<, >>)dnl
|
|
|
|
<< --enable-c-mbchar enable multibyte (wide) characters [default=>>GLIBCPP_ENABLE_C_MBCHAR_DEFAULT],
|
|
|
|
changequote([, ])dnl
|
|
|
|
[case "$enableval" in
|
|
|
|
yes) enable_c_mbchar=yes ;;
|
|
|
|
no) enable_c_mbchar=no ;;
|
|
|
|
*) AC_MSG_ERROR([Unknown argument to enable/disable c-mbchar]) ;;
|
|
|
|
esac],
|
|
|
|
enable_c_mbchar=GLIBCPP_ENABLE_C_MBCHAR_DEFAULT)dnl
|
|
|
|
dnl Option parsed, now other scripts can test enable_c_mbchar for yes/no.
|
|
|
|
])
|
|
|
|
|
|
|
|
|
2000-10-12 13:45:23 +02:00
|
|
|
dnl
|
|
|
|
dnl Set up *_INCLUDES and *_INCLUDE_DIR variables for all sundry Makefile.am's.
|
|
|
|
dnl
|
|
|
|
dnl TOPLEVEL_INCLUDES
|
|
|
|
dnl LIBMATH_INCLUDES
|
|
|
|
dnl LIBSUPCXX_INCLUDES
|
|
|
|
dnl LIBIO_INCLUDES
|
|
|
|
dnl CSHADOW_INCLUDES
|
|
|
|
dnl
|
2001-07-13 18:47:56 +02:00
|
|
|
dnl GLIBCPP_EXPORT_INCLUDES
|
2000-10-12 13:45:23 +02:00
|
|
|
AC_DEFUN(GLIBCPP_EXPORT_INCLUDES, [
|
2001-07-13 18:47:56 +02:00
|
|
|
# Root level of the build directory include sources.
|
2001-08-24 00:35:52 +02:00
|
|
|
GLIBCPP_INCLUDES="-I${glibcpp_builddir}/include/${target_alias} -I${glibcpp_builddir}/include"
|
2000-10-12 13:45:23 +02:00
|
|
|
|
2000-11-14 22:05:05 +01:00
|
|
|
# Passed down for canadian crosses.
|
2001-07-13 18:47:56 +02:00
|
|
|
if test x"$CANADIAN" = xyes; then
|
2000-11-14 22:05:05 +01:00
|
|
|
TOPLEVEL_INCLUDES='-I$(includedir)'
|
|
|
|
fi
|
2000-10-12 13:45:23 +02:00
|
|
|
|
|
|
|
LIBMATH_INCLUDES='-I$(top_srcdir)/libmath'
|
|
|
|
|
|
|
|
LIBSUPCXX_INCLUDES='-I$(top_srcdir)/libsupc++'
|
|
|
|
|
2001-07-13 18:47:56 +02:00
|
|
|
if test x"$need_libio" = xyes; then
|
|
|
|
LIBIO_INCLUDES='-I$(top_builddir)/libio -I$(top_srcdir)/libio'
|
|
|
|
AC_SUBST(LIBIO_INCLUDES)
|
|
|
|
fi
|
2000-10-12 13:45:23 +02:00
|
|
|
|
|
|
|
# Now, export this to all the little Makefiles....
|
2001-07-13 18:47:56 +02:00
|
|
|
AC_SUBST(GLIBCPP_INCLUDES)
|
2000-10-12 13:45:23 +02:00
|
|
|
AC_SUBST(TOPLEVEL_INCLUDES)
|
|
|
|
AC_SUBST(LIBMATH_INCLUDES)
|
|
|
|
AC_SUBST(LIBSUPCXX_INCLUDES)
|
|
|
|
])
|
|
|
|
|
|
|
|
|
|
|
|
dnl
|
|
|
|
dnl Set up *_FLAGS and *FLAGS variables for all sundry Makefile.am's.
|
|
|
|
dnl
|
|
|
|
AC_DEFUN(GLIBCPP_EXPORT_FLAGS, [
|
|
|
|
# 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)
|
|
|
|
|
|
|
|
WARN_FLAGS='-Wall -Wno-format -W -Wwrite-strings -Winline'
|
|
|
|
AC_SUBST(WARN_FLAGS)
|
|
|
|
])
|
|
|
|
|
2001-02-07 02:54:21 +01:00
|
|
|
dnl
|
2001-02-06 07:32:01 +01:00
|
|
|
dnl GLIBCPP_EXPORT_INSTALL_INFO
|
|
|
|
dnl calculates gxx_install_dir
|
2001-02-07 02:54:21 +01:00
|
|
|
dnl exports glibcpp_toolexecdir
|
|
|
|
dnl exports glibcpp_toolexeclibdir
|
2001-05-19 22:27:36 +02:00
|
|
|
dnl exports glibcpp_prefixdir
|
2001-02-07 02:54:21 +01:00
|
|
|
dnl
|
|
|
|
dnl Assumes cross_compiling bits already done, and with_cross_host in
|
|
|
|
dnl particular
|
2001-02-06 07:32:01 +01:00
|
|
|
dnl
|
2001-02-07 02:54:21 +01:00
|
|
|
dnl GLIBCPP_EXPORT_INSTALL_INFO
|
2001-02-06 07:32:01 +01:00
|
|
|
AC_DEFUN(GLIBCPP_EXPORT_INSTALL_INFO, [
|
2001-08-08 04:49:01 +02:00
|
|
|
# Assumes glibcpp_builddir, glibcpp_srcdir are alreay set up and
|
|
|
|
# exported correctly in GLIBCPP_CONFIGURE.
|
2001-02-07 02:54:21 +01:00
|
|
|
glibcpp_toolexecdir=no
|
|
|
|
glibcpp_toolexeclibdir=no
|
2001-05-25 23:53:51 +02:00
|
|
|
glibcpp_prefixdir=${prefix}
|
2001-05-14 03:15:36 +02:00
|
|
|
|
2001-02-06 07:32:01 +01:00
|
|
|
AC_MSG_CHECKING([for interface version number])
|
|
|
|
libstdcxx_interface=$INTERFACE
|
|
|
|
AC_MSG_RESULT($libstdcxx_interface)
|
|
|
|
|
|
|
|
# Process the option --with-gxx-include-dir=<path to include-files directory>
|
|
|
|
AC_MSG_CHECKING([for --with-gxx-include-dir])
|
|
|
|
AC_ARG_WITH(gxx-include-dir,
|
2001-05-19 22:27:36 +02:00
|
|
|
[ --with-gxx-include-dir the installation directory for include files],
|
2001-02-06 07:32:01 +01:00
|
|
|
[case "${withval}" in
|
|
|
|
yes)
|
|
|
|
AC_MSG_ERROR(Missing directory for --with-gxx-include-dir)
|
|
|
|
gxx_include_dir=no
|
|
|
|
;;
|
|
|
|
no)
|
|
|
|
gxx_include_dir=no
|
|
|
|
;;
|
|
|
|
*)
|
|
|
|
gxx_include_dir=${withval}
|
|
|
|
;;
|
|
|
|
esac], [gxx_include_dir=no])
|
|
|
|
AC_MSG_RESULT($gxx_include_dir)
|
|
|
|
|
|
|
|
# Process the option "--enable-version-specific-runtime-libs"
|
|
|
|
AC_MSG_CHECKING([for --enable-version-specific-runtime-libs])
|
|
|
|
AC_ARG_ENABLE(version-specific-runtime-libs,
|
|
|
|
[ --enable-version-specific-runtime-libs Specify that runtime libraries should be installed in a compiler-specific directory ],
|
2001-08-27 21:40:02 +02:00
|
|
|
[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)dnl
|
|
|
|
# Option set, now we can test it.
|
2001-02-06 07:32:01 +01:00
|
|
|
AC_MSG_RESULT($version_specific_libs)
|
|
|
|
|
2001-08-27 21:40:02 +02:00
|
|
|
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
|
|
|
|
# is selected.
|
|
|
|
changequote(,)dnl
|
|
|
|
gcc_version_trigger=${srcdir}/../gcc/version.c
|
|
|
|
gcc_version_full=`grep version_string ${gcc_version_trigger} | sed -e 's/.*\"\([^\"]*\)\".*/\1/'`
|
|
|
|
gcc_version=`echo ${gcc_version_full} | sed -e 's/\([^ ]*\) .*/\1/'`
|
|
|
|
gxx_include_dir='$(libdir)/gcc-lib/$(target_alias)/'${gcc_version}/include/g++
|
|
|
|
glibcpp_toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
|
|
|
|
glibcpp_toolexeclibdir='$(toolexecdir)/'${gcc_version}'$(MULTISUBDIR)'
|
|
|
|
changequote([,])dnl
|
|
|
|
fi
|
|
|
|
|
2001-02-07 02:54:21 +01:00
|
|
|
# Default case for install directory for include files.
|
2001-08-27 21:40:02 +02:00
|
|
|
if test $version_specific_libs = no &&
|
|
|
|
test $gxx_include_dir = no; then
|
2001-02-07 02:54:21 +01:00
|
|
|
gxx_include_dir='$(prefix)'/include/g++-${libstdcxx_interface}
|
|
|
|
fi
|
|
|
|
|
|
|
|
# Calculate glibcpp_toolexecdir, glibcpp_toolexeclibdir
|
|
|
|
# Install a library built with a cross compiler in tooldir, not libdir.
|
|
|
|
if test x"$glibcpp_toolexecdir" = x"no"; then
|
2001-06-26 22:52:23 +02:00
|
|
|
if test -n "$with_cross_host" &&
|
|
|
|
test x"$with_cross_host" != x"no"; then
|
2001-02-07 02:54:21 +01:00
|
|
|
glibcpp_toolexecdir='$(exec_prefix)/$(target_alias)'
|
|
|
|
glibcpp_toolexeclibdir='$(toolexecdir)/lib$(MULTISUBDIR)'
|
|
|
|
else
|
|
|
|
glibcpp_toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
|
|
|
|
glibcpp_toolexeclibdir='$(libdir)$(MULTISUBDIR)'
|
|
|
|
fi
|
2001-02-06 07:32:01 +01:00
|
|
|
fi
|
2001-02-07 02:54:21 +01:00
|
|
|
|
|
|
|
AC_MSG_CHECKING([for install location])
|
2001-02-06 07:32:01 +01:00
|
|
|
AC_MSG_RESULT($gxx_include_dir)
|
2001-02-07 02:54:21 +01:00
|
|
|
|
2001-05-14 03:15:36 +02:00
|
|
|
AC_SUBST(glibcpp_prefixdir)
|
2001-02-06 07:32:01 +01:00
|
|
|
AC_SUBST(gxx_include_dir)
|
2001-02-07 02:54:21 +01:00
|
|
|
AC_SUBST(glibcpp_toolexecdir)
|
|
|
|
AC_SUBST(glibcpp_toolexeclibdir)
|
2001-02-06 07:32:01 +01:00
|
|
|
])
|
|
|
|
|
|
|
|
|
2000-05-25 00:48:03 +02:00
|
|
|
# Check for functions in math library.
|
|
|
|
# Ulrich Drepper <drepper@cygnus.com>, 1998.
|
|
|
|
#
|
|
|
|
# This file can be copied and used freely without restrictions. It can
|
|
|
|
# be used in projects which are not available under the GNU Public License
|
|
|
|
# but which still want to provide support for the GNU gettext functionality.
|
|
|
|
# Please note that the actual code is *not* freely available.
|
|
|
|
|
|
|
|
# serial 1
|
|
|
|
|
|
|
|
dnl AC_REPLACE_MATHFUNCS(FUNCTION...)
|
|
|
|
AC_DEFUN(AC_REPLACE_MATHFUNCS,
|
|
|
|
[AC_CHECK_FUNCS([$1], , [LIBMATHOBJS="$LIBMATHOBJS ${ac_func}.lo"])
|
|
|
|
AC_SUBST(LIBMATHOBJS)dnl
|
|
|
|
])
|
|
|
|
|
|
|
|
|
2000-07-17 20:17:33 +02:00
|
|
|
|
|
|
|
dnl This macro searches for a GNU version of make. If a match is found, the
|
|
|
|
dnl makefile variable `ifGNUmake' is set to the empty string, otherwise it is
|
2000-07-24 18:34:00 +02:00
|
|
|
dnl set to "#". This is useful for including a special features in a Makefile,
|
2000-07-17 20:17:33 +02:00
|
|
|
dnl which cannot be handled by other versions of make. The variable
|
|
|
|
dnl _cv_gnu_make_command is set to the command to invoke GNU make if it exists,
|
|
|
|
dnl the empty string otherwise.
|
|
|
|
dnl
|
|
|
|
dnl Here is an example of its use:
|
|
|
|
dnl
|
|
|
|
dnl Makefile.in might contain:
|
|
|
|
dnl
|
|
|
|
dnl # A failsafe way of putting a dependency rule into a makefile
|
|
|
|
dnl $(DEPEND):
|
|
|
|
dnl $(CC) -MM $(srcdir)/*.c > $(DEPEND)
|
|
|
|
dnl
|
|
|
|
dnl @ifGNUmake@ ifeq ($(DEPEND),$(wildcard $(DEPEND)))
|
|
|
|
dnl @ifGNUmake@ include $(DEPEND)
|
|
|
|
dnl @ifGNUmake@ endif
|
|
|
|
dnl
|
|
|
|
dnl Then configure.in would normally contain:
|
|
|
|
dnl
|
|
|
|
dnl CHECK_GNU_MAKE()
|
|
|
|
dnl AC_OUTPUT(Makefile)
|
|
|
|
dnl
|
|
|
|
dnl Then perhaps to cause gnu make to override any other make, we could do
|
|
|
|
dnl something like this (note that GNU make always looks for GNUmakefile first):
|
|
|
|
dnl
|
|
|
|
dnl if ! test x$_cv_gnu_make_command = x ; then
|
|
|
|
dnl mv Makefile GNUmakefile
|
|
|
|
dnl echo .DEFAULT: > Makefile ;
|
|
|
|
dnl echo \ $_cv_gnu_make_command \$@ >> Makefile;
|
|
|
|
dnl fi
|
|
|
|
dnl
|
|
|
|
dnl Then, if any (well almost any) other make is called, and GNU make also
|
|
|
|
dnl exists, then the other make wraps the GNU make.
|
|
|
|
dnl
|
|
|
|
dnl @author John Darrington <j.darrington@elvis.murdoch.edu.au>
|
2000-07-26 23:30:45 +02:00
|
|
|
dnl @version 1.1 #### replaced Id string now that Id is for lib-v3; pme
|
2000-07-17 20:17:33 +02:00
|
|
|
dnl
|
|
|
|
dnl #### Changes for libstdc++-v3: reformatting and linewrapping; prepending
|
|
|
|
dnl #### GLIBCPP_ to the macro name; adding the :-make fallback in the
|
2000-09-11 21:05:07 +02:00
|
|
|
dnl #### conditional's subshell (" --version" is not a command), using a
|
|
|
|
dnl #### different option to grep(1).
|
2000-07-17 20:17:33 +02:00
|
|
|
dnl #### -pme
|
2001-01-26 07:19:52 +01:00
|
|
|
dnl #### Fixed Bourne shell portability bug (use ${MAKE-make}, not
|
|
|
|
dnl #### ${MAKE:-make}).
|
|
|
|
dnl #### -msokolov
|
2000-07-17 20:17:33 +02:00
|
|
|
AC_DEFUN(
|
|
|
|
GLIBCPP_CHECK_GNU_MAKE, [AC_CACHE_CHECK( for GNU make,_cv_gnu_make_command,
|
|
|
|
_cv_gnu_make_command='' ;
|
|
|
|
dnl Search all the common names for GNU make
|
2001-01-26 07:19:52 +01:00
|
|
|
for a in "${MAKE-make}" make gmake gnumake ; do
|
2000-11-04 04:00:12 +01:00
|
|
|
if ( $a --version 2> /dev/null | grep -c GNU > /dev/null )
|
2000-09-11 21:05:07 +02:00
|
|
|
then
|
2000-07-17 20:17:33 +02:00
|
|
|
_cv_gnu_make_command=$a ;
|
|
|
|
break;
|
|
|
|
fi
|
|
|
|
done ;
|
|
|
|
) ;
|
|
|
|
dnl If there was a GNU version, then set @ifGNUmake@ to the empty
|
|
|
|
dnl string, '#' otherwise
|
|
|
|
if test "x$_cv_gnu_make_command" != "x" ; then
|
|
|
|
ifGNUmake='' ;
|
|
|
|
else
|
|
|
|
ifGNUmake='#' ;
|
|
|
|
fi
|
|
|
|
AC_SUBST(ifGNUmake)
|
|
|
|
])
|
|
|
|
|
2001-08-07 05:38:33 +02:00
|
|
|
|
|
|
|
dnl Check for headers for, and arguments to, the setrlimit() function.
|
|
|
|
dnl Used only in testsuite_hooks.h.
|
|
|
|
AC_DEFUN(GLIBCPP_CHECK_SETRLIMIT_ancilliary, [
|
|
|
|
AC_TRY_COMPILE([#include <sys/resource.h>
|
|
|
|
#include <unistd.h>
|
|
|
|
], [ int f = RLIMIT_$1 ; ],
|
|
|
|
[glibcpp_mresult=1], [glibcpp_mresult=0])
|
|
|
|
AC_DEFINE_UNQUOTED(HAVE_MEMLIMIT_$1, $glibcpp_mresult,
|
|
|
|
[Only used in build directory testsuite_hooks.h.])
|
|
|
|
])
|
|
|
|
AC_DEFUN(GLIBCPP_CHECK_SETRLIMIT, [
|
2001-08-10 08:50:34 +02:00
|
|
|
setrlimit_have_headers=yes
|
2001-08-07 05:38:33 +02:00
|
|
|
AC_CHECK_HEADERS(sys/resource.h unistd.h,
|
|
|
|
[],
|
2001-08-10 08:50:34 +02:00
|
|
|
setrlimit_have_headers=no)
|
2001-08-07 05:38:33 +02:00
|
|
|
# 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.
|
2001-08-10 08:50:34 +02:00
|
|
|
if test $setrlimit_have_headers = yes; then
|
2001-08-07 05:38:33 +02:00
|
|
|
# Can't do these in a loop, else the resulting syntax is wrong.
|
|
|
|
GLIBCPP_CHECK_SETRLIMIT_ancilliary(DATA)
|
|
|
|
GLIBCPP_CHECK_SETRLIMIT_ancilliary(RSS)
|
|
|
|
GLIBCPP_CHECK_SETRLIMIT_ancilliary(VMEM)
|
|
|
|
GLIBCPP_CHECK_SETRLIMIT_ancilliary(AS)
|
2001-08-10 08:50:34 +02:00
|
|
|
|
|
|
|
# Check for rlimit, setrlimit.
|
|
|
|
AC_CACHE_VAL(ac_setrlimit, [
|
|
|
|
AC_TRY_COMPILE([#include <sys/resource.h>
|
|
|
|
#include <unistd.h>
|
|
|
|
],
|
|
|
|
[ struct rlimit r; setrlimit(0, &r);],
|
|
|
|
[ac_setrlimit=yes], [ac_setrlimit=no])
|
|
|
|
])
|
|
|
|
fi
|
|
|
|
|
|
|
|
AC_MSG_CHECKING([for testsuite memory limit support])
|
|
|
|
if test $setrlimit_have_headers = yes && test $ac_setrlimit = yes; then
|
|
|
|
ac_mem_limits=yes
|
|
|
|
AC_DEFINE(_GLIBCPP_MEM_LIMITS)
|
|
|
|
else
|
|
|
|
ac_mem_limits=no
|
2001-08-07 05:38:33 +02:00
|
|
|
fi
|
2001-08-10 08:50:34 +02:00
|
|
|
AC_MSG_RESULT($ac_mem_limits)
|
2001-08-07 05:38:33 +02:00
|
|
|
])
|
|
|
|
|
|
|
|
|
|
|
|
dnl
|
|
|
|
dnl Does any necessary configuration of the testsuite directory. Generates
|
|
|
|
dnl the testsuite_hooks.h header.
|
|
|
|
dnl
|
|
|
|
dnl GLIBCPP_CONFIGURE_TESTSUITE [no args]
|
|
|
|
AC_DEFUN(GLIBCPP_CONFIGURE_TESTSUITE, [
|
|
|
|
GLIBCPP_CHECK_SETRLIMIT
|
|
|
|
])
|
|
|
|
|
|
|
|
|
2000-07-28 19:56:27 +02:00
|
|
|
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])
|
|
|
|
])
|
2000-09-08 00:40:17 +02:00
|
|
|
|
2000-10-05 22:15:29 +02:00
|
|
|
|
2001-08-08 04:49:01 +02:00
|
|
|
# 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
|
|
|
|
|
|
|
|
AC_DEFUN(AC_LC_MESSAGES, [
|
|
|
|
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
|
|
|
|
])
|
|
|
|
])
|
|
|
|
|
|
|
|
|
2001-11-01 16:46:48 +01:00
|
|
|
dnl
|
|
|
|
dnl Check for whether the Boost-derived checks should be turned on.
|
|
|
|
dnl
|
|
|
|
dnl GLIBCPP_ENABLE_CONCEPT_CHECKS
|
|
|
|
dnl --enable-concept-checks turns them on.
|
|
|
|
dnl --disable-concept-checks leaves them off.
|
|
|
|
dnl + Usage: GLIBCPP_ENABLE_CONCEPT_CHECKS[(DEFAULT)]
|
|
|
|
dnl Where DEFAULT is either `yes' or `no'. If ommitted, it
|
|
|
|
dnl defaults to `no'.
|
|
|
|
AC_DEFUN(GLIBCPP_ENABLE_CONCEPT_CHECKS, [dnl
|
|
|
|
define([GLIBCPP_ENABLE_CONCEPT_CHECKS_DEFAULT], ifelse($1, yes, yes, no))dnl
|
|
|
|
AC_ARG_ENABLE(concept-checks,
|
|
|
|
changequote(<<, >>)dnl
|
|
|
|
<< --enable-concept-checks use Boost-derived template checks [default=>>GLIBCPP_ENABLE_CONCEPT_CHECKS_DEFAULT],
|
|
|
|
changequote([, ])dnl
|
|
|
|
[case "$enableval" in
|
|
|
|
yes) enable_concept_checks=yes ;;
|
|
|
|
no) enable_concept_checks=no ;;
|
|
|
|
*) AC_MSG_ERROR([Unknown argument to enable/disable concept checks]) ;;
|
|
|
|
esac],
|
|
|
|
enable_concept_checks=GLIBCPP_ENABLE_CONCEPT_CHECKS_DEFAULT)dnl
|
|
|
|
dnl Option parsed, now set things appropriately
|
|
|
|
if test x"$enable_concept_checks" = xyes; then
|
|
|
|
AC_DEFINE(_GLIBCPP_CONCEPT_CHECKS)
|
|
|
|
fi
|
|
|
|
])
|
2001-09-20 10:30:01 +02:00
|
|
|
|
|
|
|
|
|
|
|
|
2001-12-03 23:28:57 +01:00
|
|
|
#serial 1
|
|
|
|
# This test replaces the one in autoconf.
|
|
|
|
# Currently this macro should have the same name as the autoconf macro
|
|
|
|
# because gettext's gettext.m4 (distributed in the automake package)
|
|
|
|
# still uses it. Otherwise, the use in gettext.m4 makes autoheader
|
|
|
|
# give these diagnostics:
|
|
|
|
# configure.in:556: AC_TRY_COMPILE was called before AC_ISC_POSIX
|
|
|
|
# configure.in:556: AC_TRY_RUN was called before AC_ISC_POSIX
|
|
|
|
|
|
|
|
undefine([AC_ISC_POSIX])
|
|
|
|
|
|
|
|
AC_DEFUN([AC_ISC_POSIX],
|
|
|
|
[
|
|
|
|
dnl This test replaces the obsolescent AC_ISC_POSIX kludge.
|
|
|
|
AC_CHECK_LIB(cposix, strerror, [LIBS="$LIBS -lcposix"])
|
|
|
|
]
|
|
|
|
)
|
|
|
|
|
2001-08-08 04:49:01 +02:00
|
|
|
# Add --enable-maintainer-mode option to configure.
|
|
|
|
# From Jim Meyering
|
|
|
|
|
|
|
|
# serial 1
|
|
|
|
|
2001-12-03 23:28:57 +01:00
|
|
|
AC_DEFUN([AM_MAINTAINER_MODE],
|
2001-08-08 04:49:01 +02:00
|
|
|
[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
|
|
|
|
dnl maintainer-mode is disabled by default
|
|
|
|
AC_ARG_ENABLE(maintainer-mode,
|
|
|
|
[ --enable-maintainer-mode enable make rules and dependencies not useful
|
|
|
|
(and sometimes confusing) to the casual installer],
|
|
|
|
USE_MAINTAINER_MODE=$enableval,
|
|
|
|
USE_MAINTAINER_MODE=no)
|
|
|
|
AC_MSG_RESULT($USE_MAINTAINER_MODE)
|
|
|
|
AM_CONDITIONAL(MAINTAINER_MODE, test $USE_MAINTAINER_MODE = yes)
|
|
|
|
MAINT=$MAINTAINER_MODE_TRUE
|
|
|
|
AC_SUBST(MAINT)dnl
|
|
|
|
]
|
|
|
|
)
|
|
|
|
|
|
|
|
# Define a conditional.
|
|
|
|
|
2001-12-03 23:28:57 +01:00
|
|
|
AC_DEFUN([AM_CONDITIONAL],
|
2001-08-08 04:49:01 +02:00
|
|
|
[AC_SUBST($1_TRUE)
|
|
|
|
AC_SUBST($1_FALSE)
|
|
|
|
if $2; then
|
|
|
|
$1_TRUE=
|
|
|
|
$1_FALSE='#'
|
|
|
|
else
|
|
|
|
$1_TRUE='#'
|
|
|
|
$1_FALSE=
|
|
|
|
fi])
|
|
|
|
|
|
|
|
# Macro to add for using GNU gettext.
|
|
|
|
# Ulrich Drepper <drepper@cygnus.com>, 1995.
|
|
|
|
#
|
2001-12-03 23:28:57 +01:00
|
|
|
# This file can be copied and used freely without restrictions. It can
|
2001-08-08 04:49:01 +02:00
|
|
|
# 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.
|
|
|
|
|
2001-12-03 23:28:57 +01:00
|
|
|
# serial 9
|
|
|
|
|
|
|
|
dnl Usage: AM_WITH_NLS([TOOLSYMBOL], [NEEDSYMBOL], [LIBDIR]).
|
|
|
|
dnl If TOOLSYMBOL is specified and is 'use-libtool', then a libtool library
|
|
|
|
dnl $(top_builddir)/intl/libintl.la will be created (shared and/or static,
|
|
|
|
dnl depending on --{enable,disable}-{shared,static} and on the presence of
|
|
|
|
dnl AM-DISABLE-SHARED). Otherwise, a static library
|
|
|
|
dnl $(top_builddir)/intl/libintl.a will be created.
|
|
|
|
dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext
|
|
|
|
dnl implementations (in libc or libintl) without the ngettext() function
|
|
|
|
dnl will be ignored.
|
|
|
|
dnl LIBDIR is used to find the intl libraries. If empty,
|
|
|
|
dnl the value `$(top_builddir)/intl/' is used.
|
|
|
|
dnl
|
|
|
|
dnl The result of the configuration is one of three cases:
|
|
|
|
dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled
|
|
|
|
dnl and used.
|
|
|
|
dnl Catalog format: GNU --> install in $(datadir)
|
|
|
|
dnl Catalog extension: .mo after installation, .gmo in source tree
|
|
|
|
dnl 2) GNU gettext has been found in the system's C library.
|
|
|
|
dnl Catalog format: GNU --> install in $(datadir)
|
|
|
|
dnl Catalog extension: .mo after installation, .gmo in source tree
|
|
|
|
dnl 3) No internationalization, always use English msgid.
|
|
|
|
dnl Catalog format: none
|
|
|
|
dnl Catalog extension: none
|
|
|
|
dnl The use of .gmo is historical (it was needed to avoid overwriting the
|
|
|
|
dnl GNU format catalogs when building on a platform with an X/Open gettext),
|
|
|
|
dnl but we keep it in order not to force irrelevant filename changes on the
|
|
|
|
dnl maintainers.
|
|
|
|
dnl
|
|
|
|
AC_DEFUN([AM_WITH_NLS],
|
2001-08-08 04:49:01 +02:00
|
|
|
[AC_MSG_CHECKING([whether NLS is requested])
|
|
|
|
dnl Default is enabled NLS
|
|
|
|
AC_ARG_ENABLE(nls,
|
|
|
|
[ --disable-nls do not use Native Language Support],
|
|
|
|
USE_NLS=$enableval, USE_NLS=yes)
|
|
|
|
AC_MSG_RESULT($USE_NLS)
|
|
|
|
AC_SUBST(USE_NLS)
|
|
|
|
|
2001-12-03 23:28:57 +01:00
|
|
|
BUILD_INCLUDED_LIBINTL=no
|
2001-08-08 04:49:01 +02:00
|
|
|
USE_INCLUDED_LIBINTL=no
|
2001-12-03 23:28:57 +01:00
|
|
|
INTLLIBS=
|
2001-08-08 04:49:01 +02:00
|
|
|
|
|
|
|
dnl If we use NLS figure out what method
|
|
|
|
if test "$USE_NLS" = "yes"; then
|
2001-12-03 23:28:57 +01:00
|
|
|
AC_DEFINE(ENABLE_NLS, 1,
|
|
|
|
[Define to 1 if translation of program messages to the user's native language
|
|
|
|
is requested.])
|
2001-08-08 04:49:01 +02:00
|
|
|
AC_MSG_CHECKING([whether included gettext is requested])
|
|
|
|
AC_ARG_WITH(included-gettext,
|
|
|
|
[ --with-included-gettext use the GNU gettext library included here],
|
|
|
|
nls_cv_force_use_gnu_gettext=$withval,
|
|
|
|
nls_cv_force_use_gnu_gettext=no)
|
|
|
|
AC_MSG_RESULT($nls_cv_force_use_gnu_gettext)
|
|
|
|
|
|
|
|
nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
|
|
|
|
if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
|
|
|
|
dnl User does not insist on using GNU NLS library. Figure out what
|
2001-12-03 23:28:57 +01:00
|
|
|
dnl to use. If GNU gettext is available we use this. Else we have
|
|
|
|
dnl to fall back to GNU NLS library.
|
2001-08-08 04:49:01 +02:00
|
|
|
CATOBJEXT=NONE
|
|
|
|
|
2001-12-03 23:28:57 +01:00
|
|
|
dnl Add a version number to the cache macros.
|
|
|
|
define(gt_cv_func_gnugettext_libc, [gt_cv_func_gnugettext]ifelse([$2], need-ngettext, 2, 1)[_libc])
|
|
|
|
define(gt_cv_func_gnugettext_libintl, [gt_cv_func_gnugettext]ifelse([$2], need-ngettext, 2, 1)[_libintl])
|
|
|
|
|
2001-08-08 04:49:01 +02:00
|
|
|
AC_CHECK_HEADER(libintl.h,
|
2001-12-03 23:28:57 +01:00
|
|
|
[AC_CACHE_CHECK([for GNU gettext in libc], gt_cv_func_gnugettext_libc,
|
|
|
|
[AC_TRY_LINK([#include <libintl.h>
|
|
|
|
extern int _nl_msg_cat_cntr;],
|
|
|
|
[bindtextdomain ("", "");
|
|
|
|
return (int) gettext ("")]ifelse([$2], need-ngettext, [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr],
|
|
|
|
gt_cv_func_gnugettext_libc=yes,
|
|
|
|
gt_cv_func_gnugettext_libc=no)])
|
|
|
|
|
|
|
|
if test "$gt_cv_func_gnugettext_libc" != "yes"; then
|
|
|
|
AC_CACHE_CHECK([for GNU gettext in libintl],
|
|
|
|
gt_cv_func_gnugettext_libintl,
|
|
|
|
[gt_save_LIBS="$LIBS"
|
|
|
|
LIBS="$LIBS -lintl $LIBICONV"
|
|
|
|
AC_TRY_LINK([#include <libintl.h>
|
|
|
|
extern int _nl_msg_cat_cntr;],
|
|
|
|
[bindtextdomain ("", "");
|
|
|
|
return (int) gettext ("")]ifelse([$2], need-ngettext, [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr],
|
|
|
|
gt_cv_func_gnugettext_libintl=yes,
|
|
|
|
gt_cv_func_gnugettext_libintl=no)
|
|
|
|
LIBS="$gt_save_LIBS"])
|
2001-08-08 04:49:01 +02:00
|
|
|
fi
|
|
|
|
|
2001-12-03 23:28:57 +01:00
|
|
|
dnl If an already present or preinstalled GNU gettext() is found,
|
|
|
|
dnl use it. But if this macro is used in GNU gettext, and GNU
|
|
|
|
dnl gettext is already preinstalled in libintl, we update this
|
|
|
|
dnl libintl. (Cf. the install rule in intl/Makefile.in.)
|
|
|
|
if test "$gt_cv_func_gnugettext_libc" = "yes" \
|
|
|
|
|| { test "$gt_cv_func_gnugettext_libintl" = "yes" \
|
|
|
|
&& test "$PACKAGE" != gettext; }; then
|
|
|
|
AC_DEFINE(HAVE_GETTEXT, 1,
|
|
|
|
[Define if the GNU gettext() function is already present or preinstalled.])
|
|
|
|
|
|
|
|
if test "$gt_cv_func_gnugettext_libintl" = "yes"; then
|
|
|
|
dnl If iconv() is in a separate libiconv library, then anyone
|
|
|
|
dnl linking with libintl{.a,.so} also needs to link with
|
|
|
|
dnl libiconv.
|
|
|
|
INTLLIBS="-lintl $LIBICONV"
|
|
|
|
fi
|
|
|
|
|
|
|
|
gt_save_LIBS="$LIBS"
|
|
|
|
LIBS="$LIBS $INTLLIBS"
|
|
|
|
AC_CHECK_FUNCS(dcgettext)
|
|
|
|
LIBS="$gt_save_LIBS"
|
|
|
|
|
|
|
|
AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
|
|
|
|
[test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl
|
|
|
|
if test "$MSGFMT" != "no"; then
|
|
|
|
AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
|
|
|
|
fi
|
|
|
|
|
|
|
|
AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
|
|
|
|
[test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
|
|
|
|
|
|
|
|
CATOBJEXT=.gmo
|
|
|
|
fi
|
2001-08-08 04:49:01 +02:00
|
|
|
])
|
|
|
|
|
|
|
|
if test "$CATOBJEXT" = "NONE"; then
|
2001-12-03 23:28:57 +01:00
|
|
|
dnl GNU gettext is not found in the C library.
|
2001-08-08 04:49:01 +02:00
|
|
|
dnl Fall back on GNU gettext library.
|
|
|
|
nls_cv_use_gnu_gettext=yes
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
|
|
|
if test "$nls_cv_use_gnu_gettext" = "yes"; then
|
|
|
|
dnl Mark actions used to generate GNU NLS library.
|
|
|
|
INTLOBJS="\$(GETTOBJS)"
|
|
|
|
AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
|
|
|
|
[test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], msgfmt)
|
|
|
|
AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
|
|
|
|
AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
|
|
|
|
[test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
|
|
|
|
AC_SUBST(MSGFMT)
|
2001-12-03 23:28:57 +01:00
|
|
|
BUILD_INCLUDED_LIBINTL=yes
|
2001-08-08 04:49:01 +02:00
|
|
|
USE_INCLUDED_LIBINTL=yes
|
|
|
|
CATOBJEXT=.gmo
|
2001-12-03 23:28:57 +01:00
|
|
|
INTLLIBS="ifelse([$3],[],\$(top_builddir)/intl,[$3])/libintl.ifelse([$1], use-libtool, [l], [])a $LIBICONV"
|
|
|
|
LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
|
2001-08-08 04:49:01 +02:00
|
|
|
fi
|
|
|
|
|
|
|
|
dnl Test whether we really found GNU xgettext.
|
|
|
|
if test "$XGETTEXT" != ":"; then
|
|
|
|
dnl If it is no GNU xgettext we define it as : so that the
|
|
|
|
dnl Makefiles still can work.
|
|
|
|
if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
|
|
|
|
: ;
|
|
|
|
else
|
|
|
|
AC_MSG_RESULT(
|
2001-12-03 23:28:57 +01:00
|
|
|
[found xgettext program is not GNU xgettext; ignore it])
|
2001-08-08 04:49:01 +02:00
|
|
|
XGETTEXT=":"
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
2001-12-03 23:28:57 +01:00
|
|
|
dnl We need to process the po/ directory.
|
2001-08-08 04:49:01 +02:00
|
|
|
POSUB=po
|
|
|
|
fi
|
2001-12-03 23:28:57 +01:00
|
|
|
AC_OUTPUT_COMMANDS(
|
|
|
|
[for ac_file in $CONFIG_FILES; do
|
|
|
|
# Support "outfile[:infile[:infile...]]"
|
|
|
|
case "$ac_file" in
|
|
|
|
*:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
|
|
|
|
esac
|
|
|
|
# PO directories have a Makefile.in generated from Makefile.in.in.
|
|
|
|
case "$ac_file" in */Makefile.in)
|
|
|
|
# Adjust a relative srcdir.
|
|
|
|
ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
|
|
|
|
ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
|
|
|
|
ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
|
|
|
|
case "$ac_given_srcdir" in
|
|
|
|
.) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
|
|
|
|
/*) top_srcdir="$ac_given_srcdir" ;;
|
|
|
|
*) top_srcdir="$ac_dots$ac_given_srcdir" ;;
|
|
|
|
esac
|
|
|
|
if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
|
|
|
|
rm -f "$ac_dir/POTFILES"
|
|
|
|
echo creating "$ac_dir/POTFILES"
|
|
|
|
sed -e "/^#/d" -e "/^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," -e "\$s/\(.*\) \\\\/\1/" < "$ac_given_srcdir/$ac_dir/POTFILES.in" > "$ac_dir/POTFILES"
|
|
|
|
echo creating "$ac_dir/Makefile"
|
|
|
|
sed -e "/POTFILES =/r $ac_dir/POTFILES" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
|
|
|
|
fi
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
done])
|
2001-08-08 04:49:01 +02:00
|
|
|
|
2001-12-03 23:28:57 +01:00
|
|
|
|
|
|
|
dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL
|
|
|
|
dnl to 'yes' because some of the testsuite requires it.
|
2001-08-08 04:49:01 +02:00
|
|
|
if test "$PACKAGE" = gettext; then
|
2001-12-03 23:28:57 +01:00
|
|
|
BUILD_INCLUDED_LIBINTL=yes
|
|
|
|
fi
|
|
|
|
|
|
|
|
dnl intl/plural.c is generated from intl/plural.y. It requires bison,
|
|
|
|
dnl because plural.y uses bison specific features. It requires at least
|
|
|
|
dnl bison-1.26 because earlier versions generate a plural.c that doesn't
|
|
|
|
dnl compile.
|
|
|
|
dnl bison is only needed for the maintainer (who touches plural.y). But in
|
|
|
|
dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put
|
|
|
|
dnl the rule in general Makefile. Now, some people carelessly touch the
|
|
|
|
dnl files or have a broken "make" program, hence the plural.c rule will
|
|
|
|
dnl sometimes fire. To avoid an error, defines BISON to ":" if it is not
|
|
|
|
dnl present or too old.
|
|
|
|
AC_CHECK_PROGS([INTLBISON], [bison])
|
|
|
|
if test -z "$INTLBISON"; then
|
|
|
|
ac_verc_fail=yes
|
|
|
|
else
|
|
|
|
dnl Found it, now check the version.
|
|
|
|
AC_MSG_CHECKING([version of bison])
|
|
|
|
changequote(<<,>>)dnl
|
|
|
|
ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison .* \([0-9]*\.[0-9.]*\).*$/\1/p'`
|
|
|
|
case $ac_prog_version in
|
|
|
|
'') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
|
|
|
|
1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*)
|
|
|
|
changequote([,])dnl
|
|
|
|
ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
|
|
|
|
*) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
|
|
|
|
esac
|
|
|
|
AC_MSG_RESULT([$ac_prog_version])
|
|
|
|
fi
|
|
|
|
if test $ac_verc_fail = yes; then
|
|
|
|
INTLBISON=:
|
2001-08-08 04:49:01 +02:00
|
|
|
fi
|
|
|
|
|
|
|
|
dnl These rules are solely for the distribution goal. While doing this
|
|
|
|
dnl we only have to keep exactly one list of the available catalogs
|
|
|
|
dnl in configure.in.
|
|
|
|
for lang in $ALL_LINGUAS; do
|
|
|
|
GMOFILES="$GMOFILES $lang.gmo"
|
|
|
|
POFILES="$POFILES $lang.po"
|
|
|
|
done
|
|
|
|
|
|
|
|
dnl Make all variables we use known to autoconf.
|
2001-12-03 23:28:57 +01:00
|
|
|
AC_SUBST(BUILD_INCLUDED_LIBINTL)
|
2001-08-08 04:49:01 +02:00
|
|
|
AC_SUBST(USE_INCLUDED_LIBINTL)
|
|
|
|
AC_SUBST(CATALOGS)
|
|
|
|
AC_SUBST(CATOBJEXT)
|
|
|
|
AC_SUBST(GMOFILES)
|
|
|
|
AC_SUBST(INTLLIBS)
|
|
|
|
AC_SUBST(INTLOBJS)
|
|
|
|
AC_SUBST(POFILES)
|
|
|
|
AC_SUBST(POSUB)
|
2001-12-03 23:28:57 +01:00
|
|
|
|
|
|
|
dnl For backward compatibility. Some configure.ins may be using this.
|
|
|
|
nls_cv_header_intl=
|
|
|
|
nls_cv_header_libgt=
|
|
|
|
|
|
|
|
dnl For backward compatibility. Some Makefiles may be using this.
|
|
|
|
DATADIRNAME=share
|
|
|
|
AC_SUBST(DATADIRNAME)
|
|
|
|
|
|
|
|
dnl For backward compatibility. Some Makefiles may be using this.
|
|
|
|
INSTOBJEXT=.mo
|
|
|
|
AC_SUBST(INSTOBJEXT)
|
|
|
|
|
|
|
|
dnl For backward compatibility. Some Makefiles may be using this.
|
|
|
|
GENCAT=gencat
|
|
|
|
AC_SUBST(GENCAT)
|
2001-08-08 04:49:01 +02:00
|
|
|
])
|
|
|
|
|
2001-12-03 23:28:57 +01:00
|
|
|
dnl Usage: Just like AM_WITH_NLS, which see.
|
|
|
|
AC_DEFUN([AM_GNU_GETTEXT],
|
2001-08-08 04:49:01 +02:00
|
|
|
[AC_REQUIRE([AC_PROG_MAKE_SET])dnl
|
|
|
|
AC_REQUIRE([AC_PROG_CC])dnl
|
2001-12-03 23:28:57 +01:00
|
|
|
AC_REQUIRE([AC_CANONICAL_HOST])dnl
|
2001-08-08 04:49:01 +02:00
|
|
|
AC_REQUIRE([AC_PROG_RANLIB])dnl
|
|
|
|
AC_REQUIRE([AC_ISC_POSIX])dnl
|
|
|
|
AC_REQUIRE([AC_HEADER_STDC])dnl
|
|
|
|
AC_REQUIRE([AC_C_CONST])dnl
|
|
|
|
AC_REQUIRE([AC_C_INLINE])dnl
|
|
|
|
AC_REQUIRE([AC_TYPE_OFF_T])dnl
|
|
|
|
AC_REQUIRE([AC_TYPE_SIZE_T])dnl
|
|
|
|
AC_REQUIRE([AC_FUNC_ALLOCA])dnl
|
|
|
|
AC_REQUIRE([AC_FUNC_MMAP])dnl
|
2001-12-03 23:28:57 +01:00
|
|
|
AC_REQUIRE([jm_GLIBC21])dnl
|
2001-08-08 04:49:01 +02:00
|
|
|
|
2001-12-03 23:28:57 +01:00
|
|
|
AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h stddef.h \
|
|
|
|
stdlib.h string.h unistd.h sys/param.h])
|
|
|
|
AC_CHECK_FUNCS([feof_unlocked fgets_unlocked getcwd getegid geteuid \
|
|
|
|
getgid getuid mempcpy munmap putenv setenv setlocale stpcpy strchr strcasecmp \
|
|
|
|
strdup strtoul tsearch __argz_count __argz_stringify __argz_next])
|
2001-08-08 04:49:01 +02:00
|
|
|
|
2001-12-03 23:28:57 +01:00
|
|
|
AM_ICONV
|
|
|
|
AM_LANGINFO_CODESET
|
2001-08-08 04:49:01 +02:00
|
|
|
AM_LC_MESSAGES
|
2001-12-03 23:28:57 +01:00
|
|
|
AM_WITH_NLS([$1],[$2],[$3])
|
2001-08-08 04:49:01 +02:00
|
|
|
|
|
|
|
if test "x$CATOBJEXT" != "x"; then
|
|
|
|
if test "x$ALL_LINGUAS" = "x"; then
|
|
|
|
LINGUAS=
|
|
|
|
else
|
|
|
|
AC_MSG_CHECKING(for catalogs to be installed)
|
|
|
|
NEW_LINGUAS=
|
2001-12-03 23:28:57 +01:00
|
|
|
for presentlang in $ALL_LINGUAS; do
|
|
|
|
useit=no
|
|
|
|
for desiredlang in ${LINGUAS-$ALL_LINGUAS}; do
|
|
|
|
# Use the presentlang catalog if desiredlang is
|
|
|
|
# a. equal to presentlang, or
|
|
|
|
# b. a variant of presentlang (because in this case,
|
|
|
|
# presentlang can be used as a fallback for messages
|
|
|
|
# which are not translated in the desiredlang catalog).
|
|
|
|
case "$desiredlang" in
|
|
|
|
"$presentlang"*) useit=yes;;
|
|
|
|
esac
|
|
|
|
done
|
|
|
|
if test $useit = yes; then
|
|
|
|
NEW_LINGUAS="$NEW_LINGUAS $presentlang"
|
|
|
|
fi
|
2001-08-08 04:49:01 +02:00
|
|
|
done
|
|
|
|
LINGUAS=$NEW_LINGUAS
|
|
|
|
AC_MSG_RESULT($LINGUAS)
|
|
|
|
fi
|
|
|
|
|
|
|
|
dnl Construct list of names of catalog files to be constructed.
|
|
|
|
if test -n "$LINGUAS"; then
|
|
|
|
for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
|
|
|
dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
|
2001-12-03 23:28:57 +01:00
|
|
|
dnl find the mkinstalldirs script in another subdir but $(top_srcdir).
|
2001-08-08 04:49:01 +02:00
|
|
|
dnl Try to locate is.
|
|
|
|
MKINSTALLDIRS=
|
|
|
|
if test -n "$ac_aux_dir"; then
|
|
|
|
MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
|
|
|
|
fi
|
|
|
|
if test -z "$MKINSTALLDIRS"; then
|
|
|
|
MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
|
|
|
|
fi
|
|
|
|
AC_SUBST(MKINSTALLDIRS)
|
|
|
|
|
2001-12-03 23:28:57 +01:00
|
|
|
dnl Enable libtool support if the surrounding package wishes it.
|
|
|
|
INTL_LIBTOOL_SUFFIX_PREFIX=ifelse([$1], use-libtool, [l], [])
|
|
|
|
AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX)
|
2001-08-08 04:49:01 +02:00
|
|
|
])
|
|
|
|
|
|
|
|
# Search path for a program which passes the given test.
|
|
|
|
# Ulrich Drepper <drepper@cygnus.com>, 1996.
|
|
|
|
#
|
2001-12-03 23:28:57 +01:00
|
|
|
# This file can be copied and used freely without restrictions. It can
|
2001-08-08 04:49:01 +02:00
|
|
|
# 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
|
|
|
|
|
|
|
|
dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
|
|
|
|
dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
|
2001-12-03 23:28:57 +01:00
|
|
|
AC_DEFUN([AM_PATH_PROG_WITH_TEST],
|
2001-08-08 04:49:01 +02:00
|
|
|
[# Extract the first word of "$2", so it can be a program name with args.
|
|
|
|
set dummy $2; ac_word=[$]2
|
|
|
|
AC_MSG_CHECKING([for $ac_word])
|
|
|
|
AC_CACHE_VAL(ac_cv_path_$1,
|
|
|
|
[case "[$]$1" in
|
|
|
|
/*)
|
|
|
|
ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
|
|
|
|
;;
|
|
|
|
*)
|
|
|
|
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
|
|
|
|
for ac_dir in ifelse([$5], , $PATH, [$5]); do
|
|
|
|
test -z "$ac_dir" && ac_dir=.
|
|
|
|
if test -f $ac_dir/$ac_word; then
|
|
|
|
if [$3]; then
|
|
|
|
ac_cv_path_$1="$ac_dir/$ac_word"
|
|
|
|
break
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
done
|
|
|
|
IFS="$ac_save_ifs"
|
|
|
|
dnl If no 4th arg is given, leave the cache variable unset,
|
|
|
|
dnl so AC_PATH_PROGS will keep looking.
|
|
|
|
ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
|
|
|
|
])dnl
|
|
|
|
;;
|
|
|
|
esac])dnl
|
|
|
|
$1="$ac_cv_path_$1"
|
|
|
|
if test -n "[$]$1"; then
|
|
|
|
AC_MSG_RESULT([$]$1)
|
|
|
|
else
|
|
|
|
AC_MSG_RESULT(no)
|
|
|
|
fi
|
|
|
|
AC_SUBST($1)dnl
|
|
|
|
])
|
|
|
|
|
2001-12-03 23:28:57 +01:00
|
|
|
#serial 2
|
|
|
|
|
|
|
|
# Test for the GNU C Library, version 2.1 or newer.
|
|
|
|
# From Bruno Haible.
|
|
|
|
|
|
|
|
AC_DEFUN([jm_GLIBC21],
|
|
|
|
[
|
|
|
|
AC_CACHE_CHECK(whether we are using the GNU C Library 2.1 or newer,
|
|
|
|
ac_cv_gnu_library_2_1,
|
|
|
|
[AC_EGREP_CPP([Lucky GNU user],
|
|
|
|
[
|
|
|
|
#include <features.h>
|
|
|
|
#ifdef __GNU_LIBRARY__
|
|
|
|
#if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2)
|
|
|
|
Lucky GNU user
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
],
|
|
|
|
ac_cv_gnu_library_2_1=yes,
|
|
|
|
ac_cv_gnu_library_2_1=no)
|
|
|
|
]
|
|
|
|
)
|
|
|
|
AC_SUBST(GLIBC21)
|
|
|
|
GLIBC21="$ac_cv_gnu_library_2_1"
|
|
|
|
]
|
|
|
|
)
|
|
|
|
|
|
|
|
#serial AM2
|
|
|
|
|
|
|
|
dnl From Bruno Haible.
|
|
|
|
|
|
|
|
AC_DEFUN([AM_ICONV],
|
|
|
|
[
|
|
|
|
dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
|
|
|
|
dnl those with the standalone portable GNU libiconv installed).
|
|
|
|
|
|
|
|
AC_ARG_WITH([libiconv-prefix],
|
|
|
|
[ --with-libiconv-prefix=DIR search for libiconv in DIR/include and DIR/lib], [
|
|
|
|
for dir in `echo "$withval" | tr : ' '`; do
|
|
|
|
if test -d $dir/include; then CPPFLAGS="$CPPFLAGS -I$dir/include"; fi
|
|
|
|
if test -d $dir/lib; then LDFLAGS="$LDFLAGS -L$dir/lib"; fi
|
|
|
|
done
|
|
|
|
])
|
|
|
|
|
|
|
|
AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [
|
|
|
|
am_cv_func_iconv="no, consider installing GNU libiconv"
|
|
|
|
am_cv_lib_iconv=no
|
|
|
|
AC_TRY_LINK([#include <stdlib.h>
|
|
|
|
#include <iconv.h>],
|
|
|
|
[iconv_t cd = iconv_open("","");
|
|
|
|
iconv(cd,NULL,NULL,NULL,NULL);
|
|
|
|
iconv_close(cd);],
|
|
|
|
am_cv_func_iconv=yes)
|
|
|
|
if test "$am_cv_func_iconv" != yes; then
|
|
|
|
am_save_LIBS="$LIBS"
|
|
|
|
LIBS="$LIBS -liconv"
|
|
|
|
AC_TRY_LINK([#include <stdlib.h>
|
|
|
|
#include <iconv.h>],
|
|
|
|
[iconv_t cd = iconv_open("","");
|
|
|
|
iconv(cd,NULL,NULL,NULL,NULL);
|
|
|
|
iconv_close(cd);],
|
|
|
|
am_cv_lib_iconv=yes
|
|
|
|
am_cv_func_iconv=yes)
|
|
|
|
LIBS="$am_save_LIBS"
|
|
|
|
fi
|
|
|
|
])
|
|
|
|
if test "$am_cv_func_iconv" = yes; then
|
|
|
|
AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.])
|
|
|
|
AC_MSG_CHECKING([for iconv declaration])
|
|
|
|
AC_CACHE_VAL(am_cv_proto_iconv, [
|
|
|
|
AC_TRY_COMPILE([
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <iconv.h>
|
|
|
|
extern
|
|
|
|
#ifdef __cplusplus
|
|
|
|
"C"
|
|
|
|
#endif
|
|
|
|
#if defined(__STDC__) || defined(__cplusplus)
|
|
|
|
size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
|
|
|
|
#else
|
|
|
|
size_t iconv();
|
|
|
|
#endif
|
|
|
|
], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const")
|
|
|
|
am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"])
|
|
|
|
am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
|
|
|
|
AC_MSG_RESULT([$]{ac_t:-
|
|
|
|
}[$]am_cv_proto_iconv)
|
|
|
|
AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1,
|
|
|
|
[Define as const if the declaration of iconv() needs const.])
|
|
|
|
fi
|
|
|
|
LIBICONV=
|
|
|
|
if test "$am_cv_lib_iconv" = yes; then
|
|
|
|
LIBICONV="-liconv"
|
|
|
|
fi
|
|
|
|
AC_SUBST(LIBICONV)
|
|
|
|
])
|
|
|
|
|
|
|
|
#serial AM1
|
|
|
|
|
|
|
|
dnl From Bruno Haible.
|
|
|
|
|
|
|
|
AC_DEFUN([AM_LANGINFO_CODESET],
|
|
|
|
[
|
|
|
|
AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset,
|
|
|
|
[AC_TRY_LINK([#include <langinfo.h>],
|
|
|
|
[char* cs = nl_langinfo(CODESET);],
|
|
|
|
am_cv_langinfo_codeset=yes,
|
|
|
|
am_cv_langinfo_codeset=no)
|
|
|
|
])
|
|
|
|
if test $am_cv_langinfo_codeset = yes; then
|
|
|
|
AC_DEFINE(HAVE_LANGINFO_CODESET, 1,
|
|
|
|
[Define if you have <langinfo.h> and nl_langinfo(CODESET).])
|
|
|
|
fi
|
|
|
|
])
|
|
|
|
|
2001-08-08 04:49:01 +02:00
|
|
|
# Check whether LC_MESSAGES is available in <locale.h>.
|
|
|
|
# Ulrich Drepper <drepper@cygnus.com>, 1995.
|
|
|
|
#
|
2001-12-03 23:28:57 +01:00
|
|
|
# This file can be copied and used freely without restrictions. It can
|
2001-08-08 04:49:01 +02:00
|
|
|
# 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.
|
|
|
|
|
2001-12-03 23:28:57 +01:00
|
|
|
# serial 2
|
2001-08-08 04:49:01 +02:00
|
|
|
|
2001-12-03 23:28:57 +01:00
|
|
|
AC_DEFUN([AM_LC_MESSAGES],
|
2001-08-08 04:49:01 +02:00
|
|
|
[if test $ac_cv_header_locale_h = yes; then
|
|
|
|
AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
|
|
|
|
[AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
|
|
|
|
am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
|
|
|
|
if test $am_cv_val_LC_MESSAGES = yes; then
|
2001-09-20 10:30:01 +02:00
|
|
|
AC_DEFINE(HAVE_LC_MESSAGES, 1,
|
2001-12-03 23:28:57 +01:00
|
|
|
[Define if your <locale.h> file defines LC_MESSAGES.])
|
2001-08-08 04:49:01 +02:00
|
|
|
fi
|
|
|
|
fi])
|
2001-04-20 10:59:25 +02:00
|
|
|
|
2000-04-21 22:33:34 +02:00
|
|
|
# Do all the work for Automake. This macro actually does too much --
|
|
|
|
# some checks are only needed if your package does certain things.
|
|
|
|
# But this isn't really a big deal.
|
|
|
|
|
|
|
|
# serial 1
|
|
|
|
|
|
|
|
dnl Usage:
|
|
|
|
dnl AM_INIT_AUTOMAKE(package,version, [no-define])
|
|
|
|
|
2001-12-03 23:28:57 +01:00
|
|
|
AC_DEFUN([AM_INIT_AUTOMAKE],
|
2000-04-21 22:33:34 +02:00
|
|
|
[AC_REQUIRE([AC_PROG_INSTALL])
|
|
|
|
PACKAGE=[$1]
|
|
|
|
AC_SUBST(PACKAGE)
|
|
|
|
VERSION=[$2]
|
|
|
|
AC_SUBST(VERSION)
|
|
|
|
dnl test to see if srcdir already configured
|
|
|
|
if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
|
|
|
|
AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
|
|
|
|
fi
|
|
|
|
ifelse([$3],,
|
|
|
|
AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
|
|
|
|
AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package]))
|
|
|
|
AC_REQUIRE([AM_SANITY_CHECK])
|
|
|
|
AC_REQUIRE([AC_ARG_PROGRAM])
|
|
|
|
dnl FIXME This is truly gross.
|
|
|
|
missing_dir=`cd $ac_aux_dir && pwd`
|
|
|
|
AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
|
|
|
|
AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
|
|
|
|
AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
|
|
|
|
AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
|
|
|
|
AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
|
|
|
|
AC_REQUIRE([AC_PROG_MAKE_SET])])
|
|
|
|
|
|
|
|
#
|
|
|
|
# Check to make sure that the build environment is sane.
|
|
|
|
#
|
|
|
|
|
2001-12-03 23:28:57 +01:00
|
|
|
AC_DEFUN([AM_SANITY_CHECK],
|
2000-04-21 22:33:34 +02:00
|
|
|
[AC_MSG_CHECKING([whether build environment is sane])
|
|
|
|
# Just in case
|
|
|
|
sleep 1
|
|
|
|
echo timestamp > conftestfile
|
|
|
|
# Do `set' in a subshell so we don't clobber the current shell's
|
|
|
|
# arguments. Must try -L first in case configure is actually a
|
|
|
|
# symlink; some systems play weird games with the mod time of symlinks
|
|
|
|
# (eg FreeBSD returns the mod time of the symlink's containing
|
|
|
|
# directory).
|
|
|
|
if (
|
|
|
|
set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
|
|
|
|
if test "[$]*" = "X"; then
|
|
|
|
# -L didn't work.
|
|
|
|
set X `ls -t $srcdir/configure conftestfile`
|
|
|
|
fi
|
|
|
|
if test "[$]*" != "X $srcdir/configure conftestfile" \
|
|
|
|
&& test "[$]*" != "X conftestfile $srcdir/configure"; then
|
|
|
|
|
|
|
|
# If neither matched, then we have a broken ls. This can happen
|
|
|
|
# if, for instance, CONFIG_SHELL is bash and it inherits a
|
|
|
|
# broken ls alias from the environment. This has actually
|
|
|
|
# happened. Such a system could not be considered "sane".
|
|
|
|
AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
|
|
|
|
alias in your environment])
|
|
|
|
fi
|
|
|
|
|
|
|
|
test "[$]2" = conftestfile
|
|
|
|
)
|
|
|
|
then
|
|
|
|
# Ok.
|
|
|
|
:
|
|
|
|
else
|
|
|
|
AC_MSG_ERROR([newly created file is older than distributed files!
|
|
|
|
Check your system clock])
|
|
|
|
fi
|
|
|
|
rm -f conftest*
|
|
|
|
AC_MSG_RESULT(yes)])
|
|
|
|
|
|
|
|
dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
|
|
|
|
dnl The program must properly implement --version.
|
2001-12-03 23:28:57 +01:00
|
|
|
AC_DEFUN([AM_MISSING_PROG],
|
2000-04-21 22:33:34 +02:00
|
|
|
[AC_MSG_CHECKING(for working $2)
|
|
|
|
# Run test in a subshell; some versions of sh will print an error if
|
|
|
|
# an executable is not found, even if stderr is redirected.
|
|
|
|
# Redirect stdin to placate older versions of autoconf. Sigh.
|
|
|
|
if ($2 --version) < /dev/null > /dev/null 2>&1; then
|
|
|
|
$1=$2
|
|
|
|
AC_MSG_RESULT(found)
|
|
|
|
else
|
|
|
|
$1="$3/missing $2"
|
|
|
|
AC_MSG_RESULT(missing)
|
|
|
|
fi
|
|
|
|
AC_SUBST($1)])
|
|
|
|
|
|
|
|
# Like AC_CONFIG_HEADER, but automatically create stamp file.
|
|
|
|
|
2001-12-03 23:28:57 +01:00
|
|
|
AC_DEFUN([AM_CONFIG_HEADER],
|
2000-04-21 22:33:34 +02:00
|
|
|
[AC_PREREQ([2.12])
|
|
|
|
AC_CONFIG_HEADER([$1])
|
|
|
|
dnl When config.status generates a header, we must update the stamp-h file.
|
|
|
|
dnl This file resides in the same directory as the config header
|
|
|
|
dnl that is generated. We must strip everything past the first ":",
|
|
|
|
dnl and everything past the last "/".
|
|
|
|
AC_OUTPUT_COMMANDS(changequote(<<,>>)dnl
|
|
|
|
ifelse(patsubst(<<$1>>, <<[^ ]>>, <<>>), <<>>,
|
|
|
|
<<test -z "<<$>>CONFIG_HEADERS" || echo timestamp > patsubst(<<$1>>, <<^\([^:]*/\)?.*>>, <<\1>>)stamp-h<<>>dnl>>,
|
|
|
|
<<am_indx=1
|
|
|
|
for am_file in <<$1>>; do
|
|
|
|
case " <<$>>CONFIG_HEADERS " in
|
|
|
|
*" <<$>>am_file "*<<)>>
|
|
|
|
echo timestamp > `echo <<$>>am_file | sed -e 's%:.*%%' -e 's%[^/]*$%%'`stamp-h$am_indx
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
am_indx=`expr "<<$>>am_indx" + 1`
|
|
|
|
done<<>>dnl>>)
|
|
|
|
changequote([,]))])
|
|
|
|
|