mirror of
https://github.com/HDFGroup/hdf5.git
synced 2024-11-27 02:10:55 +08:00
[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
This commit is contained in:
parent
cbf280a22d
commit
8a528170ec
41
configure.ac
41
configure.ac
@ -646,47 +646,6 @@ AC_SUBST([RUNSERIAL])
|
||||
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.
|
||||
##
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user