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

[brad at geodynamics.org]

Author: brad
Date: 2011-05-04 19:52:23 -0700 (Wed, 04 May 2011)
New Revision: 18318

Modified:
   short/3D/PyLith/pylith_installer/trunk/Makefile.am
   short/3D/PyLith/pylith_installer/trunk/README
   short/3D/PyLith/pylith_installer/trunk/configure.ac
Log:
Fixed more settings.

Modified: short/3D/PyLith/pylith_installer/trunk/Makefile.am
===================================================================
--- short/3D/PyLith/pylith_installer/trunk/Makefile.am	2011-05-04 22:23:07 UTC (rev 18317)
+++ short/3D/PyLith/pylith_installer/trunk/Makefile.am	2011-05-05 02:52:23 UTC (rev 18318)
@@ -128,10 +128,10 @@
 
 if WITH_FORTRAN
 env_compilers = CC=$(CC) CXX=$(CXX) FC=$(FC)
-env_mpicompilers = CC=$(MPICC) CXX=$(MPICXX) FC=$(MPIF90)
+env_mpicompilers = CC=mpicc CXX=mpicxx FC=mpif90
 else
 env_compilers = CC=$(CC) CXX=$(CXX)
-env_mpicompilers = CC=$(MPICC) CXX=$(MPICXX)
+env_mpicompilers = CC=mpicc CXX=mpicxx
 endif
 
 # ----------------------------------------------------------------------

Modified: short/3D/PyLith/pylith_installer/trunk/README
===================================================================
--- short/3D/PyLith/pylith_installer/trunk/README	2011-05-04 22:23:07 UTC (rev 18317)
+++ short/3D/PyLith/pylith_installer/trunk/README	2011-05-05 02:52:23 UTC (rev 18318)
@@ -1,4 +1,4 @@
-We are pleased to announce release of PyLith Installer version 1.0.1.
+We are pleased to announce release of PyLith Installer version 1.0.3.
 
 Please submit bug reports via the World Wide Web at:
     http://geodynamics.org/roundup    

Modified: short/3D/PyLith/pylith_installer/trunk/configure.ac
===================================================================
--- short/3D/PyLith/pylith_installer/trunk/configure.ac	2011-05-04 22:23:07 UTC (rev 18317)
+++ short/3D/PyLith/pylith_installer/trunk/configure.ac	2011-05-05 02:52:23 UTC (rev 18318)
@@ -17,7 +17,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT([PyLith Installer], [1.0.1], [cig-short at geodynamics.org])
+AC_INIT([PyLith Installer], [1.0.3], [cig-short at geodynamics.org])
 AC_CONFIG_AUX_DIR([./aux-config])
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([foreign])
@@ -316,6 +316,10 @@
   # Must have a C/C++ compiler to build gcc and run C++ configure checks.
   AC_PROG_CC
   AC_PROG_CXX
+  if test "$with_fortran" = yes ; then
+    FC=gfortran
+    AC_SUBST(FC)
+  fi
 else
   # Must have a C++ compiler
   AC_PROG_CC