Commit 37bc6ca2 by Phil Edwards

acinclude.m4: Remove trailing whitespace.

2002-12-30  Phil Edwards  <pme@gcc.gnu.org>

	* acinclude.m4:  Remove trailing whitespace.
	(GLIBCPP_ENABLE_CXX_FLAGS):  Fix.
	* aclocal.m4, configure:  Regenerate.

From-SVN: r60631
parent 07fa4878
2002-12-30 Phil Edwards <pme@gcc.gnu.org>
* acinclude.m4: Remove trailing whitespace.
(GLIBCPP_ENABLE_CXX_FLAGS): Fix.
* aclocal.m4, configure: Regenerate.
2002-12-29 Phil Edwards <pme@gcc.gnu.org> 2002-12-29 Phil Edwards <pme@gcc.gnu.org>
* include/std/std_bitset.h: Better comments. * include/std/std_bitset.h: Better comments.
......
...@@ -207,8 +207,8 @@ AC_DEFUN(GLIBCPP_CONFIGURE, [ ...@@ -207,8 +207,8 @@ AC_DEFUN(GLIBCPP_CONFIGURE, [
dnl dnl
dnl Check to see if g++ can compile this library, and if so, if any version- dnl Check to see if g++ can compile this library, and if so, if any version-
dnl specific precautions need to be taken. dnl specific precautions need to be taken.
dnl dnl
dnl GLIBCPP_CHECK_COMPILER_VERSION dnl GLIBCPP_CHECK_COMPILER_VERSION
AC_DEFUN(GLIBCPP_CHECK_COMPILER_VERSION, [ AC_DEFUN(GLIBCPP_CHECK_COMPILER_VERSION, [
if test ! -f stamp-sanity-compiler; then if test ! -f stamp-sanity-compiler; then
...@@ -333,14 +333,14 @@ AC_DEFUN(GLIBCPP_CHECK_LINKER_FEATURES, [ ...@@ -333,14 +333,14 @@ AC_DEFUN(GLIBCPP_CHECK_LINKER_FEATURES, [
# Check for -Wl,--gc-sections # Check for -Wl,--gc-sections
# XXX This test is broken at the moment, as symbols required for # XXX This test is broken at the moment, as symbols required for
# linking are now in libsupc++ (not built yet.....). In addition, # linking are now in libsupc++ (not built yet.....). In addition,
# this test has cored on solaris in the past. In addition, # this test has cored on solaris in the past. In addition,
# --gc-sections doesn't really work at the moment (keeps on discarding # --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 # used sections, first .eh_frame and now some of the glibc sections for
# iconv). Bzzzzt. Thanks for playing, maybe next time. # iconv). Bzzzzt. Thanks for playing, maybe next time.
AC_MSG_CHECKING([for ld that supports -Wl,--gc-sections]) AC_MSG_CHECKING([for ld that supports -Wl,--gc-sections])
AC_TRY_RUN([ AC_TRY_RUN([
int main(void) int main(void)
{ {
try { throw 1; } try { throw 1; }
catch (...) { }; catch (...) { };
...@@ -385,8 +385,8 @@ AC_DEFUN(GLIBCPP_CHECK_MATH_DECL_1, [ ...@@ -385,8 +385,8 @@ AC_DEFUN(GLIBCPP_CHECK_MATH_DECL_1, [
#ifdef HAVE_IEEEFP_H #ifdef HAVE_IEEEFP_H
#include <ieeefp.h> #include <ieeefp.h>
#endif #endif
], ],
[ $1(0);], [ $1(0);],
[glibcpp_cv_func_$1_use=yes], [glibcpp_cv_func_$1_use=no]) [glibcpp_cv_func_$1_use=yes], [glibcpp_cv_func_$1_use=no])
AC_LANG_RESTORE AC_LANG_RESTORE
]) ])
...@@ -410,11 +410,11 @@ dnl GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1 ...@@ -410,11 +410,11 @@ dnl GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1
AC_DEFUN(GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1, [ AC_DEFUN(GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1, [
GLIBCPP_CHECK_MATH_DECL_1($1) GLIBCPP_CHECK_MATH_DECL_1($1)
if test x$glibcpp_cv_func_$1_use = x"yes"; then if test x$glibcpp_cv_func_$1_use = x"yes"; then
AC_CHECK_FUNCS($1) AC_CHECK_FUNCS($1)
else else
GLIBCPP_CHECK_MATH_DECL_1(_$1) GLIBCPP_CHECK_MATH_DECL_1(_$1)
if test x$glibcpp_cv_func__$1_use = x"yes"; then if test x$glibcpp_cv_func__$1_use = x"yes"; then
AC_CHECK_FUNCS(_$1) AC_CHECK_FUNCS(_$1)
fi fi
fi fi
]) ])
...@@ -422,7 +422,7 @@ AC_DEFUN(GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1, [ ...@@ -422,7 +422,7 @@ AC_DEFUN(GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1, [
dnl dnl
dnl Like GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1, but does a bunch of 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 dnl of functions at once. It's an all-or-nothing check -- either
dnl HAVE_XYZ is defined for each of the functions, or for none of them. dnl HAVE_XYZ is defined for each of the functions, or for none of them.
dnl Doing it this way saves significant configure time. dnl Doing it this way saves significant configure time.
AC_DEFUN(GLIBCPP_CHECK_MATH_DECLS_AND_LINKAGES_1, [ AC_DEFUN(GLIBCPP_CHECK_MATH_DECLS_AND_LINKAGES_1, [
...@@ -453,8 +453,8 @@ AC_DEFUN(GLIBCPP_CHECK_MATH_DECL_2, [ ...@@ -453,8 +453,8 @@ AC_DEFUN(GLIBCPP_CHECK_MATH_DECL_2, [
AC_CACHE_VAL(glibcpp_cv_func_$1_use, [ AC_CACHE_VAL(glibcpp_cv_func_$1_use, [
AC_LANG_SAVE AC_LANG_SAVE
AC_LANG_CPLUSPLUS AC_LANG_CPLUSPLUS
AC_TRY_COMPILE([#include <math.h>], AC_TRY_COMPILE([#include <math.h>],
[ $1(0, 0);], [ $1(0, 0);],
[glibcpp_cv_func_$1_use=yes], [glibcpp_cv_func_$1_use=no]) [glibcpp_cv_func_$1_use=yes], [glibcpp_cv_func_$1_use=no])
AC_LANG_RESTORE AC_LANG_RESTORE
]) ])
...@@ -477,11 +477,11 @@ dnl GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2 ...@@ -477,11 +477,11 @@ dnl GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2
AC_DEFUN(GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2, [ AC_DEFUN(GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2, [
GLIBCPP_CHECK_MATH_DECL_2($1) GLIBCPP_CHECK_MATH_DECL_2($1)
if test x$glibcpp_cv_func_$1_use = x"yes"; then if test x$glibcpp_cv_func_$1_use = x"yes"; then
AC_CHECK_FUNCS($1) AC_CHECK_FUNCS($1)
else else
GLIBCPP_CHECK_MATH_DECL_2(_$1) GLIBCPP_CHECK_MATH_DECL_2(_$1)
if test x$glibcpp_cv_func__$1_use = x"yes"; then if test x$glibcpp_cv_func__$1_use = x"yes"; then
AC_CHECK_FUNCS(_$1) AC_CHECK_FUNCS(_$1)
fi fi
fi fi
]) ])
...@@ -499,8 +499,8 @@ AC_DEFUN(GLIBCPP_CHECK_MATH_DECL_3, [ ...@@ -499,8 +499,8 @@ AC_DEFUN(GLIBCPP_CHECK_MATH_DECL_3, [
AC_CACHE_VAL(glibcpp_cv_func_$1_use, [ AC_CACHE_VAL(glibcpp_cv_func_$1_use, [
AC_LANG_SAVE AC_LANG_SAVE
AC_LANG_CPLUSPLUS AC_LANG_CPLUSPLUS
AC_TRY_COMPILE([#include <math.h>], AC_TRY_COMPILE([#include <math.h>],
[ $1(0, 0, 0);], [ $1(0, 0, 0);],
[glibcpp_cv_func_$1_use=yes], [glibcpp_cv_func_$1_use=no]) [glibcpp_cv_func_$1_use=yes], [glibcpp_cv_func_$1_use=no])
AC_LANG_RESTORE AC_LANG_RESTORE
]) ])
...@@ -523,11 +523,11 @@ dnl GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_3 ...@@ -523,11 +523,11 @@ dnl GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_3
AC_DEFUN(GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_3, [ AC_DEFUN(GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_3, [
GLIBCPP_CHECK_MATH_DECL_3($1) GLIBCPP_CHECK_MATH_DECL_3($1)
if test x$glibcpp_cv_func_$1_use = x"yes"; then if test x$glibcpp_cv_func_$1_use = x"yes"; then
AC_CHECK_FUNCS($1) AC_CHECK_FUNCS($1)
else else
GLIBCPP_CHECK_MATH_DECL_3(_$1) GLIBCPP_CHECK_MATH_DECL_3(_$1)
if test x$glibcpp_cv_func__$1_use = x"yes"; then if test x$glibcpp_cv_func__$1_use = x"yes"; then
AC_CHECK_FUNCS(_$1) AC_CHECK_FUNCS(_$1)
fi fi
fi fi
]) ])
...@@ -549,15 +549,15 @@ AC_DEFUN(GLIBCPP_CHECK_STDLIB_DECL_AND_LINKAGE_2, [ ...@@ -549,15 +549,15 @@ AC_DEFUN(GLIBCPP_CHECK_STDLIB_DECL_AND_LINKAGE_2, [
AC_CACHE_VAL(glibcpp_cv_func_$1_use, [ AC_CACHE_VAL(glibcpp_cv_func_$1_use, [
AC_LANG_SAVE AC_LANG_SAVE
AC_LANG_CPLUSPLUS AC_LANG_CPLUSPLUS
AC_TRY_COMPILE([#include <stdlib.h>], AC_TRY_COMPILE([#include <stdlib.h>],
[ $1(0, 0);], [ $1(0, 0);],
[glibcpp_cv_func_$1_use=yes], [glibcpp_cv_func_$1_use=no]) [glibcpp_cv_func_$1_use=yes], [glibcpp_cv_func_$1_use=no])
AC_LANG_RESTORE AC_LANG_RESTORE
]) ])
fi fi
AC_MSG_RESULT($glibcpp_cv_func_$1_use) AC_MSG_RESULT($glibcpp_cv_func_$1_use)
if test x$glibcpp_cv_func_$1_use = x"yes"; then if test x$glibcpp_cv_func_$1_use = x"yes"; then
AC_CHECK_FUNCS($1) AC_CHECK_FUNCS($1)
fi fi
]) ])
...@@ -578,15 +578,15 @@ AC_DEFUN(GLIBCPP_CHECK_STDLIB_DECL_AND_LINKAGE_3, [ ...@@ -578,15 +578,15 @@ AC_DEFUN(GLIBCPP_CHECK_STDLIB_DECL_AND_LINKAGE_3, [
AC_CACHE_VAL(glibcpp_cv_func_$1_use, [ AC_CACHE_VAL(glibcpp_cv_func_$1_use, [
AC_LANG_SAVE AC_LANG_SAVE
AC_LANG_CPLUSPLUS AC_LANG_CPLUSPLUS
AC_TRY_COMPILE([#include <stdlib.h>], AC_TRY_COMPILE([#include <stdlib.h>],
[ $1(0, 0, 0);], [ $1(0, 0, 0);],
[glibcpp_cv_func_$1_use=yes], [glibcpp_cv_func_$1_use=no]) [glibcpp_cv_func_$1_use=yes], [glibcpp_cv_func_$1_use=no])
AC_LANG_RESTORE AC_LANG_RESTORE
]) ])
fi fi
AC_MSG_RESULT($glibcpp_cv_func_$1_use) AC_MSG_RESULT($glibcpp_cv_func_$1_use)
if test x$glibcpp_cv_func_$1_use = x"yes"; then if test x$glibcpp_cv_func_$1_use = x"yes"; then
AC_CHECK_FUNCS($1) AC_CHECK_FUNCS($1)
fi fi
]) ])
...@@ -606,20 +606,20 @@ AC_DEFUN(GLIBCPP_CHECK_UNISTD_DECL_AND_LINKAGE_1, [ ...@@ -606,20 +606,20 @@ AC_DEFUN(GLIBCPP_CHECK_UNISTD_DECL_AND_LINKAGE_1, [
AC_CACHE_VAL(glibcpp_cv_func_$1_use, [ AC_CACHE_VAL(glibcpp_cv_func_$1_use, [
AC_LANG_SAVE AC_LANG_SAVE
AC_LANG_CPLUSPLUS AC_LANG_CPLUSPLUS
AC_TRY_COMPILE([#include <unistd.h>], AC_TRY_COMPILE([#include <unistd.h>],
[ $1(0);], [ $1(0);],
[glibcpp_cv_func_$1_use=yes], [glibcpp_cv_func_$1_use=no]) [glibcpp_cv_func_$1_use=yes], [glibcpp_cv_func_$1_use=no])
AC_LANG_RESTORE AC_LANG_RESTORE
]) ])
fi fi
AC_MSG_RESULT($glibcpp_cv_func_$1_use) AC_MSG_RESULT($glibcpp_cv_func_$1_use)
if test x$glibcpp_cv_func_$1_use = x"yes"; then if test x$glibcpp_cv_func_$1_use = x"yes"; then
AC_CHECK_FUNCS($1) AC_CHECK_FUNCS($1)
fi fi
]) ])
dnl dnl
dnl Because the builtins are picky picky picky about the arguments they take, dnl Because the builtins are picky picky picky about the arguments they take,
dnl do an explict linkage tests here. dnl do an explict linkage tests here.
dnl Check to see if the (math function) argument passed is dnl Check to see if the (math function) argument passed is
dnl 1) declared when using the c++ compiler dnl 1) declared when using the c++ compiler
...@@ -638,8 +638,8 @@ AC_DEFUN(GLIBCPP_CHECK_BUILTIN_MATH_DECL_AND_LINKAGE_1, [ ...@@ -638,8 +638,8 @@ AC_DEFUN(GLIBCPP_CHECK_BUILTIN_MATH_DECL_AND_LINKAGE_1, [
AC_CACHE_VAL(glibcpp_cv_func_$1_use, [ AC_CACHE_VAL(glibcpp_cv_func_$1_use, [
AC_LANG_SAVE AC_LANG_SAVE
AC_LANG_CPLUSPLUS AC_LANG_CPLUSPLUS
AC_TRY_COMPILE([#include <math.h>], AC_TRY_COMPILE([#include <math.h>],
[ $1(0);], [ $1(0);],
[glibcpp_cv_func_$1_use=yes], [glibcpp_cv_func_$1_use=no]) [glibcpp_cv_func_$1_use=yes], [glibcpp_cv_func_$1_use=no])
AC_LANG_RESTORE AC_LANG_RESTORE
]) ])
...@@ -649,8 +649,8 @@ AC_DEFUN(GLIBCPP_CHECK_BUILTIN_MATH_DECL_AND_LINKAGE_1, [ ...@@ -649,8 +649,8 @@ AC_DEFUN(GLIBCPP_CHECK_BUILTIN_MATH_DECL_AND_LINKAGE_1, [
AC_MSG_CHECKING([for $1 linkage]) AC_MSG_CHECKING([for $1 linkage])
if test x${glibcpp_cv_func_$1_link+set} != xset; then if test x${glibcpp_cv_func_$1_link+set} != xset; then
AC_CACHE_VAL(glibcpp_cv_func_$1_link, [ AC_CACHE_VAL(glibcpp_cv_func_$1_link, [
AC_TRY_LINK([#include <math.h>], AC_TRY_LINK([#include <math.h>],
[ $1(0);], [ $1(0);],
[glibcpp_cv_func_$1_link=yes], [glibcpp_cv_func_$1_link=no]) [glibcpp_cv_func_$1_link=yes], [glibcpp_cv_func_$1_link=no])
]) ])
fi fi
...@@ -684,7 +684,7 @@ dnl ...@@ -684,7 +684,7 @@ dnl
dnl GLIBCPP_CHECK_BUILTIN_MATH_SUPPORT dnl GLIBCPP_CHECK_BUILTIN_MATH_SUPPORT
AC_DEFUN(GLIBCPP_CHECK_BUILTIN_MATH_SUPPORT, [ AC_DEFUN(GLIBCPP_CHECK_BUILTIN_MATH_SUPPORT, [
dnl Test for builtin math functions. dnl Test for builtin math functions.
dnl These are made in gcc/c-common.c 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_abs)
GLIBCPP_CHECK_BUILTIN_MATH_DECL_AND_LINKAGE_1(__builtin_fabsf) 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_fabs)
...@@ -730,7 +730,7 @@ AC_DEFUN(GLIBCPP_CHECK_BUILTIN_MATH_SUPPORT, [ ...@@ -730,7 +730,7 @@ AC_DEFUN(GLIBCPP_CHECK_BUILTIN_MATH_SUPPORT, [
dnl dnl
dnl Check to see what the underlying c library is like dnl Check to see what the underlying c library is like
dnl These checks need to do two things: dnl These checks need to do two things:
dnl 1) make sure the name is declared when using the c++ compiler dnl 1) make sure the name is declared when using the c++ compiler
dnl 2) make sure the name has "C" linkage dnl 2) make sure the name has "C" linkage
dnl This might seem like overkill but experience has shown that it's not... dnl This might seem like overkill but experience has shown that it's not...
...@@ -754,7 +754,7 @@ AC_DEFUN(GLIBCPP_CHECK_STDLIB_SUPPORT, [ ...@@ -754,7 +754,7 @@ AC_DEFUN(GLIBCPP_CHECK_STDLIB_SUPPORT, [
dnl dnl
dnl Check to see what the underlying c library is like dnl Check to see what the underlying c library is like
dnl These checks need to do two things: dnl These checks need to do two things:
dnl 1) make sure the name is declared when using the c++ compiler dnl 1) make sure the name is declared when using the c++ compiler
dnl 2) make sure the name has "C" linkage dnl 2) make sure the name has "C" linkage
dnl This might seem like overkill but experience has shown that it's not... dnl This might seem like overkill but experience has shown that it's not...
...@@ -768,13 +768,13 @@ AC_DEFUN(GLIBCPP_CHECK_UNISTD_SUPPORT, [ ...@@ -768,13 +768,13 @@ AC_DEFUN(GLIBCPP_CHECK_UNISTD_SUPPORT, [
CXXFLAGS='-fno-builtins -D_GNU_SOURCE' CXXFLAGS='-fno-builtins -D_GNU_SOURCE'
GLIBCPP_CHECK_UNISTD_DECL_AND_LINKAGE_1(isatty) GLIBCPP_CHECK_UNISTD_DECL_AND_LINKAGE_1(isatty)
CXXFLAGS="$ac_save_CXXFLAGS" CXXFLAGS="$ac_save_CXXFLAGS"
]) ])
dnl dnl
dnl Check to see what the underlying c library or math library is like. dnl Check to see what the underlying c library or math library is like.
dnl These checks need to do two things: dnl These checks need to do two things:
dnl 1) make sure the name is declared when using the c++ compiler dnl 1) make sure the name is declared when using the c++ compiler
dnl 2) make sure the name has "C" linkage dnl 2) make sure the name has "C" linkage
dnl This might seem like overkill but experience has shown that it's not... dnl This might seem like overkill but experience has shown that it's not...
...@@ -886,7 +886,7 @@ AC_DEFUN(GLIBCPP_CHECK_MATH_SUPPORT, [ ...@@ -886,7 +886,7 @@ AC_DEFUN(GLIBCPP_CHECK_MATH_SUPPORT, [
dnl dnl
dnl Check to see if there is native support for complex dnl Check to see if there is native support for complex
dnl dnl
dnl Don't compile bits in math/* if native support exits. dnl Don't compile bits in math/* if native support exits.
dnl dnl
...@@ -902,7 +902,7 @@ AC_DEFUN(GLIBCPP_CHECK_COMPLEX_MATH_SUPPORT, [ ...@@ -902,7 +902,7 @@ AC_DEFUN(GLIBCPP_CHECK_COMPLEX_MATH_SUPPORT, [
AC_CHECK_FUNCS([__signbit], , [LIBMATHOBJS="$LIBMATHOBJS signbit.lo"]) AC_CHECK_FUNCS([__signbit], , [LIBMATHOBJS="$LIBMATHOBJS signbit.lo"])
AC_CHECK_FUNCS([__signbitf], , [LIBMATHOBJS="$LIBMATHOBJS signbitf.lo"]) AC_CHECK_FUNCS([__signbitf], , [LIBMATHOBJS="$LIBMATHOBJS signbitf.lo"])
dnl Compile the long double complex functions only if the function dnl Compile the long double complex functions only if the function
dnl provides the non-complex long double functions that are needed. dnl provides the non-complex long double functions that are needed.
dnl Currently this includes copysignl, which should be dnl Currently this includes copysignl, which should be
dnl cached from the GLIBCPP_CHECK_MATH_SUPPORT macro, above. dnl cached from the GLIBCPP_CHECK_MATH_SUPPORT macro, above.
...@@ -921,7 +921,7 @@ AC_DEFUN(GLIBCPP_CHECK_COMPLEX_MATH_SUPPORT, [ ...@@ -921,7 +921,7 @@ AC_DEFUN(GLIBCPP_CHECK_COMPLEX_MATH_SUPPORT, [
dnl Check to see what architecture and operating system we are compiling 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 for. Also, if architecture- or OS-specific flags are required for
dnl compilation, pick them up here. dnl compilation, pick them up here.
dnl dnl
dnl GLIBCPP_CHECK_TARGET dnl GLIBCPP_CHECK_TARGET
AC_DEFUN(GLIBCPP_CHECK_TARGET, [ AC_DEFUN(GLIBCPP_CHECK_TARGET, [
. [$]{glibcpp_basedir}/configure.target . [$]{glibcpp_basedir}/configure.target
...@@ -935,7 +935,7 @@ dnl Check to see if this target can enable the wchar_t parts of libstdc++. ...@@ -935,7 +935,7 @@ dnl Check to see if this target can enable the wchar_t parts of libstdc++.
dnl If --disable-c-mbchar was given, no wchar_t stuff is enabled. (This dnl If --disable-c-mbchar was given, no wchar_t stuff is enabled. (This
dnl must have been previously checked.) dnl must have been previously checked.)
dnl dnl
dnl Define _GLIBCPP_USE_WCHAR_T if all the bits are found dnl Define _GLIBCPP_USE_WCHAR_T if all the bits are found
dnl Define HAVE_MBSTATE_T if mbstate_t is not in wchar.h dnl Define HAVE_MBSTATE_T if mbstate_t is not in wchar.h
dnl dnl
dnl GLIBCPP_CHECK_WCHAR_T_SUPPORT dnl GLIBCPP_CHECK_WCHAR_T_SUPPORT
...@@ -945,7 +945,7 @@ AC_DEFUN(GLIBCPP_CHECK_WCHAR_T_SUPPORT, [ ...@@ -945,7 +945,7 @@ AC_DEFUN(GLIBCPP_CHECK_WCHAR_T_SUPPORT, [
dnl others even if wchar_t support is not on. dnl others even if wchar_t support is not on.
AC_MSG_CHECKING([for mbstate_t]) AC_MSG_CHECKING([for mbstate_t])
AC_TRY_COMPILE([#include <wchar.h>], AC_TRY_COMPILE([#include <wchar.h>],
[mbstate_t teststate;], [mbstate_t teststate;],
have_mbstate_t=yes, have_mbstate_t=no) have_mbstate_t=yes, have_mbstate_t=no)
AC_MSG_RESULT($have_mbstate_t) AC_MSG_RESULT($have_mbstate_t)
if test x"$have_mbstate_t" = xyes; then if test x"$have_mbstate_t" = xyes; then
...@@ -955,20 +955,20 @@ AC_DEFUN(GLIBCPP_CHECK_WCHAR_T_SUPPORT, [ ...@@ -955,20 +955,20 @@ AC_DEFUN(GLIBCPP_CHECK_WCHAR_T_SUPPORT, [
dnl Sanity check for existence of ISO C99 headers for extended encoding. 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_HEADERS(wchar.h, ac_has_wchar_h=yes, ac_has_wchar_h=no)
AC_CHECK_HEADERS(wctype.h, ac_has_wctype_h=yes, ac_has_wctype_h=no) AC_CHECK_HEADERS(wctype.h, ac_has_wctype_h=yes, ac_has_wctype_h=no)
dnl Only continue checking if the ISO C99 headers exist and support is on. dnl Only continue checking if the ISO C99 headers exist and support is on.
if test x"$ac_has_wchar_h" = xyes && if test x"$ac_has_wchar_h" = xyes &&
test x"$ac_has_wctype_h" = xyes && test x"$ac_has_wctype_h" = xyes &&
test x"$enable_c_mbchar" != xno; then test x"$enable_c_mbchar" != xno; then
dnl Test wchar.h for WCHAR_MIN, WCHAR_MAX, which is needed before dnl Test wchar.h for WCHAR_MIN, WCHAR_MAX, which is needed before
dnl numeric_limits can instantiate type_traits<wchar_t> dnl numeric_limits can instantiate type_traits<wchar_t>
AC_MSG_CHECKING([for WCHAR_MIN and WCHAR_MAX]) AC_MSG_CHECKING([for WCHAR_MIN and WCHAR_MAX])
AC_TRY_COMPILE([#include <wchar.h>], AC_TRY_COMPILE([#include <wchar.h>],
[int i = WCHAR_MIN; int j = WCHAR_MAX;], [int i = WCHAR_MIN; int j = WCHAR_MAX;],
has_wchar_minmax=yes, has_wchar_minmax=no) has_wchar_minmax=yes, has_wchar_minmax=no)
AC_MSG_RESULT($has_wchar_minmax) AC_MSG_RESULT($has_wchar_minmax)
dnl Test wchar.h for WEOF, which is what we use to determine whether dnl Test wchar.h for WEOF, which is what we use to determine whether
dnl to specialize for char_traits<wchar_t> or not. dnl to specialize for char_traits<wchar_t> or not.
AC_MSG_CHECKING([for WEOF]) AC_MSG_CHECKING([for WEOF])
...@@ -978,12 +978,12 @@ AC_DEFUN(GLIBCPP_CHECK_WCHAR_T_SUPPORT, [ ...@@ -978,12 +978,12 @@ AC_DEFUN(GLIBCPP_CHECK_WCHAR_T_SUPPORT, [
[wint_t i = WEOF;], [wint_t i = WEOF;],
has_weof=yes, has_weof=no) has_weof=yes, has_weof=no)
AC_MSG_RESULT($has_weof) AC_MSG_RESULT($has_weof)
dnl Tests for wide character functions used in char_traits<wchar_t>. dnl Tests for wide character functions used in char_traits<wchar_t>.
ac_wfuncs=yes ac_wfuncs=yes
AC_CHECK_FUNCS(wcslen wmemchr wmemcmp wmemcpy wmemmove wmemset,, \ AC_CHECK_FUNCS(wcslen wmemchr wmemcmp wmemcpy wmemmove wmemset,, \
ac_wfuncs=no) ac_wfuncs=no)
dnl Checks for names injected into std:: by the c_std headers. dnl Checks for names injected into std:: by the c_std headers.
AC_CHECK_FUNCS(btowc wctob fgetwc fgetwc fgetws fputwc fputws fwide \ AC_CHECK_FUNCS(btowc wctob fgetwc fgetwc fgetws fputwc fputws fwide \
fwprintf fwscanf swprintf swscanf vfwprintf vfwscanf vswprintf vswscanf \ fwprintf fwscanf swprintf swscanf vfwprintf vfwscanf vswprintf vswscanf \
...@@ -1002,8 +1002,8 @@ AC_DEFUN(GLIBCPP_CHECK_WCHAR_T_SUPPORT, [ ...@@ -1002,8 +1002,8 @@ AC_DEFUN(GLIBCPP_CHECK_WCHAR_T_SUPPORT, [
ac_isoC99_wchar_t=no ac_isoC99_wchar_t=no
fi fi
AC_MSG_RESULT($ac_isoC99_wchar_t) AC_MSG_RESULT($ac_isoC99_wchar_t)
dnl Use iconv for wchar_t to char conversions. As such, check for dnl Use iconv for wchar_t to char conversions. As such, check for
dnl X/Open Portability Guide, version 2 features (XPG2). 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(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) AC_CHECK_HEADER(langinfo.h, ac_has_langinfo_h=yes, ac_has_langinfo_h=no)
...@@ -1015,7 +1015,7 @@ AC_DEFUN(GLIBCPP_CHECK_WCHAR_T_SUPPORT, [ ...@@ -1015,7 +1015,7 @@ AC_DEFUN(GLIBCPP_CHECK_WCHAR_T_SUPPORT, [
AC_CHECK_FUNCS(iconv_open iconv_close iconv nl_langinfo, \ AC_CHECK_FUNCS(iconv_open iconv_close iconv nl_langinfo, \
ac_XPG2funcs=yes, ac_XPG2funcs=no) ac_XPG2funcs=yes, ac_XPG2funcs=no)
LIBS="$ac_save_LIBS" LIBS="$ac_save_LIBS"
AC_MSG_CHECKING([for XPG2 wchar_t support]) AC_MSG_CHECKING([for XPG2 wchar_t support])
...@@ -1027,7 +1027,7 @@ AC_DEFUN(GLIBCPP_CHECK_WCHAR_T_SUPPORT, [ ...@@ -1027,7 +1027,7 @@ AC_DEFUN(GLIBCPP_CHECK_WCHAR_T_SUPPORT, [
ac_XPG2_wchar_t=no ac_XPG2_wchar_t=no
fi fi
AC_MSG_RESULT($ac_XPG2_wchar_t) AC_MSG_RESULT($ac_XPG2_wchar_t)
dnl At the moment, only enable wchar_t specializations if all the dnl At the moment, only enable wchar_t specializations if all the
dnl above support is present. dnl above support is present.
AC_MSG_CHECKING([for enabled wchar_t specializations]) AC_MSG_CHECKING([for enabled wchar_t specializations])
...@@ -1039,7 +1039,7 @@ AC_DEFUN(GLIBCPP_CHECK_WCHAR_T_SUPPORT, [ ...@@ -1039,7 +1039,7 @@ AC_DEFUN(GLIBCPP_CHECK_WCHAR_T_SUPPORT, [
AC_MSG_RESULT("no") AC_MSG_RESULT("no")
fi fi
else else
dnl Wide characters disabled by the user. dnl Wide characters disabled by the user.
AC_MSG_WARN([wchar_t support disabled.]) AC_MSG_WARN([wchar_t support disabled.])
fi fi
]) ])
...@@ -1050,11 +1050,11 @@ dnl Check to see if debugging libraries are to be built. ...@@ -1050,11 +1050,11 @@ dnl Check to see if debugging libraries are to be built.
dnl dnl
dnl GLIBCPP_ENABLE_DEBUG dnl GLIBCPP_ENABLE_DEBUG
dnl dnl
dnl --enable-debug dnl --enable-debug
dnl builds a separate set of debugging libraries in addition to the dnl builds a separate set of debugging libraries in addition to the
dnl normal (shared, static) libstdc++ binaries. dnl normal (shared, static) libstdc++ binaries.
dnl dnl
dnl --disable-debug dnl --disable-debug
dnl builds only one (non-debug) version of libstdc++. dnl builds only one (non-debug) version of libstdc++.
dnl dnl
dnl --enable-debug-flags=FLAGS dnl --enable-debug-flags=FLAGS
...@@ -1077,7 +1077,7 @@ changequote([, ])dnl ...@@ -1077,7 +1077,7 @@ changequote([, ])dnl
enable_debug=GLIBCPP_ENABLE_DEBUG_DEFAULT)dnl enable_debug=GLIBCPP_ENABLE_DEBUG_DEFAULT)dnl
AC_MSG_CHECKING([for additional debug build]) AC_MSG_CHECKING([for additional debug build])
AC_MSG_RESULT($enable_debug) AC_MSG_RESULT($enable_debug)
AM_CONDITIONAL(GLIBCPP_BUILD_DEBUG, test "$enable_debug" = yes) AM_CONDITIONAL(GLIBCPP_BUILD_DEBUG, test "$enable_debug" = yes)
]) ])
...@@ -1085,8 +1085,8 @@ dnl Check for explicit debug flags. ...@@ -1085,8 +1085,8 @@ dnl Check for explicit debug flags.
dnl dnl
dnl GLIBCPP_ENABLE_DEBUG_FLAGS dnl GLIBCPP_ENABLE_DEBUG_FLAGS
dnl dnl
dnl --enable-debug-flags='-O1' dnl --enable-debug-flags='-O1'
dnl is a general method for passing flags to be used when dnl is a general method for passing flags to be used when
dnl building debug libraries with --enable-debug. dnl building debug libraries with --enable-debug.
dnl dnl
dnl --disable-debug-flags does nothing. dnl --disable-debug-flags does nothing.
...@@ -1097,7 +1097,7 @@ AC_DEFUN(GLIBCPP_ENABLE_DEBUG_FLAGS, [dnl ...@@ -1097,7 +1097,7 @@ AC_DEFUN(GLIBCPP_ENABLE_DEBUG_FLAGS, [dnl
define([GLIBCPP_ENABLE_DEBUG_FLAGS_DEFAULT], ifelse($1,,, $1))dnl define([GLIBCPP_ENABLE_DEBUG_FLAGS_DEFAULT], ifelse($1,,, $1))dnl
AC_ARG_ENABLE(debug_flags, AC_ARG_ENABLE(debug_flags,
changequote(<<, >>)dnl changequote(<<, >>)dnl
<< --enable-debug-flags=FLAGS pass compiler FLAGS when building debug << --enable-debug-flags=FLAGS pass compiler FLAGS when building debug
library;[default=>>GLIBCPP_ENABLE_DEBUG_FLAGS_DEFAULT], library;[default=>>GLIBCPP_ENABLE_DEBUG_FLAGS_DEFAULT],
changequote([, ])dnl changequote([, ])dnl
[case "${enableval}" in [case "${enableval}" in
...@@ -1109,15 +1109,15 @@ enable_debug_flags=GLIBCPP_ENABLE_DEBUG_FLAGS_DEFAULT)dnl ...@@ -1109,15 +1109,15 @@ enable_debug_flags=GLIBCPP_ENABLE_DEBUG_FLAGS_DEFAULT)dnl
dnl Option parsed, now set things appropriately dnl Option parsed, now set things appropriately
case x"$enable_debug" in case x"$enable_debug" in
xyes) xyes)
case "$enable_debug_flags" in case "$enable_debug_flags" in
none) none)
DEBUG_FLAGS="-g3 -O0";; DEBUG_FLAGS="-g3 -O0";;
-*) #valid input -*) #valid input
DEBUG_FLAGS="${enableval}" DEBUG_FLAGS="${enableval}"
esac esac
;; ;;
xno) xno)
DEBUG_FLAGS="" DEBUG_FLAGS=""
;; ;;
esac esac
...@@ -1145,21 +1145,21 @@ dnl If "default flags" is an empty string (or "none"), the effect is ...@@ -1145,21 +1145,21 @@ dnl If "default flags" is an empty string (or "none"), the effect is
dnl the same as --disable or --enable=no. dnl the same as --disable or --enable=no.
AC_DEFUN(GLIBCPP_ENABLE_CXX_FLAGS, [dnl AC_DEFUN(GLIBCPP_ENABLE_CXX_FLAGS, [dnl
define([GLIBCPP_ENABLE_CXX_FLAGS_DEFAULT], ifelse($1,,, $1))dnl define([GLIBCPP_ENABLE_CXX_FLAGS_DEFAULT], ifelse($1,,, $1))dnl
AC_MSG_CHECKING([for extra compiler flags for building])
AC_ARG_ENABLE(cxx_flags, AC_ARG_ENABLE(cxx_flags,
changequote(<<, >>)dnl changequote(<<, >>)dnl
<< --enable-cxx-flags=FLAGS pass compiler FLAGS when building library; << --enable-cxx-flags=FLAGS pass compiler FLAGS when building library;
[default=>>GLIBCPP_ENABLE_CXX_FLAGS_DEFAULT], [default=>>GLIBCPP_ENABLE_CXX_FLAGS_DEFAULT],
changequote([, ])dnl changequote([, ])dnl
enable_cxx_flags='GLIBCPP_ENABLE_CXX_FLAGS_DEFAULT') [case "x$enable_cxx_flags" in
xyes)
case "x$enable_cxx_flags" in AC_MSG_ERROR([--enable-cxx-flags needs compiler flags as arguments]) ;;
xyes) xno | xnone | x)
AC_MSG_ERROR([--enable-cxx-flags needs compiler flags as arguments]) ;; enable_cxx_flags='' ;;
xno | xnone | x) *)
enable_cxx_flags='' ;; enable_cxx_flags="$enableval" ;;
*) esac],
enable_cxx_flags="$enableval" ;; enable_cxx_flags=GLIBCPP_ENABLE_CXX_FLAGS_DEFAULT)
esac
dnl Run through flags (either default or command-line) and set anything dnl Run through flags (either default or command-line) and set anything
dnl extra (e.g., #defines) that must accompany particular g++ options. dnl extra (e.g., #defines) that must accompany particular g++ options.
...@@ -1174,6 +1174,7 @@ if test -n "$enable_cxx_flags"; then ...@@ -1174,6 +1174,7 @@ if test -n "$enable_cxx_flags"; then
done done
fi fi
EXTRA_CXX_FLAGS="$enable_cxx_flags" EXTRA_CXX_FLAGS="$enable_cxx_flags"
AC_MSG_RESULT($EXTRA_CXX_FLAGS)
AC_SUBST(EXTRA_CXX_FLAGS) AC_SUBST(EXTRA_CXX_FLAGS)
]) ])
...@@ -1184,15 +1185,15 @@ dnl ...@@ -1184,15 +1185,15 @@ dnl
dnl GLIBCPP_ENABLE_CLOCALE dnl GLIBCPP_ENABLE_CLOCALE
dnl --enable-clocale=gnu sets config/locale/c_locale_gnu.cc and friends 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 dnl --enable-clocale=generic sets config/locale/c_locale_generic.cc and friends
dnl dnl
dnl default is generic dnl default is generic
dnl dnl
AC_DEFUN(GLIBCPP_ENABLE_CLOCALE, [ AC_DEFUN(GLIBCPP_ENABLE_CLOCALE, [
AC_MSG_CHECKING([for clocale to use]) AC_MSG_CHECKING([for clocale to use])
AC_ARG_ENABLE(clocale, AC_ARG_ENABLE(clocale,
[ --enable-clocale enable model for target locale package. [ --enable-clocale enable model for target locale package.
--enable-clocale=MODEL use MODEL target-speific locale package. [default=generic] --enable-clocale=MODEL use MODEL target-speific locale package. [default=generic]
], ],
if test x$enable_clocale = xno; then if test x$enable_clocale = xno; then
enable_clocale=no enable_clocale=no
fi, fi,
...@@ -1207,7 +1208,7 @@ AC_DEFUN(GLIBCPP_ENABLE_CLOCALE, [ ...@@ -1207,7 +1208,7 @@ AC_DEFUN(GLIBCPP_ENABLE_CLOCALE, [
xlinux* | xgnu*) xlinux* | xgnu*)
AC_EGREP_CPP([_GLIBCPP_ok], [ AC_EGREP_CPP([_GLIBCPP_ok], [
#include <features.h> #include <features.h>
#if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) #if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2)
_GLIBCPP_ok _GLIBCPP_ok
#endif #endif
], enable_clocale_flag=gnu, enable_clocale_flag=generic) ], enable_clocale_flag=gnu, enable_clocale_flag=generic)
...@@ -1237,7 +1238,7 @@ AC_DEFUN(GLIBCPP_ENABLE_CLOCALE, [ ...@@ -1237,7 +1238,7 @@ AC_DEFUN(GLIBCPP_ENABLE_CLOCALE, [
j = __strcoll_l(__one, __two, loc_dup); j = __strcoll_l(__one, __two, loc_dup);
return 0; return 0;
} }
], ],
[enable_clocale_flag=gnu],[enable_clocale_flag=generic], [enable_clocale_flag=gnu],[enable_clocale_flag=generic],
[enable_clocale_flag=generic]) [enable_clocale_flag=generic])
fi fi
...@@ -1356,15 +1357,15 @@ dnl Check for which I/O library to use: libio, or something specific. ...@@ -1356,15 +1357,15 @@ dnl Check for which I/O library to use: libio, or something specific.
dnl dnl
dnl GLIBCPP_ENABLE_CSTDIO dnl GLIBCPP_ENABLE_CSTDIO
dnl --enable-cstdio=libio sets config/io/c_io_libio.h and friends dnl --enable-cstdio=libio sets config/io/c_io_libio.h and friends
dnl dnl
dnl default is stdio dnl default is stdio
dnl dnl
AC_DEFUN(GLIBCPP_ENABLE_CSTDIO, [ AC_DEFUN(GLIBCPP_ENABLE_CSTDIO, [
AC_MSG_CHECKING([for cstdio to use]) AC_MSG_CHECKING([for cstdio to use])
AC_ARG_ENABLE(cstdio, AC_ARG_ENABLE(cstdio,
[ --enable-cstdio enable stdio for target io package. [ --enable-cstdio enable stdio for target io package.
--enable-cstdio=LIB use LIB target-speific io package. [default=stdio] --enable-cstdio=LIB use LIB target-speific io package. [default=stdio]
], ],
if test x$enable_cstdio = xno; then if test x$enable_cstdio = xno; then
enable_cstdio=stdio enable_cstdio=stdio
fi, fi,
...@@ -1384,7 +1385,7 @@ AC_DEFUN(GLIBCPP_ENABLE_CSTDIO, [ ...@@ -1384,7 +1385,7 @@ AC_DEFUN(GLIBCPP_ENABLE_CSTDIO, [
AC_CHECK_HEADER(libio.h, has_libio=yes, has_libio=no) AC_CHECK_HEADER(libio.h, has_libio=yes, has_libio=no)
# Need to check and see what version of glibc is being used. If # 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 # it's not glibc-2.2 or higher, then we'll need to go ahead and
# compile most of libio for linux systems. # compile most of libio for linux systems.
if test x$has_libio = x"yes"; then if test x$has_libio = x"yes"; then
case "$target" in case "$target" in
...@@ -1392,7 +1393,7 @@ AC_DEFUN(GLIBCPP_ENABLE_CSTDIO, [ ...@@ -1392,7 +1393,7 @@ AC_DEFUN(GLIBCPP_ENABLE_CSTDIO, [
AC_MSG_CHECKING([for glibc version >= 2.2]) AC_MSG_CHECKING([for glibc version >= 2.2])
AC_EGREP_CPP([ok], [ AC_EGREP_CPP([ok], [
#include <features.h> #include <features.h>
#if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) #if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2)
ok ok
#endif #endif
], glibc_satisfactory=yes, glibc_satisfactory=no) ], glibc_satisfactory=yes, glibc_satisfactory=no)
...@@ -1402,11 +1403,11 @@ AC_DEFUN(GLIBCPP_ENABLE_CSTDIO, [ ...@@ -1402,11 +1403,11 @@ AC_DEFUN(GLIBCPP_ENABLE_CSTDIO, [
# XXX at the moment, admit defeat and force the recompilation # XXX at the moment, admit defeat and force the recompilation
# XXX of glibc even on glibc-2.2 systems, because libio is not synched. # XXX of glibc even on glibc-2.2 systems, because libio is not synched.
glibc_satisfactory=no glibc_satisfactory=no
if test x$glibc_satisfactory = x"yes"; then if test x$glibc_satisfactory = x"yes"; then
need_libio=no need_libio=no
need_wlibio=no need_wlibio=no
else else
need_libio=yes need_libio=yes
# bkoz XXX need to add checks to enable this # bkoz XXX need to add checks to enable this
...@@ -1530,7 +1531,7 @@ void foo() ...@@ -1530,7 +1531,7 @@ void foo()
bar(); bar();
} }
EOF EOF
old_CXXFLAGS="$CXXFLAGS" old_CXXFLAGS="$CXXFLAGS"
CXXFLAGS=-S CXXFLAGS=-S
if AC_TRY_EVAL(ac_compile); then if AC_TRY_EVAL(ac_compile); then
if grep _Unwind_SjLj_Resume conftest.s >/dev/null 2>&1 ; then if grep _Unwind_SjLj_Resume conftest.s >/dev/null 2>&1 ; then
...@@ -1609,7 +1610,7 @@ AC_DEFUN(GLIBCPP_ENABLE_C99, [dnl ...@@ -1609,7 +1610,7 @@ AC_DEFUN(GLIBCPP_ENABLE_C99, [dnl
*) AC_MSG_ERROR([Unknown argument to enable/disable C99]) ;; *) AC_MSG_ERROR([Unknown argument to enable/disable C99]) ;;
esac], esac],
enable_c99=GLIBCPP_ENABLE_C99_DEFAULT)dnl enable_c99=GLIBCPP_ENABLE_C99_DEFAULT)dnl
AC_LANG_SAVE AC_LANG_SAVE
AC_LANG_CPLUSPLUS AC_LANG_CPLUSPLUS
...@@ -1668,8 +1669,8 @@ AC_DEFUN(GLIBCPP_ENABLE_C99, [dnl ...@@ -1668,8 +1669,8 @@ AC_DEFUN(GLIBCPP_ENABLE_C99, [dnl
ac_c99_stdlib=yes; ac_c99_stdlib=yes;
AC_MSG_CHECKING([for lldiv_t declaration]) AC_MSG_CHECKING([for lldiv_t declaration])
AC_CACHE_VAL(ac_c99_lldiv_t, [ AC_CACHE_VAL(ac_c99_lldiv_t, [
AC_TRY_COMPILE([#include <stdlib.h>], AC_TRY_COMPILE([#include <stdlib.h>],
[ lldiv_t mydivt;], [ lldiv_t mydivt;],
[ac_c99_lldiv_t=yes], [ac_c99_lldiv_t=no]) [ac_c99_lldiv_t=yes], [ac_c99_lldiv_t=no])
]) ])
AC_MSG_RESULT($ac_c99_lldiv_t) AC_MSG_RESULT($ac_c99_lldiv_t)
...@@ -1684,19 +1685,19 @@ AC_DEFUN(GLIBCPP_ENABLE_C99, [dnl ...@@ -1684,19 +1685,19 @@ AC_DEFUN(GLIBCPP_ENABLE_C99, [dnl
AC_TRY_COMPILE([#include <stdlib.h>], [atoll("10");],, [ac_c99_stdlib=no]) AC_TRY_COMPILE([#include <stdlib.h>], [atoll("10");],, [ac_c99_stdlib=no])
AC_TRY_COMPILE([#include <stdlib.h>], [_Exit(0);],, [ac_c99_stdlib=no]) AC_TRY_COMPILE([#include <stdlib.h>], [_Exit(0);],, [ac_c99_stdlib=no])
if test x"$ac_c99_lldiv_t" = x"no"; then if test x"$ac_c99_lldiv_t" = x"no"; then
ac_c99_stdlib=no; ac_c99_stdlib=no;
fi; fi;
AC_MSG_RESULT($ac_c99_stdlib) AC_MSG_RESULT($ac_c99_stdlib)
# Check for the existence of <wchar.h> functions used if C99 is enabled. # Check for the existence of <wchar.h> functions used if C99 is enabled.
# XXX the wchar.h checks should be rolled into the general C99 bits. # XXX the wchar.h checks should be rolled into the general C99 bits.
ac_c99_wchar=yes; ac_c99_wchar=yes;
AC_MSG_CHECKING([for additional ISO C99 support in <wchar.h>]) AC_MSG_CHECKING([for additional ISO C99 support in <wchar.h>])
AC_TRY_COMPILE([#include <wchar.h>], AC_TRY_COMPILE([#include <wchar.h>],
[wcstold(L"10.0", NULL);],, [ac_c99_wchar=no]) [wcstold(L"10.0", NULL);],, [ac_c99_wchar=no])
AC_TRY_COMPILE([#include <wchar.h>], AC_TRY_COMPILE([#include <wchar.h>],
[wcstoll(L"10", NULL, 10);],, [ac_c99_wchar=no]) [wcstoll(L"10", NULL, 10);],, [ac_c99_wchar=no])
AC_TRY_COMPILE([#include <wchar.h>], AC_TRY_COMPILE([#include <wchar.h>],
[wcstoull(L"10", NULL, 10);],, [ac_c99_wchar=no]) [wcstoull(L"10", NULL, 10);],, [ac_c99_wchar=no])
AC_MSG_RESULT($ac_c99_wchar) AC_MSG_RESULT($ac_c99_wchar)
...@@ -1705,8 +1706,8 @@ AC_DEFUN(GLIBCPP_ENABLE_C99, [dnl ...@@ -1705,8 +1706,8 @@ AC_DEFUN(GLIBCPP_ENABLE_C99, [dnl
test x"$ac_c99_stdio" = x"no" || test x"$ac_c99_stdio" = x"no" ||
test x"$ac_c99_stdlib" = x"no" || test x"$ac_c99_stdlib" = x"no" ||
test x"$ac_c99_wchar" = x"no"; then test x"$ac_c99_wchar" = x"no"; then
enable_c99=no; enable_c99=no;
fi; fi;
AC_MSG_RESULT($enable_c99) AC_MSG_RESULT($enable_c99)
# Option parsed, now set things appropriately # Option parsed, now set things appropriately
...@@ -1783,13 +1784,13 @@ changequote(<<, >>)dnl ...@@ -1783,13 +1784,13 @@ changequote(<<, >>)dnl
<< --enable-cheaders=MODEL construct "C" header files for g++ [default=>>GLIBCPP_ENABLE_CHEADERS_DEFAULT], << --enable-cheaders=MODEL construct "C" header files for g++ [default=>>GLIBCPP_ENABLE_CHEADERS_DEFAULT],
changequote([, ]) changequote([, ])
[case "$enableval" in [case "$enableval" in
c) c)
enable_cheaders=c enable_cheaders=c
;; ;;
c_std) c_std)
enable_cheaders=c_std enable_cheaders=c_std
;; ;;
*) AC_MSG_ERROR([Unknown argument to enable/disable "C" headers]) *) AC_MSG_ERROR([Unknown argument to enable/disable "C" headers])
;; ;;
esac], esac],
enable_cheaders=GLIBCPP_ENABLE_CHEADERS_DEFAULT) enable_cheaders=GLIBCPP_ENABLE_CHEADERS_DEFAULT)
...@@ -1797,10 +1798,10 @@ changequote([, ]) ...@@ -1797,10 +1798,10 @@ changequote([, ])
dnl Option parsed, now set things appropriately dnl Option parsed, now set things appropriately
case "$enable_cheaders" in case "$enable_cheaders" in
c_std) c_std)
C_INCLUDE_DIR='${glibcpp_srcdir}/include/c_std' C_INCLUDE_DIR='${glibcpp_srcdir}/include/c_std'
;; ;;
c) c)
C_INCLUDE_DIR='${glibcpp_srcdir}/include/c' C_INCLUDE_DIR='${glibcpp_srcdir}/include/c'
;; ;;
esac esac
...@@ -1878,8 +1879,8 @@ dnl Set up *_FLAGS and *FLAGS variables for all sundry Makefile.am's. ...@@ -1878,8 +1879,8 @@ dnl Set up *_FLAGS and *FLAGS variables for all sundry Makefile.am's.
dnl dnl
AC_DEFUN(GLIBCPP_EXPORT_FLAGS, [ AC_DEFUN(GLIBCPP_EXPORT_FLAGS, [
# Optimization flags that are probably a good idea for thrill-seekers. Just # Optimization flags that are probably a good idea for thrill-seekers. Just
# uncomment the lines below and make, everything else is ready to go... # uncomment the lines below and make, everything else is ready to go...
# OPTIMIZE_CXXFLAGS = -O3 -fstrict-aliasing -fvtable-gc # OPTIMIZE_CXXFLAGS = -O3 -fstrict-aliasing -fvtable-gc
OPTIMIZE_CXXFLAGS= OPTIMIZE_CXXFLAGS=
AC_SUBST(OPTIMIZE_CXXFLAGS) AC_SUBST(OPTIMIZE_CXXFLAGS)
...@@ -1955,7 +1956,7 @@ fi ...@@ -1955,7 +1956,7 @@ fi
# Calculate glibcpp_toolexecdir, glibcpp_toolexeclibdir # Calculate glibcpp_toolexecdir, glibcpp_toolexeclibdir
# Install a library built with a cross compiler in tooldir, not libdir. # Install a library built with a cross compiler in tooldir, not libdir.
if test x"$glibcpp_toolexecdir" = x"no"; then if test x"$glibcpp_toolexecdir" = x"no"; then
if test -n "$with_cross_host" && if test -n "$with_cross_host" &&
test x"$with_cross_host" != x"no"; then test x"$with_cross_host" != x"no"; then
glibcpp_toolexecdir='$(exec_prefix)/$(target_alias)' glibcpp_toolexecdir='$(exec_prefix)/$(target_alias)'
...@@ -2091,8 +2092,8 @@ AC_DEFUN(GLIBCPP_CHECK_SETRLIMIT, [ ...@@ -2091,8 +2092,8 @@ AC_DEFUN(GLIBCPP_CHECK_SETRLIMIT, [
AC_TRY_COMPILE([#include <unistd.h> AC_TRY_COMPILE([#include <unistd.h>
#include <sys/time.h> #include <sys/time.h>
#include <sys/resource.h> #include <sys/resource.h>
], ],
[ struct rlimit r; setrlimit(0, &r);], [ struct rlimit r; setrlimit(0, &r);],
[ac_setrlimit=yes], [ac_setrlimit=no]) [ac_setrlimit=yes], [ac_setrlimit=no])
]) ])
fi fi
...@@ -2220,9 +2221,9 @@ changequote([, ])dnl ...@@ -2220,9 +2221,9 @@ changequote([, ])dnl
enable_symvers=GLIBCPP_ENABLE_SYMVERS_DEFAULT)dnl enable_symvers=GLIBCPP_ENABLE_SYMVERS_DEFAULT)dnl
# If we never went through the GLIBCPP_CHECK_LINKER_FEATURES macro, then we # If we never went through the GLIBCPP_CHECK_LINKER_FEATURES macro, then we
# don't know enough about $LD to do tricks... # don't know enough about $LD to do tricks...
if test x$enable_shared = xno || if test x$enable_shared = xno ||
test "x$LD" = x || test "x$LD" = x ||
test x$glibcpp_gnu_ld_version = x; then test x$glibcpp_gnu_ld_version = x; then
enable_symvers=no enable_symvers=no
fi fi
...@@ -2242,7 +2243,7 @@ fi ...@@ -2242,7 +2243,7 @@ fi
glibcpp_min_gnu_ld_version=21200 glibcpp_min_gnu_ld_version=21200
# Check to see if unspecified "yes" value can win, given results # Check to see if unspecified "yes" value can win, given results
# above. # above.
if test $enable_symvers = yes ; then if test $enable_symvers = yes ; then
if test $with_gnu_ld = yes && if test $with_gnu_ld = yes &&
test $glibcpp_shared_libgcc = yes ; test $glibcpp_shared_libgcc = yes ;
...@@ -2279,7 +2280,7 @@ case $enable_symvers in ...@@ -2279,7 +2280,7 @@ case $enable_symvers in
;; ;;
gnu) gnu)
SYMVER_MAP=config/linker-map.gnu SYMVER_MAP=config/linker-map.gnu
AC_DEFINE(_GLIBCPP_SYMVER) AC_DEFINE(_GLIBCPP_SYMVER)
;; ;;
esac esac
......
dnl aclocal.m4 generated automatically by aclocal 1.4-p5 dnl aclocal.m4 generated automatically by aclocal 1.4-p6
dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation dnl This file is free software; the Free Software Foundation
...@@ -219,8 +219,8 @@ AC_DEFUN(GLIBCPP_CONFIGURE, [ ...@@ -219,8 +219,8 @@ AC_DEFUN(GLIBCPP_CONFIGURE, [
dnl dnl
dnl Check to see if g++ can compile this library, and if so, if any version- dnl Check to see if g++ can compile this library, and if so, if any version-
dnl specific precautions need to be taken. dnl specific precautions need to be taken.
dnl dnl
dnl GLIBCPP_CHECK_COMPILER_VERSION dnl GLIBCPP_CHECK_COMPILER_VERSION
AC_DEFUN(GLIBCPP_CHECK_COMPILER_VERSION, [ AC_DEFUN(GLIBCPP_CHECK_COMPILER_VERSION, [
if test ! -f stamp-sanity-compiler; then if test ! -f stamp-sanity-compiler; then
...@@ -345,14 +345,14 @@ AC_DEFUN(GLIBCPP_CHECK_LINKER_FEATURES, [ ...@@ -345,14 +345,14 @@ AC_DEFUN(GLIBCPP_CHECK_LINKER_FEATURES, [
# Check for -Wl,--gc-sections # Check for -Wl,--gc-sections
# XXX This test is broken at the moment, as symbols required for # XXX This test is broken at the moment, as symbols required for
# linking are now in libsupc++ (not built yet.....). In addition, # linking are now in libsupc++ (not built yet.....). In addition,
# this test has cored on solaris in the past. In addition, # this test has cored on solaris in the past. In addition,
# --gc-sections doesn't really work at the moment (keeps on discarding # --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 # used sections, first .eh_frame and now some of the glibc sections for
# iconv). Bzzzzt. Thanks for playing, maybe next time. # iconv). Bzzzzt. Thanks for playing, maybe next time.
AC_MSG_CHECKING([for ld that supports -Wl,--gc-sections]) AC_MSG_CHECKING([for ld that supports -Wl,--gc-sections])
AC_TRY_RUN([ AC_TRY_RUN([
int main(void) int main(void)
{ {
try { throw 1; } try { throw 1; }
catch (...) { }; catch (...) { };
...@@ -397,8 +397,8 @@ AC_DEFUN(GLIBCPP_CHECK_MATH_DECL_1, [ ...@@ -397,8 +397,8 @@ AC_DEFUN(GLIBCPP_CHECK_MATH_DECL_1, [
#ifdef HAVE_IEEEFP_H #ifdef HAVE_IEEEFP_H
#include <ieeefp.h> #include <ieeefp.h>
#endif #endif
], ],
[ $1(0);], [ $1(0);],
[glibcpp_cv_func_$1_use=yes], [glibcpp_cv_func_$1_use=no]) [glibcpp_cv_func_$1_use=yes], [glibcpp_cv_func_$1_use=no])
AC_LANG_RESTORE AC_LANG_RESTORE
]) ])
...@@ -422,11 +422,11 @@ dnl GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1 ...@@ -422,11 +422,11 @@ dnl GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1
AC_DEFUN(GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1, [ AC_DEFUN(GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1, [
GLIBCPP_CHECK_MATH_DECL_1($1) GLIBCPP_CHECK_MATH_DECL_1($1)
if test x$glibcpp_cv_func_$1_use = x"yes"; then if test x$glibcpp_cv_func_$1_use = x"yes"; then
AC_CHECK_FUNCS($1) AC_CHECK_FUNCS($1)
else else
GLIBCPP_CHECK_MATH_DECL_1(_$1) GLIBCPP_CHECK_MATH_DECL_1(_$1)
if test x$glibcpp_cv_func__$1_use = x"yes"; then if test x$glibcpp_cv_func__$1_use = x"yes"; then
AC_CHECK_FUNCS(_$1) AC_CHECK_FUNCS(_$1)
fi fi
fi fi
]) ])
...@@ -434,7 +434,7 @@ AC_DEFUN(GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1, [ ...@@ -434,7 +434,7 @@ AC_DEFUN(GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1, [
dnl dnl
dnl Like GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_1, but does a bunch of 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 dnl of functions at once. It's an all-or-nothing check -- either
dnl HAVE_XYZ is defined for each of the functions, or for none of them. dnl HAVE_XYZ is defined for each of the functions, or for none of them.
dnl Doing it this way saves significant configure time. dnl Doing it this way saves significant configure time.
AC_DEFUN(GLIBCPP_CHECK_MATH_DECLS_AND_LINKAGES_1, [ AC_DEFUN(GLIBCPP_CHECK_MATH_DECLS_AND_LINKAGES_1, [
...@@ -465,8 +465,8 @@ AC_DEFUN(GLIBCPP_CHECK_MATH_DECL_2, [ ...@@ -465,8 +465,8 @@ AC_DEFUN(GLIBCPP_CHECK_MATH_DECL_2, [
AC_CACHE_VAL(glibcpp_cv_func_$1_use, [ AC_CACHE_VAL(glibcpp_cv_func_$1_use, [
AC_LANG_SAVE AC_LANG_SAVE
AC_LANG_CPLUSPLUS AC_LANG_CPLUSPLUS
AC_TRY_COMPILE([#include <math.h>], AC_TRY_COMPILE([#include <math.h>],
[ $1(0, 0);], [ $1(0, 0);],
[glibcpp_cv_func_$1_use=yes], [glibcpp_cv_func_$1_use=no]) [glibcpp_cv_func_$1_use=yes], [glibcpp_cv_func_$1_use=no])
AC_LANG_RESTORE AC_LANG_RESTORE
]) ])
...@@ -489,11 +489,11 @@ dnl GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2 ...@@ -489,11 +489,11 @@ dnl GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2
AC_DEFUN(GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2, [ AC_DEFUN(GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_2, [
GLIBCPP_CHECK_MATH_DECL_2($1) GLIBCPP_CHECK_MATH_DECL_2($1)
if test x$glibcpp_cv_func_$1_use = x"yes"; then if test x$glibcpp_cv_func_$1_use = x"yes"; then
AC_CHECK_FUNCS($1) AC_CHECK_FUNCS($1)
else else
GLIBCPP_CHECK_MATH_DECL_2(_$1) GLIBCPP_CHECK_MATH_DECL_2(_$1)
if test x$glibcpp_cv_func__$1_use = x"yes"; then if test x$glibcpp_cv_func__$1_use = x"yes"; then
AC_CHECK_FUNCS(_$1) AC_CHECK_FUNCS(_$1)
fi fi
fi fi
]) ])
...@@ -511,8 +511,8 @@ AC_DEFUN(GLIBCPP_CHECK_MATH_DECL_3, [ ...@@ -511,8 +511,8 @@ AC_DEFUN(GLIBCPP_CHECK_MATH_DECL_3, [
AC_CACHE_VAL(glibcpp_cv_func_$1_use, [ AC_CACHE_VAL(glibcpp_cv_func_$1_use, [
AC_LANG_SAVE AC_LANG_SAVE
AC_LANG_CPLUSPLUS AC_LANG_CPLUSPLUS
AC_TRY_COMPILE([#include <math.h>], AC_TRY_COMPILE([#include <math.h>],
[ $1(0, 0, 0);], [ $1(0, 0, 0);],
[glibcpp_cv_func_$1_use=yes], [glibcpp_cv_func_$1_use=no]) [glibcpp_cv_func_$1_use=yes], [glibcpp_cv_func_$1_use=no])
AC_LANG_RESTORE AC_LANG_RESTORE
]) ])
...@@ -535,11 +535,11 @@ dnl GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_3 ...@@ -535,11 +535,11 @@ dnl GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_3
AC_DEFUN(GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_3, [ AC_DEFUN(GLIBCPP_CHECK_MATH_DECL_AND_LINKAGE_3, [
GLIBCPP_CHECK_MATH_DECL_3($1) GLIBCPP_CHECK_MATH_DECL_3($1)
if test x$glibcpp_cv_func_$1_use = x"yes"; then if test x$glibcpp_cv_func_$1_use = x"yes"; then
AC_CHECK_FUNCS($1) AC_CHECK_FUNCS($1)
else else
GLIBCPP_CHECK_MATH_DECL_3(_$1) GLIBCPP_CHECK_MATH_DECL_3(_$1)
if test x$glibcpp_cv_func__$1_use = x"yes"; then if test x$glibcpp_cv_func__$1_use = x"yes"; then
AC_CHECK_FUNCS(_$1) AC_CHECK_FUNCS(_$1)
fi fi
fi fi
]) ])
...@@ -561,15 +561,15 @@ AC_DEFUN(GLIBCPP_CHECK_STDLIB_DECL_AND_LINKAGE_2, [ ...@@ -561,15 +561,15 @@ AC_DEFUN(GLIBCPP_CHECK_STDLIB_DECL_AND_LINKAGE_2, [
AC_CACHE_VAL(glibcpp_cv_func_$1_use, [ AC_CACHE_VAL(glibcpp_cv_func_$1_use, [
AC_LANG_SAVE AC_LANG_SAVE
AC_LANG_CPLUSPLUS AC_LANG_CPLUSPLUS
AC_TRY_COMPILE([#include <stdlib.h>], AC_TRY_COMPILE([#include <stdlib.h>],
[ $1(0, 0);], [ $1(0, 0);],
[glibcpp_cv_func_$1_use=yes], [glibcpp_cv_func_$1_use=no]) [glibcpp_cv_func_$1_use=yes], [glibcpp_cv_func_$1_use=no])
AC_LANG_RESTORE AC_LANG_RESTORE
]) ])
fi fi
AC_MSG_RESULT($glibcpp_cv_func_$1_use) AC_MSG_RESULT($glibcpp_cv_func_$1_use)
if test x$glibcpp_cv_func_$1_use = x"yes"; then if test x$glibcpp_cv_func_$1_use = x"yes"; then
AC_CHECK_FUNCS($1) AC_CHECK_FUNCS($1)
fi fi
]) ])
...@@ -590,15 +590,15 @@ AC_DEFUN(GLIBCPP_CHECK_STDLIB_DECL_AND_LINKAGE_3, [ ...@@ -590,15 +590,15 @@ AC_DEFUN(GLIBCPP_CHECK_STDLIB_DECL_AND_LINKAGE_3, [
AC_CACHE_VAL(glibcpp_cv_func_$1_use, [ AC_CACHE_VAL(glibcpp_cv_func_$1_use, [
AC_LANG_SAVE AC_LANG_SAVE
AC_LANG_CPLUSPLUS AC_LANG_CPLUSPLUS
AC_TRY_COMPILE([#include <stdlib.h>], AC_TRY_COMPILE([#include <stdlib.h>],
[ $1(0, 0, 0);], [ $1(0, 0, 0);],
[glibcpp_cv_func_$1_use=yes], [glibcpp_cv_func_$1_use=no]) [glibcpp_cv_func_$1_use=yes], [glibcpp_cv_func_$1_use=no])
AC_LANG_RESTORE AC_LANG_RESTORE
]) ])
fi fi
AC_MSG_RESULT($glibcpp_cv_func_$1_use) AC_MSG_RESULT($glibcpp_cv_func_$1_use)
if test x$glibcpp_cv_func_$1_use = x"yes"; then if test x$glibcpp_cv_func_$1_use = x"yes"; then
AC_CHECK_FUNCS($1) AC_CHECK_FUNCS($1)
fi fi
]) ])
...@@ -618,20 +618,20 @@ AC_DEFUN(GLIBCPP_CHECK_UNISTD_DECL_AND_LINKAGE_1, [ ...@@ -618,20 +618,20 @@ AC_DEFUN(GLIBCPP_CHECK_UNISTD_DECL_AND_LINKAGE_1, [
AC_CACHE_VAL(glibcpp_cv_func_$1_use, [ AC_CACHE_VAL(glibcpp_cv_func_$1_use, [
AC_LANG_SAVE AC_LANG_SAVE
AC_LANG_CPLUSPLUS AC_LANG_CPLUSPLUS
AC_TRY_COMPILE([#include <unistd.h>], AC_TRY_COMPILE([#include <unistd.h>],
[ $1(0);], [ $1(0);],
[glibcpp_cv_func_$1_use=yes], [glibcpp_cv_func_$1_use=no]) [glibcpp_cv_func_$1_use=yes], [glibcpp_cv_func_$1_use=no])
AC_LANG_RESTORE AC_LANG_RESTORE
]) ])
fi fi
AC_MSG_RESULT($glibcpp_cv_func_$1_use) AC_MSG_RESULT($glibcpp_cv_func_$1_use)
if test x$glibcpp_cv_func_$1_use = x"yes"; then if test x$glibcpp_cv_func_$1_use = x"yes"; then
AC_CHECK_FUNCS($1) AC_CHECK_FUNCS($1)
fi fi
]) ])
dnl dnl
dnl Because the builtins are picky picky picky about the arguments they take, dnl Because the builtins are picky picky picky about the arguments they take,
dnl do an explict linkage tests here. dnl do an explict linkage tests here.
dnl Check to see if the (math function) argument passed is dnl Check to see if the (math function) argument passed is
dnl 1) declared when using the c++ compiler dnl 1) declared when using the c++ compiler
...@@ -650,8 +650,8 @@ AC_DEFUN(GLIBCPP_CHECK_BUILTIN_MATH_DECL_AND_LINKAGE_1, [ ...@@ -650,8 +650,8 @@ AC_DEFUN(GLIBCPP_CHECK_BUILTIN_MATH_DECL_AND_LINKAGE_1, [
AC_CACHE_VAL(glibcpp_cv_func_$1_use, [ AC_CACHE_VAL(glibcpp_cv_func_$1_use, [
AC_LANG_SAVE AC_LANG_SAVE
AC_LANG_CPLUSPLUS AC_LANG_CPLUSPLUS
AC_TRY_COMPILE([#include <math.h>], AC_TRY_COMPILE([#include <math.h>],
[ $1(0);], [ $1(0);],
[glibcpp_cv_func_$1_use=yes], [glibcpp_cv_func_$1_use=no]) [glibcpp_cv_func_$1_use=yes], [glibcpp_cv_func_$1_use=no])
AC_LANG_RESTORE AC_LANG_RESTORE
]) ])
...@@ -661,8 +661,8 @@ AC_DEFUN(GLIBCPP_CHECK_BUILTIN_MATH_DECL_AND_LINKAGE_1, [ ...@@ -661,8 +661,8 @@ AC_DEFUN(GLIBCPP_CHECK_BUILTIN_MATH_DECL_AND_LINKAGE_1, [
AC_MSG_CHECKING([for $1 linkage]) AC_MSG_CHECKING([for $1 linkage])
if test x${glibcpp_cv_func_$1_link+set} != xset; then if test x${glibcpp_cv_func_$1_link+set} != xset; then
AC_CACHE_VAL(glibcpp_cv_func_$1_link, [ AC_CACHE_VAL(glibcpp_cv_func_$1_link, [
AC_TRY_LINK([#include <math.h>], AC_TRY_LINK([#include <math.h>],
[ $1(0);], [ $1(0);],
[glibcpp_cv_func_$1_link=yes], [glibcpp_cv_func_$1_link=no]) [glibcpp_cv_func_$1_link=yes], [glibcpp_cv_func_$1_link=no])
]) ])
fi fi
...@@ -696,7 +696,7 @@ dnl ...@@ -696,7 +696,7 @@ dnl
dnl GLIBCPP_CHECK_BUILTIN_MATH_SUPPORT dnl GLIBCPP_CHECK_BUILTIN_MATH_SUPPORT
AC_DEFUN(GLIBCPP_CHECK_BUILTIN_MATH_SUPPORT, [ AC_DEFUN(GLIBCPP_CHECK_BUILTIN_MATH_SUPPORT, [
dnl Test for builtin math functions. dnl Test for builtin math functions.
dnl These are made in gcc/c-common.c 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_abs)
GLIBCPP_CHECK_BUILTIN_MATH_DECL_AND_LINKAGE_1(__builtin_fabsf) 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_fabs)
...@@ -742,7 +742,7 @@ AC_DEFUN(GLIBCPP_CHECK_BUILTIN_MATH_SUPPORT, [ ...@@ -742,7 +742,7 @@ AC_DEFUN(GLIBCPP_CHECK_BUILTIN_MATH_SUPPORT, [
dnl dnl
dnl Check to see what the underlying c library is like dnl Check to see what the underlying c library is like
dnl These checks need to do two things: dnl These checks need to do two things:
dnl 1) make sure the name is declared when using the c++ compiler dnl 1) make sure the name is declared when using the c++ compiler
dnl 2) make sure the name has "C" linkage dnl 2) make sure the name has "C" linkage
dnl This might seem like overkill but experience has shown that it's not... dnl This might seem like overkill but experience has shown that it's not...
...@@ -766,7 +766,7 @@ AC_DEFUN(GLIBCPP_CHECK_STDLIB_SUPPORT, [ ...@@ -766,7 +766,7 @@ AC_DEFUN(GLIBCPP_CHECK_STDLIB_SUPPORT, [
dnl dnl
dnl Check to see what the underlying c library is like dnl Check to see what the underlying c library is like
dnl These checks need to do two things: dnl These checks need to do two things:
dnl 1) make sure the name is declared when using the c++ compiler dnl 1) make sure the name is declared when using the c++ compiler
dnl 2) make sure the name has "C" linkage dnl 2) make sure the name has "C" linkage
dnl This might seem like overkill but experience has shown that it's not... dnl This might seem like overkill but experience has shown that it's not...
...@@ -780,13 +780,13 @@ AC_DEFUN(GLIBCPP_CHECK_UNISTD_SUPPORT, [ ...@@ -780,13 +780,13 @@ AC_DEFUN(GLIBCPP_CHECK_UNISTD_SUPPORT, [
CXXFLAGS='-fno-builtins -D_GNU_SOURCE' CXXFLAGS='-fno-builtins -D_GNU_SOURCE'
GLIBCPP_CHECK_UNISTD_DECL_AND_LINKAGE_1(isatty) GLIBCPP_CHECK_UNISTD_DECL_AND_LINKAGE_1(isatty)
CXXFLAGS="$ac_save_CXXFLAGS" CXXFLAGS="$ac_save_CXXFLAGS"
]) ])
dnl dnl
dnl Check to see what the underlying c library or math library is like. dnl Check to see what the underlying c library or math library is like.
dnl These checks need to do two things: dnl These checks need to do two things:
dnl 1) make sure the name is declared when using the c++ compiler dnl 1) make sure the name is declared when using the c++ compiler
dnl 2) make sure the name has "C" linkage dnl 2) make sure the name has "C" linkage
dnl This might seem like overkill but experience has shown that it's not... dnl This might seem like overkill but experience has shown that it's not...
...@@ -898,7 +898,7 @@ AC_DEFUN(GLIBCPP_CHECK_MATH_SUPPORT, [ ...@@ -898,7 +898,7 @@ AC_DEFUN(GLIBCPP_CHECK_MATH_SUPPORT, [
dnl dnl
dnl Check to see if there is native support for complex dnl Check to see if there is native support for complex
dnl dnl
dnl Don't compile bits in math/* if native support exits. dnl Don't compile bits in math/* if native support exits.
dnl dnl
...@@ -914,7 +914,7 @@ AC_DEFUN(GLIBCPP_CHECK_COMPLEX_MATH_SUPPORT, [ ...@@ -914,7 +914,7 @@ AC_DEFUN(GLIBCPP_CHECK_COMPLEX_MATH_SUPPORT, [
AC_CHECK_FUNCS([__signbit], , [LIBMATHOBJS="$LIBMATHOBJS signbit.lo"]) AC_CHECK_FUNCS([__signbit], , [LIBMATHOBJS="$LIBMATHOBJS signbit.lo"])
AC_CHECK_FUNCS([__signbitf], , [LIBMATHOBJS="$LIBMATHOBJS signbitf.lo"]) AC_CHECK_FUNCS([__signbitf], , [LIBMATHOBJS="$LIBMATHOBJS signbitf.lo"])
dnl Compile the long double complex functions only if the function dnl Compile the long double complex functions only if the function
dnl provides the non-complex long double functions that are needed. dnl provides the non-complex long double functions that are needed.
dnl Currently this includes copysignl, which should be dnl Currently this includes copysignl, which should be
dnl cached from the GLIBCPP_CHECK_MATH_SUPPORT macro, above. dnl cached from the GLIBCPP_CHECK_MATH_SUPPORT macro, above.
...@@ -933,7 +933,7 @@ AC_DEFUN(GLIBCPP_CHECK_COMPLEX_MATH_SUPPORT, [ ...@@ -933,7 +933,7 @@ AC_DEFUN(GLIBCPP_CHECK_COMPLEX_MATH_SUPPORT, [
dnl Check to see what architecture and operating system we are compiling 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 for. Also, if architecture- or OS-specific flags are required for
dnl compilation, pick them up here. dnl compilation, pick them up here.
dnl dnl
dnl GLIBCPP_CHECK_TARGET dnl GLIBCPP_CHECK_TARGET
AC_DEFUN(GLIBCPP_CHECK_TARGET, [ AC_DEFUN(GLIBCPP_CHECK_TARGET, [
. [$]{glibcpp_basedir}/configure.target . [$]{glibcpp_basedir}/configure.target
...@@ -947,7 +947,7 @@ dnl Check to see if this target can enable the wchar_t parts of libstdc++. ...@@ -947,7 +947,7 @@ dnl Check to see if this target can enable the wchar_t parts of libstdc++.
dnl If --disable-c-mbchar was given, no wchar_t stuff is enabled. (This dnl If --disable-c-mbchar was given, no wchar_t stuff is enabled. (This
dnl must have been previously checked.) dnl must have been previously checked.)
dnl dnl
dnl Define _GLIBCPP_USE_WCHAR_T if all the bits are found dnl Define _GLIBCPP_USE_WCHAR_T if all the bits are found
dnl Define HAVE_MBSTATE_T if mbstate_t is not in wchar.h dnl Define HAVE_MBSTATE_T if mbstate_t is not in wchar.h
dnl dnl
dnl GLIBCPP_CHECK_WCHAR_T_SUPPORT dnl GLIBCPP_CHECK_WCHAR_T_SUPPORT
...@@ -957,7 +957,7 @@ AC_DEFUN(GLIBCPP_CHECK_WCHAR_T_SUPPORT, [ ...@@ -957,7 +957,7 @@ AC_DEFUN(GLIBCPP_CHECK_WCHAR_T_SUPPORT, [
dnl others even if wchar_t support is not on. dnl others even if wchar_t support is not on.
AC_MSG_CHECKING([for mbstate_t]) AC_MSG_CHECKING([for mbstate_t])
AC_TRY_COMPILE([#include <wchar.h>], AC_TRY_COMPILE([#include <wchar.h>],
[mbstate_t teststate;], [mbstate_t teststate;],
have_mbstate_t=yes, have_mbstate_t=no) have_mbstate_t=yes, have_mbstate_t=no)
AC_MSG_RESULT($have_mbstate_t) AC_MSG_RESULT($have_mbstate_t)
if test x"$have_mbstate_t" = xyes; then if test x"$have_mbstate_t" = xyes; then
...@@ -967,20 +967,20 @@ AC_DEFUN(GLIBCPP_CHECK_WCHAR_T_SUPPORT, [ ...@@ -967,20 +967,20 @@ AC_DEFUN(GLIBCPP_CHECK_WCHAR_T_SUPPORT, [
dnl Sanity check for existence of ISO C99 headers for extended encoding. 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_HEADERS(wchar.h, ac_has_wchar_h=yes, ac_has_wchar_h=no)
AC_CHECK_HEADERS(wctype.h, ac_has_wctype_h=yes, ac_has_wctype_h=no) AC_CHECK_HEADERS(wctype.h, ac_has_wctype_h=yes, ac_has_wctype_h=no)
dnl Only continue checking if the ISO C99 headers exist and support is on. dnl Only continue checking if the ISO C99 headers exist and support is on.
if test x"$ac_has_wchar_h" = xyes && if test x"$ac_has_wchar_h" = xyes &&
test x"$ac_has_wctype_h" = xyes && test x"$ac_has_wctype_h" = xyes &&
test x"$enable_c_mbchar" != xno; then test x"$enable_c_mbchar" != xno; then
dnl Test wchar.h for WCHAR_MIN, WCHAR_MAX, which is needed before dnl Test wchar.h for WCHAR_MIN, WCHAR_MAX, which is needed before
dnl numeric_limits can instantiate type_traits<wchar_t> dnl numeric_limits can instantiate type_traits<wchar_t>
AC_MSG_CHECKING([for WCHAR_MIN and WCHAR_MAX]) AC_MSG_CHECKING([for WCHAR_MIN and WCHAR_MAX])
AC_TRY_COMPILE([#include <wchar.h>], AC_TRY_COMPILE([#include <wchar.h>],
[int i = WCHAR_MIN; int j = WCHAR_MAX;], [int i = WCHAR_MIN; int j = WCHAR_MAX;],
has_wchar_minmax=yes, has_wchar_minmax=no) has_wchar_minmax=yes, has_wchar_minmax=no)
AC_MSG_RESULT($has_wchar_minmax) AC_MSG_RESULT($has_wchar_minmax)
dnl Test wchar.h for WEOF, which is what we use to determine whether dnl Test wchar.h for WEOF, which is what we use to determine whether
dnl to specialize for char_traits<wchar_t> or not. dnl to specialize for char_traits<wchar_t> or not.
AC_MSG_CHECKING([for WEOF]) AC_MSG_CHECKING([for WEOF])
...@@ -990,12 +990,12 @@ AC_DEFUN(GLIBCPP_CHECK_WCHAR_T_SUPPORT, [ ...@@ -990,12 +990,12 @@ AC_DEFUN(GLIBCPP_CHECK_WCHAR_T_SUPPORT, [
[wint_t i = WEOF;], [wint_t i = WEOF;],
has_weof=yes, has_weof=no) has_weof=yes, has_weof=no)
AC_MSG_RESULT($has_weof) AC_MSG_RESULT($has_weof)
dnl Tests for wide character functions used in char_traits<wchar_t>. dnl Tests for wide character functions used in char_traits<wchar_t>.
ac_wfuncs=yes ac_wfuncs=yes
AC_CHECK_FUNCS(wcslen wmemchr wmemcmp wmemcpy wmemmove wmemset,, \ AC_CHECK_FUNCS(wcslen wmemchr wmemcmp wmemcpy wmemmove wmemset,, \
ac_wfuncs=no) ac_wfuncs=no)
dnl Checks for names injected into std:: by the c_std headers. dnl Checks for names injected into std:: by the c_std headers.
AC_CHECK_FUNCS(btowc wctob fgetwc fgetwc fgetws fputwc fputws fwide \ AC_CHECK_FUNCS(btowc wctob fgetwc fgetwc fgetws fputwc fputws fwide \
fwprintf fwscanf swprintf swscanf vfwprintf vfwscanf vswprintf vswscanf \ fwprintf fwscanf swprintf swscanf vfwprintf vfwscanf vswprintf vswscanf \
...@@ -1014,8 +1014,8 @@ AC_DEFUN(GLIBCPP_CHECK_WCHAR_T_SUPPORT, [ ...@@ -1014,8 +1014,8 @@ AC_DEFUN(GLIBCPP_CHECK_WCHAR_T_SUPPORT, [
ac_isoC99_wchar_t=no ac_isoC99_wchar_t=no
fi fi
AC_MSG_RESULT($ac_isoC99_wchar_t) AC_MSG_RESULT($ac_isoC99_wchar_t)
dnl Use iconv for wchar_t to char conversions. As such, check for dnl Use iconv for wchar_t to char conversions. As such, check for
dnl X/Open Portability Guide, version 2 features (XPG2). 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(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) AC_CHECK_HEADER(langinfo.h, ac_has_langinfo_h=yes, ac_has_langinfo_h=no)
...@@ -1027,7 +1027,7 @@ AC_DEFUN(GLIBCPP_CHECK_WCHAR_T_SUPPORT, [ ...@@ -1027,7 +1027,7 @@ AC_DEFUN(GLIBCPP_CHECK_WCHAR_T_SUPPORT, [
AC_CHECK_FUNCS(iconv_open iconv_close iconv nl_langinfo, \ AC_CHECK_FUNCS(iconv_open iconv_close iconv nl_langinfo, \
ac_XPG2funcs=yes, ac_XPG2funcs=no) ac_XPG2funcs=yes, ac_XPG2funcs=no)
LIBS="$ac_save_LIBS" LIBS="$ac_save_LIBS"
AC_MSG_CHECKING([for XPG2 wchar_t support]) AC_MSG_CHECKING([for XPG2 wchar_t support])
...@@ -1039,7 +1039,7 @@ AC_DEFUN(GLIBCPP_CHECK_WCHAR_T_SUPPORT, [ ...@@ -1039,7 +1039,7 @@ AC_DEFUN(GLIBCPP_CHECK_WCHAR_T_SUPPORT, [
ac_XPG2_wchar_t=no ac_XPG2_wchar_t=no
fi fi
AC_MSG_RESULT($ac_XPG2_wchar_t) AC_MSG_RESULT($ac_XPG2_wchar_t)
dnl At the moment, only enable wchar_t specializations if all the dnl At the moment, only enable wchar_t specializations if all the
dnl above support is present. dnl above support is present.
AC_MSG_CHECKING([for enabled wchar_t specializations]) AC_MSG_CHECKING([for enabled wchar_t specializations])
...@@ -1051,7 +1051,7 @@ AC_DEFUN(GLIBCPP_CHECK_WCHAR_T_SUPPORT, [ ...@@ -1051,7 +1051,7 @@ AC_DEFUN(GLIBCPP_CHECK_WCHAR_T_SUPPORT, [
AC_MSG_RESULT("no") AC_MSG_RESULT("no")
fi fi
else else
dnl Wide characters disabled by the user. dnl Wide characters disabled by the user.
AC_MSG_WARN([wchar_t support disabled.]) AC_MSG_WARN([wchar_t support disabled.])
fi fi
]) ])
...@@ -1062,11 +1062,11 @@ dnl Check to see if debugging libraries are to be built. ...@@ -1062,11 +1062,11 @@ dnl Check to see if debugging libraries are to be built.
dnl dnl
dnl GLIBCPP_ENABLE_DEBUG dnl GLIBCPP_ENABLE_DEBUG
dnl dnl
dnl --enable-debug dnl --enable-debug
dnl builds a separate set of debugging libraries in addition to the dnl builds a separate set of debugging libraries in addition to the
dnl normal (shared, static) libstdc++ binaries. dnl normal (shared, static) libstdc++ binaries.
dnl dnl
dnl --disable-debug dnl --disable-debug
dnl builds only one (non-debug) version of libstdc++. dnl builds only one (non-debug) version of libstdc++.
dnl dnl
dnl --enable-debug-flags=FLAGS dnl --enable-debug-flags=FLAGS
...@@ -1089,7 +1089,7 @@ changequote([, ])dnl ...@@ -1089,7 +1089,7 @@ changequote([, ])dnl
enable_debug=GLIBCPP_ENABLE_DEBUG_DEFAULT)dnl enable_debug=GLIBCPP_ENABLE_DEBUG_DEFAULT)dnl
AC_MSG_CHECKING([for additional debug build]) AC_MSG_CHECKING([for additional debug build])
AC_MSG_RESULT($enable_debug) AC_MSG_RESULT($enable_debug)
AM_CONDITIONAL(GLIBCPP_BUILD_DEBUG, test "$enable_debug" = yes) AM_CONDITIONAL(GLIBCPP_BUILD_DEBUG, test "$enable_debug" = yes)
]) ])
...@@ -1097,8 +1097,8 @@ dnl Check for explicit debug flags. ...@@ -1097,8 +1097,8 @@ dnl Check for explicit debug flags.
dnl dnl
dnl GLIBCPP_ENABLE_DEBUG_FLAGS dnl GLIBCPP_ENABLE_DEBUG_FLAGS
dnl dnl
dnl --enable-debug-flags='-O1' dnl --enable-debug-flags='-O1'
dnl is a general method for passing flags to be used when dnl is a general method for passing flags to be used when
dnl building debug libraries with --enable-debug. dnl building debug libraries with --enable-debug.
dnl dnl
dnl --disable-debug-flags does nothing. dnl --disable-debug-flags does nothing.
...@@ -1109,7 +1109,7 @@ AC_DEFUN(GLIBCPP_ENABLE_DEBUG_FLAGS, [dnl ...@@ -1109,7 +1109,7 @@ AC_DEFUN(GLIBCPP_ENABLE_DEBUG_FLAGS, [dnl
define([GLIBCPP_ENABLE_DEBUG_FLAGS_DEFAULT], ifelse($1,,, $1))dnl define([GLIBCPP_ENABLE_DEBUG_FLAGS_DEFAULT], ifelse($1,,, $1))dnl
AC_ARG_ENABLE(debug_flags, AC_ARG_ENABLE(debug_flags,
changequote(<<, >>)dnl changequote(<<, >>)dnl
<< --enable-debug-flags=FLAGS pass compiler FLAGS when building debug << --enable-debug-flags=FLAGS pass compiler FLAGS when building debug
library;[default=>>GLIBCPP_ENABLE_DEBUG_FLAGS_DEFAULT], library;[default=>>GLIBCPP_ENABLE_DEBUG_FLAGS_DEFAULT],
changequote([, ])dnl changequote([, ])dnl
[case "${enableval}" in [case "${enableval}" in
...@@ -1121,15 +1121,15 @@ enable_debug_flags=GLIBCPP_ENABLE_DEBUG_FLAGS_DEFAULT)dnl ...@@ -1121,15 +1121,15 @@ enable_debug_flags=GLIBCPP_ENABLE_DEBUG_FLAGS_DEFAULT)dnl
dnl Option parsed, now set things appropriately dnl Option parsed, now set things appropriately
case x"$enable_debug" in case x"$enable_debug" in
xyes) xyes)
case "$enable_debug_flags" in case "$enable_debug_flags" in
none) none)
DEBUG_FLAGS="-g3 -O0";; DEBUG_FLAGS="-g3 -O0";;
-*) #valid input -*) #valid input
DEBUG_FLAGS="${enableval}" DEBUG_FLAGS="${enableval}"
esac esac
;; ;;
xno) xno)
DEBUG_FLAGS="" DEBUG_FLAGS=""
;; ;;
esac esac
...@@ -1157,21 +1157,21 @@ dnl If "default flags" is an empty string (or "none"), the effect is ...@@ -1157,21 +1157,21 @@ dnl If "default flags" is an empty string (or "none"), the effect is
dnl the same as --disable or --enable=no. dnl the same as --disable or --enable=no.
AC_DEFUN(GLIBCPP_ENABLE_CXX_FLAGS, [dnl AC_DEFUN(GLIBCPP_ENABLE_CXX_FLAGS, [dnl
define([GLIBCPP_ENABLE_CXX_FLAGS_DEFAULT], ifelse($1,,, $1))dnl define([GLIBCPP_ENABLE_CXX_FLAGS_DEFAULT], ifelse($1,,, $1))dnl
AC_MSG_CHECKING([for extra compiler flags for building])
AC_ARG_ENABLE(cxx_flags, AC_ARG_ENABLE(cxx_flags,
changequote(<<, >>)dnl changequote(<<, >>)dnl
<< --enable-cxx-flags=FLAGS pass compiler FLAGS when building library; << --enable-cxx-flags=FLAGS pass compiler FLAGS when building library;
[default=>>GLIBCPP_ENABLE_CXX_FLAGS_DEFAULT], [default=>>GLIBCPP_ENABLE_CXX_FLAGS_DEFAULT],
changequote([, ])dnl changequote([, ])dnl
enable_cxx_flags='GLIBCPP_ENABLE_CXX_FLAGS_DEFAULT') [case "x$enable_cxx_flags" in
xyes)
case "x$enable_cxx_flags" in AC_MSG_ERROR([--enable-cxx-flags needs compiler flags as arguments]) ;;
xyes) xno | xnone | x)
AC_MSG_ERROR([--enable-cxx-flags needs compiler flags as arguments]) ;; enable_cxx_flags='' ;;
xno | xnone | x) *)
enable_cxx_flags='' ;; enable_cxx_flags="$enableval" ;;
*) esac],
enable_cxx_flags="$enableval" ;; enable_cxx_flags=GLIBCPP_ENABLE_CXX_FLAGS_DEFAULT)
esac
dnl Run through flags (either default or command-line) and set anything dnl Run through flags (either default or command-line) and set anything
dnl extra (e.g., #defines) that must accompany particular g++ options. dnl extra (e.g., #defines) that must accompany particular g++ options.
...@@ -1186,6 +1186,7 @@ if test -n "$enable_cxx_flags"; then ...@@ -1186,6 +1186,7 @@ if test -n "$enable_cxx_flags"; then
done done
fi fi
EXTRA_CXX_FLAGS="$enable_cxx_flags" EXTRA_CXX_FLAGS="$enable_cxx_flags"
AC_MSG_RESULT($EXTRA_CXX_FLAGS)
AC_SUBST(EXTRA_CXX_FLAGS) AC_SUBST(EXTRA_CXX_FLAGS)
]) ])
...@@ -1196,15 +1197,15 @@ dnl ...@@ -1196,15 +1197,15 @@ dnl
dnl GLIBCPP_ENABLE_CLOCALE dnl GLIBCPP_ENABLE_CLOCALE
dnl --enable-clocale=gnu sets config/locale/c_locale_gnu.cc and friends 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 dnl --enable-clocale=generic sets config/locale/c_locale_generic.cc and friends
dnl dnl
dnl default is generic dnl default is generic
dnl dnl
AC_DEFUN(GLIBCPP_ENABLE_CLOCALE, [ AC_DEFUN(GLIBCPP_ENABLE_CLOCALE, [
AC_MSG_CHECKING([for clocale to use]) AC_MSG_CHECKING([for clocale to use])
AC_ARG_ENABLE(clocale, AC_ARG_ENABLE(clocale,
[ --enable-clocale enable model for target locale package. [ --enable-clocale enable model for target locale package.
--enable-clocale=MODEL use MODEL target-speific locale package. [default=generic] --enable-clocale=MODEL use MODEL target-speific locale package. [default=generic]
], ],
if test x$enable_clocale = xno; then if test x$enable_clocale = xno; then
enable_clocale=no enable_clocale=no
fi, fi,
...@@ -1219,7 +1220,7 @@ AC_DEFUN(GLIBCPP_ENABLE_CLOCALE, [ ...@@ -1219,7 +1220,7 @@ AC_DEFUN(GLIBCPP_ENABLE_CLOCALE, [
xlinux* | xgnu*) xlinux* | xgnu*)
AC_EGREP_CPP([_GLIBCPP_ok], [ AC_EGREP_CPP([_GLIBCPP_ok], [
#include <features.h> #include <features.h>
#if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) #if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2)
_GLIBCPP_ok _GLIBCPP_ok
#endif #endif
], enable_clocale_flag=gnu, enable_clocale_flag=generic) ], enable_clocale_flag=gnu, enable_clocale_flag=generic)
...@@ -1249,7 +1250,7 @@ AC_DEFUN(GLIBCPP_ENABLE_CLOCALE, [ ...@@ -1249,7 +1250,7 @@ AC_DEFUN(GLIBCPP_ENABLE_CLOCALE, [
j = __strcoll_l(__one, __two, loc_dup); j = __strcoll_l(__one, __two, loc_dup);
return 0; return 0;
} }
], ],
[enable_clocale_flag=gnu],[enable_clocale_flag=generic], [enable_clocale_flag=gnu],[enable_clocale_flag=generic],
[enable_clocale_flag=generic]) [enable_clocale_flag=generic])
fi fi
...@@ -1368,15 +1369,15 @@ dnl Check for which I/O library to use: libio, or something specific. ...@@ -1368,15 +1369,15 @@ dnl Check for which I/O library to use: libio, or something specific.
dnl dnl
dnl GLIBCPP_ENABLE_CSTDIO dnl GLIBCPP_ENABLE_CSTDIO
dnl --enable-cstdio=libio sets config/io/c_io_libio.h and friends dnl --enable-cstdio=libio sets config/io/c_io_libio.h and friends
dnl dnl
dnl default is stdio dnl default is stdio
dnl dnl
AC_DEFUN(GLIBCPP_ENABLE_CSTDIO, [ AC_DEFUN(GLIBCPP_ENABLE_CSTDIO, [
AC_MSG_CHECKING([for cstdio to use]) AC_MSG_CHECKING([for cstdio to use])
AC_ARG_ENABLE(cstdio, AC_ARG_ENABLE(cstdio,
[ --enable-cstdio enable stdio for target io package. [ --enable-cstdio enable stdio for target io package.
--enable-cstdio=LIB use LIB target-speific io package. [default=stdio] --enable-cstdio=LIB use LIB target-speific io package. [default=stdio]
], ],
if test x$enable_cstdio = xno; then if test x$enable_cstdio = xno; then
enable_cstdio=stdio enable_cstdio=stdio
fi, fi,
...@@ -1396,7 +1397,7 @@ AC_DEFUN(GLIBCPP_ENABLE_CSTDIO, [ ...@@ -1396,7 +1397,7 @@ AC_DEFUN(GLIBCPP_ENABLE_CSTDIO, [
AC_CHECK_HEADER(libio.h, has_libio=yes, has_libio=no) AC_CHECK_HEADER(libio.h, has_libio=yes, has_libio=no)
# Need to check and see what version of glibc is being used. If # 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 # it's not glibc-2.2 or higher, then we'll need to go ahead and
# compile most of libio for linux systems. # compile most of libio for linux systems.
if test x$has_libio = x"yes"; then if test x$has_libio = x"yes"; then
case "$target" in case "$target" in
...@@ -1404,7 +1405,7 @@ AC_DEFUN(GLIBCPP_ENABLE_CSTDIO, [ ...@@ -1404,7 +1405,7 @@ AC_DEFUN(GLIBCPP_ENABLE_CSTDIO, [
AC_MSG_CHECKING([for glibc version >= 2.2]) AC_MSG_CHECKING([for glibc version >= 2.2])
AC_EGREP_CPP([ok], [ AC_EGREP_CPP([ok], [
#include <features.h> #include <features.h>
#if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) #if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2)
ok ok
#endif #endif
], glibc_satisfactory=yes, glibc_satisfactory=no) ], glibc_satisfactory=yes, glibc_satisfactory=no)
...@@ -1414,11 +1415,11 @@ AC_DEFUN(GLIBCPP_ENABLE_CSTDIO, [ ...@@ -1414,11 +1415,11 @@ AC_DEFUN(GLIBCPP_ENABLE_CSTDIO, [
# XXX at the moment, admit defeat and force the recompilation # XXX at the moment, admit defeat and force the recompilation
# XXX of glibc even on glibc-2.2 systems, because libio is not synched. # XXX of glibc even on glibc-2.2 systems, because libio is not synched.
glibc_satisfactory=no glibc_satisfactory=no
if test x$glibc_satisfactory = x"yes"; then if test x$glibc_satisfactory = x"yes"; then
need_libio=no need_libio=no
need_wlibio=no need_wlibio=no
else else
need_libio=yes need_libio=yes
# bkoz XXX need to add checks to enable this # bkoz XXX need to add checks to enable this
...@@ -1542,7 +1543,7 @@ void foo() ...@@ -1542,7 +1543,7 @@ void foo()
bar(); bar();
} }
EOF EOF
old_CXXFLAGS="$CXXFLAGS" old_CXXFLAGS="$CXXFLAGS"
CXXFLAGS=-S CXXFLAGS=-S
if AC_TRY_EVAL(ac_compile); then if AC_TRY_EVAL(ac_compile); then
if grep _Unwind_SjLj_Resume conftest.s >/dev/null 2>&1 ; then if grep _Unwind_SjLj_Resume conftest.s >/dev/null 2>&1 ; then
...@@ -1621,7 +1622,7 @@ AC_DEFUN(GLIBCPP_ENABLE_C99, [dnl ...@@ -1621,7 +1622,7 @@ AC_DEFUN(GLIBCPP_ENABLE_C99, [dnl
*) AC_MSG_ERROR([Unknown argument to enable/disable C99]) ;; *) AC_MSG_ERROR([Unknown argument to enable/disable C99]) ;;
esac], esac],
enable_c99=GLIBCPP_ENABLE_C99_DEFAULT)dnl enable_c99=GLIBCPP_ENABLE_C99_DEFAULT)dnl
AC_LANG_SAVE AC_LANG_SAVE
AC_LANG_CPLUSPLUS AC_LANG_CPLUSPLUS
...@@ -1680,8 +1681,8 @@ AC_DEFUN(GLIBCPP_ENABLE_C99, [dnl ...@@ -1680,8 +1681,8 @@ AC_DEFUN(GLIBCPP_ENABLE_C99, [dnl
ac_c99_stdlib=yes; ac_c99_stdlib=yes;
AC_MSG_CHECKING([for lldiv_t declaration]) AC_MSG_CHECKING([for lldiv_t declaration])
AC_CACHE_VAL(ac_c99_lldiv_t, [ AC_CACHE_VAL(ac_c99_lldiv_t, [
AC_TRY_COMPILE([#include <stdlib.h>], AC_TRY_COMPILE([#include <stdlib.h>],
[ lldiv_t mydivt;], [ lldiv_t mydivt;],
[ac_c99_lldiv_t=yes], [ac_c99_lldiv_t=no]) [ac_c99_lldiv_t=yes], [ac_c99_lldiv_t=no])
]) ])
AC_MSG_RESULT($ac_c99_lldiv_t) AC_MSG_RESULT($ac_c99_lldiv_t)
...@@ -1696,19 +1697,19 @@ AC_DEFUN(GLIBCPP_ENABLE_C99, [dnl ...@@ -1696,19 +1697,19 @@ AC_DEFUN(GLIBCPP_ENABLE_C99, [dnl
AC_TRY_COMPILE([#include <stdlib.h>], [atoll("10");],, [ac_c99_stdlib=no]) AC_TRY_COMPILE([#include <stdlib.h>], [atoll("10");],, [ac_c99_stdlib=no])
AC_TRY_COMPILE([#include <stdlib.h>], [_Exit(0);],, [ac_c99_stdlib=no]) AC_TRY_COMPILE([#include <stdlib.h>], [_Exit(0);],, [ac_c99_stdlib=no])
if test x"$ac_c99_lldiv_t" = x"no"; then if test x"$ac_c99_lldiv_t" = x"no"; then
ac_c99_stdlib=no; ac_c99_stdlib=no;
fi; fi;
AC_MSG_RESULT($ac_c99_stdlib) AC_MSG_RESULT($ac_c99_stdlib)
# Check for the existence of <wchar.h> functions used if C99 is enabled. # Check for the existence of <wchar.h> functions used if C99 is enabled.
# XXX the wchar.h checks should be rolled into the general C99 bits. # XXX the wchar.h checks should be rolled into the general C99 bits.
ac_c99_wchar=yes; ac_c99_wchar=yes;
AC_MSG_CHECKING([for additional ISO C99 support in <wchar.h>]) AC_MSG_CHECKING([for additional ISO C99 support in <wchar.h>])
AC_TRY_COMPILE([#include <wchar.h>], AC_TRY_COMPILE([#include <wchar.h>],
[wcstold(L"10.0", NULL);],, [ac_c99_wchar=no]) [wcstold(L"10.0", NULL);],, [ac_c99_wchar=no])
AC_TRY_COMPILE([#include <wchar.h>], AC_TRY_COMPILE([#include <wchar.h>],
[wcstoll(L"10", NULL, 10);],, [ac_c99_wchar=no]) [wcstoll(L"10", NULL, 10);],, [ac_c99_wchar=no])
AC_TRY_COMPILE([#include <wchar.h>], AC_TRY_COMPILE([#include <wchar.h>],
[wcstoull(L"10", NULL, 10);],, [ac_c99_wchar=no]) [wcstoull(L"10", NULL, 10);],, [ac_c99_wchar=no])
AC_MSG_RESULT($ac_c99_wchar) AC_MSG_RESULT($ac_c99_wchar)
...@@ -1717,8 +1718,8 @@ AC_DEFUN(GLIBCPP_ENABLE_C99, [dnl ...@@ -1717,8 +1718,8 @@ AC_DEFUN(GLIBCPP_ENABLE_C99, [dnl
test x"$ac_c99_stdio" = x"no" || test x"$ac_c99_stdio" = x"no" ||
test x"$ac_c99_stdlib" = x"no" || test x"$ac_c99_stdlib" = x"no" ||
test x"$ac_c99_wchar" = x"no"; then test x"$ac_c99_wchar" = x"no"; then
enable_c99=no; enable_c99=no;
fi; fi;
AC_MSG_RESULT($enable_c99) AC_MSG_RESULT($enable_c99)
# Option parsed, now set things appropriately # Option parsed, now set things appropriately
...@@ -1795,13 +1796,13 @@ changequote(<<, >>)dnl ...@@ -1795,13 +1796,13 @@ changequote(<<, >>)dnl
<< --enable-cheaders=MODEL construct "C" header files for g++ [default=>>GLIBCPP_ENABLE_CHEADERS_DEFAULT], << --enable-cheaders=MODEL construct "C" header files for g++ [default=>>GLIBCPP_ENABLE_CHEADERS_DEFAULT],
changequote([, ]) changequote([, ])
[case "$enableval" in [case "$enableval" in
c) c)
enable_cheaders=c enable_cheaders=c
;; ;;
c_std) c_std)
enable_cheaders=c_std enable_cheaders=c_std
;; ;;
*) AC_MSG_ERROR([Unknown argument to enable/disable "C" headers]) *) AC_MSG_ERROR([Unknown argument to enable/disable "C" headers])
;; ;;
esac], esac],
enable_cheaders=GLIBCPP_ENABLE_CHEADERS_DEFAULT) enable_cheaders=GLIBCPP_ENABLE_CHEADERS_DEFAULT)
...@@ -1809,10 +1810,10 @@ changequote([, ]) ...@@ -1809,10 +1810,10 @@ changequote([, ])
dnl Option parsed, now set things appropriately dnl Option parsed, now set things appropriately
case "$enable_cheaders" in case "$enable_cheaders" in
c_std) c_std)
C_INCLUDE_DIR='${glibcpp_srcdir}/include/c_std' C_INCLUDE_DIR='${glibcpp_srcdir}/include/c_std'
;; ;;
c) c)
C_INCLUDE_DIR='${glibcpp_srcdir}/include/c' C_INCLUDE_DIR='${glibcpp_srcdir}/include/c'
;; ;;
esac esac
...@@ -1890,8 +1891,8 @@ dnl Set up *_FLAGS and *FLAGS variables for all sundry Makefile.am's. ...@@ -1890,8 +1891,8 @@ dnl Set up *_FLAGS and *FLAGS variables for all sundry Makefile.am's.
dnl dnl
AC_DEFUN(GLIBCPP_EXPORT_FLAGS, [ AC_DEFUN(GLIBCPP_EXPORT_FLAGS, [
# Optimization flags that are probably a good idea for thrill-seekers. Just # Optimization flags that are probably a good idea for thrill-seekers. Just
# uncomment the lines below and make, everything else is ready to go... # uncomment the lines below and make, everything else is ready to go...
# OPTIMIZE_CXXFLAGS = -O3 -fstrict-aliasing -fvtable-gc # OPTIMIZE_CXXFLAGS = -O3 -fstrict-aliasing -fvtable-gc
OPTIMIZE_CXXFLAGS= OPTIMIZE_CXXFLAGS=
AC_SUBST(OPTIMIZE_CXXFLAGS) AC_SUBST(OPTIMIZE_CXXFLAGS)
...@@ -1967,7 +1968,7 @@ fi ...@@ -1967,7 +1968,7 @@ fi
# Calculate glibcpp_toolexecdir, glibcpp_toolexeclibdir # Calculate glibcpp_toolexecdir, glibcpp_toolexeclibdir
# Install a library built with a cross compiler in tooldir, not libdir. # Install a library built with a cross compiler in tooldir, not libdir.
if test x"$glibcpp_toolexecdir" = x"no"; then if test x"$glibcpp_toolexecdir" = x"no"; then
if test -n "$with_cross_host" && if test -n "$with_cross_host" &&
test x"$with_cross_host" != x"no"; then test x"$with_cross_host" != x"no"; then
glibcpp_toolexecdir='$(exec_prefix)/$(target_alias)' glibcpp_toolexecdir='$(exec_prefix)/$(target_alias)'
...@@ -2103,8 +2104,8 @@ AC_DEFUN(GLIBCPP_CHECK_SETRLIMIT, [ ...@@ -2103,8 +2104,8 @@ AC_DEFUN(GLIBCPP_CHECK_SETRLIMIT, [
AC_TRY_COMPILE([#include <unistd.h> AC_TRY_COMPILE([#include <unistd.h>
#include <sys/time.h> #include <sys/time.h>
#include <sys/resource.h> #include <sys/resource.h>
], ],
[ struct rlimit r; setrlimit(0, &r);], [ struct rlimit r; setrlimit(0, &r);],
[ac_setrlimit=yes], [ac_setrlimit=no]) [ac_setrlimit=yes], [ac_setrlimit=no])
]) ])
fi fi
...@@ -2232,9 +2233,9 @@ changequote([, ])dnl ...@@ -2232,9 +2233,9 @@ changequote([, ])dnl
enable_symvers=GLIBCPP_ENABLE_SYMVERS_DEFAULT)dnl enable_symvers=GLIBCPP_ENABLE_SYMVERS_DEFAULT)dnl
# If we never went through the GLIBCPP_CHECK_LINKER_FEATURES macro, then we # If we never went through the GLIBCPP_CHECK_LINKER_FEATURES macro, then we
# don't know enough about $LD to do tricks... # don't know enough about $LD to do tricks...
if test x$enable_shared = xno || if test x$enable_shared = xno ||
test "x$LD" = x || test "x$LD" = x ||
test x$glibcpp_gnu_ld_version = x; then test x$glibcpp_gnu_ld_version = x; then
enable_symvers=no enable_symvers=no
fi fi
...@@ -2254,7 +2255,7 @@ fi ...@@ -2254,7 +2255,7 @@ fi
glibcpp_min_gnu_ld_version=21200 glibcpp_min_gnu_ld_version=21200
# Check to see if unspecified "yes" value can win, given results # Check to see if unspecified "yes" value can win, given results
# above. # above.
if test $enable_symvers = yes ; then if test $enable_symvers = yes ; then
if test $with_gnu_ld = yes && if test $with_gnu_ld = yes &&
test $glibcpp_shared_libgcc = yes ; test $glibcpp_shared_libgcc = yes ;
...@@ -2291,7 +2292,7 @@ case $enable_symvers in ...@@ -2291,7 +2292,7 @@ case $enable_symvers in
;; ;;
gnu) gnu)
SYMVER_MAP=config/linker-map.gnu SYMVER_MAP=config/linker-map.gnu
AC_DEFINE(_GLIBCPP_SYMVER) AC_DEFINE(_GLIBCPP_SYMVER)
;; ;;
esac esac
...@@ -2302,7 +2303,7 @@ AC_MSG_RESULT($enable_symvers) ...@@ -2302,7 +2303,7 @@ AC_MSG_RESULT($enable_symvers)
]) ])
# isc-posix.m4 serial 1 (gettext-0.10.40) # isc-posix.m4 serial 2 (gettext-0.11.2)
dnl Copyright (C) 1995-2002 Free Software Foundation, Inc. dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
dnl This file is free software, distributed under the terms of the GNU dnl This file is free software, distributed under the terms of the GNU
dnl General Public License. As a special exception to the GNU General dnl General Public License. As a special exception to the GNU General
...@@ -2310,6 +2311,8 @@ dnl Public License, this file may be distributed as part of a program ...@@ -2310,6 +2311,8 @@ dnl Public License, this file may be distributed as part of a program
dnl that contains a configuration script generated by Autoconf, under dnl that contains a configuration script generated by Autoconf, under
dnl the same distribution terms as the rest of that program. dnl the same distribution terms as the rest of that program.
# This file is not needed with autoconf-2.53 and newer. Remove it in 2005.
# This test replaces the one in autoconf. # This test replaces the one in autoconf.
# Currently this macro should have the same name as the autoconf macro # Currently this macro should have the same name as the autoconf macro
# because gettext's gettext.m4 (distributed in the automake package) # because gettext's gettext.m4 (distributed in the automake package)
...@@ -2370,7 +2373,8 @@ dnl Usage: ...@@ -2370,7 +2373,8 @@ dnl Usage:
dnl AM_INIT_AUTOMAKE(package,version, [no-define]) dnl AM_INIT_AUTOMAKE(package,version, [no-define])
AC_DEFUN([AM_INIT_AUTOMAKE], AC_DEFUN([AM_INIT_AUTOMAKE],
[AC_REQUIRE([AC_PROG_INSTALL]) [AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
AC_REQUIRE([AC_PROG_INSTALL])
PACKAGE=[$1] PACKAGE=[$1]
AC_SUBST(PACKAGE) AC_SUBST(PACKAGE)
VERSION=[$2] VERSION=[$2]
...@@ -2386,13 +2390,42 @@ AC_REQUIRE([AM_SANITY_CHECK]) ...@@ -2386,13 +2390,42 @@ AC_REQUIRE([AM_SANITY_CHECK])
AC_REQUIRE([AC_ARG_PROGRAM]) AC_REQUIRE([AC_ARG_PROGRAM])
dnl FIXME This is truly gross. dnl FIXME This is truly gross.
missing_dir=`cd $ac_aux_dir && pwd` missing_dir=`cd $ac_aux_dir && pwd`
AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir) AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir)
AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir) AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir) AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir)
AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir) AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir) AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
AC_REQUIRE([AC_PROG_MAKE_SET])]) AC_REQUIRE([AC_PROG_MAKE_SET])])
# Copyright 2002 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
# AM_AUTOMAKE_VERSION(VERSION)
# ----------------------------
# Automake X.Y traces this macro to ensure aclocal.m4 has been
# generated from the m4 files accompanying Automake X.Y.
AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"])
# AM_SET_CURRENT_AUTOMAKE_VERSION
# -------------------------------
# Call AM_AUTOMAKE_VERSION so it can be traced.
# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
[AM_AUTOMAKE_VERSION([1.4-p6])])
# #
# Check to make sure that the build environment is sane. # Check to make sure that the build environment is sane.
# #
......
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment