Skip to content

Commit 465cfc9

Browse files
author
Cristy
committed
latest autoconf/automake updates
1 parent a6cc262 commit 465cfc9

File tree

11 files changed

+257
-111
lines changed

11 files changed

+257
-111
lines changed

‎Makefile.in‎

Lines changed: 34 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
# Makefile.in generated by automake 1.17 from Makefile.am.
1+
# Makefile.in generated by automake 1.18.1 from Makefile.am.
22
# @configure_input@
33

4-
# Copyright (C) 1994-2024 Free Software Foundation, Inc.
4+
# Copyright (C) 1994-2025 Free Software Foundation, Inc.
55

66
# This Makefile.in is free software; the Free Software Foundation
77
# gives unlimited permission to copy and/or distribute it,
@@ -2838,7 +2838,7 @@ am__common_driver_flags = \
28382838
# To be inserted before the command running the test. Creates the
28392839
# directory for the log if needed. Stores in $dir the directory
28402840
# containing $f, in $tst the test, in $log the log. Executes the
2841-
# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and
2841+
# developer-defined test setup AM_TESTS_ENVIRONMENT (if any), and
28422842
# passes TESTS_ENVIRONMENT. Set up options for the wrapper that
28432843
# will run the test scripts (or their associated LOG_COMPILER, if
28442844
# thy have one).
@@ -11633,6 +11633,7 @@ recheck: all $(check_PROGRAMS)
1163311633
@am__EXEEXT_TRUE@ --log-file $$b.log --trs-file $$b.trs \
1163411634
@am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TAP_LOG_DRIVER_FLAGS) $(TAP_LOG_DRIVER_FLAGS) -- $(TAP_LOG_COMPILE) \
1163511635
@am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT)
11636+
1163611637
distdir: $(BUILT_SOURCES)
1163711638
$(MAKE) $(AM_MAKEFLAGS) distdir-am
1163811639

@@ -11684,6 +11685,10 @@ dist-gzip: distdir
1168411685
dist-bzip2: distdir
1168511686
tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
1168611687
$(am__post_remove_distdir)
11688+
11689+
dist-bzip3: distdir
11690+
tardir=$(distdir) && $(am__tar) | bzip3 -c >$(distdir).tar.bz3
11691+
$(am__post_remove_distdir)
1168711692
dist-lzip: distdir
1168811693
tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
1168911694
$(am__post_remove_distdir)
@@ -11726,6 +11731,8 @@ distcheck: dist
1172611731
eval GZIP= gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
1172711732
*.tar.bz2*) \
1172811733
bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
11734+
*.tar.bz3*) \
11735+
bzip3 -dc $(distdir).tar.bz3 | $(am__untar) ;;\
1172911736
*.tar.lz*) \
1173011737
lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
1173111738
*.tar.xz*) \
@@ -12833,29 +12840,30 @@ uninstall-man: uninstall-man1
1283312840
clean-filtersLTLIBRARIES clean-generic clean-libLTLIBRARIES \
1283412841
clean-libtool clean-local clean-noinstLTLIBRARIES cscope \
1283512842
cscopelist-am ctags ctags-am dist dist-all dist-bzip2 \
12836-
dist-gzip dist-hook dist-lzip dist-shar dist-tarZ dist-xz \
12837-
dist-zip dist-zstd distcheck distclean distclean-compile \
12838-
distclean-generic distclean-hdr distclean-libtool \
12839-
distclean-local distclean-tags distcleancheck distdir \
12840-
distuninstallcheck dvi dvi-am html html-am html-local info \
12841-
info-am install install-am install-binPROGRAMS \
12842-
install-binSCRIPTS install-codersLTLIBRARIES \
12843-
install-configlibDATA install-configshareDATA \
12844-
install-configsharearchDATA install-data install-data-am \
12845-
install-data-local install-docDATA install-dvi install-dvi-am \
12846-
install-exec install-exec-am install-exec-local \
12847-
install-filtersLTLIBRARIES install-html install-html-am \
12848-
install-includeHEADERS install-info install-info-am \
12849-
install-libLTLIBRARIES install-magickincHEADERS \
12850-
install-magickincarchHEADERS install-magickppincHEADERS \
12851-
install-magickpptopincHEADERS install-man install-man1 \
12852-
install-pdf install-pdf-am install-pkgconfigDATA install-ps \
12853-
install-ps-am install-strip install-wandincHEADERS \
12854-
installcheck installcheck-am installdirs maintainer-clean \
12855-
maintainer-clean-generic maintainer-clean-local mostlyclean \
12856-
mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
12857-
pdf pdf-am ps ps-am recheck tags tags-am uninstall \
12858-
uninstall-am uninstall-binPROGRAMS uninstall-binSCRIPTS \
12843+
dist-bzip3 dist-gzip dist-hook dist-lzip dist-shar dist-tarZ \
12844+
dist-xz dist-zip dist-zstd distcheck distclean \
12845+
distclean-compile distclean-generic distclean-hdr \
12846+
distclean-libtool distclean-local distclean-tags \
12847+
distcleancheck distdir distuninstallcheck dvi dvi-am html \
12848+
html-am html-local info info-am install install-am \
12849+
install-binPROGRAMS install-binSCRIPTS \
12850+
install-codersLTLIBRARIES install-configlibDATA \
12851+
install-configshareDATA install-configsharearchDATA \
12852+
install-data install-data-am install-data-local \
12853+
install-docDATA install-dvi install-dvi-am install-exec \
12854+
install-exec-am install-exec-local install-filtersLTLIBRARIES \
12855+
install-html install-html-am install-includeHEADERS \
12856+
install-info install-info-am install-libLTLIBRARIES \
12857+
install-magickincHEADERS install-magickincarchHEADERS \
12858+
install-magickppincHEADERS install-magickpptopincHEADERS \
12859+
install-man install-man1 install-pdf install-pdf-am \
12860+
install-pkgconfigDATA install-ps install-ps-am install-strip \
12861+
install-wandincHEADERS installcheck installcheck-am \
12862+
installdirs maintainer-clean maintainer-clean-generic \
12863+
maintainer-clean-local mostlyclean mostlyclean-compile \
12864+
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
12865+
recheck tags tags-am uninstall uninstall-am \
12866+
uninstall-binPROGRAMS uninstall-binSCRIPTS \
1285912867
uninstall-codersLTLIBRARIES uninstall-configlibDATA \
1286012868
uninstall-configshareDATA uninstall-configsharearchDATA \
1286112869
uninstall-docDATA uninstall-filtersLTLIBRARIES \

‎aclocal.m4‎

Lines changed: 42 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
# generated automatically by aclocal 1.17 -*- Autoconf -*-
1+
# generated automatically by aclocal 1.18.1 -*- Autoconf -*-
22

3-
# Copyright (C) 1996-2024 Free Software Foundation, Inc.
3+
# Copyright (C) 1996-2025 Free Software Foundation, Inc.
44

55
# This file is free software; the Free Software Foundation
66
# gives unlimited permission to copy and/or distribute it,
@@ -20,7 +20,7 @@ You have another version of autoconf. It may work, but is not guaranteed to.
2020
If you have problems, you may need to regenerate the build system entirely.
2121
To do so, use the procedure documented by the package, typically 'autoreconf'.])])
2222

23-
# Copyright (C) 2002-2024 Free Software Foundation, Inc.
23+
# Copyright (C) 2002-2025 Free Software Foundation, Inc.
2424
#
2525
# This file is free software; the Free Software Foundation
2626
# gives unlimited permission to copy and/or distribute it,
@@ -32,10 +32,10 @@ To do so, use the procedure documented by the package, typically 'autoreconf'.])
3232
# generated from the m4 files accompanying Automake X.Y.
3333
# (This private macro should not be called outside this file.)
3434
AC_DEFUN([AM_AUTOMAKE_VERSION],
35-
[am__api_version='1.17'
35+
[am__api_version='1.18'
3636
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
3737
dnl require some minimum version. Point them to the right macro.
38-
m4_if([$1], [1.17], [],
38+
m4_if([$1], [1.18.1], [],
3939
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
4040
])
4141

@@ -51,12 +51,12 @@ m4_define([_AM_AUTOCONF_VERSION], [])
5151
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
5252
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
5353
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
54-
[AM_AUTOMAKE_VERSION([1.17])dnl
54+
[AM_AUTOMAKE_VERSION([1.18.1])dnl
5555
m4_ifndef([AC_AUTOCONF_VERSION],
5656
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
5757
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
5858

59-
# Copyright (C) 2011-2024 Free Software Foundation, Inc.
59+
# Copyright (C) 2011-2025 Free Software Foundation, Inc.
6060
#
6161
# This file is free software; the Free Software Foundation
6262
# gives unlimited permission to copy and/or distribute it,
@@ -120,7 +120,7 @@ AC_SUBST([AR])dnl
120120

121121
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
122122

123-
# Copyright (C) 2001-2024 Free Software Foundation, Inc.
123+
# Copyright (C) 2001-2025 Free Software Foundation, Inc.
124124
#
125125
# This file is free software; the Free Software Foundation
126126
# gives unlimited permission to copy and/or distribute it,
@@ -172,7 +172,7 @@ am_aux_dir=`cd "$ac_aux_dir" && pwd`
172172

173173
# AM_CONDITIONAL -*- Autoconf -*-
174174

175-
# Copyright (C) 1997-2024 Free Software Foundation, Inc.
175+
# Copyright (C) 1997-2025 Free Software Foundation, Inc.
176176
#
177177
# This file is free software; the Free Software Foundation
178178
# gives unlimited permission to copy and/or distribute it,
@@ -203,7 +203,7 @@ AC_CONFIG_COMMANDS_PRE(
203203
Usually this means the macro was only invoked conditionally.]])
204204
fi])])
205205

206-
# Copyright (C) 1999-2024 Free Software Foundation, Inc.
206+
# Copyright (C) 1999-2025 Free Software Foundation, Inc.
207207
#
208208
# This file is free software; the Free Software Foundation
209209
# gives unlimited permission to copy and/or distribute it,
@@ -394,7 +394,7 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl
394394

395395
# Generate code to set up dependency tracking. -*- Autoconf -*-
396396

397-
# Copyright (C) 1999-2024 Free Software Foundation, Inc.
397+
# Copyright (C) 1999-2025 Free Software Foundation, Inc.
398398
#
399399
# This file is free software; the Free Software Foundation
400400
# gives unlimited permission to copy and/or distribute it,
@@ -461,7 +461,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
461461
[AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"])])
462462

463463

464-
# Copyright (C) 1996-2024 Free Software Foundation, Inc.
464+
# Copyright (C) 1996-2025 Free Software Foundation, Inc.
465465
#
466466
# This file is free software; the Free Software Foundation
467467
# gives unlimited permission to copy and/or distribute it,
@@ -485,7 +485,7 @@ fi], [AC_MSG_RESULT([no])])
485485

486486
# Do all the work for Automake. -*- Autoconf -*-
487487

488-
# Copyright (C) 1996-2024 Free Software Foundation, Inc.
488+
# Copyright (C) 1996-2025 Free Software Foundation, Inc.
489489
#
490490
# This file is free software; the Free Software Foundation
491491
# gives unlimited permission to copy and/or distribute it,
@@ -585,8 +585,9 @@ AC_REQUIRE([AC_PROG_AWK])dnl
585585
AC_REQUIRE([AC_PROG_MAKE_SET])dnl
586586
AC_REQUIRE([AM_SET_LEADING_DOT])dnl
587587
_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
588-
[_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
589-
[_AM_PROG_TAR([v7])])])
588+
[_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
589+
[_AM_IF_OPTION([tar-v7], [_AM_PROG_TAR([v7])],
590+
[_AM_PROG_TAR([ustar])])])])
590591
_AM_IF_OPTION([no-dependencies],,
591592
[AC_PROVIDE_IFELSE([AC_PROG_CC],
592593
[_AM_DEPENDENCIES([CC])],
@@ -662,7 +663,7 @@ for _am_header in $config_headers :; do
662663
done
663664
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
664665

665-
# Copyright (C) 2001-2024 Free Software Foundation, Inc.
666+
# Copyright (C) 2001-2025 Free Software Foundation, Inc.
666667
#
667668
# This file is free software; the Free Software Foundation
668669
# gives unlimited permission to copy and/or distribute it,
@@ -683,7 +684,7 @@ if test x"${install_sh+set}" != xset; then
683684
fi
684685
AC_SUBST([install_sh])])
685686

686-
# Copyright (C) 2003-2024 Free Software Foundation, Inc.
687+
# Copyright (C) 2003-2025 Free Software Foundation, Inc.
687688
#
688689
# This file is free software; the Free Software Foundation
689690
# gives unlimited permission to copy and/or distribute it,
@@ -705,7 +706,7 @@ AC_SUBST([am__leading_dot])])
705706
# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
706707
# From Jim Meyering
707708

708-
# Copyright (C) 1996-2024 Free Software Foundation, Inc.
709+
# Copyright (C) 1996-2025 Free Software Foundation, Inc.
709710
#
710711
# This file is free software; the Free Software Foundation
711712
# gives unlimited permission to copy and/or distribute it,
@@ -740,7 +741,7 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
740741

741742
# Check to see how 'make' treats includes. -*- Autoconf -*-
742743

743-
# Copyright (C) 2001-2024 Free Software Foundation, Inc.
744+
# Copyright (C) 2001-2025 Free Software Foundation, Inc.
744745
#
745746
# This file is free software; the Free Software Foundation
746747
# gives unlimited permission to copy and/or distribute it,
@@ -783,7 +784,7 @@ AC_SUBST([am__quote])])
783784

784785
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
785786

786-
# Copyright (C) 1997-2024 Free Software Foundation, Inc.
787+
# Copyright (C) 1997-2025 Free Software Foundation, Inc.
787788
#
788789
# This file is free software; the Free Software Foundation
789790
# gives unlimited permission to copy and/or distribute it,
@@ -817,7 +818,7 @@ fi
817818

818819
# Helper functions for option handling. -*- Autoconf -*-
819820

820-
# Copyright (C) 2001-2024 Free Software Foundation, Inc.
821+
# Copyright (C) 2001-2025 Free Software Foundation, Inc.
821822
#
822823
# This file is free software; the Free Software Foundation
823824
# gives unlimited permission to copy and/or distribute it,
@@ -846,7 +847,7 @@ AC_DEFUN([_AM_SET_OPTIONS],
846847
AC_DEFUN([_AM_IF_OPTION],
847848
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
848849

849-
# Copyright (C) 1999-2024 Free Software Foundation, Inc.
850+
# Copyright (C) 1999-2025 Free Software Foundation, Inc.
850851
#
851852
# This file is free software; the Free Software Foundation
852853
# gives unlimited permission to copy and/or distribute it,
@@ -878,7 +879,10 @@ AC_CACHE_CHECK(
878879
break
879880
fi
880881
done
881-
rm -f core conftest*
882+
# aligned with autoconf, so not including core; see bug#72225.
883+
rm -f -r a.out a.exe b.out conftest.$ac_ext conftest.$ac_objext \
884+
conftest.dSYM conftest1.$ac_ext conftest1.$ac_objext conftest1.dSYM \
885+
conftest2.$ac_ext conftest2.$ac_objext conftest2.dSYM
882886
unset am_i])
883887
if test "$am_cv_prog_cc_c_o" != yes; then
884888
# Losing compiler, so override with the script.
@@ -893,7 +897,7 @@ AC_LANG_POP([C])])
893897
# For backward compatibility.
894898
AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
895899

896-
# Copyright (C) 2022-2024 Free Software Foundation, Inc.
900+
# Copyright (C) 2022-2025 Free Software Foundation, Inc.
897901
#
898902
# This file is free software; the Free Software Foundation
899903
# gives unlimited permission to copy and/or distribute it,
@@ -909,7 +913,7 @@ AS_IF([(rm -f && rm -fr && rm -rf) 2>/dev/null], [], [am__rm_f_notfound='""'])
909913
AC_SUBST(am__rm_f_notfound)
910914
])
911915

912-
# Copyright (C) 2001-2024 Free Software Foundation, Inc.
916+
# Copyright (C) 2001-2025 Free Software Foundation, Inc.
913917
#
914918
# This file is free software; the Free Software Foundation
915919
# gives unlimited permission to copy and/or distribute it,
@@ -928,7 +932,7 @@ AC_DEFUN([AM_RUN_LOG],
928932

929933
# Check to make sure that the build environment is sane. -*- Autoconf -*-
930934

931-
# Copyright (C) 1996-2024 Free Software Foundation, Inc.
935+
# Copyright (C) 1996-2025 Free Software Foundation, Inc.
932936
#
933937
# This file is free software; the Free Software Foundation
934938
# gives unlimited permission to copy and/or distribute it,
@@ -1097,10 +1101,12 @@ am_lf='
10971101
'
10981102
case `pwd` in
10991103
*[[\\\"\#\$\&\'\`$am_lf]]*)
1104+
AC_MSG_RESULT([no])
11001105
AC_MSG_ERROR([unsafe absolute working directory name]);;
11011106
esac
11021107
case $srcdir in
11031108
*[[\\\"\#\$\&\'\`$am_lf\ \ ]]*)
1109+
AC_MSG_RESULT([no])
11041110
AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);;
11051111
esac
11061112
@@ -1153,7 +1159,7 @@ AC_CONFIG_COMMANDS_PRE(
11531159
rm -f conftest.file
11541160
])
11551161

1156-
# Copyright (C) 2009-2024 Free Software Foundation, Inc.
1162+
# Copyright (C) 2009-2025 Free Software Foundation, Inc.
11571163
#
11581164
# This file is free software; the Free Software Foundation
11591165
# gives unlimited permission to copy and/or distribute it,
@@ -1222,9 +1228,13 @@ fi
12221228
# empty being verbose).
12231229
AC_DEFUN([AM_SILENT_RULES],
12241230
[AC_REQUIRE([_AM_SILENT_RULES])
1225-
AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1])])
1231+
AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1])m4_newline
1232+
dnl We intentionally force a newline after the assignment, since a) nothing
1233+
dnl good can come of more text following, and b) that was the behavior
1234+
dnl before 1.17. See https://bugs.gnu.org/72267.
1235+
])
12261236

1227-
# Copyright (C) 2001-2024 Free Software Foundation, Inc.
1237+
# Copyright (C) 2001-2025 Free Software Foundation, Inc.
12281238
#
12291239
# This file is free software; the Free Software Foundation
12301240
# gives unlimited permission to copy and/or distribute it,
@@ -1252,7 +1262,7 @@ fi
12521262
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
12531263
AC_SUBST([INSTALL_STRIP_PROGRAM])])
12541264

1255-
# Copyright (C) 2006-2024 Free Software Foundation, Inc.
1265+
# Copyright (C) 2006-2025 Free Software Foundation, Inc.
12561266
#
12571267
# This file is free software; the Free Software Foundation
12581268
# gives unlimited permission to copy and/or distribute it,
@@ -1271,7 +1281,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
12711281

12721282
# Check how to create a tarball. -*- Autoconf -*-
12731283

1274-
# Copyright (C) 2004-2024 Free Software Foundation, Inc.
1284+
# Copyright (C) 2004-2025 Free Software Foundation, Inc.
12751285
#
12761286
# This file is free software; the Free Software Foundation
12771287
# gives unlimited permission to copy and/or distribute it,
@@ -1406,7 +1416,7 @@ AC_SUBST([am__tar])
14061416
AC_SUBST([am__untar])
14071417
]) # _AM_PROG_TAR
14081418

1409-
# Copyright (C) 2022-2024 Free Software Foundation, Inc.
1419+
# Copyright (C) 2022-2025 Free Software Foundation, Inc.
14101420
#
14111421
# This file is free software; the Free Software Foundation
14121422
# gives unlimited permission to copy and/or distribute it,

0 commit comments

Comments
 (0)