diff options
author | kan <kan@FreeBSD.org> | 2002-09-17 04:04:04 +0000 |
---|---|---|
committer | kan <kan@FreeBSD.org> | 2002-09-17 04:04:04 +0000 |
commit | d28dfe2607c93215301923596ce65ae6df3d4cd9 (patch) | |
tree | e1352a09cb44f9237c705b49ba032895f99b4cba /contrib/libstdc++/acinclude.m4 | |
parent | 366976642281939a5ef910427ef046ec6f72af8a (diff) | |
download | FreeBSD-src-d28dfe2607c93215301923596ce65ae6df3d4cd9.zip FreeBSD-src-d28dfe2607c93215301923596ce65ae6df3d4cd9.tar.gz |
Gcc 3.2.1-prerelease C++ support bits from the FSF anoncvs repo gcc-3_2-branch on 16-Sep-2002 13:23:11 EDT.
Diffstat (limited to 'contrib/libstdc++/acinclude.m4')
-rw-r--r-- | contrib/libstdc++/acinclude.m4 | 30 |
1 files changed, 24 insertions, 6 deletions
diff --git a/contrib/libstdc++/acinclude.m4 b/contrib/libstdc++/acinclude.m4 index 894fbf8..a7ab248 100644 --- a/contrib/libstdc++/acinclude.m4 +++ b/contrib/libstdc++/acinclude.m4 @@ -1131,6 +1131,12 @@ AC_DEFUN(GLIBCPP_ENABLE_CLOCALE, [ AC_TRY_RUN([ #define _GNU_SOURCE 1 #include <locale.h> + #include <string.h> + #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 +1178,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 +1186,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 +1212,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 +1220,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 +1228,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 +1236,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 +1249,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) ]) |