Karl Berry [Tue, 30 May 2023 00:54:07 +0000 (17:54 -0700)]
doc: improve NAME string for man pages.
This change fixes https://bugs.gnu.org/62853 and
https://bugs.gnu.org/62854.
* doc/local.mk (update_mans): move $(AM_V_GEN): to calls;
include --name="$${HELP2MAN_NAME}".
(-%D%/aclocal-$(APIVERSION).1, %D%/automake-$(APIVERSION).1):
set HELP2MAN_NAME in environment to pass to help2man.
Bogdan [Sun, 28 May 2023 01:10:11 +0000 (18:10 -0700)]
configure: exit explicitly if the path to perl contains spaces.
This change ameloriates https://bugs.gnu.org/62896.
* configure.ac: exit explicitly if the result of AC_PATH_PROG for
perl contains spaces, since shebang lines cannot support such paths.
* THANKS (Bogdan): add.
* t/ax/am-test-lib.sh (is_blocked_signal): Revise Perl code
to more closely follow documented interfaces where
available. This also works around bugs and limitations
of the POSIX module in Perl 5.6.
Karl Berry [Wed, 1 Mar 2023 23:03:30 +0000 (15:03 -0800)]
doc: tweak old NEWS about ACLOCAL_AMFLAGS.
* NEWS: any ACLOCAL_AMFLAGS deprecation will be in a major
release (the hypothetical 2.0), not sooner.
* NEWS-2.0: developers who don't wish to be maintainers are also
welcome and needed.
* bin/automake.in: restore explicit per-directory pattern rules,
since evidently @D is not supported on BSD-derived makes,
whatever POSIX says. That is, revert this commit:
https://git.savannah.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=55f8fcfd08cbf15d65d61dd2db934b6c3171cf06
Paul Eggert [Thu, 2 Feb 2023 22:17:52 +0000 (14:17 -0800)]
Use higher-resolution file timestamps
* lib/Automake/FileUtils.pm (mtime):
Return higher-resolution file timestamps.
This isn’t perfect, but it’s better than what we had.
Code change taken from Autoconf to partially fix a race
<https://bugs.gentoo.org/show_bug.cgi?id=782985>.
Frédéric Bérat [Mon, 12 Dec 2022 06:32:13 +0000 (07:32 +0100)]
tests: depcomp: ensure make_ok() fails when run_make fails
While running automake tests with -std-gnu=c99, the compiler report
errors which lead to make to fail. Yet, these failures are ignored
during the tests, which considers them to be successful as stderror is
check for one specific pattern.
If make fails, investigation should be made to discover why, whatever
the reason for the failure is.
* t/ax/depcomp.sh: Make make_ok fail when make fails.
Mike Frysinger [Fri, 13 Jan 2023 01:31:31 +0000 (20:31 -0500)]
tests: rework gettext to only check 'external' behavior
The gettext project deprecated non-external use back in 2010 with the
0.18 release, and made it fatal with the 0.20 release in 2019. With
that version, calling AM_GNU_GETTEXT() fails, which means all Automake
tests are now skipped. The t/gettext-macros.sh helper probes gettext
as such:
>+ autopoint --force
> autopoint: *** AM_GNU_GETTEXT without 'external' argument is no longer supported in version 0.21.1
> autopoint: *** Stop.
> ...
>+ aclocal-1.16 -Werror -Wno-syntax -I m4 --install
> aclocal-1.16: warnings are treated as errors
> configure.ac:4: warning: macro 'AM_GNU_GETTEXT' not found in library
> configure.ac:5: warning: macro 'AM_GNU_GETTEXT_VERSION' not found in library
>+ echo skip_all_ "couldn't find or get gettext macros"
Since t/gettext-macros.sh generates a helper that all other gettext
tests use to see if gettext is available, all they get skipped.
Rework our existing tests to only check the 'external' gettext mode.
This should work with older versions, and we don't really need to
keep track of old non-external mode since it's been deprecated for
so long.
Mike Frysinger [Fri, 13 Jan 2023 05:09:06 +0000 (00:09 -0500)]
tests: disable git log pager usage
When running this code locally, the git log call can trigger a pager
depending on the local settings, which in turn forces the test to be
interactive. Run git with --no-pager to force disable it.
Frédéric Bérat [Mon, 12 Dec 2022 07:05:53 +0000 (08:05 +0100)]
tests: Fix 'type defaults' error in link_cond due to main not being properly declared
This is related to an effort to prepare Automake for future GCC/Clang
versions which set c99 as default standard to be used.
Not properly declaring main as "int main(...)" is rejected since c99.
Mike Frysinger [Thu, 12 Jan 2023 03:07:22 +0000 (22:07 -0500)]
dirstamp: switch to a pattern rule
We can leverage $(@D) to generate a single pattern rule for all dirstamp
rules. This saves many lines in the output -- normally we create 2 rules
(or 6 lines) per subdir, and projects that use subdirs tend to use them
quite a bit.
In the most extreme & unlikely case (1 subdir, no depdir support), the
line count is the same. In every other case, it's always a win.
Looking at a few real world projects, the line deltas:
* GNU libgloss: +3 -66
* GNU newlib: +3 -714
* GNU sim: +3 -138
There shouldn't be any concerns about portability with $(@D) because:
(0) This has been in POSIX (and beyond) for decades,
(1) We only generate this rule iff we know the dirstamp is in a subdir
(so we'd never have a case where $(@D) would expand to the cwd, and
that is where a few implementations are known to be buggy),
(2) We already rely on $(@D) in our depdir code, and have since 2014
(the Automake 1.16 release).
Mike Frysinger [Thu, 12 Jan 2023 02:40:04 +0000 (21:40 -0500)]
dirstamp: use append too instead of truncate
We changed the depfiles logic to use >> (append) instead of > (truncate)
due to it being slightly faster & nicer to the disk. Do the same with
the dirstamp files as we only need the files to exist -- we don't care
about their content, and we never put anything in them ourselves. If
someone else were to, we clean them up normally with `make clean`.
Simple test case on my Linux 6.1 w/ext4 on SSD:
@: > foo.txt
for (i = 0; i < 1000000; ++i) close(open("foo.txt", O_WRONLY|O_CREAT|O_TRUNC, 0666));
-> 769 msec
@: >>foo.txt
for (i = 0; i < 1000000; ++i) close(open("foo.txt", O_WRONLY|O_CREAT|O_APPEND, 0666));
-> 2 sec
Mike Frysinger [Wed, 4 Jan 2023 02:46:38 +0000 (21:46 -0500)]
rm: convert more cases to am__rm_f
Fixes automake bug https://bugs.gnu.org/10828.
Clean up a few more cases where we were doing `test ... || rm ...` to
avoid calling `rm -f` without arguments by leveraging am__rm_f. These
were harder to find in the source due to their constructed nature.
The clean programs rules in particular were much more complicated than
they needed to be. This logic boiled down to two things: delete the
list of programs, and then delete the list without the exeext suffix,
but only if the list of programs is non-empty.
The check-TESTS rule was converted to am__rm_f, but a simplification
was missed where the $list variable is inlined.
* bin/automake.in: Delete test -z logic and always call am__rm_f.
* contrib/check-html.am: Use $(am__rm_f) helper.
* doc/automake.texi: Update examples to match current behavior.
* lib/am/check.am: Inline $list variable.
* lib/am/progs.am: Rewrite rule to use $(am__rm_f).
Karl Berry [Mon, 9 Jan 2023 01:56:40 +0000 (17:56 -0800)]
doc: overriding targets doesn't mean third-party Makefiles.
Fixes automake bug https://bugs.gnu.org/60607.
* doc/automake.texi (dvi and distcheck): simply show
dvi: as an example of a do-nothing Makefile (xref to Extending),
instead of cross-referencing the complicated method in
Third-Party Makefiles.
(Clean, Extending): wording tweaks.
Mike Frysinger [Wed, 4 Jan 2023 02:07:45 +0000 (21:07 -0500)]
depend: trim spurious leading tab
These vars are replaced with a list of remove commands that are joined
with a \n and each line always has a leading \t inserted. That means
the literal tab here before the var leads to 2 tabs included in the
output. While not functionally a problem, it can be a bit confusing
when reading the output as it implies something is amiss. Trimming
the tab also aligns with the other .am files which don't include it.
Karl Berry [Sat, 1 Oct 2022 21:59:51 +0000 (14:59 -0700)]
maintcheck: placate maintainer-check and grep 3.8.
* maintainer/syntax-checks.mk (sc_rm_minus_f): no \ before -
(diagnosed by grep 3.8).
* t/comment12.sh: use $(...) instead of `...`.
* t/comments-escaped-in-var.sh: use AUTOMAKE_fails and grep
for expected warning message.
* t/list-of-tests.mk (handwritten_TESTS): add t/py-compile-files.sh.
* t/subdir-add2-pr46.sh (.NOTPARALLEL): add; showed up with
parallelized internal make. Seems unreproducible.
Karl Berry [Sat, 1 Oct 2022 16:02:15 +0000 (09:02 -0700)]
aclocal: protect against Perl undefined warnings.
* bin/aclocal.in (usage): check that envvars (ACLOCAL_AUTOMAKE_DIR,
ACLOCAL_PATH) are defined before printing values.
* HACKING: describe running scripts from checkout, et al.
This change is per automake thread:
https://lists.gnu.org/archive/html/automake/2022-09/msg00002.html
* lib/py-compile: Test directly for availability of
importlib.util.cache_from_source. Untangle logic for when
to generate -O and -OO bytecode. Reformat embedded Python fragments.
dist: ignore "silly rename" files from nfs/afs/smb.
This change is per automake thread:
https://lists.gnu.org/archive/html/automake/2022-09/msg00002.html
* lib/am/distdir.am (distcleancheck_listfiles): filter "silly rename"
files (.nfs* .smb* .__afs*), unavoidably created by deleting files
that are still open in some process on network file systems.
Richard Hopkins [Wed, 28 Sep 2022 01:04:20 +0000 (18:04 -0700)]
automake: do not use -Q with emacs invocations.
This change is for https://bugs.gnu.org/58102.
(By the way, the previous two commits were for bugs
58026 (silent .elc compilation) and
58025 (load bytecomp), respectively, but I forgot to mention them.)
* m4/lispdir.m4 (AM_PATH_LISPDIR): omit -Q option.
Also (from karl), use -no-site-file (one hyphen) for consistency
with the other options.
* NEWS: mention this.
* doc/automake.texi (Hard-Coded Install Paths): likewise.
Jim Meyering [Tue, 24 May 2022 06:20:37 +0000 (23:20 -0700)]
fix: autoreconf fails due to .m4 files added but not installed
* m4/local.mk (dist_automake_ac_DATA): Add both rmf.m4 and xargsn.m4.
Building grep from "make maintainer-clean" state, failed like this:
configure.ac:41: warning: _AM_PROG_RM_F is m4_require'd but not\
m4_defun'd
configure.ac:41: warning: _AM_PROG_XARGS_N is m4_require'd but not\
m4_defun'd
configure:5058: error: possibly undefined macro: _AM_PROG_RM_F
configure:5059: error: possibly undefined macro: _AM_PROG_XARGS_N
Jan Engelhardt [Mon, 23 May 2022 20:47:02 +0000 (13:47 -0700)]
deps: create empty file instead of dummy file.
This change is per an automake thread, see both before and after:
https://lists.gnu.org/archive/html/automake/2022-05/msg00006.html
* lib/am/depend.am ($(am__depfiles_remade)): create empty files
for dependencies instead of files with a line '# dummy'. Turns out
this is noticeably faster.
* THANKS: update Jan's email address.
* NEWS: mention this.
Mike Frysinger [Fri, 25 Feb 2022 03:25:45 +0000 (22:25 -0500)]
automake: fall back gracefully when texinfo inputs don't exist
Fixes automake bug https://bugs.gnu.org/54063.
The function scanning for @setfilename will fall back to a default
value if the input doesn't have one defined. But we need to handle
the case where the file doesn't even exist before falling back.
* bin/automake.in: Scan /dev/null for @setfilename if input doesn't exist.
* t/list-of-tests.mk: Add txinfo-no-setfilename-no-inputs.sh.
* t/txinfo-no-setfilename-no-inputs.sh: New test.
Mike Frysinger [Mon, 21 Feb 2022 00:06:55 +0000 (19:06 -0500)]
m4: rework silent-rules macros to avoid double expansion
Fixes automake bug https://bugs.gnu.org/32868.
The AM_SILENT_RULES macro defines all the silent-rules related setup.
It's also called by users to change the default verbosity level. This
leads to a quirk where automake calls it, expands the full context,
and then users call it, and it's fully expanded again.
Instead, let's rename AM_SILENT_RULES to _AM_SILENT_RULES and move the
initialization logic to late in the configure stage. This allows the
user-centric AM_SILENT_RULES call to expand into a single line to set
the default verbosity.
* m4/init.m4: Switch to _AM_SILENT_RULES.
* m4/silent.m4: Rename AM_SILENT_RULES to _AM_SILENT_RULES. Delay
evaluation of AM_SILENT_RULES to the end. Define new AM_SILENT_RULES to
set default rules verbosity.
* t/silent-defaults.sh: New tests.
* t/list-of-tests.mk: Add t/silent-defaults.sh.
Mike Frysinger [Thu, 24 Feb 2022 05:52:08 +0000 (00:52 -0500)]
tests: make silent-custom regex a little more robust
Fixes automake bug https://bugs.gnu.org/32800.
Have the regex match the entire path with word boundaries on both
sides. This should reduce false positives when the full cwd happens
to match parent directories.
* t/silent-custom.sh: Update the header output regex.
Mike Frysinger [Sun, 6 Feb 2022 06:25:59 +0000 (01:25 -0500)]
py-compile: fix optimized compiling for Python 3.5+
Fixes automake bug https://bugs.gnu.org/38043.
Split the optimized compilation logic into a new section. This avoids
trying to support multiple versions of major versions in a single script
as it gets harder to verify new changes don't break old versions as time
goes on.
Now for Python 3.5+, compile with -O0 (which is "higher" than -O).
* NEWS: Mention fix.
* THANKS: Add Michal Górny.
* lib/py-compile: Add new section for compiling Python 3.5+.
Mike Frysinger [Mon, 21 Feb 2022 04:30:39 +0000 (23:30 -0500)]
automake: allow required files to be in subdirs
Fixes automake bug https://bugs.gnu.org/20300.
The internal method for caching path lookups expects the $filename to
only be a filename. If it's actually a subdir/file itself, then the
cache logic gets confused, and it never matches. This manifests as
AC_REQUIRE_AUX_FILE([subdir/file]) claiming that the subdir/file path
doesn't exist even when it does.
Before we process any required files, since we already construct the
full path locally, reset the dir & file inputs to the final values.
* bin/automake.in: Split dir & file name back out from the constructed
required file path.
* t/auxdir-subsubdir.sh: New test.
* t/list-of-tests.mk: Add t/auxdir-subsubdir.sh.
Mike Frysinger [Sun, 20 Feb 2022 19:28:11 +0000 (14:28 -0500)]
tests: fix yacc C++ tests with some C++ compilers
Fixes automake bug https://bugs.gnu.org/20031.
The C++ standard does not require symbols be placed into the global
namespace, just in the std namespace. The GNU implementation will
place symbols in both. For our specific code, we don't care either.
Unfortunately, it looks like generated flex code assumes that some
stdlib.h symbols (free, malloc, exit) are in the global namespace,
even when compiling for C++. So when we include <cstdlib> but not
<stdlib.h>, we might not get the symbols in the global namespace.
We can workaround this by including stdlib.h in these tests without
invalidating the point of the tests in general.
* t/yacc-cxx.sh: Include stdlib.h.
* t/yacc-d-cxx.sh: Likewise.
* t/yacc-mix-c-cxx.sh: Likewise.
Mike Frysinger [Sun, 20 Feb 2022 18:28:48 +0000 (13:28 -0500)]
automake: support embedded \# in variable appends
Fixes automake bug https://bugs.gnu.org/7610.
Use of \# is not portable. POSIX does not provide any way of retaining
the # marker in variables. There is wide spread support for \# though
in GNU & BSD Make implementations.
Today, with plain variable assignments, Automake leaves the line alone:
foo = blah\#blah
This will leave it to the implementation to decide what to do. But if
you try to append to it, Automake follows POSIX and strips it:
foo = blah\#blah
foo += what
-> foo = blah\ what
Instead, let's issue a portability warning whenever \# is used, even if
it isn't being appended, and do not strip the \# when appending. Now:
foo = blah\#blah
foo += what
-> warning: escaping \# comment markers is not portable
-> foo = blah\#blah what
* NEWS: Mention change in \# handling.
* lib/Automake/VarDef.pm: Do not strip # if escaped.
* lib/Automake/Variable.pm: Warn if \# is used.
* t/comment12.sh: New test.
* t/comments-escaped-in-var.sh: New test.
* t/list-of-tests.mk: Add comment12.sh & comments-escaped-in-var.sh.
Mike Frysinger [Thu, 17 Feb 2022 09:35:03 +0000 (04:35 -0500)]
python: use xargs -n when uninstalling files
Fixes automake bug https://bugs.gnu.org/53340.
If the system has xargs, then utilize it to uninstall files to stay
within long command line limits. If the system doesn't have xargs,
fall back to running the remove command one at a time. Since every
reasonable system should have `xargs -n`, and POSIX requires it, the
fallback probably rarely gets used, so don't bother optimizing.
* lib/am/inst-vars.am: Use am__xargs_n to call rm -f on the files.
* lib/am/python.am: Drop am__base_list and for loop and let the
am__uninstall_files_from_dir break up the long command lines.
* m4/init.m4: Call _AM_PROG_XARGS_N.
* m4/xargsn.m4: New test for `xargs -n`.
Mike Frysinger [Thu, 17 Feb 2022 08:50:55 +0000 (03:50 -0500)]
rm: handle -f w/no arguments gracefully
Fixes automake bug https://bugs.gnu.org/10828.
Delete the configure check that would abort if `rm -f` does not work,
and delete the plans to make this a hard requirement in the future.
Instead, test to see if `rm -f` fails w/out arguments. If it does,
define am__rm_f such that it always passes at least the "" argument
when deleting files. If it doesn't fail, then we can omit the "".
Then go through lib/am/ and update places where we use the pattern
`test -z ... || rm -f ...` and replace with $(am__rm_f).
* NEWS: Mention support for `rm -f` w/out arguments.
* PLANS/rm-f-without-args.txt: Remove.
* lib/am/check.am: Use new $(am__rm_f) helper.
* lib/am/clean.am: Likewise.
* lib/am/header-vars.am: Likewise.
* lib/am/inst-vars.am: Likewise.
* lib/am/libs.am: Likewise.
* lib/am/ltlib.am: Likewise.
* lib/am/progs.am: Likewise.
* lib/am/texinfos.am: Likewise.
* m4/init.m4: Delete `rm -f` checks and call _AM_PROG_RM_F.
* m4/rmf.m4: Define new _AM_PROG_RM_F macro.
* t/rm-f-probe.sh: Update test.
Mike Frysinger [Wed, 16 Feb 2022 03:25:35 +0000 (22:25 -0500)]
python: fix exit status handling with uninstall
The st variable is set at the top of this shell script, and then here
is a pipeline where it tries to update it in the subshell. But since
setting variables in a subshell doesn't propagate back up, it doesn't
actually work. Have the final subshell in the pipeline manage its own
exit status and exit with that so that the final status of the pipeline
is the right value.
* lib/am/python.am: Fix final subshell exit status passing.
Mike Frysinger [Sat, 12 Feb 2022 08:41:06 +0000 (03:41 -0500)]
m4: speed up filesystem modification checks
The current code sleeps at least 1 second to make sure the generated
files are strictly newer than the source files. It does this for a
few reasons: POSIX only guarantees that `sleep` accept integers, and
filesystems have a history (c.f. Windows) of bad timestamp resolution.
For the first part, we can easily probe sleep to see if it accepts a
decimal number with a fractional part -- just run `sleep 0.001`.
For the second part, we can create two files and then run sleep in a
loop to see when one is considered newer than the other.
For many projects, this 1 second delay is largely amortized by the
rest of the configure script. Autoconf lends itself to being both
large & slow. But in projects with many smallish configure scripts
with many cached vars, the time to rerun is dominated by this single
sleep call. For example, building libgloss against a compiler with
many (60+) multilib configurations, we see:
[Using sleep 1]
$ time ./config.status
real 2m28.164s
user 0m33.651s
sys 0m9.083s
[Using sleep 0.1]
$ time ./config.status
real 0m39.569s
user 0m33.517s
sys 0m8.969s
And in case anyone wonders, going below 0.1s doesn't seem to make a
statistically significant difference, at least in this configuration.
It appears to be within "noise" limits.
[Using sleep 0.001]
$ time ./config.status
real 0m39.760s
user 0m33.342s
sys 0m9.080s
* NEWS: Mention updated timestamp checking.
* m4/sanity.m4: Determine whether `sleep` accepts fractional seconds.
Determine (roughly) the filesystem timestamp resolution. Use this to
sleep less when waiting for generated file timestamps to update.
Mike Frysinger [Sat, 12 Feb 2022 07:12:42 +0000 (02:12 -0500)]
m4: cache build env sanity checks
When rerunning configure in an existing build dir, cache the previous
results about environment settings. There should be no need to retest
these in a dir that has already been configured.
Mike Frysinger [Tue, 8 Feb 2022 05:39:40 +0000 (00:39 -0500)]
elisp: run emacs with --no-site-file
Fixes automake bug https://bugs.gnu.org/21547.
If users have interactive site file logic, the lispdir probing can
hang, as can the compilation of elisp files. Use --no-site-file to
disable loading any of that possible user logic.
* NEWS: Note emacs --no-site-file change.
* doc/automake.texi: Run emacs with --no-site-file.
* lib/am/lisp.am: Likewise.
* m4/lispdir.m4: Likewise.
Mathieu Lirzin [Fri, 19 Jan 2018 15:30:32 +0000 (16:30 +0100)]
tests: do not assume AM_MAKEINFOHTMLFLAGS is used in non-html targets
Fixes automake bug https://bugs.gnu.org/30172.
Since AM_MAKEINFOHTMLFLAGS overrides AM_MAKEINFOFLAGS only for html
targets, make sure we restore the hacked up makefile before testing
the non-html formats. This normally doesn't cause a problem for most
people, but if their tex install doesn't work correctly, texi2dvi will
fallback to running $MAKEINFO and using invalid flags in the process.
* THANKS: Add Mathieu Lirzin.
* t/txinfo-many-output-formats.sh: Restore Makefile.am after testing
html targets.
* t/txinfo-many-output-formats-vpath.sh: Likewise.
Mike Frysinger [Sun, 6 Feb 2022 06:24:52 +0000 (01:24 -0500)]
py-compile: fix display when compiling multiple files
The compilation steps print the filename as it runs, but forgets to add
a space after it, so they all get squashed together:
$ ./py-compile 1.py 2.py 3.py
Byte-compiling python modules...
1.py2.py.3.py
Mike Frysinger [Sun, 6 Feb 2022 05:22:50 +0000 (00:22 -0500)]
py-compile: drop support for Python 0.x & 1.x
Python 2.0 was released in 2000. There's really no way for us to check
those old versions, so let's just drop them. No one will miss them.
* NEWS: Note Python version support removal.
* lib/py-compile: Abort if major version 0 or 1 is found.
* t/py-compile-env.sh: Rework slightly to handle new version probing.
Mike Frysinger [Mon, 31 Jan 2022 07:40:14 +0000 (02:40 -0500)]
AM_PROG_AR: require before AC_PROG_AR
The new autoconf AC_PROG_AR macro has similar logic to what we have in
AM_PROG_AR, but less than what we need (since autoconf doesn't support
the MS archiver), so make sure we are run before AC_PROG_AR.
Mike Frysinger [Mon, 24 Jan 2022 08:08:13 +0000 (03:08 -0500)]
texi: define new AM_TEXI2FLAGS variable
To provide a bit more flexibility when invoking TEXI2DVI & TEXI2PDF,
and provide a bit of symmetry with .info & .html generation, provide
a AM_TEXI2FLAGS setting that is passed to all TEXI2xxx invocations.
* doc/automake.texi: Mention new AM_TEXI2FLAGS setting.
* lib/am/texibuild.am: Pass $(AM_TEXI2FLAGS) to TEXI2DVI & TEXI2PDF.
* NEWS: Mention AM_TEXI2FLAGS.
* t/txinfo-many-output-formats.sh: Check for AM_TEXI2FLAGS.
Mike Frysinger [Mon, 24 Jan 2022 07:53:13 +0000 (02:53 -0500)]
texi: pass automatic -I to dvi & pdf generation
Fixes automake bug https://bugs.gnu.org/23599.
When generating info/html pages, automake adds -I flags to source
dirs that contain the texi files, but it doesn't do this for dvi or
pdf formats. Instead, automake has been relying on texi2dvi to use
makeinfo for expanding macros, and it hasn't done that by default in
a long time.
Since adding --expand to the texi2dvi call is undesirable (due to bad
and unpredictable BEHAVIOR), pass those automatic -I flags directly
to TEXI2DVI & TEXI2PDF so they work regardless of --expand behavior.
We have to keep the MAKEINFO= setting around as texi2dvi might itself
fall back to it if the version of tex is old or broken.
* bin/automake.in: Add comment about $makeinfoflags usage.
* doc/automake.texi: Mention automatic -I subdir flags.
* lib/am/texibuild.am: Pass %MAKEINFOFLAGS% to TEXI2DVI & TEXI2PDF.
* t/txinfo-subdir-pr343.sh: Check for -I subdir usage.
Mike Frysinger [Wed, 19 Jan 2022 08:31:07 +0000 (03:31 -0500)]
tests: add coverage for nobase_ and dist_ prefixes
From automake bug https://bugs.gnu.org/14245.
We have tests that check nobase_ and nodist_ interaction, but not
nobase_ and dist_. We had a report against automake 1.12 that this
combo did not work. It seems to work now, but lets include a test
to make sure we don't regress.
Based on Daiki Ueno's example, but fixed up to pass against master.
* t/list-of-tests.mk: Add t/nobase-dist.sh.
* t/nobase-dist.sh: New test.
Mike Frysinger [Wed, 26 Jan 2022 11:33:19 +0000 (06:33 -0500)]
python: add 3.10 - 3.15 to the version search list
Fixes automake bug https://bugs.gnu.org/53530.
Based on the cadence of Automake releases, add the current Python
release (3.10), the current Python development (3.11), and then 4
more versions on top of that. It doesn't hurt to check for a few
extra versions here since this is the fallback logic when the main
`python` and `python3` programs aren't found.
Mike Frysinger [Wed, 19 Jan 2022 10:14:47 +0000 (05:14 -0500)]
progs, libs: support _RANLIB overrides
Much like we have per-target support for _AR and _LINK, add an _RANLIB
override too. This allows selection of specific ranlib tools in case
a non-standard archiver tool was forced.
* bin/automake.in: Check for _RANLIB per-target settings.
* doc/automake.texi: Document _RANLIB override.
* lib/am/library.am: Change $(RANLIB) to $(%XLIBRARY%_RANLIB).
* t/list-of-tests.mk: Add ranlib_override.sh.
* t/ranlib_override.sh: New test.
* NEWS: Mention new feature.
Mike Frysinger [Mon, 24 Jan 2022 06:02:41 +0000 (01:02 -0500)]
tests: clear autotools env vars
Fixes automake bug https://bugs.gnu.org/16714.
The testsuite will try and retain these env vars when recursively
running itself, but doesn't distinguish between vars coming from
the env where the tests were launched. This breaks if the user
happens to `export ACLOCAL=alocal` before `make check`.
This gets a little more confusing in that the Makefile appears to
export these already:
ACLOCAL = ".../automake/pre-inst-env" aclocal-1.16
In reality, while those are set in the make execution environment,
they aren't exported into the process environment, so children
(i.e. shell processes in make rules) don't have them set. That's
why tests work for most people today.
However, if the user has first exported "ACLOCAL" in the parent
make environment (regardless of value), then make's value will
reset the process environment, and then that will leak into the
children. That's why we see errors that look like the makefile
env vars are leaking for these people.
At any rate, the fix is to update the test harness to clear these
vars that the test suite relies upon, especially the ones that are
also set in the Makefiles. That includes AUTOUPDATE even though
it currently isn't used inside any of the tests.
* t/local.mk: Add ACLOCAL, AUTOCONF, AUTOHEADER, AUTOMAKE, and
AUTOUPDATE to the env unset list.
* t/ax/runtest.in: Likewise.
Mike Frysinger [Thu, 20 Jan 2022 07:03:23 +0000 (02:03 -0500)]
aclocal: add m4 search path info to --help
Add a short summary to --help of the current paths that will be
searched. Make sure to omit this from the man page when running
help2man since pre-inst-env specifically clears some and others
to the current build directory.
* bin/aclocal.in: Include m4 search paths in usage.
* doc/local.mk: Run help2man with AUTOMAKE_HELP2MAN=true.
Zack Weinberg [Fri, 21 Jan 2022 19:57:30 +0000 (14:57 -0500)]
build: fix ChangeLog generation in external build directory
When gitlog-to-changelog is run in a build directory that is neither the same
as, nor a subdirectory of, the source directory, it needs a --srcdir option or
it will fail to generate the changelog. For instance
Mike Frysinger [Tue, 18 Jan 2022 09:47:09 +0000 (04:47 -0500)]
build: fix race in parallel builds
As reported by Hongxu Jia:
> The automake-$(APIVERSION) is a hardlink of automake, if it is
> created later than update_mans executing, there is a failure
> [snip]
> |: && mkdir -p doc && ./pre-inst-env /usr/bin/env perl ../automake-1.16.1/doc/help2man --output=doc/aclocal-1.16.1 aclocal-1.16
> |help2man: can't get `--help' info from aclocal-1.16
> |Try `--no-discard-stderr' if option outputs to stderr
> Makefile:3693: recipe for target 'doc/aclocal-1.16.1' failed
> [snip]
>
> The automake_script is required by update_mans and update_mans
> invokes automake-$(APIVERSION) rather than automake to generate
> doc, so we should assign `automake-$(APIVERSION)' to automake_script.
>
> The same reason to tweak aclocal_script.
However, rather than update the _script variables to point to the
hardlinked copies of the programs, we can have the help2man steps
run the existing scripts directly. This makes the relationship a
bit more explicit and avoids implicit dependencies on names.
* doc/local.mk: Pass $(aclocal_script) and $(automake_script) to $(update_mans).
* THANKS: Add Hongxu Jia.
Jim Meyering [Tue, 18 Jan 2022 10:00:22 +0000 (02:00 -0800)]
tests: fix py-compile-basedir.sh: missing "test"
Prompted by a patch from Thomas Deutschmann <whissi@gentoo.org>,
via https://lists.gnu.org/r/automake-patches/2022-01/msg00001.html:
commit v1.16.1-26-gb279a0d46 ("tests: in python tests, do not
require .pyo files (for python3)") was missing a `test` call.
Reported to Gentoo at https://bugs.gentoo.org/715040.
* t/py-compile-basedir.sh: Rather than just adding the missing
"test", rewrite using a case statement, to avoid some duplication.
Mike Frysinger [Mon, 13 Dec 2021 02:08:06 +0000 (18:08 -0800)]
configure: skip kcc on case-insensitive filesystems; add clang++.
This change fixes https://bugs.gnu.org/21336.
* configure.ac: Skip KCC check on case-insensitive filesystems; on
macOS 10.10 and later, a kerberos tool named "kcc" is installed.
Add clang++ to the C++ search list, as with current autoconf.