Skip to content

Commit 5bb5948

Browse files
committed
regenerate with new autotools versions
1 parent 7d667c6 commit 5bb5948

18 files changed

+7416
-4710
lines changed

ChangeLog.md

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ More detailed information about incremental changes can be found in the
1717
(POSIX systems) or SIGINT/SIGTERM/SIGABRT (Windows systems).
1818
- New option `mumps_mpi_communicator` to specify the MPI communicator when using
1919
an MPI-enabled build of MUMPS [#790, by Alex Tyler Chapman].
20+
- Updated build system to current autotools versions.
2021

2122
### 3.14.16 (2024-04-22)
2223

Makefile.in

+25-15
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
# Makefile.in generated by automake 1.16.5 from Makefile.am.
1+
# Makefile.in generated by automake 1.17 from Makefile.am.
22
# @configure_input@
33

4-
# Copyright (C) 1994-2021 Free Software Foundation, Inc.
4+
# Copyright (C) 1994-2024 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,
@@ -76,6 +76,8 @@ am__make_running_with_option = \
7676
test $$has_opt = yes
7777
am__make_dryrun = (target_option=n; $(am__make_running_with_option))
7878
am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
79+
am__rm_f = rm -f $(am__rm_f_notfound)
80+
am__rm_rf = rm -rf $(am__rm_f_notfound)
7981
pkgdatadir = $(datadir)/@PACKAGE@
8082
pkgincludedir = $(includedir)/@PACKAGE@
8183
pkglibdir = $(libdir)/@PACKAGE@
@@ -248,10 +250,9 @@ am__base_list = \
248250
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
249251
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
250252
am__uninstall_files_from_dir = { \
251-
test -z "$$files" \
252-
|| { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
253-
|| { echo " ( cd '$$dir' && rm -f" $$files ")"; \
254-
$(am__cd) "$$dir" && rm -f $$files; }; \
253+
{ test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
254+
|| { echo " ( cd '$$dir' && rm -f" $$files ")"; \
255+
$(am__cd) "$$dir" && echo $$files | $(am__xargs_n) 40 $(am__rm_f); }; \
255256
}
256257
am__installdirs = "$(DESTDIR)$(docdir)"
257258
DATA = $(doc_DATA)
@@ -407,8 +408,10 @@ ac_ct_PKG_CONFIG = @ac_ct_PKG_CONFIG@
407408
am__include = @am__include@
408409
am__leading_dot = @am__leading_dot@
409410
am__quote = @am__quote@
411+
am__rm_f_notfound = @am__rm_f_notfound@
410412
am__tar = @am__tar@
411413
am__untar = @am__untar@
414+
am__xargs_n = @am__xargs_n@
412415
bindir = @bindir@
413416
build = @build@
414417
build_alias = @build_alias@
@@ -500,20 +503,20 @@ src/Common/config.h: src/Common/stamp-h1
500503
@test -f $@ || $(MAKE) $(AM_MAKEFLAGS) src/Common/stamp-h1
501504

502505
src/Common/stamp-h1: $(top_srcdir)/src/Common/config.h.in $(top_builddir)/config.status
503-
@rm -f src/Common/stamp-h1
504-
cd $(top_builddir) && $(SHELL) ./config.status src/Common/config.h
506+
$(AM_V_at)rm -f src/Common/stamp-h1
507+
$(AM_V_GEN)cd $(top_builddir) && $(SHELL) ./config.status src/Common/config.h
505508
$(top_srcdir)/src/Common/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
506-
($(am__cd) $(top_srcdir) && $(AUTOHEADER))
507-
rm -f src/Common/stamp-h1
508-
touch $@
509+
$(AM_V_GEN)($(am__cd) $(top_srcdir) && $(AUTOHEADER))
510+
$(AM_V_at)rm -f src/Common/stamp-h1
511+
$(AM_V_at)touch $@
509512

510513
src/Common/config_ipopt.h: src/Common/stamp-h2
511514
@test -f $@ || rm -f src/Common/stamp-h2
512515
@test -f $@ || $(MAKE) $(AM_MAKEFLAGS) src/Common/stamp-h2
513516

514517
src/Common/stamp-h2: $(top_srcdir)/src/Common/config_ipopt.h.in $(top_builddir)/config.status
515-
@rm -f src/Common/stamp-h2
516-
cd $(top_builddir) && $(SHELL) ./config.status src/Common/config_ipopt.h
518+
$(AM_V_at)rm -f src/Common/stamp-h2
519+
$(AM_V_GEN)cd $(top_builddir) && $(SHELL) ./config.status src/Common/config_ipopt.h
517520

518521
distclean-hdr:
519522
-rm -f src/Common/config.h src/Common/stamp-h1 src/Common/config_ipopt.h src/Common/stamp-h2
@@ -747,8 +750,8 @@ mostlyclean-generic:
747750
clean-generic:
748751

749752
distclean-generic:
750-
-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
751-
-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
753+
-$(am__rm_f) $(CONFIG_CLEAN_FILES)
754+
-test . = "$(srcdir)" || $(am__rm_f) $(CONFIG_CLEAN_VPATH_FILES)
752755

753756
maintainer-clean-generic:
754757
@echo "This command is intended for maintainers to use"
@@ -880,3 +883,10 @@ cppcheck-config:
880883
# Tell versions [3.59,3.63) of GNU make to not export all variables.
881884
# Otherwise a system limit (for SysV at least) may be exceeded.
882885
.NOEXPORT:
886+
887+
# Tell GNU make to disable its built-in pattern rules.
888+
%:: %,v
889+
%:: RCS/%,v
890+
%:: RCS/%
891+
%:: s.%
892+
%:: SCCS/s.%

ar-lib

+11-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
# Wrapper for Microsoft lib.exe
33

44
me=ar-lib
5-
scriptversion=2019-07-04.01; # UTC
5+
scriptversion=2024-06-19.01; # UTC
66

7-
# Copyright (C) 2010-2021 Free Software Foundation, Inc.
7+
# Copyright (C) 2010-2024 Free Software Foundation, Inc.
88
# Written by Peter Rosin <[email protected]>.
99
#
1010
# This program is free software; you can redistribute it and/or modify
@@ -105,11 +105,15 @@ case $1 in
105105
Usage: $me [--help] [--version] PROGRAM ACTION ARCHIVE [MEMBER...]
106106
107107
Members may be specified in a file named with @FILE.
108+
109+
Report bugs to <[email protected]>.
110+
GNU Automake home page: <https://www.gnu.org/software/automake/>.
111+
General help using GNU software: <https://www.gnu.org/gethelp/>.
108112
EOF
109113
exit $?
110114
;;
111115
-v | --v*)
112-
echo "$me, version $scriptversion"
116+
echo "$me (GNU Automake) $scriptversion"
113117
exit $?
114118
;;
115119
esac
@@ -135,6 +139,10 @@ do
135139
AR="$AR $1"
136140
shift
137141
;;
142+
-nologo | -NOLOGO)
143+
# We always invoke AR with -nologo, so don't need to add it again.
144+
shift
145+
;;
138146
*)
139147
action=$1
140148
shift

compile

+7-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#! /bin/sh
22
# Wrapper for compilers which do not understand '-c -o'.
33

4-
scriptversion=2018-03-07.03; # UTC
4+
scriptversion=2024-06-19.01; # UTC
55

6-
# Copyright (C) 1999-2021 Free Software Foundation, Inc.
6+
# Copyright (C) 1999-2024 Free Software Foundation, Inc.
77
# Written by Tom Tromey <[email protected]>.
88
#
99
# This program is free software; you can redistribute it and/or modify
@@ -146,7 +146,7 @@ func_cl_wrapper ()
146146
# configure might choose to run compile as 'compile cc -o foo foo.c'.
147147
eat=1
148148
case $2 in
149-
*.o | *.[oO][bB][jJ])
149+
*.o | *.lo | *.[oO][bB][jJ])
150150
func_file_conv "$2"
151151
set x "$@" -Fo"$file"
152152
shift
@@ -283,14 +283,17 @@ If you are trying to build a whole package this is not the
283283
right script to run: please start by reading the file 'INSTALL'.
284284
285285
Report bugs to <[email protected]>.
286+
GNU Automake home page: <https://www.gnu.org/software/automake/>.
287+
General help using GNU software: <https://www.gnu.org/gethelp/>.
286288
EOF
287289
exit $?
288290
;;
289291
-v | --v*)
290-
echo "compile $scriptversion"
292+
echo "compile (GNU Automake) $scriptversion"
291293
exit $?
292294
;;
293295
cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
296+
clang-cl | *[/\\]clang-cl | clang-cl.exe | *[/\\]clang-cl.exe | \
294297
icl | *[/\\]icl | icl.exe | *[/\\]icl.exe | \
295298
ifort | *[/\\]ifort | ifort.exe | *[/\\]ifort.exe )
296299
func_cl_wrapper "$@" # Doesn't return...

0 commit comments

Comments
 (0)