From c7bbbdd036d3dd7ae253fb13c9994215af06f073 Mon Sep 17 00:00:00 2001 From: kan Date: Fri, 11 Jul 2003 03:42:04 +0000 Subject: Gcc 3.3.1-pre 2003-07-11 C++ support bits. --- contrib/libstdc++/aclocal.m4 | 301 +++++++++++++++++++++++++++---------------- 1 file changed, 192 insertions(+), 109 deletions(-) (limited to 'contrib/libstdc++/aclocal.m4') diff --git a/contrib/libstdc++/aclocal.m4 b/contrib/libstdc++/aclocal.m4 index ef2d3a7..ecc43b4 100644 --- a/contrib/libstdc++/aclocal.m4 +++ b/contrib/libstdc++/aclocal.m4 @@ -11,7 +11,7 @@ dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A dnl PARTICULAR PURPOSE. dnl -dnl Initialize configure bits. +dnl Initialize basic configure bits, set toplevel_srcdir for Makefiles. dnl dnl GLIBCPP_TOPREL_CONFIGURE AC_DEFUN(GLIBCPP_TOPREL_CONFIGURE, [ @@ -49,13 +49,10 @@ AC_DEFUN(GLIBCPP_TOPREL_CONFIGURE, [ ]) dnl -dnl Initialize configure bits. +dnl Initialize the rest of the library configury. dnl dnl GLIBCPP_CONFIGURE AC_DEFUN(GLIBCPP_CONFIGURE, [ - -#possibly test for the presence of the compiler sources here? - # 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 @@ -282,8 +279,7 @@ AC_DEFUN(GLIBCPP_CHECK_COMPILER_FEATURES, [ # this is the suspicious part CXXFLAGS='' fi - if test x"$ac_fdsections" = x"yes" && - test x"$enable_debug" = x"no"; then + if test x"$ac_fdsections" = x"yes"; then SECTION_FLAGS='-ffunction-sections -fdata-sections' fi AC_MSG_RESULT($ac_fdsections) @@ -376,7 +372,7 @@ AC_DEFUN(GLIBCPP_CHECK_LINKER_FEATURES, [ fi # Set linker optimization flags. - if test x"$with_gnu_ld" = x"yes" && test x"$enable_debug" = x"no"; then + if test x"$with_gnu_ld" = x"yes"; then OPT_LDFLAGS="-Wl,-O1 $OPT_LDFLAGS" fi @@ -744,7 +740,6 @@ AC_DEFUN(GLIBCPP_CHECK_BUILTIN_MATH_SUPPORT, [ fi ]) - dnl dnl Check to see what the underlying c library is like dnl These checks need to do two things: @@ -760,7 +755,7 @@ 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' + CXXFLAGS='-fno-builtin -D_GNU_SOURCE' GLIBCPP_CHECK_STDLIB_DECL_AND_LINKAGE_2(strtold) GLIBCPP_CHECK_STDLIB_DECL_AND_LINKAGE_2(strtof) @@ -802,7 +797,7 @@ dnl GLIBCPP_CHECK_MATH_SUPPORT AC_DEFUN(GLIBCPP_CHECK_MATH_SUPPORT, [ ac_test_CXXFLAGS="${CXXFLAGS+set}" ac_save_CXXFLAGS="$CXXFLAGS" - CXXFLAGS='-fno-builtins -D_GNU_SOURCE' + CXXFLAGS='-fno-builtin -D_GNU_SOURCE' dnl Check libm AC_CHECK_LIB(m, sin, libm="-lm") @@ -927,7 +922,11 @@ AC_DEFUN(GLIBCPP_CHECK_COMPLEX_MATH_SUPPORT, [ AC_CHECK_FUNCS([__signbitl], , [LIBMATHOBJS="$LIBMATHOBJS signbitl.lo"]) fi + if test -n "$LIBMATHOBJS"; then + need_libmath=yes + fi AC_SUBST(LIBMATHOBJS) + AM_CONDITIONAL(GLIBCPP_BUILD_LIBMATH, test "$need_libmath" = yes) ]) @@ -937,9 +936,9 @@ dnl compilation, pick them up here. dnl 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) + . [$]{glibcpp_basedir}/configure.target + AC_MSG_RESULT(CPU config directory is $cpu_include_dir) + AC_MSG_RESULT(OS config directory is $os_include_dir) ]) @@ -953,6 +952,8 @@ dnl Define HAVE_MBSTATE_T if mbstate_t is not in wchar.h dnl dnl GLIBCPP_CHECK_WCHAR_T_SUPPORT AC_DEFUN(GLIBCPP_CHECK_WCHAR_T_SUPPORT, [ + dnl Wide characters disabled by default. + enable_wchar_t=no dnl Test wchar.h for mbstate_t, which is needed for char_traits and dnl others even if wchar_t support is not on. @@ -998,7 +999,7 @@ AC_DEFUN(GLIBCPP_CHECK_WCHAR_T_SUPPORT, [ ac_wfuncs=no) 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 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 \ @@ -1043,30 +1044,33 @@ AC_DEFUN(GLIBCPP_CHECK_WCHAR_T_SUPPORT, [ 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]) if test x"$ac_isoC99_wchar_t" = xyes && test x"$ac_XPG2_wchar_t" = xyes; then - AC_DEFINE(_GLIBCPP_USE_WCHAR_T) - AC_MSG_RESULT("yes") - else - AC_MSG_RESULT("no") + AC_DEFINE(_GLIBCPP_USE_WCHAR_T) + enable_wchar_t=yes fi - else - dnl Wide characters disabled by the user. - AC_MSG_WARN([wchar_t support disabled.]) fi + AC_MSG_CHECKING([for enabled wchar_t specializations]) + AC_MSG_RESULT($enable_wchar_t) + AM_CONDITIONAL(GLIBCPP_TEST_WCHAR_T, test "$enable_wchar_t" = yes) ]) dnl -dnl Check for special debugging mode; not for production use. +dnl Check to see if debugging libraries are to be built. dnl dnl GLIBCPP_ENABLE_DEBUG -dnl --enable-debug sets '-ggdb3 -O0'. -dnl --disable-debug sets '-g' and whatever optimization options the -dnl compiler can handle. -dnl + --enable-maintainer-mode automatically defaults this to on. -dnl + Perhaps -D/-U of NDEBUG, DEBUG, DEBUG_ASSERT, ...? +dnl +dnl --enable-debug +dnl builds a separate set of debugging libraries in addition to the +dnl normal (shared, static) libstdc++ binaries. +dnl +dnl --disable-debug +dnl builds only one (non-debug) version of libstdc++. +dnl +dnl --enable-debug-flags=FLAGS +dnl iff --enable-debug == yes, then use FLAGS to build the debug library. +dnl dnl + Usage: GLIBCPP_ENABLE_DEBUG[(DEFAULT)] dnl Where DEFAULT is either `yes' or `no'. If ommitted, it dnl defaults to `no'. @@ -1074,7 +1078,7 @@ 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], +<< --enable-debug build extra debug library [default=>>GLIBCPP_ENABLE_DEBUG_DEFAULT], changequote([, ])dnl [case "${enableval}" in yes) enable_debug=yes ;; @@ -1082,17 +1086,56 @@ changequote([, ])dnl *) AC_MSG_ERROR([Unknown argument to enable/disable extra debugging]) ;; esac], enable_debug=GLIBCPP_ENABLE_DEBUG_DEFAULT)dnl +AC_MSG_CHECKING([for additional debug build]) +AC_MSG_RESULT($enable_debug) +AM_CONDITIONAL(GLIBCPP_BUILD_DEBUG, test "$enable_debug" = yes) +]) + + +dnl Check for explicit debug flags. +dnl +dnl GLIBCPP_ENABLE_DEBUG_FLAGS +dnl +dnl --enable-debug-flags='-O1' +dnl is a general method for passing flags to be used when +dnl building debug libraries with --enable-debug. +dnl +dnl --disable-debug-flags does nothing. +dnl + Usage: GLIBCPP_ENABLE_DEBUG_FLAGS(default flags) +dnl If "default flags" is an empty string (or "none"), the effect is +dnl the same as --disable or --enable=no. +AC_DEFUN(GLIBCPP_ENABLE_DEBUG_FLAGS, [dnl +define([GLIBCPP_ENABLE_DEBUG_FLAGS_DEFAULT], ifelse($1,,, $1))dnl +AC_ARG_ENABLE(debug_flags, +changequote(<<, >>)dnl +<< --enable-debug-flags=FLAGS pass compiler FLAGS when building debug + library;[default=>>GLIBCPP_ENABLE_DEBUG_FLAGS_DEFAULT], +changequote([, ])dnl +[case "${enableval}" in + none) ;; + -*) enable_debug_flags="${enableval}" ;; + *) AC_MSG_ERROR([Unknown argument to extra debugging flags]) ;; + esac], +enable_debug_flags=GLIBCPP_ENABLE_DEBUG_FLAGS_DEFAULT)dnl dnl Option parsed, now set things appropriately -case "${enable_debug}" in - yes) - DEBUG_FLAGS='-O0 -ggdb3' - ;; - no) - DEBUG_FLAGS='-g' +case x"$enable_debug" in + xyes) + case "$enable_debug_flags" in + none) + DEBUG_FLAGS="-g3 -O0";; + -*) #valid input + DEBUG_FLAGS="${enableval}" + esac + ;; + xno) + DEBUG_FLAGS="" ;; esac AC_SUBST(DEBUG_FLAGS) + +AC_MSG_CHECKING([for debug build flags]) +AC_MSG_RESULT($DEBUG_FLAGS) ]) @@ -1113,39 +1156,36 @@ dnl If "default flags" is an empty string (or "none"), the effect is dnl the same as --disable or --enable=no. AC_DEFUN(GLIBCPP_ENABLE_CXX_FLAGS, [dnl define([GLIBCPP_ENABLE_CXX_FLAGS_DEFAULT], ifelse($1,,, $1))dnl -AC_ARG_ENABLE(cxx-flags, +AC_MSG_CHECKING([for extra compiler flags for building]) +AC_ARG_ENABLE(cxx_flags, changequote(<<, >>)dnl << --enable-cxx-flags=FLAGS pass compiler FLAGS when building library; - [default=>>GLIBCPP_ENABLE_CXX_FLAGS_DEFAULT], + [default=>>GLIBCPP_ENABLE_CXX_FLAGS_DEFAULT], changequote([, ])dnl -[case "x$enableval" in - xyes) - AC_MSG_ERROR([--enable-cxx-flags needs compiler flags as arguments]) ;; - xno|x) - enable_cxx_flags='' ;; - *) - enable_cxx_flags="$enableval" ;; - esac], -enable_cxx_flags='GLIBCPP_ENABLE_CXX_FLAGS_DEFAULT') - -dnl Thinko on my part during design. This kludge is the workaround. -if test "$enable_cxx_flags" = "none"; then - enable_cxx_flags=''; -fi +[case "x$enable_cxx_flags" in + xyes) + AC_MSG_ERROR([--enable-cxx-flags needs compiler flags as arguments]) ;; + xno | xnone | x) + enable_cxx_flags='' ;; + *) + enable_cxx_flags="$enableval" ;; +esac], +enable_cxx_flags=GLIBCPP_ENABLE_CXX_FLAGS_DEFAULT) dnl Run through flags (either default or command-line) and set anything dnl extra (e.g., #defines) that must accompany particular g++ options. if test -n "$enable_cxx_flags"; then - for f in $enable_cxx_flags; do - case "$f" in - -fhonor-std) ;; - -*) ;; - *) # and we're trying to pass /what/ exactly? - AC_MSG_ERROR([compiler flags start with a -]) ;; - esac - done + for f in $enable_cxx_flags; do + case "$f" in + -fhonor-std) ;; + -*) ;; + *) # and we're trying to pass /what/ exactly? + AC_MSG_ERROR([compiler flags start with a -]) ;; + esac + done fi EXTRA_CXX_FLAGS="$enable_cxx_flags" +AC_MSG_RESULT($EXTRA_CXX_FLAGS) AC_SUBST(EXTRA_CXX_FLAGS) ]) @@ -1310,24 +1350,20 @@ AC_DEFUN(GLIBCPP_ENABLE_CLOCALE, [ glibcpp_localedir=${glibcpp_builddir}/po/share/locale AC_SUBST(glibcpp_localedir) - # For the time being, transform ctype_noninline.h to ctype_members_char.cc -# CCTYPE_CHAR_CC=config/${os_include_dir}/ctype_noninline.h - AC_SUBST(USE_NLS) AC_SUBST(CLOCALE_H) AC_SUBST(CCODECVT_H) AC_SUBST(CMESSAGES_H) + AC_SUBST(CCODECVT_CC) + AC_SUBST(CCOLLATE_CC) + AC_SUBST(CCTYPE_CC) + AC_SUBST(CMESSAGES_CC) + AC_SUBST(CMONEY_CC) + AC_SUBST(CNUMERIC_CC) AC_SUBST(CTIME_H) - AC_LINK_FILES($CLOCALE_CC, src/c++locale.cc) - AC_LINK_FILES($CCODECVT_CC, src/codecvt_members.cc) - AC_LINK_FILES($CCOLLATE_CC, src/collate_members.cc) -# AC_LINK_FILES($CCTYPE_CHAR_CC, src/ctype_members_char.cc) - AC_LINK_FILES($CCTYPE_CC, src/ctype_members.cc) - AC_LINK_FILES($CMESSAGES_CC, src/messages_members.cc) - AC_LINK_FILES($CMONEY_CC, src/monetary_members.cc) - AC_LINK_FILES($CNUMERIC_CC, src/numeric_members.cc) - AC_LINK_FILES($CTIME_CC, src/time_members.cc) - AC_LINK_FILES($CLOCALE_INTERNAL_H, src/c++locale_internal.h) + AC_SUBST(CTIME_CC) + AC_SUBST(CLOCALE_CC) + AC_SUBST(CLOCALE_INTERNAL_H) ]) @@ -1428,7 +1464,7 @@ AC_DEFUN(GLIBCPP_ENABLE_CSTDIO, [ esac AC_SUBST(CSTDIO_H) AC_SUBST(BASIC_FILE_H) - AC_LINK_FILES($BASIC_FILE_CC, src/basic_file.cc) + AC_SUBST(BASIC_FILE_CC) # 2000-08-04 bkoz hack CCODECVT_C=config/io/c_io_libio_codecvt.c @@ -1511,7 +1547,7 @@ void foo() } EOF old_CXXFLAGS="$CXXFLAGS" - CXXFLAGS="-S -fexceptions" + 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 @@ -1747,21 +1783,20 @@ AC_DEFUN(GLIBCPP_ENABLE_LONG_LONG, [dnl dnl -dnl Check for what kind of C headers to use. +dnl Check for what type 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 Where DEFAULT is either `c' or `c_std'. 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, changequote(<<, >>)dnl -<< --enable-cheaders 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([, ]) [case "$enableval" in c) @@ -1770,9 +1805,6 @@ changequote([, ]) c_std) enable_cheaders=c_std ;; - c_shadow) - enable_cheaders=c_shadow - ;; *) AC_MSG_ERROR([Unknown argument to enable/disable "C" headers]) ;; esac], @@ -1781,9 +1813,6 @@ changequote([, ]) dnl Option parsed, now set things appropriately case "$enable_cheaders" in - c_shadow) - C_INCLUDE_DIR='${glibcpp_srcdir}/include/c_shadow' - ;; c_std) C_INCLUDE_DIR='${glibcpp_srcdir}/include/c_std' ;; @@ -1832,7 +1861,6 @@ dnl TOPLEVEL_INCLUDES dnl LIBMATH_INCLUDES dnl LIBSUPCXX_INCLUDES dnl LIBIO_INCLUDES -dnl CSHADOW_INCLUDES dnl dnl GLIBCPP_EXPORT_INCLUDES AC_DEFUN(GLIBCPP_EXPORT_INCLUDES, [ @@ -1871,7 +1899,7 @@ AC_DEFUN(GLIBCPP_EXPORT_FLAGS, [ OPTIMIZE_CXXFLAGS= AC_SUBST(OPTIMIZE_CXXFLAGS) - WARN_FLAGS='-Wall -Wno-format -W -Wwrite-strings -Winline' + WARN_FLAGS='-Wall -Wno-format -W -Wwrite-strings' AC_SUBST(WARN_FLAGS) ]) @@ -2053,8 +2081,9 @@ dnl string, '#' otherwise 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 - #include + AC_TRY_COMPILE([#include + #include + #include ], [ int f = RLIMIT_$1 ; ], [glibcpp_mresult=1], [glibcpp_mresult=0]) AC_DEFINE_UNQUOTED(HAVE_MEMLIMIT_$1, $glibcpp_mresult, @@ -2062,7 +2091,7 @@ AC_DEFUN(GLIBCPP_CHECK_SETRLIMIT_ancilliary, [ ]) AC_DEFUN(GLIBCPP_CHECK_SETRLIMIT, [ setrlimit_have_headers=yes - AC_CHECK_HEADERS(sys/resource.h unistd.h, + AC_CHECK_HEADERS(unistd.h sys/time.h sys/resource.h, [], setrlimit_have_headers=no) # If don't have the headers, then we can't run the tests now, and we @@ -2076,8 +2105,9 @@ AC_DEFUN(GLIBCPP_CHECK_SETRLIMIT, [ # Check for rlimit, setrlimit. AC_CACHE_VAL(ac_setrlimit, [ - AC_TRY_COMPILE([#include - #include + AC_TRY_COMPILE([#include + #include + #include ], [ struct rlimit r; setrlimit(0, &r);], [ac_setrlimit=yes], [ac_setrlimit=no]) @@ -2101,18 +2131,30 @@ dnl the testsuite_hooks.h header. dnl dnl GLIBCPP_CONFIGURE_TESTSUITE [no args] AC_DEFUN(GLIBCPP_CONFIGURE_TESTSUITE, [ - GLIBCPP_CHECK_SETRLIMIT + if test x"$GLIBCPP_IS_CROSS_COMPILING" = xfalse; then + # Do checks for memory limit functions. + GLIBCPP_CHECK_SETRLIMIT - # Look for setenv, so that extended locale tests can be performed. - GLIBCPP_CHECK_STDLIB_DECL_AND_LINKAGE_3(setenv) + # Look for setenv, so that extended locale tests can be performed. + GLIBCPP_CHECK_STDLIB_DECL_AND_LINKAGE_3(setenv) + fi # Export file names for ABI checking. - baseline_file="${glibcpp_srcdir}/config/abi/${abi_baseline_triplet}/baseline_symbols.txt" - AC_SUBST(baseline_file) + baseline_dir="${glibcpp_srcdir}/config/abi/${abi_baseline_pair}\$(MULTISUBDIR)" + AC_SUBST(baseline_dir) - # Don't do ABI checking unless native. - AM_CONDITIONAL(GLIBCPP_BUILD_ABI_CHECK, - test x"$build" = x"$host" && test -z "$with_cross_host") + # Determine if checking the ABI is desirable. + if test x$enable_symvers = xno; then + enable_abi_check=no + else + case "$host" in + *-*-cygwin*) + enable_abi_check=no ;; + *) + enable_abi_check=yes ;; + esac + fi + AM_CONDITIONAL(GLIBCPP_TEST_ABI, test "$enable_abi_check" = yes) ]) @@ -2126,6 +2168,45 @@ AC_DEFUN([AC_LIBTOOL_DLOPEN]) AC_DEFUN([AC_PROG_LD]) ]) +dnl +dnl Check whether S_ISREG (Posix) or S_IFREG is available in . +dnl + +AC_DEFUN(GLIBCPP_CHECK_S_ISREG_OR_S_IFREG, [ + AC_CACHE_VAL(glibcpp_cv_S_ISREG, [ + AC_TRY_LINK([#include ], + [struct stat buffer; fstat(0, &buffer); S_ISREG(buffer.st_mode); ], + [glibcpp_cv_S_ISREG=yes], + [glibcpp_cv_S_ISREG=no]) + ]) + AC_CACHE_VAL(glibcpp_cv_S_IFREG, [ + AC_TRY_LINK([#include ], + [struct stat buffer; fstat(0, &buffer); S_IFREG & buffer.st_mode; ], + [glibcpp_cv_S_IFREG=yes], + [glibcpp_cv_S_IFREG=no]) + ]) + if test x$glibcpp_cv_S_ISREG = xyes; then + AC_DEFINE(HAVE_S_ISREG) + elif test x$glibcpp_cv_S_IFREG = xyes; then + AC_DEFINE(HAVE_S_IFREG) + fi +]) + +dnl +dnl Check whether poll is available in . +dnl + +AC_DEFUN(GLIBCPP_CHECK_POLL, [ + AC_CACHE_VAL(glibcpp_cv_POLL, [ + AC_TRY_COMPILE([#include ], + [struct pollfd pfd[1]; pfd[0].events = POLLIN; poll(pfd, 1, 0); ], + [glibcpp_cv_POLL=yes], + [glibcpp_cv_POLL=no]) + ]) + if test x$glibcpp_cv_POLL = xyes; then + AC_DEFINE(HAVE_POLL) + fi +]) # Check whether LC_MESSAGES is available in . # Ulrich Drepper , 1995. @@ -2215,12 +2296,14 @@ if test x$enable_shared = xno || fi # Check to see if libgcc_s exists, indicating that shared libgcc is possible. -AC_MSG_CHECKING([for shared libgcc]) -ac_save_CFLAGS="$CFLAGS" -CFLAGS=' -lgcc_s' -AC_TRY_LINK( , [return 0], glibcpp_shared_libgcc=yes, glibcpp_shared_libgcc=no) -CFLAGS="$ac_save_CFLAGS" -AC_MSG_RESULT($glibcpp_shared_libgcc) +if test $enable_symvers != no; then + AC_MSG_CHECKING([for shared libgcc]) + ac_save_CFLAGS="$CFLAGS" + CFLAGS=' -lgcc_s' + AC_TRY_LINK(, [return 0], glibcpp_shared_libgcc=yes, glibcpp_shared_libgcc=no) + CFLAGS="$ac_save_CFLAGS" + AC_MSG_RESULT($glibcpp_shared_libgcc) +fi # For GNU ld, we need at least this version. It's 2.12 in the same format # as the tested-for version. See GLIBCPP_CHECK_LINKER_FEATURES for more. @@ -2260,15 +2343,15 @@ fi dnl Everything parsed; figure out what file to use. case $enable_symvers in no) - LINKER_MAP=config/linker-map.dummy + SYMVER_MAP=config/linker-map.dummy ;; gnu) - LINKER_MAP=config/linker-map.gnu + SYMVER_MAP=config/linker-map.gnu AC_DEFINE(_GLIBCPP_SYMVER) ;; esac -AC_LINK_FILES($LINKER_MAP, src/linker.map) +AC_SUBST(SYMVER_MAP) AM_CONDITIONAL(GLIBCPP_BUILD_VERSIONED_SHLIB, test $enable_symvers != no) AC_MSG_CHECKING([versioning on shared library symbols]) AC_MSG_RESULT($enable_symvers) -- cgit v1.1