summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScot Breitenfeld <brtnfld@hdfgroup.org>2015-02-03 15:42:15 (GMT)
committerScot Breitenfeld <brtnfld@hdfgroup.org>2015-02-03 15:42:15 (GMT)
commit8a528170ec8335e870aad2c795a6d7b751015250 (patch)
tree3ecd894999a8b0bb2492ae2e01816b0134b300d0
parentcbf280a22d2f5aa378cb6faeef28b324b1c8ada5 (diff)
downloadhdf5-8a528170ec8335e870aad2c795a6d7b751015250.zip
hdf5-8a528170ec8335e870aad2c795a6d7b751015250.tar.gz
hdf5-8a528170ec8335e870aad2c795a6d7b751015250.tar.bz2
[svn-r26117] Autotools work HDFFV-9067,
Removed restiction of disabling shared libraries on the MAC, H5_FORTRAN_SHARED was replaced with HAVE_SHARED_CONDITIONAL since H5_FORTRAN_SHARED was removed. tested: jam
-rw-r--r--configure.ac41
-rw-r--r--fortran/src/Makefile.am2
-rw-r--r--fortran/test/Makefile.am2
-rw-r--r--fortran/testpar/Makefile.am2
-rw-r--r--hl/fortran/src/Makefile.am2
-rw-r--r--hl/fortran/test/Makefile.am2
6 files changed, 5 insertions, 46 deletions
diff --git a/configure.ac b/configure.ac
index b148f28..91169f6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -647,47 +647,6 @@ AC_SUBST([RUNPARALLEL])
AC_SUBST([TESTPARALLEL])
## ----------------------------------------------------------------------
-## Fortran libraries are not currently supported on Mac. Disable them.
-## (this is overridable with --enable-unsupported).
-##
-AC_SUBST([H5_FORTRAN_SHARED])
-H5_FORTRAN_SHARED="no"
-if test "X${HDF_FORTRAN}" = "Xyes" && test "X${enable_shared}" != "Xno"; then
- AC_MSG_CHECKING([if shared Fortran libraries are supported])
- H5_FORTRAN_SHARED="yes"
-
- ## Disable fortran shared libraries on Mac. (MAM - 03/30/11)
-
- case "`uname`" in
- Darwin*)
- H5_FORTRAN_SHARED="no"
- CHECK_WARN="Shared Fortran libraries not currently supported on Mac."
- ;;
- esac
-
- ## Report results of check(s)
-
- if test "X${H5_FORTRAN_SHARED}" = "Xno"; then
- AC_MSG_RESULT([no])
- AC_MSG_WARN([$CHECK_WARN])
- if test "X${ALLOW_UNSUPPORTED}" != "Xyes"; then
- AC_MSG_WARN([Disabling shared Fortran libraries.])
- AC_MSG_WARN([To override this behavior, please use --enable-unsupported configure option.])
- if test "X${enable_static}" = "Xno"; then
- AC_MSG_ERROR([both static and shared Fortran libraries are disabled])
- fi
- else
- AC_MSG_WARN([Allowing unsupported Fortran shared libraries due to use of --enable-unsupported flag])
- H5_FORTRAN_SHARED="yes"
- fi
- else
- AC_MSG_RESULT([yes])
- fi
-fi
-
-AM_CONDITIONAL([FORTRAN_SHARED_CONDITIONAL], [test "X$H5_FORTRAN_SHARED" = "Xyes"])
-
-## ----------------------------------------------------------------------
## Disable C++ shared libraries if +DD64 flag is detected.
##
AC_SUBST([H5_CXX_SHARED])
diff --git a/fortran/src/Makefile.am b/fortran/src/Makefile.am
index a4b3843..e5db074 100644
--- a/fortran/src/Makefile.am
+++ b/fortran/src/Makefile.am
@@ -37,7 +37,7 @@ libhdf5_fortran_la_LDFLAGS= -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISIO
# Some Fortran compilers can't build shared libraries, so sometimes we
# want to build a shared C library and a static Fortran library. If so,
# pass the -static flag to the library linker.
-if FORTRAN_SHARED_CONDITIONAL
+if HAVE_SHARED_CONDITIONAL
else
AM_LDFLAGS+=-static
endif
diff --git a/fortran/test/Makefile.am b/fortran/test/Makefile.am
index 735ab7a..6d55250 100644
--- a/fortran/test/Makefile.am
+++ b/fortran/test/Makefile.am
@@ -31,7 +31,7 @@ noinst_LTLIBRARIES=libh5test_fortran.la
# Some Fortran compilers can't build shared libraries, so sometimes we
# want to build a shared C library and a static Fortran library. If so,
# pass the -static flag to the library linker.
-if FORTRAN_SHARED_CONDITIONAL
+if HAVE_SHARED_CONDITIONAL
else
AM_LDFLAGS+=-static
endif
diff --git a/fortran/testpar/Makefile.am b/fortran/testpar/Makefile.am
index 517a3c8..60ac23f 100644
--- a/fortran/testpar/Makefile.am
+++ b/fortran/testpar/Makefile.am
@@ -29,7 +29,7 @@ AM_FCFLAGS+=-I$(top_srcdir)/fortran/src -I$(top_srcdir)/fortran/test $(F9XMODFLA
# pass the -static flag to the library linker.
# (Actually, we historically have bad luck combining shared libraries with
# parallel code. But you're welcome to try...)
-if FORTRAN_SHARED_CONDITIONAL
+if HAVE_SHARED_CONDITIONAL
else
AM_LDFLAGS+=-static
endif
diff --git a/hl/fortran/src/Makefile.am b/hl/fortran/src/Makefile.am
index c8c4541..a540a36 100644
--- a/hl/fortran/src/Makefile.am
+++ b/hl/fortran/src/Makefile.am
@@ -35,7 +35,7 @@ libhdf5hl_fortran_la_LDFLAGS= -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVIS
# Some Fortran compilers can't build shared libraries, so sometimes we
# want to build a shared C library and a static Fortran library. If so,
# pass the -static flag to the library linker.
-if FORTRAN_SHARED_CONDITIONAL
+if HAVE_SHARED_CONDITIONAL
else
AM_LDFLAGS+=-static
endif
diff --git a/hl/fortran/test/Makefile.am b/hl/fortran/test/Makefile.am
index fa3a803..3671cdc 100644
--- a/hl/fortran/test/Makefile.am
+++ b/hl/fortran/test/Makefile.am
@@ -27,7 +27,7 @@ AM_FCFLAGS+=-I$(top_builddir)/fortran/src -I$(top_builddir)/hl/fortran/src $(F9X
# Some Fortran compilers can't build shared libraries, so sometimes we
# need to make sure the Fortran programs link against the static version
# of the HDF5 library. We do this by passing the -static flag to the linker.
-if FORTRAN_SHARED_CONDITIONAL
+if HAVE_SHARED_CONDITIONAL
else
AM_LDFLAGS+=-static
endif