Skip to content

Commit ee716b0

Browse files
t-tkt-tk
committed
Merge branch 'master' into build/work000 r75813 #158 
2 parents ebc5657 + a6247f8 commit ee716b0

File tree

230 files changed

+9151
-2813
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

230 files changed

+9151
-2813
lines changed

‎source/ChangeLog‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
2025-06-26 Karl Berry <[email protected]>
2+
3+
* automake 1.18.1.
4+
15
2025-04-30 Karl Berry <[email protected]>
26

37
* Build: incorporate original CFLAGS, CXXFLAGS, OBJCXXFLAGS values.

‎source/Makefile.in‎

Lines changed: 11 additions & 5 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,
@@ -751,6 +751,10 @@ dist-bzip2: distdir
751751
tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
752752
$(am__post_remove_distdir)
753753

754+
dist-bzip3: distdir
755+
tardir=$(distdir) && $(am__tar) | bzip3 -c >$(distdir).tar.bz3
756+
$(am__post_remove_distdir)
757+
754758
dist-lzip: distdir
755759
tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
756760
$(am__post_remove_distdir)
@@ -794,6 +798,8 @@ distcheck: dist
794798
eval GZIP= gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
795799
*.tar.bz2*) \
796800
bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
801+
*.tar.bz3*) \
802+
bzip3 -dc $(distdir).tar.bz3 | $(am__untar) ;;\
797803
*.tar.lz*) \
798804
lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
799805
*.tar.xz*) \
@@ -984,9 +990,9 @@ uninstall-am:
984990
.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am all-local \
985991
am--refresh check check-am clean clean-cscope clean-generic \
986992
clean-libtool cscope cscopelist-am ctags ctags-am dist \
987-
dist-all dist-bzip2 dist-gzip dist-hook dist-lzip dist-shar \
988-
dist-tarZ dist-xz dist-zip dist-zstd distcheck distclean \
989-
distclean-generic distclean-libtool distclean-tags \
993+
dist-all dist-bzip2 dist-bzip3 dist-gzip dist-hook dist-lzip \
994+
dist-shar dist-tarZ dist-xz dist-zip dist-zstd distcheck \
995+
distclean distclean-generic distclean-libtool distclean-tags \
990996
distcleancheck distdir distuninstallcheck dvi dvi-am html \
991997
html-am info info-am install install-am install-data \
992998
install-data-am install-dvi install-dvi-am install-exec \

‎source/aclocal.m4‎

Lines changed: 41 additions & 31 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,
@@ -462,7 +462,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
462462

463463
# Do all the work for Automake. -*- Autoconf -*-
464464

465-
# Copyright (C) 1996-2024 Free Software Foundation, Inc.
465+
# Copyright (C) 1996-2025 Free Software Foundation, Inc.
466466
#
467467
# This file is free software; the Free Software Foundation
468468
# gives unlimited permission to copy and/or distribute it,
@@ -562,8 +562,9 @@ AC_REQUIRE([AC_PROG_AWK])dnl
562562
AC_REQUIRE([AC_PROG_MAKE_SET])dnl
563563
AC_REQUIRE([AM_SET_LEADING_DOT])dnl
564564
_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
565-
[_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
566-
[_AM_PROG_TAR([v7])])])
565+
[_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
566+
[_AM_IF_OPTION([tar-v7], [_AM_PROG_TAR([v7])],
567+
[_AM_PROG_TAR([ustar])])])])
567568
_AM_IF_OPTION([no-dependencies],,
568569
[AC_PROVIDE_IFELSE([AC_PROG_CC],
569570
[_AM_DEPENDENCIES([CC])],
@@ -639,7 +640,7 @@ for _am_header in $config_headers :; do
639640
done
640641
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
641642

642-
# Copyright (C) 2001-2024 Free Software Foundation, Inc.
643+
# Copyright (C) 2001-2025 Free Software Foundation, Inc.
643644
#
644645
# This file is free software; the Free Software Foundation
645646
# gives unlimited permission to copy and/or distribute it,
@@ -660,7 +661,7 @@ if test x"${install_sh+set}" != xset; then
660661
fi
661662
AC_SUBST([install_sh])])
662663

663-
# Copyright (C) 2003-2024 Free Software Foundation, Inc.
664+
# Copyright (C) 2003-2025 Free Software Foundation, Inc.
664665
#
665666
# This file is free software; the Free Software Foundation
666667
# gives unlimited permission to copy and/or distribute it,
@@ -682,7 +683,7 @@ AC_SUBST([am__leading_dot])])
682683
# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
683684
# From Jim Meyering
684685

685-
# Copyright (C) 1996-2024 Free Software Foundation, Inc.
686+
# Copyright (C) 1996-2025 Free Software Foundation, Inc.
686687
#
687688
# This file is free software; the Free Software Foundation
688689
# gives unlimited permission to copy and/or distribute it,
@@ -717,7 +718,7 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
717718

718719
# Check to see how 'make' treats includes. -*- Autoconf -*-
719720

720-
# Copyright (C) 2001-2024 Free Software Foundation, Inc.
721+
# Copyright (C) 2001-2025 Free Software Foundation, Inc.
721722
#
722723
# This file is free software; the Free Software Foundation
723724
# gives unlimited permission to copy and/or distribute it,
@@ -760,7 +761,7 @@ AC_SUBST([am__quote])])
760761

761762
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
762763

763-
# Copyright (C) 1997-2024 Free Software Foundation, Inc.
764+
# Copyright (C) 1997-2025 Free Software Foundation, Inc.
764765
#
765766
# This file is free software; the Free Software Foundation
766767
# gives unlimited permission to copy and/or distribute it,
@@ -794,7 +795,7 @@ fi
794795

795796
# Helper functions for option handling. -*- Autoconf -*-
796797

797-
# Copyright (C) 2001-2024 Free Software Foundation, Inc.
798+
# Copyright (C) 2001-2025 Free Software Foundation, Inc.
798799
#
799800
# This file is free software; the Free Software Foundation
800801
# gives unlimited permission to copy and/or distribute it,
@@ -823,7 +824,7 @@ AC_DEFUN([_AM_SET_OPTIONS],
823824
AC_DEFUN([_AM_IF_OPTION],
824825
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
825826

826-
# Copyright (C) 1999-2024 Free Software Foundation, Inc.
827+
# Copyright (C) 1999-2025 Free Software Foundation, Inc.
827828
#
828829
# This file is free software; the Free Software Foundation
829830
# gives unlimited permission to copy and/or distribute it,
@@ -855,7 +856,10 @@ AC_CACHE_CHECK(
855856
break
856857
fi
857858
done
858-
rm -f core conftest*
859+
# aligned with autoconf, so not including core; see bug#72225.
860+
rm -f -r a.out a.exe b.out conftest.$ac_ext conftest.$ac_objext \
861+
conftest.dSYM conftest1.$ac_ext conftest1.$ac_objext conftest1.dSYM \
862+
conftest2.$ac_ext conftest2.$ac_objext conftest2.dSYM
859863
unset am_i])
860864
if test "$am_cv_prog_cc_c_o" != yes; then
861865
# Losing compiler, so override with the script.
@@ -870,7 +874,7 @@ AC_LANG_POP([C])])
870874
# For backward compatibility.
871875
AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
872876

873-
# Copyright (C) 2022-2024 Free Software Foundation, Inc.
877+
# Copyright (C) 2022-2025 Free Software Foundation, Inc.
874878
#
875879
# This file is free software; the Free Software Foundation
876880
# gives unlimited permission to copy and/or distribute it,
@@ -886,7 +890,7 @@ AS_IF([(rm -f && rm -fr && rm -rf) 2>/dev/null], [], [am__rm_f_notfound='""'])
886890
AC_SUBST(am__rm_f_notfound)
887891
])
888892

889-
# Copyright (C) 2001-2024 Free Software Foundation, Inc.
893+
# Copyright (C) 2001-2025 Free Software Foundation, Inc.
890894
#
891895
# This file is free software; the Free Software Foundation
892896
# gives unlimited permission to copy and/or distribute it,
@@ -905,7 +909,7 @@ AC_DEFUN([AM_RUN_LOG],
905909

906910
# Check to make sure that the build environment is sane. -*- Autoconf -*-
907911

908-
# Copyright (C) 1996-2024 Free Software Foundation, Inc.
912+
# Copyright (C) 1996-2025 Free Software Foundation, Inc.
909913
#
910914
# This file is free software; the Free Software Foundation
911915
# gives unlimited permission to copy and/or distribute it,
@@ -1074,10 +1078,12 @@ am_lf='
10741078
'
10751079
case `pwd` in
10761080
*[[\\\"\#\$\&\'\`$am_lf]]*)
1081+
AC_MSG_RESULT([no])
10771082
AC_MSG_ERROR([unsafe absolute working directory name]);;
10781083
esac
10791084
case $srcdir in
10801085
*[[\\\"\#\$\&\'\`$am_lf\ \ ]]*)
1086+
AC_MSG_RESULT([no])
10811087
AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);;
10821088
esac
10831089
@@ -1130,7 +1136,7 @@ AC_CONFIG_COMMANDS_PRE(
11301136
rm -f conftest.file
11311137
])
11321138

1133-
# Copyright (C) 2009-2024 Free Software Foundation, Inc.
1139+
# Copyright (C) 2009-2025 Free Software Foundation, Inc.
11341140
#
11351141
# This file is free software; the Free Software Foundation
11361142
# gives unlimited permission to copy and/or distribute it,
@@ -1199,9 +1205,13 @@ fi
11991205
# empty being verbose).
12001206
AC_DEFUN([AM_SILENT_RULES],
12011207
[AC_REQUIRE([_AM_SILENT_RULES])
1202-
AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1])])
1208+
AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1])m4_newline
1209+
dnl We intentionally force a newline after the assignment, since a) nothing
1210+
dnl good can come of more text following, and b) that was the behavior
1211+
dnl before 1.17. See https://bugs.gnu.org/72267.
1212+
])
12031213

1204-
# Copyright (C) 2001-2024 Free Software Foundation, Inc.
1214+
# Copyright (C) 2001-2025 Free Software Foundation, Inc.
12051215
#
12061216
# This file is free software; the Free Software Foundation
12071217
# gives unlimited permission to copy and/or distribute it,
@@ -1229,7 +1239,7 @@ fi
12291239
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
12301240
AC_SUBST([INSTALL_STRIP_PROGRAM])])
12311241

1232-
# Copyright (C) 2006-2024 Free Software Foundation, Inc.
1242+
# Copyright (C) 2006-2025 Free Software Foundation, Inc.
12331243
#
12341244
# This file is free software; the Free Software Foundation
12351245
# gives unlimited permission to copy and/or distribute it,
@@ -1248,7 +1258,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
12481258

12491259
# Check how to create a tarball. -*- Autoconf -*-
12501260

1251-
# Copyright (C) 2004-2024 Free Software Foundation, Inc.
1261+
# Copyright (C) 2004-2025 Free Software Foundation, Inc.
12521262
#
12531263
# This file is free software; the Free Software Foundation
12541264
# gives unlimited permission to copy and/or distribute it,
@@ -1383,7 +1393,7 @@ AC_SUBST([am__tar])
13831393
AC_SUBST([am__untar])
13841394
]) # _AM_PROG_TAR
13851395

1386-
# Copyright (C) 2022-2024 Free Software Foundation, Inc.
1396+
# Copyright (C) 2022-2025 Free Software Foundation, Inc.
13871397
#
13881398
# This file is free software; the Free Software Foundation
13891399
# gives unlimited permission to copy and/or distribute it,

‎source/auxdir/auxsub/Makefile.in‎

Lines changed: 21 additions & 14 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,
@@ -271,6 +271,7 @@ ctags CTAGS:
271271

272272
cscope cscopelist:
273273

274+
274275
distdir: $(BUILT_SOURCES)
275276
$(MAKE) $(AM_MAKEFLAGS) distdir-am
276277

@@ -321,6 +322,10 @@ dist-bzip2: distdir
321322
tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
322323
$(am__post_remove_distdir)
323324

325+
dist-bzip3: distdir
326+
tardir=$(distdir) && $(am__tar) | bzip3 -c >$(distdir).tar.bz3
327+
$(am__post_remove_distdir)
328+
324329
dist-lzip: distdir
325330
tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
326331
$(am__post_remove_distdir)
@@ -365,6 +370,8 @@ distcheck: dist
365370
eval GZIP= gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
366371
*.tar.bz2*) \
367372
bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
373+
*.tar.bz3*) \
374+
bzip3 -dc $(distdir).tar.bz3 | $(am__untar) ;;\
368375
*.tar.lz*) \
369376
lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
370377
*.tar.xz*) \
@@ -550,18 +557,18 @@ uninstall-am:
550557
.MAKE: install-am install-strip
551558

552559
.PHONY: all all-am am--refresh check check-am clean clean-generic \
553-
cscopelist-am ctags-am dist dist-all dist-bzip2 dist-gzip \
554-
dist-lzip dist-shar dist-tarZ dist-xz dist-zip dist-zstd \
555-
distcheck distclean distclean-generic distcleancheck distdir \
556-
distuninstallcheck dvi dvi-am html html-am info info-am \
557-
install install-am install-data install-data-am install-dvi \
558-
install-dvi-am install-exec install-exec-am install-html \
559-
install-html-am install-info install-info-am install-man \
560-
install-pdf install-pdf-am install-ps install-ps-am \
561-
install-strip installcheck installcheck-am installdirs \
562-
maintainer-clean maintainer-clean-generic mostlyclean \
563-
mostlyclean-generic pdf pdf-am ps ps-am tags-am uninstall \
564-
uninstall-am
560+
cscopelist-am ctags-am dist dist-all dist-bzip2 dist-bzip3 \
561+
dist-gzip dist-lzip dist-shar dist-tarZ dist-xz dist-zip \
562+
dist-zstd distcheck distclean distclean-generic distcleancheck \
563+
distdir distuninstallcheck dvi dvi-am html html-am info \
564+
info-am install install-am install-data install-data-am \
565+
install-dvi install-dvi-am install-exec install-exec-am \
566+
install-html install-html-am install-info install-info-am \
567+
install-man install-pdf install-pdf-am install-ps \
568+
install-ps-am install-strip installcheck installcheck-am \
569+
installdirs maintainer-clean maintainer-clean-generic \
570+
mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags-am \
571+
uninstall uninstall-am
565572

566573
.PRECIOUS: Makefile
567574

0 commit comments

Comments
 (0)