|
|
@@ -1,10 +1,8 @@
|
|
|
-# gettext.m4 serial 17 (gettext-0.11.5)
|
|
|
-dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
|
|
|
-dnl This file is free software, distributed under the terms of the GNU
|
|
|
-dnl General Public License. As a special exception to the GNU General
|
|
|
-dnl Public License, this file may be distributed as part of a program
|
|
|
-dnl that contains a configuration script generated by Autoconf, under
|
|
|
-dnl the same distribution terms as the rest of that program.
|
|
|
+# gettext.m4 serial 36 (gettext-0.14.3)
|
|
|
+dnl Copyright (C) 1995-2005 Free Software Foundation, Inc.
|
|
|
+dnl This file is free software; the Free Software Foundation
|
|
|
+dnl gives unlimited permission to copy and/or distribute it,
|
|
|
+dnl with or without modifications, as long as this notice is preserved.
|
|
|
dnl
|
|
|
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
|
|
|
@@ -17,7 +15,7 @@ dnl They are *not* in the public domain.
|
|
|
|
|
|
dnl Authors:
|
|
|
dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
|
|
|
-dnl Bruno Haible <haible@clisp.cons.org>, 2000-2002.
|
|
|
+dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003.
|
|
|
|
|
|
dnl Macro to add for using GNU gettext.
|
|
|
|
|
|
@@ -65,8 +63,8 @@ AC_DEFUN([AM_GNU_GETTEXT],
|
|
|
ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], ,
|
|
|
[errprint([ERROR: invalid second argument to AM_GNU_GETTEXT
|
|
|
])])])])
|
|
|
- define(gt_included_intl, ifelse([$1], [external], [no], [yes]))
|
|
|
- define(gt_libtool_suffix_prefix, ifelse([$1], [use-libtool], [l], []))
|
|
|
+ define([gt_included_intl], ifelse([$1], [external], [no], [yes]))
|
|
|
+ define([gt_libtool_suffix_prefix], ifelse([$1], [use-libtool], [l], []))
|
|
|
|
|
|
AC_REQUIRE([AM_PO_SUBDIRS])dnl
|
|
|
ifelse(gt_included_intl, yes, [
|
|
|
@@ -92,13 +90,11 @@ AC_DEFUN([AM_GNU_GETTEXT],
|
|
|
AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
|
|
|
])
|
|
|
|
|
|
- AC_MSG_CHECKING([whether NLS is requested])
|
|
|
- dnl Default is enabled NLS
|
|
|
- AC_ARG_ENABLE(nls,
|
|
|
- [ --disable-nls do not use Native Language Support],
|
|
|
- USE_NLS=$enableval, USE_NLS=yes)
|
|
|
- AC_MSG_RESULT($USE_NLS)
|
|
|
- AC_SUBST(USE_NLS)
|
|
|
+ dnl Sometimes, on MacOS X, libintl requires linking with CoreFoundation.
|
|
|
+ gt_INTL_MACOSX
|
|
|
+
|
|
|
+ dnl Set USE_NLS.
|
|
|
+ AM_NLS
|
|
|
|
|
|
ifelse(gt_included_intl, yes, [
|
|
|
BUILD_INCLUDED_LIBINTL=no
|
|
|
@@ -177,9 +173,9 @@ extern
|
|
|
#ifdef __cplusplus
|
|
|
"C"
|
|
|
#endif
|
|
|
-const char *_nl_expand_alias ();],
|
|
|
+const char *_nl_expand_alias (const char *);],
|
|
|
[bindtextdomain ("", "");
|
|
|
-return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)],
|
|
|
+return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias ("")],
|
|
|
gt_cv_func_gnugettext_libintl=yes,
|
|
|
gt_cv_func_gnugettext_libintl=no)
|
|
|
dnl Now see whether libintl exists and depends on libiconv.
|
|
|
@@ -198,9 +194,9 @@ extern
|
|
|
#ifdef __cplusplus
|
|
|
"C"
|
|
|
#endif
|
|
|
-const char *_nl_expand_alias ();],
|
|
|
+const char *_nl_expand_alias (const char *);],
|
|
|
[bindtextdomain ("", "");
|
|
|
-return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias (0)],
|
|
|
+return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_expand_alias ("")],
|
|
|
[LIBINTL="$LIBINTL $LIBICONV"
|
|
|
LTLIBINTL="$LTLIBINTL $LTLIBICONV"
|
|
|
gt_cv_func_gnugettext_libintl=yes
|
|
|
@@ -216,7 +212,8 @@ return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("",
|
|
|
dnl libintl. (Cf. the install rule in intl/Makefile.in.)
|
|
|
if test "$gt_cv_func_gnugettext_libc" = "yes" \
|
|
|
|| { test "$gt_cv_func_gnugettext_libintl" = "yes" \
|
|
|
- && test "$PACKAGE" != gettext; }; then
|
|
|
+ && test "$PACKAGE" != gettext-runtime \
|
|
|
+ && test "$PACKAGE" != gettext-tools; }; then
|
|
|
gt_use_preinstalled_gnugettext=yes
|
|
|
else
|
|
|
dnl Reset the values set by searching for libintl.
|
|
|
@@ -235,7 +232,6 @@ return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("",
|
|
|
|
|
|
if test "$nls_cv_use_gnu_gettext" = "yes"; then
|
|
|
dnl Mark actions used to generate GNU NLS library.
|
|
|
- INTLOBJS="\$(GETTOBJS)"
|
|
|
BUILD_INCLUDED_LIBINTL=yes
|
|
|
USE_INCLUDED_LIBINTL=yes
|
|
|
LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LIBICONV"
|
|
|
@@ -243,6 +239,7 @@ return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("",
|
|
|
LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
|
|
|
fi
|
|
|
|
|
|
+ CATOBJEXT=
|
|
|
if test "$gt_use_preinstalled_gnugettext" = "yes" \
|
|
|
|| test "$nls_cv_use_gnu_gettext" = "yes"; then
|
|
|
dnl Mark actions to use GNU gettext tools.
|
|
|
@@ -250,6 +247,15 @@ return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("",
|
|
|
fi
|
|
|
])
|
|
|
|
|
|
+ if test -n "$INTL_MACOSX_LIBS"; then
|
|
|
+ if test "$gt_use_preinstalled_gnugettext" = "yes" \
|
|
|
+ || test "$nls_cv_use_gnu_gettext" = "yes"; then
|
|
|
+ dnl Some extra flags are needed during linking.
|
|
|
+ LIBINTL="$LIBINTL $INTL_MACOSX_LIBS"
|
|
|
+ LTLIBINTL="$LTLIBINTL $INTL_MACOSX_LIBS"
|
|
|
+ fi
|
|
|
+ fi
|
|
|
+
|
|
|
if test "$gt_use_preinstalled_gnugettext" = "yes" \
|
|
|
|| test "$nls_cv_use_gnu_gettext" = "yes"; then
|
|
|
AC_DEFINE(ENABLE_NLS, 1,
|
|
|
@@ -260,6 +266,22 @@ return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("",
|
|
|
fi
|
|
|
fi
|
|
|
|
|
|
+ AC_MSG_CHECKING([whether to use NLS])
|
|
|
+ AC_MSG_RESULT([$USE_NLS])
|
|
|
+ if test "$USE_NLS" = "yes"; then
|
|
|
+ AC_MSG_CHECKING([where the gettext function comes from])
|
|
|
+ if test "$gt_use_preinstalled_gnugettext" = "yes"; then
|
|
|
+ if test "$gt_cv_func_gnugettext_libintl" = "yes"; then
|
|
|
+ gt_source="external libintl"
|
|
|
+ else
|
|
|
+ gt_source="libc"
|
|
|
+ fi
|
|
|
+ else
|
|
|
+ gt_source="included intl directory"
|
|
|
+ fi
|
|
|
+ AC_MSG_RESULT([$gt_source])
|
|
|
+ fi
|
|
|
+
|
|
|
if test "$USE_NLS" = "yes"; then
|
|
|
|
|
|
if test "$gt_use_preinstalled_gnugettext" = "yes"; then
|
|
|
@@ -283,7 +305,7 @@ return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("",
|
|
|
ifelse(gt_included_intl, yes, [
|
|
|
dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL
|
|
|
dnl to 'yes' because some of the testsuite requires it.
|
|
|
- if test "$PACKAGE" = gettext; then
|
|
|
+ if test "$PACKAGE" = gettext-runtime || test "$PACKAGE" = gettext-tools; then
|
|
|
BUILD_INCLUDED_LIBINTL=yes
|
|
|
fi
|
|
|
|
|
|
@@ -291,7 +313,6 @@ return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("",
|
|
|
AC_SUBST(BUILD_INCLUDED_LIBINTL)
|
|
|
AC_SUBST(USE_INCLUDED_LIBINTL)
|
|
|
AC_SUBST(CATOBJEXT)
|
|
|
- AC_SUBST(INTLOBJS)
|
|
|
|
|
|
dnl For backward compatibility. Some configure.ins may be using this.
|
|
|
nls_cv_header_intl=
|
|
|
@@ -309,6 +330,13 @@ return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("",
|
|
|
GENCAT=gencat
|
|
|
AC_SUBST(GENCAT)
|
|
|
|
|
|
+ dnl For backward compatibility. Some Makefiles may be using this.
|
|
|
+ INTLOBJS=
|
|
|
+ if test "$USE_INCLUDED_LIBINTL" = yes; then
|
|
|
+ INTLOBJS="\$(GETTOBJS)"
|
|
|
+ fi
|
|
|
+ AC_SUBST(INTLOBJS)
|
|
|
+
|
|
|
dnl Enable libtool support if the surrounding package wishes it.
|
|
|
INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix
|
|
|
AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX)
|
|
|
@@ -325,179 +353,6 @@ return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("",
|
|
|
])
|
|
|
|
|
|
|
|
|
-dnl Checks for all prerequisites of the po subdirectory,
|
|
|
-dnl except for USE_NLS.
|
|
|
-AC_DEFUN([AM_PO_SUBDIRS],
|
|
|
-[
|
|
|
- AC_REQUIRE([AC_PROG_MAKE_SET])dnl
|
|
|
- AC_REQUIRE([AC_PROG_INSTALL])dnl
|
|
|
- AC_REQUIRE([AM_MKINSTALLDIRS])dnl
|
|
|
-
|
|
|
- dnl Perform the following tests also if --disable-nls has been given,
|
|
|
- dnl because they are needed for "make dist" to work.
|
|
|
-
|
|
|
- dnl Search for GNU msgfmt in the PATH.
|
|
|
- dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions.
|
|
|
- dnl The second test excludes FreeBSD msgfmt.
|
|
|
- AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
|
|
|
- [$ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1 &&
|
|
|
- (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
|
|
|
- :)
|
|
|
- AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
|
|
|
-
|
|
|
- dnl Search for GNU xgettext 0.11 or newer in the PATH.
|
|
|
- dnl The first test excludes Solaris xgettext and early GNU xgettext versions.
|
|
|
- dnl The second test excludes FreeBSD xgettext.
|
|
|
- AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
|
|
|
- [$ac_dir/$ac_word --omit-header --copyright-holder= /dev/null >/dev/null 2>&1 &&
|
|
|
- (if $ac_dir/$ac_word --omit-header --copyright-holder= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
|
|
|
- :)
|
|
|
- dnl Remove leftover from FreeBSD xgettext call.
|
|
|
- rm -f messages.po
|
|
|
-
|
|
|
- dnl Search for GNU msgmerge 0.11 or newer in the PATH.
|
|
|
- AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge,
|
|
|
- [$ac_dir/$ac_word --update -q /dev/null /dev/null >/dev/null 2>&1], :)
|
|
|
-
|
|
|
- dnl This could go away some day; the PATH_PROG_WITH_TEST already does it.
|
|
|
- dnl Test whether we really found GNU msgfmt.
|
|
|
- if test "$GMSGFMT" != ":"; then
|
|
|
- dnl If it is no GNU msgfmt we define it as : so that the
|
|
|
- dnl Makefiles still can work.
|
|
|
- if $GMSGFMT --statistics /dev/null >/dev/null 2>&1 &&
|
|
|
- (if $GMSGFMT --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
|
|
|
- : ;
|
|
|
- else
|
|
|
- GMSGFMT=`echo "$GMSGFMT" | sed -e 's,^.*/,,'`
|
|
|
- AC_MSG_RESULT(
|
|
|
- [found $GMSGFMT program is not GNU msgfmt; ignore it])
|
|
|
- GMSGFMT=":"
|
|
|
- fi
|
|
|
- fi
|
|
|
-
|
|
|
- dnl This could go away some day; the PATH_PROG_WITH_TEST already does it.
|
|
|
- dnl Test whether we really found GNU xgettext.
|
|
|
- if test "$XGETTEXT" != ":"; then
|
|
|
- dnl If it is no GNU xgettext we define it as : so that the
|
|
|
- dnl Makefiles still can work.
|
|
|
- if $XGETTEXT --omit-header --copyright-holder= /dev/null >/dev/null 2>&1 &&
|
|
|
- (if $XGETTEXT --omit-header --copyright-holder= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then
|
|
|
- : ;
|
|
|
- else
|
|
|
- AC_MSG_RESULT(
|
|
|
- [found xgettext program is not GNU xgettext; ignore it])
|
|
|
- XGETTEXT=":"
|
|
|
- fi
|
|
|
- dnl Remove leftover from FreeBSD xgettext call.
|
|
|
- rm -f messages.po
|
|
|
- fi
|
|
|
-
|
|
|
- AC_OUTPUT_COMMANDS([
|
|
|
- for ac_file in $CONFIG_FILES; do
|
|
|
- # Support "outfile[:infile[:infile...]]"
|
|
|
- case "$ac_file" in
|
|
|
- *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
|
|
|
- esac
|
|
|
- # PO directories have a Makefile.in generated from Makefile.in.in.
|
|
|
- case "$ac_file" in */Makefile.in)
|
|
|
- # Adjust a relative srcdir.
|
|
|
- ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
|
|
|
- ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`"
|
|
|
- ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
|
|
|
- # In autoconf-2.13 it is called $ac_given_srcdir.
|
|
|
- # In autoconf-2.50 it is called $srcdir.
|
|
|
- test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
|
|
|
- case "$ac_given_srcdir" in
|
|
|
- .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
|
|
|
- /*) top_srcdir="$ac_given_srcdir" ;;
|
|
|
- *) top_srcdir="$ac_dots$ac_given_srcdir" ;;
|
|
|
- esac
|
|
|
- if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
|
|
|
- rm -f "$ac_dir/POTFILES"
|
|
|
- test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
|
|
|
- cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
|
|
|
- # ALL_LINGUAS, POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES depend
|
|
|
- # on $ac_dir but don't depend on user-specified configuration
|
|
|
- # parameters.
|
|
|
- if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
|
|
|
- # The LINGUAS file contains the set of available languages.
|
|
|
- if test -n "$ALL_LINGUAS"; then
|
|
|
- test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
|
|
|
- fi
|
|
|
- ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"`
|
|
|
- # Hide the ALL_LINGUAS assigment from automake.
|
|
|
- eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
|
|
|
- fi
|
|
|
- case "$ac_given_srcdir" in
|
|
|
- .) srcdirpre= ;;
|
|
|
- *) srcdirpre='$(srcdir)/' ;;
|
|
|
- esac
|
|
|
- POFILES=
|
|
|
- GMOFILES=
|
|
|
- UPDATEPOFILES=
|
|
|
- DUMMYPOFILES=
|
|
|
- for lang in $ALL_LINGUAS; do
|
|
|
- POFILES="$POFILES $srcdirpre$lang.po"
|
|
|
- GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
|
|
|
- UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
|
|
|
- DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
|
|
|
- done
|
|
|
- # CATALOGS depends on both $ac_dir and the user's LINGUAS
|
|
|
- # environment variable.
|
|
|
- INST_LINGUAS=
|
|
|
- if test -n "$ALL_LINGUAS"; then
|
|
|
- for presentlang in $ALL_LINGUAS; do
|
|
|
- useit=no
|
|
|
- if test "%UNSET%" != "$LINGUAS"; then
|
|
|
- desiredlanguages="$LINGUAS"
|
|
|
- else
|
|
|
- desiredlanguages="$ALL_LINGUAS"
|
|
|
- fi
|
|
|
- for desiredlang in $desiredlanguages; do
|
|
|
- # Use the presentlang catalog if desiredlang is
|
|
|
- # a. equal to presentlang, or
|
|
|
- # b. a variant of presentlang (because in this case,
|
|
|
- # presentlang can be used as a fallback for messages
|
|
|
- # which are not translated in the desiredlang catalog).
|
|
|
- case "$desiredlang" in
|
|
|
- "$presentlang"*) useit=yes;;
|
|
|
- esac
|
|
|
- done
|
|
|
- if test $useit = yes; then
|
|
|
- INST_LINGUAS="$INST_LINGUAS $presentlang"
|
|
|
- fi
|
|
|
- done
|
|
|
- fi
|
|
|
- CATALOGS=
|
|
|
- if test -n "$INST_LINGUAS"; then
|
|
|
- for lang in $INST_LINGUAS; do
|
|
|
- CATALOGS="$CATALOGS $lang.gmo"
|
|
|
- done
|
|
|
- fi
|
|
|
- test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
|
|
|
- sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
|
|
|
- for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do
|
|
|
- if test -f "$f"; then
|
|
|
- case "$f" in
|
|
|
- *.orig | *.bak | *~) ;;
|
|
|
- *) cat "$f" >> "$ac_dir/Makefile" ;;
|
|
|
- esac
|
|
|
- fi
|
|
|
- done
|
|
|
- fi
|
|
|
- ;;
|
|
|
- esac
|
|
|
- done],
|
|
|
- [# Capture the value of obsolete ALL_LINGUAS because we need it to compute
|
|
|
- # POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES, CATALOGS. But hide it
|
|
|
- # from automake.
|
|
|
- eval 'ALL_LINGUAS''="$ALL_LINGUAS"'
|
|
|
- # Capture the value of LINGUAS because we need it to compute CATALOGS.
|
|
|
- LINGUAS="${LINGUAS-%UNSET%}"
|
|
|
- ])
|
|
|
-])
|
|
|
-
|
|
|
-
|
|
|
dnl Checks for all prerequisites of the intl subdirectory,
|
|
|
dnl except for INTL_LIBTOOL_SUFFIX_PREFIX (and possibly LIBTOOL), INTLOBJS,
|
|
|
dnl USE_INCLUDED_LIBINTL, BUILD_INCLUDED_LIBINTL.
|
|
|
@@ -507,31 +362,90 @@ AC_DEFUN([AM_INTL_SUBDIR],
|
|
|
AC_REQUIRE([AM_MKINSTALLDIRS])dnl
|
|
|
AC_REQUIRE([AC_PROG_CC])dnl
|
|
|
AC_REQUIRE([AC_CANONICAL_HOST])dnl
|
|
|
+ AC_REQUIRE([gt_GLIBC2])dnl
|
|
|
AC_REQUIRE([AC_PROG_RANLIB])dnl
|
|
|
AC_REQUIRE([AC_ISC_POSIX])dnl
|
|
|
AC_REQUIRE([AC_HEADER_STDC])dnl
|
|
|
AC_REQUIRE([AC_C_CONST])dnl
|
|
|
+ AC_REQUIRE([bh_C_SIGNED])dnl
|
|
|
AC_REQUIRE([AC_C_INLINE])dnl
|
|
|
AC_REQUIRE([AC_TYPE_OFF_T])dnl
|
|
|
AC_REQUIRE([AC_TYPE_SIZE_T])dnl
|
|
|
+ AC_REQUIRE([gl_AC_TYPE_LONG_LONG])dnl
|
|
|
+ AC_REQUIRE([gt_TYPE_LONGDOUBLE])dnl
|
|
|
+ AC_REQUIRE([gt_TYPE_WCHAR_T])dnl
|
|
|
+ AC_REQUIRE([gt_TYPE_WINT_T])dnl
|
|
|
+ AC_REQUIRE([gl_AC_HEADER_INTTYPES_H])
|
|
|
+ AC_REQUIRE([gl_AC_HEADER_STDINT_H])
|
|
|
+ AC_REQUIRE([gt_TYPE_INTMAX_T])
|
|
|
+ AC_REQUIRE([gt_PRINTF_POSIX])
|
|
|
AC_REQUIRE([AC_FUNC_ALLOCA])dnl
|
|
|
AC_REQUIRE([AC_FUNC_MMAP])dnl
|
|
|
- AC_REQUIRE([jm_GLIBC21])dnl
|
|
|
+ AC_REQUIRE([gl_GLIBC21])dnl
|
|
|
AC_REQUIRE([gt_INTDIV0])dnl
|
|
|
- AC_REQUIRE([jm_AC_TYPE_UINTMAX_T])dnl
|
|
|
+ AC_REQUIRE([gl_AC_TYPE_UINTMAX_T])dnl
|
|
|
AC_REQUIRE([gt_HEADER_INTTYPES_H])dnl
|
|
|
AC_REQUIRE([gt_INTTYPES_PRI])dnl
|
|
|
+ AC_REQUIRE([gl_XSIZE])dnl
|
|
|
+ AC_REQUIRE([gt_INTL_MACOSX])dnl
|
|
|
|
|
|
+ AC_CHECK_TYPE([ptrdiff_t], ,
|
|
|
+ [AC_DEFINE([ptrdiff_t], [long],
|
|
|
+ [Define as the type of the result of subtracting two pointers, if the system doesn't define it.])
|
|
|
+ ])
|
|
|
AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h stddef.h \
|
|
|
stdlib.h string.h unistd.h sys/param.h])
|
|
|
- AC_CHECK_FUNCS([feof_unlocked fgets_unlocked getc_unlocked getcwd getegid \
|
|
|
-geteuid getgid getuid mempcpy munmap putenv setenv setlocale stpcpy \
|
|
|
-strcasecmp strdup strtoul tsearch __argz_count __argz_stringify __argz_next])
|
|
|
+ AC_CHECK_FUNCS([asprintf fwprintf getcwd getegid geteuid getgid getuid \
|
|
|
+mempcpy munmap putenv setenv setlocale snprintf stpcpy strcasecmp strdup \
|
|
|
+strtoul tsearch wcslen __argz_count __argz_stringify __argz_next \
|
|
|
+__fsetlocking])
|
|
|
+
|
|
|
+ dnl Use the _snprintf function only if it is declared (because on NetBSD it
|
|
|
+ dnl is defined as a weak alias of snprintf; we prefer to use the latter).
|
|
|
+ gt_CHECK_DECL(_snprintf, [#include <stdio.h>])
|
|
|
+ gt_CHECK_DECL(_snwprintf, [#include <stdio.h>])
|
|
|
+
|
|
|
+ dnl Use the *_unlocked functions only if they are declared.
|
|
|
+ dnl (because some of them were defined without being declared in Solaris
|
|
|
+ dnl 2.5.1 but were removed in Solaris 2.6, whereas we want binaries built
|
|
|
+ dnl on Solaris 2.5.1 to run on Solaris 2.6).
|
|
|
+ dnl Don't use AC_CHECK_DECLS because it isn't supported in autoconf-2.13.
|
|
|
+ gt_CHECK_DECL(feof_unlocked, [#include <stdio.h>])
|
|
|
+ gt_CHECK_DECL(fgets_unlocked, [#include <stdio.h>])
|
|
|
+ gt_CHECK_DECL(getc_unlocked, [#include <stdio.h>])
|
|
|
+
|
|
|
+ case $gt_cv_func_printf_posix in
|
|
|
+ *yes) HAVE_POSIX_PRINTF=1 ;;
|
|
|
+ *) HAVE_POSIX_PRINTF=0 ;;
|
|
|
+ esac
|
|
|
+ AC_SUBST([HAVE_POSIX_PRINTF])
|
|
|
+ if test "$ac_cv_func_asprintf" = yes; then
|
|
|
+ HAVE_ASPRINTF=1
|
|
|
+ else
|
|
|
+ HAVE_ASPRINTF=0
|
|
|
+ fi
|
|
|
+ AC_SUBST([HAVE_ASPRINTF])
|
|
|
+ if test "$ac_cv_func_snprintf" = yes; then
|
|
|
+ HAVE_SNPRINTF=1
|
|
|
+ else
|
|
|
+ HAVE_SNPRINTF=0
|
|
|
+ fi
|
|
|
+ AC_SUBST([HAVE_SNPRINTF])
|
|
|
+ if test "$ac_cv_func_wprintf" = yes; then
|
|
|
+ HAVE_WPRINTF=1
|
|
|
+ else
|
|
|
+ HAVE_WPRINTF=0
|
|
|
+ fi
|
|
|
+ AC_SUBST([HAVE_WPRINTF])
|
|
|
|
|
|
AM_ICONV
|
|
|
AM_LANGINFO_CODESET
|
|
|
if test $ac_cv_header_locale_h = yes; then
|
|
|
- AM_LC_MESSAGES
|
|
|
+ gt_LC_MESSAGES
|
|
|
+ fi
|
|
|
+
|
|
|
+ if test -n "$INTL_MACOSX_LIBS"; then
|
|
|
+ CPPFLAGS="$CPPFLAGS -I/System/Library/Frameworks/CoreFoundation.framework/Headers"
|
|
|
fi
|
|
|
|
|
|
dnl intl/plural.c is generated from intl/plural.y. It requires bison,
|
|
|
@@ -567,19 +481,67 @@ changequote([,])dnl
|
|
|
])
|
|
|
|
|
|
|
|
|
-AC_DEFUN([AM_MKINSTALLDIRS],
|
|
|
+dnl Checks for special options needed on MacOS X.
|
|
|
+dnl Defines INTL_MACOSX_LIBS.
|
|
|
+AC_DEFUN([gt_INTL_MACOSX],
|
|
|
[
|
|
|
- dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
|
|
|
- dnl find the mkinstalldirs script in another subdir but $(top_srcdir).
|
|
|
- dnl Try to locate is.
|
|
|
- MKINSTALLDIRS=
|
|
|
- if test -n "$ac_aux_dir"; then
|
|
|
- MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
|
|
|
+ dnl Check for API introduced in MacOS X 10.2.
|
|
|
+ AC_CACHE_CHECK([for CFPreferencesCopyAppValue],
|
|
|
+ gt_cv_func_CFPreferencesCopyAppValue,
|
|
|
+ [gt_save_CPPFLAGS="$CPPFLAGS"
|
|
|
+ CPPFLAGS="$CPPFLAGS -I/System/Library/Frameworks/CoreFoundation.framework/Headers"
|
|
|
+ gt_save_LIBS="$LIBS"
|
|
|
+ LIBS="$LIBS -framework CoreFoundation"
|
|
|
+ AC_TRY_LINK([#include <CFPreferences.h>],
|
|
|
+ [CFPreferencesCopyAppValue(NULL, NULL)],
|
|
|
+ [gt_cv_func_CFPreferencesCopyAppValue=yes],
|
|
|
+ [gt_cv_func_CFPreferencesCopyAppValue=no])
|
|
|
+ CPPFLAGS="$gt_save_CPPFLAGS"
|
|
|
+ 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 CFPreferencesCopyAppValue 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_CPPFLAGS="$CPPFLAGS"
|
|
|
+ CPPFLAGS="$CPPFLAGS -I/System/Library/Frameworks/CoreFoundation.framework/Headers"
|
|
|
+ gt_save_LIBS="$LIBS"
|
|
|
+ LIBS="$LIBS -framework CoreFoundation"
|
|
|
+ AC_TRY_LINK([#include <CFLocale.h>], [CFLocaleCopyCurrent();],
|
|
|
+ [gt_cv_func_CFLocaleCopyCurrent=yes],
|
|
|
+ [gt_cv_func_CFLocaleCopyCurrent=no])
|
|
|
+ CPPFLAGS="$gt_save_CPPFLAGS"
|
|
|
+ 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_CFLocaleCopyCurrent = yes; then
|
|
|
+ INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"
|
|
|
fi
|
|
|
- if test -z "$MKINSTALLDIRS"; then
|
|
|
- MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
|
|
|
+ AC_SUBST([INTL_MACOSX_LIBS])
|
|
|
+])
|
|
|
+
|
|
|
+
|
|
|
+dnl gt_CHECK_DECL(FUNC, INCLUDES)
|
|
|
+dnl Check whether a function is declared.
|
|
|
+AC_DEFUN([gt_CHECK_DECL],
|
|
|
+[
|
|
|
+ AC_CACHE_CHECK([whether $1 is declared], ac_cv_have_decl_$1,
|
|
|
+ [AC_TRY_COMPILE([$2], [
|
|
|
+#ifndef $1
|
|
|
+ char *p = (char *) $1;
|
|
|
+#endif
|
|
|
+], ac_cv_have_decl_$1=yes, ac_cv_have_decl_$1=no)])
|
|
|
+ if test $ac_cv_have_decl_$1 = yes; then
|
|
|
+ gt_value=1
|
|
|
+ else
|
|
|
+ gt_value=0
|
|
|
fi
|
|
|
- AC_SUBST(MKINSTALLDIRS)
|
|
|
+ AC_DEFINE_UNQUOTED([HAVE_DECL_]translit($1, [a-z], [A-Z]), [$gt_value],
|
|
|
+ [Define to 1 if you have the declaration of `$1', and to 0 if you don't.])
|
|
|
])
|
|
|
|
|
|
|
Pavel Roskin