Skip to content

Commit 8650e37

Browse files
authored
Merge pull request #4057 from jwpeterson/autoconf_submodule_update
Update autoconf submodule
2 parents 710a611 + ed1d7f6 commit 8650e37

5 files changed

Lines changed: 24 additions & 14 deletions

File tree

configure

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26533,15 +26533,24 @@ else $as_nop
2653326533

2653426534
ACSM_PROFILING_FLAGS=""
2653526535
ACSM_CXXFLAGS_DBG="$ACSM_CXXFLAGS_DBG -O0 -g"
26536-
ACSM_CXXFLAGS_OPT="$ACSM_CXXFLAGS_OPT -O3 -w0"
26536+
ACSM_CXXFLAGS_OPT="$ACSM_CXXFLAGS_OPT -O3"
2653726537
ACSM_CXXFLAGS_DEVEL="$ACSM_CXXFLAGS_DEVEL -O2 -g"
2653826538
ACSM_CFLAGS_DBG="$ACSM_CFLAGS_DBG -O0 -g"
26539-
ACSM_CFLAGS_OPT="$ACSM_CFLAGS_OPT -O3 -w0"
26539+
ACSM_CFLAGS_OPT="$ACSM_CFLAGS_OPT -O3"
2654026540
ACSM_CFLAGS_DEVEL="$ACSM_CFLAGS_DEVEL -O2 -g"
2654126541
;; #(
2654226542
*) :
2654326543
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Unknown Intel compiler \"$ACSM_GXX_VERSION\"" >&5
2654426544
printf "%s\n" "Unknown Intel compiler \"$ACSM_GXX_VERSION\"" >&6; } ;;
26545+
esac
26546+
case "$ACSM_GXX_VERSION" in #(
26547+
intel_icx_v21.x | intel_icx_v22.x | intel_icx_v23.x) :
26548+
;; #(
26549+
*) :
26550+
26551+
CXXFLAGS="$CXXFLAGS -Werror=recommended-option"
26552+
CFLAGS="$CFLAGS -Werror=recommended-option"
26553+
;;
2654526554
esac
2654626555
;; #(
2654726556
nvidia) :

contrib/metaphysicl

examples/miscellaneous/miscellaneous_ex17/Makefile.in

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ am__aclocal_m4_deps = \
106106
$(top_srcdir)/m4/autoconf-submodule/acsm_enable_paranoid.m4 \
107107
$(top_srcdir)/m4/autoconf-submodule/acsm_enable_werror.m4 \
108108
$(top_srcdir)/m4/autoconf-submodule/acsm_mpi.m4 \
109+
$(top_srcdir)/m4/autoconf-submodule/acsm_precision.m4 \
109110
$(top_srcdir)/m4/autoconf-submodule/acsm_scrape_petsc_configure.m4 \
110111
$(top_srcdir)/m4/autoconf-submodule/acsm_summarize_env.m4 \
111112
$(top_srcdir)/m4/autoconf-submodule/acsm_test_sanitize_flags.m4 \
@@ -147,15 +148,15 @@ am__aclocal_m4_deps = \
147148
$(top_srcdir)/m4/nemesis.m4 $(top_srcdir)/m4/netcdf.m4 \
148149
$(top_srcdir)/m4/netgen.m4 $(top_srcdir)/m4/nlopt.m4 \
149150
$(top_srcdir)/m4/parmetis.m4 $(top_srcdir)/m4/petsc.m4 \
150-
$(top_srcdir)/m4/poly2tri.m4 $(top_srcdir)/m4/precision.m4 \
151-
$(top_srcdir)/m4/qhull.m4 $(top_srcdir)/m4/sfc.m4 \
152-
$(top_srcdir)/m4/slepc.m4 $(top_srcdir)/m4/sstream.m4 \
153-
$(top_srcdir)/m4/strstream.m4 $(top_srcdir)/m4/tbb.m4 \
154-
$(top_srcdir)/m4/tecio.m4 $(top_srcdir)/m4/tecplot.m4 \
155-
$(top_srcdir)/m4/tetgen.m4 $(top_srcdir)/m4/threads.m4 \
156-
$(top_srcdir)/m4/triangle.m4 $(top_srcdir)/m4/trilinos.m4 \
157-
$(top_srcdir)/m4/unordered.m4 $(top_srcdir)/m4/vtk.m4 \
158-
$(top_srcdir)/m4/xdr.m4 $(top_srcdir)/configure.ac
151+
$(top_srcdir)/m4/poly2tri.m4 $(top_srcdir)/m4/qhull.m4 \
152+
$(top_srcdir)/m4/sfc.m4 $(top_srcdir)/m4/slepc.m4 \
153+
$(top_srcdir)/m4/sstream.m4 $(top_srcdir)/m4/strstream.m4 \
154+
$(top_srcdir)/m4/tbb.m4 $(top_srcdir)/m4/tecio.m4 \
155+
$(top_srcdir)/m4/tecplot.m4 $(top_srcdir)/m4/tetgen.m4 \
156+
$(top_srcdir)/m4/threads.m4 $(top_srcdir)/m4/triangle.m4 \
157+
$(top_srcdir)/m4/trilinos.m4 $(top_srcdir)/m4/unordered.m4 \
158+
$(top_srcdir)/m4/vtk.m4 $(top_srcdir)/m4/xdr.m4 \
159+
$(top_srcdir)/configure.ac
159160
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
160161
$(ACLOCAL_M4)
161162
DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)

m4/autoconf-submodule

0 commit comments

Comments
 (0)