[cig-commits] [commit] rajesh-petsc-schur: Fixes to Autoconf to correctly handle PETSc (a086571)

[cig_noreply at geodynamics.org]

Repository : https://github.com/geodynamics/citcoms

On branch  : rajesh-petsc-schur
Link       : https://github.com/geodynamics/citcoms/compare/464e1b32299b15819f93efd98d969cddb84dfe51...f97ae655a50bdbd6dac1923a3471ee4dae178fbd

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

commit a0865714e03aabeff8560646e71019e456705463
Author: Eric Heien <emheien at ucdavis.edu>
Date:   Tue Oct 14 17:43:54 2014 -0700

    Fixes to Autoconf to correctly handle PETSc


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

a0865714e03aabeff8560646e71019e456705463
 bin/Makefile.am | 4 ++--
 configure.ac    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/bin/Makefile.am b/bin/Makefile.am
index 4a76f37..6ef673e 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -37,9 +37,9 @@ bin_SCRIPTS =
 
 ######## C drivers ########
 CitcomSFull_SOURCES = Citcom.c CitcomSFull.c
-CitcomSFull_LDADD = $(libCitcomS)
+CitcomSFull_LDADD = $(libCitcomS) $(PETSC_LIB)
 CitcomSRegional_SOURCES = Citcom.c CitcomSRegional.c
-CitcomSRegional_LDADD = $(libCitcomS)
+CitcomSRegional_LDADD = $(libCitcomS) $(PETSC_LIB)
 
 libCitcomS = $(top_builddir)/lib/libCitcomS.a
 
diff --git a/configure.ac b/configure.ac
index 6ddcfd8..0946cac 100644
--- a/configure.ac
+++ b/configure.ac
@@ -63,7 +63,7 @@ AC_PROG_CXX([mpicxx mpic++ mpiCC hcp mpCC mpxlC mpxlC_r cmpic++ g++ c++ gpp aCC
 AC_CHECK_HEADERS([malloc.h])
 
 if test "$want_petsc" = yes; then
-  CIT_PATH_PETSC(3.5.2,[CPPFLAGS="-DUSE_PETSC $CPPFLAGS"],[AC_MSG_ERROR([PETSc 3.5.1 library not found])])
+  CIT_PATH_PETSC(3.5.2,[CPPFLAGS="-DUSE_PETSC $PETSC_CC_INCLUDES $CPPFLAGS"],[AC_MSG_ERROR([PETSc 3.5.2 library not found])])
   CIT_HEADER_PETSC
   CIT_CHECK_LIB_PETSC
 fi