diff options
author | Mike McGreevy <mamcgree@hdfgroup.org> | 2009-10-16 20:21:12 (GMT) |
---|---|---|
committer | Mike McGreevy <mamcgree@hdfgroup.org> | 2009-10-16 20:21:12 (GMT) |
commit | 11155cf5c356dfc3bbc382f320c6c7fd294b3f22 (patch) | |
tree | 2f71d66ddee210eb73c6912f00742b434b25237f /configure | |
parent | 26b0d9bde85b4617b3d2e317cd545ed165a727f7 (diff) | |
download | hdf5-11155cf5c356dfc3bbc382f320c6c7fd294b3f22.zip hdf5-11155cf5c356dfc3bbc382f320c6c7fd294b3f22.tar.gz hdf5-11155cf5c356dfc3bbc382f320c6c7fd294b3f22.tar.bz2 |
[svn-r17664] Purpose:
configure cleanup
Description
1. Removed check that disables shared libraries when pgcc is used. Apparently
they previously did not work with libtool 1.5.14 and on mir, neither of
which is in use anymore. Testing on jam and amani appear fine, so this
check is unnecessary.
2. Removed check that disables shared C++ libraries when -xarch is used to
enable 64 bit mode. We now use m64 flag to build 64 bit binaries, so
we shouldn't explicitly disable shared C++ libraries if -xarch is
discovered.
3. Removed old configure output summary section from configure.in, since
we now use the libhdf5.settings file.
4. Updated powerpc-ibm-aix5.x config file to once again put c99 flag into
H5_CFLAGS (and thus NOT get into h5cc), as decided in our dev meeting.
Tested:
h5committest
full build with pgcc on jam / amani
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 265 |
1 files changed, 27 insertions, 238 deletions
@@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Id: configure.in 17648 2009-10-15 18:13:55Z epourmal . +# From configure.in Id: configure.in 17655 2009-10-15 21:53:23Z mamcgree . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.64 for HDF5 1.8.3-snap13. # @@ -7514,13 +7514,6 @@ elif test "X${enable_shared}" = "Xyes" -a "X${PARALLEL}" != "X"; then echo ' shared libraries explicitly enabled by user' fi -if test "X${enable_shared}" != "Xno" && \ - (${CC-cc} -V 2>&1 | grep '^pgcc') > /dev/null; then - echo ' warning: shared libraries are not supported for pgcc!' - echo ' disabling shared libraries' - enable_shared="no" -fi - if test "X${HDF_FORTRAN}" = "Xyes"; then H5_FORTRAN_SHARED="yes" @@ -7566,12 +7559,6 @@ H5_CXX_SHARED="no" if test "X${HDF_CXX}" = "Xyes" && test "X${enable_shared}" != "Xno"; then H5_CXX_SHARED="yes" - if (echo dummy ${CXX} ${CXXLD} ${CFLAGS} ${CXXFLAGS} ${LDFLAGS} | grep 'xarch') > /dev/null; then - echo " warning: -xarch flag detected" - echo " disabling shared C++ libraries" - H5_CXX_SHARED="no" - fi - if (echo dummy ${CXX} ${CXXLD} ${CFLAGS} ${CXXFLAGS} ${LDFLAGS} | grep 'DD64') > /dev/null; then echo " warning: +DD64 flag detected" @@ -8218,13 +8205,13 @@ if test "${lt_cv_nm_interface+set}" = set; then : else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:8221: $ac_compile\"" >&5) + (eval echo "\"\$as_me:8208: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:8224: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:8211: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:8227: output\"" >&5) + (eval echo "\"\$as_me:8214: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -9429,7 +9416,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 9432 "configure"' > conftest.$ac_ext + echo '#line 9419 "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -11749,11 +11736,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11752: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11739: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:11756: \$? = $ac_status" >&5 + echo "$as_me:11743: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -12088,11 +12075,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12091: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12078: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:12095: \$? = $ac_status" >&5 + echo "$as_me:12082: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -12193,11 +12180,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12196: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12183: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:12200: \$? = $ac_status" >&5 + echo "$as_me:12187: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -12248,11 +12235,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12251: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12238: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:12255: \$? = $ac_status" >&5 + echo "$as_me:12242: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -14679,7 +14666,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 14682 "configure" +#line 14669 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -14775,7 +14762,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 14778 "configure" +#line 14765 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -16747,11 +16734,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16750: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16737: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16754: \$? = $ac_status" >&5 + echo "$as_me:16741: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -16846,11 +16833,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16849: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16836: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16853: \$? = $ac_status" >&5 + echo "$as_me:16840: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -16898,11 +16885,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16901: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16888: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16905: \$? = $ac_status" >&5 + echo "$as_me:16892: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -18415,11 +18402,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:18418: $lt_compile\"" >&5) + (eval echo "\"\$as_me:18405: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:18422: \$? = $ac_status" >&5 + echo "$as_me:18409: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -18514,11 +18501,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:18517: $lt_compile\"" >&5) + (eval echo "\"\$as_me:18504: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:18521: \$? = $ac_status" >&5 + echo "$as_me:18508: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -18566,11 +18553,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:18569: $lt_compile\"" >&5) + (eval echo "\"\$as_me:18556: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:18573: \$? = $ac_status" >&5 + echo "$as_me:18560: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -31266,201 +31253,3 @@ cat >> src/H5config.h <<EOF EOF cat src/libhdf5.settings - -if false; then -if test -z "$ECHO_N" -o -z "$ECHO_C"; then - if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then - if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then - ECHO_N='' - ECHO_C=' -' - else - ECHO_N=-n - ECHO_C='' - fi - else - ECHO_N='' - ECHO_C='\c' - fi -fi - -PRINT_PLAIN() { - echo $ECHO_N "$1$ECHO_C" - echo $ECHO_N "$1$ECHO_C" 1>>src/libhdf5.settings -} - -PRINT_N() { - echo $ECHO_N "$1: $ECHO_C" - echo $ECHO_N "$1: $ECHO_C" 1>>src/libhdf5.settings -} - -PRINT() { - echo "$1" - echo "$1" 1>>src/libhdf5.settings -} - -IF_YES_NO() { - if test $# -lt 1; then - PRINT "No" - return - else - while test $# -gt 0; do - if test "$1" != "yes"; then - PRINT "No" - return - fi - shift - done - fi - PRINT "Yes" -} - -IF_ENABLED_DISABLED() { - if test "$1" = "yes"; then - PRINT "Enabled" - else - PRINT "Disabled" - fi -} - -PRINT "" -PRINT " Configure Summary" -PRINT " =================" -PRINT "" -PRINT "Compiling Options:" -PRINT "------------------" - -PRINT_N " Compilation Mode" -case "X-$enable_production" in - X-yes) PRINT "Production" ;; - X-no) PRINT "Development" ;; - X-profile) PRINT "Profile" ;; - *) PRINT "$enable_production" ;; -esac - -PRINT_N " C Compiler" -PRINT "$CC" - -PRINT_N " CFLAGS / H5_CFLAGS" -PRINT "$CFLAGS" -PRINT " $H5_CFLAGS" - -PRINT_N " CPPFLAGS / H5_CPPFLAGS" -PRINT "$CPPFLAGS" -PRINT " $H5_CPPFLAGS" - -PRINT_N " LDFLAGS" -PRINT "$LDFLAGS" - -PRINT_N " Debug Mode" - -if test "X$DEBUG_PKG" = "X$all_packages"; then - PRINT "All" -elif test "X$DEBUG_PKG" = "X"; then - PRINT "None" -else - PRINT $DEBUG_PKG -fi - -PRINT_N " Shared Libraries" -IF_YES_NO "$enable_shared" - -PRINT_N " Static Libraries" -IF_YES_NO "$enable_static" - -PRINT_N " Statically Linked Executables" -IF_YES_NO "$STATIC_EXEC" - -PRINT_N "Default Version of Public Symbols" -PRINT $DEFAULT_API_VERSION - -PRINT_N " With Deprecated Public Symbols" -IF_YES_NO "$DEPRECATED_SYMBOLS" - -PRINT_N " Tracing" -IF_YES_NO "$TRACE_API" - -PRINT_N "Clear file buffers before write" -IF_YES_NO "$CLEARFILEBUF" - -PRINT_N " Using memory checker" -IF_YES_NO "$USINGMEMCHECKER" - -PRINT_N " Optimization Instrumentation" -IF_YES_NO "$INSTRUMENT" - -PRINT "" -PRINT "Languages:" -PRINT "----------" - -PRINT_N " C++" -IF_YES_NO "$HDF_CXX" -if test X$HDF_CXX = Xyes; then - PRINT_N " C++ Compiler" - PRINT "$CXX" - - PRINT_N " CXXFLAGS / H5_CXXFLAGS" - PRINT "$CXXFLAGS" - PRINT " $H5_CXXFLAGS" -fi - -PRINT_N " Fortran" -IF_YES_NO "$HDF_FORTRAN" -if test X$HDF_FORTRAN = Xyes; then - PRINT_N " Fortran Compiler" - PRINT "$FC" - - PRINT_N " FCFLAGS / H5_FCFLAGS" - PRINT "$FCFLAGS" - PRINT " $H5_FCFLAGS" -fi - -PRINT "" -PRINT "Features:" -PRINT "---------" - -PRINT_N " dmalloc" -IF_YES_NO "$HAVE_DMALLOC" - -PRINT_N " Function Stack Tracing" -IF_ENABLED_DISABLED "$CODESTACK" - -PRINT_N " GPFS" -IF_YES_NO "$GPFS" - -PRINT_N " Strict File Format Checks" -IF_ENABLED_DISABLED "$STRICT_FORMAT_CHECKS" - -PRINT_N " Default API Mapping" -PRINT "$DEFAULT_API_VERSION" - -PRINT_N " I/O filters (external)" -PRINT "$EXTERNAL_FILTERS" - -PRINT_N " I/O filters (internal)" -PRINT "$FILTERS" - -PRINT_N " Linux Large File Support (LFS)" -IF_ENABLED_DISABLED "$LINUX_LFS" - -PRINT_N " MPE" -IF_YES_NO "$MPE" - - -PRINT_N " Parallel HDF5" -if test "$PARALLEL" != "no"; then - PRINT "Yes" -else - PRINT "No" -fi - - -PRINT_N " Direct VFD" -IF_ENABLED_DISABLED "$DIRECT_VFD" - -PRINT_N " Threadsafety" -IF_ENABLED_DISABLED "$THREADSAFE" - -PRINT_N " High Level library" -IF_ENABLED_DISABLED "$HDF5_HL" -fi |