Diff: gettext.m4 - gettext.m4

	gettext.m4	gettext.m4

	# gettext.m4 serial 59 (gettext-0.16.1)	# gettext.m4 serial 63 (gettext-0.18)
	dnl Copyright (C) 1995-2006 Free Software Foundation, Inc.	dnl Copyright (C) 1995-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	dnl
	dnl This file can can be used in projects which are not available under	dnl This file can can be used in projects which are not available under
	dnl the GNU General Public License or the GNU Library General Public	dnl the GNU General Public License or the GNU Library General Public
	dnl License but which still want to provide support for the GNU gettext	dnl License but which still want to provide support for the GNU gettext
	dnl functionality.	dnl functionality.
	dnl Please note that the actual code of the GNU gettext library is covered	dnl Please note that the actual code of the GNU gettext library is covered
	dnl by the GNU Library General Public License, and the rest of the GNU	dnl by the GNU Library General Public License, and the rest of the GNU
	dnl gettext package package is covered by the GNU General Public License.	dnl gettext package package is covered by the GNU General Public License.
	dnl They are not in the public domain.	dnl They are not in the public domain.

	dnl Authors:	dnl Authors:
	dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.	dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.

	dnl Bruno Haible <haible@clisp.cons.org>, 2000-2006.	dnl Bruno Haible <haible@clisp.cons.org>, 2000-2006, 2008-2010.

	dnl Macro to add for using GNU gettext.	dnl Macro to add for using GNU gettext.

	dnl Usage: AM_GNU_GETTEXT([INTLSYMBOL], [NEEDSYMBOL], [INTLDIR]).	dnl Usage: AM_GNU_GETTEXT([INTLSYMBOL], [NEEDSYMBOL], [INTLDIR]).
	dnl INTLSYMBOL can be one of 'external', 'no-libtool', 'use-libtool'. The	dnl INTLSYMBOL can be one of 'external', 'no-libtool', 'use-libtool'. The
	dnl default (if it is not specified or empty) is 'no-libtool'.	dnl default (if it is not specified or empty) is 'no-libtool'.
	dnl INTLSYMBOL should be 'external' for packages with no intl directory,	dnl INTLSYMBOL should be 'external' for packages with no intl directory,
	dnl and 'no-libtool' or 'use-libtool' for packages with an intl director y.	dnl and 'no-libtool' or 'use-libtool' for packages with an intl director y.
	dnl If INTLSYMBOL is 'use-libtool', then a libtool library	dnl If INTLSYMBOL is 'use-libtool', then a libtool library
	dnl $(top_builddir)/intl/libintl.la will be created (shared and/or stati c,	dnl $(top_builddir)/intl/libintl.la will be created (shared and/or stati c,

	skipping to change at line 63	skipping to change at line 63
	dnl GNU format catalogs when building on a platform with an X/Open gettext) ,	dnl GNU format catalogs when building on a platform with an X/Open gettext) ,
	dnl but we keep it in order not to force irrelevant filename changes on the	dnl but we keep it in order not to force irrelevant filename changes on the
	dnl maintainers.	dnl maintainers.
	dnl	dnl
	AC_DEFUN([AM_GNU_GETTEXT],	AC_DEFUN([AM_GNU_GETTEXT],
	[	[
	dnl Argument checking.	dnl Argument checking.
	ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool] , , [ifelse([$1], [use-libtool], ,	ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool] , , [ifelse([$1], [use-libtool], ,
	[errprint([ERROR: invalid first argument to AM_GNU_GETTEXT	[errprint([ERROR: invalid first argument to AM_GNU_GETTEXT
	])])])])])	])])])])])

		ifelse(ifelse([$1], [], [old])[]ifelse([$1], [no-libtool], [old]), [old],
		[AC_DIAGNOSE([obsolete], [Use of AM_GNU_GETTEXT without [external] argu
		ment is deprecated.])])
	ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-f ormatstring-macros], ,	ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-f ormatstring-macros], ,
	[errprint([ERROR: invalid second argument to AM_GNU_GETTEXT	[errprint([ERROR: invalid second argument to AM_GNU_GETTEXT
	])])])])	])])])])
	define([gt_included_intl],	define([gt_included_intl],
	ifelse([$1], [external],	ifelse([$1], [external],
	ifdef([AM_GNU_GETTEXT_][INTL_SUBDIR], [yes], [no]),	ifdef([AM_GNU_GETTEXT_][INTL_SUBDIR], [yes], [no]),
	[yes]))	[yes]))
	define([gt_libtool_suffix_prefix], ifelse([$1], [use-libtool], [l], []))	define([gt_libtool_suffix_prefix], ifelse([$1], [use-libtool], [l], []))
	gt_NEEDS_INIT	gt_NEEDS_INIT
	AM_GNU_GETTEXT_NEED([$2])	AM_GNU_GETTEXT_NEED([$2])

	skipping to change at line 126	skipping to change at line 128
	*) gt_api_version=1 ;;	*) gt_api_version=1 ;;
	esac	esac
	gt_func_gnugettext_libc="gt_cv_func_gnugettext${gt_api_version}_libc"	gt_func_gnugettext_libc="gt_cv_func_gnugettext${gt_api_version}_libc"
	gt_func_gnugettext_libintl="gt_cv_func_gnugettext${gt_api_version}_libint l"	gt_func_gnugettext_libintl="gt_cv_func_gnugettext${gt_api_version}_libint l"

	dnl If we use NLS figure out what method	dnl If we use NLS figure out what method
	if test "$USE_NLS" = "yes"; then	if test "$USE_NLS" = "yes"; then
	gt_use_preinstalled_gnugettext=no	gt_use_preinstalled_gnugettext=no
	ifelse(gt_included_intl, yes, [	ifelse(gt_included_intl, yes, [
	AC_MSG_CHECKING([whether included gettext is requested])	AC_MSG_CHECKING([whether included gettext is requested])

	AC_ARG_WITH(included-gettext,	AC_ARG_WITH([included-gettext],
	[ --with-included-gettext use the GNU gettext library included her e],	[ --with-included-gettext use the GNU gettext library included her e],
	nls_cv_force_use_gnu_gettext=$withval,	nls_cv_force_use_gnu_gettext=$withval,
	nls_cv_force_use_gnu_gettext=no)	nls_cv_force_use_gnu_gettext=no)

	AC_MSG_RESULT($nls_cv_force_use_gnu_gettext)	AC_MSG_RESULT([$nls_cv_force_use_gnu_gettext])

	nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"	nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
	if test "$nls_cv_force_use_gnu_gettext" != "yes"; then	if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
	])	])
	dnl User does not insist on using GNU NLS library. Figure out what	dnl User does not insist on using GNU NLS library. Figure out what
	dnl to use. If GNU gettext is available we use this. Else we have	dnl to use. If GNU gettext is available we use this. Else we have
	dnl to fall back to GNU NLS library.	dnl to fall back to GNU NLS library.

	if test $gt_api_version -ge 3; then	if test $gt_api_version -ge 3; then
	gt_revision_test_code='	gt_revision_test_code='

	skipping to change at line 270	skipping to change at line 272
	if test "$gt_use_preinstalled_gnugettext" = "yes" \	if test "$gt_use_preinstalled_gnugettext" = "yes" \
	\|\| test "$nls_cv_use_gnu_gettext" = "yes"; then	\|\| test "$nls_cv_use_gnu_gettext" = "yes"; then
	dnl Some extra flags are needed during linking.	dnl Some extra flags are needed during linking.
	LIBINTL="$LIBINTL $INTL_MACOSX_LIBS"	LIBINTL="$LIBINTL $INTL_MACOSX_LIBS"
	LTLIBINTL="$LTLIBINTL $INTL_MACOSX_LIBS"	LTLIBINTL="$LTLIBINTL $INTL_MACOSX_LIBS"
	fi	fi
	fi	fi

	if test "$gt_use_preinstalled_gnugettext" = "yes" \	if test "$gt_use_preinstalled_gnugettext" = "yes" \
	\|\| test "$nls_cv_use_gnu_gettext" = "yes"; then	\|\| test "$nls_cv_use_gnu_gettext" = "yes"; then

	AC_DEFINE(ENABLE_NLS, 1,	AC_DEFINE([ENABLE_NLS], [1],
	[Define to 1 if translation of program messages to the user's nativ e language	[Define to 1 if translation of program messages to the user's nativ e language
	is requested.])	is requested.])
	else	else
	USE_NLS=no	USE_NLS=no
	fi	fi
	fi	fi

	AC_MSG_CHECKING([whether to use NLS])	AC_MSG_CHECKING([whether to use NLS])
	AC_MSG_RESULT([$USE_NLS])	AC_MSG_RESULT([$USE_NLS])
	if test "$USE_NLS" = "yes"; then	if test "$USE_NLS" = "yes"; then

	skipping to change at line 304	skipping to change at line 306
	if test "$USE_NLS" = "yes"; then	if test "$USE_NLS" = "yes"; then

	if test "$gt_use_preinstalled_gnugettext" = "yes"; then	if test "$gt_use_preinstalled_gnugettext" = "yes"; then
	if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "y es"; }; then	if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "y es"; }; then
	AC_MSG_CHECKING([how to link with libintl])	AC_MSG_CHECKING([how to link with libintl])
	AC_MSG_RESULT([$LIBINTL])	AC_MSG_RESULT([$LIBINTL])
	AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCINTL])	AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCINTL])
	fi	fi

	dnl For backward compatibility. Some packages may be using this.	dnl For backward compatibility. Some packages may be using this.

	AC_DEFINE(HAVE_GETTEXT, 1,	AC_DEFINE([HAVE_GETTEXT], [1],
	[Define if the GNU gettext() function is already present or preinsta lled.])	[Define if the GNU gettext() function is already present or preinsta lled.])

	AC_DEFINE(HAVE_DCGETTEXT, 1,	AC_DEFINE([HAVE_DCGETTEXT], [1],
	[Define if the GNU dcgettext() function is already present or preins talled.])	[Define if the GNU dcgettext() function is already present or preins talled.])
	fi	fi

	dnl We need to process the po/ directory.	dnl We need to process the po/ directory.
	POSUB=po	POSUB=po
	fi	fi

	ifelse(gt_included_intl, yes, [	ifelse(gt_included_intl, yes, [
	dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINT L	dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINT L
	dnl to 'yes' because some of the testsuite requires it.	dnl to 'yes' because some of the testsuite requires it.
	if test "$PACKAGE" = gettext-runtime \|\| test "$PACKAGE" = gettext-tools ; then	if test "$PACKAGE" = gettext-runtime \|\| test "$PACKAGE" = gettext-tools ; then
	BUILD_INCLUDED_LIBINTL=yes	BUILD_INCLUDED_LIBINTL=yes
	fi	fi

	dnl Make all variables we use known to autoconf.	dnl Make all variables we use known to autoconf.

	AC_SUBST(BUILD_INCLUDED_LIBINTL)	AC_SUBST([BUILD_INCLUDED_LIBINTL])
	AC_SUBST(USE_INCLUDED_LIBINTL)	AC_SUBST([USE_INCLUDED_LIBINTL])
	AC_SUBST(CATOBJEXT)	AC_SUBST([CATOBJEXT])

	dnl For backward compatibility. Some configure.ins may be using this.	dnl For backward compatibility. Some configure.ins may be using this.
	nls_cv_header_intl=	nls_cv_header_intl=
	nls_cv_header_libgt=	nls_cv_header_libgt=

	dnl For backward compatibility. Some Makefiles may be using this.	dnl For backward compatibility. Some Makefiles may be using this.
	DATADIRNAME=share	DATADIRNAME=share

	AC_SUBST(DATADIRNAME)	AC_SUBST([DATADIRNAME])

	dnl For backward compatibility. Some Makefiles may be using this.	dnl For backward compatibility. Some Makefiles may be using this.
	INSTOBJEXT=.mo	INSTOBJEXT=.mo

	AC_SUBST(INSTOBJEXT)	AC_SUBST([INSTOBJEXT])

	dnl For backward compatibility. Some Makefiles may be using this.	dnl For backward compatibility. Some Makefiles may be using this.
	GENCAT=gencat	GENCAT=gencat

	AC_SUBST(GENCAT)	AC_SUBST([GENCAT])

	dnl For backward compatibility. Some Makefiles may be using this.	dnl For backward compatibility. Some Makefiles may be using this.
	INTLOBJS=	INTLOBJS=
	if test "$USE_INCLUDED_LIBINTL" = yes; then	if test "$USE_INCLUDED_LIBINTL" = yes; then
	INTLOBJS="\$(GETTOBJS)"	INTLOBJS="\$(GETTOBJS)"
	fi	fi

	AC_SUBST(INTLOBJS)	AC_SUBST([INTLOBJS])

	dnl Enable libtool support if the surrounding package wishes it.	dnl Enable libtool support if the surrounding package wishes it.
	INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix	INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix

	AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX)	AC_SUBST([INTL_LIBTOOL_SUFFIX_PREFIX])
	])	])

	dnl For backward compatibility. Some Makefiles may be using this.	dnl For backward compatibility. Some Makefiles may be using this.
	INTLLIBS="$LIBINTL"	INTLLIBS="$LIBINTL"

	AC_SUBST(INTLLIBS)	AC_SUBST([INTLLIBS])

	dnl Make all documented variables known to autoconf.	dnl Make all documented variables known to autoconf.

	AC_SUBST(LIBINTL)	AC_SUBST([LIBINTL])
	AC_SUBST(LTLIBINTL)	AC_SUBST([LTLIBINTL])
	AC_SUBST(POSUB)	AC_SUBST([POSUB])
	])

	dnl Checks for special options needed on MacOS X.
	dnl Defines INTL_MACOSX_LIBS.
	AC_DEFUN([gt_INTL_MACOSX],
	[
	dnl Check for API introduced in MacOS X 10.2.
	AC_CACHE_CHECK([for CFPreferencesCopyAppValue],
	gt_cv_func_CFPreferencesCopyAppValue,
	[gt_save_LIBS="$LIBS"
	LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
	AC_TRY_LINK([#include <CoreFoundation/CFPreferences.h>],
	[CFPreferencesCopyAppValue(NULL, NULL)],
	[gt_cv_func_CFPreferencesCopyAppValue=yes],
	[gt_cv_func_CFPreferencesCopyAppValue=no])
	LIBS="$gt_save_LIBS"])
	if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
	AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], 1,
	[Define to 1 if you have the MacOS X function CFPreferencesCopyAppVal
	ue in the CoreFoundation framework.])
	fi
	dnl Check for API introduced in MacOS X 10.3.
	AC_CACHE_CHECK([for CFLocaleCopyCurrent], gt_cv_func_CFLocaleCopyCurrent,
	[gt_save_LIBS="$LIBS"
	LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
	AC_TRY_LINK([#include <CoreFoundation/CFLocale.h>], [CFLocaleCopyCurre
	nt();],
	[gt_cv_func_CFLocaleCopyCurrent=yes],
	[gt_cv_func_CFLocaleCopyCurrent=no])
	LIBS="$gt_save_LIBS"])
	if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
	AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], 1,
	[Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in
	the CoreFoundation framework.])
	fi
	INTL_MACOSX_LIBS=
	if test $gt_cv_func_CFPreferencesCopyAppValue = yes \|\| test $gt_cv_func_C
	FLocaleCopyCurrent = yes; then
	INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"
	fi
	AC_SUBST([INTL_MACOSX_LIBS])
	])	])

	dnl gt_NEEDS_INIT ensures that the gt_needs variable is initialized.	dnl gt_NEEDS_INIT ensures that the gt_needs variable is initialized.
	m4_define([gt_NEEDS_INIT],	m4_define([gt_NEEDS_INIT],
	[	[
	m4_divert_text([DEFAULTS], [gt_needs=])	m4_divert_text([DEFAULTS], [gt_needs=])
	m4_define([gt_NEEDS_INIT], [])	m4_define([gt_NEEDS_INIT], [])
	])	])

	dnl Usage: AM_GNU_GETTEXT_NEED([NEEDSYMBOL])	dnl Usage: AM_GNU_GETTEXT_NEED([NEEDSYMBOL])

End of changes. 16 change blocks.
	61 lines changed or deleted	23 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/