From 24edaaf9f03c74c1bcc6959ba355ac80be2e080f Mon Sep 17 00:00:00 2001 From: Bill Wendling Date: Tue, 23 Apr 2002 15:02:26 -0500 Subject: [PATCH] [svn-r5235] Purpose: Update Description: Updated the way we used the AC_INIT macros so that it's current to the new standard way and not deprecated anymore. Also, added a test for some functions during parallel Fortran configure. This required the creation of an H5config_fortran.h file so that we can test for these... Platforms tested: Elena is going to test the changes to the fortran after she checks in her other code. I will test on SDSC machines after getting her code. The other changes were tested on Linux. --- MANIFEST | 1 + c++/configure | 370 +++++++++++++------------- c++/configure.in | 371 +++++++++++++------------- configure | 51 ++-- configure.in | 18 +- fortran/configure | 421 ++++++++++++++++++++++++++---- fortran/configure.in | 47 +++- fortran/src/H5config_fortran.h.in | 61 +++++ 8 files changed, 915 insertions(+), 425 deletions(-) create mode 100644 fortran/src/H5config_fortran.h.in diff --git a/MANIFEST b/MANIFEST index 493b18b8e4..f24bdec7b0 100644 --- a/MANIFEST +++ b/MANIFEST @@ -546,6 +546,7 @@ ./fortran/src/H5_ff.f90 ./fortran/src/H5Af.c ./fortran/src/H5Aff.f90 +./fortran/src/H5config_fortran.h.in ./fortran/src/H5Df.c ./fortran/src/H5Dff.f90 ./fortran/src/H5Ef.c diff --git a/c++/configure b/c++/configure index c5cfc0f569..b04c849650 100755 --- a/c++/configure +++ b/c++/configure @@ -1,7 +1,9 @@ #! /bin/sh # From configure.in Id: configure.in. # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.53. +# Generated by GNU Autoconf 2.53 for HDF5 1.5. +# +# Report bugs to . # # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 # Free Software Foundation, Inc. @@ -412,11 +414,11 @@ SHELL=${CONFIG_SHELL-/bin/sh} : ${ac_max_here_lines=38} # Identity of this package. -PACKAGE_NAME= -PACKAGE_TARNAME= -PACKAGE_VERSION= -PACKAGE_STRING= -PACKAGE_BUGREPORT= +PACKAGE_NAME='HDF5' +PACKAGE_TARNAME='hdf5' +PACKAGE_VERSION='1.5' +PACKAGE_STRING='HDF5 1.5' +PACKAGE_BUGREPORT='hdfhelp@ncsa.uiuc.edu' ac_unique_file="src/H5Library.cpp" # Factoring default headers for most tests. @@ -932,7 +934,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 this package to adapt to many kinds of systems. +\`configure' configures HDF5 1.5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -992,7 +994,9 @@ _ACEOF fi if test -n "$ac_init_help"; then - + case $ac_init_help in + short | recursive ) echo "Configuration of HDF5 1.5:";; + esac cat <<\_ACEOF Optional Features: @@ -1026,6 +1030,7 @@ Some influential environment variables: Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. +Report bugs to . _ACEOF fi @@ -1088,6 +1093,8 @@ fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF +HDF5 configure 1.5 +generated by GNU Autoconf 2.53 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. @@ -1101,7 +1108,7 @@ cat >&5 <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by $as_me, which was +It was created by HDF5 $as_me 1.5, which was generated by GNU Autoconf 2.53. Invocation command line was $ $0 $@ @@ -1363,6 +1370,16 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + + + + + + + + @@ -1396,6 +1413,7 @@ ac_config_guess="$SHELL $ac_aux_dir/config.guess" ac_config_sub="$SHELL $ac_aux_dir/config.sub" ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. + # Make sure we can run config.sub. $ac_config_sub sun4 >/dev/null 2>&1 || { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5 @@ -1485,60 +1503,60 @@ echo "$as_me: error: config.cache file is invalid" >&2;} fi case "$host_os" in - aix4.*) - host_os_novers=aix4.x - ;; - freebsd*) - host_os_novers=freebsd - ;; - irix5.*) - host_os_novers=irix5.x - ;; - irix6.*) - host_os_novers=irix6.x - ;; - osf4.*) - host_os_novers=osf4.x - ;; - osf5.*) - host_os_novers=osf5.x - ;; - solaris2.*) - host_os_novers=solaris2.x - ;; - *) - host_os_novers=$host_os - ;; + aix4.*) + host_os_novers=aix4.x + ;; + freebsd*) + host_os_novers=freebsd + ;; + irix5.*) + host_os_novers=irix5.x + ;; + irix6.*) + host_os_novers=irix6.x + ;; + osf4.*) + host_os_novers=osf4.x + ;; + osf5.*) + host_os_novers=osf5.x + ;; + solaris2.*) + host_os_novers=solaris2.x + ;; + *) + host_os_novers=$host_os + ;; esac DEFAULT_LIBS="" host_config="none" for f in $host_cpu-$host_vendor-$host_os \ - $host_cpu-$host_vendor-$host_os_novers \ - $host_vendor-$host_os \ + $host_cpu-$host_vendor-$host_os_novers \ + $host_vendor-$host_os \ $host_vendor-$host_os_novers \ - $host_cpu-$host_os \ + $host_cpu-$host_os \ $host_cpu-$host_os_novers \ $host_cpu-$host_vendor \ - $host_os \ - $host_os_novers \ - $host_vendor \ - $host_cpu ; do - echo "$as_me:$LINENO: checking for config $f" >&5 + $host_os \ + $host_os_novers \ + $host_vendor \ + $host_cpu ; do + echo "$as_me:$LINENO: checking for config $f" >&5 echo $ECHO_N "checking for config $f... $ECHO_C" >&6 - if test -f $srcdir/config/$f; then - host_config=$srcdir/config/$f - echo "$as_me:$LINENO: result: found" >&5 + if test -f $srcdir/config/$f; then + host_config=$srcdir/config/$f + echo "$as_me:$LINENO: result: found" >&5 echo "${ECHO_T}found" >&6 - break - fi - echo "$as_me:$LINENO: result: no" >&5 + break + fi + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 done if test "X$host_config" != "Xnone"; then - CXX_BASENAME="`echo $CXX |cut -f1 -d' ' |xargs basename 2>/dev/null`" - . $host_config + CXX_BASENAME="`echo $CXX |cut -f1 -d' ' |xargs basename 2>/dev/null`" + . $host_config fi ac_ext=cc @@ -4380,7 +4398,7 @@ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes case $host in *-*-irix6*) # Find out which ABI we are using. - echo '#line 4383 "configure"' > conftest.$ac_ext + echo '#line 4401 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -4921,7 +4939,7 @@ chmod -w . save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -o out/conftest2.$ac_objext" compiler_c_o=no -if { (eval echo configure:4924: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then +if { (eval echo configure:4942: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings if test -s out/conftest.err; then @@ -6732,7 +6750,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5 + echo "$as_me:$LINENO: checking how make searches directories" >&5 echo $ECHO_N "checking how make searches directories... $ECHO_C" >&6 - while true; do #for break - cat >maketest <maketest </dev/null 2>&1; then - SEARCH_RULE='VPATH=' - SEARCH_SEP=' ' - echo "$as_me:$LINENO: result: VPATH=DIR1 DIR2 ..." >&5 + if (${MAKE-make} -f maketest foo) >/dev/null 2>&1; then + SEARCH_RULE='VPATH=' + SEARCH_SEP=' ' + echo "$as_me:$LINENO: result: VPATH=DIR1 DIR2 ..." >&5 echo "${ECHO_T}VPATH=DIR1 DIR2 ..." >&6 - break - fi + break + fi - cat >maketest <maketest </dev/null 2>&1; then - SEARCH_RULE='VPATH=' - SEARCH_SEP=':' - echo "$as_me:$LINENO: result: VPATH=DIR1:DIR2:..." >&5 + if (${MAKE-make} -f maketest foo) >/dev/null 2>&1; then + SEARCH_RULE='VPATH=' + SEARCH_SEP=':' + echo "$as_me:$LINENO: result: VPATH=DIR1:DIR2:..." >&5 echo "${ECHO_T}VPATH=DIR1:DIR2:..." >&6 - break - fi + break + fi - cat >maketest <maketest </dev/null 2>&1; then - SEARCH_RULE='.PATH: ' - SEARCH_SEP=' ' - echo "$as_me:$LINENO: result: .PATH: DIR1 DIR2 ..." >&5 -echo "${ECHO_T}.PATH: DIR1 DIR2 ..." >&6 - break - fi - - SEARCH_RULE='## SEARCH DISABLED: ' + if (MAKE= ${MAKE-make} -f maketest foo) >/dev/null 2>&1; then + SEARCH_RULE='.PATH: ' SEARCH_SEP=' ' - echo "$as_me:$LINENO: result: it doesn't" >&5 + echo "$as_me:$LINENO: result: .PATH: DIR1 DIR2 ..." >&5 +echo "${ECHO_T}.PATH: DIR1 DIR2 ..." >&6 + break + fi + + SEARCH_RULE='## SEARCH DISABLED: ' + SEARCH_SEP=' ' + echo "$as_me:$LINENO: result: it doesn't" >&5 echo "${ECHO_T}it doesn't" >&6 - if test ! -f configure; then - { { echo "$as_me:$LINENO: error: ${MAKE-make} requires the build and source directories to be the same" >&5 + if test ! -f configure; then + { { echo "$as_me:$LINENO: error: ${MAKE-make} requires the build and source directories to be the same" >&5 echo "$as_me: error: ${MAKE-make} requires the build and source directories to be the same" >&2;} { (exit 1); exit 1; }; } - fi - break - done - rm maketest + fi + break + done + rm maketest fi echo "$as_me:$LINENO: checking for production mode" >&5 @@ -7724,32 +7742,32 @@ if test "${enable_production+set}" = set; then fi; case "X-$enable_production" in - X-yes) - echo "$as_me:$LINENO: result: \"production\"" >&5 + X-yes) + echo "$as_me:$LINENO: result: \"production\"" >&5 echo "${ECHO_T}\"production\"" >&6 - CONFIG_MODE=production - CXXFLAGS="$CXXFLAGS $PROD_CXXFLAGS" - CPPFLAGS="$CPPFLAGS $PROD_CPPFLAGS" - ;; - X-|X-no) - echo "$as_me:$LINENO: result: \"development\"" >&5 + CONFIG_MODE=production + CXXFLAGS="$CXXFLAGS $PROD_CXXFLAGS" + CPPFLAGS="$CPPFLAGS $PROD_CPPFLAGS" + ;; + X-|X-no) + echo "$as_me:$LINENO: result: \"development\"" >&5 echo "${ECHO_T}\"development\"" >&6 - CONFIG_MODE=development - CXXFLAGS="$CXXFLAGS $DEBUG_CXXFLAGS" - CPPFLAGS="$CPPFLAGS $DEBUG_CPPFLAGS" - ;; - X-pg|X-profile) - echo "$as_me:$LINENO: result: \"profile\"" >&5 + CONFIG_MODE=development + CXXFLAGS="$CXXFLAGS $DEBUG_CXXFLAGS" + CPPFLAGS="$CPPFLAGS $DEBUG_CPPFLAGS" + ;; + X-pg|X-profile) + echo "$as_me:$LINENO: result: \"profile\"" >&5 echo "${ECHO_T}\"profile\"" >&6 - CONFIG_MODE=profile - CXXFLAGS="$CXXFLAGS $PROFILE_CXXFLAGS" - CPPFLAGS="$CPPFLAGS $PROFILE_CPPFLAGS" - ;; - *) - echo "$as_me:$LINENO: result: \"user-defined\"" >&5 + CONFIG_MODE=profile + CXXFLAGS="$CXXFLAGS $PROFILE_CXXFLAGS" + CPPFLAGS="$CPPFLAGS $PROFILE_CPPFLAGS" + ;; + *) + echo "$as_me:$LINENO: result: \"user-defined\"" >&5 echo "${ECHO_T}\"user-defined\"" >&6 - CONFIG_MODE="$X-enableval" - ;; + CONFIG_MODE="$X-enableval" + ;; esac echo "$as_me:$LINENO: checking if should build only statically linked executables" >&5 @@ -7761,11 +7779,11 @@ if test "${enable_static_exec+set}" = set; then fi; if test "X$STATIC_EXEC" = "Xyes"; then - echo "yes" - LT_STATIC_EXEC="-all-static" + echo "yes" + LT_STATIC_EXEC="-all-static" else - echo "no" - LT_STATIC_EXEC="" + echo "no" + LT_STATIC_EXEC="" fi @@ -7805,7 +7823,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo no + echo no else echo "$as_me: program exited with status $ac_status" >&5 @@ -7813,8 +7831,8 @@ echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 ( exit $ac_status ) - echo yes - CXXFLAGS="${CXXFLAGS} -DOLD_HEADER_FILENAME" + echo yes + CXXFLAGS="${CXXFLAGS} -DOLD_HEADER_FILENAME" fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext @@ -7862,7 +7880,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo yes + echo yes else echo "$as_me: program exited with status $ac_status" >&5 @@ -7870,8 +7888,8 @@ echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 ( exit $ac_status ) - echo no - CXXFLAGS="${CXXFLAGS} -DH5_NO_NAMESPACE" + echo no + CXXFLAGS="${CXXFLAGS} -DH5_NO_NAMESPACE" fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext @@ -7906,7 +7924,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo yes + echo yes else echo "$as_me: program exited with status $ac_status" >&5 @@ -7914,8 +7932,8 @@ echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 ( exit $ac_status ) - echo no - CXXFLAGS="${CXXFLAGS} -DBOOL_NOTDEFINED" + echo no + CXXFLAGS="${CXXFLAGS} -DBOOL_NOTDEFINED" fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext @@ -7953,7 +7971,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo yes + echo yes else echo "$as_me: program exited with status $ac_status" >&5 @@ -7961,8 +7979,8 @@ echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 ( exit $ac_status ) - echo no - CXXFLAGS="${CXXFLAGS} -DNO_STATIC_CAST" + echo no + CXXFLAGS="${CXXFLAGS} -DNO_STATIC_CAST" fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext @@ -8028,70 +8046,70 @@ echo "$as_me:$LINENO: checking make" >&5 echo $ECHO_N "checking make... $ECHO_C" >&6 if test "`${MAKE-make} --version -f /dev/null 2>/dev/null |\ - sed -n 1p|cut -c1-8`" = "GNU Make"; then - echo "$as_me:$LINENO: result: GNU make" >&5 + sed -n 1p|cut -c1-8`" = "GNU Make"; then + echo "$as_me:$LINENO: result: GNU make" >&5 echo "${ECHO_T}GNU make" >&6 - GMAKE=yes - if test "X$GCC" = "Xyes"; then - DEPEND=config/depend1 - else - DEPEND=config/depend2 - fi + GMAKE=yes + if test "X$GCC" = "Xyes"; then + DEPEND=config/depend1 + else + DEPEND=config/depend2 + fi else - echo "$as_me:$LINENO: result: generic" >&5 + echo "$as_me:$LINENO: result: generic" >&5 echo "${ECHO_T}generic" >&6 fi if test -z "$DEPEND"; then - echo "$as_me:$LINENO: checking how to include a makefile" >&5 + echo "$as_me:$LINENO: checking how to include a makefile" >&5 echo $ECHO_N "checking how to include a makefile... $ECHO_C" >&6 - cat >makeinc <makeinc <' >maketest - if (MAKE= ${MAKE-make} -f maketest foo) >/dev/null 2>&1; then - echo "$as_me:$LINENO: result: .include " >&5 + while true; do echo '.include ' >maketest + if (MAKE= ${MAKE-make} -f maketest foo) >/dev/null 2>&1; then + echo "$as_me:$LINENO: result: .include " >&5 echo "${ECHO_T}.include " >&6 - DEPEND=config/depend3 - break - fi - - echo 'include makeinc' >maketest - if (${MAKE-make} -f maketest foo) >/dev/null 2>&1; then - echo "$as_me:$LINENO: result: include FILE" >&5 -echo "${ECHO_T}include FILE" >&6 - DEPEND=config/depend4 - break; - fi - - echo "$as_me:$LINENO: result: you have a deficient make command" >&5 -echo "${ECHO_T}you have a deficient make command" >&6 - DEPEND=config/dependN + DEPEND=config/depend3 break - done - rm makeinc maketest + fi + + echo 'include makeinc' >maketest + if (${MAKE-make} -f maketest foo) >/dev/null 2>&1; then + echo "$as_me:$LINENO: result: include FILE" >&5 +echo "${ECHO_T}include FILE" >&6 + DEPEND=config/depend4 + break; + fi + + echo "$as_me:$LINENO: result: you have a deficient make command" >&5 +echo "${ECHO_T}you have a deficient make command" >&6 + DEPEND=config/dependN + break + done + rm makeinc maketest fi rm -f conftest core core.* *.core conftest.o conftest.c dummy.o $ac_clean_files DYNAMIC_DIRS="" if test -n "$LDFLAGS"; then - for d in $LDFLAGS ; do - case "$d" in - -L*) - d=`echo $d | sed -e 's/-L//g'` - case "$d" in - .*) - d=${ROOT}/$d - ;; - esac - DYNAMIC_DIRS="-R${d} $DYNAMIC_DIRS" - ;; - esac - done + for d in $LDFLAGS ; do + case "$d" in + -L*) + d=`echo $d | sed -e 's/-L//g'` + case "$d" in + .*) + d=${ROOT}/$d + ;; + esac + DYNAMIC_DIRS="-R${d} $DYNAMIC_DIRS" + ;; + esac + done fi @@ -8099,15 +8117,15 @@ fi CONCLUDE=config/conclude if test -z "$SEARCH"; then - SEARCH='$(srcdir) $(top_builddir)/src $(top_srcdir)/src' - cmd='echo $SEARCH |sed "s/ /'$SEARCH_SEP'/g"' - SEARCH="$SEARCH_RULE`eval $cmd`" + SEARCH='$(srcdir) $(top_builddir)/src $(top_srcdir)/src' + cmd='echo $SEARCH |sed "s/ /'$SEARCH_SEP'/g"' + SEARCH="$SEARCH_RULE`eval $cmd`" fi if test "X$GMAKE" = "Xyes"; then - SETX=":" + SETX=":" else - SETX="set -x" + SETX="set -x" fi rm -f conftest conftest.o conftest.c core core.* *.core dummy.o @@ -8473,7 +8491,7 @@ _ASBOX } >&5 cat >&5 <<_CSEOF -This file was extended by $as_me, which was +This file was extended by HDF5 $as_me 1.5, which was generated by GNU Autoconf 2.53. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -8527,7 +8545,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -config.status +HDF5 config.status 1.5 configured by $0, generated by GNU Autoconf 2.53, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff --git a/c++/configure.in b/c++/configure.in index 17501c3c1a..00cc44237c 100644 --- a/c++/configure.in +++ b/c++/configure.in @@ -10,8 +10,19 @@ dnl ---------------------------------------------------------------------- dnl Initialize configure. dnl AC_REVISION($Id$) -AC_INIT(src/H5Library.cpp) -AC_CONFIG_AUX_DIR(../bin) + +dnl AC_INIT takes the name of the package, the version number, and an +dnl email address to report bugs. AC_CONFIG_SRCDIR takes a unique file +dnl as its argument. +dnl +dnl NOTE: Don't forget to change the version number here when we do a +dnl release!!! +dnl +AC_INIT([HDF5], [1.5], [hdfhelp@ncsa.uiuc.edu]) +AC_CONFIG_SRCDIR([src/H5Library.cpp]) + +AC_CONFIG_AUX_DIR([../bin]) + AC_CANONICAL_HOST AC_SUBST(CPPFLAGS) @@ -65,30 +76,30 @@ dnl dnl If the `OS' ends with a version number then remove it. For instance, dnl `freebsd3.1' would become `freebsd' case "$host_os" in - aix4.*) - host_os_novers=aix4.x - ;; - freebsd*) - host_os_novers=freebsd - ;; - irix5.*) - host_os_novers=irix5.x - ;; - irix6.*) - host_os_novers=irix6.x - ;; - osf4.*) - host_os_novers=osf4.x - ;; - osf5.*) - host_os_novers=osf5.x - ;; - solaris2.*) - host_os_novers=solaris2.x - ;; - *) - host_os_novers=$host_os - ;; + aix4.*) + host_os_novers=aix4.x + ;; + freebsd*) + host_os_novers=freebsd + ;; + irix5.*) + host_os_novers=irix5.x + ;; + irix6.*) + host_os_novers=irix6.x + ;; + osf4.*) + host_os_novers=osf4.x + ;; + osf5.*) + host_os_novers=osf5.x + ;; + solaris2.*) + host_os_novers=solaris2.x + ;; + *) + host_os_novers=$host_os + ;; esac dnl Different compilers may need default libraries. They are specified in @@ -99,27 +110,27 @@ AC_SUBST(DEFAULT_LIBS) DEFAULT_LIBS="" host_config="none" for f in $host_cpu-$host_vendor-$host_os \ - $host_cpu-$host_vendor-$host_os_novers \ - $host_vendor-$host_os \ + $host_cpu-$host_vendor-$host_os_novers \ + $host_vendor-$host_os \ $host_vendor-$host_os_novers \ - $host_cpu-$host_os \ + $host_cpu-$host_os \ $host_cpu-$host_os_novers \ $host_cpu-$host_vendor \ - $host_os \ - $host_os_novers \ - $host_vendor \ - $host_cpu ; do - AC_MSG_CHECKING(for config $f) - if test -f $srcdir/config/$f; then - host_config=$srcdir/config/$f - AC_MSG_RESULT(found) - break - fi - AC_MSG_RESULT(no) + $host_os \ + $host_os_novers \ + $host_vendor \ + $host_cpu ; do + AC_MSG_CHECKING(for config $f) + if test -f $srcdir/config/$f; then + host_config=$srcdir/config/$f + AC_MSG_RESULT(found) + break + fi + AC_MSG_RESULT(no) done if test "X$host_config" != "Xnone"; then - CXX_BASENAME="`echo $CXX |cut -f1 -d' ' |xargs basename 2>/dev/null`" - . $host_config + CXX_BASENAME="`echo $CXX |cut -f1 -d' ' |xargs basename 2>/dev/null`" + . $host_config fi dnl ---------------------------------------------------------------------- @@ -152,47 +163,47 @@ dnl with an action should override the `all' default target. So we have dnl to decide what the proper syntax is. dnl if test -z "$SEARCH"; then - AC_MSG_CHECKING(how make searches directories) - while true; do #for break - dnl The most common method is `VPATH=DIR1 DIR2 ...' - cat >maketest <maketest </dev/null 2>&1; then - SEARCH_RULE='VPATH=' - SEARCH_SEP=' ' - AC_MSG_RESULT([VPATH=DIR1 DIR2 ...]) - break - fi - - dnl The second most common method is like above except with the - dnl directories separated by colons. - cat >maketest </dev/null 2>&1; then + SEARCH_RULE='VPATH=' + SEARCH_SEP=' ' + AC_MSG_RESULT([VPATH=DIR1 DIR2 ...]) + break + fi + + dnl The second most common method is like above except with the + dnl directories separated by colons. + cat >maketest </dev/null 2>&1; then - SEARCH_RULE='VPATH=' - SEARCH_SEP=':' - AC_MSG_RESULT([VPATH=DIR1:DIR2:...]) - break - fi - - dnl pmake uses the construct `.PATH: DIR1 DIR2 - cat >maketest </dev/null 2>&1; then + SEARCH_RULE='VPATH=' + SEARCH_SEP=':' + AC_MSG_RESULT([VPATH=DIR1:DIR2:...]) + break + fi + + dnl pmake uses the construct `.PATH: DIR1 DIR2 + cat >maketest </dev/null 2>&1; then - SEARCH_RULE='.PATH: ' - SEARCH_SEP=' ' - AC_MSG_RESULT([.PATH: DIR1 DIR2 ...]) - break - fi - - dnl No way for make to search directories - SEARCH_RULE='## SEARCH DISABLED: ' + if (MAKE= ${MAKE-make} -f maketest foo) >/dev/null 2>&1; then + SEARCH_RULE='.PATH: ' SEARCH_SEP=' ' - AC_MSG_RESULT([it doesn't]) - if test ! -f configure; then - AC_MSG_ERROR(${MAKE-make} requires the build and source directories to be the same) - fi + AC_MSG_RESULT([.PATH: DIR1 DIR2 ...]) break - done - rm maketest + fi + + dnl No way for make to search directories + SEARCH_RULE='## SEARCH DISABLED: ' + SEARCH_SEP=' ' + AC_MSG_RESULT([it doesn't]) + if test ! -f configure; then + AC_MSG_ERROR(${MAKE-make} requires the build and source directories to be the same) + fi + break + done + rm maketest fi dnl ---------------------------------------------------------------------- @@ -229,28 +240,28 @@ AC_ARG_ENABLE(production, [ --enable-production Determines how to run the compiler.]) case "X-$enable_production" in - X-yes) - AC_MSG_RESULT("production") - CONFIG_MODE=production - CXXFLAGS="$CXXFLAGS $PROD_CXXFLAGS" - CPPFLAGS="$CPPFLAGS $PROD_CPPFLAGS" - ;; - X-|X-no) - AC_MSG_RESULT("development") - CONFIG_MODE=development - CXXFLAGS="$CXXFLAGS $DEBUG_CXXFLAGS" - CPPFLAGS="$CPPFLAGS $DEBUG_CPPFLAGS" - ;; - X-pg|X-profile) - AC_MSG_RESULT("profile") - CONFIG_MODE=profile - CXXFLAGS="$CXXFLAGS $PROFILE_CXXFLAGS" - CPPFLAGS="$CPPFLAGS $PROFILE_CPPFLAGS" - ;; - *) - AC_MSG_RESULT("user-defined") - CONFIG_MODE="$X-enableval" - ;; + X-yes) + AC_MSG_RESULT("production") + CONFIG_MODE=production + CXXFLAGS="$CXXFLAGS $PROD_CXXFLAGS" + CPPFLAGS="$CPPFLAGS $PROD_CPPFLAGS" + ;; + X-|X-no) + AC_MSG_RESULT("development") + CONFIG_MODE=development + CXXFLAGS="$CXXFLAGS $DEBUG_CXXFLAGS" + CPPFLAGS="$CPPFLAGS $DEBUG_CPPFLAGS" + ;; + X-pg|X-profile) + AC_MSG_RESULT("profile") + CONFIG_MODE=profile + CXXFLAGS="$CXXFLAGS $PROFILE_CXXFLAGS" + CPPFLAGS="$CPPFLAGS $PROFILE_CPPFLAGS" + ;; + *) + AC_MSG_RESULT("user-defined") + CONFIG_MODE="$X-enableval" + ;; esac dnl ---------------------------------------------------------------------- @@ -258,15 +269,15 @@ dnl If we should build only static executables dnl AC_MSG_CHECKING(if should build only statically linked executables) AC_ARG_ENABLE(static_exec, - [ --enable-static-exec Build only statically linked executables [default=no]], - STATIC_EXEC=$enableval) + [ --enable-static-exec Build only statically linked executables [default=no]], + STATIC_EXEC=$enableval) if test "X$STATIC_EXEC" = "Xyes"; then - echo "yes" - LT_STATIC_EXEC="-all-static" + echo "yes" + LT_STATIC_EXEC="-all-static" else - echo "no" - LT_STATIC_EXEC="" + echo "no" + LT_STATIC_EXEC="" fi AC_SUBST(LT_STATIC_EXEC) @@ -281,10 +292,10 @@ AC_TRY_RUN([ int main(void) { return 0; } ], [ - echo no + echo no ], [ - echo yes - CXXFLAGS="${CXXFLAGS} -DOLD_HEADER_FILENAME" + echo yes + CXXFLAGS="${CXXFLAGS} -DOLD_HEADER_FILENAME" ]) AC_MSG_CHECKING(if $CXX can handle namespaces) @@ -307,10 +318,10 @@ int main(void) { return 0; } ], [ - echo yes + echo yes ], [ - echo no - CXXFLAGS="${CXXFLAGS} -DH5_NO_NAMESPACE" + echo no + CXXFLAGS="${CXXFLAGS} -DH5_NO_NAMESPACE" ]) AC_MSG_CHECKING(if $CXX supports bool types) @@ -320,10 +331,10 @@ int main(void) { return 0; } ], [ - echo yes + echo yes ], [ - echo no - CXXFLAGS="${CXXFLAGS} -DBOOL_NOTDEFINED" + echo no + CXXFLAGS="${CXXFLAGS} -DBOOL_NOTDEFINED" ]) AC_MSG_CHECKING(if $CXX can handle static cast) @@ -336,10 +347,10 @@ int main(void) { return 0; } ], [ - echo yes + echo yes ], [ - echo no - CXXFLAGS="${CXXFLAGS} -DNO_STATIC_CAST" + echo no + CXXFLAGS="${CXXFLAGS} -DNO_STATIC_CAST" ]) dnl ---------------------------------------------------------------------- @@ -352,52 +363,52 @@ AC_CACHE_SAVE AC_MSG_CHECKING(make) AC_SUBST_FILE(DEPEND) if test "`${MAKE-make} --version -f /dev/null 2>/dev/null |\ - sed -n 1p|cut -c1-8`" = "GNU Make"; then - AC_MSG_RESULT(GNU make) - GMAKE=yes - if test "X$GCC" = "Xyes"; then - DEPEND=config/depend1 - else - DEPEND=config/depend2 - fi + sed -n 1p|cut -c1-8`" = "GNU Make"; then + AC_MSG_RESULT(GNU make) + GMAKE=yes + if test "X$GCC" = "Xyes"; then + DEPEND=config/depend1 + else + DEPEND=config/depend2 + fi else - AC_MSG_RESULT(generic) + AC_MSG_RESULT(generic) fi dnl How do we include another file into a Makefile? if test -z "$DEPEND"; then - AC_MSG_CHECKING(how to include a makefile) + AC_MSG_CHECKING(how to include a makefile) - dnl The include file contains the target for `foo' - cat >makeinc <makeinc <' >maketest - if (MAKE= ${MAKE-make} -f maketest foo) >/dev/null 2>&1; then - AC_MSG_RESULT([.include ]) - DEPEND=config/depend3 - break - fi - - dnl Most make's use `include FILE' - echo 'include makeinc' >maketest - if (${MAKE-make} -f maketest foo) >/dev/null 2>&1; then - AC_MSG_RESULT(include FILE) - DEPEND=config/depend4 - break; - fi - - dnl default - AC_MSG_RESULT(you have a deficient make command) - DEPEND=config/dependN + while true; do dnl for break + dnl pmake. We have to be careful because some pmake think that the + dnl contents of the MAKE environment variable is a target. + echo '.include ' >maketest + if (MAKE= ${MAKE-make} -f maketest foo) >/dev/null 2>&1; then + AC_MSG_RESULT([.include ]) + DEPEND=config/depend3 break - done - rm makeinc maketest + fi + + dnl Most make's use `include FILE' + echo 'include makeinc' >maketest + if (${MAKE-make} -f maketest foo) >/dev/null 2>&1; then + AC_MSG_RESULT(include FILE) + DEPEND=config/depend4 + break; + fi + + dnl default + AC_MSG_RESULT(you have a deficient make command) + DEPEND=config/dependN + break + done + rm makeinc maketest fi dnl Some cleanup stuff @@ -410,21 +421,21 @@ dnl libraries. dnl DYNAMIC_DIRS="" if test -n "$LDFLAGS"; then - for d in $LDFLAGS ; do - case "$d" in - -L*) - d=`echo $d | sed -e 's/-L//g'` - case "$d" in - .*) - dnl If the path isn't absolute, make it so by prepending the - dnl ROOT directory to it. - d=${ROOT}/$d - ;; - esac - DYNAMIC_DIRS="-R${d} $DYNAMIC_DIRS" - ;; - esac - done + for d in $LDFLAGS ; do + case "$d" in + -L*) + d=`echo $d | sed -e 's/-L//g'` + case "$d" in + .*) + dnl If the path isn't absolute, make it so by prepending the + dnl ROOT directory to it. + d=${ROOT}/$d + ;; + esac + DYNAMIC_DIRS="-R${d} $DYNAMIC_DIRS" + ;; + esac + done fi AC_SUBST(DYNAMIC_DIRS) @@ -438,17 +449,17 @@ AC_SUBST_FILE(CONCLUDE) CONCLUDE=config/conclude dnl The directory search list if test -z "$SEARCH"; then - AC_SUBST(SEARCH) SEARCH='$(srcdir) $(top_builddir)/src $(top_srcdir)/src' - cmd='echo $SEARCH |sed "s/ /'$SEARCH_SEP'/g"' - SEARCH="$SEARCH_RULE`eval $cmd`" + AC_SUBST(SEARCH) SEARCH='$(srcdir) $(top_builddir)/src $(top_srcdir)/src' + cmd='echo $SEARCH |sed "s/ /'$SEARCH_SEP'/g"' + SEARCH="$SEARCH_RULE`eval $cmd`" fi dnl We don't need to say when we're entering directories if we're using dnl GNU make becuase make does it for us. if test "X$GMAKE" = "Xyes"; then - AC_SUBST(SETX) SETX=":" + AC_SUBST(SETX) SETX=":" else - AC_SUBST(SETX) SETX="set -x" + AC_SUBST(SETX) SETX="set -x" fi dnl Some cleanup stuff diff --git a/configure b/configure index 0eea1010cd..faaebb7d8e 100755 --- a/configure +++ b/configure @@ -1,7 +1,9 @@ #! /bin/sh # From configure.in Id: configure.in. # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.53. +# Generated by GNU Autoconf 2.53 for HDF5 1.5. +# +# Report bugs to . # # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 # Free Software Foundation, Inc. @@ -412,11 +414,11 @@ SHELL=${CONFIG_SHELL-/bin/sh} : ${ac_max_here_lines=38} # Identity of this package. -PACKAGE_NAME= -PACKAGE_TARNAME= -PACKAGE_VERSION= -PACKAGE_STRING= -PACKAGE_BUGREPORT= +PACKAGE_NAME='HDF5' +PACKAGE_TARNAME='hdf5' +PACKAGE_VERSION='1.5' +PACKAGE_STRING='HDF5 1.5' +PACKAGE_BUGREPORT='hdfhelp@ncsa.uiuc.edu' ac_unique_file="src/H5.c" ac_subdirs_all="$ac_subdirs_all ${config_dirs}" @@ -921,7 +923,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 this package to adapt to many kinds of systems. +\`configure' configures HDF5 1.5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -981,7 +983,9 @@ _ACEOF fi if test -n "$ac_init_help"; then - + case $ac_init_help in + short | recursive ) echo "Configuration of HDF5 1.5:";; + esac cat <<\_ACEOF Optional Features: @@ -1047,6 +1051,7 @@ Some influential environment variables: Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. +Report bugs to . _ACEOF fi @@ -1109,6 +1114,8 @@ fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF +HDF5 configure 1.5 +generated by GNU Autoconf 2.53 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. @@ -1122,7 +1129,7 @@ cat >&5 <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by $as_me, which was +It was created by HDF5 $as_me 1.5, which was generated by GNU Autoconf 2.53. Invocation command line was $ $0 $@ @@ -1385,6 +1392,15 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + + + + + + + @@ -1394,7 +1410,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu ac_config_headers="$ac_config_headers src/H5config.h" -ac_config_commands="$ac_config_commands default-1" ac_aux_dir= for ac_dir in bin $srcdir/bin; do @@ -1421,6 +1436,10 @@ ac_config_guess="$SHELL $ac_aux_dir/config.guess" ac_config_sub="$SHELL $ac_aux_dir/config.sub" ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. + +ac_config_commands="$ac_config_commands default-1" + + # Make sure we can run config.sub. $ac_config_sub sun4 >/dev/null 2>&1 || { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5 @@ -4078,7 +4097,7 @@ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes case $host in *-*-irix6*) # Find out which ABI we are using. - echo '#line 4081 "configure"' > conftest.$ac_ext + echo '#line 4100 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -4619,7 +4638,7 @@ chmod -w . save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -o out/conftest2.$ac_objext" compiler_c_o=no -if { (eval echo configure:4622: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then +if { (eval echo configure:4641: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings if test -s out/conftest.err; then @@ -6430,7 +6449,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5 cat >&5 <<_CSEOF -This file was extended by $as_me, which was +This file was extended by HDF5 $as_me 1.5, which was generated by GNU Autoconf 2.53. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -29967,7 +29986,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -config.status +HDF5 config.status 1.5 configured by $0, generated by GNU Autoconf 2.53, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff --git a/configure.in b/configure.in index d30e9b7faf..80b39b9d20 100644 --- a/configure.in +++ b/configure.in @@ -8,8 +8,20 @@ dnl ---------------------------------------------------------------------- dnl Initialize configure. dnl AC_REVISION($Id$) -AC_INIT(src/H5.c) -AC_CONFIG_HEADER(src/H5config.h) + +dnl AC_INIT takes the name of the package, the version number, and an +dnl email address to report bugs. AC_CONFIG_SRCDIR takes a unique file +dnl as its argument. +dnl +dnl NOTE: Don't forget to change the version number here when we do a +dnl release!!! +dnl +AC_INIT([HDF5], [1.5], [hdfhelp@ncsa.uiuc.edu]) +AC_CONFIG_SRCDIR([src/H5.c]) +AC_CONFIG_HEADER([src/H5config.h]) + +AC_CONFIG_AUX_DIR([bin]) + AC_OUTPUT_COMMANDS([ echo "creating src/H5pubconf.h" sed 's/#define /#define H5_/' . # # Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 # Free Software Foundation, Inc. @@ -412,11 +414,11 @@ SHELL=${CONFIG_SHELL-/bin/sh} : ${ac_max_here_lines=38} # Identity of this package. -PACKAGE_NAME= -PACKAGE_TARNAME= -PACKAGE_VERSION= -PACKAGE_STRING= -PACKAGE_BUGREPORT= +PACKAGE_NAME='HDF5 Fortran' +PACKAGE_TARNAME='hdf5-fortran' +PACKAGE_VERSION='1.5' +PACKAGE_STRING='HDF5 Fortran 1.5' +PACKAGE_BUGREPORT='hdfhelp@ncsa.uiuc.edu' ac_unique_file="src/HDF5.f90" # Factoring default headers for most tests. @@ -920,7 +922,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 this package to adapt to many kinds of systems. +\`configure' configures HDF5 Fortran 1.5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -980,7 +982,9 @@ _ACEOF fi if test -n "$ac_init_help"; then - + case $ac_init_help in + short | recursive ) echo "Configuration of HDF5 Fortran 1.5:";; + esac cat <<\_ACEOF Optional Features: @@ -1012,6 +1016,7 @@ Some influential environment variables: Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. +Report bugs to . _ACEOF fi @@ -1074,6 +1079,8 @@ fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF +HDF5 Fortran configure 1.5 +generated by GNU Autoconf 2.53 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. @@ -1087,7 +1094,7 @@ cat >&5 <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by $as_me, which was +It was created by HDF5 Fortran $as_me 1.5, which was generated by GNU Autoconf 2.53. Invocation command line was $ $0 $@ @@ -1357,6 +1364,18 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + + + + + + + +ac_config_headers="$ac_config_headers src/H5config_fortran.h" + + ac_aux_dir= for ac_dir in ../bin $srcdir/../bin; do if test -f $ac_dir/install-sh; then @@ -1382,6 +1401,7 @@ ac_config_guess="$SHELL $ac_aux_dir/config.guess" ac_config_sub="$SHELL $ac_aux_dir/config.sub" ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. + # Make sure we can run config.sub. $ac_config_sub sun4 >/dev/null 2>&1 || { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5 @@ -3853,7 +3873,7 @@ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes case $host in *-*-irix6*) # Find out which ABI we are using. - echo '#line 3856 "configure"' > conftest.$ac_ext + echo '#line 3876 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -4394,7 +4414,7 @@ chmod -w . save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -o out/conftest2.$ac_objext" compiler_c_o=no -if { (eval echo configure:4397: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then +if { (eval echo configure:4417: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings if test -s out/conftest.err; then @@ -6205,7 +6225,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&2;} fi ADD_PARALLEL_FILES="yes" + + echo "$as_me:$LINENO: checking for MPI_Comm_c2f and MPI_Comm_f2c functions" >&5 +echo $ECHO_N "checking for MPI_Comm_c2f and MPI_Comm_f2c functions... $ECHO_C" >&6 + + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +#include "confdefs.h" + +#include + +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ +MPI_Comm_c2f(); return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 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 + +cat >>confdefs.h <<\_ACEOF +#define HAVE_MPI_MULTI_LANG_Comm 1 +_ACEOF + + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + +fi +rm -f conftest.$ac_objext conftest.$ac_ext + + echo "$as_me:$LINENO: checking for MPI_Info_c2f and MPI_Info_f2c functions" >&5 +echo $ECHO_N "checking for MPI_Info_c2f and MPI_Info_f2c functions... $ECHO_C" >&6 + cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "configure" +#include "confdefs.h" + +#include + +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ +MPI_Info_c2f(); return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 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 + +cat >>confdefs.h <<\_ACEOF +#define HAVE_MPI_MULTI_LANG_Info 1 +_ACEOF + + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + +fi +rm -f conftest.$ac_objext conftest.$ac_ext + + ac_ext=f90 +ac_compile='${F9X-f90} -c $FFLAGS conftest.$ac_ext 1>&5' +ac_link='${F9X-f90} -o conftest${ac_exeext} $FFLAGS conftest.$ac_ext $LDFLAGS $LIBS 1>&5' +cross_compiling=$ac_cv_prog_f9x_cross + fi @@ -8482,38 +8616,7 @@ s/^[^=]*=[ ]*$//; }' fi -# Transform confdefs.h into DEFS. -# Protect against shell expansion while executing Makefile rules. -# Protect against Makefile macro expansion. -# -# If the first sed substitution is executed (which looks for macros that -# take arguments), then we branch to the quote section. Otherwise, -# look for a macro that doesn't take arguments. -cat >confdef2opt.sed <<\_ACEOF -t clear -: clear -s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g -t quote -s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\),-D\1=\2,g -t quote -d -: quote -s,[ `~#$^&*(){}\\|;'"<>?],\\&,g -s,\[,\\&,g -s,\],\\&,g -s,\$,$$,g -p -_ACEOF -# We use echo to avoid assuming a particular line-breaking character. -# The extra dot is to prevent the shell from consuming trailing -# line-breaks from the sub-command output. A line-break within -# single-quotes doesn't work because, if this script is created in a -# platform that uses two characters for line-breaks (e.g., DOS), tr -# would break. -ac_LF_and_DOT=`echo; echo .` -DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'` -rm -f confdef2opt.sed - +DEFS=-DHAVE_CONFIG_H : ${CONFIG_STATUS=./config.status} @@ -8764,7 +8867,7 @@ _ASBOX } >&5 cat >&5 <<_CSEOF -This file was extended by $as_me, which was +This file was extended by HDF5 Fortran $as_me 1.5, which was generated by GNU Autoconf 2.53. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -8809,16 +8912,21 @@ Usage: $0 [OPTIONS] [FILE]... --recheck update $as_me by reconfiguring in the same conditions --file=FILE[:TEMPLATE] instantiate the configuration file FILE + --header=FILE[:TEMPLATE] + instantiate the configuration header FILE Configuration files: $config_files +Configuration headers: +$config_headers + Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -config.status +HDF5 Fortran config.status 1.5 configured by $0, generated by GNU Autoconf 2.53, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" @@ -8918,6 +9026,7 @@ do "test/Makefile" ) CONFIG_FILES="$CONFIG_FILES test/Makefile" ;; "$PARALLEL_MAKE" ) CONFIG_FILES="$CONFIG_FILES $PARALLEL_MAKE" ;; "examples/Makefile" ) CONFIG_FILES="$CONFIG_FILES examples/Makefile" ;; + "src/H5config_fortran.h" ) CONFIG_HEADERS="$CONFIG_HEADERS src/H5config_fortran.h" ;; *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; @@ -8930,6 +9039,7 @@ done # bizarre bug on SunOS 4.1.3. if $ac_need_defaults; then test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files + test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers fi # Create a temporary directory, and hook for its removal unless debugging. @@ -9254,6 +9364,223 @@ s,@INSTALL@,$ac_INSTALL,;t t done _ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF + +# +# CONFIG_HEADER section. +# + +# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where +# NAME is the cpp macro being defined and VALUE is the value it is being given. +# +# ac_d sets the value in "#define NAME VALUE" lines. +ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)' +ac_dB='[ ].*$,\1#\2' +ac_dC=' ' +ac_dD=',;t' +# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE". +ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' +ac_uB='$,\1#\2define\3' +ac_uC=' ' +ac_uD=',;t' + +for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue + # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". + case $ac_file in + - | *:- | *:-:* ) # input from stdin + cat >$tmp/stdin + ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` + ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; + *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` + ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; + * ) ac_file_in=$ac_file.in ;; + esac + + test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5 +echo "$as_me: creating $ac_file" >&6;} + + # First look for the input files in the build tree, otherwise in the + # src tree. + ac_file_inputs=`IFS=: + for f in $ac_file_in; do + case $f in + -) echo $tmp/stdin ;; + [\\/$]*) + # Absolute (can't be DOS-style, as IFS=:) + test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 +echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + echo $f;; + *) # Relative + if test -f "$f"; then + # Build tree + echo $f + elif test -f "$srcdir/$f"; then + # Source tree + echo $srcdir/$f + else + # /dev/null tree + { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 +echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + fi;; + esac + done` || { (exit 1); exit 1; } + # Remove the trailing spaces. + sed 's/[ ]*$//' $ac_file_inputs >$tmp/in + +_ACEOF + +# Transform confdefs.h into two sed scripts, `conftest.defines' and +# `conftest.undefs', that substitutes the proper values into +# config.h.in to produce config.h. The first handles `#define' +# templates, and the second `#undef' templates. +# And first: Protect against being on the right side of a sed subst in +# config.status. Protect against being in an unquoted here document +# in config.status. +rm -f conftest.defines conftest.undefs +# Using a here document instead of a string reduces the quoting nightmare. +# Putting comments in sed scripts is not portable. +# +# `end' is used to avoid that the second main sed command (meant for +# 0-ary CPP macros) applies to n-ary macro definitions. +# See the Autoconf documentation for `clear'. +cat >confdef2sed.sed <<\_ACEOF +s/[\\&,]/\\&/g +s,[\\$`],\\&,g +t clear +: clear +s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*\)\(([^)]*)\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp +t end +s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp +: end +_ACEOF +# If some macros were called several times there might be several times +# the same #defines, which is useless. Nevertheless, we may not want to +# sort them, since we want the *last* AC-DEFINE to be honored. +uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines +sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs +rm -f confdef2sed.sed + +# This sed command replaces #undef with comments. This is necessary, for +# example, in the case of _POSIX_SOURCE, which is predefined and required +# on some systems where configure will not decide to define it. +cat >>conftest.undefs <<\_ACEOF +s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */, +_ACEOF + +# Break up conftest.defines because some shells have a limit on the size +# of here documents, and old seds have small limits too (100 cmds). +echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS +echo ' if egrep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS +echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS +echo ' :' >>$CONFIG_STATUS +rm -f conftest.tail +while grep . conftest.defines >/dev/null +do + # Write a limited-size here document to $tmp/defines.sed. + echo ' cat >$tmp/defines.sed <>$CONFIG_STATUS + # Speed up: don't consider the non `#define' lines. + echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS + # Work around the forget-to-reset-the-flag bug. + echo 't clr' >>$CONFIG_STATUS + echo ': clr' >>$CONFIG_STATUS + sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS + echo 'CEOF + sed -f $tmp/defines.sed $tmp/in >$tmp/out + rm -f $tmp/in + mv $tmp/out $tmp/in +' >>$CONFIG_STATUS + sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail + rm -f conftest.defines + mv conftest.tail conftest.defines +done +rm -f conftest.defines +echo ' fi # egrep' >>$CONFIG_STATUS +echo >>$CONFIG_STATUS + +# Break up conftest.undefs because some shells have a limit on the size +# of here documents, and old seds have small limits too (100 cmds). +echo ' # Handle all the #undef templates' >>$CONFIG_STATUS +rm -f conftest.tail +while grep . conftest.undefs >/dev/null +do + # Write a limited-size here document to $tmp/undefs.sed. + echo ' cat >$tmp/undefs.sed <>$CONFIG_STATUS + # Speed up: don't consider the non `#undef' + echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS + # Work around the forget-to-reset-the-flag bug. + echo 't clr' >>$CONFIG_STATUS + echo ': clr' >>$CONFIG_STATUS + sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS + echo 'CEOF + sed -f $tmp/undefs.sed $tmp/in >$tmp/out + rm -f $tmp/in + mv $tmp/out $tmp/in +' >>$CONFIG_STATUS + sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail + rm -f conftest.undefs + mv conftest.tail conftest.undefs +done +rm -f conftest.undefs + +cat >>$CONFIG_STATUS <<\_ACEOF + # Let's still pretend it is `configure' which instantiates (i.e., don't + # use $as_me), people would be surprised to read: + # /* config.h. Generated by config.status. */ + if test x"$ac_file" = x-; then + echo "/* Generated by configure. */" >$tmp/config.h + else + echo "/* $ac_file. Generated by configure. */" >$tmp/config.h + fi + cat $tmp/in >>$tmp/config.h + rm -f $tmp/in + if test x"$ac_file" != x-; then + if cmp -s $ac_file $tmp/config.h 2>/dev/null; then + { echo "$as_me:$LINENO: $ac_file is unchanged" >&5 +echo "$as_me: $ac_file is unchanged" >&6;} + else + ac_dir=`(dirname "$ac_file") 2>/dev/null || +$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$ac_file" : 'X\(//\)[^/]' \| \ + X"$ac_file" : 'X\(//\)$' \| \ + X"$ac_file" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || +echo X"$ac_file" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` + { case "$ac_dir" in + [\\/]* | ?:[\\/]* ) as_incr_dir=;; + *) as_incr_dir=.;; +esac +as_dummy="$ac_dir" +for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do + case $as_mkdir_dir in + # Skip DOS drivespec + ?:) as_incr_dir=$as_mkdir_dir ;; + *) + as_incr_dir=$as_incr_dir/$as_mkdir_dir + test -d "$as_incr_dir" || + mkdir "$as_incr_dir" || + { { echo "$as_me:$LINENO: error: cannot create \"$ac_dir\"" >&5 +echo "$as_me: error: cannot create \"$ac_dir\"" >&2;} + { (exit 1); exit 1; }; } + ;; + esac +done; } + + rm -f $ac_file + mv $tmp/config.h $ac_file + fi + else + cat $tmp/config.h + rm -f $tmp/config.h + fi +done +_ACEOF cat >>$CONFIG_STATUS <<\_ACEOF diff --git a/fortran/configure.in b/fortran/configure.in index b013810e03..62533ed801 100644 --- a/fortran/configure.in +++ b/fortran/configure.in @@ -10,8 +10,20 @@ dnl ---------------------------------------------------------------------- dnl Initialize configure. dnl AC_REVISION($Id$) -AC_INIT(src/HDF5.f90) -AC_CONFIG_AUX_DIR(../bin) + +dnl AC_INIT takes the name of the package, the version number, and an +dnl email address to report bugs. AC_CONFIG_SRCDIR takes a unique file +dnl as its argument. +dnl +dnl NOTE: Don't forget to change the version number here when we do a +dnl release!!! +dnl +AC_INIT([HDF5 Fortran], [1.5], [hdfhelp@ncsa.uiuc.edu]) +AC_CONFIG_SRCDIR([src/HDF5.f90]) +AC_CONFIG_HEADER([src/H5config_fortran.h]) + +AC_CONFIG_AUX_DIR([../bin]) + AC_CANONICAL_HOST AC_SUBST(CPPFLAGS) AC_SUBST(FFLAGS) @@ -531,6 +543,35 @@ if test -n "$PARALLEL"; then fi ADD_PARALLEL_FILES="yes" + + AC_MSG_CHECKING([for MPI_Comm_c2f and MPI_Comm_f2c functions]) + + dnl Change to the C language + AC_LANG_C + + AC_TRY_COMPILE([ +#include + ], + [MPI_Comm_c2f(); return 0;], + AC_DEFINE(HAVE_MPI_MULTI_LANG_Comm, 1, + [Define if \`MPI_Comm_c2f' and \`MPI_Comm_f2c' exists]) + AC_MSG_RESULT(yes), + AC_MSG_RESULT(no) + ) + + AC_MSG_CHECKING([for MPI_Info_c2f and MPI_Info_f2c functions]) + AC_TRY_COMPILE([ +#include + ], + [MPI_Info_c2f(); return 0;], + AC_DEFINE(HAVE_MPI_MULTI_LANG_Info, 1, + [Define if \`MPI_Info_c2f' and \`MPI_Info_f2c' exists]) + AC_MSG_RESULT(yes), + AC_MSG_RESULT(no) + ) + + dnl Change to the Fortran 90 language + AC_LANG_FORTRAN9X fi AC_SUBST(ADD_PARALLEL_FILES) @@ -672,7 +713,7 @@ AC_CONFIG_FILES([config/depend1 AC_OUTPUT no_create=$saved_no_create -dnl Then the stamp2 file for H5config.h +dnl Then the stamp2 file for H5config_fortran.h touch ./config/stamp2 dnl Finally the makefiles diff --git a/fortran/src/H5config_fortran.h.in b/fortran/src/H5config_fortran.h.in new file mode 100644 index 0000000000..0e94c9f0c3 --- /dev/null +++ b/fortran/src/H5config_fortran.h.in @@ -0,0 +1,61 @@ +/* src/H5config_fortran.h.in. Generated from configure.in by autoheader. */ + +/* Define to 1 if you have the header file. */ +#undef HAVE_DLFCN_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_INTTYPES_H + +/* Define to 1 if you have the `z' library (-lz). */ +#undef HAVE_LIBZ + +/* Define to 1 if you have the header file. */ +#undef HAVE_MEMORY_H + +/* Define if `MPI_Comm_c2f' and `MPI_Comm_f2c' exists */ +#undef HAVE_MPI_MULTI_LANG_Comm + +/* Define if `MPI_Info_c2f' and `MPI_Info_f2c' exists */ +#undef HAVE_MPI_MULTI_LANG_Info + +/* Define to 1 if you have the header file. */ +#undef HAVE_STDINT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STDLIB_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STRINGS_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STRING_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_STAT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_TYPES_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_UNISTD_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_ZLIB_H + +/* Define to the address where bug reports for this package should be sent. */ +#undef PACKAGE_BUGREPORT + +/* Define to the full name of this package. */ +#undef PACKAGE_NAME + +/* Define to the full name and version of this package. */ +#undef PACKAGE_STRING + +/* Define to the one symbol short name of this package. */ +#undef PACKAGE_TARNAME + +/* Define to the version of this package. */ +#undef PACKAGE_VERSION + +/* Define to 1 if you have the ANSI C header files. */ +#undef STDC_HEADERS