summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike McGreevy <mamcgree@hdfgroup.org>2011-11-11 16:04:27 (GMT)
committerMike McGreevy <mamcgree@hdfgroup.org>2011-11-11 16:04:27 (GMT)
commita45dda8ce707aceda4a2a75faea99452d5ed912e (patch)
treebaee12cc9c9aaf0b86bdd0fe09194e957895eca9
parent6e0f6e4ebc5aefc9ccce51a1bf2de37d1ab98dc0 (diff)
downloadhdf5-a45dda8ce707aceda4a2a75faea99452d5ed912e.zip
hdf5-a45dda8ce707aceda4a2a75faea99452d5ed912e.tar.gz
hdf5-a45dda8ce707aceda4a2a75faea99452d5ed912e.tar.bz2
[svn-r21738] Purpose:
Revert part of r21275 (F2003 configure change) which unintentionally removed a line from configure.in that sets FC=no when fortran is not enabled. This ensures that configure doesn't run compiler checks on a fortran compiler when it won't be used. (and can cause failures in configure when no fortran compiler is present as well as issues with the resulting src/Makefile when building DLLs on Cygwin) Tested: h5committest; manually on jam & bangan (Cygwin).
-rwxr-xr-xconfigure4
-rw-r--r--configure.in2
2 files changed, 5 insertions, 1 deletions
diff --git a/configure b/configure
index afafc15..66b2c57 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.in Id: configure.in 21721 2011-11-06 14:02:33Z hdftest .
+# From configure.in Id: configure.in 21722 2011-11-06 21:56:17Z derobins .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.68 for HDF5 1.9.98.
#
@@ -6370,6 +6370,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
fi
+else
+ FC="no"
fi
ac_ext=c
diff --git a/configure.in b/configure.in
index 3992711..6cf68b4 100644
--- a/configure.in
+++ b/configure.in
@@ -553,6 +553,8 @@ if test "X$HDF_FORTRAN" = "Xyes"; then
fi
fi
+else
+ FC="no"
fi
dnl Change back to the C language