Run bootstrap.

Refs #2029.

Author: jwpeterson

Makefile.in

@@ -6835,7 +6835,8 @@ EXTRA_DIST = reference_elements \
              contrib/tecplot/README \
              contrib/bin/strip_dup_incl_paths.pl \
              contrib/bin/strip_dup_libs.pl \
-             CITATION
+             CITATION \
+             contrib/metaphysicl/README
 
 nobase_data_DATA = \
         reference_elements/2D/one_quad.xda \
@@ -35818,6 +35819,16 @@ uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \
 .PRECIOUS: Makefile
 
 
+# If the metaphysicl submodule has not been initialized, throw an
+# error during "make dist". We need the submodule to be properly
+# initalized so that the sources can be copied into the distribution,
+# and trying to do it "on the fly" is too complicated.
+contrib/metaphysicl/README:
+	@echo ""
+	@echo "Error: You must run git submodule update --init contrib/metaphysicl first"
+	@echo ""
+	@exit 1
+
 # This rule extends the built-in make install rule, and can
 # be used to:
 #  when doing 'make install prefix=/other/path', update generated files

configure

@@ -38549,17 +38549,48 @@ fi
 
       if test "x$enableparmetis" = "xyes"; then :
 
-                              if test "x$build_metis" = "xyes"; then :
 
-                  PARMETIS_INCLUDE="-I\$(top_srcdir)/contrib/parmetis/include"
-                  PARMETIS_LIB="\$(EXTERNAL_LIBDIR)/libparmetis\$(libext)"
+                    if test "x$build_metis" = "xno" && test $petsc_have_parmetis -gt 0; then :
+
+
+$as_echo "#define HAVE_PARMETIS 1" >>confdefs.h
+
+                  { $as_echo "$as_me:${as_lineno-$LINENO}: result: <<< Configuring library with PETSc Parmetis support >>>" >&5
+$as_echo "<<< Configuring library with PETSc Parmetis support >>>" >&6; }
+
+fi
+
+                                        if test "x$build_metis" = "xno" && test $petsc_have_parmetis -eq 0; then :
+
+                  PARMETIS_INCLUDE=""
+                  PARMETIS_LIB=""
+                  enableparmetis=no
+                  { $as_echo "$as_me:${as_lineno-$LINENO}: result: <<< PETSc has METIS but no ParMETIS, configuring library without Parmetis support >>>" >&5
+$as_echo "<<< PETSc has METIS but no ParMETIS, configuring library without Parmetis support >>>" >&6; }
 
 fi
 
+                                                  if test "x$build_metis" = "xyes" && test $petsc_have_parmetis -gt 0; then :
+
+                  PARMETIS_INCLUDE=""
+                  PARMETIS_LIB=""
+                  enableparmetis=no
+                  { $as_echo "$as_me:${as_lineno-$LINENO}: result: <<< PETSc has no METIS but it does have ParMETIS, configuring library without Parmetis support >>>" >&5
+$as_echo "<<< PETSc has no METIS but it does have ParMETIS, configuring library without Parmetis support >>>" >&6; }
+
+fi
+
+                    if test "x$build_metis" = "xyes" && test $petsc_have_parmetis -eq 0; then :
+
+                  PARMETIS_INCLUDE="-I\$(top_srcdir)/contrib/parmetis/include"
+                  PARMETIS_LIB="\$(EXTERNAL_LIBDIR)/libparmetis\$(libext)"
+
 $as_echo "#define HAVE_PARMETIS 1" >>confdefs.h
 
-          { $as_echo "$as_me:${as_lineno-$LINENO}: result: <<< Configuring library with Parmetis support >>>" >&5
-$as_echo "<<< Configuring library with Parmetis support >>>" >&6; }
+                  { $as_echo "$as_me:${as_lineno-$LINENO}: result: <<< Configuring library with internal Parmetis support >>>" >&5
+$as_echo "<<< Configuring library with internal Parmetis support >>>" >&6; }
+
+fi
 
 else
 

tests/Makefile.in

@@ -1607,7 +1607,7 @@ unit_tests_sources = driver.C test_comm.h stream_redirector.h \
 @LIBMESH_ENABLE_CPPUNIT_TRUE@@LIBMESH_OPT_MODE_TRUE@unit_tests_opt_LDADD = $(top_builddir)/libmesh_opt.la
 @LIBMESH_ENABLE_CPPUNIT_TRUE@TESTS = run_unit_tests.sh
 CLEANFILES = cube_mesh.xda slit_mesh.xda slit_solution.xda out.e \
-	mesh_with_soln.e $(am__append_12)
+	mesh_with_soln.e elemental_from_nodal.e $(am__append_12)
 all: all-am
 
 .SUFFIXES: