summaryrefslogtreecommitdiffstats
path: root/fortran/configure
diff options
context:
space:
mode:
authorBill Wendling <wendling@ncsa.uiuc.edu>2001-03-22 19:08:02 (GMT)
committerBill Wendling <wendling@ncsa.uiuc.edu>2001-03-22 19:08:02 (GMT)
commit4432a558f91d7eb81a3eea9b0c6155b62b4ce342 (patch)
tree2d9d9d6afa09788e25dbf9b00accfef99e201576 /fortran/configure
parent8f950835004165557a3425944c8691107f590756 (diff)
downloadhdf5-4432a558f91d7eb81a3eea9b0c6155b62b4ce342.zip
hdf5-4432a558f91d7eb81a3eea9b0c6155b62b4ce342.tar.gz
hdf5-4432a558f91d7eb81a3eea9b0c6155b62b4ce342.tar.bz2
[svn-r3693] Purpose:
Bug Fix Description: Create a Makefile in the testpar/ directory only if PARALLEL is enabled. Solution: Set a macro to the testpar/Makefile for the generation script.
Diffstat (limited to 'fortran/configure')
-rwxr-xr-xfortran/configure40
1 files changed, 32 insertions, 8 deletions
diff --git a/fortran/configure b/fortran/configure
index 530f67f..2fd0a9c 100755
--- a/fortran/configure
+++ b/fortran/configure
@@ -2713,6 +2713,12 @@ rm -f conftest conftest.o conftest.c core core.* *.core dummy.o
mkdir ./config >/dev/null 2>&1
touch ./config/stamp1
+PARALLEL_MAKE=
+
+if test -n "$TESTPARALLEL"; then
+ PARALLEL_MAKE=$TESTPARALLEL/Makefile
+fi
+
saved_no_create=$no_create
no_create=yes
trap '' 1 2 15
@@ -2816,10 +2822,19 @@ done
ac_given_srcdir=$srcdir
ac_given_INSTALL="$INSTALL"
-trap 'rm -fr `echo "config/depend1 config/depend2 config/depend3 config/depend4 \
- config/dependN config/commence config/conclude Makefile \
- src/H5fortran_types.f90 src/Makefile test/Makefile \
- testpar/Makefile examples/Makefile src/H5config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+trap 'rm -fr `echo "config/depend1
+ config/depend2
+ config/depend3
+ config/depend4
+ config/dependN
+ config/commence
+ config/conclude
+ Makefile
+ src/H5fortran_types.f90
+ src/Makefile
+ test/Makefile
+ $PARALLEL_MAKE
+ examples/Makefile src/H5config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
EOF
cat >> $CONFIG_STATUS <<EOF
@@ -2938,10 +2953,19 @@ EOF
cat >> $CONFIG_STATUS <<EOF
-CONFIG_FILES=\${CONFIG_FILES-"config/depend1 config/depend2 config/depend3 config/depend4 \
- config/dependN config/commence config/conclude Makefile \
- src/H5fortran_types.f90 src/Makefile test/Makefile \
- testpar/Makefile examples/Makefile"}
+CONFIG_FILES=\${CONFIG_FILES-"config/depend1
+ config/depend2
+ config/depend3
+ config/depend4
+ config/dependN
+ config/commence
+ config/conclude
+ Makefile
+ src/H5fortran_types.f90
+ src/Makefile
+ test/Makefile
+ $PARALLEL_MAKE
+ examples/Makefile"}
EOF
cat >> $CONFIG_STATUS <<\EOF
for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then