[svn-r14063] Purpose: removing --disable-hsizet flag from configure.

Description: This flag causes problems for users and is difficult to
             support in the library. The ability for users to disable
             this has been removed. (note: the library still uses a
             macro defined in configure, that will be removed after
             1.6.6 release has completed).

Tested: kagiso

Note: This checkin pre-approved by Elena due to it occuring mid-release. :)

4 files changed, 13 insertions, 54 deletions

diff --git a/c++/configure b/c++/configure
index 96325d2..21a8bce 100755
--- a/c++/configure
+++ b/c++/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From c++/configure.in Id: configure.in 14029 2007-07-31 03:01:30Z epourmal .
+# From c++/configure.in Id: configure.in 14030 2007-07-31 03:04:21Z epourmal .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for HDF5 C++ 1.6.6-pre3.
 #
diff --git a/configure b/configure
index 88c5b67..53b0a3f 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Id: configure.in 14029 2007-07-31 03:01:30Z epourmal .
+# From configure.in Id: configure.in 14030 2007-07-31 03:04:21Z epourmal .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for HDF5 1.6.6-pre3.
 #
@@ -1472,11 +1472,6 @@ if test -n "$ac_init_help"; then
 Optional Features:
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --disable-hsizet        Datasets can normally be larger than memory and/or
-                          files but some compilers are unable to handle this
-                          (including versions of GCC before 2.8.0). Disabling
-                          the feature causes dataset sizes to be restricted to
-                          the size of core memory, or 'size_t'.
   --enable-fortran        Compile the Fortran interface [default=no]
   --enable-cxx            Compile the C++ interface [default=no]
   --enable-static-exec    Build only statically linked executables
@@ -2202,33 +2197,17 @@ case $host_os in
     ;;
 esac
 
-# Check whether --enable-hsizet was given.
-if test "${enable_hsizet+set}" = set; then
-  enableval=$enable_hsizet; HSIZET=$enableval
-fi
-
-
 { echo "$as_me:$LINENO: checking for sizeof hsize_t and hssize_t" >&5
 echo $ECHO_N "checking for sizeof hsize_t and hssize_t... $ECHO_C" >&6; }
 
-
-case $HSIZET in
-  no|small)
-    { echo "$as_me:$LINENO: result: small" >&5
-echo "${ECHO_T}small" >&6; }
-    HSIZET=small
-    ;;
-  *)
-    { echo "$as_me:$LINENO: result: large" >&5
+{ echo "$as_me:$LINENO: result: large" >&5
 echo "${ECHO_T}large" >&6; }
-    HSIZET=large
+HSIZET=large
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_LARGE_HSIZET 1
 _ACEOF
 
-    ;;
-esac
 
 host_config="none"
 for f in $host_cpu-$host_vendor-$host_os \
@@ -5311,7 +5290,7 @@ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
 case $host in
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 5314 "configure"' > conftest.$ac_ext
+  echo '#line 5293 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -5868,7 +5847,7 @@ chmod -w .
 save_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
 compiler_c_o=no
-if { (eval echo configure:5871: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
+if { (eval echo configure:5850: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
   # The compiler can only warn and ignore the option if not recognized
   # So say no if there are warnings
   if test -s out/conftest.err; then
@@ -7743,7 +7722,7 @@ else
     lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 7746 "configure"
+#line 7725 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -7841,7 +7820,7 @@ else
     lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 7844 "configure"
+#line 7823 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
diff --git a/configure.in b/configure.in
index 8a9c8ef..7a184c7 100644
--- a/configure.in
+++ b/configure.in
@@ -167,32 +167,12 @@ case $host_os in
     ;;
 esac
 
-AC_ARG_ENABLE([hsizet],
-              [AC_HELP_STRING([--disable-hsizet],
-                              [Datasets can normally be larger than
-                               memory and/or files but some compilers are
-                               unable to handle this (including versions
-                               of GCC before 2.8.0). Disabling the
-                               feature causes dataset sizes to be
-                               restricted to the size of core memory, or
-                               'size_t'.])],
-              [HSIZET=$enableval])
-
 AC_MSG_CHECKING([for sizeof hsize_t and hssize_t])
-
 AC_SUBST(HSIZET)
-case $HSIZET in
-  no|small)
-    AC_MSG_RESULT([small])
-    HSIZET=small
-    ;;
-  *)
-    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])
-    ;;
-esac
+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 \
diff --git a/fortran/configure b/fortran/configure
index 647b6ff..591d720 100755
--- a/fortran/configure
+++ b/fortran/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From fortran/configure.in Id: configure.in 14029 2007-07-31 03:01:30Z epourmal .
+# From fortran/configure.in Id: configure.in 14030 2007-07-31 03:04:21Z epourmal .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for HDF5 Fortran 1.6.6-pre3.
 #