diff options
author | Mike McGreevy <mamcgree@hdfgroup.org> | 2012-03-30 21:00:55 (GMT) |
---|---|---|
committer | Mike McGreevy <mamcgree@hdfgroup.org> | 2012-03-30 21:00:55 (GMT) |
commit | 5799eccab8aec8921773a2a1706b13c3cd79a925 (patch) | |
tree | dd6f882f009d8457528f8d1784251773503627b3 /configure | |
parent | 56d950d3264aae3d935854470a9178a333614bff (diff) | |
download | hdf5-5799eccab8aec8921773a2a1706b13c3cd79a925.zip hdf5-5799eccab8aec8921773a2a1706b13c3cd79a925.tar.gz hdf5-5799eccab8aec8921773a2a1706b13c3cd79a925.tar.bz2 |
[svn-r22210] Purpose:
Merge fix for HDFFV-944 (r22149) from trunk to hdf5_1_8.
(Also reran bin/reconfigure which updated trace information
for the two new MPI functions for getting/setting atomicity
in src/H5Fmpi.c)
Tested:
h5committest
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 34 |
1 files changed, 17 insertions, 17 deletions
@@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Id: configure.in 22086 2012-03-19 00:31:55Z hdftest . +# From configure.in Id: configure.in 22141 2012-03-26 00:29:22Z hdftest . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.68 for HDF5 1.8.9-snap15. # @@ -21562,22 +21562,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -case $host_os in - linux* | freebsd* ) - # If gcc is not used, need to set $wl to use "-Wl," - if $CC -v 2>&1 | grep '^gcc' > /dev/null ; then - : using gcc - else - echo 'fixing $wl in' $ofile -ed - $ofile <<EOF 2> /dev/null -/^wl=""/s//wl="-Wl,"/ -w -q -EOF - fi - ;; -esac - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we should install only statically linked executables" >&5 $as_echo_n "checking if we should install only statically linked executables... " >&6; } # Check whether --enable-static_exec was given. @@ -34998,6 +34982,22 @@ touch ./config/stamp2 # Finally the makefiles test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1 +case $host_os in + linux* | freebsd* ) + # If gcc is not used, need to set $wl to use "-Wl," + if $CC -v 2>&1 | grep '^gcc' > /dev/null ; then + : using gcc + else + echo 'fixing $wl in' $ofile +ed - $ofile <<EOF 2> /dev/null +g/^wl=""/s//wl="-Wl,"/ +w +q +EOF + fi + ;; +esac + if (./libtool --features | grep '^enable shared libraries' > /dev/null); then enable_shared=yes else |