po.m4 | po.m4 | |||
---|---|---|---|---|
# po.m4 serial 13 (gettext-0.15) | # po.m4 serial 17 (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-2003. | dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003. | |||
AC_PREREQ(2.50) | AC_PREREQ([2.50]) | |||
dnl Checks for all prerequisites of the po subdirectory. | dnl Checks for all prerequisites of the po subdirectory. | |||
AC_DEFUN([AM_PO_SUBDIRS], | AC_DEFUN([AM_PO_SUBDIRS], | |||
[ | [ | |||
AC_REQUIRE([AC_PROG_MAKE_SET])dnl | AC_REQUIRE([AC_PROG_MAKE_SET])dnl | |||
AC_REQUIRE([AC_PROG_INSTALL])dnl | AC_REQUIRE([AC_PROG_INSTALL])dnl | |||
AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake | AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake | |||
AC_REQUIRE([AM_NLS])dnl | AC_REQUIRE([AM_NLS])dnl | |||
dnl Release version of the gettext macros. This is used to ensure that | ||||
dnl the gettext macros and po/Makefile.in.in are in sync. | ||||
AC_SUBST([GETTEXT_MACRO_VERSION], [0.18]) | ||||
dnl Perform the following tests also if --disable-nls has been given, | dnl Perform the following tests also if --disable-nls has been given, | |||
dnl because they are needed for "make dist" to work. | dnl because they are needed for "make dist" to work. | |||
dnl Search for GNU msgfmt in the PATH. | dnl Search for GNU msgfmt in the PATH. | |||
dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions. | dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions. | |||
dnl The second test excludes FreeBSD msgfmt. | dnl The second test excludes FreeBSD msgfmt. | |||
AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, | AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, | |||
[$ac_dir/$ac_word --statistics /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 && | [$ac_dir/$ac_word --statistics /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 && | |||
(if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usa ge >/dev/null; then exit 1; else exit 0; fi)], | (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usa ge >/dev/null; then exit 1; else exit 0; fi)], | |||
:) | :) | |||
AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) | AC_PATH_PROG([GMSGFMT], [gmsgfmt], [$MSGFMT]) | |||
dnl Test whether it is GNU msgfmt >= 0.15. | dnl Test whether it is GNU msgfmt >= 0.15. | |||
changequote(,)dnl | changequote(,)dnl | |||
case `$MSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in | case `$MSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in | |||
'' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) MSGFMT_015=: ;; | '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) MSGFMT_015=: ;; | |||
*) MSGFMT_015=$MSGFMT ;; | *) MSGFMT_015=$MSGFMT ;; | |||
esac | esac | |||
changequote([,])dnl | changequote([,])dnl | |||
AC_SUBST([MSGFMT_015]) | AC_SUBST([MSGFMT_015]) | |||
changequote(,)dnl | changequote(,)dnl | |||
skipping to change at line 87 | skipping to change at line 91 | |||
dnl Search for GNU msgmerge 0.11 or newer in the PATH. | dnl Search for GNU msgmerge 0.11 or newer in the PATH. | |||
AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge, | AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge, | |||
[$ac_dir/$ac_word --update -q /dev/null /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1], :) | [$ac_dir/$ac_word --update -q /dev/null /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1], :) | |||
dnl Installation directories. | dnl Installation directories. | |||
dnl Autoconf >= 2.60 defines localedir. For older versions of autoconf, w e | dnl Autoconf >= 2.60 defines localedir. For older versions of autoconf, w e | |||
dnl have to define it here, so that it can be used in po/Makefile. | dnl have to define it here, so that it can be used in po/Makefile. | |||
test -n "$localedir" || localedir='${datadir}/locale' | test -n "$localedir" || localedir='${datadir}/locale' | |||
AC_SUBST([localedir]) | AC_SUBST([localedir]) | |||
dnl Support for AM_XGETTEXT_OPTION. | ||||
test -n "${XGETTEXT_EXTRA_OPTIONS+set}" || XGETTEXT_EXTRA_OPTIONS= | ||||
AC_SUBST([XGETTEXT_EXTRA_OPTIONS]) | ||||
AC_CONFIG_COMMANDS([po-directories], [[ | AC_CONFIG_COMMANDS([po-directories], [[ | |||
for ac_file in $CONFIG_FILES; do | for ac_file in $CONFIG_FILES; do | |||
# Support "outfile[:infile[:infile...]]" | # Support "outfile[:infile[:infile...]]" | |||
case "$ac_file" in | case "$ac_file" in | |||
*:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; | *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; | |||
esac | esac | |||
# PO directories have a Makefile.in generated from Makefile.in.in. | # PO directories have a Makefile.in generated from Makefile.in.in. | |||
case "$ac_file" in */Makefile.in) | case "$ac_file" in */Makefile.in) | |||
# Adjust a relative srcdir. | # Adjust a relative srcdir. | |||
ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'` | ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'` | |||
skipping to change at line 429 | skipping to change at line 437 | |||
EOF | EOF | |||
done | done | |||
fi | fi | |||
if test -n "$POMAKEFILEDEPS"; then | if test -n "$POMAKEFILEDEPS"; then | |||
cat >> "$ac_file.tmp" <<EOF | cat >> "$ac_file.tmp" <<EOF | |||
Makefile: $POMAKEFILEDEPS | Makefile: $POMAKEFILEDEPS | |||
EOF | EOF | |||
fi | fi | |||
mv "$ac_file.tmp" "$ac_file" | mv "$ac_file.tmp" "$ac_file" | |||
]) | ]) | |||
dnl Initializes the accumulator used by AM_XGETTEXT_OPTION. | ||||
AC_DEFUN([AM_XGETTEXT_OPTION_INIT], | ||||
[ | ||||
XGETTEXT_EXTRA_OPTIONS= | ||||
]) | ||||
dnl Registers an option to be passed to xgettext in the po subdirectory. | ||||
AC_DEFUN([AM_XGETTEXT_OPTION], | ||||
[ | ||||
AC_REQUIRE([AM_XGETTEXT_OPTION_INIT]) | ||||
XGETTEXT_EXTRA_OPTIONS="$XGETTEXT_EXTRA_OPTIONS $1" | ||||
]) | ||||
End of changes. 6 change blocks. | ||||
4 lines changed or deleted | 12 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/ |