diff options
Diffstat (limited to 'gdb/acinclude.m4')
| -rw-r--r-- | gdb/acinclude.m4 | 127 |
1 files changed, 2 insertions, 125 deletions
diff --git a/gdb/acinclude.m4 b/gdb/acinclude.m4 index 0ecfaf9..ad940f7 100644 --- a/gdb/acinclude.m4 +++ b/gdb/acinclude.m4 @@ -53,6 +53,8 @@ sinclude([../config/lcmessage.m4]) dnl For AM_LANGINFO_CODESET. sinclude([../config/codeset.m4]) +sinclude([../config/iconv.m4]) + sinclude([../config/zlib.m4]) m4_include([common/common.m4]) @@ -174,131 +176,6 @@ case "x$am_cv_prog_cc_stdc" in esac ]) -dnl Originally from Bruno Haible, but with some modifications -dnl for the GDB project. - -AC_DEFUN([AM_ICONV], -[ - dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and - dnl those with the standalone portable GNU libiconv installed). - - AC_ARG_WITH([libiconv-prefix], - AS_HELP_STRING([--with-libiconv-prefix=DIR], [search for libiconv in DIR/include and DIR/lib]), [ - for dir in `echo "$withval" | tr : ' '`; do - if test -d $dir/include; then LIBICONV_INCLUDE="-I$dir/include"; fi - if test -d $dir/lib; then LIBICONV_LIBDIR="-L$dir/lib"; fi - done - ]) - - BUILD_LIBICONV_LIBDIRS="../libiconv/lib/.libs ../libiconv/lib/_libs" - BUILD_LIBICONV_INCLUDE="-I../libiconv/include" - - AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [ - am_cv_func_iconv="no, consider installing GNU libiconv" - am_cv_lib_iconv=no - am_cv_use_build_libiconv=no - am_cv_build_libiconv_path= - - # If libiconv is part of the build tree, then try using it over - # any system iconv. - if test -d ../libiconv; then - for lib_dir in $BUILD_LIBICONV_LIBDIRS; do - am_save_LIBS="$LIBS" - am_save_CPPFLAGS="$CPPFLAGS" - LIBS="$LIBS $lib_dir/libiconv.a" - CPPFLAGS="$CPPFLAGS $BUILD_LIBICONV_INCLUDE" - AC_TRY_LINK([#include <stdlib.h> -#include <iconv.h>], - [iconv_t cd = iconv_open("",""); - iconv(cd,NULL,NULL,NULL,NULL); - iconv_close(cd);], - am_cv_use_build_libiconv=yes - am_cv_build_libiconv_path=$lib_dir/libiconv.a - am_cv_lib_iconv=yes - am_cv_func_iconv=yes) - LIBS="$am_save_LIBS" - CPPFLAGS="$am_save_CPPFLAGS" - if test "$am_cv_use_build_libiconv" = "yes"; then - break - fi - done - fi - - # Next, try to find iconv in libc. - if test "$am_cv_func_iconv" != yes; then - AC_TRY_LINK([#include <stdlib.h> -#include <iconv.h>], - [iconv_t cd = iconv_open("",""); - iconv(cd,NULL,NULL,NULL,NULL); - iconv_close(cd);], - am_cv_func_iconv=yes) - fi - - # If iconv was not in libc, try -liconv. In this case, arrange to - # look in the libiconv prefix, if it was specified by the user. - if test "$am_cv_func_iconv" != yes; then - am_save_CPPFLAGS="$CPPFLAGS" - am_save_LIBS="$LIBS" - if test -n "$LIBICONV_INCLUDE"; then - CPPFLAGS="$CPPFLAGS $LIBICONV_INCLUDE" - LIBS="$LIBS $LIBICONV_LIBDIR" - fi - LIBS="$LIBS -liconv" - AC_TRY_LINK([#include <stdlib.h> -#include <iconv.h>], - [iconv_t cd = iconv_open("",""); - iconv(cd,NULL,NULL,NULL,NULL); - iconv_close(cd);], - am_cv_lib_iconv=yes - am_cv_func_iconv=yes) - LIBS="$am_save_LIBS" - CPPFLAGS="$am_save_CPPFLAGS" - fi - ]) - - # Set the various flags based on the cache variables. We can't rely - # on the flags to remain set from the above code, due to caching. - LIBICONV= - if test "$am_cv_lib_iconv" = yes; then - LIBICONV="-liconv" - else - LIBICONV_LIBDIR= - LIBICONV_INCLUDE= - fi - if test "$am_cv_use_build_libiconv" = yes; then - LIBICONV="$am_cv_build_libiconv_path" - 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]) - AC_CACHE_VAL(am_cv_proto_iconv, [ - AC_TRY_COMPILE([ -#include <stdlib.h> -#include <iconv.h> -extern -#ifdef __cplusplus -"C" -#endif -#if defined(__STDC__) || defined(__cplusplus) -size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft); -#else -size_t iconv(); -#endif -], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const") - am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"]) - am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'` - AC_MSG_RESULT([$]{ac_t:- - }[$]am_cv_proto_iconv) - AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1, - [Define as const if the declaration of iconv() needs const.]) - fi -]) - dnl written by Guido Draheim <guidod@gmx.de>, original by Alexandre Oliva dnl Version 1.3 (2001/03/02) dnl source http://www.gnu.org/software/ac-archive/Miscellaneous/ac_define_dir.html |