From f1a1ae37ff9376e2709f56f9ed2bad63c7c57ef9 Mon Sep 17 00:00:00 2001 From: Robb Matzke Date: Tue, 8 Jun 1999 11:14:10 -0500 Subject: [svn-r1315] Changes since 19990607 ---------------------- ./configure.in ./configure [REGENERATED] ./src/libhdf5.settings.in [NEW] ./config/conclude.in ./INSTALL ./MANIFEST A file called `libhdf5.settings' is installed along with the libraries and it contains a list of various things that might be of interest to someone using the library (such as what compiler/options were used and what other libraries might need to be linked to satisfy external references). We can add more things as it becomes necessary. Here's a sample... SUMMARY OF THE HDF5 CONFIGURATION ================================= HDF5 Version: hdf5-1.1.106 Configured on: Tue Jun 8 11:38:52 EDT 1999 Configured by: matzke@llnl.gov at Spizella Software Configure mode: development Host system: i686-pc-linux-gnulibc1 Byte sex: little-endian Libraries: static, shared Parallel support: mpicc Installation point: /usr/local Compiler: mpicc (egcs-2.91.66) Compiler switches: -Wall -g Extra libraries: -lmfhdf -ldf -lz -ljpeg -lm Archiver: ar Ranlib: ranlib Debugged Packages: d,e,f,g,hg,i,mm,o,p,s,v,z API Tracing: yes File addresses: large --- INSTALL | 12 ++ MANIFEST | 1 + config/conclude.in | 3 + configure | 555 +++++++++++++++++++++++++++--------------------- configure.in | 75 ++++++- src/libhdf5.settings.in | 20 ++ 6 files changed, 419 insertions(+), 247 deletions(-) create mode 100644 src/libhdf5.settings.in diff --git a/INSTALL b/INSTALL index 32d78d4..7c3d809 100644 --- a/INSTALL +++ b/INSTALL @@ -393,6 +393,18 @@ INSTALL.ascired for instructions. ./tools/h5debug (low-level file debugging) ./tools/h5import (a demo) +* Using the Library + Please see the User Manual in the doc/html directory. + + Most programs will include and link with + -lhdf5. Additional libraries may also be necessary depending + on whether support for compression, etc. was compiled into the + hdf5 library. + + A summary of the hdf5 installation can be found in the + libhdf5.settings file in the same directory as the static + and/or shared hdf5 libraries. + * Support Support is described in the README file. diff --git a/MANIFEST b/MANIFEST index 2e49889..6e5a9ea 100644 --- a/MANIFEST +++ b/MANIFEST @@ -319,6 +319,7 @@ ./src/H5public.h ./src/Makefile.in ./src/hdf5.h +./src/libhdf5.settings.in ./test/.distdep ./test/Makefile.in diff --git a/config/conclude.in b/config/conclude.in index d12b848..8e47c9e 100644 --- a/config/conclude.in +++ b/config/conclude.in @@ -62,6 +62,9 @@ install: $(PUB_LIB) $(PUB_HDR) $(PROGS) $(libdir) $(includedir) $(bindir) ($(LT_INSTALL_LIB) $$f $(libdir)/. || exit 1); \ fi; \ done + @if test -f libhdf5.settings; then \ + (set -x; $(INSTALL_DATA) libhdf5.settings $(libdir)/. || exit 1); \ + fi @for f in X $(PUB_HDR); do \ if test $$f != X; then \ if test -f $$f; then \ diff --git a/configure b/configure index 829700c..70c01a3 100755 --- a/configure +++ b/configure @@ -1311,26 +1311,30 @@ fi case "X-$enableval" in X-yes) echo "$ac_t"""production"" 1>&6 + CONFIG_MODE=production CFLAGS="$CFLAGS $PROD_CFLAGS" CPPFLAGS="$CPPFLAGS $PROD_CPPFLAGS" ;; X-|X-no) echo "$ac_t"""development"" 1>&6 + CONFIG_MODE=development CFLAGS="$CFLAGS $DEBUG_CFLAGS" CPPFLAGS="$CPPFLAGS $DEBUG_CPPFLAGS" ;; X-pg|X-profile) echo "$ac_t"""profile"" 1>&6 + CONFIG_MODE=profile CFLAGS="$CFLAGS $PROFILE_CFLAGS" CPPFLAGS="$CPPFLAGS $PROFILE_CPPFLAGS" ;; *) echo "$ac_t"""user-defined"" 1>&6 + CONFIG_MODE="$X-enableval" ;; esac echo $ac_n "checking for ceil in -lm""... $ac_c" 1>&6 -echo "configure:1334: checking for ceil in -lm" >&5 +echo "configure:1338: checking for ceil in -lm" >&5 ac_lib_var=`echo m'_'ceil | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1338,7 +1342,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1357: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1377,7 +1381,7 @@ else fi echo $ac_n "checking for xdr_int in -lnsl""... $ac_c" 1>&6 -echo "configure:1381: checking for xdr_int in -lnsl" >&5 +echo "configure:1385: checking for xdr_int in -lnsl" >&5 ac_lib_var=`echo nsl'_'xdr_int | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1385,7 +1389,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1404: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1423,7 +1427,7 @@ else echo "$ac_t""no" 1>&6 fi echo $ac_n "checking for main in -lcoug""... $ac_c" 1>&6 -echo "configure:1427: checking for main in -lcoug" >&5 +echo "configure:1431: checking for main in -lcoug" >&5 ac_lib_var=`echo coug'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1431,14 +1435,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lcoug $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1446: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1465,7 +1469,7 @@ else echo "$ac_t""no" 1>&6 fi echo $ac_n "checking for main in -ljpeg""... $ac_c" 1>&6 -echo "configure:1469: checking for main in -ljpeg" >&5 +echo "configure:1473: checking for main in -ljpeg" >&5 ac_lib_var=`echo jpeg'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1473,14 +1477,14 @@ else ac_save_LIBS="$LIBS" LIBS="-ljpeg $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1488: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1508,7 +1512,7 @@ else fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1512: checking how to run the C preprocessor" >&5 +echo "configure:1516: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1523,13 +1527,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1533: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1537: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -1540,13 +1544,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1550: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1554: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -1569,12 +1573,12 @@ fi echo "$ac_t""$CPP" 1>&6 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:1573: checking for ANSI C header files" >&5 +echo "configure:1577: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1582,7 +1586,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1586: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1590: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1599,7 +1603,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -1617,7 +1621,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -1638,7 +1642,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -1649,7 +1653,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:1653: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1657: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then : else @@ -1673,12 +1677,12 @@ EOF fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:1677: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:1681: checking whether time.h and sys/time.h may both be included" >&5 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1687,7 +1691,7 @@ int main() { struct tm *tp; ; return 0; } EOF -if { (eval echo configure:1691: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1695: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -1711,17 +1715,17 @@ for ac_hdr in sys/resource.h sys/time.h unistd.h sys/ioctl.h sys/stat.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1715: checking for $ac_hdr" >&5 +echo "configure:1719: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1725: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1729: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1751,17 +1755,17 @@ for ac_hdr in stddef.h setjmp.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1755: checking for $ac_hdr" >&5 +echo "configure:1759: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1765: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1769: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1791,17 +1795,17 @@ for ac_hdr in io.h winsock.h sys/timeb.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1795: checking for $ac_hdr" >&5 +echo "configure:1799: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1805: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1809: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1834,17 +1838,17 @@ case $host in do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1838: checking for $ac_hdr" >&5 +echo "configure:1842: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1848: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1852: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -1874,12 +1878,12 @@ done esac echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:1878: checking for off_t" >&5 +echo "configure:1882: checking for off_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -1907,12 +1911,12 @@ EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:1911: checking for size_t" >&5 +echo "configure:1915: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -1940,12 +1944,12 @@ EOF fi echo $ac_n "checking for ssize_t""... $ac_c" 1>&6 -echo "configure:1944: checking for ssize_t" >&5 +echo "configure:1948: checking for ssize_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_ssize_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -1973,14 +1977,14 @@ EOF fi echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:1977: checking whether byte ordering is bigendian" >&5 +echo "configure:1981: checking whether byte ordering is bigendian" >&5 if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_bigendian=unknown # See if sys/param.h defines the BYTE_ORDER macro. cat > conftest.$ac_ext < #include @@ -1991,11 +1995,11 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:1995: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1999: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* # It does; now see whether it defined to BIG_ENDIAN or not. cat > conftest.$ac_ext < #include @@ -2006,7 +2010,7 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:2010: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2014: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_bigendian=yes else @@ -2026,7 +2030,7 @@ if test "$cross_compiling" = yes; then { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2047: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_c_bigendian=no else @@ -2063,7 +2067,7 @@ EOF fi echo $ac_n "checking size of char""... $ac_c" 1>&6 -echo "configure:2067: checking size of char" >&5 +echo "configure:2071: checking size of char" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_char'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2071,7 +2075,7 @@ else ac_cv_sizeof_char=1 else cat > conftest.$ac_ext < main() @@ -2082,7 +2086,7 @@ main() exit(0); } EOF -if { (eval echo configure:2086: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2090: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_char=`cat conftestval` else @@ -2102,7 +2106,7 @@ EOF echo $ac_n "checking size of short""... $ac_c" 1>&6 -echo "configure:2106: checking size of short" >&5 +echo "configure:2110: checking size of short" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2110,7 +2114,7 @@ else ac_cv_sizeof_short=2 else cat > conftest.$ac_ext < main() @@ -2121,7 +2125,7 @@ main() exit(0); } EOF -if { (eval echo configure:2125: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2129: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_short=`cat conftestval` else @@ -2141,7 +2145,7 @@ EOF echo $ac_n "checking size of int""... $ac_c" 1>&6 -echo "configure:2145: checking size of int" >&5 +echo "configure:2149: checking size of int" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2149,7 +2153,7 @@ else ac_cv_sizeof_int=4 else cat > conftest.$ac_ext < main() @@ -2160,7 +2164,7 @@ main() exit(0); } EOF -if { (eval echo configure:2164: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2168: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_int=`cat conftestval` else @@ -2180,7 +2184,7 @@ EOF echo $ac_n "checking size of long""... $ac_c" 1>&6 -echo "configure:2184: checking size of long" >&5 +echo "configure:2188: checking size of long" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2188,7 +2192,7 @@ else ac_cv_sizeof_long=4 else cat > conftest.$ac_ext < main() @@ -2199,7 +2203,7 @@ main() exit(0); } EOF -if { (eval echo configure:2203: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2207: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_long=`cat conftestval` else @@ -2219,7 +2223,7 @@ EOF echo $ac_n "checking size of long long""... $ac_c" 1>&6 -echo "configure:2223: checking size of long long" >&5 +echo "configure:2227: checking size of long long" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2227,7 +2231,7 @@ else ac_cv_sizeof_long_long=8 else cat > conftest.$ac_ext < main() @@ -2238,7 +2242,7 @@ main() exit(0); } EOF -if { (eval echo configure:2242: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2246: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_long_long=`cat conftestval` else @@ -2258,7 +2262,7 @@ EOF echo $ac_n "checking size of __int64""... $ac_c" 1>&6 -echo "configure:2262: checking size of __int64" >&5 +echo "configure:2266: checking size of __int64" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof___int64'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2266,7 +2270,7 @@ else ac_cv_sizeof___int64=8 else cat > conftest.$ac_ext < main() @@ -2277,7 +2281,7 @@ main() exit(0); } EOF -if { (eval echo configure:2281: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2285: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_sizeof___int64=`cat conftestval` else @@ -2297,7 +2301,7 @@ EOF echo $ac_n "checking size of float""... $ac_c" 1>&6 -echo "configure:2301: checking size of float" >&5 +echo "configure:2305: checking size of float" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_float'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2305,7 +2309,7 @@ else ac_cv_sizeof_float=4 else cat > conftest.$ac_ext < main() @@ -2316,7 +2320,7 @@ main() exit(0); } EOF -if { (eval echo configure:2320: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2324: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_float=`cat conftestval` else @@ -2336,7 +2340,7 @@ EOF echo $ac_n "checking size of double""... $ac_c" 1>&6 -echo "configure:2340: checking size of double" >&5 +echo "configure:2344: checking size of double" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_double'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2344,7 +2348,7 @@ else ac_cv_sizeof_double=8 else cat > conftest.$ac_ext < main() @@ -2355,7 +2359,7 @@ main() exit(0); } EOF -if { (eval echo configure:2359: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2363: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_double=`cat conftestval` else @@ -2375,7 +2379,7 @@ EOF echo $ac_n "checking size of long double""... $ac_c" 1>&6 -echo "configure:2379: checking size of long double" >&5 +echo "configure:2383: checking size of long double" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_long_double'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2383,7 +2387,7 @@ else ac_cv_sizeof_long_double=8 else cat > conftest.$ac_ext < main() @@ -2394,7 +2398,7 @@ main() exit(0); } EOF -if { (eval echo configure:2398: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2402: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_long_double=`cat conftestval` else @@ -2418,7 +2422,7 @@ cat >>confdefs.h <<\EOF #include EOF echo $ac_n "checking size of int8_t""... $ac_c" 1>&6 -echo "configure:2422: checking size of int8_t" >&5 +echo "configure:2426: checking size of int8_t" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_int8_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2426,7 +2430,7 @@ else ac_cv_sizeof_int8_t=1 else cat > conftest.$ac_ext < main() @@ -2437,7 +2441,7 @@ main() exit(0); } EOF -if { (eval echo configure:2441: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2445: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_int8_t=`cat conftestval` else @@ -2457,7 +2461,7 @@ EOF echo $ac_n "checking size of uint8_t""... $ac_c" 1>&6 -echo "configure:2461: checking size of uint8_t" >&5 +echo "configure:2465: checking size of uint8_t" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_uint8_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2465,7 +2469,7 @@ else ac_cv_sizeof_uint8_t=1 else cat > conftest.$ac_ext < main() @@ -2476,7 +2480,7 @@ main() exit(0); } EOF -if { (eval echo configure:2480: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2484: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_uint8_t=`cat conftestval` else @@ -2496,7 +2500,7 @@ EOF echo $ac_n "checking size of int16_t""... $ac_c" 1>&6 -echo "configure:2500: checking size of int16_t" >&5 +echo "configure:2504: checking size of int16_t" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_int16_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2504,7 +2508,7 @@ else ac_cv_sizeof_int16_t=2 else cat > conftest.$ac_ext < main() @@ -2515,7 +2519,7 @@ main() exit(0); } EOF -if { (eval echo configure:2519: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2523: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_int16_t=`cat conftestval` else @@ -2535,7 +2539,7 @@ EOF echo $ac_n "checking size of uint16_t""... $ac_c" 1>&6 -echo "configure:2539: checking size of uint16_t" >&5 +echo "configure:2543: checking size of uint16_t" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_uint16_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2543,7 +2547,7 @@ else ac_cv_sizeof_uint16_t=2 else cat > conftest.$ac_ext < main() @@ -2554,7 +2558,7 @@ main() exit(0); } EOF -if { (eval echo configure:2558: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2562: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_uint16_t=`cat conftestval` else @@ -2574,7 +2578,7 @@ EOF echo $ac_n "checking size of int32_t""... $ac_c" 1>&6 -echo "configure:2578: checking size of int32_t" >&5 +echo "configure:2582: checking size of int32_t" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_int32_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2582,7 +2586,7 @@ else ac_cv_sizeof_int32_t=4 else cat > conftest.$ac_ext < main() @@ -2593,7 +2597,7 @@ main() exit(0); } EOF -if { (eval echo configure:2597: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2601: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_int32_t=`cat conftestval` else @@ -2613,7 +2617,7 @@ EOF echo $ac_n "checking size of uint32_t""... $ac_c" 1>&6 -echo "configure:2617: checking size of uint32_t" >&5 +echo "configure:2621: checking size of uint32_t" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_uint32_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2621,7 +2625,7 @@ else ac_cv_sizeof_uint32_t=4 else cat > conftest.$ac_ext < main() @@ -2632,7 +2636,7 @@ main() exit(0); } EOF -if { (eval echo configure:2636: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2640: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_uint32_t=`cat conftestval` else @@ -2652,7 +2656,7 @@ EOF echo $ac_n "checking size of int64_t""... $ac_c" 1>&6 -echo "configure:2656: checking size of int64_t" >&5 +echo "configure:2660: checking size of int64_t" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_int64_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2660,7 +2664,7 @@ else ac_cv_sizeof_int64_t=8 else cat > conftest.$ac_ext < main() @@ -2671,7 +2675,7 @@ main() exit(0); } EOF -if { (eval echo configure:2675: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2679: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_int64_t=`cat conftestval` else @@ -2691,7 +2695,7 @@ EOF echo $ac_n "checking size of uint64_t""... $ac_c" 1>&6 -echo "configure:2695: checking size of uint64_t" >&5 +echo "configure:2699: checking size of uint64_t" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_uint64_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2699,7 +2703,7 @@ else ac_cv_sizeof_uint64_t=8 else cat > conftest.$ac_ext < main() @@ -2710,7 +2714,7 @@ main() exit(0); } EOF -if { (eval echo configure:2714: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2718: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_uint64_t=`cat conftestval` else @@ -2731,7 +2735,7 @@ EOF echo $ac_n "checking size of size_t""... $ac_c" 1>&6 -echo "configure:2735: checking size of size_t" >&5 +echo "configure:2739: checking size of size_t" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2739,7 +2743,7 @@ else ac_cv_sizeof_size_t=4 else cat > conftest.$ac_ext < main() @@ -2750,7 +2754,7 @@ main() exit(0); } EOF -if { (eval echo configure:2754: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2758: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_size_t=`cat conftestval` else @@ -2773,7 +2777,7 @@ cat >>confdefs.h <<\EOF #include /*for off_t definition*/ EOF echo $ac_n "checking size of off_t""... $ac_c" 1>&6 -echo "configure:2777: checking size of off_t" >&5 +echo "configure:2781: checking size of off_t" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_off_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2781,7 +2785,7 @@ else ac_cv_sizeof_off_t=4 else cat > conftest.$ac_ext < main() @@ -2792,7 +2796,7 @@ main() exit(0); } EOF -if { (eval echo configure:2796: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2800: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_off_t=`cat conftestval` else @@ -2819,13 +2823,16 @@ if test "${enable_hsizet+set}" = set; then fi echo $ac_n "checking for sizeof hsize_t and hssize_t""... $ac_c" 1>&6 -echo "configure:2823: checking for sizeof hsize_t and hssize_t" >&5 +echo "configure:2827: checking for sizeof hsize_t and hssize_t" >&5 + case $HSIZET in no|small) echo "$ac_t""small" 1>&6 + HSIZET=small ;; *) echo "$ac_t""large" 1>&6 + HSIZET=large cat >> confdefs.h <<\EOF #define HAVE_LARGE_HSIZET 1 EOF @@ -2848,17 +2855,17 @@ case $withval in do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2852: checking for $ac_hdr" >&5 +echo "configure:2859: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2862: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2869: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -2885,7 +2892,7 @@ fi done echo $ac_n "checking for compress in -lz""... $ac_c" 1>&6 -echo "configure:2889: checking for compress in -lz" >&5 +echo "configure:2896: checking for compress in -lz" >&5 ac_lib_var=`echo z'_'compress | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2893,7 +2900,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lz $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2915: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2934,7 +2941,7 @@ fi ;; no) echo $ac_n "checking for GNU zlib""... $ac_c" 1>&6 -echo "configure:2938: checking for GNU zlib" >&5 +echo "configure:2945: checking for GNU zlib" >&5 echo "$ac_t""suppressed" 1>&6 ;; *) @@ -2946,17 +2953,17 @@ echo "configure:2938: checking for GNU zlib" >&5 do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2950: checking for $ac_hdr" >&5 +echo "configure:2957: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2960: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2967: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -2988,17 +2995,17 @@ done do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2992: checking for $ac_hdr" >&5 +echo "configure:2999: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3002: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3009: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -3031,7 +3038,7 @@ done saved_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS -L$zlib_lib" echo $ac_n "checking for compress in -lz""... $ac_c" 1>&6 -echo "configure:3035: checking for compress in -lz" >&5 +echo "configure:3042: checking for compress in -lz" >&5 ac_lib_var=`echo z'_'compress | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3039,7 +3046,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lz $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3061: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3080,7 +3087,7 @@ fi else echo $ac_n "checking for compress in -lz""... $ac_c" 1>&6 -echo "configure:3084: checking for compress in -lz" >&5 +echo "configure:3091: checking for compress in -lz" >&5 ac_lib_var=`echo z'_'compress | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3088,7 +3095,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lz $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3110: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3149,17 +3156,17 @@ case $withval in do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3153: checking for $ac_hdr" >&5 +echo "configure:3160: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3163: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3170: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -3187,7 +3194,7 @@ fi done echo $ac_n "checking for main in -ldf""... $ac_c" 1>&6 -echo "configure:3191: checking for main in -ldf" >&5 +echo "configure:3198: checking for main in -ldf" >&5 ac_lib_var=`echo df'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3195,14 +3202,14 @@ else ac_save_LIBS="$LIBS" LIBS="-ldf $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3213: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3231,7 +3238,7 @@ unset H5TOH4 TESTH5TOH4 fi echo $ac_n "checking for main in -lmfhdf""... $ac_c" 1>&6 -echo "configure:3235: checking for main in -lmfhdf" >&5 +echo "configure:3242: checking for main in -lmfhdf" >&5 ac_lib_var=`echo mfhdf'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3239,14 +3246,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lmfhdf $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3257: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3277,7 +3284,7 @@ fi ;; no) echo $ac_n "checking for HDF4""... $ac_c" 1>&6 -echo "configure:3281: checking for HDF4" >&5 +echo "configure:3288: checking for HDF4" >&5 echo "$ac_t""suppressed" 1>&6 unset H5TOH4 TESTH5TOH4 ;; @@ -3290,17 +3297,17 @@ echo "configure:3281: checking for HDF4" >&5 do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3294: checking for $ac_hdr" >&5 +echo "configure:3301: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3304: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3311: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -3334,17 +3341,17 @@ done do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3338: checking for $ac_hdr" >&5 +echo "configure:3345: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3348: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3355: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -3377,7 +3384,7 @@ done saved_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS -L$hdf4_lib" echo $ac_n "checking for main in -ldf""... $ac_c" 1>&6 -echo "configure:3381: checking for main in -ldf" >&5 +echo "configure:3388: checking for main in -ldf" >&5 ac_lib_var=`echo df'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3385,14 +3392,14 @@ else ac_save_LIBS="$LIBS" LIBS="-ldf $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3403: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3421,7 +3428,7 @@ unset H5TOH4 TESTH5TOH4 fi echo $ac_n "checking for main in -lmfhdf""... $ac_c" 1>&6 -echo "configure:3425: checking for main in -lmfhdf" >&5 +echo "configure:3432: checking for main in -lmfhdf" >&5 ac_lib_var=`echo mfhdf'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3429,14 +3436,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lmfhdf $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3447: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3466,7 +3473,7 @@ fi else echo $ac_n "checking for main in -ldf""... $ac_c" 1>&6 -echo "configure:3470: checking for main in -ldf" >&5 +echo "configure:3477: checking for main in -ldf" >&5 ac_lib_var=`echo df'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3474,14 +3481,14 @@ else ac_save_LIBS="$LIBS" LIBS="-ldf $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3492: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3509,7 +3516,7 @@ else fi echo $ac_n "checking for main in -lmfhdf""... $ac_c" 1>&6 -echo "configure:3513: checking for main in -lmfhdf" >&5 +echo "configure:3520: checking for main in -lmfhdf" >&5 ac_lib_var=`echo mfhdf'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3517,14 +3524,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lmfhdf $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3535: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3558,9 +3565,9 @@ esac echo $ac_n "checking for tm_gmtoff in struct tm""... $ac_c" 1>&6 -echo "configure:3562: checking for tm_gmtoff in struct tm" >&5 +echo "configure:3569: checking for tm_gmtoff in struct tm" >&5 cat > conftest.$ac_ext < @@ -3569,7 +3576,7 @@ int main() { struct tm tm; tm.tm_gmtoff=0; ; return 0; } EOF -if { (eval echo configure:3573: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3580: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_TM_GMTOFF 1 @@ -3585,9 +3592,9 @@ fi rm -f conftest* echo $ac_n "checking for __tm_gmtoff in struct tm""... $ac_c" 1>&6 -echo "configure:3589: checking for __tm_gmtoff in struct tm" >&5 +echo "configure:3596: checking for __tm_gmtoff in struct tm" >&5 cat > conftest.$ac_ext < @@ -3596,7 +3603,7 @@ int main() { struct tm tm; tm.__tm_gmtoff=0; ; return 0; } EOF -if { (eval echo configure:3600: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3607: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE___TM_GMTOFF 1 @@ -3612,9 +3619,9 @@ fi rm -f conftest* echo $ac_n "checking for global timezone variable""... $ac_c" 1>&6 -echo "configure:3616: checking for global timezone variable" >&5 +echo "configure:3623: checking for global timezone variable" >&5 cat > conftest.$ac_ext < @@ -3623,7 +3630,7 @@ int main() { timezone=0; ; return 0; } EOF -if { (eval echo configure:3627: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3634: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_TIMEZONE 1 @@ -3639,12 +3646,12 @@ fi rm -f conftest* echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6 -echo "configure:3643: checking whether struct tm is in sys/time.h or time.h" >&5 +echo "configure:3650: checking whether struct tm is in sys/time.h or time.h" >&5 if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -3652,7 +3659,7 @@ int main() { struct tm *tp; tp->tm_sec; ; return 0; } EOF -if { (eval echo configure:3656: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3663: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm=time.h else @@ -3673,12 +3680,12 @@ EOF fi echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6 -echo "configure:3677: checking for tm_zone in struct tm" >&5 +echo "configure:3684: checking for tm_zone in struct tm" >&5 if eval "test \"`echo '$''{'ac_cv_struct_tm_zone'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include <$ac_cv_struct_tm> @@ -3686,7 +3693,7 @@ int main() { struct tm tm; tm.tm_zone; ; return 0; } EOF -if { (eval echo configure:3690: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3697: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm_zone=yes else @@ -3706,12 +3713,12 @@ EOF else echo $ac_n "checking for tzname""... $ac_c" 1>&6 -echo "configure:3710: checking for tzname" >&5 +echo "configure:3717: checking for tzname" >&5 if eval "test \"`echo '$''{'ac_cv_var_tzname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #ifndef tzname /* For SGI. */ @@ -3721,7 +3728,7 @@ int main() { atoi(*tzname); ; return 0; } EOF -if { (eval echo configure:3725: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3732: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_cv_var_tzname=yes else @@ -3743,9 +3750,9 @@ EOF fi echo $ac_n "checking for struct timezone""... $ac_c" 1>&6 -echo "configure:3747: checking for struct timezone" >&5 +echo "configure:3754: checking for struct timezone" >&5 cat > conftest.$ac_ext < @@ -3755,7 +3762,7 @@ int main() { struct timezone tz; tz.tz_minuteswest=0; ; return 0; } EOF -if { (eval echo configure:3759: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3766: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_STRUCT_TIMEZONE 1 @@ -3771,9 +3778,9 @@ fi rm -f conftest* echo $ac_n "checking for st_blocks in struct stat""... $ac_c" 1>&6 -echo "configure:3775: checking for st_blocks in struct stat" >&5 +echo "configure:3782: checking for st_blocks in struct stat" >&5 cat > conftest.$ac_ext < @@ -3781,7 +3788,7 @@ int main() { struct stat sb; sb.st_blocks=0; ; return 0; } EOF -if { (eval echo configure:3785: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3792: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_STAT_ST_BLOCKS 1 @@ -3799,12 +3806,12 @@ rm -f conftest* for ac_func in _getvideoconfig gettextinfo GetConsoleScreenBufferInfo do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3803: checking for $ac_func" >&5 +echo "configure:3810: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3838: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3854,12 +3861,12 @@ done for ac_func in _scrsize ioctl do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3858: checking for $ac_func" >&5 +echo "configure:3865: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3893: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3908,16 +3915,16 @@ done echo $ac_n "checking for struct videoconfig""... $ac_c" 1>&6 -echo "configure:3912: checking for struct videoconfig" >&5 +echo "configure:3919: checking for struct videoconfig" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3928: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_STRUCT_VIDEOCONFIG 1 @@ -3933,16 +3940,16 @@ fi rm -f conftest* echo $ac_n "checking for struct text_info""... $ac_c" 1>&6 -echo "configure:3937: checking for struct text_info" >&5 +echo "configure:3944: checking for struct text_info" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3953: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_STRUCT_TEXT_INFO 1 @@ -3958,16 +3965,16 @@ fi rm -f conftest* echo $ac_n "checking for TIOCGWINSZ""... $ac_c" 1>&6 -echo "configure:3962: checking for TIOCGWINSZ" >&5 +echo "configure:3969: checking for TIOCGWINSZ" >&5 cat > conftest.$ac_ext < int main() { int w=TIOCGWINSZ; ; return 0; } EOF -if { (eval echo configure:3971: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3978: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_TIOCGWINSZ 1 @@ -3983,16 +3990,16 @@ fi rm -f conftest* echo $ac_n "checking for TIOCGGETD""... $ac_c" 1>&6 -echo "configure:3987: checking for TIOCGGETD" >&5 +echo "configure:3994: checking for TIOCGGETD" >&5 cat > conftest.$ac_ext < int main() { int w=TIOCGETD; ; return 0; } EOF -if { (eval echo configure:3996: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4003: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_TIOCGETD 1 @@ -4011,12 +4018,12 @@ rm -f conftest* for ac_func in getpwuid gethostname system getrusage fork waitpid do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4015: checking for $ac_func" >&5 +echo "configure:4022: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4050: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4066,12 +4073,12 @@ done for ac_func in gettimeofday BSDgettimeofday difftime snprintf vsnprintf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4070: checking for $ac_func" >&5 +echo "configure:4077: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4105: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4121,12 +4128,12 @@ done for ac_func in compress2 setsysinfo longjmp signal sigaction do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4125: checking for $ac_func" >&5 +echo "configure:4132: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4160: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4174,24 +4181,24 @@ fi done cat > conftest.$ac_ext < int main() { off64_t n = 0; ; return 0; } EOF -if { (eval echo configure:4185: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4192: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* for ac_func in lseek64 fseek64 do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4190: checking for $ac_func" >&5 +echo "configure:4197: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4225: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4249,12 +4256,12 @@ rm -f conftest* echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:4253: checking for working const" >&5 +echo "configure:4260: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4314: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -4324,21 +4331,21 @@ EOF fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:4328: checking for inline" >&5 +echo "configure:4335: checking for inline" >&5 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4349: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -4365,16 +4372,16 @@ esac echo $ac_n "checking for __attribute__ extension""... $ac_c" 1>&6 -echo "configure:4369: checking for __attribute__ extension" >&5 +echo "configure:4376: checking for __attribute__ extension" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4385: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_ATTRIBUTE 1 @@ -4390,16 +4397,16 @@ fi rm -f conftest* echo $ac_n "checking for __FUNCTION__ extension""... $ac_c" 1>&6 -echo "configure:4394: checking for __FUNCTION__ extension" >&5 +echo "configure:4401: checking for __FUNCTION__ extension" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4410: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_FUNCTION 1 @@ -4415,7 +4422,7 @@ fi rm -f conftest* echo $ac_n "checking how to print long long""... $ac_c" 1>&6 -echo "configure:4419: checking how to print long long" >&5 +echo "configure:4426: checking how to print long long" >&5 if eval "test \"`echo '$''{'hdf5_cv_printf_ll'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4424,7 +4431,7 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < @@ -4435,7 +4442,7 @@ else sprintf(s,"%${hdf5_cv_printf_ll}d",x); exit (strcmp(s,"1099511627776"));} EOF -if { (eval echo configure:4439: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4446: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null then break else @@ -4455,7 +4462,7 @@ EOF echo $ac_n "checking for debug flags""... $ac_c" 1>&6 -echo "configure:4459: checking for debug flags" >&5 +echo "configure:4466: checking for debug flags" >&5 # Check whether --enable-debug or --disable-debug was given. if test "${enable_debug+set}" = set; then enableval="$enable_debug" @@ -4463,6 +4470,7 @@ if test "${enable_debug+set}" = set; then fi + all_packages="ac,b,d,e,f,g,hg,hl,i,mf,mm,o,p,s,t,v,z" if test X = "X$DEBUG_PKG" -o Xyes = "X$DEBUG_PKG"; then DEBUG_PKG="d,e,f,g,hg,i,mm,o,p,s,v,z" @@ -4487,7 +4495,7 @@ if test "X" != "X$DEBUG_PKG"; then fi echo $ac_n "checking for API tracing""... $ac_c" 1>&6 -echo "configure:4491: checking for API tracing" >&5; +echo "configure:4499: checking for API tracing" >&5; # Check whether --enable-trace or --disable-trace was given. if test "${enable_trace+set}" = set; then enableval="$enable_trace" @@ -4495,8 +4503,10 @@ if test "${enable_trace+set}" = set; then fi + if test X = "X$TRACE" -o Xyes = "X$TRACE"; then echo "$ac_t""yes" 1>&6 + TRACE_API=yes CPPFLAGS="$CPPFLAGS -DH5_DEBUG_API" else echo "$ac_t""no" 1>&6 @@ -4507,13 +4517,14 @@ fi + case "$CC_BASENAME" in mpicc) # The mpich compiler. Use mpirun from the same directory if it # exists. - PARALLEL=yes + PARALLEL=mpicc echo $ac_n "checking for mpirun""... $ac_c" 1>&6 -echo "configure:4517: checking for mpirun" >&5 +echo "configure:4528: checking for mpirun" >&5 # Find the path where mpicc is located. cmd=`echo $CC |cut -f1 -d' '` @@ -4541,7 +4552,7 @@ echo "configure:4517: checking for mpirun" >&5 mpcc|mpcc_r) # The IBM compiler - PARALLEL=yes + PARALLEL="$CC_BASENAME" ;; *) @@ -4558,7 +4569,7 @@ fi echo $ac_n "checking for parallel support files""... $ac_c" 1>&6 -echo "configure:4562: checking for parallel support files" >&5 +echo "configure:4573: checking for parallel support files" >&5 case "X-$enable_parallel" in X-|X-no|X-none) # Either we are not compiling for parallel or the header and library @@ -4587,9 +4598,9 @@ case "X-$enable_parallel" in # for the libraries in order to get the onto the link line, the user # will have already told us about the locations. Fail if something # is missing. - PARALLEL=yes + PARALLEL=mpich echo $ac_n "checking for MPI_Init in -lmpich""... $ac_c" 1>&6 -echo "configure:4593: checking for MPI_Init in -lmpich" >&5 +echo "configure:4604: checking for MPI_Init in -lmpich" >&5 ac_lib_var=`echo mpich'_'MPI_Init | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4597,7 +4608,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lmpich $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4623: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4657,10 +4668,10 @@ EOF # Display what we found about running programs echo $ac_n "checking prefix for running on one processor""... $ac_c" 1>&6 -echo "configure:4661: checking prefix for running on one processor" >&5 +echo "configure:4672: checking prefix for running on one processor" >&5 echo "$ac_t""$RUNSERIAL" 1>&6 echo $ac_n "checking prefix for running in parallel""... $ac_c" 1>&6 -echo "configure:4664: checking prefix for running in parallel" >&5 +echo "configure:4675: checking prefix for running in parallel" >&5 echo "$ac_t""$RUNPARALLEL" 1>&6 # Check that we can link a simple MPI and MPI-IO application @@ -4682,6 +4693,55 @@ echo "configure:4664: checking prefix for running in parallel" >&5 fi fi + +# HDF5 version from the first line of the README file. +H5_VERSION=`cut -d' ' -f3 $srcdir/README |head -1` + + +# Configuration date + CONFIG_DATE=`date` + +# User doing the configuration + CONFIG_USER="$USER@`hostname`" +if test "X-$ORGANIZATION" != "X-"; then + CONFIG_USER="$CONFIG_USER at $ORGANIZATION" +fi + +# Configuration mode (production, development, profile, etc) saved above. + + +# Byte sex from the AC_C_BIGENDIAN macro. + +if test "X-$WORDS_BIGENDIAN" = "X-"; then + BYTESEX="little-endian" +else + BYTESEX="big-endian" +fi + +# Are we compiling static libraries, shared libraries, or both? + +if test "X-$enable_static" = "X-yes" && test "X-$enable_shared" = "X-yes"; then + STATIC_SHARED="static, shared" +elif test "X-$enable_static" = "X-yes"; then + STATIC_SHARED="static" +elif test "X-$enable_shared" = "X-yes"; then + STATIC_SHARED="shared" +else + STATIC_SHARED="none" +fi + +# Parallel support? (set above except empty if none) +PARALLEL=${PARALLEL:-no} + +# Compiler with version information + +if test "X-$cc_vendor" != "X-" && test "X-$cc_version" != "X-"; then + CC_VERSION="$CC ($cc_vendor-$cc_version)" +else + CC_VERSION="$CC" +fi + + COMMENCE=config/commence CONCLUDE=config/conclude @@ -4821,7 +4881,7 @@ done ac_given_srcdir=$srcdir ac_given_INSTALL="$INSTALL" -trap 'rm -fr `echo "config/depend config/commence config/conclude \ +trap 'rm -fr `echo "src/libhdf5.settings config/depend config/commence config/conclude \ Makefile src/Makefile pablo/Makefile test/Makefile \ testpar/Makefile tools/Makefile examples/Makefile src/H5config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 EOF @@ -4869,11 +4929,22 @@ s%@LN_S@%$LN_S%g s%@LIBTOOL@%$LIBTOOL%g s%@AR@%$AR%g s%@CPP@%$CPP%g +s%@HSIZET@%$HSIZET%g s%@H5TOH4@%$H5TOH4%g s%@TESTH5TOH4@%$TESTH5TOH4%g +s%@DEBUG_PKG@%$DEBUG_PKG%g +s%@TRACE_API@%$TRACE_API%g +s%@PARALLEL@%$PARALLEL%g s%@RUNSERIAL@%$RUNSERIAL%g s%@RUNPARALLEL@%$RUNPARALLEL%g s%@TESTPARALLEL@%$TESTPARALLEL%g +s%@H5_VERSION@%$H5_VERSION%g +s%@CONFIG_DATE@%$CONFIG_DATE%g +s%@CONFIG_USER@%$CONFIG_USER%g +s%@CONFIG_MODE@%$CONFIG_MODE%g +s%@BYTESEX@%$BYTESEX%g +s%@STATIC_SHARED@%$STATIC_SHARED%g +s%@CC_VERSION@%$CC_VERSION%g /@COMMENCE@/r $COMMENCE s%@COMMENCE@%%g /@CONCLUDE@/r $CONCLUDE @@ -4929,7 +5000,7 @@ EOF cat >> $CONFIG_STATUS <