aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Edelsohn <edelsohn@gnu.org>2000-11-13 22:32:05 +0000
committerBenjamin Kosnik <bkoz@gcc.gnu.org>2000-11-13 22:32:05 +0000
commitfef53cdcf23a73f1ce971932826a210f811e3101 (patch)
tree7b7ab13edf0ff01005d9f929acade6767ea34515
parenta78cc542019750a2c78cda87c874c0f8ad84c90f (diff)
downloadgcc-fef53cdcf23a73f1ce971932826a210f811e3101.zip
gcc-fef53cdcf23a73f1ce971932826a210f811e3101.tar.gz
gcc-fef53cdcf23a73f1ce971932826a210f811e3101.tar.bz2
acinclude.m4 (GLIBCPP_CHECK_WCHAR_T_SUPPORT): Add test for libiconv.a providing wchar_t support functions.
2000-11-12 David Edelsohn <edelsohn@gnu.org> * acinclude.m4 (GLIBCPP_CHECK_WCHAR_T_SUPPORT): Add test for libiconv.a providing wchar_t support functions. * aclocal.m4: Regenerate. From-SVN: r37441
-rw-r--r--libstdc++-v3/ChangeLog6
-rw-r--r--libstdc++-v3/acinclude.m46
2 files changed, 12 insertions, 0 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index de6c35c..035adc0 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2000-11-12 David Edelsohn <edelsohn@gnu.org>
+
+ * acinclude.m4 (GLIBCPP_CHECK_WCHAR_T_SUPPORT): Add test for
+ libiconv.a providing wchar_t support functions.
+ * aclocal.m4: Regenerate.
+
2000-11-12 Loren J. Rittle <ljrittle@acm.org>
* acinclude.m4 (GLIBCPP_ENABLE_ATOMICITY): Handle FreeBSD.
diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4
index dc267fb..9ce0382 100644
--- a/libstdc++-v3/acinclude.m4
+++ b/libstdc++-v3/acinclude.m4
@@ -1083,6 +1083,12 @@ AC_DEFUN(GLIBCPP_CHECK_WCHAR_T_SUPPORT, [
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_HEADER(langinfo.h, ac_has_langinfo_h=yes, ac_has_langinfo_h=no)
+
+ dnl Check for existence of libiconv.a providing XPG2 wchar_t support.
+ AC_CHECK_LIB(iconv, iconv, libiconv="-liconv")
+ ac_save_LIBS="$LIBS"
+ LIBS="$LIBS $libiconv"
+
AC_CHECK_FUNCS(iconv_open iconv_close iconv nl_langinfo, \
ac_XPG2funcs=yes, ac_XPG2funcs=no)