[cig-commits] r18003 - cs/autoconf/trunk

[brad at geodynamics.org]

Author: brad
Date: 2011-03-01 18:27:31 -0800 (Tue, 01 Mar 2011)
New Revision: 18003

Modified:
   cs/autoconf/trunk/cit_petsc.m4
Log:
Added case for installed PETSc.

Modified: cs/autoconf/trunk/cit_petsc.m4
===================================================================
--- cs/autoconf/trunk/cit_petsc.m4	2011-03-02 00:01:55 UTC (rev 18002)
+++ cs/autoconf/trunk/cit_petsc.m4	2011-03-02 02:27:31 UTC (rev 18003)
@@ -71,6 +71,14 @@
     AC_MSG_RESULT(no)
     m4_default([$3], [AC_MSG_ERROR([Could not find file with PETSc configuration settings; check PETSC_ARCH/conf])])
   fi
+  # installed PETSc
+elif test -d "$PETSC_DIR/conf"; then
+  if test -f "$PETSC_DIR/conf/petscvariables"; then
+    cit_petsc_petscconf="$PETSC_DIR/conf/petscvariables"
+  else
+    AC_MSG_RESULT(no)
+    m4_default([$3], [AC_MSG_ERROR([Could not find file with PETSc configuration settings; check PETSC_DIR/conf])])
+  fi
   # Using conf/variables *should* be obsolete for new config.
   #cit_petsc_variables="$PETSC_DIR/conf/variables"
 elif test -d "$PESC_DIR/bmake/$PETSC_ARCH"; then