[cig-commits] r21123 - short/3D/PyLith/pylith_installer/trunk

[brad at geodynamics.org]

Author: brad
Date: 2012-12-10 16:47:06 -0800 (Mon, 10 Dec 2012)
New Revision: 21123

Modified:
   short/3D/PyLith/pylith_installer/trunk/Makefile.am
   short/3D/PyLith/pylith_installer/trunk/configure.ac
Log:
Set PETSc variables.

Modified: short/3D/PyLith/pylith_installer/trunk/Makefile.am
===================================================================
--- short/3D/PyLith/pylith_installer/trunk/Makefile.am	2012-12-10 23:25:32 UTC (rev 21122)
+++ short/3D/PyLith/pylith_installer/trunk/Makefile.am	2012-12-11 00:47:06 UTC (rev 21123)
@@ -715,8 +715,8 @@
 			--with-sieve=1 \
 			--download-boost=1 \
 			$(petsc_options) $(env_flags) \
-			PETSC_DIR=$(abs_builddir) ; \
-		make -j $(make_threads) PETSC_DIR=$(abs_builddir) && \
+			PETSC_DIR=$(abs_builddir) PETSC_ARCH=$(PETSC_ARCH) ; \
+		make -j$(make_threads) -C $(PETSC_ARCH) PETSC_DIR=$(abs_builddir) PETSC_ARCH=$(PETSC_ARCH) && \
 		make PETSC_DIR=$(abs_builddir) install && \
 		make PETSC_DIR=$(abs_builddir) test && \
 		touch ../installed_petsc

Modified: short/3D/PyLith/pylith_installer/trunk/configure.ac
===================================================================
--- short/3D/PyLith/pylith_installer/trunk/configure.ac	2012-12-10 23:25:32 UTC (rev 21122)
+++ short/3D/PyLith/pylith_installer/trunk/configure.ac	2012-12-11 00:47:06 UTC (rev 21123)
@@ -584,12 +584,14 @@
   fi
   AC_SUBST(existing_petsc)
 
+  AC_ARG_VAR(PETSC_DIR, [location of PETSc installation])
+  AC_ARG_VAR(PETSC_ARCH, [PETSc configuration])
   PETSC_DIR=$prefix
   AC_SUBST(PETSC_DIR)
   PETSC_ARCH=pylith_petsc_opt
   AC_SUBST(PETSC_ARCH)
 else
-  CIT_PATH_PETSC([3.1.0])
+  CIT_PATH_PETSC([3.3.0])
   CIT_HEADER_PETSC
   CIT_CHECK_LIB_PETSC
   CIT_CHECK_LIB_PETSC_SIEVE