Re-bootstrap

Makefile.am

@@ -9,11 +9,11 @@ AM_CFLAGS        = $(libmesh_CFLAGS)
 AM_LDFLAGS       = $(libmesh_LDFLAGS)
 
 # We might have turned on -Werror and/or paranoid warnings
-CXXFLAGS_DBG += $(ANY_WERROR_FLAG) $(ANY_PARANOID_FLAGS)
-CXXFLAGS_DEVEL += $(ANY_WERROR_FLAG) $(ANY_PARANOID_FLAGS)
-CXXFLAGS_OPROF += $(ANY_WERROR_FLAG) $(ANY_PARANOID_FLAGS)
-CXXFLAGS_OPT += $(ANY_WERROR_FLAG) $(ANY_PARANOID_FLAGS)
-CXXFLAGS_PROF += $(ANY_WERROR_FLAG) $(ANY_PARANOID_FLAGS)
+CXXFLAGS_DBG += $(ACSM_ANY_WERROR_FLAG) $(ACSM_ANY_PARANOID_FLAGS)
+CXXFLAGS_DEVEL += $(ACSM_ANY_WERROR_FLAG) $(ACSM_ANY_PARANOID_FLAGS)
+CXXFLAGS_OPROF += $(ACSM_ANY_WERROR_FLAG) $(ACSM_ANY_PARANOID_FLAGS)
+CXXFLAGS_OPT += $(ACSM_ANY_WERROR_FLAG) $(ACSM_ANY_PARANOID_FLAGS)
+CXXFLAGS_PROF += $(ACSM_ANY_WERROR_FLAG) $(ACSM_ANY_PARANOID_FLAGS)
 
 # We need to set the no-undefined flag for linking
 # with libtool, because Windows requires all shared

Makefile.in

@@ -127,7 +127,10 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps =  \
 	$(top_srcdir)/m4/autoconf-submodule/acsm_code_coverage.m4 \
 	$(top_srcdir)/m4/autoconf-submodule/acsm_compiler_control_args.m4 \
+	$(top_srcdir)/m4/autoconf-submodule/acsm_compiler_flags.m4 \
 	$(top_srcdir)/m4/autoconf-submodule/acsm_cxx_compiler_standard.m4 \
+	$(top_srcdir)/m4/autoconf-submodule/acsm_enable_paranoid.m4 \
+	$(top_srcdir)/m4/autoconf-submodule/acsm_enable_werror.m4 \
 	$(top_srcdir)/m4/autoconf-submodule/acsm_mpi.m4 \
 	$(top_srcdir)/m4/autoconf-submodule/acsm_scrape_petsc_configure.m4 \
 	$(top_srcdir)/m4/autoconf-submodule/acsm_summarize_env.m4 \
@@ -6808,10 +6811,10 @@ am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
   | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
 distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
+ACSM_ANY_PARANOID_FLAGS = @ACSM_ANY_PARANOID_FLAGS@
+ACSM_ANY_WERROR_FLAG = @ACSM_ANY_WERROR_FLAG@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-ANY_PARANOID_FLAGS = @ANY_PARANOID_FLAGS@
-ANY_WERROR_FLAG = @ANY_WERROR_FLAG@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
@@ -6859,15 +6862,17 @@ CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 
 # We might have turned on -Werror and/or paranoid warnings
-CXXFLAGS_DBG = @CXXFLAGS_DBG@ $(ANY_WERROR_FLAG) $(ANY_PARANOID_FLAGS)
-CXXFLAGS_DEVEL = @CXXFLAGS_DEVEL@ $(ANY_WERROR_FLAG) \
-	$(ANY_PARANOID_FLAGS)
+CXXFLAGS_DBG = @CXXFLAGS_DBG@ $(ACSM_ANY_WERROR_FLAG) \
+	$(ACSM_ANY_PARANOID_FLAGS)
+CXXFLAGS_DEVEL = @CXXFLAGS_DEVEL@ $(ACSM_ANY_WERROR_FLAG) \
+	$(ACSM_ANY_PARANOID_FLAGS)
 CXXFLAGS_DVL = @CXXFLAGS_DVL@
-CXXFLAGS_OPROF = @CXXFLAGS_OPROF@ $(ANY_WERROR_FLAG) \
-	$(ANY_PARANOID_FLAGS)
-CXXFLAGS_OPT = @CXXFLAGS_OPT@ $(ANY_WERROR_FLAG) $(ANY_PARANOID_FLAGS)
-CXXFLAGS_PROF = @CXXFLAGS_PROF@ $(ANY_WERROR_FLAG) \
-	$(ANY_PARANOID_FLAGS)
+CXXFLAGS_OPROF = @CXXFLAGS_OPROF@ $(ACSM_ANY_WERROR_FLAG) \
+	$(ACSM_ANY_PARANOID_FLAGS)
+CXXFLAGS_OPT = @CXXFLAGS_OPT@ $(ACSM_ANY_WERROR_FLAG) \
+	$(ACSM_ANY_PARANOID_FLAGS)
+CXXFLAGS_PROF = @CXXFLAGS_PROF@ $(ACSM_ANY_WERROR_FLAG) \
+	$(ACSM_ANY_PARANOID_FLAGS)
 CXXSHAREDFLAG = @CXXSHAREDFLAG@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@

aclocal.m4

@@ -1171,7 +1171,10 @@ AC_SUBST([am__untar])
 
 m4_include([m4/autoconf-submodule/acsm_code_coverage.m4])
 m4_include([m4/autoconf-submodule/acsm_compiler_control_args.m4])
+m4_include([m4/autoconf-submodule/acsm_compiler_flags.m4])
 m4_include([m4/autoconf-submodule/acsm_cxx_compiler_standard.m4])
+m4_include([m4/autoconf-submodule/acsm_enable_paranoid.m4])
+m4_include([m4/autoconf-submodule/acsm_enable_werror.m4])
 m4_include([m4/autoconf-submodule/acsm_mpi.m4])
 m4_include([m4/autoconf-submodule/acsm_scrape_petsc_configure.m4])
 m4_include([m4/autoconf-submodule/acsm_summarize_env.m4])