diff options
| author | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2015-05-11 19:11:04 (GMT) |
|---|---|---|
| committer | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2015-05-11 19:11:04 (GMT) |
| commit | 5520ff138ca79bb5aa46146908773c910f767554 (patch) | |
| tree | c9ea17f4530c1eade235ea077f179d3557042233 /configure.ac | |
| parent | c3218d9f39ec281506251c2c6ba0b395adfa9013 (diff) | |
| parent | 67ba6cb57d84dd34c69930d469ae445697b49731 (diff) | |
| download | hdf5-5520ff138ca79bb5aa46146908773c910f767554.zip hdf5-5520ff138ca79bb5aa46146908773c910f767554.tar.gz hdf5-5520ff138ca79bb5aa46146908773c910f767554.tar.bz2 | |
[svn-r27050] merge from trunk.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 41951a8..a5ded98 100644 --- a/configure.ac +++ b/configure.ac @@ -26,7 +26,7 @@ AC_PREREQ([2.69]) ## NOTE: Do not forget to change the version number here when we do a ## release!!! ## -AC_INIT([HDF5], [1.9.216], [help@hdfgroup.org]) +AC_INIT([HDF5], [1.9.218], [help@hdfgroup.org]) AC_CONFIG_SRCDIR([src/H5.c]) AC_CONFIG_HEADER([src/H5config.h]) @@ -637,6 +637,19 @@ AC_SUBST([RUNPARALLEL]) AC_SUBST([TESTPARALLEL]) ## ---------------------------------------------------------------------- +## Disable shared libraries on CYGWIN. (LK - 04/16/15) +## A number of tests run by "make check" fail on CYGWIN, so for HDF5 v1.8.15 +## we will change the default for shared libraries to disabled. + + +case "`uname`" in + CYGWIN*) + enable_shared="no" + CHECK_WARN="Shared libraries are not currently supported on CYGWIN." + ;; +esac + +## ---------------------------------------------------------------------- ## Fortran libraries are not currently supported on Mac. Disable them. ## (this is overridable with --enable-unsupported). ## @@ -687,6 +700,8 @@ LT_PREREQ([2.2]) ## win32-dll - This will build clean dlls on win32 platforms. LT_INIT([dlopen,win32-dll]) + + ## ---------------------------------------------------------------------- ## Check if we should install only statically linked executables. ## This check needs to occur after libtool is initialized because @@ -2900,5 +2915,11 @@ cat >> src/H5config.h <<EOF #endif EOF +## HDF5 configure code created by autotools with gcc 4.9.2 is adding problematic +## linker flags: -l with no library name; -l <libname>, specifically gfortran or m. +## This sed script corrects "-l <libname>" first and then "-l " with no library name. +## If the order is not preserved, all instances of "-l " will be removed. +sed -e '/^postdeps/ s/-l \([a-zA-Z]\)/-l\1/g' -e '/^postdeps/ s/-l //g' -i libtool + ## show the configure settings cat src/libhdf5.settings |