[cig-commits] [commit] baagaard/maint-1.9.0: Revert PETSc settings after merge for v1.9.0. (e221e6f)

[cig_noreply at geodynamics.org]

Repository : ssh://geoshell/pylith_installer

On branch  : baagaard/maint-1.9.0
Link       : https://github.com/geodynamics/pylith_installer/compare/ef1bd09fad7a461e6ee8adc51b01702500c12fff...e221e6f9f402eca0b07570b810ee33b06ba33b68

>---------------------------------------------------------------

commit e221e6f9f402eca0b07570b810ee33b06ba33b68
Author: Brad Aagaard <baagaard at usgs.gov>
Date:   Mon May 5 15:23:19 2014 -0700

    Revert PETSc settings after merge for v1.9.0.


>---------------------------------------------------------------

e221e6f9f402eca0b07570b810ee33b06ba33b68
 Makefile.am  | 4 +++-
 configure.ac | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index d94d35b..c620f87 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -715,10 +715,12 @@ endif
 	cd petsc-pylith && \
 		./configure --prefix=$(prefix) \
 			--with-c2html=0 --with-x=0 \
-			--with-clanguage=C \
+			--with-clanguage=C++ \
 			--with-mpicompilers=1 \
 			--with-debugging=0 \
 			--with-shared-libraries=1 \
+			--with-sieve=1 \
+			--download-boost=1 \
 			$(petsc_options) $(env_flags) \
 			PETSC_DIR=$(abs_builddir) PETSC_ARCH=$(PETSC_ARCH) ; \
 		make $(petsc_build_options) PETSC_DIR=$(abs_builddir) PETSC_ARCH=$(PETSC_ARCH) && \
diff --git a/configure.ac b/configure.ac
index ea81afb..9f22166 100644
--- a/configure.ac
+++ b/configure.ac
@@ -283,7 +283,7 @@ AC_ARG_WITH([petsc-options],
     [AC_HELP_STRING([--with-petsc-options],
         [set optional PETSc configure options @<:@default=--download-chaco=1 --download-ml=1 --download-f-blas-lapack=1@:>@])],
 	[petsc_options=$withval],
-	[petsc_options="--download-chaco=1 --download-ml=1 --download-fblaslapack=1"])
+	[petsc_options="--download-chaco=1 --download-ml=1  --download-f-blas-lapack=1"])
 AC_SUBST(petsc_options)
 
 # pylith git