iconv.m4		iconv.m4
	# iconv.m4 serial AM4 (gettext-0.11.3)		# iconv.m4 serial 9 (gettext-0.18)
	dnl Copyright (C) 2000-2002 Free Software Foundation, Inc.		dnl Copyright (C) 2000-2002, 2007-2010 Free Software Foundation, Inc.
	dnl This file is free software; the Free Software Foundation		dnl This file is free software; the Free Software Foundation
	dnl gives unlimited permission to copy and/or distribute it,		dnl gives unlimited permission to copy and/or distribute it,
	dnl with or without modifications, as long as this notice is preserved.		dnl with or without modifications, as long as this notice is preserved.
	dnl From Bruno Haible.		dnl From Bruno Haible.
	AC_DEFUN([AM_ICONV_LINKFLAGS_BODY],		AC_DEFUN([AM_ICONV_LINKFLAGS_BODY],
	[		[
	dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.		dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
	AC_REQUIRE([AC_LIB_PREPARE_PREFIX])		AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
	skipping to change at line 24		skipping to change at line 24
	dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV		dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
	dnl accordingly.		dnl accordingly.
	AC_LIB_LINKFLAGS_BODY([iconv])		AC_LIB_LINKFLAGS_BODY([iconv])
	])		])
	AC_DEFUN([AM_ICONV_LINK],		AC_DEFUN([AM_ICONV_LINK],
	[		[
	dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and		dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
	dnl those with the standalone portable GNU libiconv installed).		dnl those with the standalone portable GNU libiconv installed).
			AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
	dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV		dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
	dnl accordingly.		dnl accordingly.
	AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])		AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
	dnl Add $INCICONV to CPPFLAGS before performing the following checks,		dnl Add $INCICONV to CPPFLAGS before performing the following checks,
	dnl because if the user has installed libiconv and not disabled its use		dnl because if the user has installed libiconv and not disabled its use
	dnl via --without-libiconv-prefix, he wants to use it. The first		dnl via --without-libiconv-prefix, he wants to use it. The first
	dnl AC_TRY_LINK will then fail, the second AC_TRY_LINK will succeed.		dnl AC_TRY_LINK will then fail, the second AC_TRY_LINK will succeed.
	am_save_CPPFLAGS="$CPPFLAGS"		am_save_CPPFLAGS="$CPPFLAGS"
	AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV])		AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV])
	AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [		AC_CACHE_CHECK([for iconv], [am_cv_func_iconv], [
	am_cv_func_iconv="no, consider installing GNU libiconv"		am_cv_func_iconv="no, consider installing GNU libiconv"
	am_cv_lib_iconv=no		am_cv_lib_iconv=no
	AC_TRY_LINK([#include <stdlib.h>		AC_TRY_LINK([#include <stdlib.h>
	#include <iconv.h>],		#include <iconv.h>],
	[iconv_t cd = iconv_open("","");		[iconv_t cd = iconv_open("","");
	iconv(cd,NULL,NULL,NULL,NULL);		iconv(cd,NULL,NULL,NULL,NULL);
	iconv_close(cd);],		iconv_close(cd);],
	am_cv_func_iconv=yes)		[am_cv_func_iconv=yes])
	if test "$am_cv_func_iconv" != yes; then		if test "$am_cv_func_iconv" != yes; then
	am_save_LIBS="$LIBS"		am_save_LIBS="$LIBS"
	LIBS="$LIBS $LIBICONV"		LIBS="$LIBS $LIBICONV"
	AC_TRY_LINK([#include <stdlib.h>		AC_TRY_LINK([#include <stdlib.h>
	#include <iconv.h>],		#include <iconv.h>],
	[iconv_t cd = iconv_open("","");		[iconv_t cd = iconv_open("","");
	iconv(cd,NULL,NULL,NULL,NULL);		iconv(cd,NULL,NULL,NULL,NULL);
	iconv_close(cd);],		iconv_close(cd);],
	am_cv_lib_iconv=yes		[am_cv_lib_iconv=yes]
	am_cv_func_iconv=yes)		[am_cv_func_iconv=yes])
	LIBS="$am_save_LIBS"		LIBS="$am_save_LIBS"
	fi		fi
	])		])
	if test "$am_cv_func_iconv" = yes; then		if test "$am_cv_func_iconv" = yes; then
	AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.])		AC_CACHE_CHECK([for working iconv], [am_cv_func_iconv_works], [
			dnl This tests against bugs in AIX 5.1, HP-UX 11.11, Solaris 10.
			am_save_LIBS="$LIBS"
			if test $am_cv_lib_iconv = yes; then
			LIBS="$LIBS $LIBICONV"
			fi
			AC_TRY_RUN([
			#include <iconv.h>
			#include <string.h>
			int main ()
			{
			/* Test against AIX 5.1 bug: Failures are not distinguishable from succes
			sful
			returns. */
			{
			iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8");
			if (cd_utf8_to_88591 != (iconv_t)(-1))
			{
			static const char input[] = "\342\202\254"; /* EURO SIGN */
			char buf[10];
			const char *inptr = input;
			size_t inbytesleft = strlen (input);
			char *outptr = buf;
			size_t outbytesleft = sizeof (buf);
			size_t res = iconv (cd_utf8_to_88591,
			(char **) &inptr, &inbytesleft,
			&outptr, &outbytesleft);
			if (res == 0)
			return 1;
			}
			}
			/* Test against Solaris 10 bug: Failures are not distinguishable from
			successful returns. */
			{
			iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646");
			if (cd_ascii_to_88591 != (iconv_t)(-1))
			{
			static const char input[] = "\263";
			char buf[10];
			const char *inptr = input;
			size_t inbytesleft = strlen (input);
			char *outptr = buf;
			size_t outbytesleft = sizeof (buf);
			size_t res = iconv (cd_ascii_to_88591,
			(char **) &inptr, &inbytesleft,
			&outptr, &outbytesleft);
			if (res == 0)
			return 1;
			}
			}
			#if 0 /* This bug could be worked around by the caller. */
			/* Test against HP-UX 11.11 bug: Positive return value instead of 0. */
			{
			iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591");
			if (cd_88591_to_utf8 != (iconv_t)(-1))
			{
			static const char input[] = "\304rger mit b\366sen B\374bchen ohne
			Augenma\337";
			char buf[50];
			const char *inptr = input;
			size_t inbytesleft = strlen (input);
			char *outptr = buf;
			size_t outbytesleft = sizeof (buf);
			size_t res = iconv (cd_88591_to_utf8,
			(char **) &inptr, &inbytesleft,
			&outptr, &outbytesleft);
			if ((int)res > 0)
			return 1;
			}
			}
			#endif
			/* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is
			provided. */
			if (/* Try standardized names. */
			iconv_open ("UTF-8", "EUC-JP") == (iconv_t)(-1)
			/* Try IRIX, OSF/1 names. */
			&& iconv_open ("UTF-8", "eucJP") == (iconv_t)(-1)
			/* Try AIX names. */
			&& iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1)
			/* Try HP-UX names. */
			&& iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
			return 1;
			return 0;
			}], [am_cv_func_iconv_works=yes], [am_cv_func_iconv_works=no],
			[case "$host_os" in
			aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
			*) am_cv_func_iconv_works="guessing yes" ;;
			esac])
			LIBS="$am_save_LIBS"
			])
			case "$am_cv_func_iconv_works" in
			*no) am_func_iconv=no am_cv_lib_iconv=no ;;
			*) am_func_iconv=yes ;;
			esac
			else
			am_func_iconv=no am_cv_lib_iconv=no
			fi
			if test "$am_func_iconv" = yes; then
			AC_DEFINE([HAVE_ICONV], [1],
			[Define if you have the iconv() function and it works.])
	fi		fi
	if test "$am_cv_lib_iconv" = yes; then		if test "$am_cv_lib_iconv" = yes; then
	AC_MSG_CHECKING([how to link with libiconv])		AC_MSG_CHECKING([how to link with libiconv])
	AC_MSG_RESULT([$LIBICONV])		AC_MSG_RESULT([$LIBICONV])
	else		else
	dnl If $LIBICONV didn't lead to a usable library, we don't need $INCICO NV		dnl If $LIBICONV didn't lead to a usable library, we don't need $INCICO NV
	dnl either.		dnl either.
	CPPFLAGS="$am_save_CPPFLAGS"		CPPFLAGS="$am_save_CPPFLAGS"
	LIBICONV=		LIBICONV=
	LTLIBICONV=		LTLIBICONV=
	fi		fi
	AC_SUBST(LIBICONV)		AC_SUBST([LIBICONV])
	AC_SUBST(LTLIBICONV)		AC_SUBST([LTLIBICONV])
	])		])
	AC_DEFUN([AM_ICONV],		AC_DEFUN([AM_ICONV],
	[		[
	AM_ICONV_LINK		AM_ICONV_LINK
	if test "$am_cv_func_iconv" = yes; then		if test "$am_cv_func_iconv" = yes; then
	AC_MSG_CHECKING([for iconv declaration])		AC_MSG_CHECKING([for iconv declaration])
	AC_CACHE_VAL(am_cv_proto_iconv, [		AC_CACHE_VAL([am_cv_proto_iconv], [
	AC_TRY_COMPILE([		AC_TRY_COMPILE([
	#include <stdlib.h>		#include <stdlib.h>
	#include <iconv.h>		#include <iconv.h>
	extern		extern
	#ifdef __cplusplus		#ifdef __cplusplus
	"C"		"C"
	#endif		#endif
	#if defined(__STDC__) || defined(__cplusplus)		#if defined(__STDC__) || defined(__cplusplus)
	size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbu f, size_t *outbytesleft);		size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbu f, size_t *outbytesleft);
	#else		#else
	size_t iconv();		size_t iconv();
	#endif		#endif
	], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const")		], [], [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_icon v_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytes left);"])		am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_icon v_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytes left);"])
	am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/ ( /(/'`		am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/ ( /(/'`
	AC_MSG_RESULT([$]{ac_t:-		AC_MSG_RESULT([
	}[$]am_cv_proto_iconv)		$am_cv_proto_iconv])
	AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1,		AC_DEFINE_UNQUOTED([ICONV_CONST], [$am_cv_proto_iconv_arg1],
	[Define as const if the declaration of iconv() needs const.])		[Define as const if the declaration of iconv() needs const.])
	fi		fi
	])		])
End of changes. 10 change blocks.
	14 lines changed or deleted		114 lines changed or added
This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/