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

[brad at geodynamics.org]

Author: brad
Date: 2008-01-07 14:58:05 -0800 (Mon, 07 Jan 2008)
New Revision: 8989

Modified:
   cs/autoconf/trunk/cit_petsc.m4
Log:
Updated location and name of of PETSc variables file to account for changes in layout of configuration files in PETSc dev.

Modified: cs/autoconf/trunk/cit_petsc.m4
===================================================================
--- cs/autoconf/trunk/cit_petsc.m4	2008-01-07 19:50:02 UTC (rev 8988)
+++ cs/autoconf/trunk/cit_petsc.m4	2008-01-07 22:58:05 UTC (rev 8989)
@@ -62,7 +62,17 @@
 AC_MSG_RESULT([$PETSC_ARCH])
 
 AC_MSG_CHECKING([for PETSc config])
-if test -d "$PETSC_DIR/$PETSC_ARCH"; then
+if test -d "$PETSC_DIR/$PETSC_ARCH/conf"; then
+  if test -f "$PETSC_DIR/$PETSC_ARCH/conf/petscvariables"; then
+    cit_petsc_petscconf="$PETSC_DIR/$PETSC_ARCH/conf/petscvariables"
+  elif test -f "$PETSC_DIR/$PETSC_ARCH/conf/petscconf"; then
+    cit_petsc_petscconf="$PETSC_DIR/$PETSC_ARCH/conf/petscconf"
+  else 
+    AC_MSG_RESULT(no)
+    m4_default([$3], [AC_MSG_ERROR([Could not find file with PETSc configuration settings; check PETSC_ARCH/conf])])
+  fi
+  cit_petsc_variables="$PETSC_DIR/conf/variables"
+elif test -d "$PETSC_DIR/$PETSC_ARCH"; then
     # new config layout
     cit_petsc_petscconf="$PETSC_DIR/$PETSC_ARCH/conf/petscconf"
     cit_petsc_variables="$PETSC_DIR/conf/variables"