diff options
| author | Tom Tromey <tromey@redhat.com> | 2009-03-25 00:58:37 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@redhat.com> | 2009-03-25 00:58:37 +0000 |
| commit | fc3b640d978b8b07680feb80a69ddd8c05ee69bd (patch) | |
| tree | 92abfc36a7dcea9da711c8e3d4db835f08df9b0c /gdb/acinclude.m4 | |
| parent | b5fe7cfc58a3c8ea9be1aaedef6e441462340d10 (diff) | |
| download | gdb-fc3b640d978b8b07680feb80a69ddd8c05ee69bd.zip gdb-fc3b640d978b8b07680feb80a69ddd8c05ee69bd.tar.gz gdb-fc3b640d978b8b07680feb80a69ddd8c05ee69bd.tar.bz2 | |
2009-03-24 Tom Tromey <tromey@redhat.com>
Pedro Alves <pedro@codesourcery.com>
* configure, config.in: Rebuild.
* configure.ac: Check for libiconvlist.
* charset.c: Check HAVE_LIBICONVLIST.
* acinclude.m4 (AM_ICONV): Don't subst LIBICONV, LIBICONV_INCLUDE,
LIBICONV_LIBDIR. Update CPPFLAGS and LIBS.
* Makefile.in (LIBICONV, LIBICONV_INCLUDE, LIBICONV_LIBDIR):
Remove.
(INTERNAL_CFLAGS_BASE): Update.
(INTERNAL_LDFLAGS): Update.
(CLIBS): Update.
Diffstat (limited to 'gdb/acinclude.m4')
| -rw-r--r-- | gdb/acinclude.m4 | 27 |
1 files changed, 11 insertions, 16 deletions
diff --git a/gdb/acinclude.m4 b/gdb/acinclude.m4 index a2c262e..1897045 100644 --- a/gdb/acinclude.m4 +++ b/gdb/acinclude.m4 @@ -221,13 +221,19 @@ AC_DEFUN([AM_ICONV], am_cv_lib_iconv=yes am_cv_func_iconv=yes) LIBS="$am_save_LIBS" - if test "$am_cv_func_iconv" = "yes"; then - am_cv_use_build_libiconv=yes - else - CPPFLAGS="$am_save_CPPFLAGS" - fi + CPPFLAGS="$am_save_CPPFLAGS" fi ]) + LIBICONV= + if test "$am_cv_lib_iconv" = yes; then + LIBICONV="-liconv" + fi + if test "$am_cv_use_build_libiconv" = yes; then + LIBICONV_LIBDIR="$BUILD_LIBICONV_LIBDIR" + LIBICONV_INCLUDE="$BUILD_LIBICONV_INCLUDE" + fi + CPPFLAGS="$CPPFLAGS $LIBICONV_INCLUDE" + LIBS="$LIBS $LIBICONV_LIBDIR $LIBICONV" if test "$am_cv_func_iconv" = yes; then AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.]) AC_MSG_CHECKING([for iconv declaration]) @@ -252,17 +258,6 @@ size_t iconv(); AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1, [Define as const if the declaration of iconv() needs const.]) fi - LIBICONV= - if test "$am_cv_lib_iconv" = yes; then - LIBICONV="-liconv" - fi - if test "$am_cv_use_build_libiconv" = yes; then - LIBICONV_LIBDIR="$BUILD_LIBICONV_LIBDIR" - LIBICONV_INCLUDE="$BUILD_LIBICONV_INCLUDE" - fi - AC_SUBST(LIBICONV) - AC_SUBST(LIBICONV_INCLUDE) - AC_SUBST(LIBICONV_LIBDIR) ]) dnl written by Guido Draheim <guidod@gmx.de>, original by Alexandre Oliva |