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
This commit is contained in:
Benjamin Kosnik
Benjamin Kosnik
parent
cc057ef343
commit
3840fa2a8f
|
|
@ -1,3 +1,20 @@
|
|||
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>
|
||||
|
||||
* bits/locale_facets.tcc (num_get<char>::_M_extract): Fix signage,
|
||||
|
|
|
|||
|
|
@ -83,14 +83,13 @@ FMTFLAGS = @FMTFLAGS@
|
|||
GCC_OBJDIR = @GCC_OBJDIR@
|
||||
GLIBCPP_CFLAGS = @GLIBCPP_CFLAGS@
|
||||
GLIBCPP_CXXFLAGS = @GLIBCPP_CXXFLAGS@
|
||||
LD = @LD@
|
||||
LIBMATHOBJS = @LIBMATHOBJS@
|
||||
LIBSTRINGOBJS = @LIBSTRINGOBJS@
|
||||
LIBTOOL = @LIBTOOL@
|
||||
LN_S = @LN_S@
|
||||
MAINT = @MAINT@
|
||||
MAKEINFO = @MAKEINFO@
|
||||
NM = @NM@
|
||||
OBJDUMP = @OBJDUMP@
|
||||
PACKAGE = @PACKAGE@
|
||||
RANLIB = @RANLIB@
|
||||
THREADDEPS = @THREADDEPS@
|
||||
|
|
@ -99,7 +98,6 @@ THREADLIBS = @THREADLIBS@
|
|||
THREADOBJS = @THREADOBJS@
|
||||
THREADSPEC = @THREADSPEC@
|
||||
USE_LONG_DOUBLE = @USE_LONG_DOUBLE@
|
||||
USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
|
||||
VERSION = @VERSION@
|
||||
WERROR = @WERROR@
|
||||
cpu_include_dir = @cpu_include_dir@
|
||||
|
|
|
|||
|
|
@ -9,11 +9,6 @@
|
|||
// around.
|
||||
#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.
|
||||
#undef _GLIBCPP_USE_WCHAR_T
|
||||
|
||||
|
|
|
|||
|
|
@ -520,59 +520,86 @@ dnl Check to see if this target can enable the wchar_t parts of libstdc++.
|
|||
dnl
|
||||
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_HAS_WCHAR_MIN_MAX if WCHAR_MIN, WCHAR_MAX in wchar.h
|
||||
dnl
|
||||
dnl GLIBCPP_CHECK_WCHAR_T_SUPPORT
|
||||
AC_DEFUN(GLIBCPP_CHECK_WCHAR_T_SUPPORT, [
|
||||
AC_CHECK_HEADER(wchar.h,[
|
||||
dnl Test wchar.h for mbstate_t, which is needed for char_traits and others.
|
||||
AC_MSG_CHECKING([for native mbstate_t])
|
||||
AC_TRY_COMPILE([#include <wchar.h>],
|
||||
[mbstate_t teststate;],
|
||||
use_native_mbstatet=yes, use_native_mbstatet=no)
|
||||
AC_MSG_RESULT($use_native_mbstatet)
|
||||
if test $use_native_mbstatet = "no"; then
|
||||
|
||||
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.
|
||||
AC_MSG_CHECKING([for mbstate_t])
|
||||
AC_TRY_COMPILE([#include <wchar.h>],
|
||||
[mbstate_t teststate;],
|
||||
use_native_mbstatet=yes, use_native_mbstatet=no)
|
||||
AC_MSG_RESULT($use_native_mbstatet)
|
||||
if test x"$use_native_mbstatet" = xno; then
|
||||
AC_DEFINE(_GLIBCPP_NEED_MBSTATE_T)
|
||||
fi
|
||||
|
||||
dnl Test wchar.h for WCHAR_MIN, WCHAR_MAX, which is needed before
|
||||
dnl numeric_limits can instantiate type_traits<wchar_t>
|
||||
AC_MSG_CHECKING([for WCHAR_MIN and WCHAR_MAX])
|
||||
AC_TRY_COMPILE([#include <wchar.h>],
|
||||
[int i = WCHAR_MIN; int j = WCHAR_MAX;],
|
||||
has_wchar_minmax=yes, has_wchar_minmax=no)
|
||||
AC_MSG_RESULT($has_wchar_minmax)
|
||||
|
||||
dnl Test wchar.h for WEOF, which is what we use to determine whether
|
||||
dnl to specialize for char_traits<wchar_t> or not.
|
||||
AC_MSG_CHECKING([for WEOF])
|
||||
AC_TRY_COMPILE([
|
||||
#include <wchar.h>
|
||||
#include <stddef.h>],
|
||||
[wint_t i = WEOF;],
|
||||
has_weof=yes, has_weof=no)
|
||||
AC_MSG_RESULT($has_weof)
|
||||
|
||||
dnl Tests for wide character functions used in char_traits<wchar_t>.
|
||||
AC_CHECK_FUNCS(wcslen wmemchr wmemcmp wmemcpy wmemmove wmemset, ac_wfuncs=yes, ac_wfuncs=no)
|
||||
|
||||
AC_MSG_CHECKING([for ISO C9X wchar_t support])
|
||||
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"
|
||||
AC_DEFINE(_GLIBCPP_USE_WCHAR_T)
|
||||
AC_MSG_RESULT("yes")
|
||||
else
|
||||
libinst_wstring_la=""
|
||||
AC_MSG_RESULT("no")
|
||||
fi
|
||||
AC_SUBST(libinst_wstring_la)
|
||||
|
||||
else
|
||||
AC_MSG_WARN([<wchar.h> not found])
|
||||
AC_DEFINE(_GLIBCPP_NEED_MBSTATE_T)
|
||||
fi
|
||||
|
||||
dnl Test wchar.h for WCHAR_MIN, WCHAR_MAX, which is needed before
|
||||
dnl numeric_limits can instantiate type_traits<wchar_t>
|
||||
AC_MSG_CHECKING([for WCHAR_MIN and WCHAR_MAX])
|
||||
AC_TRY_COMPILE([#include <wchar.h>],
|
||||
[int i = WCHAR_MIN; int j = WCHAR_MAX;],
|
||||
has_wchar_minmax=yes, has_wchar_minmax=no)
|
||||
AC_MSG_RESULT($has_wchar_minmax)
|
||||
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
|
||||
# to specialize for wchar_t or not.
|
||||
AC_MSG_CHECKING([for WEOF])
|
||||
AC_TRY_COMPILE([
|
||||
#include <wchar.h>
|
||||
#include <stddef.h>],
|
||||
[wint_t i = WEOF;],
|
||||
has_weof=yes, has_weof=no)
|
||||
AC_MSG_RESULT($has_weof)
|
||||
|
||||
dnl Tests for wide character functions.
|
||||
AC_REPLACE_STRINGFUNCS(wcslen wmemchr wmemcmp wmemcpy wmemmove wmemset)
|
||||
AC_SUBST(libinst_wstring_la)
|
||||
|
||||
AC_MSG_CHECKING([for wide character support])
|
||||
if test $has_weof = "yes" && test $has_wchar_minmax = "yes"; then
|
||||
libinst_wstring_la="libinst-wstring.la"
|
||||
AC_DEFINE(_GLIBCPP_USE_WCHAR_T)
|
||||
AC_MSG_RESULT(ok)
|
||||
else
|
||||
libinst_wstring_la=""
|
||||
AC_MSG_RESULT("not specializing for wchar_t")
|
||||
fi
|
||||
],[
|
||||
AC_MSG_WARN([<wchar.h> not found])
|
||||
AC_DEFINE(_GLIBCPP_NEED_MBSTATE_T)
|
||||
])
|
||||
])
|
||||
|
||||
|
||||
|
|
@ -949,7 +976,6 @@ dnl GLIBCPP_ENABLE_LONG_LONG
|
|||
AC_DEFUN(GLIBCPP_ENABLE_LONG_LONG, [dnl
|
||||
define([GLIBCPP_ENABLE_LONG_LONG_DEFAULT], ifelse($1, yes, yes, no))dnl
|
||||
|
||||
AC_MSG_CHECKING([for enabled long long])
|
||||
AC_ARG_ENABLE(long-long,
|
||||
changequote(<<, >>)dnl
|
||||
<<--enable-long-long turns on 'long long' [default=>>GLIBCPP_ENABLE_LONG_LONG_DEFAULT],
|
||||
|
|
@ -965,11 +991,12 @@ AC_DEFUN(GLIBCPP_ENABLE_LONG_LONG, [dnl
|
|||
AC_CHECK_FUNC(strtoll,,ac_strtoll=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
|
||||
enable_long_long=no;
|
||||
fi; unset ac_ll
|
||||
|
||||
enable_long_long=no;
|
||||
fi;
|
||||
AC_MSG_RESULT($enable_long_long)
|
||||
|
||||
dnl Option parsed, now set things appropriately
|
||||
case "$enable_long_long" in
|
||||
yes) AC_DEFINE(_GLIBCPP_USE_LONG_LONG)
|
||||
|
|
|
|||
|
|
@ -532,59 +532,86 @@ dnl Check to see if this target can enable the wchar_t parts of libstdc++.
|
|||
dnl
|
||||
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_HAS_WCHAR_MIN_MAX if WCHAR_MIN, WCHAR_MAX in wchar.h
|
||||
dnl
|
||||
dnl GLIBCPP_CHECK_WCHAR_T_SUPPORT
|
||||
AC_DEFUN(GLIBCPP_CHECK_WCHAR_T_SUPPORT, [
|
||||
AC_CHECK_HEADER(wchar.h,[
|
||||
dnl Test wchar.h for mbstate_t, which is needed for char_traits and others.
|
||||
AC_MSG_CHECKING([for native mbstate_t])
|
||||
AC_TRY_COMPILE([#include <wchar.h>],
|
||||
[mbstate_t teststate;],
|
||||
use_native_mbstatet=yes, use_native_mbstatet=no)
|
||||
AC_MSG_RESULT($use_native_mbstatet)
|
||||
if test $use_native_mbstatet = "no"; then
|
||||
|
||||
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.
|
||||
AC_MSG_CHECKING([for mbstate_t])
|
||||
AC_TRY_COMPILE([#include <wchar.h>],
|
||||
[mbstate_t teststate;],
|
||||
use_native_mbstatet=yes, use_native_mbstatet=no)
|
||||
AC_MSG_RESULT($use_native_mbstatet)
|
||||
if test x"$use_native_mbstatet" = xno; then
|
||||
AC_DEFINE(_GLIBCPP_NEED_MBSTATE_T)
|
||||
fi
|
||||
|
||||
dnl Test wchar.h for WCHAR_MIN, WCHAR_MAX, which is needed before
|
||||
dnl numeric_limits can instantiate type_traits<wchar_t>
|
||||
AC_MSG_CHECKING([for WCHAR_MIN and WCHAR_MAX])
|
||||
AC_TRY_COMPILE([#include <wchar.h>],
|
||||
[int i = WCHAR_MIN; int j = WCHAR_MAX;],
|
||||
has_wchar_minmax=yes, has_wchar_minmax=no)
|
||||
AC_MSG_RESULT($has_wchar_minmax)
|
||||
|
||||
dnl Test wchar.h for WEOF, which is what we use to determine whether
|
||||
dnl to specialize for char_traits<wchar_t> or not.
|
||||
AC_MSG_CHECKING([for WEOF])
|
||||
AC_TRY_COMPILE([
|
||||
#include <wchar.h>
|
||||
#include <stddef.h>],
|
||||
[wint_t i = WEOF;],
|
||||
has_weof=yes, has_weof=no)
|
||||
AC_MSG_RESULT($has_weof)
|
||||
|
||||
dnl Tests for wide character functions used in char_traits<wchar_t>.
|
||||
AC_CHECK_FUNCS(wcslen wmemchr wmemcmp wmemcpy wmemmove wmemset, ac_wfuncs=yes, ac_wfuncs=no)
|
||||
|
||||
AC_MSG_CHECKING([for ISO C9X wchar_t support])
|
||||
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"
|
||||
AC_DEFINE(_GLIBCPP_USE_WCHAR_T)
|
||||
AC_MSG_RESULT("yes")
|
||||
else
|
||||
libinst_wstring_la=""
|
||||
AC_MSG_RESULT("no")
|
||||
fi
|
||||
AC_SUBST(libinst_wstring_la)
|
||||
|
||||
else
|
||||
AC_MSG_WARN([<wchar.h> not found])
|
||||
AC_DEFINE(_GLIBCPP_NEED_MBSTATE_T)
|
||||
fi
|
||||
|
||||
dnl Test wchar.h for WCHAR_MIN, WCHAR_MAX, which is needed before
|
||||
dnl numeric_limits can instantiate type_traits<wchar_t>
|
||||
AC_MSG_CHECKING([for WCHAR_MIN and WCHAR_MAX])
|
||||
AC_TRY_COMPILE([#include <wchar.h>],
|
||||
[int i = WCHAR_MIN; int j = WCHAR_MAX;],
|
||||
has_wchar_minmax=yes, has_wchar_minmax=no)
|
||||
AC_MSG_RESULT($has_wchar_minmax)
|
||||
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
|
||||
# to specialize for wchar_t or not.
|
||||
AC_MSG_CHECKING([for WEOF])
|
||||
AC_TRY_COMPILE([
|
||||
#include <wchar.h>
|
||||
#include <stddef.h>],
|
||||
[wint_t i = WEOF;],
|
||||
has_weof=yes, has_weof=no)
|
||||
AC_MSG_RESULT($has_weof)
|
||||
|
||||
dnl Tests for wide character functions.
|
||||
AC_REPLACE_STRINGFUNCS(wcslen wmemchr wmemcmp wmemcpy wmemmove wmemset)
|
||||
AC_SUBST(libinst_wstring_la)
|
||||
|
||||
AC_MSG_CHECKING([for wide character support])
|
||||
if test $has_weof = "yes" && test $has_wchar_minmax = "yes"; then
|
||||
libinst_wstring_la="libinst-wstring.la"
|
||||
AC_DEFINE(_GLIBCPP_USE_WCHAR_T)
|
||||
AC_MSG_RESULT(ok)
|
||||
else
|
||||
libinst_wstring_la=""
|
||||
AC_MSG_RESULT("not specializing for wchar_t")
|
||||
fi
|
||||
],[
|
||||
AC_MSG_WARN([<wchar.h> not found])
|
||||
AC_DEFINE(_GLIBCPP_NEED_MBSTATE_T)
|
||||
])
|
||||
])
|
||||
|
||||
|
||||
|
|
@ -961,7 +988,6 @@ dnl GLIBCPP_ENABLE_LONG_LONG
|
|||
AC_DEFUN(GLIBCPP_ENABLE_LONG_LONG, [dnl
|
||||
define([GLIBCPP_ENABLE_LONG_LONG_DEFAULT], ifelse($1, yes, yes, no))dnl
|
||||
|
||||
AC_MSG_CHECKING([for enabled long long])
|
||||
AC_ARG_ENABLE(long-long,
|
||||
changequote(<<, >>)dnl
|
||||
<<--enable-long-long turns on 'long long' [default=>>GLIBCPP_ENABLE_LONG_LONG_DEFAULT],
|
||||
|
|
@ -977,11 +1003,12 @@ AC_DEFUN(GLIBCPP_ENABLE_LONG_LONG, [dnl
|
|||
AC_CHECK_FUNC(strtoll,,ac_strtoll=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
|
||||
enable_long_long=no;
|
||||
fi; unset ac_ll
|
||||
|
||||
enable_long_long=no;
|
||||
fi;
|
||||
AC_MSG_RESULT($enable_long_long)
|
||||
|
||||
dnl Option parsed, now set things appropriately
|
||||
case "$enable_long_long" in
|
||||
yes) AC_DEFINE(_GLIBCPP_USE_LONG_LONG)
|
||||
|
|
@ -1216,7 +1243,7 @@ else
|
|||
fi])
|
||||
|
||||
|
||||
# serial 35 AC_PROG_LIBTOOL
|
||||
# serial 40 AC_PROG_LIBTOOL
|
||||
AC_DEFUN(AC_PROG_LIBTOOL,
|
||||
[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
|
||||
|
||||
|
|
@ -1225,10 +1252,11 @@ AC_CACHE_SAVE
|
|||
|
||||
# Actually configure libtool. ac_aux_dir is where install-sh is found.
|
||||
CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
|
||||
LD="$LD" NM="$NM" RANLIB="$RANLIB" LN_S="$LN_S" \
|
||||
DLLTOOL="$DLLTOOL" AS="$AS" \
|
||||
LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
|
||||
LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
|
||||
DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
|
||||
${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])
|
||||
|
||||
# Reload cache, that may have been modified by ltconfig
|
||||
|
|
@ -1257,24 +1285,33 @@ AC_REQUIRE([AC_PROG_RANLIB])dnl
|
|||
AC_REQUIRE([AC_PROG_CC])dnl
|
||||
AC_REQUIRE([AC_PROG_LD])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
|
||||
dnl
|
||||
|
||||
case "$target" in
|
||||
NONE) lt_target="$host" ;;
|
||||
*) lt_target="$target" ;;
|
||||
esac
|
||||
|
||||
# Check for any special flags to pass to ltconfig.
|
||||
libtool_flags="--cache-file=$cache_file"
|
||||
test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
|
||||
test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
|
||||
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_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
|
||||
# libtool support.
|
||||
case "$host" in
|
||||
case "$lt_target" in
|
||||
*-*-irix6*)
|
||||
# Find out which ABI we are using.
|
||||
echo '[#]line __oline__ "configure"' > conftest.$ac_ext
|
||||
|
|
@ -1306,33 +1343,28 @@ case "$host" in
|
|||
fi
|
||||
;;
|
||||
|
||||
*-*-cygwin*)
|
||||
AC_SYS_LIBTOOL_CYGWIN
|
||||
ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
|
||||
[*-*-cygwin* | *-*-mingw*)
|
||||
AC_CHECK_TOOL(DLLTOOL, dlltool, false)
|
||||
AC_CHECK_TOOL(AS, as, false)
|
||||
AC_CHECK_TOOL(OBJDUMP, objdump, false)
|
||||
;;
|
||||
|
||||
])
|
||||
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_DEFUN(AC_LIBTOOL_DLOPEN, [lt_dlopen=yes])
|
||||
# AC_LIBTOOL_DLOPEN - enable checks for dlopen support
|
||||
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
|
||||
# Usage: AC_ENABLE_SHARED[(DEFAULT)]
|
||||
# Where DEFAULT is either `yes' or `no'. If omitted, it defaults to
|
||||
# `yes'.
|
||||
AC_DEFUN(AC_ENABLE_SHARED,
|
||||
[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
|
||||
AC_DEFUN(AC_ENABLE_SHARED, [dnl
|
||||
define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
|
||||
AC_ARG_ENABLE(shared,
|
||||
changequote(<<, >>)dnl
|
||||
<< --enable-shared[=PKGS] build shared libraries [default=>>AC_ENABLE_SHARED_DEFAULT],
|
||||
|
|
@ -1357,15 +1389,15 @@ enable_shared=AC_ENABLE_SHARED_DEFAULT)dnl
|
|||
])
|
||||
|
||||
# AC_DISABLE_SHARED - set the default shared flag to --disable-shared
|
||||
AC_DEFUN(AC_DISABLE_SHARED,
|
||||
[AC_ENABLE_SHARED(no)])
|
||||
AC_DEFUN(AC_DISABLE_SHARED, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
|
||||
AC_ENABLE_SHARED(no)])
|
||||
|
||||
# AC_ENABLE_STATIC - implement the --enable-static flag
|
||||
# Usage: AC_ENABLE_STATIC[(DEFAULT)]
|
||||
# Where DEFAULT is either `yes' or `no'. If omitted, it defaults to
|
||||
# `yes'.
|
||||
AC_DEFUN(AC_ENABLE_STATIC,
|
||||
[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
|
||||
AC_DEFUN(AC_ENABLE_STATIC, [dnl
|
||||
define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
|
||||
AC_ARG_ENABLE(static,
|
||||
changequote(<<, >>)dnl
|
||||
<< --enable-static[=PKGS] build static libraries [default=>>AC_ENABLE_STATIC_DEFAULT],
|
||||
|
|
@ -1390,16 +1422,16 @@ enable_static=AC_ENABLE_STATIC_DEFAULT)dnl
|
|||
])
|
||||
|
||||
# AC_DISABLE_STATIC - set the default static flag to --disable-static
|
||||
AC_DEFUN(AC_DISABLE_STATIC,
|
||||
[AC_ENABLE_STATIC(no)])
|
||||
AC_DEFUN(AC_DISABLE_STATIC, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
|
||||
AC_ENABLE_STATIC(no)])
|
||||
|
||||
|
||||
# AC_ENABLE_FAST_INSTALL - implement the --enable-fast-install flag
|
||||
# Usage: AC_ENABLE_FAST_INSTALL[(DEFAULT)]
|
||||
# Where DEFAULT is either `yes' or `no'. If omitted, it defaults to
|
||||
# `yes'.
|
||||
AC_DEFUN(AC_ENABLE_FAST_INSTALL,
|
||||
[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
|
||||
AC_DEFUN(AC_ENABLE_FAST_INSTALL, [dnl
|
||||
define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
|
||||
AC_ARG_ENABLE(fast-install,
|
||||
changequote(<<, >>)dnl
|
||||
<< --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
|
|||
])
|
||||
|
||||
# AC_ENABLE_FAST_INSTALL - set the default to --disable-fast-install
|
||||
AC_DEFUN(AC_DISABLE_FAST_INSTALL,
|
||||
[AC_ENABLE_FAST_INSTALL(no)])
|
||||
|
||||
AC_DEFUN(AC_DISABLE_FAST_INSTALL, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
|
||||
AC_ENABLE_FAST_INSTALL(no)])
|
||||
|
||||
# AC_PROG_LD - find the path to the GNU or non-GNU linker
|
||||
AC_DEFUN(AC_PROG_LD,
|
||||
|
|
@ -1444,7 +1475,7 @@ if test "$ac_cv_prog_gcc" = yes; then
|
|||
case "$ac_prog" in
|
||||
# Accept absolute paths.
|
||||
changequote(,)dnl
|
||||
/* | [A-Za-z]:[\\/]*)
|
||||
[\\/]* | [A-Za-z]:[\\/]*)
|
||||
re_direlt='/[^/][^/]*/\.\./'
|
||||
changequote([,])dnl
|
||||
# Canonicalize the path of ld
|
||||
|
|
@ -1470,10 +1501,10 @@ else
|
|||
fi
|
||||
AC_CACHE_VAL(ac_cv_path_LD,
|
||||
[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
|
||||
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"
|
||||
# Check to see if the program is GNU ld. I'd rather use --version,
|
||||
# but apparently some GNU ld's only accept -v.
|
||||
|
|
@ -1496,7 +1527,6 @@ else
|
|||
AC_MSG_RESULT(no)
|
||||
fi
|
||||
test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
|
||||
AC_SUBST(LD)
|
||||
AC_PROG_LD_GNU
|
||||
])
|
||||
|
||||
|
|
@ -1518,10 +1548,10 @@ AC_CACHE_VAL(ac_cv_path_NM,
|
|||
# Let the user override the test.
|
||||
ac_cv_path_NM="$NM"
|
||||
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
|
||||
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.
|
||||
# Adding the `sed 1q' prevents false positives on HP-UX, which says:
|
||||
# nm: unknown option "B" ignored
|
||||
|
|
@ -1542,230 +1572,24 @@ else
|
|||
fi])
|
||||
NM="$ac_cv_path_NM"
|
||||
AC_MSG_RESULT([$NM])
|
||||
AC_SUBST(NM)
|
||||
])
|
||||
|
||||
# AC_SYS_NM_PARSE - Check for command to grab the raw symbol name followed
|
||||
# by C symbol name from nm.
|
||||
AC_DEFUN(AC_SYS_NM_PARSE,
|
||||
[AC_REQUIRE([AC_CANONICAL_HOST])dnl
|
||||
AC_REQUIRE([AC_PROG_NM])dnl
|
||||
# Check for command to grab the raw symbol name followed by C symbol from nm.
|
||||
AC_MSG_CHECKING([command to parse $NM output])
|
||||
AC_CACHE_VAL(ac_cv_sys_global_symbol_pipe,
|
||||
[# 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*)
|
||||
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
|
||||
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_DEFUN(AC_CHECK_LIBM,
|
||||
[AC_REQUIRE([AC_CANONICAL_HOST])dnl
|
||||
LIBM=
|
||||
case "$lt_target" in
|
||||
*-*-beos* | *-*-cygwin*)
|
||||
# These system don't have libm
|
||||
;;
|
||||
*-ncr-sysv4.3*)
|
||||
AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
|
||||
AC_CHECK_LIB(m, main, LIBM="$LIBM -lm")
|
||||
;;
|
||||
*)
|
||||
AC_CHECK_LIB(m, main, LIBM="-lm")
|
||||
;;
|
||||
esac
|
||||
])
|
||||
|
||||
# AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for
|
||||
|
|
@ -1776,13 +1600,14 @@ AC_CHECK_LIB(m, cos)
|
|||
# '${top_builddir}/' (note the single quotes!) if your package is not
|
||||
# flat, and, if you're not using automake, define top_builddir as
|
||||
# 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
|
||||
no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
|
||||
"") enable_ltdl_convenience=yes
|
||||
ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
|
||||
esac
|
||||
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
|
||||
|
|
@ -1794,16 +1619,23 @@ AC_DEFUN(AC_LIBLTDL_CONVENIENCE, [
|
|||
# flat, and, if you're not using automake, define top_builddir as
|
||||
# appropriate in the Makefiles.
|
||||
# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
|
||||
AC_DEFUN(AC_LIBLTDL_INSTALLABLE, [
|
||||
AC_CHECK_LIB(ltdl, main, LIBLTDL="-lltdl", [
|
||||
case "$enable_ltdl_install" in
|
||||
no) AC_MSG_WARN([libltdl not installed, but installation disabled]) ;;
|
||||
"") enable_ltdl_install=yes
|
||||
ac_configure_args="$ac_configure_args --enable-ltdl-install" ;;
|
||||
esac
|
||||
AC_DEFUN(AC_LIBLTDL_INSTALLABLE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
|
||||
AC_CHECK_LIB(ltdl, main,
|
||||
[test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
|
||||
[if test x"$enable_ltdl_install" = xno; then
|
||||
AC_MSG_WARN([libltdl not installed, but installation disabled])
|
||||
else
|
||||
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
|
||||
INCLTDL=ifelse($#,1,-I$1,['-I${top_builddir}/libltdl'])
|
||||
else
|
||||
ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
|
||||
LIBLTDL="-lltdl"
|
||||
INCLTDL=
|
||||
fi
|
||||
])
|
||||
|
||||
|
|
@ -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_PROG_LD, [indir([AC_PROG_LD])])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
|
||||
AC_DEFUN(AM_SYS_LIBTOOL_CYGWIN, [indir([AC_SYS_LIBTOOL_CYGWIN])])dnl
|
||||
|
||||
dnl This is just to silence aclocal about the macro not being used
|
||||
ifelse([AC_DISABLE_FAST_INSTALL])dnl
|
||||
|
||||
# Like AC_CONFIG_HEADER, but automatically create stamp file.
|
||||
|
||||
|
|
|
|||
|
|
@ -194,8 +194,8 @@ namespace std {
|
|||
to_char_type(const int_type& __c)
|
||||
{ return static_cast<char>(__c); }
|
||||
|
||||
// To keep both the byte 0xff and the eof symbol 0xffffffff
|
||||
// from ending up as 0xffffffff.
|
||||
// To keep both the byte 0xff and the eof symbol 0xffffffff
|
||||
// from ending up as 0xffffffff.
|
||||
static int_type
|
||||
to_int_type(const char_type& __c)
|
||||
{ return static_cast<int_type>(static_cast<unsigned char>(__c)); }
|
||||
|
|
@ -247,7 +247,7 @@ namespace std {
|
|||
|
||||
static size_t
|
||||
length(const char_type* __s)
|
||||
{ return wcslen (__s); }
|
||||
{ return wcslen(__s); }
|
||||
|
||||
static const char_type*
|
||||
find(const char_type* __s, size_t __n, const char_type& __a)
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@
|
|||
#include <bits/c++config.h>
|
||||
#include <bits/std_cfloat.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>
|
||||
#endif
|
||||
|
||||
|
|
@ -299,7 +299,7 @@ namespace std {
|
|||
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> {
|
||||
static const bool is_specialized = true;
|
||||
|
||||
|
|
|
|||
|
|
@ -37,54 +37,21 @@
|
|||
#define _CPP_CWCHAR 1
|
||||
|
||||
#include <bits/c++config.h>
|
||||
#ifdef _GLIBCPP_USE_WCHAR_T
|
||||
|
||||
#if _GLIBCPP_USE_WCHAR_T
|
||||
# pragma system_header
|
||||
# include_next <wchar.h>
|
||||
#endif
|
||||
|
||||
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
|
||||
#else
|
||||
# ifdef _GLIBCPP_NEED_MBSTATE_T
|
||||
extern "C"
|
||||
{
|
||||
typedef struct
|
||||
{
|
||||
int __fill[6];
|
||||
} mbstate_t;
|
||||
#endif
|
||||
}
|
||||
|
||||
# endif
|
||||
#endif //_GLIBCPP_USE_WCHAR_T
|
||||
|
||||
#endif // _CPP_CWCHAR
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
// -*- 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
|
||||
// software; you can redistribute it and/or modify it under the
|
||||
|
|
@ -34,11 +34,6 @@
|
|||
#ifndef _CPP_CWCTYPE
|
||||
#define _CPP_CWCTYPE 1
|
||||
|
||||
// This keeps isanum, et al from being propagated as macros.
|
||||
#if __linux__
|
||||
#define __NO_WCTYPE 1
|
||||
#endif
|
||||
|
||||
# pragma system_header
|
||||
# include_next <wctype.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -12,11 +12,6 @@
|
|||
// around.
|
||||
#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.
|
||||
#undef _GLIBCPP_USE_WCHAR_T
|
||||
|
||||
|
|
@ -290,6 +285,15 @@
|
|||
/* Define if you have the hypotl function. */
|
||||
#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. */
|
||||
#undef HAVE_ISINF
|
||||
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -83,14 +83,13 @@ FMTFLAGS = @FMTFLAGS@
|
|||
GCC_OBJDIR = @GCC_OBJDIR@
|
||||
GLIBCPP_CFLAGS = @GLIBCPP_CFLAGS@
|
||||
GLIBCPP_CXXFLAGS = @GLIBCPP_CXXFLAGS@
|
||||
LD = @LD@
|
||||
LIBMATHOBJS = @LIBMATHOBJS@
|
||||
LIBSTRINGOBJS = @LIBSTRINGOBJS@
|
||||
LIBTOOL = @LIBTOOL@
|
||||
LN_S = @LN_S@
|
||||
MAINT = @MAINT@
|
||||
MAKEINFO = @MAKEINFO@
|
||||
NM = @NM@
|
||||
OBJDUMP = @OBJDUMP@
|
||||
PACKAGE = @PACKAGE@
|
||||
RANLIB = @RANLIB@
|
||||
THREADDEPS = @THREADDEPS@
|
||||
|
|
@ -99,7 +98,6 @@ THREADLIBS = @THREADLIBS@
|
|||
THREADOBJS = @THREADOBJS@
|
||||
THREADSPEC = @THREADSPEC@
|
||||
USE_LONG_DOUBLE = @USE_LONG_DOUBLE@
|
||||
USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
|
||||
VERSION = @VERSION@
|
||||
WERROR = @WERROR@
|
||||
cpu_include_dir = @cpu_include_dir@
|
||||
|
|
|
|||
|
|
@ -83,14 +83,13 @@ FMTFLAGS = @FMTFLAGS@
|
|||
GCC_OBJDIR = @GCC_OBJDIR@
|
||||
GLIBCPP_CFLAGS = @GLIBCPP_CFLAGS@
|
||||
GLIBCPP_CXXFLAGS = @GLIBCPP_CXXFLAGS@
|
||||
LD = @LD@
|
||||
LIBMATHOBJS = @LIBMATHOBJS@
|
||||
LIBSTRINGOBJS = @LIBSTRINGOBJS@
|
||||
LIBTOOL = @LIBTOOL@
|
||||
LN_S = @LN_S@
|
||||
MAINT = @MAINT@
|
||||
MAKEINFO = @MAKEINFO@
|
||||
NM = @NM@
|
||||
OBJDUMP = @OBJDUMP@
|
||||
PACKAGE = @PACKAGE@
|
||||
RANLIB = @RANLIB@
|
||||
THREADDEPS = @THREADDEPS@
|
||||
|
|
@ -99,7 +98,6 @@ THREADLIBS = @THREADLIBS@
|
|||
THREADOBJS = @THREADOBJS@
|
||||
THREADSPEC = @THREADSPEC@
|
||||
USE_LONG_DOUBLE = @USE_LONG_DOUBLE@
|
||||
USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
|
||||
VERSION = @VERSION@
|
||||
WERROR = @WERROR@
|
||||
cpu_include_dir = @cpu_include_dir@
|
||||
|
|
|
|||
|
|
@ -81,14 +81,13 @@ FMTFLAGS = @FMTFLAGS@
|
|||
GCC_OBJDIR = @GCC_OBJDIR@
|
||||
GLIBCPP_CFLAGS = @GLIBCPP_CFLAGS@
|
||||
GLIBCPP_CXXFLAGS = @GLIBCPP_CXXFLAGS@
|
||||
LD = @LD@
|
||||
LIBMATHOBJS = @LIBMATHOBJS@
|
||||
LIBSTRINGOBJS = @LIBSTRINGOBJS@
|
||||
LIBTOOL = @LIBTOOL@
|
||||
LN_S = @LN_S@
|
||||
MAINT = @MAINT@
|
||||
MAKEINFO = @MAKEINFO@
|
||||
NM = @NM@
|
||||
OBJDUMP = @OBJDUMP@
|
||||
PACKAGE = @PACKAGE@
|
||||
RANLIB = @RANLIB@
|
||||
THREADDEPS = @THREADDEPS@
|
||||
|
|
@ -97,7 +96,6 @@ THREADLIBS = @THREADLIBS@
|
|||
THREADOBJS = @THREADOBJS@
|
||||
THREADSPEC = @THREADSPEC@
|
||||
USE_LONG_DOUBLE = @USE_LONG_DOUBLE@
|
||||
USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
|
||||
VERSION = @VERSION@
|
||||
WERROR = @WERROR@
|
||||
cpu_include_dir = @cpu_include_dir@
|
||||
|
|
|
|||
|
|
@ -726,7 +726,7 @@ int main()
|
|||
type_trait<char>();
|
||||
type_trait<signed 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>();
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -756,8 +756,7 @@ namespace std {
|
|||
codecvt_byname<wchar_t, char, mbstate_t>::
|
||||
codecvt_byname(const char* /*__s*/, size_t __refs)
|
||||
: codecvt<wchar_t, char, mbstate_t> (__refs)
|
||||
{
|
||||
}
|
||||
{ }
|
||||
|
||||
codecvt_byname<wchar_t, char, mbstate_t>::~codecvt_byname() {}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue