[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: Revert "* info/Makefile.am (../gnulib/lib/libgnu.
|
From: |
Gavin D. Smith |
|
Subject: |
branch master updated: Revert "* info/Makefile.am (../gnulib/lib/libgnu.a):" |
|
Date: |
Wed, 07 Aug 2024 10:32:08 -0400 |
This is an automated email from the git hooks/post-receive script.
gavin pushed a commit to branch master
in repository texinfo.
The following commit(s) were added to refs/heads/master by this push:
new 207431e0ca Revert "* info/Makefile.am (../gnulib/lib/libgnu.a):"
207431e0ca is described below
commit 207431e0caad693c4f8557f4e3463d310cb3367d
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Wed Aug 7 15:16:30 2024 +0100
Revert "* info/Makefile.am (../gnulib/lib/libgnu.a):"
This reverts commit 893435e65effef1ebb1e3ce06ea07b3174d00160.
---
ChangeLog | 100 ----------------------------------
Pod-Simple-Texinfo/Makefile.am | 9 ++-
README-hacking | 8 +++
configure.ac | 8 +--
doc/Makefile.am | 7 +--
doc/tp_api/Makefile.am | 19 +------
info/Makefile.am | 4 --
man/Makefile.am | 5 +-
texindex/Makefile.am | 3 +-
tp/Texinfo/XS/configure.ac | 13 -----
tp/Texinfo/XS/gnulib/m4/intlmacosx.m4 | 65 ----------------------
tp/Texinfo/XS/gnulib/m4/nls.m4 | 10 ++--
tp/Texinfo/XS/gnulib/m4/po.m4 | 63 +++++++++++----------
tp/Texinfo/XS/gnulib/m4/progtest.m4 | 8 +--
14 files changed, 63 insertions(+), 259 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 73b86cb0ef..e22d7e2202 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,103 +1,3 @@
-2024-08-07 Gavin Smith <gavinsmith0123@gmail.com>
-
- * doc/tp_api/Makefile.am (texi2any_internals.texi):
- Remove dependency on ModulePath.pm and add dependency on pod2texi.
-
-2024-08-07 Gavin Smith <gavinsmith0123@gmail.com>
-
- * doc/Makefile.am (pod2texi.texi): Add dependency on pod2texi
- and run pod2texi instead of pod2texi.pl.
- * Pod-Simple-Texinfo/Makefile.am (pod2texi): Add dependency on
- tp/Texinfo/ModulePath.pm.
-
-2024-08-06 Gavin Smith <gavinsmith0123@gmail.com>
-
- * configure.ac: adjust a comment so that aclocal does not think
- that "serial number" refers to a serial number of "number".
-
-2024-08-06 Gavin Smith <gavinsmith0123@gmail.com>
-
- * tp/Texinfo/XS/configure.ac: adjust a comment so that aclocal
- does not think that "serial number" refers to a serial number of
- "number".
-
-2024-08-06 Gavin Smith <gavinsmith0123@gmail.com>
-
- * tp/Texinfo/XS: add or upgrade gettext files by following
- new instructions in configure.ac.
-
-2024-08-06 Gavin Smith <gavinsmith0123@gmail.com>
-
- * tp/Texinfo/XS/configure.ac: elaborate on comment using
- information from Bruno.
-
-2024-08-06 Bruno Haible <bruno@clisp.org>
-
- build: Prepare for use of autopoint.
-
- * configure.ac: Add comments about use of autopoint.
- * tp/Texinfo/XS/configure.ac: Specify the same GNU gettext
- version as the top-level configure.ac. Add comments about use
- of autopoint.
-
-2024-08-06 Gavin Smith <gavinsmith0123@gmail.com>
-
- * Pod-Simple-Texinfo/Makefile.am (pod2texi):
- Remove replacement of USE_EXTERNAL_LIBINTL,
- USE_EXTERNAL_EASTASIANWIDTH and USE_EXTERNAL_UNIDECODE as
- these no longer occur in pod2texi.pl (since change
- on 2023-09-24).
-
-2024-08-06 Gavin Smith <gavinsmith0123@gmail.com>
-
- * doc/tp_api/Makefile.am (texi2any_internals.texi):
- Add a comment.
-
-2024-08-06 Bruno Haible <bruno@clisp.org>
-
- Generate doc/tp_api/texi2any_internals.texi in the source directory.
-
- * doc/tp_api/Makefile.am (texi2any_internals.texi): Move the
- generated texi2any_internals.texi from the build dir to the
- source dir.
-
-2024-08-06 Bruno Haible <bruno@clisp.org>
-
- * texindex/Makefile.am (texindex.awk): Move the generated
- texindex.awk from the build dir to the source dir.
-
- * man/Makefile.am (man/Makefile.am): Set environment variable
- TEXINDEX_SCRIPT, so that the texindex program find its
- texindex.awk script.
-
-2024-08-06 Gavin Smith <gavinsmith0123@gmail.com>
-
- * doc/tp_api/Makefile.am (texi2any_internals.texi):
- Generate in srcdir. Report from Bruno.
-
-2024-08-06 Patrice Dumas <pertusus@free.fr>
-
- * doc/tp_api/Makefile.am (texi2any_internals.texi): Pass --subdir
- option to pod2texi.pl to generate distributed files in srcdir.
- Report from Bruno Haible.
-
-2024-08-04 Gavin Smith <gavinsmith0123@gmail.com>
-
- * README-hacking: Remove out-of-date information about running
- "make" before "make dist".
-
-2024-08-04 Patrice Dumas <pertusus@free.fr>
-
- * doc/tp_api/Makefile.am (tp/Texinfo/ModulePath.pm):
- Add rule to allow running "make dist" without running "make"
- first. Report from Bruno Haible.
-
-2024-08-04 Patrice Dumas <pertusus@free.fr>
-
- * info/Makefile.am (../gnulib/lib/libgnu.a):
- Add rule to allow running "make dist" without running "make"
- first. Report from Bruno Haible.
-
2024-07-27 Patrice Dumas <pertusus@free.fr>
* t/init_files_tests.t
diff --git a/Pod-Simple-Texinfo/Makefile.am b/Pod-Simple-Texinfo/Makefile.am
index 1f833cd525..3239b6ce71 100644
--- a/Pod-Simple-Texinfo/Makefile.am
+++ b/Pod-Simple-Texinfo/Makefile.am
@@ -31,14 +31,13 @@ modulesdir = $(pkgdatadir)/Pod-Simple-Texinfo/Pod/Simple/
dist_modules_DATA = \
lib/Pod/Simple/Texinfo.pm
-# Needed if make has not run in the "tp" directory yet
-$(top_builddir)/tp/Texinfo/ModulePath.pm:
- cd $(top_builddir)/tp && $(MAKE) $(AM_MAKEFLAGS) Texinfo/ModulePath.pm
-
-pod2texi: pod2texi.pl Makefile $(top_builddir)/tp/Texinfo/ModulePath.pm
+pod2texi: pod2texi.pl Makefile
sed -e 's,[@]datadir[@],$(datadir),g' \
-e 's,[@]pkglibdir[@],$(pkglibdir),g' \
-e 's,[@]PACKAGE[@],$(PACKAGE),g' \
+ -e 's,[@]USE_EXTERNAL_LIBINTL[@],$(USE_EXTERNAL_LIBINTL),g' \
+ -e
's,[@]USE_EXTERNAL_EASTASIANWIDTH[@],$(USE_EXTERNAL_EASTASIANWIDTH),g' \
+ -e 's,[@]USE_EXTERNAL_UNIDECODE[@],$(USE_EXTERNAL_UNIDECODE),g' \
-e '1 s,/usr/bin/env perl,$(PERL),g' \
$(srcdir)/pod2texi.pl >$@
chmod a+x $@
diff --git a/README-hacking b/README-hacking
index 95ded4ed1e..1508880938 100644
--- a/README-hacking
+++ b/README-hacking
@@ -47,6 +47,14 @@ building from development sources, as result files are not
under version
control. Make will fail with an explicit "missing command" for help2man,
and with a "command not found" error for a Gettext utility command.
+Running make in one particular subdirectory is possible, for example
+make -C info. However there are interdependencies between the
+subdirectories, notably on gnulib, so if you don't want to run "make",
+you may have to run "make -C gnulib/lib" first.
+
+Additionally, make dist may not work until make has been run at least
+once, because of rules to create man pages under the man/ directory.
+
"make dist" will fail if the use of Perl XS extension modules is
disabled and there is no Makefile in the XS subdirectory.
diff --git a/configure.ac b/configure.ac
index bc5b1c1aca..1543971d2b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,7 +15,7 @@ AC_INIT([GNU Texinfo], [7.1.90], [bug-texinfo@gnu.org])
dnl Must come before AM_INIT_AUTOMAKE.
AC_CONFIG_AUX_DIR([build-aux])
dnl tar-ustar because we have long filenames for some test files.
-AM_INIT_AUTOMAKE([1.16.1
+AM_INIT_AUTOMAKE([1.16.1 dist-xz
info-in-builddir parallel-tests tar-ustar])
# Where to generate output; srcdir location.
@@ -384,12 +384,8 @@ AC_ARG_WITH([external-Text-Unidecode],
AC_SUBST([USE_UNICODE])
AC_SUBST([USE_EXTERNAL_UNIDECODE])
-# i18n support. To upgrade to a new version of gettext, run:
+# i18n support. To update to a new version of gettext, run:
# gettextize -f --po-dir=po --po-dir=po_document
-# To fetch the *.m4 files without upgrading, run:
-# autopoint -f
-# and then revert any changes of gnulib/m4/*.m4 files that downgrade from a
-# newer serial number (from gnulib) to an older serial number (from gettext).
# See http://gnu.org/s/gnulib/manual/html_node/gettextize-and-autopoint.html.
AM_GNU_GETTEXT_VERSION([0.21])
AM_GNU_GETTEXT([external])
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 6d686be6d5..25b4e2c8e4 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -33,9 +33,6 @@ TEXI2DVI = $(TEXI2DVI_ENVIRONMENT) $(top_srcdir)/util/texi2dvi
# include pod2texi in the main manual
pod2texi_pl = $(abs_top_srcdir)/Pod-Simple-Texinfo/pod2texi.pl
-$(top_builddir)/Pod-Simple-Texinfo/pod2texi:
- cd $(top_builddir)/Pod-Simple-Texinfo && $(MAKE) $(AM_MAKEFLAGS)
pod2texi
-
if BUILD_PERL_API_TEXI
# we setup the conversion to Texinfo for inclusion in a document,
# but we ignore the main document (output to /dev/null) that includes
@@ -43,8 +40,8 @@ if BUILD_PERL_API_TEXI
# pod2texi.pl), as we include from the Texinfo manual. The file name
# for the included section is therefore determined by the information
# in the Pod file NAME section.
-$(srcdir)/pod2texi.texi: $(pod2texi_pl)
$(top_builddir)/Pod-Simple-Texinfo/pod2texi
- $(MAKEINFO_ENVIRONMENT) $(PERL) -I
$(top_srcdir)/Pod-Simple-Texinfo/lib/
$(top_builddir)/Pod-Simple-Texinfo/pod2texi --base-level=subsubsection
--no-section-nodes --headings-as-sections --subdir=$(srcdir) $(pod2texi_pl) >
/dev/null
+$(srcdir)/pod2texi.texi: $(pod2texi_pl)
+ $(MAKEINFO_ENVIRONMENT) $(PERL) -I
$(top_srcdir)/Pod-Simple-Texinfo/lib/
$(top_srcdir)/Pod-Simple-Texinfo/pod2texi.pl --base-level=subsubsection
--no-section-nodes --headings-as-sections --subdir=$(srcdir) $(pod2texi_pl) >
/dev/null
endif
TXI_MODULES_ENV = srcdir="$(srcdir)"; export srcdir;
diff --git a/doc/tp_api/Makefile.am b/doc/tp_api/Makefile.am
index bec6779839..a2d3a888be 100644
--- a/doc/tp_api/Makefile.am
+++ b/doc/tp_api/Makefile.am
@@ -78,23 +78,10 @@ texi2any_internals_dependencies = \
$(top_srcdir)/tp/Texinfo/Convert/TexinfoXML.pm \
$(top_srcdir)/tp/Texinfo/Convert/Plaintext.pm
-$(top_builddir)/Pod-Simple-Texinfo/pod2texi:
- cd $(top_builddir)/Pod-Simple-Texinfo && $(MAKE) $(AM_MAKEFLAGS)
pod2texi
-
-# This rule moves the new file to srcdir only if it has changed. This
-# prevents an error at "make distcheck" with a read-only srcdir.
texi2any_internals.texi: $(texi2any_internals_dependencies)
texi2any_internals_indices.texi texi2any_internals_preamble.texi
- if $(MAKEINFO_ENVIRONMENT) $(PERL) -I
$(top_srcdir)/Pod-Simple-Texinfo/lib/
$(top_builddir)/Pod-Simple-Texinfo/pod2texi --base-level=section --preamble -
--subdir=$(srcdir)/api_includes $(texi2any_internals_dependencies) <
$(srcdir)/texi2any_internals_preamble.texi >$@.tmp ; then \
- cat $@.tmp | sed -e 's/^@bye/@__bye/' | sed -e '/^@__bye/r
$(srcdir)/texi2any_internals_indices.texi' | sed -e 's/^@__bye//' >
texi2any_internals.texi ; \
- if test '$(srcdir)' != '.' ; then \
- if cmp texi2any_internals.texi $(srcdir)/texi2any_internals.texi
>/dev/null 2>&1 ; then \
- rm -f texi2any_internals.texi ; \
- else \
- mv texi2any_internals.texi $(srcdir)/texi2any_internals.texi ; \
- fi ; \
- fi ; \
- fi ; \
- rm -f $@.tmp
+ if $(MAKEINFO_ENVIRONMENT) $(PERL) -I
$(top_srcdir)/Pod-Simple-Texinfo/lib/
$(top_srcdir)/Pod-Simple-Texinfo/pod2texi.pl --base-level=section --preamble -
--subdir=api_includes $(texi2any_internals_dependencies) <
$(srcdir)/texi2any_internals_preamble.texi >$@.tmp ; then \
+ cat $@.tmp | sed -e 's/^@bye/@__bye/' | sed -e '/^@__bye/r
$(srcdir)/texi2any_internals_indices.texi' | sed -e 's/^@__bye//' > $@ ; \
+ fi ; rm -f $@.tmp
endif
diff --git a/info/Makefile.am b/info/Makefile.am
index a54adc37b1..2315b1c999 100644
--- a/info/Makefile.am
+++ b/info/Makefile.am
@@ -43,10 +43,6 @@ LDADD += $(HARD_LOCALE_LIB) $(SETLOCALE_NULL_LIB)
# for mbrtowc gnulib module which is brought in indirectly
LDADD += $(MBRTOWC_LIB)
-# Needed if make has not run in the "gnulib" directory yet
-../gnulib/lib/libgnu.a:
- cd ../gnulib/lib && $(MAKE) $(AM_MAKEFLAGS)
-
EXTRA_DIST = pcterm.c
ginfo_SOURCES = dir.c display.c display.h doc.h dribble.c dribble.h \
diff --git a/man/Makefile.am b/man/Makefile.am
index 779d193a02..6ff35bf204 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -96,10 +96,7 @@ $(srcdir)/makeinfo.1: $(tpdir)/texi2any.pl $(common_mandeps)
rm $@.tmp
$(srcdir)/texindex.1: $(top_srcdir)/texindex/ti.twjr $(common_mandeps)
- @name="sort Texinfo index files" \
- && TEXINDEX_SCRIPT=$(top_srcdir)/texindex/texindex.awk \
- && export TEXINDEX_SCRIPT \
- && $(man_rule_bin)
+ @name="sort Texinfo index files" && $(man_rule_bin)
#
# For texi2dvi, do not depend on the current user's settings.
diff --git a/texindex/Makefile.am b/texindex/Makefile.am
index 157455dcb3..f378f46fcf 100644
--- a/texindex/Makefile.am
+++ b/texindex/Makefile.am
@@ -54,8 +54,7 @@ texindex: texindex.in Makefile
texindex.awk: ti.twjr
$(GAWK) -f $(srcdir)/jrtangle $(srcdir)/ti.twjr || rm -f texindex.awk
$(do_subst) <texindex.awk >texindex.awk-tmp
- rm -f texindex.awk
- mv texindex.awk-tmp $(srcdir)/texindex.awk
+ mv texindex.awk-tmp texindex.awk
# how to build the pdf of the program-as-document.
ti.pdf: ti.texi
diff --git a/tp/Texinfo/XS/configure.ac b/tp/Texinfo/XS/configure.ac
index 4597425661..f9fffdc463 100644
--- a/tp/Texinfo/XS/configure.ac
+++ b/tp/Texinfo/XS/configure.ac
@@ -133,20 +133,7 @@ AC_PROG_CC
gl_EARLY
-# i18n support. We need to use the same GNU gettext version as the main
-# configure.ac file since the version of the gettext.m4 and related files
-# must be in sync with the Makefile.in.in in the shared po/ directory.
-#
-# To upgrade to a new version of gettext, run:
-# gettextize -f --po-dir=../../../po --no-changelog
-# To fetch the *.m4 files without upgrading, run:
-# autopoint -f; rm -rf po
-# and then revert any changes of gnulib/m4/*.m4 files that downgrade from a
-# newer serial number (from gnulib) to an older serial number (from gettext).
-# See http://gnu.org/s/gnulib/manual/html_node/gettextize-and-autopoint.html.
-AM_GNU_GETTEXT_VERSION([0.21])
AM_GNU_GETTEXT([external])
-
AM_MISSING_PROG([XSUBPP], [xsubpp])
AM_MISSING_PROG([GAWK], [gawk])
diff --git a/tp/Texinfo/XS/gnulib/m4/intlmacosx.m4
b/tp/Texinfo/XS/gnulib/m4/intlmacosx.m4
deleted file mode 100644
index ebd9937c1a..0000000000
--- a/tp/Texinfo/XS/gnulib/m4/intlmacosx.m4
+++ /dev/null
@@ -1,65 +0,0 @@
-# intlmacosx.m4 serial 8 (gettext-0.20.2)
-dnl Copyright (C) 2004-2014, 2016, 2019-2020 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 be used in projects which are not available under
-dnl the GNU General Public License or the GNU Lesser General Public
-dnl License but which still want to provide support for the GNU gettext
-dnl functionality.
-dnl Please note that the actual code of the GNU gettext library is covered
-dnl by the GNU Lesser General Public License, and the rest of the GNU
-dnl gettext package is covered by the GNU General Public License.
-dnl They are *not* in the public domain.
-
-dnl Checks for special options needed on Mac OS X.
-dnl Defines INTL_MACOSX_LIBS.
-AC_DEFUN([gt_INTL_MACOSX],
-[
- dnl Check for API introduced in Mac OS X 10.4.
- AC_CACHE_CHECK([for CFPreferencesCopyAppValue],
- [gt_cv_func_CFPreferencesCopyAppValue],
- [gt_save_LIBS="$LIBS"
- LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
- AC_LINK_IFELSE(
- [AC_LANG_PROGRAM(
- [[#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 Mac OS X function CFPreferencesCopyAppValue
in the CoreFoundation framework.])
- fi
- dnl Don't check for the API introduced in Mac OS X 10.5, CFLocaleCopyCurrent,
- dnl because in macOS 10.13.4 it has the following behaviour:
- dnl When two or more languages are specified in the
- dnl "System Preferences > Language & Region > Preferred Languages" panel,
- dnl it returns en_CC where CC is the territory (even when English is not
among
- dnl the preferred languages!). What we want instead is what
- dnl CFLocaleCopyCurrent returned in earlier macOS releases and what
- dnl CFPreferencesCopyAppValue still returns, namely ll_CC where ll is the
- dnl first among the preferred languages and CC is the territory.
- AC_CACHE_CHECK([for CFLocaleCopyPreferredLanguages],
[gt_cv_func_CFLocaleCopyPreferredLanguages],
- [gt_save_LIBS="$LIBS"
- LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
- AC_LINK_IFELSE(
- [AC_LANG_PROGRAM(
- [[#include <CoreFoundation/CFLocale.h>]],
- [[CFLocaleCopyPreferredLanguages();]])],
- [gt_cv_func_CFLocaleCopyPreferredLanguages=yes],
- [gt_cv_func_CFLocaleCopyPreferredLanguages=no])
- LIBS="$gt_save_LIBS"])
- if test $gt_cv_func_CFLocaleCopyPreferredLanguages = yes; then
- AC_DEFINE([HAVE_CFLOCALECOPYPREFERREDLANGUAGES], [1],
- [Define to 1 if you have the Mac OS X function
CFLocaleCopyPreferredLanguages in the CoreFoundation framework.])
- fi
- INTL_MACOSX_LIBS=
- if test $gt_cv_func_CFPreferencesCopyAppValue = yes \
- || test $gt_cv_func_CFLocaleCopyPreferredLanguages = yes; then
- INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"
- fi
- AC_SUBST([INTL_MACOSX_LIBS])
-])
diff --git a/tp/Texinfo/XS/gnulib/m4/nls.m4 b/tp/Texinfo/XS/gnulib/m4/nls.m4
index 5a506fc4b5..afdb9cacd0 100644
--- a/tp/Texinfo/XS/gnulib/m4/nls.m4
+++ b/tp/Texinfo/XS/gnulib/m4/nls.m4
@@ -1,16 +1,16 @@
-# nls.m4 serial 6 (gettext-0.20.2)
-dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014, 2016, 2019-2020 Free
-dnl Software Foundation, Inc.
+# nls.m4 serial 5 (gettext-0.18)
+dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014, 2016 Free Software
+dnl 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 be used in projects which are not available under
-dnl the GNU General Public License or the GNU Lesser 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 functionality.
dnl Please note that the actual code of the GNU gettext library is covered
-dnl by the GNU Lesser 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 is covered by the GNU General Public License.
dnl They are *not* in the public domain.
diff --git a/tp/Texinfo/XS/gnulib/m4/po.m4 b/tp/Texinfo/XS/gnulib/m4/po.m4
index 3778fd7aac..c5a2f6bf2a 100644
--- a/tp/Texinfo/XS/gnulib/m4/po.m4
+++ b/tp/Texinfo/XS/gnulib/m4/po.m4
@@ -1,15 +1,15 @@
-# po.m4 serial 31 (gettext-0.20.2)
-dnl Copyright (C) 1995-2014, 2016, 2018-2020 Free Software Foundation, Inc.
+# po.m4 serial 24 (gettext-0.19)
+dnl Copyright (C) 1995-2014, 2016 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 be used in projects which are not available under
-dnl the GNU General Public License or the GNU Lesser 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 functionality.
dnl Please note that the actual code of the GNU gettext library is covered
-dnl by the GNU Lesser 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 is covered by the GNU General Public License.
dnl They are *not* in the public domain.
@@ -30,7 +30,7 @@ AC_DEFUN([AM_PO_SUBDIRS],
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.20])
+ AC_SUBST([GETTEXT_MACRO_VERSION], [0.19])
dnl Perform the following tests also if --disable-nls has been given,
dnl because they are needed for "make dist" to work.
@@ -45,6 +45,13 @@ AC_DEFUN([AM_PO_SUBDIRS],
AC_PATH_PROG([GMSGFMT], [gmsgfmt], [$MSGFMT])
dnl Test whether it is GNU msgfmt >= 0.15.
+changequote(,)dnl
+ 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=: ;;
+ *) MSGFMT_015=$MSGFMT ;;
+ esac
+changequote([,])dnl
+ AC_SUBST([MSGFMT_015])
changequote(,)dnl
case `$GMSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
'' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) GMSGFMT_015=: ;;
@@ -76,21 +83,11 @@ changequote([,])dnl
AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge,
[$ac_dir/$ac_word --update -q /dev/null /dev/null >&]AS_MESSAGE_LOG_FD[
2>&1], :)
- dnl Test whether it is GNU msgmerge >= 0.20.
- if LC_ALL=C $MSGMERGE --help | grep ' --for-msgfmt ' >/dev/null; then
- MSGMERGE_FOR_MSGFMT_OPTION='--for-msgfmt'
- else
- dnl Test whether it is GNU msgmerge >= 0.12.
- if LC_ALL=C $MSGMERGE --help | grep ' --no-fuzzy-matching ' >/dev/null;
then
- MSGMERGE_FOR_MSGFMT_OPTION='--no-fuzzy-matching --no-location --quiet'
- else
- dnl With these old versions, $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) is
- dnl slow. But this is not a big problem, as such old gettext versions are
- dnl hardly in use any more.
- MSGMERGE_FOR_MSGFMT_OPTION='--no-location --quiet'
- fi
- fi
- AC_SUBST([MSGMERGE_FOR_MSGFMT_OPTION])
+ dnl Installation directories.
+ dnl Autoconf >= 2.60 defines localedir. For older versions of autoconf, we
+ dnl have to define it here, so that it can be used in po/Makefile.
+ test -n "$localedir" || localedir='${datadir}/locale'
+ AC_SUBST([localedir])
dnl Support for AM_XGETTEXT_OPTION.
test -n "${XGETTEXT_EXTRA_OPTIONS+set}" || XGETTEXT_EXTRA_OPTIONS=
@@ -133,11 +130,14 @@ changequote([,])dnl
if test -n "$OBSOLETE_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" -e "s/#.*//"
"$ac_given_srcdir/$ac_dir/LINGUAS"`
+ ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//"
"$ac_given_srcdir/$ac_dir/LINGUAS"`
+ # Hide the ALL_LINGUAS assignment from automake < 1.5.
+ eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
else
# The set of available languages was given in configure.in.
- ALL_LINGUAS=$OBSOLETE_ALL_LINGUAS
+ # Hide the ALL_LINGUAS assignment from automake < 1.5.
+ eval 'ALL_LINGUAS''=$OBSOLETE_ALL_LINGUAS'
fi
# Compute POFILES
# as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
@@ -208,8 +208,9 @@ changequote([,])dnl
esac
done]],
[# Capture the value of obsolete ALL_LINGUAS because we need it to compute
- # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS.
- OBSOLETE_ALL_LINGUAS="$ALL_LINGUAS"
+ # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it
+ # from automake < 1.5.
+ eval 'OBSOLETE_ALL_LINGUAS''="$ALL_LINGUAS"'
# Capture the value of LINGUAS because we need it to compute CATALOGS.
LINGUAS="${LINGUAS-%UNSET%}"
])
@@ -310,13 +311,15 @@ changequote([,])dnl
fi
if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
# The LINGUAS file contains the set of available languages.
- ALL_LINGUAS=`sed -e "/^#/d" -e "s/#.*//"
"$ac_given_srcdir/$ac_dir/LINGUAS"`
+ ALL_LINGUAS_=`sed -e "/^#/d" -e "s/#.*//"
"$ac_given_srcdir/$ac_dir/LINGUAS"`
POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
else
# Set ALL_LINGUAS to the value of the Makefile variable LINGUAS.
sed_x_LINGUAS=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e
's/VARIABLE/LINGUAS/g'`
- ALL_LINGUAS=`sed -n -e "$sed_x_LINGUAS" < "$ac_file"`
+ ALL_LINGUAS_=`sed -n -e "$sed_x_LINGUAS" < "$ac_file"`
fi
+ # Hide the ALL_LINGUAS assignment from automake < 1.5.
+ eval 'ALL_LINGUAS''=$ALL_LINGUAS_'
# Compute POFILES
# as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
# Compute UPDATEPOFILES
@@ -326,9 +329,9 @@ changequote([,])dnl
# Compute GMOFILES
# as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
# Compute PROPERTIESFILES
- # as $(foreach lang, $(ALL_LINGUAS),
$(srcdir)/$(DOMAIN)_$(lang).properties)
+ # as $(foreach lang, $(ALL_LINGUAS),
$(top_srcdir)/$(DOMAIN)_$(lang).properties)
# Compute CLASSFILES
- # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(DOMAIN)_$(lang).class)
+ # as $(foreach lang, $(ALL_LINGUAS),
$(top_srcdir)/$(DOMAIN)_$(lang).class)
# Compute QMFILES
# as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).qm)
# Compute MSGFILES
@@ -353,8 +356,8 @@ changequote([,])dnl
UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
- PROPERTIESFILES="$PROPERTIESFILES \$(srcdir)/\$(DOMAIN)_$lang.properties"
- CLASSFILES="$CLASSFILES \$(srcdir)/\$(DOMAIN)_$lang.class"
+ PROPERTIESFILES="$PROPERTIESFILES
\$(top_srcdir)/\$(DOMAIN)_$lang.properties"
+ CLASSFILES="$CLASSFILES \$(top_srcdir)/\$(DOMAIN)_$lang.class"
QMFILES="$QMFILES $srcdirpre$lang.qm"
frobbedlang=`echo $lang | sed -e 's/\..*$//' -e
'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
MSGFILES="$MSGFILES $srcdirpre$frobbedlang.msg"
diff --git a/tp/Texinfo/XS/gnulib/m4/progtest.m4
b/tp/Texinfo/XS/gnulib/m4/progtest.m4
index f28010aed1..9ace7c3418 100644
--- a/tp/Texinfo/XS/gnulib/m4/progtest.m4
+++ b/tp/Texinfo/XS/gnulib/m4/progtest.m4
@@ -1,15 +1,15 @@
-# progtest.m4 serial 8 (gettext-0.20.2)
-dnl Copyright (C) 1996-2003, 2005, 2008-2020 Free Software Foundation, Inc.
+# progtest.m4 serial 7 (gettext-0.18.2)
+dnl Copyright (C) 1996-2003, 2005, 2008-2016 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 be used in projects which are not available under
-dnl the GNU General Public License or the GNU Lesser 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 functionality.
dnl Please note that the actual code of the GNU gettext library is covered
-dnl by the GNU Lesser 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 is covered by the GNU General Public License.
dnl They are *not* in the public domain.
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: Revert "* info/Makefile.am (../gnulib/lib/libgnu.a):",
Gavin D. Smith <=