diff options
| author | pme <pme@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-03-19 11:34:47 +0000 |
|---|---|---|
| committer | pme <pme@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-03-19 11:34:47 +0000 |
| commit | 622700c3706807105d8aff1745e225a8a6564353 (patch) | |
| tree | 05e016085db5fbc026e884949a40ffea756b57c4 /libstdc++-v3/acinclude.m4 | |
| parent | 9589ca7af72ebbfb9369a6348d04a3da448fd398 (diff) | |
2004-03-19 Phil Edwards <phil@codesourcery.com>
* acinclude.m4 (GLIBCXX_CHECK_WCHAR_T_SUPPORT): Set LIBICONV,
not libiconv. SUBST this variable as well.
* testsuite/Makefile.am (site.exp): New target, based on that
created by automake. Also set libiconv.
* configure, Makefile.in, include/Makefile.in, libmath/Makefile.in,
libsupc++/Makefile.in, po/Makefile.in, src/Makefile.in,
testsuite/Makefile.in: Regenerate.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@79678 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/acinclude.m4')
| -rw-r--r-- | libstdc++-v3/acinclude.m4 | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4 index 9a53a7aa177..8be0e2557ff 100644 --- a/libstdc++-v3/acinclude.m4 +++ b/libstdc++-v3/acinclude.m4 @@ -336,6 +336,8 @@ dnl dnl Defines: dnl HAVE_MBSTATE_T if mbstate_t is not in wchar.h dnl _GLIBCXX_USE_WCHAR_T if all the bits are found. +dnl Substs: +dnl LIBICONV to a -l string containing the iconv library, if needed. dnl AC_DEFUN([GLIBCXX_CHECK_WCHAR_T_SUPPORT], [ # Test wchar.h for mbstate_t, which is needed for char_traits and @@ -412,9 +414,10 @@ AC_DEFUN([GLIBCXX_CHECK_WCHAR_T_SUPPORT], [ AC_CHECK_HEADER(langinfo.h, ac_has_langinfo_h=yes, ac_has_langinfo_h=no) # Check for existence of libiconv.a providing XPG2 wchar_t support. - AC_CHECK_LIB(iconv, iconv, libiconv="-liconv") + AC_CHECK_LIB(iconv, iconv, LIBICONV="-liconv") ac_save_LIBS="$LIBS" - LIBS="$LIBS $libiconv" + LIBS="$LIBS $LIBICONV" + AC_SUBST(LIBICONV) AC_CHECK_FUNCS([iconv_open iconv_close iconv nl_langinfo], [ac_XPG2funcs=yes], [ac_XPG2funcs=no]) |