From b3ddd2cc5428b052ca26b36634b64be21032a330 Mon Sep 17 00:00:00 2001 From: Robb Matzke Date: Mon, 1 Mar 1999 14:44:32 -0500 Subject: [svn-r1110] Changes since 19990226 ---------------------- ./INSTALL Added instructions for using other compilers on Irix platforms. ./configure.in ./configure [REGENERATED] ./src/H5config.h.in [REGENERATED] ./src/H5private.h The presence of and is only checked on DEC/Alpha because there are too many problems including these headers on other systems. ./config/irix6.x ./config/irix64 Removed `-ansi' and added a comment. Converting an ASCII UTC date and time to a time_t value is not defined by ANSI or Posix but is available if we don't use `-ansi'. This allows the dataset modification time messages to be read properly by H5Gget_objinfo(). ./src/H5Tconv.c Fixed a compiler warning. ./test/dtypes.c ./test/hyperslab.c ./test/istore.c Fixed compiler warnings in printf() statements. --- INSTALL | 7 + config/irix6.x | 6 +- config/irix64 | 6 +- configure | 434 ++++++++++++++++++++++++++++++------------------------ configure.in | 9 +- src/H5Tconv.c | 2 +- src/H5config.h.in | 3 - src/H5private.h | 7 +- test/dtypes.c | 18 ++- test/hyperslab.c | 19 ++- test/istore.c | 6 +- 11 files changed, 293 insertions(+), 224 deletions(-) diff --git a/INSTALL b/INSTALL index 633150e..46f0082 100644 --- a/INSTALL +++ b/INSTALL @@ -99,6 +99,13 @@ Step 2. Configure. RANLIB Name of the `ranlib' program or `:' if none. MAKE Name of the `make' program (GNU make is preferred) + * The default compiler is `cc -n32' on Irix6.x platforms and `cc -64' on + Irix64 platforms. To use an alternate compiler (such as `cc -o32') + specify the name and compiler selection switch with the CC environment + variable: + + $ CC='cc -o32' ./configure ...... + * This version of HDF5 is normally built with various debugging code enabled. To turn it off add the `--disable-debug' switch to the configure command. Even if debugging support is compiled into the diff --git a/config/irix6.x b/config/irix6.x index ed16b69..4699d00 100644 --- a/config/irix6.x +++ b/config/irix6.x @@ -25,7 +25,11 @@ case "X-$CC_BASENAME" in ;; *) - CFLAGS="$CFLAGS -ansi" + # Do *not* use -ansi because it prevents hdf5 from being able + # to read modification dates from the file. On some systems it + # can also result in compile errors in system header files + # since hdf5 includes a couple non-ANSI header files. + #CFLAGS="$CFLAGS -ansi" # Always turn off these compiler warnings: # 1174: function declared but not used diff --git a/config/irix64 b/config/irix64 index 1c17c7c..ac3b2b8 100644 --- a/config/irix64 +++ b/config/irix64 @@ -26,7 +26,11 @@ case "X-$CC_BASENAME" in ;; *) - CFLAGS="$CFLAGS -ansi" + # Do *not* use -ansi because it prevents hdf5 from being able + # to read modification dates from the file. On some systems it + # can also result in compile errors in system header files + # since hdf5 includes a couple non-ANSI header files. + #CFLAGS="$CFLAGS -ansi" # Always turn off these compiler warnings for the -64 compiler: # 1174: function declared but not used diff --git a/configure b/configure index bcdff1a..734d00b 100755 --- a/configure +++ b/configure @@ -1502,7 +1502,7 @@ else fi done -for ac_hdr in stddef.h sys/sysinfo.h sys/proc.h sys/param.h +for ac_hdr in stddef.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 @@ -1583,14 +1583,56 @@ fi done +if test "$host_vendor-$host_cpu" = "dec-alpha"; then + for ac_hdr in sys/sysinfo.h sys/proc.h +do +ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +echo "configure:1592: 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:1602: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" +fi +rm -f conftest* +fi +if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` + cat >> confdefs.h <&6 +fi +done + +fi echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:1589: checking for off_t" >&5 +echo "configure:1631: 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 @@ -1618,12 +1660,12 @@ EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:1622: checking for size_t" >&5 +echo "configure:1664: 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 @@ -1651,12 +1693,12 @@ EOF fi echo $ac_n "checking for ssize_t""... $ac_c" 1>&6 -echo "configure:1655: checking for ssize_t" >&5 +echo "configure:1697: 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 @@ -1684,14 +1726,14 @@ EOF fi echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:1688: checking whether byte ordering is bigendian" >&5 +echo "configure:1730: 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 @@ -1702,11 +1744,11 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:1706: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1748: \"$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 @@ -1717,7 +1759,7 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:1721: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1763: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_bigendian=yes else @@ -1737,7 +1779,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${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1796: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_bigendian=no else @@ -1774,7 +1816,7 @@ EOF fi echo $ac_n "checking size of char""... $ac_c" 1>&6 -echo "configure:1778: checking size of char" >&5 +echo "configure:1820: 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 @@ -1782,7 +1824,7 @@ else ac_cv_sizeof_char=1 else cat > conftest.$ac_ext < main() @@ -1793,7 +1835,7 @@ main() exit(0); } EOF -if { (eval echo configure:1797: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1839: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_char=`cat conftestval` else @@ -1813,7 +1855,7 @@ EOF echo $ac_n "checking size of short""... $ac_c" 1>&6 -echo "configure:1817: checking size of short" >&5 +echo "configure:1859: 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 @@ -1821,7 +1863,7 @@ else ac_cv_sizeof_short=2 else cat > conftest.$ac_ext < main() @@ -1832,7 +1874,7 @@ main() exit(0); } EOF -if { (eval echo configure:1836: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1878: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_short=`cat conftestval` else @@ -1852,7 +1894,7 @@ EOF echo $ac_n "checking size of int""... $ac_c" 1>&6 -echo "configure:1856: checking size of int" >&5 +echo "configure:1898: 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 @@ -1860,7 +1902,7 @@ else ac_cv_sizeof_int=4 else cat > conftest.$ac_ext < main() @@ -1871,7 +1913,7 @@ main() exit(0); } EOF -if { (eval echo configure:1875: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1917: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_int=`cat conftestval` else @@ -1891,7 +1933,7 @@ EOF echo $ac_n "checking size of long""... $ac_c" 1>&6 -echo "configure:1895: checking size of long" >&5 +echo "configure:1937: 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 @@ -1899,7 +1941,7 @@ else ac_cv_sizeof_long=4 else cat > conftest.$ac_ext < main() @@ -1910,7 +1952,7 @@ main() exit(0); } EOF -if { (eval echo configure:1914: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1956: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_long=`cat conftestval` else @@ -1930,7 +1972,7 @@ EOF echo $ac_n "checking size of long long""... $ac_c" 1>&6 -echo "configure:1934: checking size of long long" >&5 +echo "configure:1976: 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 @@ -1938,7 +1980,7 @@ else ac_cv_sizeof_long_long=8 else cat > conftest.$ac_ext < main() @@ -1949,7 +1991,7 @@ main() exit(0); } EOF -if { (eval echo configure:1953: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1995: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_long_long=`cat conftestval` else @@ -1969,7 +2011,7 @@ EOF echo $ac_n "checking size of __int64""... $ac_c" 1>&6 -echo "configure:1973: checking size of __int64" >&5 +echo "configure:2015: 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 @@ -1977,7 +2019,7 @@ else ac_cv_sizeof___int64=8 else cat > conftest.$ac_ext < main() @@ -1988,7 +2030,7 @@ main() exit(0); } EOF -if { (eval echo configure:1992: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2034: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof___int64=`cat conftestval` else @@ -2008,7 +2050,7 @@ EOF echo $ac_n "checking size of float""... $ac_c" 1>&6 -echo "configure:2012: checking size of float" >&5 +echo "configure:2054: 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 @@ -2016,7 +2058,7 @@ else ac_cv_sizeof_float=4 else cat > conftest.$ac_ext < main() @@ -2027,7 +2069,7 @@ main() exit(0); } EOF -if { (eval echo configure:2031: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2073: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_float=`cat conftestval` else @@ -2047,7 +2089,7 @@ EOF echo $ac_n "checking size of double""... $ac_c" 1>&6 -echo "configure:2051: checking size of double" >&5 +echo "configure:2093: 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 @@ -2055,7 +2097,7 @@ else ac_cv_sizeof_double=8 else cat > conftest.$ac_ext < main() @@ -2066,7 +2108,7 @@ main() exit(0); } EOF -if { (eval echo configure:2070: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2112: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_double=`cat conftestval` else @@ -2086,7 +2128,7 @@ EOF echo $ac_n "checking size of long double""... $ac_c" 1>&6 -echo "configure:2090: checking size of long double" >&5 +echo "configure:2132: 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 @@ -2094,7 +2136,7 @@ else ac_cv_sizeof_long_double=8 else cat > conftest.$ac_ext < main() @@ -2105,7 +2147,7 @@ main() exit(0); } EOF -if { (eval echo configure:2109: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2151: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_long_double=`cat conftestval` else @@ -2129,7 +2171,7 @@ cat >>confdefs.h <<\EOF #include EOF echo $ac_n "checking size of int8_t""... $ac_c" 1>&6 -echo "configure:2133: checking size of int8_t" >&5 +echo "configure:2175: 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 @@ -2137,7 +2179,7 @@ else ac_cv_sizeof_int8_t=1 else cat > conftest.$ac_ext < main() @@ -2148,7 +2190,7 @@ main() exit(0); } EOF -if { (eval echo configure:2152: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2194: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_int8_t=`cat conftestval` else @@ -2168,7 +2210,7 @@ EOF echo $ac_n "checking size of uint8_t""... $ac_c" 1>&6 -echo "configure:2172: checking size of uint8_t" >&5 +echo "configure:2214: 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 @@ -2176,7 +2218,7 @@ else ac_cv_sizeof_uint8_t=1 else cat > conftest.$ac_ext < main() @@ -2187,7 +2229,7 @@ main() exit(0); } EOF -if { (eval echo configure:2191: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2233: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_uint8_t=`cat conftestval` else @@ -2207,7 +2249,7 @@ EOF echo $ac_n "checking size of int16_t""... $ac_c" 1>&6 -echo "configure:2211: checking size of int16_t" >&5 +echo "configure:2253: 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 @@ -2215,7 +2257,7 @@ else ac_cv_sizeof_int16_t=2 else cat > conftest.$ac_ext < main() @@ -2226,7 +2268,7 @@ main() exit(0); } EOF -if { (eval echo configure:2230: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2272: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_int16_t=`cat conftestval` else @@ -2246,7 +2288,7 @@ EOF echo $ac_n "checking size of uint16_t""... $ac_c" 1>&6 -echo "configure:2250: checking size of uint16_t" >&5 +echo "configure:2292: 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 @@ -2254,7 +2296,7 @@ else ac_cv_sizeof_uint16_t=2 else cat > conftest.$ac_ext < main() @@ -2265,7 +2307,7 @@ main() exit(0); } EOF -if { (eval echo configure:2269: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2311: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_uint16_t=`cat conftestval` else @@ -2285,7 +2327,7 @@ EOF echo $ac_n "checking size of int32_t""... $ac_c" 1>&6 -echo "configure:2289: checking size of int32_t" >&5 +echo "configure:2331: 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 @@ -2293,7 +2335,7 @@ else ac_cv_sizeof_int32_t=4 else cat > conftest.$ac_ext < main() @@ -2304,7 +2346,7 @@ main() exit(0); } EOF -if { (eval echo configure:2308: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2350: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_int32_t=`cat conftestval` else @@ -2324,7 +2366,7 @@ EOF echo $ac_n "checking size of uint32_t""... $ac_c" 1>&6 -echo "configure:2328: checking size of uint32_t" >&5 +echo "configure:2370: 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 @@ -2332,7 +2374,7 @@ else ac_cv_sizeof_uint32_t=4 else cat > conftest.$ac_ext < main() @@ -2343,7 +2385,7 @@ main() exit(0); } EOF -if { (eval echo configure:2347: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2389: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_uint32_t=`cat conftestval` else @@ -2363,7 +2405,7 @@ EOF echo $ac_n "checking size of int64_t""... $ac_c" 1>&6 -echo "configure:2367: checking size of int64_t" >&5 +echo "configure:2409: 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 @@ -2371,7 +2413,7 @@ else ac_cv_sizeof_int64_t=8 else cat > conftest.$ac_ext < main() @@ -2382,7 +2424,7 @@ main() exit(0); } EOF -if { (eval echo configure:2386: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2428: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_int64_t=`cat conftestval` else @@ -2402,7 +2444,7 @@ EOF echo $ac_n "checking size of uint64_t""... $ac_c" 1>&6 -echo "configure:2406: checking size of uint64_t" >&5 +echo "configure:2448: 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 @@ -2410,7 +2452,7 @@ else ac_cv_sizeof_uint64_t=8 else cat > conftest.$ac_ext < main() @@ -2421,7 +2463,7 @@ main() exit(0); } EOF -if { (eval echo configure:2425: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2467: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_uint64_t=`cat conftestval` else @@ -2442,7 +2484,7 @@ EOF echo $ac_n "checking size of size_t""... $ac_c" 1>&6 -echo "configure:2446: checking size of size_t" >&5 +echo "configure:2488: 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 @@ -2450,7 +2492,7 @@ else ac_cv_sizeof_size_t=4 else cat > conftest.$ac_ext < main() @@ -2461,7 +2503,7 @@ main() exit(0); } EOF -if { (eval echo configure:2465: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2507: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_size_t=`cat conftestval` else @@ -2484,7 +2526,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:2488: checking size of off_t" >&5 +echo "configure:2530: 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 @@ -2492,7 +2534,7 @@ else ac_cv_sizeof_off_t=4 else cat > conftest.$ac_ext < main() @@ -2503,7 +2545,7 @@ main() exit(0); } EOF -if { (eval echo configure:2507: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2549: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_off_t=`cat conftestval` else @@ -2530,7 +2572,7 @@ 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:2534: checking for sizeof hsize_t and hssize_t" >&5 +echo "configure:2576: checking for sizeof hsize_t and hssize_t" >&5 case $HSIZET in no|small) echo "$ac_t""small" 1>&6 @@ -2559,17 +2601,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:2563: checking for $ac_hdr" >&5 +echo "configure:2605: 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:2573: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2615: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2596,7 +2638,7 @@ fi done echo $ac_n "checking for compress in -lz""... $ac_c" 1>&6 -echo "configure:2600: checking for compress in -lz" >&5 +echo "configure:2642: 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 @@ -2604,7 +2646,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lz $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2661: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2645,7 +2687,7 @@ fi ;; no) echo $ac_n "checking for GNU zlib""... $ac_c" 1>&6 -echo "configure:2649: checking for GNU zlib" >&5 +echo "configure:2691: checking for GNU zlib" >&5 echo "$ac_t""suppressed" 1>&6 ;; *) @@ -2657,17 +2699,17 @@ echo "configure:2649: 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:2661: checking for $ac_hdr" >&5 +echo "configure:2703: 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:2671: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2713: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2699,17 +2741,17 @@ done do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2703: checking for $ac_hdr" >&5 +echo "configure:2745: 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:2713: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2755: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2742,7 +2784,7 @@ done saved_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS -L$zlib_lib" echo $ac_n "checking for compress in -lz""... $ac_c" 1>&6 -echo "configure:2746: checking for compress in -lz" >&5 +echo "configure:2788: 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 @@ -2750,7 +2792,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lz $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2807: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2791,7 +2833,7 @@ fi else echo $ac_n "checking for compress in -lz""... $ac_c" 1>&6 -echo "configure:2795: checking for compress in -lz" >&5 +echo "configure:2837: 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 @@ -2799,7 +2841,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lz $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2856: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2860,17 +2902,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:2864: checking for $ac_hdr" >&5 +echo "configure:2906: 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:2874: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2916: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2898,7 +2940,7 @@ fi done echo $ac_n "checking for main in -ldf""... $ac_c" 1>&6 -echo "configure:2902: checking for main in -ldf" >&5 +echo "configure:2944: 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 @@ -2906,14 +2948,14 @@ else ac_save_LIBS="$LIBS" LIBS="-ldf $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2959: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2942,7 +2984,7 @@ unset H5TOH4 TESTH5TOH4 fi echo $ac_n "checking for main in -lmfhdf""... $ac_c" 1>&6 -echo "configure:2946: checking for main in -lmfhdf" >&5 +echo "configure:2988: 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 @@ -2950,14 +2992,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lmfhdf $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3003: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2988,7 +3030,7 @@ fi ;; no) echo $ac_n "checking for HDF4""... $ac_c" 1>&6 -echo "configure:2992: checking for HDF4" >&5 +echo "configure:3034: checking for HDF4" >&5 echo "$ac_t""suppressed" 1>&6 unset H5TOH4 TESTH5TOH4 ;; @@ -3001,17 +3043,17 @@ echo "configure:2992: 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:3005: checking for $ac_hdr" >&5 +echo "configure:3047: 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:3015: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3057: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3045,17 +3087,17 @@ done do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3049: checking for $ac_hdr" >&5 +echo "configure:3091: 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:3059: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3101: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3088,7 +3130,7 @@ done saved_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS -L$hdf4_lib" echo $ac_n "checking for main in -ldf""... $ac_c" 1>&6 -echo "configure:3092: checking for main in -ldf" >&5 +echo "configure:3134: 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 @@ -3096,14 +3138,14 @@ else ac_save_LIBS="$LIBS" LIBS="-ldf $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3149: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3132,7 +3174,7 @@ unset H5TOH4 TESTH5TOH4 fi echo $ac_n "checking for main in -lmfhdf""... $ac_c" 1>&6 -echo "configure:3136: checking for main in -lmfhdf" >&5 +echo "configure:3178: 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 @@ -3140,14 +3182,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lmfhdf $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3193: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3177,7 +3219,7 @@ fi else echo $ac_n "checking for main in -ldf""... $ac_c" 1>&6 -echo "configure:3181: checking for main in -ldf" >&5 +echo "configure:3223: 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 @@ -3185,14 +3227,14 @@ else ac_save_LIBS="$LIBS" LIBS="-ldf $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3238: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3220,7 +3262,7 @@ else fi echo $ac_n "checking for main in -lmfhdf""... $ac_c" 1>&6 -echo "configure:3224: checking for main in -lmfhdf" >&5 +echo "configure:3266: 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 @@ -3228,14 +3270,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lmfhdf $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3281: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3269,9 +3311,9 @@ esac echo $ac_n "checking for tm_gmtoff in struct tm""... $ac_c" 1>&6 -echo "configure:3273: checking for tm_gmtoff in struct tm" >&5 +echo "configure:3315: checking for tm_gmtoff in struct tm" >&5 cat > conftest.$ac_ext < @@ -3280,7 +3322,7 @@ int main() { struct tm tm; tm.tm_gmtoff=0; ; return 0; } EOF -if { (eval echo configure:3284: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3326: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_TM_GMTOFF 1 @@ -3296,9 +3338,9 @@ fi rm -f conftest* echo $ac_n "checking for __tm_gmtoff in struct tm""... $ac_c" 1>&6 -echo "configure:3300: checking for __tm_gmtoff in struct tm" >&5 +echo "configure:3342: checking for __tm_gmtoff in struct tm" >&5 cat > conftest.$ac_ext < @@ -3307,7 +3349,7 @@ int main() { struct tm tm; tm.__tm_gmtoff=0; ; return 0; } EOF -if { (eval echo configure:3311: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3353: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE___TM_GMTOFF 1 @@ -3323,9 +3365,9 @@ fi rm -f conftest* echo $ac_n "checking for global timezone variable""... $ac_c" 1>&6 -echo "configure:3327: checking for global timezone variable" >&5 +echo "configure:3369: checking for global timezone variable" >&5 cat > conftest.$ac_ext < @@ -3334,7 +3376,7 @@ int main() { timezone=0; ; return 0; } EOF -if { (eval echo configure:3338: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3380: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_TIMEZONE 1 @@ -3350,12 +3392,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:3354: checking whether struct tm is in sys/time.h or time.h" >&5 +echo "configure:3396: 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 @@ -3363,7 +3405,7 @@ int main() { struct tm *tp; tp->tm_sec; ; return 0; } EOF -if { (eval echo configure:3367: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3409: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm=time.h else @@ -3384,12 +3426,12 @@ EOF fi echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6 -echo "configure:3388: checking for tm_zone in struct tm" >&5 +echo "configure:3430: 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> @@ -3397,7 +3439,7 @@ int main() { struct tm tm; tm.tm_zone; ; return 0; } EOF -if { (eval echo configure:3401: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3443: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm_zone=yes else @@ -3417,12 +3459,12 @@ EOF else echo $ac_n "checking for tzname""... $ac_c" 1>&6 -echo "configure:3421: checking for tzname" >&5 +echo "configure:3463: 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. */ @@ -3432,7 +3474,7 @@ int main() { atoi(*tzname); ; return 0; } EOF -if { (eval echo configure:3436: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3478: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_var_tzname=yes else @@ -3454,9 +3496,9 @@ EOF fi echo $ac_n "checking for struct timezone""... $ac_c" 1>&6 -echo "configure:3458: checking for struct timezone" >&5 +echo "configure:3500: checking for struct timezone" >&5 cat > conftest.$ac_ext < @@ -3466,7 +3508,7 @@ int main() { struct timezone tz; tz.tz_minuteswest=0; ; return 0; } EOF -if { (eval echo configure:3470: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3512: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_STRUCT_TIMEZONE 1 @@ -3482,9 +3524,9 @@ fi rm -f conftest* echo $ac_n "checking for st_blocks in struct stat""... $ac_c" 1>&6 -echo "configure:3486: checking for st_blocks in struct stat" >&5 +echo "configure:3528: checking for st_blocks in struct stat" >&5 cat > conftest.$ac_ext < @@ -3492,7 +3534,7 @@ int main() { struct stat sb; sb.st_blocks=0; ; return 0; } EOF -if { (eval echo configure:3496: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3538: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_STAT_ST_BLOCKS 1 @@ -3510,12 +3552,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:3514: checking for $ac_func" >&5 +echo "configure:3556: 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${ac_exeext}; then +if { (eval echo configure:3584: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3565,12 +3607,12 @@ done for ac_func in _scrsize ioctl compress2 setsysinfo do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3569: checking for $ac_func" >&5 +echo "configure:3611: 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${ac_exeext}; then +if { (eval echo configure:3639: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3619,16 +3661,16 @@ done echo $ac_n "checking for struct videoconfig""... $ac_c" 1>&6 -echo "configure:3623: checking for struct videoconfig" >&5 +echo "configure:3665: checking for struct videoconfig" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3674: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_STRUCT_VIDEOCONFIG 1 @@ -3644,16 +3686,16 @@ fi rm -f conftest* echo $ac_n "checking for struct text_info""... $ac_c" 1>&6 -echo "configure:3648: checking for struct text_info" >&5 +echo "configure:3690: checking for struct text_info" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3699: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_STRUCT_TEXT_INFO 1 @@ -3669,16 +3711,16 @@ fi rm -f conftest* echo $ac_n "checking for TIOCGWINSZ""... $ac_c" 1>&6 -echo "configure:3673: checking for TIOCGWINSZ" >&5 +echo "configure:3715: checking for TIOCGWINSZ" >&5 cat > conftest.$ac_ext < int main() { int w=TIOCGWINSZ; ; return 0; } EOF -if { (eval echo configure:3682: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3724: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_TIOCGWINSZ 1 @@ -3694,16 +3736,16 @@ fi rm -f conftest* echo $ac_n "checking for TIOCGGETD""... $ac_c" 1>&6 -echo "configure:3698: checking for TIOCGGETD" >&5 +echo "configure:3740: checking for TIOCGGETD" >&5 cat > conftest.$ac_ext < int main() { int w=TIOCGETD; ; return 0; } EOF -if { (eval echo configure:3707: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3749: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_TIOCGETD 1 @@ -3722,12 +3764,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:3726: checking for $ac_func" >&5 +echo "configure:3768: 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${ac_exeext}; then +if { (eval echo configure:3796: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3777,12 +3819,12 @@ done for ac_func in gettimeofday BSDgettimeofday difftime sigaction snprintf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3781: checking for $ac_func" >&5 +echo "configure:3823: 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${ac_exeext}; then +if { (eval echo configure:3851: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3831,24 +3873,24 @@ done cat > conftest.$ac_ext < int main() { off64_t n = 0; ; return 0; } EOF -if { (eval echo configure:3842: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3884: \"$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:3847: checking for $ac_func" >&5 +echo "configure:3889: 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${ac_exeext}; then +if { (eval echo configure:3917: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3906,12 +3948,12 @@ rm -f conftest* echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:3910: checking for working const" >&5 +echo "configure:3952: 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:4006: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -3981,21 +4023,21 @@ EOF fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:3985: checking for inline" >&5 +echo "configure:4027: 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:4041: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -4022,16 +4064,16 @@ esac echo $ac_n "checking for __attribute__ extension""... $ac_c" 1>&6 -echo "configure:4026: checking for __attribute__ extension" >&5 +echo "configure:4068: checking for __attribute__ extension" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4077: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_ATTRIBUTE 1 @@ -4047,16 +4089,16 @@ fi rm -f conftest* echo $ac_n "checking for __FUNCTION__ extension""... $ac_c" 1>&6 -echo "configure:4051: checking for __FUNCTION__ extension" >&5 +echo "configure:4093: checking for __FUNCTION__ extension" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4102: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_FUNCTION 1 @@ -4072,7 +4114,7 @@ fi rm -f conftest* echo $ac_n "checking how to print long long""... $ac_c" 1>&6 -echo "configure:4076: checking how to print long long" >&5 +echo "configure:4118: 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 @@ -4081,7 +4123,7 @@ else { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < @@ -4092,7 +4134,7 @@ else sprintf(s,"%${hdf5_cv_printf_ll}d",x); exit (strcmp(s,"1099511627776"));} EOF -if { (eval echo configure:4096: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4138: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then break else @@ -4112,7 +4154,7 @@ EOF echo $ac_n "checking for debug flags""... $ac_c" 1>&6 -echo "configure:4116: checking for debug flags" >&5 +echo "configure:4158: checking for debug flags" >&5 # Check whether --enable-debug or --disable-debug was given. if test "${enable_debug+set}" = set; then enableval="$enable_debug" @@ -4144,7 +4186,7 @@ if test "X" != "X$DEBUG_PKG"; then fi echo $ac_n "checking for API tracing""... $ac_c" 1>&6 -echo "configure:4148: checking for API tracing" >&5; +echo "configure:4190: checking for API tracing" >&5; # Check whether --enable-trace or --disable-trace was given. if test "${enable_trace+set}" = set; then enableval="$enable_trace" @@ -4167,7 +4209,7 @@ if test "${enable_parallel+set}" = set; then fi echo $ac_n "checking for parallel support""... $ac_c" 1>&6 -echo "configure:4171: checking for parallel support" >&5; +echo "configure:4213: checking for parallel support" >&5; @@ -4195,7 +4237,7 @@ case "X-$PARALLEL" in EOF echo $ac_n "checking for MPI_Init in -lmpi""... $ac_c" 1>&6 -echo "configure:4199: checking for MPI_Init in -lmpi" >&5 +echo "configure:4241: checking for MPI_Init in -lmpi" >&5 ac_lib_var=`echo mpi'_'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 @@ -4203,7 +4245,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lmpi $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4260: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4242,7 +4284,7 @@ else fi echo $ac_n "checking for MPI_File_open in -lmpio""... $ac_c" 1>&6 -echo "configure:4246: checking for MPI_File_open in -lmpio" >&5 +echo "configure:4288: checking for MPI_File_open in -lmpio" >&5 ac_lib_var=`echo mpio'_'MPI_File_open | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4250,7 +4292,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lmpio $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4307: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else diff --git a/configure.in b/configure.in index e11fb3b..db13084 100644 --- a/configure.in +++ b/configure.in @@ -1,3 +1,4 @@ + dnl Process this file with autoconf to produce configure. dnl dnl Copyright (C) 1997 National Center for Supercomputing Applications. @@ -143,10 +144,16 @@ AC_HEADER_STDC AC_HEADER_TIME dnl Unix AC_CHECK_HEADERS(sys/resource.h sys/time.h unistd.h sys/ioctl.h sys/stat.h) -AC_CHECK_HEADERS(stddef.h sys/sysinfo.h sys/proc.h sys/param.h) +AC_CHECK_HEADERS(stddef.h) dnl Windows AC_CHECK_HEADERS(io.h winsock.h sys/timeb.h) +dnl The and are needed on the DEC Alpha +dnl to turn off UAC fixing. We do *not* attempt to locate these files on +dnl other systems because there are too many problems with including them. +if test "$host_vendor-$host_cpu" = "dec-alpha"; then + AC_CHECK_HEADERS(sys/sysinfo.h sys/proc.h) +fi dnl ---------------------------------------------------------------------- dnl Data types and their sizes. diff --git a/src/H5Tconv.c b/src/H5Tconv.c index 5c91a68..12df642 100644 --- a/src/H5Tconv.c +++ b/src/H5Tconv.c @@ -4918,7 +4918,7 @@ H5T_conv_i32le_f64le (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, * element of the buffer) then the source and destination areas * overlap so we need to use a temp buf for the destination. */ - if (s==buf) d = tmp; + if ((void*)s==buf) d = tmp; /* Convert the integer to a sign and magnitude */ switch (src->u.atomic.u.i.sign) { diff --git a/src/H5config.h.in b/src/H5config.h.in index abe9531..dbd9072 100644 --- a/src/H5config.h.in +++ b/src/H5config.h.in @@ -203,9 +203,6 @@ /* Define if you have the header file. */ #undef HAVE_SYS_IOCTL_H -/* Define if you have the header file. */ -#undef HAVE_SYS_PARAM_H - /* Define if you have the header file. */ #undef HAVE_SYS_PROC_H diff --git a/src/H5private.h b/src/H5private.h index 487f83a..865c85d 100644 --- a/src/H5private.h +++ b/src/H5private.h @@ -92,16 +92,11 @@ /* * System information. These are needed on the DEC Alpha to turn off fixing * of unaligned accesses by the operating system during detection of - * alignment constraints in H5detect.c:main(). The must be - * included before on FreeBSD even though we never use anything - * from either header file on that system. + * alignment constraints in H5detect.c:main(). */ #ifdef HAVE_SYS_SYSINFO_H # include #endif -#ifdef HAVE_SYS_PARAM_H -# include -#endif #ifdef HAVE_SYS_PROC_H # include #endif diff --git a/test/dtypes.c b/test/dtypes.c index 0047560..04e5737 100644 --- a/test/dtypes.c +++ b/test/dtypes.c @@ -2088,7 +2088,8 @@ test_conv_int_1(const char *name, hid_t src, hid_t dst) for (k=0; k1) { - printf("i=%d:\n", i); + printf("i=%lu:\n", (unsigned long)i); } else { - printf("%03d:", i); + printf("%03lu:", (unsigned long)i); } for (j=0; j1) - printf("%03d:", j); + printf("%03lu:", (unsigned long)j); for (k=0; k 1) { - printf("i=%d:\n", i); + printf("i=%lu:\n", (unsigned long)i); } else { - printf("%03d:", i); + printf("%03lu:", (unsigned long)i); } for (j = 0; j < ny; j++) { if (nz > 1) - printf("%03d:", j); + printf("%03lu:", (unsigned long)j); for (k = 0; k < nz; k++) { printf(" %3d", *array++); } -- cgit v0.12