diff options
author | Vailin Choi <vchoi@hdfgroup.org> | 2013-10-21 16:12:33 (GMT) |
---|---|---|
committer | Vailin Choi <vchoi@hdfgroup.org> | 2013-10-21 16:12:33 (GMT) |
commit | 2b18e934c6812fd1b487ebfebf9240b009c3e4ae (patch) | |
tree | 4c5f328cf76071650907986d781191af05a3374a /configure | |
parent | 0a9249a4016f327a3382a103d1b3d10cc6451a5a (diff) | |
download | hdf5-2b18e934c6812fd1b487ebfebf9240b009c3e4ae.zip hdf5-2b18e934c6812fd1b487ebfebf9240b009c3e4ae.tar.gz hdf5-2b18e934c6812fd1b487ebfebf9240b009c3e4ae.tar.bz2 |
[svn-r24336] Bring revisions #24118 - #24200 from trunk.
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 125 |
1 files changed, 81 insertions, 44 deletions
@@ -1,7 +1,7 @@ #! /bin/sh # From configure.ac Id: configure.ac 22697 2012-08-19 14:35:47Z hdftest . # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for HDF5 1.9.164-swmr0. +# Generated by GNU Autoconf 2.69 for HDF5 1.9.165-swmr0. # # Report bugs to <help@hdfgroup.org>. # @@ -591,8 +591,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='HDF5' PACKAGE_TARNAME='hdf5' -PACKAGE_VERSION='1.9.164-swmr0' -PACKAGE_STRING='HDF5 1.9.164-swmr0' +PACKAGE_VERSION='1.9.165-swmr0' +PACKAGE_STRING='HDF5 1.9.165-swmr0' PACKAGE_BUGREPORT='help@hdfgroup.org' PACKAGE_URL='' @@ -690,7 +690,12 @@ LL_PATH USE_FILTER_SZIP USE_FILTER_DEFLATE AM_MAKEFLAGS +LT_ADD_LIBHDF5_DEPENDENCY +LT_ADD_LIBHDF5_DEPENDENCY_FALSE +LT_ADD_LIBHDF5_DEPENDENCY_TRUE LT_STATIC_EXEC +USE_PLUGINS_CONDITIONAL_FALSE +USE_PLUGINS_CONDITIONAL_TRUE CPP OTOOL64 OTOOL @@ -921,8 +926,8 @@ with_mpe enable_mpi_size enable_filters with_default_vfd -with_default_plugin enable_direct_vfd +with_default_plugindir enable_dconv_exception enable_dconv_accuracy enable_hl @@ -1487,7 +1492,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures HDF5 1.9.164-swmr0 to adapt to many kinds of systems. +\`configure' configures HDF5 1.9.165-swmr0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1557,7 +1562,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of HDF5 1.9.164-swmr0:";; + short | recursive ) echo "Configuration of HDF5 1.9.165-swmr0:";; esac cat <<\_ACEOF @@ -1668,7 +1673,7 @@ Optional Packages: --with-mpe=DIR Use MPE instrumentation [default=no] --with-default-vfd=driver Specify default file driver [default=sec2] - --with-default-plugin=location + --with-default-plugindir=location Specify default location for plugins [default="/usr/local/hdf5/lib/plugin"] --with-default-api-version=(v16|v18|v110) @@ -1756,7 +1761,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -HDF5 configure 1.9.164-swmr0 +HDF5 configure 1.9.165-swmr0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2850,7 +2855,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by HDF5 $as_me 1.9.164-swmr0, which was +It was created by HDF5 $as_me 1.9.165-swmr0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3682,7 +3687,7 @@ fi # Define the identity of the package. PACKAGE='hdf5' - VERSION='1.9.164-swmr0' + VERSION='1.9.165-swmr0' cat >>confdefs.h <<_ACEOF @@ -22036,12 +22041,22 @@ if test "X$STATIC_EXEC" = "Xyes"; then ## Issue a warning if -static flag is not supported. if test "X$lt_cv_prog_compiler_static_works" = "Xno"; then echo " warning: -static flag not supported on this system; executable won't statically link shared system libraries." + LT_STATIC_EXEC="" + else + LT_STATIC_EXEC="-all-static" fi - LT_STATIC_EXEC="-all-static" else echo "no" LT_STATIC_EXEC="" fi + if test "X$LT_STATIC_EXEC" = X; then + USE_PLUGINS_CONDITIONAL_TRUE= + USE_PLUGINS_CONDITIONAL_FALSE='#' +else + USE_PLUGINS_CONDITIONAL_TRUE='#' + USE_PLUGINS_CONDITIONAL_FALSE= +fi + @@ -22084,6 +22099,20 @@ $as_echo "error" >&6; } as_fn_error $? "\'$enableval\' is not a valid rpath type" "$LINENO" 5 ;; esac +## ---------------------------------------------------------------------- +## When sharedlib-rpath is disabled, setting runpath_var to "" above, don't +## add libhdf5 as a dependency for the other hdf5 libs, either. This keeps +## the rpath to libhdf5 out of the lib files as well as the executables. + if test "X$runpath_var" != X; then + LT_ADD_LIBHDF5_DEPENDENCY_TRUE= + LT_ADD_LIBHDF5_DEPENDENCY_FALSE='#' +else + LT_ADD_LIBHDF5_DEPENDENCY_TRUE='#' + LT_ADD_LIBHDF5_DEPENDENCY_FALSE= +fi + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking make" >&5 $as_echo_n "checking make... " >&6; } @@ -29275,36 +29304,6 @@ _ACEOF fi ## ---------------------------------------------------------------------- -## Enable custom plugin default path for library. It requires SHARED support. -## -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Custom Plugin Default Path definition" >&5 -$as_echo_n "checking for Custom Plugin Default Path definition... " >&6; } - -# Check whether --with-default-plugin was given. -if test "${with_default_plugin+set}" = set; then : - withval=$with_default_plugin; -else - withval="/usr/local/hdf5/lib/plugin" -fi - - -if test "X$withval" = "X"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: default" >&5 -$as_echo "default" >&6; } - default_plugin="/usr/local/hdf5/lib/plugin" -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $withval" >&5 -$as_echo "$withval" >&6; } - default_plugin=$withval -fi - - -cat >>confdefs.h <<_ACEOF -#define DEFAULT_PLUGIN "$default_plugin" -_ACEOF - - -## ---------------------------------------------------------------------- ## Check if Direct I/O driver is enabled by --enable-direct-vfd ## @@ -29408,6 +29407,36 @@ fi ## ---------------------------------------------------------------------- +## Enable custom plugin default path for library. It requires SHARED support. +## +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for custom plugin default path definition" >&5 +$as_echo_n "checking for custom plugin default path definition... " >&6; } + +# Check whether --with-default-plugindir was given. +if test "${with_default_plugindir+set}" = set; then : + withval=$with_default_plugindir; +else + withval="/usr/local/hdf5/lib/plugin" +fi + + +if test "X$withval" = "X"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: default" >&5 +$as_echo "default" >&6; } + default_plugindir="/usr/local/hdf5/lib/plugin" +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $withval" >&5 +$as_echo "$withval" >&6; } + default_plugindir=$withval +fi + + +cat >>confdefs.h <<_ACEOF +#define DEFAULT_PLUGINDIR "$default_plugindir" +_ACEOF + + +## ---------------------------------------------------------------------- ## Decide whether the presence of user's exception handling functions is ## checked and data conversion exceptions are returned. This is mainly ## for the speed optimization of hard conversions. Soft conversions can @@ -31647,7 +31676,7 @@ Usage: $0 [OPTIONS] Report bugs to <bug-libtool@gnu.org>." lt_cl_version="\ -HDF5 config.lt 1.9.164-swmr0 +HDF5 config.lt 1.9.165-swmr0 configured by $0, generated by GNU Autoconf 2.69. Copyright (C) 2011 Free Software Foundation, Inc. @@ -33347,6 +33376,14 @@ if test -z "${CXX_SHARED_CONDITIONAL_TRUE}" && test -z "${CXX_SHARED_CONDITIONAL as_fn_error $? "conditional \"CXX_SHARED_CONDITIONAL\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${USE_PLUGINS_CONDITIONAL_TRUE}" && test -z "${USE_PLUGINS_CONDITIONAL_FALSE}"; then + as_fn_error $? "conditional \"USE_PLUGINS_CONDITIONAL\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${LT_ADD_LIBHDF5_DEPENDENCY_TRUE}" && test -z "${LT_ADD_LIBHDF5_DEPENDENCY_FALSE}"; then + as_fn_error $? "conditional \"LT_ADD_LIBHDF5_DEPENDENCY\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${BUILD_SHARED_SZIP_CONDITIONAL_TRUE}" && test -z "${BUILD_SHARED_SZIP_CONDITIONAL_FALSE}"; then as_fn_error $? "conditional \"BUILD_SHARED_SZIP_CONDITIONAL\" was never defined. @@ -33777,7 +33814,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by HDF5 $as_me 1.9.164-swmr0, which was +This file was extended by HDF5 $as_me 1.9.165-swmr0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -33843,7 +33880,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -HDF5 config.status 1.9.164-swmr0 +HDF5 config.status 1.9.165-swmr0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" |