Skip to content

R
riscv-gcc-1
Commit 3840fa2a by Benjamin Kosnik Committed by Benjamin Kosnik
Options

std_cwctype.h: Clean. 


2000-06-01  Benjamin Kosnik  <bkoz@gnu.org>

	* bits/std_cwctype.h: Clean.
	* bits/std_cwchar.h: Clean, remove cruft.

	* acinclude.m4 (GLIBCPP_CHECK_WCHAR_T_SUPPORT): Re-work, add bits
	for beginning iconv support.
	Remove _GLIBCPP_HAS_WCHAR_MIN_MAX, roll into _GLIBCPP_USE_WCHAR_T
	macro.
	* acconfig.h: Remove _GLIBCPP_HAS_WCHAR_MIN_MAX.
	* bits/limits_generic.h: Remove.
	* src/gen-num-limits.cc: Same.

	* src/locale.cc: Tweaks.

	* bits/char_traits.h: Tweaks.

From-SVN: r34352
parent cc057ef3
Showing with 593 additions and 986 deletions
libstdc++-v3/ChangeLog
2000-06-01 Benjamin Kosnik <bkoz@gnu.org>
* bits/std_cwctype.h: Clean.
* bits/std_cwchar.h: Clean, remove cruft.
* acinclude.m4 (GLIBCPP_CHECK_WCHAR_T_SUPPORT): Re-work, add bits
for beginning iconv support.
Remove _GLIBCPP_HAS_WCHAR_MIN_MAX, roll into _GLIBCPP_USE_WCHAR_T
macro.
* acconfig.h: Remove _GLIBCPP_HAS_WCHAR_MIN_MAX.
* bits/limits_generic.h: Remove.
* src/gen-num-limits.cc: Same.
* src/locale.cc: Tweaks.
* bits/char_traits.h: Tweaks.
2000-05-31 Russell Davidson <russell@ehess.cnrs-mrs.fr> 2000-05-31 Russell Davidson <russell@ehess.cnrs-mrs.fr>
* bits/locale_facets.tcc (num_get<char>::_M_extract): Fix signage, * bits/locale_facets.tcc (num_get<char>::_M_extract): Fix signage,
......
libstdc++-v3/Makefile.in
...@@ -83,14 +83,13 @@ FMTFLAGS = @FMTFLAGS@ ...@@ -83,14 +83,13 @@ FMTFLAGS = @FMTFLAGS@
GCC_OBJDIR = @GCC_OBJDIR@ GCC_OBJDIR = @GCC_OBJDIR@
GLIBCPP_CFLAGS = @GLIBCPP_CFLAGS@ GLIBCPP_CFLAGS = @GLIBCPP_CFLAGS@
GLIBCPP_CXXFLAGS = @GLIBCPP_CXXFLAGS@ GLIBCPP_CXXFLAGS = @GLIBCPP_CXXFLAGS@
LD = @LD@
LIBMATHOBJS = @LIBMATHOBJS@ LIBMATHOBJS = @LIBMATHOBJS@
LIBSTRINGOBJS = @LIBSTRINGOBJS@ LIBSTRINGOBJS = @LIBSTRINGOBJS@
LIBTOOL = @LIBTOOL@ LIBTOOL = @LIBTOOL@
LN_S = @LN_S@ LN_S = @LN_S@
MAINT = @MAINT@ MAINT = @MAINT@
MAKEINFO = @MAKEINFO@ MAKEINFO = @MAKEINFO@
NM = @NM@ OBJDUMP = @OBJDUMP@
PACKAGE = @PACKAGE@ PACKAGE = @PACKAGE@
RANLIB = @RANLIB@ RANLIB = @RANLIB@
THREADDEPS = @THREADDEPS@ THREADDEPS = @THREADDEPS@
...@@ -99,7 +98,6 @@ THREADLIBS = @THREADLIBS@ ...@@ -99,7 +98,6 @@ THREADLIBS = @THREADLIBS@
THREADOBJS = @THREADOBJS@ THREADOBJS = @THREADOBJS@
THREADSPEC = @THREADSPEC@ THREADSPEC = @THREADSPEC@
USE_LONG_DOUBLE = @USE_LONG_DOUBLE@ USE_LONG_DOUBLE = @USE_LONG_DOUBLE@
USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
VERSION = @VERSION@ VERSION = @VERSION@
WERROR = @WERROR@ WERROR = @WERROR@
cpu_include_dir = @cpu_include_dir@ cpu_include_dir = @cpu_include_dir@
......
libstdc++-v3/acconfig.h
...@@ -9,11 +9,6 @@ ...@@ -9,11 +9,6 @@
// around. // around.
#undef _GLIBCPP_NEED_MBSTATE_T #undef _GLIBCPP_NEED_MBSTATE_T
// Define if WCHAR_MIN and WCHAR_MAX are in the <cwchar_t>
// header. Presently, this is needed so that solaris won't
// instantitate numeric_limits<wchar_t>
#undef _GLIBCPP_HAS_WCHAR_MIN_MAX
// Define if code specialized for wchar_t should be used. // Define if code specialized for wchar_t should be used.
#undef _GLIBCPP_USE_WCHAR_T #undef _GLIBCPP_USE_WCHAR_T
......
libstdc++-v3/acinclude.m4
...@@ -520,18 +520,24 @@ dnl Check to see if this target can enable the wchar_t parts of libstdc++. ...@@ -520,18 +520,24 @@ dnl Check to see if this target can enable the wchar_t parts of libstdc++.
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 _GLIBCPP_NEED_MBSTATE_T if mbstate_t is not in wchar.h dnl Define _GLIBCPP_NEED_MBSTATE_T if mbstate_t is not in wchar.h
dnl Define _GLIBCPP_HAS_WCHAR_MIN_MAX if WCHAR_MIN, WCHAR_MAX in wchar.h
dnl dnl
dnl GLIBCPP_CHECK_WCHAR_T_SUPPORT dnl GLIBCPP_CHECK_WCHAR_T_SUPPORT
AC_DEFUN(GLIBCPP_CHECK_WCHAR_T_SUPPORT, [ AC_DEFUN(GLIBCPP_CHECK_WCHAR_T_SUPPORT, [
AC_CHECK_HEADER(wchar.h,[
dnl Sanity check for existence of ISO C9X headers for extended encoding.
AC_CHECK_HEADER(wchar.h, ac_has_wchar_h=yes, ac_has_wchar_h=no)
AC_CHECK_HEADER(wctype.h, ac_has_wctype_h=yes, ac_has_wctype_h=no)
dnl Only continue checking if the ISO C9X headers exist.
if test x"$ac_has_wchar_h" = xyes && test x"$ac_has_wctype_h" = xyes; then
dnl Test wchar.h for mbstate_t, which is needed for char_traits and others. dnl Test wchar.h for mbstate_t, which is needed for char_traits and others.
AC_MSG_CHECKING([for native 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;],
use_native_mbstatet=yes, use_native_mbstatet=no) use_native_mbstatet=yes, use_native_mbstatet=no)
AC_MSG_RESULT($use_native_mbstatet) AC_MSG_RESULT($use_native_mbstatet)
if test $use_native_mbstatet = "no"; then if test x"$use_native_mbstatet" = xno; then
AC_DEFINE(_GLIBCPP_NEED_MBSTATE_T) AC_DEFINE(_GLIBCPP_NEED_MBSTATE_T)
fi fi
...@@ -542,12 +548,9 @@ AC_DEFUN(GLIBCPP_CHECK_WCHAR_T_SUPPORT, [ ...@@ -542,12 +548,9 @@ AC_DEFUN(GLIBCPP_CHECK_WCHAR_T_SUPPORT, [
[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)
if test $has_wchar_minmax = "yes"; then
AC_DEFINE(_GLIBCPP_HAS_WCHAR_MIN_MAX)
fi
# 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
# to specialize for wchar_t or not. dnl to specialize for char_traits<wchar_t> or not.
AC_MSG_CHECKING([for WEOF]) AC_MSG_CHECKING([for WEOF])
AC_TRY_COMPILE([ AC_TRY_COMPILE([
#include <wchar.h> #include <wchar.h>
...@@ -556,23 +559,47 @@ AC_DEFUN(GLIBCPP_CHECK_WCHAR_T_SUPPORT, [ ...@@ -556,23 +559,47 @@ AC_DEFUN(GLIBCPP_CHECK_WCHAR_T_SUPPORT, [
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. dnl Tests for wide character functions used in char_traits<wchar_t>.
AC_REPLACE_STRINGFUNCS(wcslen wmemchr wmemcmp wmemcpy wmemmove wmemset) AC_CHECK_FUNCS(wcslen wmemchr wmemcmp wmemcpy wmemmove wmemset, ac_wfuncs=yes, ac_wfuncs=no)
AC_SUBST(libinst_wstring_la)
AC_MSG_CHECKING([for wide character support]) AC_MSG_CHECKING([for ISO C9X wchar_t support])
if test $has_weof = "yes" && test $has_wchar_minmax = "yes"; then if test x"$has_weof" = xyes && test x"$has_wchar_minmax" = xyes && test x"$ac_wfuncs" = xyes; then
ac_isoC9X_wchar_t=yes
else
ac_isoC9X_wchar_t=no
fi
AC_MSG_RESULT($ac_isoC9X_wchar_t)
dnl Use iconv for wchar_t to char conversions. As such, check for
dnl X/Open Portability Guide, version 2 features (XPG2).
AC_CHECK_HEADER(iconv.h, ac_has_iconv_h=yes, ac_has_iconv_h=no)
AC_CHECK_FUNCS(iconv_open iconv_close iconv, ac_XPG2funcs=yes, ac_XPG2funcs=no)
AC_MSG_CHECKING([for XPG2 wchar_t support])
if test x"$ac_has_iconv_h" = xyes && test x"$ac_XPG2funcs" = xyes; then
ac_XPG2_wchar_t=yes
else
ac_XPG2_wchar_t=no
fi
AC_MSG_RESULT($ac_XPG2_wchar_t)
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_isoC9X_wchar_t" = xyes && test x"$ac_XPG2_wchar_t" = xyes; then
libinst_wstring_la="libinst-wstring.la" libinst_wstring_la="libinst-wstring.la"
AC_DEFINE(_GLIBCPP_USE_WCHAR_T) AC_DEFINE(_GLIBCPP_USE_WCHAR_T)
AC_MSG_RESULT(ok) AC_MSG_RESULT("yes")
else else
libinst_wstring_la="" libinst_wstring_la=""
AC_MSG_RESULT("not specializing for wchar_t") AC_MSG_RESULT("no")
fi fi
],[ AC_SUBST(libinst_wstring_la)
else
AC_MSG_WARN([<wchar.h> not found]) AC_MSG_WARN([<wchar.h> not found])
AC_DEFINE(_GLIBCPP_NEED_MBSTATE_T) AC_DEFINE(_GLIBCPP_NEED_MBSTATE_T)
]) fi
]) ])
...@@ -949,7 +976,6 @@ dnl GLIBCPP_ENABLE_LONG_LONG ...@@ -949,7 +976,6 @@ dnl GLIBCPP_ENABLE_LONG_LONG
AC_DEFUN(GLIBCPP_ENABLE_LONG_LONG, [dnl AC_DEFUN(GLIBCPP_ENABLE_LONG_LONG, [dnl
define([GLIBCPP_ENABLE_LONG_LONG_DEFAULT], ifelse($1, yes, yes, no))dnl define([GLIBCPP_ENABLE_LONG_LONG_DEFAULT], ifelse($1, yes, yes, no))dnl
AC_MSG_CHECKING([for enabled long long])
AC_ARG_ENABLE(long-long, AC_ARG_ENABLE(long-long,
changequote(<<, >>)dnl changequote(<<, >>)dnl
<<--enable-long-long turns on 'long long' [default=>>GLIBCPP_ENABLE_LONG_LONG_DEFAULT], <<--enable-long-long turns on 'long long' [default=>>GLIBCPP_ENABLE_LONG_LONG_DEFAULT],
...@@ -965,11 +991,12 @@ AC_DEFUN(GLIBCPP_ENABLE_LONG_LONG, [dnl ...@@ -965,11 +991,12 @@ AC_DEFUN(GLIBCPP_ENABLE_LONG_LONG, [dnl
AC_CHECK_FUNC(strtoll,,ac_strtoll=no) AC_CHECK_FUNC(strtoll,,ac_strtoll=no)
AC_CHECK_FUNC(strtoull,,ac_strtoull=no) AC_CHECK_FUNC(strtoull,,ac_strtoull=no)
AC_MSG_CHECKING([for enabled long long])
if test x"$ac_strtoll" = xno || test x"$ac_strtoull" = xno; then if test x"$ac_strtoll" = xno || test x"$ac_strtoull" = xno; then
enable_long_long=no; enable_long_long=no;
fi; unset ac_ll fi;
AC_MSG_RESULT($enable_long_long) AC_MSG_RESULT($enable_long_long)
dnl Option parsed, now set things appropriately dnl Option parsed, now set things appropriately
case "$enable_long_long" in case "$enable_long_long" in
yes) AC_DEFINE(_GLIBCPP_USE_LONG_LONG) yes) AC_DEFINE(_GLIBCPP_USE_LONG_LONG)
......
libstdc++-v3/aclocal.m4
...@@ -532,18 +532,24 @@ dnl Check to see if this target can enable the wchar_t parts of libstdc++. ...@@ -532,18 +532,24 @@ dnl Check to see if this target can enable the wchar_t parts of libstdc++.
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 _GLIBCPP_NEED_MBSTATE_T if mbstate_t is not in wchar.h dnl Define _GLIBCPP_NEED_MBSTATE_T if mbstate_t is not in wchar.h
dnl Define _GLIBCPP_HAS_WCHAR_MIN_MAX if WCHAR_MIN, WCHAR_MAX in wchar.h
dnl dnl
dnl GLIBCPP_CHECK_WCHAR_T_SUPPORT dnl GLIBCPP_CHECK_WCHAR_T_SUPPORT
AC_DEFUN(GLIBCPP_CHECK_WCHAR_T_SUPPORT, [ AC_DEFUN(GLIBCPP_CHECK_WCHAR_T_SUPPORT, [
AC_CHECK_HEADER(wchar.h,[
dnl Sanity check for existence of ISO C9X headers for extended encoding.
AC_CHECK_HEADER(wchar.h, ac_has_wchar_h=yes, ac_has_wchar_h=no)
AC_CHECK_HEADER(wctype.h, ac_has_wctype_h=yes, ac_has_wctype_h=no)
dnl Only continue checking if the ISO C9X headers exist.
if test x"$ac_has_wchar_h" = xyes && test x"$ac_has_wctype_h" = xyes; then
dnl Test wchar.h for mbstate_t, which is needed for char_traits and others. dnl Test wchar.h for mbstate_t, which is needed for char_traits and others.
AC_MSG_CHECKING([for native 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;],
use_native_mbstatet=yes, use_native_mbstatet=no) use_native_mbstatet=yes, use_native_mbstatet=no)
AC_MSG_RESULT($use_native_mbstatet) AC_MSG_RESULT($use_native_mbstatet)
if test $use_native_mbstatet = "no"; then if test x"$use_native_mbstatet" = xno; then
AC_DEFINE(_GLIBCPP_NEED_MBSTATE_T) AC_DEFINE(_GLIBCPP_NEED_MBSTATE_T)
fi fi
...@@ -554,12 +560,9 @@ AC_DEFUN(GLIBCPP_CHECK_WCHAR_T_SUPPORT, [ ...@@ -554,12 +560,9 @@ AC_DEFUN(GLIBCPP_CHECK_WCHAR_T_SUPPORT, [
[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)
if test $has_wchar_minmax = "yes"; then
AC_DEFINE(_GLIBCPP_HAS_WCHAR_MIN_MAX)
fi
# 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
# to specialize for wchar_t or not. dnl to specialize for char_traits<wchar_t> or not.
AC_MSG_CHECKING([for WEOF]) AC_MSG_CHECKING([for WEOF])
AC_TRY_COMPILE([ AC_TRY_COMPILE([
#include <wchar.h> #include <wchar.h>
...@@ -568,23 +571,47 @@ AC_DEFUN(GLIBCPP_CHECK_WCHAR_T_SUPPORT, [ ...@@ -568,23 +571,47 @@ AC_DEFUN(GLIBCPP_CHECK_WCHAR_T_SUPPORT, [
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. dnl Tests for wide character functions used in char_traits<wchar_t>.
AC_REPLACE_STRINGFUNCS(wcslen wmemchr wmemcmp wmemcpy wmemmove wmemset) AC_CHECK_FUNCS(wcslen wmemchr wmemcmp wmemcpy wmemmove wmemset, ac_wfuncs=yes, ac_wfuncs=no)
AC_SUBST(libinst_wstring_la)
AC_MSG_CHECKING([for wide character support]) AC_MSG_CHECKING([for ISO C9X wchar_t support])
if test $has_weof = "yes" && test $has_wchar_minmax = "yes"; then if test x"$has_weof" = xyes && test x"$has_wchar_minmax" = xyes && test x"$ac_wfuncs" = xyes; then
ac_isoC9X_wchar_t=yes
else
ac_isoC9X_wchar_t=no
fi
AC_MSG_RESULT($ac_isoC9X_wchar_t)
dnl Use iconv for wchar_t to char conversions. As such, check for
dnl X/Open Portability Guide, version 2 features (XPG2).
AC_CHECK_HEADER(iconv.h, ac_has_iconv_h=yes, ac_has_iconv_h=no)
AC_CHECK_FUNCS(iconv_open iconv_close iconv, ac_XPG2funcs=yes, ac_XPG2funcs=no)
AC_MSG_CHECKING([for XPG2 wchar_t support])
if test x"$ac_has_iconv_h" = xyes && test x"$ac_XPG2funcs" = xyes; then
ac_XPG2_wchar_t=yes
else
ac_XPG2_wchar_t=no
fi
AC_MSG_RESULT($ac_XPG2_wchar_t)
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_isoC9X_wchar_t" = xyes && test x"$ac_XPG2_wchar_t" = xyes; then
libinst_wstring_la="libinst-wstring.la" libinst_wstring_la="libinst-wstring.la"
AC_DEFINE(_GLIBCPP_USE_WCHAR_T) AC_DEFINE(_GLIBCPP_USE_WCHAR_T)
AC_MSG_RESULT(ok) AC_MSG_RESULT("yes")
else else
libinst_wstring_la="" libinst_wstring_la=""
AC_MSG_RESULT("not specializing for wchar_t") AC_MSG_RESULT("no")
fi fi
],[ AC_SUBST(libinst_wstring_la)
else
AC_MSG_WARN([<wchar.h> not found]) AC_MSG_WARN([<wchar.h> not found])
AC_DEFINE(_GLIBCPP_NEED_MBSTATE_T) AC_DEFINE(_GLIBCPP_NEED_MBSTATE_T)
]) fi
]) ])
...@@ -961,7 +988,6 @@ dnl GLIBCPP_ENABLE_LONG_LONG ...@@ -961,7 +988,6 @@ dnl GLIBCPP_ENABLE_LONG_LONG
AC_DEFUN(GLIBCPP_ENABLE_LONG_LONG, [dnl AC_DEFUN(GLIBCPP_ENABLE_LONG_LONG, [dnl
define([GLIBCPP_ENABLE_LONG_LONG_DEFAULT], ifelse($1, yes, yes, no))dnl define([GLIBCPP_ENABLE_LONG_LONG_DEFAULT], ifelse($1, yes, yes, no))dnl
AC_MSG_CHECKING([for enabled long long])
AC_ARG_ENABLE(long-long, AC_ARG_ENABLE(long-long,
changequote(<<, >>)dnl changequote(<<, >>)dnl
<<--enable-long-long turns on 'long long' [default=>>GLIBCPP_ENABLE_LONG_LONG_DEFAULT], <<--enable-long-long turns on 'long long' [default=>>GLIBCPP_ENABLE_LONG_LONG_DEFAULT],
...@@ -977,11 +1003,12 @@ AC_DEFUN(GLIBCPP_ENABLE_LONG_LONG, [dnl ...@@ -977,11 +1003,12 @@ AC_DEFUN(GLIBCPP_ENABLE_LONG_LONG, [dnl
AC_CHECK_FUNC(strtoll,,ac_strtoll=no) AC_CHECK_FUNC(strtoll,,ac_strtoll=no)
AC_CHECK_FUNC(strtoull,,ac_strtoull=no) AC_CHECK_FUNC(strtoull,,ac_strtoull=no)
AC_MSG_CHECKING([for enabled long long])
if test x"$ac_strtoll" = xno || test x"$ac_strtoull" = xno; then if test x"$ac_strtoll" = xno || test x"$ac_strtoull" = xno; then
enable_long_long=no; enable_long_long=no;
fi; unset ac_ll fi;
AC_MSG_RESULT($enable_long_long) AC_MSG_RESULT($enable_long_long)
dnl Option parsed, now set things appropriately dnl Option parsed, now set things appropriately
case "$enable_long_long" in case "$enable_long_long" in
yes) AC_DEFINE(_GLIBCPP_USE_LONG_LONG) yes) AC_DEFINE(_GLIBCPP_USE_LONG_LONG)
...@@ -1216,7 +1243,7 @@ else ...@@ -1216,7 +1243,7 @@ else
fi]) fi])
# serial 35 AC_PROG_LIBTOOL # serial 40 AC_PROG_LIBTOOL
AC_DEFUN(AC_PROG_LIBTOOL, AC_DEFUN(AC_PROG_LIBTOOL,
[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl [AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
...@@ -1225,10 +1252,11 @@ AC_CACHE_SAVE ...@@ -1225,10 +1252,11 @@ AC_CACHE_SAVE
# Actually configure libtool. ac_aux_dir is where install-sh is found. # Actually configure libtool. ac_aux_dir is where install-sh is found.
CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \ CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
LD="$LD" NM="$NM" RANLIB="$RANLIB" LN_S="$LN_S" \ LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
DLLTOOL="$DLLTOOL" AS="$AS" \ LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \ ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \ $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $lt_target \
|| AC_MSG_ERROR([libtool configure failed]) || AC_MSG_ERROR([libtool configure failed])
# Reload cache, that may have been modified by ltconfig # Reload cache, that may have been modified by ltconfig
...@@ -1257,24 +1285,33 @@ AC_REQUIRE([AC_PROG_RANLIB])dnl ...@@ -1257,24 +1285,33 @@ AC_REQUIRE([AC_PROG_RANLIB])dnl
AC_REQUIRE([AC_PROG_CC])dnl AC_REQUIRE([AC_PROG_CC])dnl
AC_REQUIRE([AC_PROG_LD])dnl AC_REQUIRE([AC_PROG_LD])dnl
AC_REQUIRE([AC_PROG_NM])dnl AC_REQUIRE([AC_PROG_NM])dnl
AC_REQUIRE([AC_SYS_NM_PARSE])dnl
AC_REQUIRE([AC_SYS_SYMBOL_UNDERSCORE])dnl
AC_REQUIRE([AC_PROG_LN_S])dnl AC_REQUIRE([AC_PROG_LN_S])dnl
dnl dnl
case "$target" in
NONE) lt_target="$host" ;;
*) lt_target="$target" ;;
esac
# Check for any special flags to pass to ltconfig. # Check for any special flags to pass to ltconfig.
libtool_flags="--cache-file=$cache_file" libtool_flags="--cache-file=$cache_file"
test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared" test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static" test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install" test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install"
test "$lt_dlopen" = yes && libtool_flags="$libtool_flags --enable-dlopen"
test "$silent" = yes && libtool_flags="$libtool_flags --silent"
test "$ac_cv_prog_gcc" = yes && libtool_flags="$libtool_flags --with-gcc" test "$ac_cv_prog_gcc" = yes && libtool_flags="$libtool_flags --with-gcc"
test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld" test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
ifdef([AC_PROVIDE_AC_LIBTOOL_DLOPEN],
[libtool_flags="$libtool_flags --enable-dlopen"])
ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
[libtool_flags="$libtool_flags --enable-win32-dll"])
AC_ARG_ENABLE(libtool-lock,
[ --disable-libtool-lock avoid locking (might break parallel builds)])
test "x$enable_libtool_lock" = xno && libtool_flags="$libtool_flags --disable-lock"
test x"$silent" = xyes && libtool_flags="$libtool_flags --silent"
# Some flags need to be propagated to the compiler or linker for good # Some flags need to be propagated to the compiler or linker for good
# libtool support. # libtool support.
case "$host" in case "$lt_target" in
*-*-irix6*) *-*-irix6*)
# Find out which ABI we are using. # Find out which ABI we are using.
echo '[#]line __oline__ "configure"' > conftest.$ac_ext echo '[#]line __oline__ "configure"' > conftest.$ac_ext
...@@ -1306,33 +1343,28 @@ case "$host" in ...@@ -1306,33 +1343,28 @@ case "$host" in
fi fi
;; ;;
*-*-cygwin*) ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
AC_SYS_LIBTOOL_CYGWIN [*-*-cygwin* | *-*-mingw*)
AC_CHECK_TOOL(DLLTOOL, dlltool, false)
AC_CHECK_TOOL(AS, as, false)
AC_CHECK_TOOL(OBJDUMP, objdump, false)
;; ;;
])
esac esac
# enable the --disable-libtool-lock switch
AC_ARG_ENABLE(libtool-lock,
[ --disable-libtool-lock force libtool not to do file locking],
need_locks=$enableval,
need_locks=yes)
if test x"$need_locks" = xno; then
libtool_flags="$libtool_flags --disable-lock"
fi
]) ])
# AC_LIBTOOL_DLOPEN - check for dlopen support # AC_LIBTOOL_DLOPEN - enable checks for dlopen support
AC_DEFUN(AC_LIBTOOL_DLOPEN, [lt_dlopen=yes]) AC_DEFUN(AC_LIBTOOL_DLOPEN, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])])
# AC_LIBTOOL_WIN32_DLL - declare package support for building win32 dll's
AC_DEFUN(AC_LIBTOOL_WIN32_DLL, [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])])
# AC_ENABLE_SHARED - implement the --enable-shared flag # AC_ENABLE_SHARED - implement the --enable-shared flag
# Usage: AC_ENABLE_SHARED[(DEFAULT)] # Usage: AC_ENABLE_SHARED[(DEFAULT)]
# Where DEFAULT is either `yes' or `no'. If omitted, it defaults to # Where DEFAULT is either `yes' or `no'. If omitted, it defaults to
# `yes'. # `yes'.
AC_DEFUN(AC_ENABLE_SHARED, AC_DEFUN(AC_ENABLE_SHARED, [dnl
[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
AC_ARG_ENABLE(shared, AC_ARG_ENABLE(shared,
changequote(<<, >>)dnl changequote(<<, >>)dnl
<< --enable-shared[=PKGS] build shared libraries [default=>>AC_ENABLE_SHARED_DEFAULT], << --enable-shared[=PKGS] build shared libraries [default=>>AC_ENABLE_SHARED_DEFAULT],
...@@ -1357,15 +1389,15 @@ enable_shared=AC_ENABLE_SHARED_DEFAULT)dnl ...@@ -1357,15 +1389,15 @@ enable_shared=AC_ENABLE_SHARED_DEFAULT)dnl
]) ])
# AC_DISABLE_SHARED - set the default shared flag to --disable-shared # AC_DISABLE_SHARED - set the default shared flag to --disable-shared
AC_DEFUN(AC_DISABLE_SHARED, AC_DEFUN(AC_DISABLE_SHARED, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
[AC_ENABLE_SHARED(no)]) AC_ENABLE_SHARED(no)])
# AC_ENABLE_STATIC - implement the --enable-static flag # AC_ENABLE_STATIC - implement the --enable-static flag
# Usage: AC_ENABLE_STATIC[(DEFAULT)] # Usage: AC_ENABLE_STATIC[(DEFAULT)]
# Where DEFAULT is either `yes' or `no'. If omitted, it defaults to # Where DEFAULT is either `yes' or `no'. If omitted, it defaults to
# `yes'. # `yes'.
AC_DEFUN(AC_ENABLE_STATIC, AC_DEFUN(AC_ENABLE_STATIC, [dnl
[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
AC_ARG_ENABLE(static, AC_ARG_ENABLE(static,
changequote(<<, >>)dnl changequote(<<, >>)dnl
<< --enable-static[=PKGS] build static libraries [default=>>AC_ENABLE_STATIC_DEFAULT], << --enable-static[=PKGS] build static libraries [default=>>AC_ENABLE_STATIC_DEFAULT],
...@@ -1390,16 +1422,16 @@ enable_static=AC_ENABLE_STATIC_DEFAULT)dnl ...@@ -1390,16 +1422,16 @@ enable_static=AC_ENABLE_STATIC_DEFAULT)dnl
]) ])
# AC_DISABLE_STATIC - set the default static flag to --disable-static # AC_DISABLE_STATIC - set the default static flag to --disable-static
AC_DEFUN(AC_DISABLE_STATIC, AC_DEFUN(AC_DISABLE_STATIC, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
[AC_ENABLE_STATIC(no)]) AC_ENABLE_STATIC(no)])
# AC_ENABLE_FAST_INSTALL - implement the --enable-fast-install flag # AC_ENABLE_FAST_INSTALL - implement the --enable-fast-install flag
# Usage: AC_ENABLE_FAST_INSTALL[(DEFAULT)] # Usage: AC_ENABLE_FAST_INSTALL[(DEFAULT)]
# Where DEFAULT is either `yes' or `no'. If omitted, it defaults to # Where DEFAULT is either `yes' or `no'. If omitted, it defaults to
# `yes'. # `yes'.
AC_DEFUN(AC_ENABLE_FAST_INSTALL, AC_DEFUN(AC_ENABLE_FAST_INSTALL, [dnl
[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
AC_ARG_ENABLE(fast-install, AC_ARG_ENABLE(fast-install,
changequote(<<, >>)dnl changequote(<<, >>)dnl
<< --enable-fast-install[=PKGS] optimize for fast installation [default=>>AC_ENABLE_FAST_INSTALL_DEFAULT], << --enable-fast-install[=PKGS] optimize for fast installation [default=>>AC_ENABLE_FAST_INSTALL_DEFAULT],
...@@ -1424,9 +1456,8 @@ enable_fast_install=AC_ENABLE_FAST_INSTALL_DEFAULT)dnl ...@@ -1424,9 +1456,8 @@ enable_fast_install=AC_ENABLE_FAST_INSTALL_DEFAULT)dnl
]) ])
# AC_ENABLE_FAST_INSTALL - set the default to --disable-fast-install # AC_ENABLE_FAST_INSTALL - set the default to --disable-fast-install
AC_DEFUN(AC_DISABLE_FAST_INSTALL, AC_DEFUN(AC_DISABLE_FAST_INSTALL, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
[AC_ENABLE_FAST_INSTALL(no)]) AC_ENABLE_FAST_INSTALL(no)])
# AC_PROG_LD - find the path to the GNU or non-GNU linker # AC_PROG_LD - find the path to the GNU or non-GNU linker
AC_DEFUN(AC_PROG_LD, AC_DEFUN(AC_PROG_LD,
...@@ -1444,7 +1475,7 @@ if test "$ac_cv_prog_gcc" = yes; then ...@@ -1444,7 +1475,7 @@ if test "$ac_cv_prog_gcc" = yes; then
case "$ac_prog" in case "$ac_prog" in
# Accept absolute paths. # Accept absolute paths.
changequote(,)dnl changequote(,)dnl
/* | [A-Za-z]:[\\/]*) [\\/]* | [A-Za-z]:[\\/]*)
re_direlt='/[^/][^/]*/\.\./' re_direlt='/[^/][^/]*/\.\./'
changequote([,])dnl changequote([,])dnl
# Canonicalize the path of ld # Canonicalize the path of ld
...@@ -1470,10 +1501,10 @@ else ...@@ -1470,10 +1501,10 @@ else
fi fi
AC_CACHE_VAL(ac_cv_path_LD, AC_CACHE_VAL(ac_cv_path_LD,
[if test -z "$LD"; then [if test -z "$LD"; then
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
for ac_dir in $PATH; do for ac_dir in $PATH; do
test -z "$ac_dir" && ac_dir=. test -z "$ac_dir" && ac_dir=.
if test -f "$ac_dir/$ac_prog"; then if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
ac_cv_path_LD="$ac_dir/$ac_prog" ac_cv_path_LD="$ac_dir/$ac_prog"
# Check to see if the program is GNU ld. I'd rather use --version, # Check to see if the program is GNU ld. I'd rather use --version,
# but apparently some GNU ld's only accept -v. # but apparently some GNU ld's only accept -v.
...@@ -1496,7 +1527,6 @@ else ...@@ -1496,7 +1527,6 @@ else
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
fi fi
test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH]) test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
AC_SUBST(LD)
AC_PROG_LD_GNU AC_PROG_LD_GNU
]) ])
...@@ -1518,10 +1548,10 @@ AC_CACHE_VAL(ac_cv_path_NM, ...@@ -1518,10 +1548,10 @@ AC_CACHE_VAL(ac_cv_path_NM,
# Let the user override the test. # Let the user override the test.
ac_cv_path_NM="$NM" ac_cv_path_NM="$NM"
else else
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
test -z "$ac_dir" && ac_dir=. test -z "$ac_dir" && ac_dir=.
if test -f $ac_dir/nm; then if test -f $ac_dir/nm || test -f $ac_dir/nm$ac_exeext ; then
# Check to see if the nm accepts a BSD-compat flag. # Check to see if the nm accepts a BSD-compat flag.
# Adding the `sed 1q' prevents false positives on HP-UX, which says: # Adding the `sed 1q' prevents false positives on HP-UX, which says:
# nm: unknown option "B" ignored # nm: unknown option "B" ignored
...@@ -1542,230 +1572,24 @@ else ...@@ -1542,230 +1572,24 @@ else
fi]) fi])
NM="$ac_cv_path_NM" NM="$ac_cv_path_NM"
AC_MSG_RESULT([$NM]) AC_MSG_RESULT([$NM])
AC_SUBST(NM)
]) ])
# AC_SYS_NM_PARSE - Check for command to grab the raw symbol name followed # AC_CHECK_LIBM - check for math library
# by C symbol name from nm. AC_DEFUN(AC_CHECK_LIBM,
AC_DEFUN(AC_SYS_NM_PARSE,
[AC_REQUIRE([AC_CANONICAL_HOST])dnl [AC_REQUIRE([AC_CANONICAL_HOST])dnl
AC_REQUIRE([AC_PROG_NM])dnl LIBM=
# Check for command to grab the raw symbol name followed by C symbol from nm. case "$lt_target" in
AC_MSG_CHECKING([command to parse $NM output]) *-*-beos* | *-*-cygwin*)
AC_CACHE_VAL(ac_cv_sys_global_symbol_pipe, # These system don't have libm
[# These are sane defaults that work on at least a few old systems.
# {They come from Ultrix. What could be older than Ultrix?!! ;)}
changequote(,)dnl
# Character class describing NM global symbol codes.
ac_symcode='[BCDEGRST]'
# Regexp to match symbols that can be accessed directly from C.
ac_sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
# Transform the above into a raw symbol and a C symbol.
ac_symxfrm='\1 \2\3 \3'
# Transform an extracted symbol line into a proper C declaration
ac_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern char \1;/p'"
# Define system-specific variables.
case "$host_os" in
aix*)
ac_symcode='[BCDT]'
;;
cygwin* | mingw*)
ac_symcode='[ABCDGISTW]'
;; ;;
hpux*) *-ncr-sysv4.3*)
ac_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^. .* \(.*\)$/extern char \1;/p'" AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
AC_CHECK_LIB(m, main, LIBM="$LIBM -lm")
;; ;;
irix*) *)
ac_symcode='[BCDEGRST]' AC_CHECK_LIB(m, main, LIBM="-lm")
;;
solaris*)
ac_symcode='[BDT]'
;; ;;
esac esac
# If we're using GNU nm, then use its standard symbol codes.
if $NM -V 2>&1 | egrep '(GNU|with BFD)' > /dev/null; then
ac_symcode='[ABCDGISTW]'
fi
changequote([,])dnl
# Try without a prefix undercore, then with it.
for ac_symprfx in "" "_"; do
ac_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($ac_symcode\)[ ][ ]*\($ac_symprfx\)$ac_sympat$/$ac_symxfrm/p'"
# Check to see that the pipe works correctly.
ac_pipe_works=no
rm -f conftest.$ac_ext
cat > conftest.$ac_ext <<EOF
#ifdef __cplusplus
extern "C" {
#endif
char nm_test_var;
void nm_test_func(){}
#ifdef __cplusplus
}
#endif
int main(){nm_test_var='a';nm_test_func;return 0;}
EOF
if AC_TRY_EVAL(ac_compile); then
# Now try to grab the symbols.
ac_nlist=conftest.nm
if AC_TRY_EVAL(NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist) && test -s "$ac_nlist"; then
# Try sorting and uniquifying the output.
if sort "$ac_nlist" | uniq > "$ac_nlist"T; then
mv -f "$ac_nlist"T "$ac_nlist"
else
rm -f "$ac_nlist"T
fi
# Make sure that we snagged all the symbols we need.
if egrep ' nm_test_var$' "$ac_nlist" >/dev/null; then
if egrep ' nm_test_func$' "$ac_nlist" >/dev/null; then
cat <<EOF > conftest.c
#ifdef __cplusplus
extern "C" {
#endif
EOF
# Now generate the symbol file.
eval "$ac_global_symbol_to_cdecl"' < "$ac_nlist" >> conftest.c'
cat <<EOF >> conftest.c
#if defined (__STDC__) && __STDC__
# define lt_ptr_t void *
#else
# define lt_ptr_t char *
# define const
#endif
/* The mapping between symbol names and symbols. */
const struct {
const char *name;
lt_ptr_t address;
}
changequote(,)dnl
lt_preloaded_symbols[] =
changequote([,])dnl
{
EOF
sed 's/^. \(.*\) \(.*\)$/ {"\2", (lt_ptr_t) \&\2},/' < "$ac_nlist" >> conftest.c
cat <<\EOF >> conftest.c
{0, (lt_ptr_t) 0}
};
#ifdef __cplusplus
}
#endif
EOF
# Now try linking the two files.
mv conftest.$ac_objext conftestm.$ac_objext
ac_save_LIBS="$LIBS"
ac_save_CFLAGS="$CFLAGS"
LIBS="conftestm.$ac_objext"
CFLAGS="$CFLAGS$no_builtin_flag"
if AC_TRY_EVAL(ac_link) && test -s conftest; then
ac_pipe_works=yes
else
echo "configure: failed program was:" >&AC_FD_CC
cat conftest.c >&AC_FD_CC
fi
LIBS="$ac_save_LIBS"
CFLAGS="$ac_save_CFLAGS"
else
echo "cannot find nm_test_func in $ac_nlist" >&AC_FD_CC
fi
else
echo "cannot find nm_test_var in $ac_nlist" >&AC_FD_CC
fi
else
echo "cannot run $ac_cv_sys_global_symbol_pipe" >&AC_FD_CC
fi
else
echo "$progname: failed program was:" >&AC_FD_CC
cat conftest.c >&AC_FD_CC
fi
rm -rf conftest*
# Do not use the global_symbol_pipe unless it works.
if test "$ac_pipe_works" = yes; then
if test x"$ac_symprfx" = x"_"; then
ac_cv_sys_symbol_underscore=yes
else
ac_cv_sys_symbol_underscore=no
fi
break
else
ac_cv_sys_global_symbol_pipe=
fi
done
])
ac_result=yes
if test -z "$ac_cv_sys_global_symbol_pipe"; then
ac_result=no
fi
AC_MSG_RESULT($ac_result)
])
# AC_SYS_LIBTOOL_CYGWIN - find tools needed on cygwin
AC_DEFUN(AC_SYS_LIBTOOL_CYGWIN,
[AC_CHECK_TOOL(DLLTOOL, dlltool, false)
AC_CHECK_TOOL(AS, as, false)
])
# AC_SYS_SYMBOL_UNDERSCORE - does the compiler prefix global symbols
# with an underscore?
AC_DEFUN(AC_SYS_SYMBOL_UNDERSCORE,
[AC_REQUIRE([AC_PROG_NM])dnl
AC_REQUIRE([AC_SYS_NM_PARSE])dnl
AC_MSG_CHECKING([for _ prefix in compiled symbols])
AC_CACHE_VAL(ac_cv_sys_symbol_underscore,
[ac_cv_sys_symbol_underscore=no
cat > conftest.$ac_ext <<EOF
void nm_test_func(){}
int main(){nm_test_func;return 0;}
EOF
if AC_TRY_EVAL(ac_compile); then
# Now try to grab the symbols.
ac_nlist=conftest.nm
if AC_TRY_EVAL(NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist) && test -s "$ac_nlist"; then
# See whether the symbols have a leading underscore.
if egrep '^. _nm_test_func' "$ac_nlist" >/dev/null; then
ac_cv_sys_symbol_underscore=yes
else
if egrep '^. nm_test_func ' "$ac_nlist" >/dev/null; then
:
else
echo "configure: cannot find nm_test_func in $ac_nlist" >&AC_FD_CC
fi
fi
else
echo "configure: cannot run $ac_cv_sys_global_symbol_pipe" >&AC_FD_CC
fi
else
echo "configure: failed program was:" >&AC_FD_CC
cat conftest.c >&AC_FD_CC
fi
rm -rf conftest*
])
AC_MSG_RESULT($ac_cv_sys_symbol_underscore)
USE_SYMBOL_UNDERSCORE=${ac_cv_sys_symbol_underscore=no}
AC_SUBST(USE_SYMBOL_UNDERSCORE)dnl
])
# AC_CHECK_LIBM - check for math library
AC_DEFUN(AC_CHECK_LIBM, [
AC_CHECK_LIB(mw, _mwvalidcheckl)
AC_CHECK_LIB(m, cos)
]) ])
# AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for # AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for
...@@ -1776,13 +1600,14 @@ AC_CHECK_LIB(m, cos) ...@@ -1776,13 +1600,14 @@ AC_CHECK_LIB(m, cos)
# '${top_builddir}/' (note the single quotes!) if your package is not # '${top_builddir}/' (note the single quotes!) if your package is not
# flat, and, if you're not using automake, define top_builddir as # flat, and, if you're not using automake, define top_builddir as
# appropriate in the Makefiles. # appropriate in the Makefiles.
AC_DEFUN(AC_LIBLTDL_CONVENIENCE, [ AC_DEFUN(AC_LIBLTDL_CONVENIENCE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
case "$enable_ltdl_convenience" in case "$enable_ltdl_convenience" in
no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;; no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
"") enable_ltdl_convenience=yes "") enable_ltdl_convenience=yes
ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;; ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
esac esac
LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdlc.la LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdlc.la
INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl'])
]) ])
# AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for # AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for
...@@ -1794,16 +1619,23 @@ AC_DEFUN(AC_LIBLTDL_CONVENIENCE, [ ...@@ -1794,16 +1619,23 @@ AC_DEFUN(AC_LIBLTDL_CONVENIENCE, [
# flat, and, if you're not using automake, define top_builddir as # flat, and, if you're not using automake, define top_builddir as
# appropriate in the Makefiles. # appropriate in the Makefiles.
# In the future, this macro may have to be called after AC_PROG_LIBTOOL. # In the future, this macro may have to be called after AC_PROG_LIBTOOL.
AC_DEFUN(AC_LIBLTDL_INSTALLABLE, [ AC_DEFUN(AC_LIBLTDL_INSTALLABLE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
AC_CHECK_LIB(ltdl, main, LIBLTDL="-lltdl", [ AC_CHECK_LIB(ltdl, main,
case "$enable_ltdl_install" in [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
no) AC_MSG_WARN([libltdl not installed, but installation disabled]) ;; [if test x"$enable_ltdl_install" = xno; then
"") enable_ltdl_install=yes AC_MSG_WARN([libltdl not installed, but installation disabled])
ac_configure_args="$ac_configure_args --enable-ltdl-install" ;; else
esac enable_ltdl_install=yes
fi
]) ])
if test x"$enable_ltdl_install" != x"no"; then if test x"$enable_ltdl_install" = x"yes"; then
ac_configure_args="$ac_configure_args --enable-ltdl-install"
LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdl.la LIBLTDL=ifelse($#,1,$1,['${top_builddir}/libltdl'])/libltdl.la
INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl'])
else
ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
LIBLTDL="-lltdl"
INCLTDL=
fi fi
]) ])
...@@ -1815,9 +1647,9 @@ AC_DEFUN(AM_DISABLE_SHARED, [indir([AC_DISABLE_SHARED], $@)])dnl ...@@ -1815,9 +1647,9 @@ AC_DEFUN(AM_DISABLE_SHARED, [indir([AC_DISABLE_SHARED], $@)])dnl
AC_DEFUN(AM_DISABLE_STATIC, [indir([AC_DISABLE_STATIC], $@)])dnl AC_DEFUN(AM_DISABLE_STATIC, [indir([AC_DISABLE_STATIC], $@)])dnl
AC_DEFUN(AM_PROG_LD, [indir([AC_PROG_LD])])dnl AC_DEFUN(AM_PROG_LD, [indir([AC_PROG_LD])])dnl
AC_DEFUN(AM_PROG_NM, [indir([AC_PROG_NM])])dnl AC_DEFUN(AM_PROG_NM, [indir([AC_PROG_NM])])dnl
AC_DEFUN(AM_SYS_NM_PARSE, [indir([AC_SYS_NM_PARSE])])dnl
AC_DEFUN(AM_SYS_SYMBOL_UNDERSCORE, [indir([AC_SYS_SYMBOL_UNDERSCORE])])dnl dnl This is just to silence aclocal about the macro not being used
AC_DEFUN(AM_SYS_LIBTOOL_CYGWIN, [indir([AC_SYS_LIBTOOL_CYGWIN])])dnl ifelse([AC_DISABLE_FAST_INSTALL])dnl
# Like AC_CONFIG_HEADER, but automatically create stamp file. # Like AC_CONFIG_HEADER, but automatically create stamp file.
......
libstdc++-v3/bits/char_traits.h
...@@ -247,7 +247,7 @@ namespace std { ...@@ -247,7 +247,7 @@ namespace std {
static size_t static size_t
length(const char_type* __s) length(const char_type* __s)
{ return wcslen (__s); } { return wcslen(__s); }
static const char_type* static const char_type*
find(const char_type* __s, size_t __n, const char_type& __a) find(const char_type* __s, size_t __n, const char_type& __a)
......
libstdc++-v3/bits/limits_generic.h
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
#include <bits/c++config.h> #include <bits/c++config.h>
#include <bits/std_cfloat.h> #include <bits/std_cfloat.h>
#include <bits/std_climits.h> #include <bits/std_climits.h>
#if defined( _GLIBCPP_USE_WCHAR_T) && defined(_GLIBCPP_HAS_WCHAR_MIN_MAX) #if defined( _GLIBCPP_USE_WCHAR_T)
#include <bits/std_cwchar.h> #include <bits/std_cwchar.h>
#endif #endif
...@@ -299,7 +299,7 @@ namespace std { ...@@ -299,7 +299,7 @@ namespace std {
static const float_round_style round_style = round_toward_zero; static const float_round_style round_style = round_toward_zero;
}; };
#if defined( _GLIBCPP_USE_WCHAR_T) && defined(_GLIBCPP_HAS_WCHAR_MIN_MAX) #if defined( _GLIBCPP_USE_WCHAR_T)
template<> struct numeric_limits<wchar_t> { template<> struct numeric_limits<wchar_t> {
static const bool is_specialized = true; static const bool is_specialized = true;
......
libstdc++-v3/bits/std_cwchar.h
...@@ -37,54 +37,21 @@ ...@@ -37,54 +37,21 @@
#define _CPP_CWCHAR 1 #define _CPP_CWCHAR 1
#include <bits/c++config.h> #include <bits/c++config.h>
#ifdef _GLIBCPP_USE_WCHAR_T
#if _GLIBCPP_USE_WCHAR_T
# pragma system_header # pragma system_header
# include_next <wchar.h> # include_next <wchar.h>
#endif #else
# ifdef _GLIBCPP_NEED_MBSTATE_T
extern "C" { extern "C"
{
#ifdef _GLIBCPP_USE_WCHAR_T
#ifndef _GLIBCPP_HAVE_WMEMCMP
int wmemcmp(const wchar_t* __s1, const wchar_t* __s2, size_t __n);
#endif
#ifndef _GLIBCPP_HAVE_WCSLEN
size_t wcslen(const wchar_t* __s);
#endif
#ifndef _GLIBCPP_HAVE_WMEMCHR
wchar_t* wmemchr(const wchar_t* __s, wchar_t __c, size_t __n);
#endif
#ifndef _GLIBCPP_HAVE_WMEMMOVE
wchar_t* wmemmove(wchar_t* __s1, const wchar_t* __s2, size_t __n);
#endif
#ifndef _GLIBCPP_HAVE_WMEMCPY
wchar_t* wmemcpy(wchar_t* __s1, const wchar_t* __s2, size_t __n);
#endif
#ifndef _GLIBCPP_HAVE_WMEMSET
wchar_t* wmemset(wchar_t* __s, wchar_t __c, size_t __n);
#endif
#endif //_GLIBCPP_USE_WCHAR_T
// NB: mbstate_t should be defined in <cwchar>, as per
// 21.2 p5
// If not, autoconf will
// detect this with some configure time magic and define
// _GLIBCPP_NEED_MBSTATE_T (see config.h in the build directory.)
#ifdef _GLIBCPP_NEED_MBSTATE_T
typedef struct typedef struct
{ {
int __fill[6]; int __fill[6];
} mbstate_t; } mbstate_t;
#endif
} }
# endif
#endif //_GLIBCPP_USE_WCHAR_T
#endif // _CPP_CWCHAR #endif // _CPP_CWCHAR
......
libstdc++-v3/bits/std_cwctype.h
// -*- C++ -*- forwarding header. // -*- C++ -*- forwarding header.
// Copyright (C) 1997-1999 Free Software Foundation, Inc. // Copyright (C) 1997-1999, 2000 Free Software Foundation, Inc.
// //
// This file is part of the GNU ISO C++ Library. This library is free // This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the // software; you can redistribute it and/or modify it under the
...@@ -34,11 +34,6 @@ ...@@ -34,11 +34,6 @@
#ifndef _CPP_CWCTYPE #ifndef _CPP_CWCTYPE
#define _CPP_CWCTYPE 1 #define _CPP_CWCTYPE 1
// This keeps isanum, et al from being propagated as macros.
#if __linux__
#define __NO_WCTYPE 1
#endif
# pragma system_header # pragma system_header
# include_next <wctype.h> # include_next <wctype.h>
......
libstdc++-v3/config.h.in
...@@ -12,11 +12,6 @@ ...@@ -12,11 +12,6 @@
// around. // around.
#undef _GLIBCPP_NEED_MBSTATE_T #undef _GLIBCPP_NEED_MBSTATE_T
// Define if WCHAR_MIN and WCHAR_MAX are in the <cwchar_t>
// header. Presently, this is needed so that solaris won't
// instantitate numeric_limits<wchar_t>
#undef _GLIBCPP_HAS_WCHAR_MIN_MAX
// Define if code specialized for wchar_t should be used. // Define if code specialized for wchar_t should be used.
#undef _GLIBCPP_USE_WCHAR_T #undef _GLIBCPP_USE_WCHAR_T
...@@ -290,6 +285,15 @@ ...@@ -290,6 +285,15 @@
/* Define if you have the hypotl function. */ /* Define if you have the hypotl function. */
#undef HAVE_HYPOTL #undef HAVE_HYPOTL
/* Define if you have the iconv function. */
#undef HAVE_ICONV
/* Define if you have the iconv_close function. */
#undef HAVE_ICONV_CLOSE
/* Define if you have the iconv_open function. */
#undef HAVE_ICONV_OPEN
/* Define if you have the isinf function. */ /* Define if you have the isinf function. */
#undef HAVE_ISINF #undef HAVE_ISINF
......
libstdc++-v3/configure
...@@ -30,7 +30,7 @@ ac_help="$ac_help ...@@ -30,7 +30,7 @@ ac_help="$ac_help
ac_help="$ac_help ac_help="$ac_help
--with-gnu-ld assume the C compiler uses GNU ld [default=no]" --with-gnu-ld assume the C compiler uses GNU ld [default=no]"
ac_help="$ac_help ac_help="$ac_help
--disable-libtool-lock force libtool not to do file locking" --disable-libtool-lock avoid locking (might break parallel builds)"
ac_help="$ac_help ac_help="$ac_help
--enable-debug extra debugging, turn off optimization [default=no]" --enable-debug extra debugging, turn off optimization [default=no]"
ac_help="$ac_help ac_help="$ac_help
...@@ -64,7 +64,6 @@ program_suffix=NONE ...@@ -64,7 +64,6 @@ program_suffix=NONE
program_transform_name=s,x,x, program_transform_name=s,x,x,
silent= silent=
site= site=
sitefile=
srcdir= srcdir=
target=NONE target=NONE
verbose= verbose=
...@@ -179,7 +178,6 @@ Configuration: ...@@ -179,7 +178,6 @@ Configuration:
--help print this message --help print this message
--no-create do not create output files --no-create do not create output files
--quiet, --silent do not print \`checking...' messages --quiet, --silent do not print \`checking...' messages
--site-file=FILE use FILE as the site file
--version print the version of autoconf that created configure --version print the version of autoconf that created configure
Directory and file names: Directory and file names:
--prefix=PREFIX install architecture-independent files in PREFIX --prefix=PREFIX install architecture-independent files in PREFIX
...@@ -350,11 +348,6 @@ EOF ...@@ -350,11 +348,6 @@ EOF
-site=* | --site=* | --sit=*) -site=* | --site=* | --sit=*)
site="$ac_optarg" ;; site="$ac_optarg" ;;
-site-file | --site-file | --site-fil | --site-fi | --site-f)
ac_prev=sitefile ;;
-site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*)
sitefile="$ac_optarg" ;;
-srcdir | --srcdir | --srcdi | --srcd | --src | --sr) -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
ac_prev=srcdir ;; ac_prev=srcdir ;;
-srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
...@@ -520,16 +513,12 @@ fi ...@@ -520,16 +513,12 @@ fi
srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'` srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
# Prefer explicitly selected file to automatically selected ones. # Prefer explicitly selected file to automatically selected ones.
if test -z "$sitefile"; then if test -z "$CONFIG_SITE"; then
if test -z "$CONFIG_SITE"; then
if test "x$prefix" != xNONE; then if test "x$prefix" != xNONE; then
CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
else else
CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
fi fi
fi
else
CONFIG_SITE="$sitefile"
fi fi
for ac_site_file in $CONFIG_SITE; do for ac_site_file in $CONFIG_SITE; do
if test -r "$ac_site_file"; then if test -r "$ac_site_file"; then
...@@ -617,7 +606,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } ...@@ -617,7 +606,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
fi fi
echo $ac_n "checking host system type""... $ac_c" 1>&6 echo $ac_n "checking host system type""... $ac_c" 1>&6
echo "configure:621: checking host system type" >&5 echo "configure:610: checking host system type" >&5
host_alias=$host host_alias=$host
case "$host_alias" in case "$host_alias" in
...@@ -638,7 +627,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` ...@@ -638,7 +627,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
echo "$ac_t""$host" 1>&6 echo "$ac_t""$host" 1>&6
echo $ac_n "checking target system type""... $ac_c" 1>&6 echo $ac_n "checking target system type""... $ac_c" 1>&6
echo "configure:642: checking target system type" >&5 echo "configure:631: checking target system type" >&5
target_alias=$target target_alias=$target
case "$target_alias" in case "$target_alias" in
...@@ -656,7 +645,7 @@ target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` ...@@ -656,7 +645,7 @@ target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
echo "$ac_t""$target" 1>&6 echo "$ac_t""$target" 1>&6
echo $ac_n "checking build system type""... $ac_c" 1>&6 echo $ac_n "checking build system type""... $ac_c" 1>&6
echo "configure:660: checking build system type" >&5 echo "configure:649: checking build system type" >&5
build_alias=$build build_alias=$build
case "$build_alias" in case "$build_alias" in
...@@ -705,7 +694,7 @@ fi ...@@ -705,7 +694,7 @@ fi
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# ./install, which can be erroneously created by make from ./install.sh. # ./install, which can be erroneously created by make from ./install.sh.
echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
echo "configure:709: checking for a BSD compatible install" >&5 echo "configure:698: checking for a BSD compatible install" >&5
if test -z "$INSTALL"; then if test -z "$INSTALL"; then
if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
...@@ -758,7 +747,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' ...@@ -758,7 +747,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6 echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
echo "configure:762: checking whether build environment is sane" >&5 echo "configure:751: checking whether build environment is sane" >&5
# Just in case # Just in case
sleep 1 sleep 1
echo timestamp > conftestfile echo timestamp > conftestfile
...@@ -815,7 +804,7 @@ test "$program_suffix" != NONE && ...@@ -815,7 +804,7 @@ test "$program_suffix" != NONE &&
test "$program_transform_name" = "" && program_transform_name="s,x,x," test "$program_transform_name" = "" && program_transform_name="s,x,x,"
echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
echo "configure:819: checking whether ${MAKE-make} sets \${MAKE}" >&5 echo "configure:808: checking whether ${MAKE-make} sets \${MAKE}" >&5
set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
...@@ -848,12 +837,12 @@ else ...@@ -848,12 +837,12 @@ else
fi fi
echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
echo "configure:852: checking for Cygwin environment" >&5 echo "configure:841: checking for Cygwin environment" >&5
if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 857 "configure" #line 846 "configure"
#include "confdefs.h" #include "confdefs.h"
int main() { int main() {
...@@ -864,7 +853,7 @@ int main() { ...@@ -864,7 +853,7 @@ int main() {
return __CYGWIN__; return __CYGWIN__;
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:868: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:857: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest* rm -rf conftest*
ac_cv_cygwin=yes ac_cv_cygwin=yes
else else
...@@ -881,19 +870,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6 ...@@ -881,19 +870,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6
CYGWIN= CYGWIN=
test "$ac_cv_cygwin" = yes && CYGWIN=yes test "$ac_cv_cygwin" = yes && CYGWIN=yes
echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6 echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
echo "configure:885: checking for mingw32 environment" >&5 echo "configure:874: checking for mingw32 environment" >&5
if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 890 "configure" #line 879 "configure"
#include "confdefs.h" #include "confdefs.h"
int main() { int main() {
return __MINGW32__; return __MINGW32__;
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:897: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:886: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest* rm -rf conftest*
ac_cv_mingw32=yes ac_cv_mingw32=yes
else else
...@@ -940,7 +929,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } ...@@ -940,7 +929,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
fi fi
echo $ac_n "checking host system type""... $ac_c" 1>&6 echo $ac_n "checking host system type""... $ac_c" 1>&6
echo "configure:944: checking host system type" >&5 echo "configure:933: checking host system type" >&5
host_alias=$host host_alias=$host
case "$host_alias" in case "$host_alias" in
...@@ -981,7 +970,7 @@ EOF ...@@ -981,7 +970,7 @@ EOF
missing_dir=`cd $ac_aux_dir && pwd` missing_dir=`cd $ac_aux_dir && pwd`
echo $ac_n "checking for working aclocal""... $ac_c" 1>&6 echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
echo "configure:985: checking for working aclocal" >&5 echo "configure:974: checking for working aclocal" >&5
# Run test in a subshell; some versions of sh will print an error if # Run test in a subshell; some versions of sh will print an error if
# an executable is not found, even if stderr is redirected. # an executable is not found, even if stderr is redirected.
# Redirect stdin to placate older versions of autoconf. Sigh. # Redirect stdin to placate older versions of autoconf. Sigh.
...@@ -994,7 +983,7 @@ else ...@@ -994,7 +983,7 @@ else
fi fi
echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
echo "configure:998: checking for working autoconf" >&5 echo "configure:987: checking for working autoconf" >&5
# Run test in a subshell; some versions of sh will print an error if # Run test in a subshell; some versions of sh will print an error if
# an executable is not found, even if stderr is redirected. # an executable is not found, even if stderr is redirected.
# Redirect stdin to placate older versions of autoconf. Sigh. # Redirect stdin to placate older versions of autoconf. Sigh.
...@@ -1007,7 +996,7 @@ else ...@@ -1007,7 +996,7 @@ else
fi fi
echo $ac_n "checking for working automake""... $ac_c" 1>&6 echo $ac_n "checking for working automake""... $ac_c" 1>&6
echo "configure:1011: checking for working automake" >&5 echo "configure:1000: checking for working automake" >&5
# Run test in a subshell; some versions of sh will print an error if # Run test in a subshell; some versions of sh will print an error if
# an executable is not found, even if stderr is redirected. # an executable is not found, even if stderr is redirected.
# Redirect stdin to placate older versions of autoconf. Sigh. # Redirect stdin to placate older versions of autoconf. Sigh.
...@@ -1020,7 +1009,7 @@ else ...@@ -1020,7 +1009,7 @@ else
fi fi
echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
echo "configure:1024: checking for working autoheader" >&5 echo "configure:1013: checking for working autoheader" >&5
# Run test in a subshell; some versions of sh will print an error if # Run test in a subshell; some versions of sh will print an error if
# an executable is not found, even if stderr is redirected. # an executable is not found, even if stderr is redirected.
# Redirect stdin to placate older versions of autoconf. Sigh. # Redirect stdin to placate older versions of autoconf. Sigh.
...@@ -1033,7 +1022,7 @@ else ...@@ -1033,7 +1022,7 @@ else
fi fi
echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
echo "configure:1037: checking for working makeinfo" >&5 echo "configure:1026: checking for working makeinfo" >&5
# Run test in a subshell; some versions of sh will print an error if # Run test in a subshell; some versions of sh will print an error if
# an executable is not found, even if stderr is redirected. # an executable is not found, even if stderr is redirected.
# Redirect stdin to placate older versions of autoconf. Sigh. # Redirect stdin to placate older versions of autoconf. Sigh.
...@@ -1059,7 +1048,7 @@ fi ...@@ -1059,7 +1048,7 @@ fi
# Extract the first word of "gcc", so it can be a program name with args. # Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2 set dummy gcc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:1063: checking for $ac_word" >&5 echo "configure:1052: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -1089,7 +1078,7 @@ if test -z "$CC"; then ...@@ -1089,7 +1078,7 @@ if test -z "$CC"; then
# Extract the first word of "cc", so it can be a program name with args. # Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2 set dummy cc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:1093: checking for $ac_word" >&5 echo "configure:1082: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -1138,7 +1127,7 @@ fi ...@@ -1138,7 +1127,7 @@ fi
fi fi
echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
echo "configure:1142: checking whether we are using GNU C" >&5 echo "configure:1131: checking whether we are using GNU C" >&5
if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -1147,7 +1136,7 @@ else ...@@ -1147,7 +1136,7 @@ else
yes; yes;
#endif #endif
EOF EOF
if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1151: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1140: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
ac_cv_prog_gcc=yes ac_cv_prog_gcc=yes
else else
ac_cv_prog_gcc=no ac_cv_prog_gcc=no
...@@ -1162,7 +1151,7 @@ if test $ac_cv_prog_gcc = yes; then ...@@ -1162,7 +1151,7 @@ if test $ac_cv_prog_gcc = yes; then
ac_save_CFLAGS="$CFLAGS" ac_save_CFLAGS="$CFLAGS"
CFLAGS= CFLAGS=
echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
echo "configure:1166: checking whether ${CC-cc} accepts -g" >&5 echo "configure:1155: checking whether ${CC-cc} accepts -g" >&5
if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -1199,7 +1188,7 @@ do ...@@ -1199,7 +1188,7 @@ do
# Extract the first word of "$ac_prog", so it can be a program name with args. # Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2 set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:1203: checking for $ac_word" >&5 echo "configure:1192: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -1232,7 +1221,7 @@ test -n "$CXX" || CXX="gcc" ...@@ -1232,7 +1221,7 @@ test -n "$CXX" || CXX="gcc"
test -z "$CXX" && { echo "configure: error: no acceptable c++ found in \$PATH" 1>&2; exit 1; } test -z "$CXX" && { echo "configure: error: no acceptable c++ found in \$PATH" 1>&2; exit 1; }
echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
echo "configure:1236: checking whether we are using GNU C++" >&5 echo "configure:1225: checking whether we are using GNU C++" >&5
if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -1241,7 +1230,7 @@ else ...@@ -1241,7 +1230,7 @@ else
yes; yes;
#endif #endif
EOF EOF
if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1245: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1234: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
ac_cv_prog_gxx=yes ac_cv_prog_gxx=yes
else else
ac_cv_prog_gxx=no ac_cv_prog_gxx=no
...@@ -1256,7 +1245,7 @@ if test $ac_cv_prog_gxx = yes; then ...@@ -1256,7 +1245,7 @@ if test $ac_cv_prog_gxx = yes; then
ac_save_CXXFLAGS="$CXXFLAGS" ac_save_CXXFLAGS="$CXXFLAGS"
CXXFLAGS= CXXFLAGS=
echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
echo "configure:1260: checking whether ${CXX-g++} accepts -g" >&5 echo "configure:1249: checking whether ${CXX-g++} accepts -g" >&5
if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -1289,7 +1278,7 @@ fi ...@@ -1289,7 +1278,7 @@ fi
# LIBGCJ_CONFIGURE, which doesn't work because that means that it will # LIBGCJ_CONFIGURE, which doesn't work because that means that it will
# be run before AC_CANONICAL_HOST. # be run before AC_CANONICAL_HOST.
echo $ac_n "checking build system type""... $ac_c" 1>&6 echo $ac_n "checking build system type""... $ac_c" 1>&6
echo "configure:1293: checking build system type" >&5 echo "configure:1282: checking build system type" >&5
build_alias=$build build_alias=$build
case "$build_alias" in case "$build_alias" in
...@@ -1310,7 +1299,7 @@ echo "$ac_t""$build" 1>&6 ...@@ -1310,7 +1299,7 @@ echo "$ac_t""$build" 1>&6
# Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
set dummy ${ac_tool_prefix}as; ac_word=$2 set dummy ${ac_tool_prefix}as; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:1314: checking for $ac_word" >&5 echo "configure:1303: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -1342,7 +1331,7 @@ fi ...@@ -1342,7 +1331,7 @@ fi
# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
set dummy ${ac_tool_prefix}ar; ac_word=$2 set dummy ${ac_tool_prefix}ar; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:1346: checking for $ac_word" >&5 echo "configure:1335: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -1374,7 +1363,7 @@ fi ...@@ -1374,7 +1363,7 @@ fi
# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
set dummy ${ac_tool_prefix}ranlib; ac_word=$2 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:1378: checking for $ac_word" >&5 echo "configure:1367: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -1406,7 +1395,7 @@ if test -n "$ac_tool_prefix"; then ...@@ -1406,7 +1395,7 @@ if test -n "$ac_tool_prefix"; then
# Extract the first word of "ranlib", so it can be a program name with args. # Extract the first word of "ranlib", so it can be a program name with args.
set dummy ranlib; ac_word=$2 set dummy ranlib; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:1410: checking for $ac_word" >&5 echo "configure:1399: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -1451,7 +1440,7 @@ fi ...@@ -1451,7 +1440,7 @@ fi
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# ./install, which can be erroneously created by make from ./install.sh. # ./install, which can be erroneously created by make from ./install.sh.
echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
echo "configure:1455: checking for a BSD compatible install" >&5 echo "configure:1444: checking for a BSD compatible install" >&5
if test -z "$INSTALL"; then if test -z "$INSTALL"; then
if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
...@@ -1505,7 +1494,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' ...@@ -1505,7 +1494,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
echo "configure:1509: checking whether to enable maintainer-specific portions of Makefiles" >&5 echo "configure:1498: checking whether to enable maintainer-specific portions of Makefiles" >&5
# Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
if test "${enable_maintainer_mode+set}" = set; then if test "${enable_maintainer_mode+set}" = set; then
enableval="$enable_maintainer_mode" enableval="$enable_maintainer_mode"
...@@ -1539,7 +1528,7 @@ if false; then ...@@ -1539,7 +1528,7 @@ if false; then
echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
echo "configure:1543: checking for executable suffix" >&5 echo "configure:1532: checking for executable suffix" >&5
if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -1549,10 +1538,10 @@ else ...@@ -1549,10 +1538,10 @@ else
rm -f conftest* rm -f conftest*
echo 'int main () { return 0; }' > conftest.$ac_ext echo 'int main () { return 0; }' > conftest.$ac_ext
ac_cv_exeext= ac_cv_exeext=
if { (eval echo configure:1553: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then if { (eval echo configure:1542: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
for file in conftest.*; do for file in conftest.*; do
case $file in case $file in
*.c | *.o | *.obj | *.ilk | *.pdb) ;; *.c | *.o | *.obj) ;;
*) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;; *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
esac esac
done done
...@@ -1590,7 +1579,7 @@ GLIBCPP_CXXFLAGS="${glibcpp_cxxflags}" ...@@ -1590,7 +1579,7 @@ GLIBCPP_CXXFLAGS="${glibcpp_cxxflags}"
lt_dlopen=yes
# Check whether --enable-shared or --disable-shared was given. # Check whether --enable-shared or --disable-shared was given.
if test "${enable_shared+set}" = set; then if test "${enable_shared+set}" = set; then
enableval="$enable_shared" enableval="$enable_shared"
...@@ -1663,7 +1652,7 @@ fi ...@@ -1663,7 +1652,7 @@ fi
# Extract the first word of "ranlib", so it can be a program name with args. # Extract the first word of "ranlib", so it can be a program name with args.
set dummy ranlib; ac_word=$2 set dummy ranlib; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:1667: checking for $ac_word" >&5 echo "configure:1656: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -1702,11 +1691,11 @@ ac_prog=ld ...@@ -1702,11 +1691,11 @@ ac_prog=ld
if test "$ac_cv_prog_gcc" = yes; then if test "$ac_cv_prog_gcc" = yes; then
# Check if gcc -print-prog-name=ld gives a path. # Check if gcc -print-prog-name=ld gives a path.
echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6 echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
echo "configure:1706: checking for ld used by GCC" >&5 echo "configure:1695: checking for ld used by GCC" >&5
ac_prog=`($CC -print-prog-name=ld) 2>&5` ac_prog=`($CC -print-prog-name=ld) 2>&5`
case "$ac_prog" in case "$ac_prog" in
# Accept absolute paths. # Accept absolute paths.
/* | [A-Za-z]:[\\/]*) [\\/]* | [A-Za-z]:[\\/]*)
re_direlt='/[^/][^/]*/\.\./' re_direlt='/[^/][^/]*/\.\./'
# Canonicalize the path of ld # Canonicalize the path of ld
ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'` ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
...@@ -1726,19 +1715,19 @@ echo "configure:1706: checking for ld used by GCC" >&5 ...@@ -1726,19 +1715,19 @@ echo "configure:1706: checking for ld used by GCC" >&5
esac esac
elif test "$with_gnu_ld" = yes; then elif test "$with_gnu_ld" = yes; then
echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
echo "configure:1730: checking for GNU ld" >&5 echo "configure:1719: checking for GNU ld" >&5
else else
echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
echo "configure:1733: checking for non-GNU ld" >&5 echo "configure:1722: checking for non-GNU ld" >&5
fi fi
if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
if test -z "$LD"; then if test -z "$LD"; then
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
for ac_dir in $PATH; do for ac_dir in $PATH; do
test -z "$ac_dir" && ac_dir=. test -z "$ac_dir" && ac_dir=.
if test -f "$ac_dir/$ac_prog"; then if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
ac_cv_path_LD="$ac_dir/$ac_prog" ac_cv_path_LD="$ac_dir/$ac_prog"
# Check to see if the program is GNU ld. I'd rather use --version, # Check to see if the program is GNU ld. I'd rather use --version,
# but apparently some GNU ld's only accept -v. # but apparently some GNU ld's only accept -v.
...@@ -1763,9 +1752,8 @@ else ...@@ -1763,9 +1752,8 @@ else
echo "$ac_t""no" 1>&6 echo "$ac_t""no" 1>&6
fi fi
test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; } test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6 echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
echo "configure:1769: checking if the linker ($LD) is GNU ld" >&5 echo "configure:1757: checking if the linker ($LD) is GNU ld" >&5
if eval "test \"`echo '$''{'ac_cv_prog_gnu_ld'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_gnu_ld'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -1781,7 +1769,7 @@ echo "$ac_t""$ac_cv_prog_gnu_ld" 1>&6 ...@@ -1781,7 +1769,7 @@ echo "$ac_t""$ac_cv_prog_gnu_ld" 1>&6
echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6 echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6
echo "configure:1785: checking for BSD-compatible nm" >&5 echo "configure:1773: checking for BSD-compatible nm" >&5
if eval "test \"`echo '$''{'ac_cv_path_NM'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_path_NM'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -1789,10 +1777,10 @@ else ...@@ -1789,10 +1777,10 @@ else
# Let the user override the test. # Let the user override the test.
ac_cv_path_NM="$NM" ac_cv_path_NM="$NM"
else else
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
test -z "$ac_dir" && ac_dir=. test -z "$ac_dir" && ac_dir=.
if test -f $ac_dir/nm; then if test -f $ac_dir/nm || test -f $ac_dir/nm$ac_exeext ; then
# Check to see if the nm accepts a BSD-compat flag. # Check to see if the nm accepts a BSD-compat flag.
# Adding the `sed 1q' prevents false positives on HP-UX, which says: # Adding the `sed 1q' prevents false positives on HP-UX, which says:
# nm: unknown option "B" ignored # nm: unknown option "B" ignored
...@@ -1816,213 +1804,8 @@ fi ...@@ -1816,213 +1804,8 @@ fi
NM="$ac_cv_path_NM" NM="$ac_cv_path_NM"
echo "$ac_t""$NM" 1>&6 echo "$ac_t""$NM" 1>&6
# Check for command to grab the raw symbol name followed by C symbol from nm.
echo $ac_n "checking command to parse $NM output""... $ac_c" 1>&6
echo "configure:1823: checking command to parse $NM output" >&5
if eval "test \"`echo '$''{'ac_cv_sys_global_symbol_pipe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
# These are sane defaults that work on at least a few old systems.
# {They come from Ultrix. What could be older than Ultrix?!! ;)}
# Character class describing NM global symbol codes.
ac_symcode='[BCDEGRST]'
# Regexp to match symbols that can be accessed directly from C.
ac_sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
# Transform the above into a raw symbol and a C symbol.
ac_symxfrm='\1 \2\3 \3'
# Transform an extracted symbol line into a proper C declaration
ac_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern char \1;/p'"
# Define system-specific variables.
case "$host_os" in
aix*)
ac_symcode='[BCDT]'
;;
cygwin* | mingw*)
ac_symcode='[ABCDGISTW]'
;;
hpux*)
ac_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^. .* \(.*\)$/extern char \1;/p'"
;;
irix*)
ac_symcode='[BCDEGRST]'
;;
solaris*)
ac_symcode='[BDT]'
;;
esac
# If we're using GNU nm, then use its standard symbol codes.
if $NM -V 2>&1 | egrep '(GNU|with BFD)' > /dev/null; then
ac_symcode='[ABCDGISTW]'
fi
# Try without a prefix undercore, then with it.
for ac_symprfx in "" "_"; do
ac_cv_sys_global_symbol_pipe="sed -n -e 's/^.* \($ac_symcode\) *\($ac_symprfx\)$ac_sympat$/$ac_symxfrm/p'"
# Check to see that the pipe works correctly.
ac_pipe_works=no
rm -f conftest.$ac_ext
cat > conftest.$ac_ext <<EOF
#ifdef __cplusplus
extern "C" {
#endif
char nm_test_var;
void nm_test_func(){}
#ifdef __cplusplus
}
#endif
int main(){nm_test_var='a';nm_test_func;return 0;}
EOF
if { (eval echo configure:1886: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
# Now try to grab the symbols.
ac_nlist=conftest.nm
if { (eval echo configure:1890: \"$NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist) 2>&5; } && test -s "$ac_nlist"; then
# Try sorting and uniquifying the output.
if sort "$ac_nlist" | uniq > "$ac_nlist"T; then
mv -f "$ac_nlist"T "$ac_nlist"
else
rm -f "$ac_nlist"T
fi
# Make sure that we snagged all the symbols we need.
if egrep ' nm_test_var$' "$ac_nlist" >/dev/null; then
if egrep ' nm_test_func$' "$ac_nlist" >/dev/null; then
cat <<EOF > conftest.c
#ifdef __cplusplus
extern "C" {
#endif
EOF
# Now generate the symbol file.
eval "$ac_global_symbol_to_cdecl"' < "$ac_nlist" >> conftest.c'
cat <<EOF >> conftest.c
#if defined (__STDC__) && __STDC__
# define lt_ptr_t void *
#else
# define lt_ptr_t char *
# define const
#endif
/* The mapping between symbol names and symbols. */
const struct {
const char *name;
lt_ptr_t address;
}
lt_preloaded_symbols[] =
{
EOF
sed 's/^. \(.*\) \(.*\)$/ {"\2", (lt_ptr_t) \&\2},/' < "$ac_nlist" >> conftest.c
cat <<\EOF >> conftest.c
{0, (lt_ptr_t) 0}
};
#ifdef __cplusplus
}
#endif
EOF
# Now try linking the two files.
mv conftest.$ac_objext conftestm.$ac_objext
ac_save_LIBS="$LIBS"
ac_save_CFLAGS="$CFLAGS"
LIBS="conftestm.$ac_objext"
CFLAGS="$CFLAGS$no_builtin_flag"
if { (eval echo configure:1942: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
ac_pipe_works=yes
else
echo "configure: failed program was:" >&5
cat conftest.c >&5
fi
LIBS="$ac_save_LIBS"
CFLAGS="$ac_save_CFLAGS"
else
echo "cannot find nm_test_func in $ac_nlist" >&5
fi
else
echo "cannot find nm_test_var in $ac_nlist" >&5
fi
else
echo "cannot run $ac_cv_sys_global_symbol_pipe" >&5
fi
else
echo "$progname: failed program was:" >&5
cat conftest.c >&5
fi
rm -rf conftest*
# Do not use the global_symbol_pipe unless it works.
if test "$ac_pipe_works" = yes; then
if test x"$ac_symprfx" = x"_"; then
ac_cv_sys_symbol_underscore=yes
else
ac_cv_sys_symbol_underscore=no
fi
break
else
ac_cv_sys_global_symbol_pipe=
fi
done
fi
ac_result=yes
if test -z "$ac_cv_sys_global_symbol_pipe"; then
ac_result=no
fi
echo "$ac_t""$ac_result" 1>&6
echo $ac_n "checking for _ prefix in compiled symbols""... $ac_c" 1>&6
echo "configure:1988: checking for _ prefix in compiled symbols" >&5
if eval "test \"`echo '$''{'ac_cv_sys_symbol_underscore'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_cv_sys_symbol_underscore=no
cat > conftest.$ac_ext <<EOF
void nm_test_func(){}
int main(){nm_test_func;return 0;}
EOF
if { (eval echo configure:1997: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
# Now try to grab the symbols.
ac_nlist=conftest.nm
if { (eval echo configure:2000: \"$NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist) 2>&5; } && test -s "$ac_nlist"; then
# See whether the symbols have a leading underscore.
if egrep '^. _nm_test_func' "$ac_nlist" >/dev/null; then
ac_cv_sys_symbol_underscore=yes
else
if egrep '^. nm_test_func ' "$ac_nlist" >/dev/null; then
:
else
echo "configure: cannot find nm_test_func in $ac_nlist" >&5
fi
fi
else
echo "configure: cannot run $ac_cv_sys_global_symbol_pipe" >&5
fi
else
echo "configure: failed program was:" >&5
cat conftest.c >&5
fi
rm -rf conftest*
fi
echo "$ac_t""$ac_cv_sys_symbol_underscore" 1>&6
USE_SYMBOL_UNDERSCORE=${ac_cv_sys_symbol_underscore=no}
echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
echo "configure:2026: checking whether ln -s works" >&5 echo "configure:1809: checking whether ln -s works" >&5
if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -2043,23 +1826,36 @@ else ...@@ -2043,23 +1826,36 @@ else
fi fi
case "$target" in
NONE) lt_target="$host" ;;
*) lt_target="$target" ;;
esac
# Check for any special flags to pass to ltconfig. # Check for any special flags to pass to ltconfig.
libtool_flags="--cache-file=$cache_file" libtool_flags="--cache-file=$cache_file"
test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared" test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static" test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install" test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install"
test "$lt_dlopen" = yes && libtool_flags="$libtool_flags --enable-dlopen"
test "$silent" = yes && libtool_flags="$libtool_flags --silent"
test "$ac_cv_prog_gcc" = yes && libtool_flags="$libtool_flags --with-gcc" test "$ac_cv_prog_gcc" = yes && libtool_flags="$libtool_flags --with-gcc"
test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld" test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
libtool_flags="$libtool_flags --enable-dlopen"
# Check whether --enable-libtool-lock or --disable-libtool-lock was given.
if test "${enable_libtool_lock+set}" = set; then
enableval="$enable_libtool_lock"
:
fi
test "x$enable_libtool_lock" = xno && libtool_flags="$libtool_flags --disable-lock"
test x"$silent" = xyes && libtool_flags="$libtool_flags --silent"
# Some flags need to be propagated to the compiler or linker for good # Some flags need to be propagated to the compiler or linker for good
# libtool support. # libtool support.
case "$host" in case "$lt_target" in
*-*-irix6*) *-*-irix6*)
# Find out which ABI we are using. # Find out which ABI we are using.
echo '#line 2062 "configure"' > conftest.$ac_ext echo '#line 1858 "configure"' > conftest.$ac_ext
if { (eval echo configure:2063: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:1859: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
case "`/usr/bin/file conftest.o`" in case "`/usr/bin/file conftest.o`" in
*32-bit*) *32-bit*)
LD="${LD-ld} -32" LD="${LD-ld} -32"
...@@ -2080,19 +1876,19 @@ case "$host" in ...@@ -2080,19 +1876,19 @@ case "$host" in
SAVE_CFLAGS="$CFLAGS" SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -belf" CFLAGS="$CFLAGS -belf"
echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6 echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6
echo "configure:2084: checking whether the C compiler needs -belf" >&5 echo "configure:1880: checking whether the C compiler needs -belf" >&5
if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 2089 "configure" #line 1885 "configure"
#include "confdefs.h" #include "confdefs.h"
int main() { int main() {
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:2096: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:1892: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
lt_cv_cc_needs_belf=yes lt_cv_cc_needs_belf=yes
else else
...@@ -2111,161 +1907,9 @@ echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6 ...@@ -2111,161 +1907,9 @@ echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6
fi fi
;; ;;
*-*-cygwin*)
# Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
set dummy ${ac_tool_prefix}dlltool; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:2119: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
if test -n "$DLLTOOL"; then
ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
else
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
ac_dummy="$PATH"
for ac_dir in $ac_dummy; do
test -z "$ac_dir" && ac_dir=.
if test -f $ac_dir/$ac_word; then
ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
break
fi
done
IFS="$ac_save_ifs"
fi
fi
DLLTOOL="$ac_cv_prog_DLLTOOL"
if test -n "$DLLTOOL"; then
echo "$ac_t""$DLLTOOL" 1>&6
else
echo "$ac_t""no" 1>&6
fi
if test -z "$ac_cv_prog_DLLTOOL"; then
if test -n "$ac_tool_prefix"; then
# Extract the first word of "dlltool", so it can be a program name with args.
set dummy dlltool; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:2151: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
if test -n "$DLLTOOL"; then
ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
else
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
ac_dummy="$PATH"
for ac_dir in $ac_dummy; do
test -z "$ac_dir" && ac_dir=.
if test -f $ac_dir/$ac_word; then
ac_cv_prog_DLLTOOL="dlltool"
break
fi
done
IFS="$ac_save_ifs"
test -z "$ac_cv_prog_DLLTOOL" && ac_cv_prog_DLLTOOL="false"
fi
fi
DLLTOOL="$ac_cv_prog_DLLTOOL"
if test -n "$DLLTOOL"; then
echo "$ac_t""$DLLTOOL" 1>&6
else
echo "$ac_t""no" 1>&6
fi
else
DLLTOOL="false"
fi
fi
# Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
set dummy ${ac_tool_prefix}as; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:2186: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
if test -n "$AS"; then
ac_cv_prog_AS="$AS" # Let the user override the test.
else
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
ac_dummy="$PATH"
for ac_dir in $ac_dummy; do
test -z "$ac_dir" && ac_dir=.
if test -f $ac_dir/$ac_word; then
ac_cv_prog_AS="${ac_tool_prefix}as"
break
fi
done
IFS="$ac_save_ifs"
fi
fi
AS="$ac_cv_prog_AS"
if test -n "$AS"; then
echo "$ac_t""$AS" 1>&6
else
echo "$ac_t""no" 1>&6
fi
if test -z "$ac_cv_prog_AS"; then
if test -n "$ac_tool_prefix"; then
# Extract the first word of "as", so it can be a program name with args.
set dummy as; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:2218: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
if test -n "$AS"; then
ac_cv_prog_AS="$AS" # Let the user override the test.
else
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
ac_dummy="$PATH"
for ac_dir in $ac_dummy; do
test -z "$ac_dir" && ac_dir=.
if test -f $ac_dir/$ac_word; then
ac_cv_prog_AS="as"
break
fi
done
IFS="$ac_save_ifs"
test -z "$ac_cv_prog_AS" && ac_cv_prog_AS="false"
fi
fi
AS="$ac_cv_prog_AS"
if test -n "$AS"; then
echo "$ac_t""$AS" 1>&6
else
echo "$ac_t""no" 1>&6
fi
else
AS="false"
fi
fi
;;
esac esac
# enable the --disable-libtool-lock switch
# Check whether --enable-libtool-lock or --disable-libtool-lock was given.
if test "${enable_libtool_lock+set}" = set; then
enableval="$enable_libtool_lock"
need_locks=$enableval
else
need_locks=yes
fi
if test x"$need_locks" = xno; then
libtool_flags="$libtool_flags --disable-lock"
fi
# Save cache, so that ltconfig can load it # Save cache, so that ltconfig can load it
cat > confcache <<\EOF cat > confcache <<\EOF
...@@ -2318,10 +1962,11 @@ rm -f confcache ...@@ -2318,10 +1962,11 @@ rm -f confcache
# Actually configure libtool. ac_aux_dir is where install-sh is found. # Actually configure libtool. ac_aux_dir is where install-sh is found.
CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \ CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
LD="$LD" NM="$NM" RANLIB="$RANLIB" LN_S="$LN_S" \ LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
DLLTOOL="$DLLTOOL" AS="$AS" \ LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \ ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \ $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $lt_target \
|| { echo "configure: error: libtool configure failed" 1>&2; exit 1; } || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
# Reload cache, that may have been modified by ltconfig # Reload cache, that may have been modified by ltconfig
...@@ -2350,7 +1995,7 @@ exec 5>>./config.log ...@@ -2350,7 +1995,7 @@ exec 5>>./config.log
# Check for c++ or library specific bits that don't require linking. # Check for c++ or library specific bits that don't require linking.
echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6
echo "configure:2354: checking how to run the C++ preprocessor" >&5 echo "configure:1999: checking how to run the C++ preprocessor" >&5
if test -z "$CXXCPP"; then if test -z "$CXXCPP"; then
if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
...@@ -2363,12 +2008,12 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes ...@@ -2363,12 +2008,12 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes
cross_compiling=$ac_cv_prog_cxx_cross cross_compiling=$ac_cv_prog_cxx_cross
CXXCPP="${CXX-g++} -E" CXXCPP="${CXX-g++} -E"
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 2367 "configure" #line 2012 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <stdlib.h> #include <stdlib.h>
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:2372: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:2017: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
: :
...@@ -2410,9 +2055,9 @@ cross_compiling=$ac_cv_prog_cxx_cross ...@@ -2410,9 +2055,9 @@ cross_compiling=$ac_cv_prog_cxx_cross
# Sanity check that g++ is capable of dealing with v-3. # Sanity check that g++ is capable of dealing with v-3.
echo $ac_n "checking for g++ that will successfully compile this code""... $ac_c" 1>&6 echo $ac_n "checking for g++ that will successfully compile this code""... $ac_c" 1>&6
echo "configure:2414: checking for g++ that will successfully compile this code" >&5 echo "configure:2059: checking for g++ that will successfully compile this code" >&5
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 2416 "configure" #line 2061 "configure"
#include "confdefs.h" #include "confdefs.h"
#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95) #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95)
...@@ -2434,10 +2079,10 @@ rm -f conftest* ...@@ -2434,10 +2079,10 @@ rm -f conftest*
# Check for pragma system_header. # Check for pragma system_header.
echo $ac_n "checking for g++ that supports pragma system_header""... $ac_c" 1>&6 echo $ac_n "checking for g++ that supports pragma system_header""... $ac_c" 1>&6
echo "configure:2438: checking for g++ that supports pragma system_header" >&5 echo "configure:2083: checking for g++ that supports pragma system_header" >&5
CXXFLAGS='-Wunknown-pragmas -Werror' CXXFLAGS='-Wunknown-pragmas -Werror'
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 2441 "configure" #line 2086 "configure"
#include "confdefs.h" #include "confdefs.h"
#pragma system_header #pragma system_header
int main() { int main() {
...@@ -2445,7 +2090,7 @@ int foo; ...@@ -2445,7 +2090,7 @@ int foo;
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:2449: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:2094: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest* rm -rf conftest*
ac_newpragma=yes ac_newpragma=yes
else else
...@@ -2468,10 +2113,10 @@ rm -f conftest* ...@@ -2468,10 +2113,10 @@ rm -f conftest*
# Check for more sophisticated diagnostic control. # Check for more sophisticated diagnostic control.
echo $ac_n "checking for g++ that supports -fdiagnostics-show-location=once""... $ac_c" 1>&6 echo $ac_n "checking for g++ that supports -fdiagnostics-show-location=once""... $ac_c" 1>&6
echo "configure:2472: checking for g++ that supports -fdiagnostics-show-location=once" >&5 echo "configure:2117: checking for g++ that supports -fdiagnostics-show-location=once" >&5
CXXFLAGS='-fdiagnostics-show-location=once' CXXFLAGS='-fdiagnostics-show-location=once'
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 2475 "configure" #line 2120 "configure"
#include "confdefs.h" #include "confdefs.h"
int main() { int main() {
...@@ -2479,7 +2124,7 @@ int foo; ...@@ -2479,7 +2124,7 @@ int foo;
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:2483: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:2128: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest* rm -rf conftest*
ac_gabydiags=yes ac_gabydiags=yes
else else
...@@ -2512,7 +2157,7 @@ cross_compiling=$ac_cv_prog_cc_cross ...@@ -2512,7 +2157,7 @@ cross_compiling=$ac_cv_prog_cc_cross
echo $ac_n "checking for cpu primitives directory""... $ac_c" 1>&6 echo $ac_n "checking for cpu primitives directory""... $ac_c" 1>&6
echo "configure:2516: checking for cpu primitives directory" >&5 echo "configure:2161: checking for cpu primitives directory" >&5
CPUFLAGS= CPUFLAGS=
case "$target_cpu" in case "$target_cpu" in
alpha*) alpha*)
...@@ -2569,7 +2214,7 @@ esac ...@@ -2569,7 +2214,7 @@ esac
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
echo "configure:2573: checking how to run the C preprocessor" >&5 echo "configure:2218: checking how to run the C preprocessor" >&5
# On Suns, sometimes $CPP names a directory. # On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then if test -n "$CPP" && test -d "$CPP"; then
CPP= CPP=
...@@ -2584,13 +2229,13 @@ else ...@@ -2584,13 +2229,13 @@ else
# On the NeXT, cc -E runs the code through the compiler's parser, # On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp. # not just through cpp.
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 2588 "configure" #line 2233 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <assert.h> #include <assert.h>
Syntax Error Syntax Error
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:2594: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:2239: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
: :
...@@ -2601,13 +2246,13 @@ else ...@@ -2601,13 +2246,13 @@ else
rm -rf conftest* rm -rf conftest*
CPP="${CC-cc} -E -traditional-cpp" CPP="${CC-cc} -E -traditional-cpp"
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 2605 "configure" #line 2250 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <assert.h> #include <assert.h>
Syntax Error Syntax Error
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:2611: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:2256: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
: :
...@@ -2618,13 +2263,13 @@ else ...@@ -2618,13 +2263,13 @@ else
rm -rf conftest* rm -rf conftest*
CPP="${CC-cc} -nologo -E" CPP="${CC-cc} -nologo -E"
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 2622 "configure" #line 2267 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <assert.h> #include <assert.h>
Syntax Error Syntax Error
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:2628: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:2273: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
: :
...@@ -2650,7 +2295,7 @@ echo "$ac_t""$CPP" 1>&6 ...@@ -2650,7 +2295,7 @@ echo "$ac_t""$CPP" 1>&6
echo $ac_n "checking for cstdio to use""... $ac_c" 1>&6 echo $ac_n "checking for cstdio to use""... $ac_c" 1>&6
echo "configure:2654: checking for cstdio to use" >&5 echo "configure:2299: checking for cstdio to use" >&5
# Check whether --enable-cstdio or --disable-cstdio was given. # Check whether --enable-cstdio or --disable-cstdio was given.
if test "${enable_cstdio+set}" = set; then if test "${enable_cstdio+set}" = set; then
enableval="$enable_cstdio" enableval="$enable_cstdio"
...@@ -2674,17 +2319,17 @@ fi ...@@ -2674,17 +2319,17 @@ fi
# see if we are on a system with libio native (ie, linux) # see if we are on a system with libio native (ie, linux)
ac_safe=`echo "libio.h" | sed 'y%./+-%__p_%'` ac_safe=`echo "libio.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for libio.h""... $ac_c" 1>&6 echo $ac_n "checking for libio.h""... $ac_c" 1>&6
echo "configure:2678: checking for libio.h" >&5 echo "configure:2323: checking for libio.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 2683 "configure" #line 2328 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <libio.h> #include <libio.h>
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:2688: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:2333: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
rm -rf conftest* rm -rf conftest*
...@@ -2719,17 +2364,17 @@ fi ...@@ -2719,17 +2364,17 @@ fi
# NB: This replaces the _G_CONFIG_H machinery in libio-v2 # NB: This replaces the _G_CONFIG_H machinery in libio-v2
ac_safe=`echo "_G_config.h" | sed 'y%./+-%__p_%'` ac_safe=`echo "_G_config.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for _G_config.h""... $ac_c" 1>&6 echo $ac_n "checking for _G_config.h""... $ac_c" 1>&6
echo "configure:2723: checking for _G_config.h" >&5 echo "configure:2368: checking for _G_config.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 2728 "configure" #line 2373 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <_G_config.h> #include <_G_config.h>
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:2733: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:2378: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
rm -rf conftest* rm -rf conftest*
...@@ -2788,8 +2433,6 @@ else ...@@ -2788,8 +2433,6 @@ else
fi fi
echo $ac_n "checking for enabled long long""... $ac_c" 1>&6
echo "configure:2793: checking for enabled long long" >&5
# Check whether --enable-long-long or --disable-long-long was given. # Check whether --enable-long-long or --disable-long-long was given.
if test "${enable_long_long+set}" = set; then if test "${enable_long_long+set}" = set; then
enableval="$enable_long_long" enableval="$enable_long_long"
...@@ -2804,12 +2447,12 @@ fi ...@@ -2804,12 +2447,12 @@ fi
# Check for the existance of functions used if long long is enabled. # Check for the existance of functions used if long long is enabled.
echo $ac_n "checking for strtoll""... $ac_c" 1>&6 echo $ac_n "checking for strtoll""... $ac_c" 1>&6
echo "configure:2808: checking for strtoll" >&5 echo "configure:2451: checking for strtoll" >&5
if eval "test \"`echo '$''{'ac_cv_func_strtoll'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_func_strtoll'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 2813 "configure" #line 2456 "configure"
#include "confdefs.h" #include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes, /* System header to define __stub macros and hopefully few prototypes,
which can conflict with char strtoll(); below. */ which can conflict with char strtoll(); below. */
...@@ -2832,7 +2475,7 @@ strtoll(); ...@@ -2832,7 +2475,7 @@ strtoll();
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:2836: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:2479: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_func_strtoll=yes" eval "ac_cv_func_strtoll=yes"
else else
...@@ -2853,12 +2496,12 @@ ac_strtoll=no ...@@ -2853,12 +2496,12 @@ ac_strtoll=no
fi fi
echo $ac_n "checking for strtoull""... $ac_c" 1>&6 echo $ac_n "checking for strtoull""... $ac_c" 1>&6
echo "configure:2857: checking for strtoull" >&5 echo "configure:2500: checking for strtoull" >&5
if eval "test \"`echo '$''{'ac_cv_func_strtoull'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_func_strtoull'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 2862 "configure" #line 2505 "configure"
#include "confdefs.h" #include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes, /* System header to define __stub macros and hopefully few prototypes,
which can conflict with char strtoull(); below. */ which can conflict with char strtoull(); below. */
...@@ -2881,7 +2524,7 @@ strtoull(); ...@@ -2881,7 +2524,7 @@ strtoull();
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:2885: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:2528: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_func_strtoull=yes" eval "ac_cv_func_strtoull=yes"
else else
...@@ -2902,11 +2545,13 @@ ac_strtoull=no ...@@ -2902,11 +2545,13 @@ ac_strtoull=no
fi fi
echo $ac_n "checking for enabled long long""... $ac_c" 1>&6
echo "configure:2550: checking for enabled long long" >&5
if test x"$ac_strtoll" = xno || test x"$ac_strtoull" = xno; then if test x"$ac_strtoll" = xno || test x"$ac_strtoull" = xno; then
enable_long_long=no; enable_long_long=no;
fi; unset ac_ll fi;
echo "$ac_t""$enable_long_long" 1>&6 echo "$ac_t""$enable_long_long" 1>&6
case "$enable_long_long" in case "$enable_long_long" in
yes) cat >> confdefs.h <<\EOF yes) cat >> confdefs.h <<\EOF
#define _GLIBCPP_USE_LONG_LONG 1 #define _GLIBCPP_USE_LONG_LONG 1
...@@ -2916,7 +2561,7 @@ EOF ...@@ -2916,7 +2561,7 @@ EOF
esac esac
echo $ac_n "checking for enabled cshadow headers""... $ac_c" 1>&6 echo $ac_n "checking for enabled cshadow headers""... $ac_c" 1>&6
echo "configure:2920: checking for enabled cshadow headers" >&5 echo "configure:2565: checking for enabled cshadow headers" >&5
# Check whether --enable-cshadow-headers or --disable-cshadow-headers was given. # Check whether --enable-cshadow-headers or --disable-cshadow-headers was given.
if test "${enable_cshadow_headers+set}" = set; then if test "${enable_cshadow_headers+set}" = set; then
enableval="$enable_cshadow_headers" enableval="$enable_cshadow_headers"
...@@ -2957,7 +2602,7 @@ fi ...@@ -2957,7 +2602,7 @@ fi
echo $ac_n "checking for threads package to use""... $ac_c" 1>&6 echo $ac_n "checking for threads package to use""... $ac_c" 1>&6
echo "configure:2961: checking for threads package to use" >&5 echo "configure:2606: checking for threads package to use" >&5
# Check whether --enable-threads or --disable-threads was given. # Check whether --enable-threads or --disable-threads was given.
if test "${enable_threads+set}" = set; then if test "${enable_threads+set}" = set; then
enableval="$enable_threads" enableval="$enable_threads"
...@@ -3020,17 +2665,17 @@ fi ...@@ -3020,17 +2665,17 @@ fi
posix) posix)
ac_safe=`echo "pthread.h" | sed 'y%./+-%__p_%'` ac_safe=`echo "pthread.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for pthread.h""... $ac_c" 1>&6 echo $ac_n "checking for pthread.h""... $ac_c" 1>&6
echo "configure:3024: checking for pthread.h" >&5 echo "configure:2669: checking for pthread.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 3029 "configure" #line 2674 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <pthread.h> #include <pthread.h>
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:3034: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:2679: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
rm -rf conftest* rm -rf conftest*
...@@ -3219,17 +2864,17 @@ else ...@@ -3219,17 +2864,17 @@ else
do do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:3223: checking for $ac_hdr" >&5 echo "configure:2868: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 3228 "configure" #line 2873 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <$ac_hdr> #include <$ac_hdr>
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:3233: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:2878: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
rm -rf conftest* rm -rf conftest*
...@@ -3259,7 +2904,7 @@ done ...@@ -3259,7 +2904,7 @@ done
echo $ac_n "checking for GNU C++ __complex__ support""... $ac_c" 1>&6 echo $ac_n "checking for GNU C++ __complex__ support""... $ac_c" 1>&6
echo "configure:3263: checking for GNU C++ __complex__ support" >&5 echo "configure:2908: checking for GNU C++ __complex__ support" >&5
if eval "test \"`echo '$''{'glibcpp_cv_complex'+set}'`\" = set"; then if eval "test \"`echo '$''{'glibcpp_cv_complex'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -3273,7 +2918,7 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes ...@@ -3273,7 +2918,7 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes
cross_compiling=$ac_cv_prog_cxx_cross cross_compiling=$ac_cv_prog_cxx_cross
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 3277 "configure" #line 2922 "configure"
#include "confdefs.h" #include "confdefs.h"
struct dcomplex { __complex__ double x; }; \ struct dcomplex { __complex__ double x; }; \
dcomplex f(const dcomplex& x) { return dcomplex(x); } dcomplex f(const dcomplex& x) { return dcomplex(x); }
...@@ -3282,7 +2927,7 @@ int main() { ...@@ -3282,7 +2927,7 @@ int main() {
dcomplex x; f(x); dcomplex x; f(x);
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:3286: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:2931: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest* rm -rf conftest*
glibcpp_cv_complex=ok glibcpp_cv_complex=ok
else else
...@@ -3314,7 +2959,7 @@ EOF ...@@ -3314,7 +2959,7 @@ EOF
echo $ac_n "checking for GNU C++ __complex__ float support""... $ac_c" 1>&6 echo $ac_n "checking for GNU C++ __complex__ float support""... $ac_c" 1>&6
echo "configure:3318: checking for GNU C++ __complex__ float support" >&5 echo "configure:2963: checking for GNU C++ __complex__ float support" >&5
if eval "test \"`echo '$''{'glibcpp_cv_float_complex'+set}'`\" = set"; then if eval "test \"`echo '$''{'glibcpp_cv_float_complex'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -3347,14 +2992,14 @@ cross_compiling=$ac_cv_prog_cxx_cross ...@@ -3347,14 +2992,14 @@ cross_compiling=$ac_cv_prog_cxx_cross
}; };
EOB EOB
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 3351 "configure" #line 2996 "configure"
#include "confdefs.h" #include "confdefs.h"
#include "conftest.h" #include "conftest.h"
int main() { int main() {
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:3358: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:3003: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest* rm -rf conftest*
glibcpp_cv_float_complex=ok glibcpp_cv_float_complex=ok
else else
...@@ -3385,16 +3030,16 @@ EOF ...@@ -3385,16 +3030,16 @@ EOF
echo $ac_n "checking for __builtin_sinf""... $ac_c" 1>&6 echo $ac_n "checking for __builtin_sinf""... $ac_c" 1>&6
echo "configure:3389: checking for __builtin_sinf" >&5 echo "configure:3034: checking for __builtin_sinf" >&5
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 3391 "configure" #line 3036 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <math.h> #include <math.h>
int main() { int main() {
float foo(void) { __builtin_sinf(0.0); } float foo(void) { __builtin_sinf(0.0); }
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:3398: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:3043: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest* rm -rf conftest*
use_builtin_sinf=yes use_builtin_sinf=yes
else else
...@@ -3413,16 +3058,16 @@ EOF ...@@ -3413,16 +3058,16 @@ EOF
fi fi
echo $ac_n "checking for __builtin_cosf""... $ac_c" 1>&6 echo $ac_n "checking for __builtin_cosf""... $ac_c" 1>&6
echo "configure:3417: checking for __builtin_cosf" >&5 echo "configure:3062: checking for __builtin_cosf" >&5
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 3419 "configure" #line 3064 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <math.h> #include <math.h>
int main() { int main() {
float foo(void) { __builtin_cosf(0.0); } float foo(void) { __builtin_cosf(0.0); }
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:3426: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:3071: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest* rm -rf conftest*
use_builtin_cosf=yes use_builtin_cosf=yes
else else
...@@ -3441,16 +3086,16 @@ EOF ...@@ -3441,16 +3086,16 @@ EOF
fi fi
echo $ac_n "checking for __builtin_fabsf""... $ac_c" 1>&6 echo $ac_n "checking for __builtin_fabsf""... $ac_c" 1>&6
echo "configure:3445: checking for __builtin_fabsf" >&5 echo "configure:3090: checking for __builtin_fabsf" >&5
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 3447 "configure" #line 3092 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <math.h> #include <math.h>
int main() { int main() {
float foo(void) { __builtin_fabsf(0.0); } float foo(void) { __builtin_fabsf(0.0); }
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:3454: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:3099: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest* rm -rf conftest*
use_builtin_fabsf=yes use_builtin_fabsf=yes
else else
...@@ -3469,16 +3114,16 @@ EOF ...@@ -3469,16 +3114,16 @@ EOF
fi fi
echo $ac_n "checking for __builtin_sqrtf""... $ac_c" 1>&6 echo $ac_n "checking for __builtin_sqrtf""... $ac_c" 1>&6
echo "configure:3473: checking for __builtin_sqrtf" >&5 echo "configure:3118: checking for __builtin_sqrtf" >&5
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 3475 "configure" #line 3120 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <math.h> #include <math.h>
int main() { int main() {
float foo(void) { __builtin_sqrtf(0.0); } float foo(void) { __builtin_sqrtf(0.0); }
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:3482: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:3127: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest* rm -rf conftest*
use_builtin_sqrtf=yes use_builtin_sqrtf=yes
else else
...@@ -3498,7 +3143,7 @@ EOF ...@@ -3498,7 +3143,7 @@ EOF
echo $ac_n "checking for sin in -lm""... $ac_c" 1>&6 echo $ac_n "checking for sin in -lm""... $ac_c" 1>&6
echo "configure:3502: checking for sin in -lm" >&5 echo "configure:3147: checking for sin in -lm" >&5
ac_lib_var=`echo m'_'sin | sed 'y%./+-%__p_%'` ac_lib_var=`echo m'_'sin | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
...@@ -3506,7 +3151,7 @@ else ...@@ -3506,7 +3151,7 @@ else
ac_save_LIBS="$LIBS" ac_save_LIBS="$LIBS"
LIBS="-lm $LIBS" LIBS="-lm $LIBS"
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 3510 "configure" #line 3155 "configure"
#include "confdefs.h" #include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */ /* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2 /* We use char because int might match the return type of a gcc2
...@@ -3517,7 +3162,7 @@ int main() { ...@@ -3517,7 +3162,7 @@ int main() {
sin() sin()
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:3521: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:3166: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes" eval "ac_cv_lib_$ac_lib_var=yes"
else else
...@@ -3544,17 +3189,17 @@ fi ...@@ -3544,17 +3189,17 @@ fi
do do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:3548: checking for $ac_hdr" >&5 echo "configure:3193: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 3553 "configure" #line 3198 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <$ac_hdr> #include <$ac_hdr>
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:3558: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:3203: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
rm -rf conftest* rm -rf conftest*
...@@ -3586,12 +3231,12 @@ done ...@@ -3586,12 +3231,12 @@ done
carg cargf nan hypot hypotf atan2f expf copysignf carg cargf nan hypot hypotf atan2f expf copysignf
do do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
echo "configure:3590: checking for $ac_func" >&5 echo "configure:3235: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 3595 "configure" #line 3240 "configure"
#include "confdefs.h" #include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes, /* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */ which can conflict with char $ac_func(); below. */
...@@ -3614,7 +3259,7 @@ $ac_func(); ...@@ -3614,7 +3259,7 @@ $ac_func();
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:3618: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:3263: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_func_$ac_func=yes" eval "ac_cv_func_$ac_func=yes"
else else
...@@ -3643,12 +3288,12 @@ done ...@@ -3643,12 +3288,12 @@ done
USE_LONG_DOUBLE=no USE_LONG_DOUBLE=no
echo $ac_n "checking for copysignl""... $ac_c" 1>&6 echo $ac_n "checking for copysignl""... $ac_c" 1>&6
echo "configure:3647: checking for copysignl" >&5 echo "configure:3292: checking for copysignl" >&5
if eval "test \"`echo '$''{'ac_cv_func_copysignl'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_func_copysignl'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 3652 "configure" #line 3297 "configure"
#include "confdefs.h" #include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes, /* System header to define __stub macros and hopefully few prototypes,
which can conflict with char copysignl(); below. */ which can conflict with char copysignl(); below. */
...@@ -3671,7 +3316,7 @@ copysignl(); ...@@ -3671,7 +3316,7 @@ copysignl();
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:3675: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:3320: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_func_copysignl=yes" eval "ac_cv_func_copysignl=yes"
else else
...@@ -3690,12 +3335,12 @@ if eval "test \"`echo '$ac_cv_func_'copysignl`\" = yes"; then ...@@ -3690,12 +3335,12 @@ if eval "test \"`echo '$ac_cv_func_'copysignl`\" = yes"; then
csqrtl ctanhl ctanl cargl hypotl signbitl c_logl clog10l csqrtl ctanhl ctanl cargl hypotl signbitl c_logl clog10l
do do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
echo "configure:3694: checking for $ac_func" >&5 echo "configure:3339: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 3699 "configure" #line 3344 "configure"
#include "confdefs.h" #include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes, /* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */ which can conflict with char $ac_func(); below. */
...@@ -3718,7 +3363,7 @@ $ac_func(); ...@@ -3718,7 +3363,7 @@ $ac_func();
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:3722: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:3367: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_func_$ac_func=yes" eval "ac_cv_func_$ac_func=yes"
else else
...@@ -3756,12 +3401,12 @@ fi ...@@ -3756,12 +3401,12 @@ fi
fpclass qfpclass fpclass qfpclass
do do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
echo "configure:3760: checking for $ac_func" >&5 echo "configure:3405: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 3765 "configure" #line 3410 "configure"
#include "confdefs.h" #include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes, /* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */ which can conflict with char $ac_func(); below. */
...@@ -3784,7 +3429,7 @@ $ac_func(); ...@@ -3784,7 +3429,7 @@ $ac_func();
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:3788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:3433: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_func_$ac_func=yes" eval "ac_cv_func_$ac_func=yes"
else else
...@@ -3819,12 +3464,12 @@ _strtof _strtold _fabsf _sincos _sincosf _sincosl _finite _finitef _qfinite \ ...@@ -3819,12 +3464,12 @@ _strtof _strtold _fabsf _sincos _sincosf _sincosl _finite _finitef _qfinite \
_fpclass _qfpclass _fpclass _qfpclass
do do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
echo "configure:3823: checking for $ac_func" >&5 echo "configure:3468: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 3828 "configure" #line 3473 "configure"
#include "confdefs.h" #include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes, /* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */ which can conflict with char $ac_func(); below. */
...@@ -3847,7 +3492,7 @@ $ac_func(); ...@@ -3847,7 +3492,7 @@ $ac_func();
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:3851: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:3496: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_func_$ac_func=yes" eval "ac_cv_func_$ac_func=yes"
else else
...@@ -3875,19 +3520,54 @@ done ...@@ -3875,19 +3520,54 @@ done
LIBS="$save_LIBS" LIBS="$save_LIBS"
ac_safe=`echo "wchar.h" | sed 'y%./+-%__p_%'` ac_safe=`echo "wchar.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for wchar.h""... $ac_c" 1>&6 echo $ac_n "checking for wchar.h""... $ac_c" 1>&6
echo "configure:3881: checking for wchar.h" >&5 echo "configure:3527: checking for wchar.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 3886 "configure" #line 3532 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <wchar.h> #include <wchar.h>
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:3891: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:3537: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
eval "ac_cv_header_$ac_safe=yes"
else
echo "$ac_err" >&5
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
eval "ac_cv_header_$ac_safe=no"
fi
rm -f conftest*
fi
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
echo "$ac_t""yes" 1>&6
ac_has_wchar_h=yes
else
echo "$ac_t""no" 1>&6
ac_has_wchar_h=no
fi
ac_safe=`echo "wctype.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for wctype.h""... $ac_c" 1>&6
echo "configure:3561: checking for wctype.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 3566 "configure"
#include "confdefs.h"
#include <wctype.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:3571: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
rm -rf conftest* rm -rf conftest*
...@@ -3903,18 +3583,26 @@ rm -f conftest* ...@@ -3903,18 +3583,26 @@ rm -f conftest*
fi fi
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
echo "$ac_t""yes" 1>&6 echo "$ac_t""yes" 1>&6
ac_has_wctype_h=yes
else
echo "$ac_t""no" 1>&6
ac_has_wctype_h=no
fi
if test x"$ac_has_wchar_h" = xyes && test x"$ac_has_wctype_h" = xyes; then
echo $ac_n "checking for native mbstate_t""... $ac_c" 1>&6 echo $ac_n "checking for mbstate_t""... $ac_c" 1>&6
echo "configure:3909: checking for native mbstate_t" >&5 echo "configure:3597: checking for mbstate_t" >&5
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 3911 "configure" #line 3599 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <wchar.h> #include <wchar.h>
int main() { int main() {
mbstate_t teststate; mbstate_t teststate;
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:3918: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:3606: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest* rm -rf conftest*
use_native_mbstatet=yes use_native_mbstatet=yes
else else
...@@ -3925,7 +3613,7 @@ else ...@@ -3925,7 +3613,7 @@ else
fi fi
rm -f conftest* rm -f conftest*
echo "$ac_t""$use_native_mbstatet" 1>&6 echo "$ac_t""$use_native_mbstatet" 1>&6
if test $use_native_mbstatet = "no"; then if test x"$use_native_mbstatet" = xno; then
cat >> confdefs.h <<\EOF cat >> confdefs.h <<\EOF
#define _GLIBCPP_NEED_MBSTATE_T 1 #define _GLIBCPP_NEED_MBSTATE_T 1
EOF EOF
...@@ -3933,16 +3621,16 @@ EOF ...@@ -3933,16 +3621,16 @@ EOF
fi fi
echo $ac_n "checking for WCHAR_MIN and WCHAR_MAX""... $ac_c" 1>&6 echo $ac_n "checking for WCHAR_MIN and WCHAR_MAX""... $ac_c" 1>&6
echo "configure:3937: checking for WCHAR_MIN and WCHAR_MAX" >&5 echo "configure:3625: checking for WCHAR_MIN and WCHAR_MAX" >&5
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 3939 "configure" #line 3627 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <wchar.h> #include <wchar.h>
int main() { int main() {
int i = WCHAR_MIN; int j = WCHAR_MAX; int i = WCHAR_MIN; int j = WCHAR_MAX;
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:3946: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:3634: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest* rm -rf conftest*
has_wchar_minmax=yes has_wchar_minmax=yes
else else
...@@ -3953,19 +3641,11 @@ else ...@@ -3953,19 +3641,11 @@ else
fi fi
rm -f conftest* rm -f conftest*
echo "$ac_t""$has_wchar_minmax" 1>&6 echo "$ac_t""$has_wchar_minmax" 1>&6
if test $has_wchar_minmax = "yes"; then
cat >> confdefs.h <<\EOF
#define _GLIBCPP_HAS_WCHAR_MIN_MAX 1
EOF
fi
# Test wchar.h for WEOF, which is what we use to determine whether
# to specialize for wchar_t or not.
echo $ac_n "checking for WEOF""... $ac_c" 1>&6 echo $ac_n "checking for WEOF""... $ac_c" 1>&6
echo "configure:3967: checking for WEOF" >&5 echo "configure:3647: checking for WEOF" >&5
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 3969 "configure" #line 3649 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <wchar.h> #include <wchar.h>
...@@ -3974,7 +3654,7 @@ int main() { ...@@ -3974,7 +3654,7 @@ int main() {
wint_t i = WEOF; wint_t i = WEOF;
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:3978: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:3658: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest* rm -rf conftest*
has_weof=yes has_weof=yes
else else
...@@ -3989,12 +3669,12 @@ rm -f conftest* ...@@ -3989,12 +3669,12 @@ rm -f conftest*
for ac_func in wcslen wmemchr wmemcmp wmemcpy wmemmove wmemset for ac_func in wcslen wmemchr wmemcmp wmemcpy wmemmove wmemset
do do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
echo "configure:3993: checking for $ac_func" >&5 echo "configure:3673: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 3998 "configure" #line 3678 "configure"
#include "confdefs.h" #include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes, /* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */ which can conflict with char $ac_func(); below. */
...@@ -4017,7 +3697,7 @@ $ac_func(); ...@@ -4017,7 +3697,7 @@ $ac_func();
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:4021: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:3701: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_func_$ac_func=yes" eval "ac_cv_func_$ac_func=yes"
else else
...@@ -4035,56 +3715,160 @@ if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then ...@@ -4035,56 +3715,160 @@ if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
cat >> confdefs.h <<EOF cat >> confdefs.h <<EOF
#define $ac_tr_func 1 #define $ac_tr_func 1
EOF EOF
ac_wfuncs=yes
else else
echo "$ac_t""no" 1>&6 echo "$ac_t""no" 1>&6
LIBSTRINGOBJS="$LIBSTRINGOBJS ${ac_func}.lo" ac_wfuncs=no
fi fi
done done
echo $ac_n "checking for ISO C9X wchar_t support""... $ac_c" 1>&6
echo "configure:3728: checking for ISO C9X wchar_t support" >&5
if test x"$has_weof" = xyes && test x"$has_wchar_minmax" = xyes && test x"$ac_wfuncs" = xyes; then
ac_isoC9X_wchar_t=yes
else
ac_isoC9X_wchar_t=no
fi
echo "$ac_t""$ac_isoC9X_wchar_t" 1>&6
ac_safe=`echo "iconv.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for iconv.h""... $ac_c" 1>&6
echo "configure:3738: checking for iconv.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 3743 "configure"
#include "confdefs.h"
#include <iconv.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:3748: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
eval "ac_cv_header_$ac_safe=yes"
else
echo "$ac_err" >&5
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
eval "ac_cv_header_$ac_safe=no"
fi
rm -f conftest*
fi
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
echo "$ac_t""yes" 1>&6
ac_has_iconv_h=yes
else
echo "$ac_t""no" 1>&6
ac_has_iconv_h=no
fi
for ac_func in iconv_open iconv_close iconv
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
echo "configure:3773: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
#line 3778 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
#include <assert.h>
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
char $ac_func();
int main() {
/* The GNU C library defines this for functions which it implements
to always fail with ENOSYS. Some functions are actually named
something starting with __ and the normal name is an alias. */
#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
choke me
#else
$ac_func();
#endif
; return 0; }
EOF
if { (eval echo configure:3801: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
eval "ac_cv_func_$ac_func=no"
fi
rm -f conftest*
fi
if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
echo "$ac_t""yes" 1>&6
ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
cat >> confdefs.h <<EOF
#define $ac_tr_func 1
EOF
ac_XPG2funcs=yes
else
echo "$ac_t""no" 1>&6
ac_XPG2funcs=no
fi
done
echo $ac_n "checking for XPG2 wchar_t support""... $ac_c" 1>&6
echo "configure:3828: checking for XPG2 wchar_t support" >&5
if test x"$ac_has_iconv_h" = xyes && test x"$ac_XPG2funcs" = xyes; then
ac_XPG2_wchar_t=yes
else
ac_XPG2_wchar_t=no
fi
echo "$ac_t""$ac_XPG2_wchar_t" 1>&6
echo $ac_n "checking for wide character support""... $ac_c" 1>&6 echo $ac_n "checking for enabled wchar_t specializations""... $ac_c" 1>&6
echo "configure:4050: checking for wide character support" >&5 echo "configure:3837: checking for enabled wchar_t specializations" >&5
if test $has_weof = "yes" && test $has_wchar_minmax = "yes"; then if test x"$ac_isoC9X_wchar_t" = xyes && test x"$ac_XPG2_wchar_t" = xyes; then
libinst_wstring_la="libinst-wstring.la" libinst_wstring_la="libinst-wstring.la"
cat >> confdefs.h <<\EOF cat >> confdefs.h <<\EOF
#define _GLIBCPP_USE_WCHAR_T 1 #define _GLIBCPP_USE_WCHAR_T 1
EOF EOF
echo "$ac_t""ok" 1>&6 echo "$ac_t"""yes"" 1>&6
else else
libinst_wstring_la="" libinst_wstring_la=""
echo "$ac_t"""not specializing for wchar_t"" 1>&6 echo "$ac_t"""no"" 1>&6
fi fi
else
echo "$ac_t""no" 1>&6
else
echo "configure: warning: <wchar.h> not found" 1>&2 echo "configure: warning: <wchar.h> not found" 1>&2
cat >> confdefs.h <<\EOF cat >> confdefs.h <<\EOF
#define _GLIBCPP_NEED_MBSTATE_T 1 #define _GLIBCPP_NEED_MBSTATE_T 1
EOF EOF
fi
fi
ac_safe=`echo "ctype.h" | sed 'y%./+-%__p_%'` ac_safe=`echo "ctype.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for ctype.h""... $ac_c" 1>&6 echo $ac_n "checking for ctype.h""... $ac_c" 1>&6
echo "configure:4078: checking for ctype.h" >&5 echo "configure:3862: checking for ctype.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 4083 "configure" #line 3867 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <ctype.h> #include <ctype.h>
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:4088: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:3872: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
rm -rf conftest* rm -rf conftest*
...@@ -4105,9 +3889,9 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then ...@@ -4105,9 +3889,9 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
ctype_default=yes ctype_default=yes
echo $ac_n "checking <ctype> for gnu-linux ""... $ac_c" 1>&6 echo $ac_n "checking <ctype> for gnu-linux ""... $ac_c" 1>&6
echo "configure:4109: checking <ctype> for gnu-linux " >&5 echo "configure:3893: checking <ctype> for gnu-linux " >&5
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 4111 "configure" #line 3895 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <ctype.h> #include <ctype.h>
int main() { int main() {
...@@ -4118,7 +3902,7 @@ int ...@@ -4118,7 +3902,7 @@ int
+ __ctype_tolower[a] + __ctype_toupper[a] + __ctype_b[a];} + __ctype_tolower[a] + __ctype_toupper[a] + __ctype_b[a];}
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:4122: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:3906: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest* rm -rf conftest*
\ \
ctype_linux=yes ctype_linux=yes
...@@ -4137,9 +3921,9 @@ rm -f conftest* ...@@ -4137,9 +3921,9 @@ rm -f conftest*
if test $ctype_default = "yes"; then if test $ctype_default = "yes"; then
echo $ac_n "checking <ctype> for freebsd 4.0 ""... $ac_c" 1>&6 echo $ac_n "checking <ctype> for freebsd 4.0 ""... $ac_c" 1>&6
echo "configure:4141: checking <ctype> for freebsd 4.0 " >&5 echo "configure:3925: checking <ctype> for freebsd 4.0 " >&5
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 4143 "configure" #line 3927 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <ctype.h> #include <ctype.h>
int main() { int main() {
...@@ -4149,7 +3933,7 @@ int ...@@ -4149,7 +3933,7 @@ int
+ _CTYPE_D + _CTYPE_P + _CTYPE_X + _CTYPE_G ;} + _CTYPE_D + _CTYPE_P + _CTYPE_X + _CTYPE_G ;}
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:4153: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:3937: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest* rm -rf conftest*
\ \
ctype_bsd=yes ctype_bsd=yes
...@@ -4169,9 +3953,9 @@ rm -f conftest* ...@@ -4169,9 +3953,9 @@ rm -f conftest*
if test $ctype_default = "yes"; then if test $ctype_default = "yes"; then
echo $ac_n "checking <ctype> for freebsd 3.4 ""... $ac_c" 1>&6 echo $ac_n "checking <ctype> for freebsd 3.4 ""... $ac_c" 1>&6
echo "configure:4173: checking <ctype> for freebsd 3.4 " >&5 echo "configure:3957: checking <ctype> for freebsd 3.4 " >&5
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 4175 "configure" #line 3959 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <ctype.h> #include <ctype.h>
int main() { int main() {
...@@ -4181,7 +3965,7 @@ int ...@@ -4181,7 +3965,7 @@ int
+ _D + _P + _X + _G + __istype (a, 0);} + _D + _P + _X + _G + __istype (a, 0);}
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:4185: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:3969: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest* rm -rf conftest*
\ \
ctype_freebsd34=yes ctype_freebsd34=yes
...@@ -4201,9 +3985,9 @@ rm -f conftest* ...@@ -4201,9 +3985,9 @@ rm -f conftest*
if test $ctype_default = "yes"; then if test $ctype_default = "yes"; then
echo $ac_n "checking <ctype> for solaris 2.6,7,8 ""... $ac_c" 1>&6 echo $ac_n "checking <ctype> for solaris 2.6,7,8 ""... $ac_c" 1>&6
echo "configure:4205: checking <ctype> for solaris 2.6,7,8 " >&5 echo "configure:3989: checking <ctype> for solaris 2.6,7,8 " >&5
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 4207 "configure" #line 3991 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <ctype.h> #include <ctype.h>
int main() { int main() {
...@@ -4214,7 +3998,7 @@ int ...@@ -4214,7 +3998,7 @@ int
+ __trans_lower[a] + __trans_upper[a] + __ctype_mask[a];} + __trans_lower[a] + __trans_upper[a] + __ctype_mask[a];}
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:4218: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:4002: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest* rm -rf conftest*
\ \
ctype_solaris=yes ctype_solaris=yes
...@@ -4229,7 +4013,7 @@ rm -f conftest* ...@@ -4229,7 +4013,7 @@ rm -f conftest*
if test $ctype_solaris = "yes"; then if test $ctype_solaris = "yes"; then
echo $ac_n "checking for version""... $ac_c" 1>&6 echo $ac_n "checking for version""... $ac_c" 1>&6
echo "configure:4233: checking for version" >&5 echo "configure:4017: checking for version" >&5
ac_ext=C ac_ext=C
# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
ac_cpp='$CXXCPP $CPPFLAGS' ac_cpp='$CXXCPP $CPPFLAGS'
...@@ -4238,14 +4022,14 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes ...@@ -4238,14 +4022,14 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes
cross_compiling=$ac_cv_prog_cxx_cross cross_compiling=$ac_cv_prog_cxx_cross
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 4242 "configure" #line 4026 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <ctype.h> #include <ctype.h>
int main() { int main() {
typedef long* __to_type; __to_type const& _M_toupper = __trans_upper; typedef long* __to_type; __to_type const& _M_toupper = __trans_upper;
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:4249: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:4033: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest* rm -rf conftest*
\ \
ctype_solaris26=yes ctype_solaris26=yes
...@@ -4277,9 +4061,9 @@ cross_compiling=$ac_cv_prog_cc_cross ...@@ -4277,9 +4061,9 @@ cross_compiling=$ac_cv_prog_cc_cross
if test $ctype_default = "yes"; then if test $ctype_default = "yes"; then
echo $ac_n "checking <ctype> for solaris 2.5.1 ""... $ac_c" 1>&6 echo $ac_n "checking <ctype> for solaris 2.5.1 ""... $ac_c" 1>&6
echo "configure:4281: checking <ctype> for solaris 2.5.1 " >&5 echo "configure:4065: checking <ctype> for solaris 2.5.1 " >&5
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 4283 "configure" #line 4067 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <ctype.h> #include <ctype.h>
int main() { int main() {
...@@ -4289,7 +4073,7 @@ int ...@@ -4289,7 +4073,7 @@ int
+ __ctype[a];} + __ctype[a];}
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:4293: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:4077: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest* rm -rf conftest*
\ \
ctype_solaris25=yes ctype_solaris25=yes
...@@ -4309,9 +4093,9 @@ rm -f conftest* ...@@ -4309,9 +4093,9 @@ rm -f conftest*
if test $ctype_default = "yes"; then if test $ctype_default = "yes"; then
echo $ac_n "checking <ctype> for aix ""... $ac_c" 1>&6 echo $ac_n "checking <ctype> for aix ""... $ac_c" 1>&6
echo "configure:4313: checking <ctype> for aix " >&5 echo "configure:4097: checking <ctype> for aix " >&5
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 4315 "configure" #line 4099 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <ctype.h> #include <ctype.h>
int main() { int main() {
...@@ -4322,7 +4106,7 @@ int ...@@ -4322,7 +4106,7 @@ int
+ _VALC('a') + _IS('c', 0);} + _VALC('a') + _IS('c', 0);}
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:4326: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:4110: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest* rm -rf conftest*
\ \
ctype_aix=yes ctype_aix=yes
...@@ -4342,9 +4126,9 @@ rm -f conftest* ...@@ -4342,9 +4126,9 @@ rm -f conftest*
if test $ctype_default = "yes"; then if test $ctype_default = "yes"; then
echo $ac_n "checking <ctype> for newlib ""... $ac_c" 1>&6 echo $ac_n "checking <ctype> for newlib ""... $ac_c" 1>&6
echo "configure:4346: checking <ctype> for newlib " >&5 echo "configure:4130: checking <ctype> for newlib " >&5
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 4348 "configure" #line 4132 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <ctype.h> #include <ctype.h>
int main() { int main() {
...@@ -4354,7 +4138,7 @@ int ...@@ -4354,7 +4138,7 @@ int
+ _ctype_[a];} + _ctype_[a];}
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:4358: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if { (eval echo configure:4142: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest* rm -rf conftest*
\ \
ctype_newlib=yes ctype_newlib=yes
...@@ -4388,17 +4172,17 @@ fi ...@@ -4388,17 +4172,17 @@ fi
do do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
echo "configure:4392: checking for $ac_hdr" >&5 echo "configure:4176: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 4397 "configure" #line 4181 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <$ac_hdr> #include <$ac_hdr>
EOF EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
{ (eval echo configure:4402: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } { (eval echo configure:4186: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then if test -z "$ac_err"; then
rm -rf conftest* rm -rf conftest*
...@@ -4427,12 +4211,12 @@ done ...@@ -4427,12 +4211,12 @@ done
for ac_func in getpagesize for ac_func in getpagesize
do do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
echo "configure:4431: checking for $ac_func" >&5 echo "configure:4215: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 4436 "configure" #line 4220 "configure"
#include "confdefs.h" #include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes, /* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */ which can conflict with char $ac_func(); below. */
...@@ -4455,7 +4239,7 @@ $ac_func(); ...@@ -4455,7 +4239,7 @@ $ac_func();
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:4459: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:4243: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
eval "ac_cv_func_$ac_func=yes" eval "ac_cv_func_$ac_func=yes"
else else
...@@ -4480,7 +4264,7 @@ fi ...@@ -4480,7 +4264,7 @@ fi
done done
echo $ac_n "checking for working mmap""... $ac_c" 1>&6 echo $ac_n "checking for working mmap""... $ac_c" 1>&6
echo "configure:4484: checking for working mmap" >&5 echo "configure:4268: checking for working mmap" >&5
if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -4488,7 +4272,7 @@ else ...@@ -4488,7 +4272,7 @@ else
ac_cv_func_mmap_fixed_mapped=no ac_cv_func_mmap_fixed_mapped=no
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 4492 "configure" #line 4276 "configure"
#include "confdefs.h" #include "confdefs.h"
/* Thanks to Mike Haertel and Jim Avera for this test. /* Thanks to Mike Haertel and Jim Avera for this test.
...@@ -4628,7 +4412,7 @@ main() ...@@ -4628,7 +4412,7 @@ main()
} }
EOF EOF
if { (eval echo configure:4632: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null if { (eval echo configure:4416: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
then then
ac_cv_func_mmap_fixed_mapped=yes ac_cv_func_mmap_fixed_mapped=yes
else else
...@@ -4691,19 +4475,19 @@ fi ...@@ -4691,19 +4475,19 @@ fi
if test $ac_cv_header_locale_h = yes; then if test $ac_cv_header_locale_h = yes; then
echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6 echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6
echo "configure:4695: checking for LC_MESSAGES" >&5 echo "configure:4479: checking for LC_MESSAGES" >&5
if eval "test \"`echo '$''{'ac_cv_val_LC_MESSAGES'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_val_LC_MESSAGES'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
cat > conftest.$ac_ext <<EOF cat > conftest.$ac_ext <<EOF
#line 4700 "configure" #line 4484 "configure"
#include "confdefs.h" #include "confdefs.h"
#include <locale.h> #include <locale.h>
int main() { int main() {
return LC_MESSAGES return LC_MESSAGES
; return 0; } ; return 0; }
EOF EOF
if { (eval echo configure:4707: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then if { (eval echo configure:4491: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest* rm -rf conftest*
ac_cv_val_LC_MESSAGES=yes ac_cv_val_LC_MESSAGES=yes
else else
...@@ -4926,11 +4710,7 @@ s%@MAINT@%$MAINT%g ...@@ -4926,11 +4710,7 @@ s%@MAINT@%$MAINT%g
s%@EXEEXT@%$EXEEXT%g s%@EXEEXT@%$EXEEXT%g
s%@GLIBCPP_CFLAGS@%$GLIBCPP_CFLAGS%g s%@GLIBCPP_CFLAGS@%$GLIBCPP_CFLAGS%g
s%@GLIBCPP_CXXFLAGS@%$GLIBCPP_CXXFLAGS%g s%@GLIBCPP_CXXFLAGS@%$GLIBCPP_CXXFLAGS%g
s%@LD@%$LD%g
s%@NM@%$NM%g
s%@USE_SYMBOL_UNDERSCORE@%$USE_SYMBOL_UNDERSCORE%g
s%@LN_S@%$LN_S%g s%@LN_S@%$LN_S%g
s%@DLLTOOL@%$DLLTOOL%g
s%@LIBTOOL@%$LIBTOOL%g s%@LIBTOOL@%$LIBTOOL%g
s%@CXXCPP@%$CXXCPP%g s%@CXXCPP@%$CXXCPP%g
s%@WERROR@%$WERROR%g s%@WERROR@%$WERROR%g
...@@ -4959,7 +4739,6 @@ s%@EXTRA_CXX_FLAGS@%$EXTRA_CXX_FLAGS%g ...@@ -4959,7 +4739,6 @@ s%@EXTRA_CXX_FLAGS@%$EXTRA_CXX_FLAGS%g
s%@ctype_include_dir@%$ctype_include_dir%g s%@ctype_include_dir@%$ctype_include_dir%g
s%@LIBMATHOBJS@%$LIBMATHOBJS%g s%@LIBMATHOBJS@%$LIBMATHOBJS%g
s%@USE_LONG_DOUBLE@%$USE_LONG_DOUBLE%g s%@USE_LONG_DOUBLE@%$USE_LONG_DOUBLE%g
s%@LIBSTRINGOBJS@%$LIBSTRINGOBJS%g
s%@libinst_wstring_la@%$libinst_wstring_la%g s%@libinst_wstring_la@%$libinst_wstring_la%g
s%@CANADIAN_TRUE@%$CANADIAN_TRUE%g s%@CANADIAN_TRUE@%$CANADIAN_TRUE%g
s%@CANADIAN_FALSE@%$CANADIAN_FALSE%g s%@CANADIAN_FALSE@%$CANADIAN_FALSE%g
......
libstdc++-v3/libio/Makefile.in
...@@ -83,14 +83,13 @@ FMTFLAGS = @FMTFLAGS@ ...@@ -83,14 +83,13 @@ FMTFLAGS = @FMTFLAGS@
GCC_OBJDIR = @GCC_OBJDIR@ GCC_OBJDIR = @GCC_OBJDIR@
GLIBCPP_CFLAGS = @GLIBCPP_CFLAGS@ GLIBCPP_CFLAGS = @GLIBCPP_CFLAGS@
GLIBCPP_CXXFLAGS = @GLIBCPP_CXXFLAGS@ GLIBCPP_CXXFLAGS = @GLIBCPP_CXXFLAGS@
LD = @LD@
LIBMATHOBJS = @LIBMATHOBJS@ LIBMATHOBJS = @LIBMATHOBJS@
LIBSTRINGOBJS = @LIBSTRINGOBJS@ LIBSTRINGOBJS = @LIBSTRINGOBJS@
LIBTOOL = @LIBTOOL@ LIBTOOL = @LIBTOOL@
LN_S = @LN_S@ LN_S = @LN_S@
MAINT = @MAINT@ MAINT = @MAINT@
MAKEINFO = @MAKEINFO@ MAKEINFO = @MAKEINFO@
NM = @NM@ OBJDUMP = @OBJDUMP@
PACKAGE = @PACKAGE@ PACKAGE = @PACKAGE@
RANLIB = @RANLIB@ RANLIB = @RANLIB@
THREADDEPS = @THREADDEPS@ THREADDEPS = @THREADDEPS@
...@@ -99,7 +98,6 @@ THREADLIBS = @THREADLIBS@ ...@@ -99,7 +98,6 @@ THREADLIBS = @THREADLIBS@
THREADOBJS = @THREADOBJS@ THREADOBJS = @THREADOBJS@
THREADSPEC = @THREADSPEC@ THREADSPEC = @THREADSPEC@
USE_LONG_DOUBLE = @USE_LONG_DOUBLE@ USE_LONG_DOUBLE = @USE_LONG_DOUBLE@
USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
VERSION = @VERSION@ VERSION = @VERSION@
WERROR = @WERROR@ WERROR = @WERROR@
cpu_include_dir = @cpu_include_dir@ cpu_include_dir = @cpu_include_dir@
......
libstdc++-v3/math/Makefile.in
...@@ -83,14 +83,13 @@ FMTFLAGS = @FMTFLAGS@ ...@@ -83,14 +83,13 @@ FMTFLAGS = @FMTFLAGS@
GCC_OBJDIR = @GCC_OBJDIR@ GCC_OBJDIR = @GCC_OBJDIR@
GLIBCPP_CFLAGS = @GLIBCPP_CFLAGS@ GLIBCPP_CFLAGS = @GLIBCPP_CFLAGS@
GLIBCPP_CXXFLAGS = @GLIBCPP_CXXFLAGS@ GLIBCPP_CXXFLAGS = @GLIBCPP_CXXFLAGS@
LD = @LD@
LIBMATHOBJS = @LIBMATHOBJS@ LIBMATHOBJS = @LIBMATHOBJS@
LIBSTRINGOBJS = @LIBSTRINGOBJS@ LIBSTRINGOBJS = @LIBSTRINGOBJS@
LIBTOOL = @LIBTOOL@ LIBTOOL = @LIBTOOL@
LN_S = @LN_S@ LN_S = @LN_S@
MAINT = @MAINT@ MAINT = @MAINT@
MAKEINFO = @MAKEINFO@ MAKEINFO = @MAKEINFO@
NM = @NM@ OBJDUMP = @OBJDUMP@
PACKAGE = @PACKAGE@ PACKAGE = @PACKAGE@
RANLIB = @RANLIB@ RANLIB = @RANLIB@
THREADDEPS = @THREADDEPS@ THREADDEPS = @THREADDEPS@
...@@ -99,7 +98,6 @@ THREADLIBS = @THREADLIBS@ ...@@ -99,7 +98,6 @@ THREADLIBS = @THREADLIBS@
THREADOBJS = @THREADOBJS@ THREADOBJS = @THREADOBJS@
THREADSPEC = @THREADSPEC@ THREADSPEC = @THREADSPEC@
USE_LONG_DOUBLE = @USE_LONG_DOUBLE@ USE_LONG_DOUBLE = @USE_LONG_DOUBLE@
USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
VERSION = @VERSION@ VERSION = @VERSION@
WERROR = @WERROR@ WERROR = @WERROR@
cpu_include_dir = @cpu_include_dir@ cpu_include_dir = @cpu_include_dir@
......
libstdc++-v3/src/Makefile.in
...@@ -81,14 +81,13 @@ FMTFLAGS = @FMTFLAGS@ ...@@ -81,14 +81,13 @@ FMTFLAGS = @FMTFLAGS@
GCC_OBJDIR = @GCC_OBJDIR@ GCC_OBJDIR = @GCC_OBJDIR@
GLIBCPP_CFLAGS = @GLIBCPP_CFLAGS@ GLIBCPP_CFLAGS = @GLIBCPP_CFLAGS@
GLIBCPP_CXXFLAGS = @GLIBCPP_CXXFLAGS@ GLIBCPP_CXXFLAGS = @GLIBCPP_CXXFLAGS@
LD = @LD@
LIBMATHOBJS = @LIBMATHOBJS@ LIBMATHOBJS = @LIBMATHOBJS@
LIBSTRINGOBJS = @LIBSTRINGOBJS@ LIBSTRINGOBJS = @LIBSTRINGOBJS@
LIBTOOL = @LIBTOOL@ LIBTOOL = @LIBTOOL@
LN_S = @LN_S@ LN_S = @LN_S@
MAINT = @MAINT@ MAINT = @MAINT@
MAKEINFO = @MAKEINFO@ MAKEINFO = @MAKEINFO@
NM = @NM@ OBJDUMP = @OBJDUMP@
PACKAGE = @PACKAGE@ PACKAGE = @PACKAGE@
RANLIB = @RANLIB@ RANLIB = @RANLIB@
THREADDEPS = @THREADDEPS@ THREADDEPS = @THREADDEPS@
...@@ -97,7 +96,6 @@ THREADLIBS = @THREADLIBS@ ...@@ -97,7 +96,6 @@ THREADLIBS = @THREADLIBS@
THREADOBJS = @THREADOBJS@ THREADOBJS = @THREADOBJS@
THREADSPEC = @THREADSPEC@ THREADSPEC = @THREADSPEC@
USE_LONG_DOUBLE = @USE_LONG_DOUBLE@ USE_LONG_DOUBLE = @USE_LONG_DOUBLE@
USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
VERSION = @VERSION@ VERSION = @VERSION@
WERROR = @WERROR@ WERROR = @WERROR@
cpu_include_dir = @cpu_include_dir@ cpu_include_dir = @cpu_include_dir@
......
libstdc++-v3/src/gen-num-limits.cc
...@@ -726,7 +726,7 @@ int main() ...@@ -726,7 +726,7 @@ int main()
type_trait<char>(); type_trait<char>();
type_trait<signed char>(); type_trait<signed char>();
type_trait<unsigned char>(); type_trait<unsigned char>();
#if defined( _GLIBCPP_USE_WCHAR_T) && defined(_GLIBCPP_HAS_WCHAR_MIN_MAX) #if defined( _GLIBCPP_USE_WCHAR_T)
type_trait<wchar_t>(); type_trait<wchar_t>();
#endif #endif
......
libstdc++-v3/src/locale.cc
...@@ -756,8 +756,7 @@ namespace std { ...@@ -756,8 +756,7 @@ namespace std {
codecvt_byname<wchar_t, char, mbstate_t>:: codecvt_byname<wchar_t, char, mbstate_t>::
codecvt_byname(const char* /*__s*/, size_t __refs) codecvt_byname(const char* /*__s*/, size_t __refs)
: codecvt<wchar_t, char, mbstate_t> (__refs) : codecvt<wchar_t, char, mbstate_t> (__refs)
{ { }
}
codecvt_byname<wchar_t, char, mbstate_t>::~codecvt_byname() {} codecvt_byname<wchar_t, char, mbstate_t>::~codecvt_byname() {}
......
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