From 389cc309c55299b7f4ae4ed77f039a878e67335d Mon Sep 17 00:00:00 2001 From: Mike McGreevy Date: Thu, 15 May 2008 11:42:03 -0500 Subject: [svn-r15007] Purpose: configure cleanup Description: cleaning up configure related to removal of --disable-hsizet flag, which we no longer support. Tested: kagiso --- Makefile.in | 1 - c++/Makefile.in | 1 - c++/examples/Makefile.in | 1 - c++/src/Makefile.in | 1 - c++/test/Makefile.in | 1 - config/gnu-flags | 14 +++----- configure | 80 ++++++++++++++++------------------------- configure.in | 13 ------- examples/Makefile.in | 1 - fortran/Makefile.in | 1 - fortran/examples/Makefile.in | 1 - fortran/src/Makefile.in | 1 - fortran/test/Makefile.in | 1 - fortran/testpar/Makefile.in | 1 - hl/Makefile.in | 1 - hl/c++/Makefile.in | 1 - hl/c++/examples/Makefile.in | 1 - hl/c++/src/Makefile.in | 1 - hl/c++/test/Makefile.in | 1 - hl/examples/Makefile.in | 1 - hl/fortran/Makefile.in | 1 - hl/fortran/examples/Makefile.in | 1 - hl/fortran/src/Makefile.in | 1 - hl/fortran/test/Makefile.in | 1 - hl/src/Makefile.in | 1 - hl/test/Makefile.in | 1 - hl/tools/Makefile.in | 1 - hl/tools/gif2h5/Makefile.in | 1 - perform/Makefile.in | 1 - release_docs/INSTALL | 9 +---- src/H5config.h.in | 3 -- src/Makefile.in | 1 - src/libhdf5.settings.in | 2 -- test/Makefile.in | 1 - test/big.c | 6 ---- testpar/Makefile.in | 1 - tools/Makefile.in | 1 - tools/h5copy/Makefile.in | 1 - tools/h5diff/Makefile.in | 1 - tools/h5dump/Makefile.in | 1 - tools/h5import/Makefile.in | 1 - tools/h5jam/Makefile.in | 1 - tools/h5ls/Makefile.in | 1 - tools/h5repack/Makefile.in | 1 - tools/h5stat/Makefile.in | 1 - tools/lib/Makefile.in | 1 - tools/misc/Makefile.in | 1 - 47 files changed, 36 insertions(+), 131 deletions(-) diff --git a/Makefile.in b/Makefile.in index f4df2ea..9c443b6 100644 --- a/Makefile.in +++ b/Makefile.in @@ -179,7 +179,6 @@ HDF_FORTRAN = @HDF_FORTRAN@ HID_T = @HID_T@ HL = @HL@ HL_FOR = @HL_FOR@ -HSIZET = @HSIZET@ HSIZE_T = @HSIZE_T@ HSSIZE_T = @HSSIZE_T@ INSTALL = @INSTALL@ diff --git a/c++/Makefile.in b/c++/Makefile.in index 3f83889..3d4ceb3 100644 --- a/c++/Makefile.in +++ b/c++/Makefile.in @@ -150,7 +150,6 @@ HDF_FORTRAN = @HDF_FORTRAN@ HID_T = @HID_T@ HL = @HL@ HL_FOR = @HL_FOR@ -HSIZET = @HSIZET@ HSIZE_T = @HSIZE_T@ HSSIZE_T = @HSSIZE_T@ INSTALL = @INSTALL@ diff --git a/c++/examples/Makefile.in b/c++/examples/Makefile.in index cfdcee5..d7cb7c2 100644 --- a/c++/examples/Makefile.in +++ b/c++/examples/Makefile.in @@ -146,7 +146,6 @@ HDF_FORTRAN = @HDF_FORTRAN@ HID_T = @HID_T@ HL = @HL@ HL_FOR = @HL_FOR@ -HSIZET = @HSIZET@ HSIZE_T = @HSIZE_T@ HSSIZE_T = @HSSIZE_T@ INSTALL = @INSTALL@ diff --git a/c++/src/Makefile.in b/c++/src/Makefile.in index ac51be0..e9836e9 100644 --- a/c++/src/Makefile.in +++ b/c++/src/Makefile.in @@ -182,7 +182,6 @@ HDF_FORTRAN = @HDF_FORTRAN@ HID_T = @HID_T@ HL = @HL@ HL_FOR = @HL_FOR@ -HSIZET = @HSIZET@ HSIZE_T = @HSIZE_T@ HSSIZE_T = @HSSIZE_T@ INSTALL = @INSTALL@ diff --git a/c++/test/Makefile.in b/c++/test/Makefile.in index e3e798e..9432b9a 100644 --- a/c++/test/Makefile.in +++ b/c++/test/Makefile.in @@ -168,7 +168,6 @@ HDF_FORTRAN = @HDF_FORTRAN@ HID_T = @HID_T@ HL = @HL@ HL_FOR = @HL_FOR@ -HSIZET = @HSIZET@ HSIZE_T = @HSIZE_T@ HSSIZE_T = @HSSIZE_T@ INSTALL = @INSTALL@ diff --git a/config/gnu-flags b/config/gnu-flags index b700038..401bafe 100644 --- a/config/gnu-flags +++ b/config/gnu-flags @@ -52,11 +52,10 @@ if test gcc = "$cc_vendor" -a "$cc_vers_all" -lt 2008001; then cat <&5 -echo $ECHO_N "checking for sizeof hsize_t and hssize_t... $ECHO_C" >&6; } - -{ echo "$as_me:$LINENO: result: large" >&5 -echo "${ECHO_T}large" >&6; } -HSIZET=large - -cat >>confdefs.h <<\_ACEOF -#define HAVE_LARGE_HSIZET 1 -_ACEOF - - host_config="none" for f in $host_cpu-$host_vendor-$host_os \ $host_cpu-$host_vendor-$host_os_novers \ @@ -7926,13 +7913,13 @@ if test "${lt_cv_nm_interface+set}" = set; then else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:7929: $ac_compile\"" >&5) + (eval echo "\"\$as_me:7916: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:7932: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:7919: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:7935: output\"" >&5) + (eval echo "\"\$as_me:7922: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -9040,7 +9027,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 9043 "configure"' > conftest.$ac_ext + echo '#line 9030 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -11608,11 +11595,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11611: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11598: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:11615: \$? = $ac_status" >&5 + echo "$as_me:11602: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -11932,11 +11919,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11935: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11922: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:11939: \$? = $ac_status" >&5 + echo "$as_me:11926: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -12037,11 +12024,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12040: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12027: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:12044: \$? = $ac_status" >&5 + echo "$as_me:12031: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -12092,11 +12079,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12095: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12082: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:12099: \$? = $ac_status" >&5 + echo "$as_me:12086: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -14920,7 +14907,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 14923 "configure" +#line 14910 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -15020,7 +15007,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 15023 "configure" +#line 15010 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -17039,11 +17026,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17042: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17029: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:17046: \$? = $ac_status" >&5 + echo "$as_me:17033: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -17138,11 +17125,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17141: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17128: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:17145: \$? = $ac_status" >&5 + echo "$as_me:17132: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -17190,11 +17177,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17193: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17180: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:17197: \$? = $ac_status" >&5 + echo "$as_me:17184: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -18720,11 +18707,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:18723: $lt_compile\"" >&5) + (eval echo "\"\$as_me:18710: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:18727: \$? = $ac_status" >&5 + echo "$as_me:18714: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -18819,11 +18806,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:18822: $lt_compile\"" >&5) + (eval echo "\"\$as_me:18809: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:18826: \$? = $ac_status" >&5 + echo "$as_me:18813: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -18871,11 +18858,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:18874: $lt_compile\"" >&5) + (eval echo "\"\$as_me:18861: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:18878: \$? = $ac_status" >&5 + echo "$as_me:18865: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -51913,9 +51900,9 @@ STATIC_SHARED!$STATIC_SHARED$ac_delim enable_shared!$enable_shared$ac_delim enable_static!$enable_static$ac_delim UNAME_INFO!$UNAME_INFO$ac_delim -HSIZET!$HSIZET$ac_delim CC!$CC$ac_delim CFLAGS!$CFLAGS$ac_delim +LDFLAGS!$LDFLAGS$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -51957,7 +51944,6 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF -LDFLAGS!$LDFLAGS$ac_delim ac_ct_CC!$ac_ct_CC$ac_delim EXEEXT!$EXEEXT$ac_delim OBJEXT!$OBJEXT$ac_delim @@ -52054,6 +52040,7 @@ BUILD_ALL_CONDITIONAL_TRUE!$BUILD_ALL_CONDITIONAL_TRUE$ac_delim BUILD_ALL_CONDITIONAL_FALSE!$BUILD_ALL_CONDITIONAL_FALSE$ac_delim DEPRECATED_SYMBOLS!$DEPRECATED_SYMBOLS$ac_delim DEFAULT_API_VERSION!$DEFAULT_API_VERSION$ac_delim +STRICT_FORMAT_CHECKS!$STRICT_FORMAT_CHECKS$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -52095,7 +52082,6 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF -STRICT_FORMAT_CHECKS!$STRICT_FORMAT_CHECKS$ac_delim BUILD_CXX_CONDITIONAL_TRUE!$BUILD_CXX_CONDITIONAL_TRUE$ac_delim BUILD_CXX_CONDITIONAL_FALSE!$BUILD_CXX_CONDITIONAL_FALSE$ac_delim BUILD_PARALLEL_CONDITIONAL_TRUE!$BUILD_PARALLEL_CONDITIONAL_TRUE$ac_delim @@ -52110,7 +52096,7 @@ LIBOBJS!$LIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 13; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 12; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 @@ -53868,12 +53854,6 @@ IF_ENABLED_DISABLED "$STRICT_FORMAT_CHECKS" PRINT_N " Default API Mapping" PRINT "$DEFAULT_API_VERSION" -PRINT_N " hsize_t" -case "$HSIZET" in - no|small) PRINT "Small" ;; - *) PRINT "Large" ;; -esac - PRINT_N " I/O filters (external)" PRINT "$EXTERNAL_FILTERS" diff --git a/configure.in b/configure.in index 86ce010..2e5035d 100644 --- a/configure.in +++ b/configure.in @@ -255,13 +255,6 @@ case $host_os in ;; esac -AC_MSG_CHECKING([for sizeof hsize_t and hssize_t]) -AC_SUBST(HSIZET) -AC_MSG_RESULT([large]) -HSIZET=large -AC_DEFINE([HAVE_LARGE_HSIZET], [1], - [Define if it's safe to use `long long' for hsize_t and hssize_t]) - host_config="none" for f in $host_cpu-$host_vendor-$host_os \ $host_cpu-$host_vendor-$host_os_novers \ @@ -4078,12 +4071,6 @@ IF_ENABLED_DISABLED "$STRICT_FORMAT_CHECKS" PRINT_N " Default API Mapping" PRINT "$DEFAULT_API_VERSION" -PRINT_N " hsize_t" -case "$HSIZET" in - no|small) PRINT "Small" ;; - *) PRINT "Large" ;; -esac - PRINT_N " I/O filters (external)" PRINT "$EXTERNAL_FILTERS" diff --git a/examples/Makefile.in b/examples/Makefile.in index 9171f40..ee60a9e 100644 --- a/examples/Makefile.in +++ b/examples/Makefile.in @@ -144,7 +144,6 @@ HDF_FORTRAN = @HDF_FORTRAN@ HID_T = @HID_T@ HL = @HL@ HL_FOR = @HL_FOR@ -HSIZET = @HSIZET@ HSIZE_T = @HSIZE_T@ HSSIZE_T = @HSSIZE_T@ INSTALL = @INSTALL@ diff --git a/fortran/Makefile.in b/fortran/Makefile.in index bc82201..c90063a 100644 --- a/fortran/Makefile.in +++ b/fortran/Makefile.in @@ -154,7 +154,6 @@ HDF_FORTRAN = @HDF_FORTRAN@ HID_T = @HID_T@ HL = @HL@ HL_FOR = @HL_FOR@ -HSIZET = @HSIZET@ HSIZE_T = @HSIZE_T@ HSSIZE_T = @HSSIZE_T@ INSTALL = @INSTALL@ diff --git a/fortran/examples/Makefile.in b/fortran/examples/Makefile.in index 515379b..d806d9f 100644 --- a/fortran/examples/Makefile.in +++ b/fortran/examples/Makefile.in @@ -146,7 +146,6 @@ HDF_FORTRAN = yes HID_T = @HID_T@ HL = @HL@ HL_FOR = @HL_FOR@ -HSIZET = @HSIZET@ HSIZE_T = @HSIZE_T@ HSSIZE_T = @HSSIZE_T@ INSTALL = @INSTALL@ diff --git a/fortran/src/Makefile.in b/fortran/src/Makefile.in index a08bec2..a23b608 100644 --- a/fortran/src/Makefile.in +++ b/fortran/src/Makefile.in @@ -210,7 +210,6 @@ HDF_FORTRAN = yes HID_T = @HID_T@ HL = @HL@ HL_FOR = @HL_FOR@ -HSIZET = @HSIZET@ HSIZE_T = @HSIZE_T@ HSSIZE_T = @HSSIZE_T@ INSTALL = @INSTALL@ diff --git a/fortran/test/Makefile.in b/fortran/test/Makefile.in index 11fd436..de0e94e 100644 --- a/fortran/test/Makefile.in +++ b/fortran/test/Makefile.in @@ -209,7 +209,6 @@ HDF_FORTRAN = yes HID_T = @HID_T@ HL = @HL@ HL_FOR = @HL_FOR@ -HSIZET = @HSIZET@ HSIZE_T = @HSIZE_T@ HSSIZE_T = @HSSIZE_T@ INSTALL = @INSTALL@ diff --git a/fortran/testpar/Makefile.in b/fortran/testpar/Makefile.in index 2e72551..2851c6b 100644 --- a/fortran/testpar/Makefile.in +++ b/fortran/testpar/Makefile.in @@ -159,7 +159,6 @@ HDF_FORTRAN = yes HID_T = @HID_T@ HL = @HL@ HL_FOR = @HL_FOR@ -HSIZET = @HSIZET@ HSIZE_T = @HSIZE_T@ HSSIZE_T = @HSSIZE_T@ INSTALL = @INSTALL@ diff --git a/hl/Makefile.in b/hl/Makefile.in index 11a74e8..bdec033 100755 --- a/hl/Makefile.in +++ b/hl/Makefile.in @@ -154,7 +154,6 @@ HDF_FORTRAN = @HDF_FORTRAN@ HID_T = @HID_T@ HL = @HL@ HL_FOR = @HL_FOR@ -HSIZET = @HSIZET@ HSIZE_T = @HSIZE_T@ HSSIZE_T = @HSSIZE_T@ INSTALL = @INSTALL@ diff --git a/hl/c++/Makefile.in b/hl/c++/Makefile.in index 2929bc3..9772091 100644 --- a/hl/c++/Makefile.in +++ b/hl/c++/Makefile.in @@ -150,7 +150,6 @@ HDF_FORTRAN = @HDF_FORTRAN@ HID_T = @HID_T@ HL = @HL@ HL_FOR = @HL_FOR@ -HSIZET = @HSIZET@ HSIZE_T = @HSIZE_T@ HSSIZE_T = @HSSIZE_T@ INSTALL = @INSTALL@ diff --git a/hl/c++/examples/Makefile.in b/hl/c++/examples/Makefile.in index 17d1b95..b67cab4 100644 --- a/hl/c++/examples/Makefile.in +++ b/hl/c++/examples/Makefile.in @@ -146,7 +146,6 @@ HDF_FORTRAN = @HDF_FORTRAN@ HID_T = @HID_T@ HL = @HL@ HL_FOR = @HL_FOR@ -HSIZET = @HSIZET@ HSIZE_T = @HSIZE_T@ HSSIZE_T = @HSSIZE_T@ INSTALL = @INSTALL@ diff --git a/hl/c++/src/Makefile.in b/hl/c++/src/Makefile.in index 197b0f3..dc56b8b 100644 --- a/hl/c++/src/Makefile.in +++ b/hl/c++/src/Makefile.in @@ -169,7 +169,6 @@ HDF_FORTRAN = @HDF_FORTRAN@ HID_T = @HID_T@ HL = @HL@ HL_FOR = @HL_FOR@ -HSIZET = @HSIZET@ HSIZE_T = @HSIZE_T@ HSSIZE_T = @HSSIZE_T@ INSTALL = @INSTALL@ diff --git a/hl/c++/test/Makefile.in b/hl/c++/test/Makefile.in index 64dd8d5..a5dbd60 100644 --- a/hl/c++/test/Makefile.in +++ b/hl/c++/test/Makefile.in @@ -160,7 +160,6 @@ HDF_FORTRAN = @HDF_FORTRAN@ HID_T = @HID_T@ HL = @HL@ HL_FOR = @HL_FOR@ -HSIZET = @HSIZET@ HSIZE_T = @HSIZE_T@ HSSIZE_T = @HSSIZE_T@ INSTALL = @INSTALL@ diff --git a/hl/examples/Makefile.in b/hl/examples/Makefile.in index 7b84e50..0eaf0ee 100644 --- a/hl/examples/Makefile.in +++ b/hl/examples/Makefile.in @@ -144,7 +144,6 @@ HDF_FORTRAN = @HDF_FORTRAN@ HID_T = @HID_T@ HL = @HL@ HL_FOR = @HL_FOR@ -HSIZET = @HSIZET@ HSIZE_T = @HSIZE_T@ HSSIZE_T = @HSSIZE_T@ INSTALL = @INSTALL@ diff --git a/hl/fortran/Makefile.in b/hl/fortran/Makefile.in index fcfd9ff..fb640c4 100644 --- a/hl/fortran/Makefile.in +++ b/hl/fortran/Makefile.in @@ -154,7 +154,6 @@ HDF_FORTRAN = @HDF_FORTRAN@ HID_T = @HID_T@ HL = @HL@ HL_FOR = @HL_FOR@ -HSIZET = @HSIZET@ HSIZE_T = @HSIZE_T@ HSSIZE_T = @HSSIZE_T@ INSTALL = @INSTALL@ diff --git a/hl/fortran/examples/Makefile.in b/hl/fortran/examples/Makefile.in index ad1d557..a10d84f 100644 --- a/hl/fortran/examples/Makefile.in +++ b/hl/fortran/examples/Makefile.in @@ -146,7 +146,6 @@ HDF_FORTRAN = yes HID_T = @HID_T@ HL = @HL@ HL_FOR = @HL_FOR@ -HSIZET = @HSIZET@ HSIZE_T = @HSIZE_T@ HSSIZE_T = @HSSIZE_T@ INSTALL = @INSTALL@ diff --git a/hl/fortran/src/Makefile.in b/hl/fortran/src/Makefile.in index e2ed9a6..dde1469 100644 --- a/hl/fortran/src/Makefile.in +++ b/hl/fortran/src/Makefile.in @@ -174,7 +174,6 @@ HDF_FORTRAN = @HDF_FORTRAN@ HID_T = @HID_T@ HL = @HL@ HL_FOR = @HL_FOR@ -HSIZET = @HSIZET@ HSIZE_T = @HSIZE_T@ HSSIZE_T = @HSSIZE_T@ INSTALL = @INSTALL@ diff --git a/hl/fortran/test/Makefile.in b/hl/fortran/test/Makefile.in index eda9cf7..b04d8c7 100644 --- a/hl/fortran/test/Makefile.in +++ b/hl/fortran/test/Makefile.in @@ -164,7 +164,6 @@ HDF_FORTRAN = @HDF_FORTRAN@ HID_T = @HID_T@ HL = @HL@ HL_FOR = @HL_FOR@ -HSIZET = @HSIZET@ HSIZE_T = @HSIZE_T@ HSSIZE_T = @HSSIZE_T@ INSTALL = @INSTALL@ diff --git a/hl/src/Makefile.in b/hl/src/Makefile.in index f4341ab..d75699d 100644 --- a/hl/src/Makefile.in +++ b/hl/src/Makefile.in @@ -170,7 +170,6 @@ HDF_FORTRAN = @HDF_FORTRAN@ HID_T = @HID_T@ HL = @HL@ HL_FOR = @HL_FOR@ -HSIZET = @HSIZET@ HSIZE_T = @HSIZE_T@ HSSIZE_T = @HSSIZE_T@ INSTALL = @INSTALL@ diff --git a/hl/test/Makefile.in b/hl/test/Makefile.in index 87e0b61..c997cea 100644 --- a/hl/test/Makefile.in +++ b/hl/test/Makefile.in @@ -180,7 +180,6 @@ HDF_FORTRAN = @HDF_FORTRAN@ HID_T = @HID_T@ HL = @HL@ HL_FOR = @HL_FOR@ -HSIZET = @HSIZET@ HSIZE_T = @HSIZE_T@ HSSIZE_T = @HSSIZE_T@ INSTALL = @INSTALL@ diff --git a/hl/tools/Makefile.in b/hl/tools/Makefile.in index a92fa11..ec37f61 100644 --- a/hl/tools/Makefile.in +++ b/hl/tools/Makefile.in @@ -151,7 +151,6 @@ HDF_FORTRAN = @HDF_FORTRAN@ HID_T = @HID_T@ HL = @HL@ HL_FOR = @HL_FOR@ -HSIZET = @HSIZET@ HSIZE_T = @HSIZE_T@ HSSIZE_T = @HSSIZE_T@ INSTALL = @INSTALL@ diff --git a/hl/tools/gif2h5/Makefile.in b/hl/tools/gif2h5/Makefile.in index aba052e..a67df6c 100644 --- a/hl/tools/gif2h5/Makefile.in +++ b/hl/tools/gif2h5/Makefile.in @@ -172,7 +172,6 @@ HDF_FORTRAN = @HDF_FORTRAN@ HID_T = @HID_T@ HL = @HL@ HL_FOR = @HL_FOR@ -HSIZET = @HSIZET@ HSIZE_T = @HSIZE_T@ HSSIZE_T = @HSSIZE_T@ INSTALL = @INSTALL@ diff --git a/perform/Makefile.in b/perform/Makefile.in index fc5abea..a62d749 100644 --- a/perform/Makefile.in +++ b/perform/Makefile.in @@ -209,7 +209,6 @@ HDF_FORTRAN = @HDF_FORTRAN@ HID_T = @HID_T@ HL = @HL@ HL_FOR = @HL_FOR@ -HSIZET = @HSIZET@ HSIZE_T = @HSIZE_T@ HSSIZE_T = @HSSIZE_T@ INSTALL = @INSTALL@ diff --git a/release_docs/INSTALL b/release_docs/INSTALL index 4a9a567..9f18c55 100644 --- a/release_docs/INSTALL +++ b/release_docs/INSTALL @@ -622,11 +622,6 @@ A. Warnings about compilers A.1. GNU (Intel platforms) Versions before 2.8.1 have serious problems allocating registers when functions contain operations on `long long' datatypes. - Supplying the `--disable-hsizet' switch to configure (documented - in Appendix B, "Large (>2GB) versus small (<2GB) file capability,") - will prevent HDF5 from using `long long' datatypes in - situations that are known not to work, but it limits the HDF5 - address space to 2GB. A.2. COMPAQ/DEC The V5.2-038 compiler (and possibly others) occasionally @@ -656,10 +651,8 @@ B. Large (>2GB) versus small (<2GB) file capability than 2GB, it is necessary to use the non-ANSI `long long' data type on some platforms. However, some compilers (e.g., GNU gcc versions before 2.8.1 on Intel platforms) are unable to produce - correct machine code for this datatype. To disable use of the - `long long' type on these machines, say: + correct machine code for this datatype. - $ ./configure --disable-hsizet C. Building and testing with other compilers C.1. Building and testing with Intel compilers diff --git a/src/H5config.h.in b/src/H5config.h.in index f5265c5..429b613 100644 --- a/src/H5config.h.in +++ b/src/H5config.h.in @@ -162,9 +162,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_IO_H -/* Define if it's safe to use `long long' for hsize_t and hssize_t */ -#undef HAVE_LARGE_HSIZET - /* Define to 1 if you have the `dmalloc' library (-ldmalloc). */ #undef HAVE_LIBDMALLOC diff --git a/src/Makefile.in b/src/Makefile.in index 6dc6767..4bb247a 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -228,7 +228,6 @@ HDF_FORTRAN = @HDF_FORTRAN@ HID_T = @HID_T@ HL = @HL@ HL_FOR = @HL_FOR@ -HSIZET = @HSIZET@ HSIZE_T = @HSIZE_T@ HSSIZE_T = @HSSIZE_T@ INSTALL = @INSTALL@ diff --git a/src/libhdf5.settings.in b/src/libhdf5.settings.in index 73bd35a..380d26b 100644 --- a/src/libhdf5.settings.in +++ b/src/libhdf5.settings.in @@ -20,7 +20,6 @@ General Information: Ranlib: @RANLIB@ Debugged Packages: @DEBUG_PKG@ API Tracing: @TRACE_API@ - File addresses: @HSIZET@ Compiling Options: ------------------ @@ -54,7 +53,6 @@ Features: GPFS: @GPFS@ Strict File Format Checks: @STRICT_FORMAT_CHECKS@ Default API Mapping: @DEFAULT_API_VERSION@ - hsize_t: @HSIZET@ I/O filters (external): @EXTERNAL_FILTERS@ I/O filters (internal): @FILTERS@ Linux Large File Support (LFS): @LINUX_LFS@ diff --git a/test/Makefile.in b/test/Makefile.in index 1c0470d..12787a2 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -434,7 +434,6 @@ HDF_FORTRAN = @HDF_FORTRAN@ HID_T = @HID_T@ HL = @HL@ HL_FOR = @HL_FOR@ -HSIZET = @HSIZET@ HSIZE_T = @HSIZE_T@ HSSIZE_T = @HSSIZE_T@ INSTALL = @INSTALL@ diff --git a/test/big.c b/test/big.c index fa61a9b..9899754 100644 --- a/test/big.c +++ b/test/big.c @@ -589,12 +589,6 @@ main (int ac, char **av) usage(); goto quit; } - if (sizeof(hsize_t)<=4) { - puts("Test skipped because the hdf5 library was configured with the"); - puts("--disable-hsizet flag in order to work around a compiler bug."); - usage(); - goto quit; - } } /* Do the test with the Family Driver */ diff --git a/testpar/Makefile.in b/testpar/Makefile.in index 3cb06a7..89882cd 100644 --- a/testpar/Makefile.in +++ b/testpar/Makefile.in @@ -187,7 +187,6 @@ HDF_FORTRAN = @HDF_FORTRAN@ HID_T = @HID_T@ HL = @HL@ HL_FOR = @HL_FOR@ -HSIZET = @HSIZET@ HSIZE_T = @HSIZE_T@ HSSIZE_T = @HSSIZE_T@ INSTALL = @INSTALL@ diff --git a/tools/Makefile.in b/tools/Makefile.in index af1b177..6f0ba68 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -151,7 +151,6 @@ HDF_FORTRAN = @HDF_FORTRAN@ HID_T = @HID_T@ HL = @HL@ HL_FOR = @HL_FOR@ -HSIZET = @HSIZET@ HSIZE_T = @HSIZE_T@ HSSIZE_T = @HSSIZE_T@ INSTALL = @INSTALL@ diff --git a/tools/h5copy/Makefile.in b/tools/h5copy/Makefile.in index a53e043..c675414 100644 --- a/tools/h5copy/Makefile.in +++ b/tools/h5copy/Makefile.in @@ -168,7 +168,6 @@ HDF_FORTRAN = @HDF_FORTRAN@ HID_T = @HID_T@ HL = @HL@ HL_FOR = @HL_FOR@ -HSIZET = @HSIZET@ HSIZE_T = @HSIZE_T@ HSSIZE_T = @HSSIZE_T@ INSTALL = @INSTALL@ diff --git a/tools/h5diff/Makefile.in b/tools/h5diff/Makefile.in index 24e4e5e..de7d8d8 100644 --- a/tools/h5diff/Makefile.in +++ b/tools/h5diff/Makefile.in @@ -175,7 +175,6 @@ HDF_FORTRAN = @HDF_FORTRAN@ HID_T = @HID_T@ HL = @HL@ HL_FOR = @HL_FOR@ -HSIZET = @HSIZET@ HSIZE_T = @HSIZE_T@ HSSIZE_T = @HSSIZE_T@ INSTALL = @INSTALL@ diff --git a/tools/h5dump/Makefile.in b/tools/h5dump/Makefile.in index f7e0982..21433be 100644 --- a/tools/h5dump/Makefile.in +++ b/tools/h5dump/Makefile.in @@ -173,7 +173,6 @@ HDF_FORTRAN = @HDF_FORTRAN@ HID_T = @HID_T@ HL = @HL@ HL_FOR = @HL_FOR@ -HSIZET = @HSIZET@ HSIZE_T = @HSIZE_T@ HSSIZE_T = @HSSIZE_T@ INSTALL = @INSTALL@ diff --git a/tools/h5import/Makefile.in b/tools/h5import/Makefile.in index d0cb2ad..e6b5675 100755 --- a/tools/h5import/Makefile.in +++ b/tools/h5import/Makefile.in @@ -168,7 +168,6 @@ HDF_FORTRAN = @HDF_FORTRAN@ HID_T = @HID_T@ HL = @HL@ HL_FOR = @HL_FOR@ -HSIZET = @HSIZET@ HSIZE_T = @HSIZE_T@ HSSIZE_T = @HSSIZE_T@ INSTALL = @INSTALL@ diff --git a/tools/h5jam/Makefile.in b/tools/h5jam/Makefile.in index 29949e9..ccafff5 100644 --- a/tools/h5jam/Makefile.in +++ b/tools/h5jam/Makefile.in @@ -179,7 +179,6 @@ HDF_FORTRAN = @HDF_FORTRAN@ HID_T = @HID_T@ HL = @HL@ HL_FOR = @HL_FOR@ -HSIZET = @HSIZET@ HSIZE_T = @HSIZE_T@ HSSIZE_T = @HSSIZE_T@ INSTALL = @INSTALL@ diff --git a/tools/h5ls/Makefile.in b/tools/h5ls/Makefile.in index c6070ea..1f3f11a 100644 --- a/tools/h5ls/Makefile.in +++ b/tools/h5ls/Makefile.in @@ -162,7 +162,6 @@ HDF_FORTRAN = @HDF_FORTRAN@ HID_T = @HID_T@ HL = @HL@ HL_FOR = @HL_FOR@ -HSIZET = @HSIZET@ HSIZE_T = @HSIZE_T@ HSSIZE_T = @HSSIZE_T@ INSTALL = @INSTALL@ diff --git a/tools/h5repack/Makefile.in b/tools/h5repack/Makefile.in index 02dee85..0e2406f 100644 --- a/tools/h5repack/Makefile.in +++ b/tools/h5repack/Makefile.in @@ -182,7 +182,6 @@ HDF_FORTRAN = @HDF_FORTRAN@ HID_T = @HID_T@ HL = @HL@ HL_FOR = @HL_FOR@ -HSIZET = @HSIZET@ HSIZE_T = @HSIZE_T@ HSSIZE_T = @HSSIZE_T@ INSTALL = @INSTALL@ diff --git a/tools/h5stat/Makefile.in b/tools/h5stat/Makefile.in index 6c98a0a..d41eec5 100644 --- a/tools/h5stat/Makefile.in +++ b/tools/h5stat/Makefile.in @@ -171,7 +171,6 @@ HDF_FORTRAN = @HDF_FORTRAN@ HID_T = @HID_T@ HL = @HL@ HL_FOR = @HL_FOR@ -HSIZET = @HSIZET@ HSIZE_T = @HSIZE_T@ HSSIZE_T = @HSSIZE_T@ INSTALL = @INSTALL@ diff --git a/tools/lib/Makefile.in b/tools/lib/Makefile.in index a0e2cbf..446159b 100644 --- a/tools/lib/Makefile.in +++ b/tools/lib/Makefile.in @@ -167,7 +167,6 @@ HDF_FORTRAN = @HDF_FORTRAN@ HID_T = @HID_T@ HL = @HL@ HL_FOR = @HL_FOR@ -HSIZET = @HSIZET@ HSIZE_T = @HSIZE_T@ HSSIZE_T = @HSSIZE_T@ INSTALL = @INSTALL@ diff --git a/tools/misc/Makefile.in b/tools/misc/Makefile.in index b871ddd..b51ba8a 100644 --- a/tools/misc/Makefile.in +++ b/tools/misc/Makefile.in @@ -186,7 +186,6 @@ HDF_FORTRAN = @HDF_FORTRAN@ HID_T = @HID_T@ HL = @HL@ HL_FOR = @HL_FOR@ -HSIZET = @HSIZET@ HSIZE_T = @HSIZE_T@ HSSIZE_T = @HSSIZE_T@ INSTALL = @INSTALL@ -- cgit v0.12