[svn-r2669] Purpose:

	Bug Fix
Description:
	I was relying on the PARALLEL macro to be "yes" or "no" all the
	time. This isn't the case.
Solution:
	Created the ADD_PARALLEL_FILES macro to do just this.
Platforms tested:
	Modi4

3 files changed, 19 insertions, 9 deletions

diff --git a/fortran/configure b/fortran/configure
index 242af3a..25f715c 100755
--- a/fortran/configure
+++ b/fortran/configure
@@ -2540,6 +2540,7 @@ fi
       ;;
 esac
 
+ADD_PARALLEL_FILES=""
 if test -n "$PARALLEL"; then
       cat >> confdefs.h <<\EOF
 #define HAVE_PARALLEL 1
@@ -2547,23 +2548,23 @@ EOF
 
 
       echo $ac_n "checking prefix for running on one processor""... $ac_c" 1>&6
-echo "configure:2551: checking prefix for running on one processor" >&5
+echo "configure:2552: checking prefix for running on one processor" >&5
    echo "$ac_t""$RUNSERIAL" 1>&6
    echo $ac_n "checking prefix for running in parallel""... $ac_c" 1>&6
-echo "configure:2554: checking prefix for running in parallel" >&5
+echo "configure:2555: checking prefix for running in parallel" >&5
    echo "$ac_t""$RUNPARALLEL" 1>&6
 
       echo $ac_n "checking whether a simple MPI-IO program can be linked""... $ac_c" 1>&6
-echo "configure:2558: checking whether a simple MPI-IO program can be linked" >&5
+echo "configure:2559: checking whether a simple MPI-IO program can be linked" >&5
    cat > conftest.$ac_ext <<EOF
-#line 2560 "configure"
+#line 2561 "configure"
 #include "confdefs.h"
 
 int main() {
 MPI_Init();MPI_File_open();
 ; return 0; }
 EOF
-if { (eval echo configure:2567: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2568: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 else
@@ -2585,10 +2586,13 @@ rm -f conftest*
    if test "X$RUNPARALLEL" = "Xnone"; then
       RUNPARALLEL=
    fi
+
+   ADD_PARALLEL_FILES="yes"
 fi
 
+
 echo $ac_n "checking make""... $ac_c" 1>&6
-echo "configure:2592: checking make" >&5
+echo "configure:2596: checking make" >&5
 
 if test "`${MAKE-make} --version -f /dev/null 2>/dev/null |\
 	sed -n 1p|cut -c1-8`" = "GNU Make"; then
@@ -2605,7 +2609,7 @@ fi
 
 if test -n "$DEPEND"; then
    echo $ac_n "checking how to include a makefile""... $ac_c" 1>&6
-echo "configure:2609: checking how to include a makefile" >&5
+echo "configure:2613: checking how to include a makefile" >&5
 
       cat >makeinc <<EOF
 foo:
@@ -2854,6 +2858,7 @@ s%@PARALLEL@%$PARALLEL%g
 s%@RUNSERIAL@%$RUNSERIAL%g
 s%@RUNPARALLEL@%$RUNPARALLEL%g
 s%@TESTPARALLEL@%$TESTPARALLEL%g
+s%@ADD_PARALLEL_FILES@%$ADD_PARALLEL_FILES%g
 /@DEPEND@/r $DEPEND
 s%@DEPEND@%%g
 s%@DYNAMIC_DIRS@%$DYNAMIC_DIRS%g
diff --git a/fortran/configure.in b/fortran/configure.in
index bf91d91..3467378 100644
--- a/fortran/configure.in
+++ b/fortran/configure.in
@@ -431,6 +431,7 @@ esac
 dnl ----------------------------------------------------------------------
 dnl Print some other parallel information and do some sanity checks.
 dnl
+ADD_PARALLEL_FILES=""
 if test -n "$PARALLEL"; then
    dnl We are building a parallel library
    AC_DEFINE(HAVE_PARALLEL)
@@ -462,7 +463,10 @@ if test -n "$PARALLEL"; then
    if test "X$RUNPARALLEL" = "Xnone"; then
       RUNPARALLEL=
    fi
+
+   ADD_PARALLEL_FILES="yes"
 fi
+AC_SUBST(ADD_PARALLEL_FILES)
 
 AC_MSG_CHECKING(make)
 AC_SUBST_FILE(DEPEND)
diff --git a/fortran/src/Makefile.in b/fortran/src/Makefile.in
index b723933..cf6ee29 100644
--- a/fortran/src/Makefile.in
+++ b/fortran/src/Makefile.in
@@ -22,11 +22,12 @@ LIB=libhdf5_fortran.la
 CLEAN=H5fortran_types.f90
 
 ## Source and object files for the library
-CPARALLEL=${PARALLEL:yes="H5Pf_parallel.c"}
+ADD_PARALLEL_FILES=@ADD_PARALLEL_FILES@
+CPARALLEL=${ADD_PARALLEL_FILES:yes="H5Pf_parallel.c"}
 CLIB_SRC=H5f90kit.c H5f90misc.c H5Git.c H5Rf.c H5Ff.c  H5Sf.c H5Df.c H5Gf.c	\
 	 H5Af.c H5Tf.c H5Pf.c H5If.c H5Ef.c ${CPARALLEL:no=}
 
-FPARALLEL=${PARALLEL:yes="H5Pff_parallel.f90 HDF5_parallel.f90"}
+FPARALLEL=${ADD_PARALLEL_FILES:yes="H5Pff_parallel.f90 HDF5_parallel.f90"}
 FLIB_SRC=H5fortran_types.f90 H5fortran_flags.f90 H5f90global.f90 H5f90miscf.f90	\
          H5Rff.f90 H5Fff.f90 H5Sff.f90 H5Dff.f90 H5Gff.f90 H5Aff.f90 H5Tff.f90 	\
 	 H5Pff.f90 H5Iff.f90 H5Eff.f90 HDF5.f90 ${FPARALLEL:no=}