From 8af3db74ef1810f9bcb6cbb7efe6950b64dd6acb Mon Sep 17 00:00:00 2001 From: James Laird Date: Fri, 28 Oct 2005 17:10:22 -0500 Subject: [svn-r11616] Purpose: Configure feature and cleanup Description: Added error when Absoft f95 is used without --disable-shared. Removed tools/misc/h5import.c and tools/misc/pdb2hdf.c . Platforms tested: mir heping Misc. update: --- MANIFEST | 2 - configure | 303 +---------------------------------------------- configure.in | 9 -- fortran/configure | 8 ++ fortran/configure.in | 9 ++ release_docs/RELEASE.txt | 1 + src/H5config.h.in | 9 -- 7 files changed, 19 insertions(+), 322 deletions(-) diff --git a/MANIFEST b/MANIFEST index 918dcb1..b0783ea 100644 --- a/MANIFEST +++ b/MANIFEST @@ -1502,10 +1502,8 @@ ./tools/misc/Makefile.in ./tools/misc/h5cc.in ./tools/misc/h5debug.c -./tools/misc/h5import.c ./tools/misc/h5redeploy.in ./tools/misc/h5repart.c -./tools/misc/pdb2hdf.c ./tools/testfiles/tall-1.ddl ./tools/testfiles/tall-2.ddl diff --git a/configure b/configure index 107729c..099ec09 100755 --- a/configure +++ b/configure @@ -473,7 +473,7 @@ ac_includes_default="\ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os CPPFLAGS H5_CPPFLAGS H5_CFLAGS DEFAULT_LIBS TR HSIZET CC CFLAGS LDFLAGS ac_ct_CC EXEEXT OBJEXT config_dirs subdirs LT_STATIC_EXEC PERL AR SET_MAKE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S ECHO RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP CPP EGREP LIBTOOL USE_FILTER_DEFLATE USE_FILTER_SZIP SSL GASS TESTGASS SRB TESTSRB PDB2HDF PTHREAD DEBUG_PKG TRACE_API INSTRUMENT_LIBRARY PARALLEL RUNSERIAL RUNPARALLEL TESTPARALLEL MPE FILTERS USE_FILTER_SHUFFLE USE_FILTER_FLETCHER32 H5_VERSION CONFIG_DATE CONFIG_USER CONFIG_MODE BYTESEX STATIC_SHARED CC_VERSION ROOT DYNAMIC_DIRS HL SEARCH SETX LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os CPPFLAGS H5_CPPFLAGS H5_CFLAGS DEFAULT_LIBS TR HSIZET CC CFLAGS LDFLAGS ac_ct_CC EXEEXT OBJEXT config_dirs subdirs LT_STATIC_EXEC PERL AR SET_MAKE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S ECHO RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP CPP EGREP LIBTOOL USE_FILTER_DEFLATE USE_FILTER_SZIP SSL GASS TESTGASS SRB TESTSRB PTHREAD DEBUG_PKG TRACE_API INSTRUMENT_LIBRARY PARALLEL RUNSERIAL RUNPARALLEL TESTPARALLEL MPE FILTERS USE_FILTER_SHUFFLE USE_FILTER_FLETCHER32 H5_VERSION CONFIG_DATE CONFIG_USER CONFIG_MODE BYTESEX STATIC_SHARED CC_VERSION ROOT DYNAMIC_DIRS HL SEARCH SETX LIBOBJS LTLIBOBJS' ac_subst_files='DEPEND COMMENCE CONCLUDE' # Initialize some variables set by options. @@ -31351,306 +31351,6 @@ _ACEOF fi - - -echo "$as_me:$LINENO: checking for PD_open in -lpdb" >&5 -echo $ECHO_N "checking for PD_open in -lpdb... $ECHO_C" >&6 -if test "${ac_cv_lib_pdb_PD_open+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lpdb $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char PD_open (); -int -main () -{ -PD_open (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_pdb_PD_open=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_pdb_PD_open=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_pdb_PD_open" >&5 -echo "${ECHO_T}$ac_cv_lib_pdb_PD_open" >&6 -if test $ac_cv_lib_pdb_PD_open = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBPDB 1 -_ACEOF - - LIBS="-lpdb $LIBS" - -fi - - -echo "$as_me:$LINENO: checking for lite_PD_open in -lsilo" >&5 -echo $ECHO_N "checking for lite_PD_open in -lsilo... $ECHO_C" >&6 -if test "${ac_cv_lib_silo_lite_PD_open+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lsilo $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char lite_PD_open (); -int -main () -{ -lite_PD_open (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_silo_lite_PD_open=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_silo_lite_PD_open=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -echo "$as_me:$LINENO: result: $ac_cv_lib_silo_lite_PD_open" >&5 -echo "${ECHO_T}$ac_cv_lib_silo_lite_PD_open" >&6 -if test $ac_cv_lib_silo_lite_PD_open = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBSILO 1 -_ACEOF - - LIBS="-lsilo $LIBS" - -fi - - -for ac_header in pdb.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -else - # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_header_compiler=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 - -# Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi -rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------ ## -## Report this to hdfhelp@ncsa.uiuc.edu ## -## ------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 - -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - PDB2HDF=pdb2hdf -fi - -done - - cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@ -37713,7 +37413,6 @@ s,@GASS@,$GASS,;t t s,@TESTGASS@,$TESTGASS,;t t s,@SRB@,$SRB,;t t s,@TESTSRB@,$TESTSRB,;t t -s,@PDB2HDF@,$PDB2HDF,;t t s,@PTHREAD@,$PTHREAD,;t t s,@DEBUG_PKG@,$DEBUG_PKG,;t t s,@TRACE_API@,$TRACE_API,;t t diff --git a/configure.in b/configure.in index 4699d9b..d0d74e6 100644 --- a/configure.in +++ b/configure.in @@ -1232,15 +1232,6 @@ if test -n "$SRB"; then AC_DEFINE([HAVE_SRB], [1], [Define if the SRB is defined]) fi -dnl ---------------------------------------------------------------------- -dnl Is LLNL's PDB present? If so then we'll compile the PDB-to-HDF5 -dnl translator. -dnl -AC_SUBST([PDB2HDF]) -AC_CHECK_LIB([pdb], [PD_open]) -AC_CHECK_LIB([silo], [lite_PD_open]) -AC_CHECK_HEADERS([pdb.h], [PDB2HDF=pdb2hdf]) - dnl Checkpoint the cache AC_CACHE_SAVE diff --git a/fortran/configure b/fortran/configure index a795a11..37c89c0 100755 --- a/fortran/configure +++ b/fortran/configure @@ -9623,6 +9623,14 @@ _ACEOF fi +if test "X$F9X_BASENAME" = "Xf95"; then + if test "X$enable_shared" != "Xno"; then + { { echo "$as_me:$LINENO: error: must use --disable-shared when building with Absoft Fortran compiler" >&5 +echo "$as_me: error: must use --disable-shared when building with Absoft Fortran compiler" >&2;} + { (exit 1); exit 1; }; } + fi +fi + echo "$as_me:$LINENO: checking for Stream Virtual File Driver support" >&5 echo $ECHO_N "checking for Stream Virtual File Driver support... $ECHO_C" >&6 # Check whether --enable-stream-vfd or --disable-stream-vfd was given. diff --git a/fortran/configure.in b/fortran/configure.in index d57722c..f9c3f1f 100644 --- a/fortran/configure.in +++ b/fortran/configure.in @@ -596,6 +596,15 @@ if test "x$HAVE_SZLIB" = "xyes" -a "x$HAVE_SZLIB_H" = "xyes"; then fi dnl ---------------------------------------------------------------------- +dnl Absoft compiler must be used with --disable-shared. +dnl +if test "X$F9X_BASENAME" = "Xf95"; then + if test "X$enable_shared" != "Xno"; then + AC_MSG_ERROR([must use --disable-shared when building with Absoft Fortran compiler]) + fi +fi + +dnl ---------------------------------------------------------------------- dnl Should the Stream Virtual File Driver be compiled in ? dnl AC_MSG_CHECKING([for Stream Virtual File Driver support]) diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt index 1f590ee..0d7ba72 100644 --- a/release_docs/RELEASE.txt +++ b/release_docs/RELEASE.txt @@ -92,6 +92,7 @@ New Features KY - 2005/09/12 Tools: ------ + - Removed obsolete pdb2hdf tool. JML - 2005/10/28 - Sped up h5dump on files with large numbers of objects. QAK - 2005/08/25 diff --git a/src/H5config.h.in b/src/H5config.h.in index 19d6751..9b7f6a3 100644 --- a/src/H5config.h.in +++ b/src/H5config.h.in @@ -172,15 +172,9 @@ /* Define to 1 if you have the `nsl' library (-lnsl). */ #undef HAVE_LIBNSL -/* Define to 1 if you have the `pdb' library (-lpdb). */ -#undef HAVE_LIBPDB - /* Define to 1 if you have the `pthread' library (-lpthread). */ #undef HAVE_LIBPTHREAD -/* Define to 1 if you have the `silo' library (-lsilo). */ -#undef HAVE_LIBSILO - /* Define to 1 if you have the `socket' library (-lsocket). */ #undef HAVE_LIBSOCKET @@ -220,9 +214,6 @@ /* Define if we have parallel support */ #undef HAVE_PARALLEL -/* Define to 1 if you have the header file. */ -#undef HAVE_PDB_H - /* Define to 1 if you have the header file. */ #undef HAVE_PTHREAD_H -- cgit v0.12