X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=libstdc%2B%2B-v3%2Facinclude.m4;h=2bfec92da0f0d1e8d000417e13aa317ae19974b8;hb=33c99202e6125cde62f7ea4e0215ec53b61a4b38;hp=b814f5734565d282020a61ffb1db8911add51931;hpb=077ce9785f3a56d7447f04aba890c912be2faf21;p=pf3gnuchains%2Fgcc-fork.git diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4 index b814f573456..2bfec92da0f 100644 --- a/libstdc++-v3/acinclude.m4 +++ b/libstdc++-v3/acinclude.m4 @@ -1,5 +1,5 @@ dnl -dnl Initialize configure bits. +dnl Initialize basic configure bits, set toplevel_srcdir for Makefiles. dnl dnl GLIBCPP_TOPREL_CONFIGURE AC_DEFUN(GLIBCPP_TOPREL_CONFIGURE, [ @@ -37,13 +37,10 @@ AC_DEFUN(GLIBCPP_TOPREL_CONFIGURE, [ ]) dnl -dnl Initialize configure bits. +dnl Initialize the rest of the library configury. dnl dnl GLIBCPP_CONFIGURE AC_DEFUN(GLIBCPP_CONFIGURE, [ - -#possibly test for the presence of the compiler sources here? - # Export build and source directories. # These need to be absolute paths, yet at the same time need to # canonicalize only relative paths, because then amd will not unmount @@ -1131,6 +1128,12 @@ AC_DEFUN(GLIBCPP_ENABLE_CLOCALE, [ AC_TRY_RUN([ #define _GNU_SOURCE 1 #include + #include + #if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) + extern __typeof(newlocale) __newlocale; + extern __typeof(duplocale) __duplocale; + extern __typeof(strcoll_l) __strcoll_l; + #endif int main() { const char __one[] = "Äuglein Augmen"; @@ -1172,6 +1175,7 @@ AC_DEFUN(GLIBCPP_ENABLE_CLOCALE, [ CLOCALE_H=config/locale/generic/c_locale.h CLOCALE_CC=config/locale/generic/c_locale.cc CCODECVT_H=config/locale/generic/codecvt_specializations.h + CCODECVT_CC=config/locale/generic/codecvt_members.cc CCOLLATE_CC=config/locale/generic/collate_members.cc CCTYPE_CC=config/locale/generic/ctype_members.cc CMESSAGES_H=config/locale/generic/messages_members.h @@ -1179,6 +1183,7 @@ AC_DEFUN(GLIBCPP_ENABLE_CLOCALE, [ CMONEY_CC=config/locale/generic/monetary_members.cc CNUMERIC_CC=config/locale/generic/numeric_members.cc CTIME_CC=config/locale/generic/time_members.cc + CLOCALE_INTERNAL_H=config/locale/generic/c++locale_internal.h ;; xgnu) AC_MSG_RESULT(gnu) @@ -1204,6 +1209,7 @@ AC_DEFUN(GLIBCPP_ENABLE_CLOCALE, [ CLOCALE_H=config/locale/gnu/c_locale.h CLOCALE_CC=config/locale/gnu/c_locale.cc CCODECVT_H=config/locale/ieee_1003.1-2001/codecvt_specializations.h + CCODECVT_CC=config/locale/gnu/codecvt_members.cc CCOLLATE_CC=config/locale/gnu/collate_members.cc CCTYPE_CC=config/locale/gnu/ctype_members.cc CMESSAGES_H=config/locale/gnu/messages_members.h @@ -1211,6 +1217,7 @@ AC_DEFUN(GLIBCPP_ENABLE_CLOCALE, [ CMONEY_CC=config/locale/gnu/monetary_members.cc CNUMERIC_CC=config/locale/gnu/numeric_members.cc CTIME_CC=config/locale/gnu/time_members.cc + CLOCALE_INTERNAL_H=config/locale/gnu/c++locale_internal.h ;; xieee_1003.1-2001) AC_MSG_RESULT(generic) @@ -1218,6 +1225,7 @@ AC_DEFUN(GLIBCPP_ENABLE_CLOCALE, [ CLOCALE_H=config/locale/ieee_1003.1-2001/c_locale.h CLOCALE_CC=config/locale/ieee_1003.1-2001/c_locale.cc CCODECVT_H=config/locale/ieee_1003.1-2001/codecvt_specializations.h + CCODECVT_CC=config/locale/generic/codecvt_members.cc CCOLLATE_CC=config/locale/generic/collate_members.cc CCTYPE_CC=config/locale/generic/ctype_members.cc CMESSAGES_H=config/locale/ieee_1003.1-2001/messages_members.h @@ -1225,6 +1233,7 @@ AC_DEFUN(GLIBCPP_ENABLE_CLOCALE, [ CMONEY_CC=config/locale/generic/monetary_members.cc CNUMERIC_CC=config/locale/generic/numeric_members.cc CTIME_CC=config/locale/generic/time_members.cc + CLOCALE_INTERNAL_H=config/locale/generic/c++locale_internal.h ;; *) echo "$enable_clocale is an unknown locale package" 1>&2 @@ -1237,17 +1246,23 @@ AC_DEFUN(GLIBCPP_ENABLE_CLOCALE, [ glibcpp_localedir=${glibcpp_builddir}/po/share/locale AC_SUBST(glibcpp_localedir) + # For the time being, transform ctype_noninline.h to ctype_members_char.cc +# CCTYPE_CHAR_CC=config/${os_include_dir}/ctype_noninline.h + AC_SUBST(USE_NLS) AC_SUBST(CLOCALE_H) AC_SUBST(CCODECVT_H) AC_SUBST(CMESSAGES_H) AC_LINK_FILES($CLOCALE_CC, src/c++locale.cc) - AC_LINK_FILES($CCOLLATE_CC, src/collate.cc) - AC_LINK_FILES($CCTYPE_CC, src/ctype.cc) - AC_LINK_FILES($CMESSAGES_CC, src/messages.cc) - AC_LINK_FILES($CMONEY_CC, src/monetary.cc) - AC_LINK_FILES($CNUMERIC_CC, src/numeric.cc) - AC_LINK_FILES($CTIME_CC, src/time.cc) + AC_LINK_FILES($CCODECVT_CC, src/codecvt_members.cc) + AC_LINK_FILES($CCOLLATE_CC, src/collate_members.cc) +# AC_LINK_FILES($CCTYPE_CHAR_CC, src/ctype_members_char.cc) + AC_LINK_FILES($CCTYPE_CC, src/ctype_members.cc) + AC_LINK_FILES($CMESSAGES_CC, src/messages_members.cc) + AC_LINK_FILES($CMONEY_CC, src/monetary_members.cc) + AC_LINK_FILES($CNUMERIC_CC, src/numeric_members.cc) + AC_LINK_FILES($CTIME_CC, src/time_members.cc) + AC_LINK_FILES($CLOCALE_INTERNAL_H, src/c++locale_internal.h) ]) @@ -1672,9 +1687,8 @@ dnl dnl GLIBCPP_ENABLE_CHEADERS dnl --enable-cheaders= [does stuff]. dnl --disable-cheaders [does not do anything, really]. -dnl + This will eventually need to be 'c_shadow' by default. dnl + Usage: GLIBCPP_ENABLE_CHEADERS[(DEFAULT)] -dnl Where DEFAULT is either `c' or `c_std' or 'c_shadow'. +dnl Where DEFAULT is either `c' or `c_std'. dnl If ommitted, it defaults to `c_std'. AC_DEFUN(GLIBCPP_ENABLE_CHEADERS, [dnl define([GLIBCPP_ENABLE_CHEADERS_DEFAULT], ifelse($1, c_std, c_std, c_std))dnl @@ -1690,9 +1704,6 @@ changequote([, ]) c_std) enable_cheaders=c_std ;; - c_shadow) - enable_cheaders=c_shadow - ;; *) AC_MSG_ERROR([Unknown argument to enable/disable "C" headers]) ;; esac], @@ -1701,9 +1712,6 @@ changequote([, ]) dnl Option parsed, now set things appropriately case "$enable_cheaders" in - c_shadow) - C_INCLUDE_DIR='${glibcpp_srcdir}/include/c_shadow' - ;; c_std) C_INCLUDE_DIR='${glibcpp_srcdir}/include/c_std' ;; @@ -1752,7 +1760,6 @@ dnl TOPLEVEL_INCLUDES dnl LIBMATH_INCLUDES dnl LIBSUPCXX_INCLUDES dnl LIBIO_INCLUDES -dnl CSHADOW_INCLUDES dnl dnl GLIBCPP_EXPORT_INCLUDES AC_DEFUN(GLIBCPP_EXPORT_INCLUDES, [ @@ -2187,6 +2194,7 @@ case $enable_symvers in ;; gnu) LINKER_MAP=config/linker-map.gnu + AC_DEFINE(_GLIBCPP_SYMVER) ;; esac