[svn-r19050] Description:

	Bring r18704:19049 from trunk to revise_chunks branch.

Tested on:
        FreeBSD/32 6.3 (duty) in debug mode
        FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
        Linux/32 2.6 (jam) w/PGI compilers, w/default API=1.8.x,
                w/C++ & FORTRAN, w/threadsafe, in debug mode
        Linux/64-amd64 2.6 (amani) w/Intel compilers, w/default API=1.6.x,
                w/C++ & FORTRAN, in production mode
        Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
                w/szip filter, in production mode
        Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
                in production mode
        Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in debug mode
        Mac OS X/32 10.6.3 (amazon) in debug mode
        Mac OS X/32 10.6.3 (amazon) w/C++ & FORTRAN, w/threadsafe,
                in production mode

4 files changed, 82 insertions, 30 deletions

diff --git a/config/ibm-aix b/config/ibm-aix
index 954dc7f..8b6a5a3 100644
--- a/config/ibm-aix
+++ b/config/ibm-aix
@@ -19,7 +19,6 @@
 # the various compile modes.
 
 # Use AIX supplied C compiler by default, xlc for serial, mpcc_r for parallel.
-# Use -D_LARGE_FILES by default to support large file size.
 # Make sure this is applied to other API compile options such as C++.
 if test "X-" =  "X-$CC"; then
   if test "X-$enable_parallel" = "X-yes"; then
@@ -44,19 +43,7 @@ fi
 
 case $CC_BASENAME in
   xlc|xlc-*|mpcc_r|mpcc_r-*)
-    # Turn off shared lib option.  It causes some test suite to fail.
-    enable_shared="${enable_shared:-no}"
-    # Use -D_LARGE_FILES by default to support large file size.
-    # Make sure this is applied to other API compile options such as C++.
-    AM_CFLAGS="-D_LARGE_FILES $AM_CFLAGS"
-    H5_CFLAGS="-qlanglvl=stdc99 $H5_CFLAGS"
-    DEBUG_CFLAGS="-g -qfullpath"
-    DEBUG_CPPFLAGS=
-    # -O causes test/dtypes to fail badly. Turn it off for now.
-    PROD_CFLAGS=""
-    PROD_CPPFLAGS=
-    PROFILE_CFLAGS="-g -qfullpath -pg"
-    PROFILE_CPPFLAGS=
+    . $srcdir/config/ibm-flags
     ;;
 
   gcc)
@@ -122,10 +109,6 @@ ac_cv_sizeof_uint_fast64_t=${ac_cv_sizeof_uint_fast64_t=8}
 # Don't cache long since it varies between 32 and 64 bits
 #ac_cv_sizeof_long=${ac_cv_sizeof_long=4}
 
-# Don't cache size_t and off_t because they depend on if -D_LARGE_FILES is used
-#ac_cv_sizeof_size_t=${ac_cv_sizeof_size_t=4}
-#ac_cv_sizeof_off_t=${ac_cv_sizeof_off_t=8}
-
 # The default Fortran 90 compiler
 
 if test "X-" = "X-$FC"; then
@@ -164,8 +147,7 @@ CXX=${CXX=xlC}
 
 # Added -qweaksymbol to suppress linker messages warning of duplicate
 # symbols; these warnings are harmless. - BMR
-# Use -D_LARGE_FILES by default to support large file size.
 H5_CXXFLAGS="$H5_CXXFLAGS -qweaksymbol"
-AM_CXXFLAGS="$AM_CXXFLAGS -D_LARGE_FILES"
+AM_CXXFLAGS="$AM_CXXFLAGS"
 
 
diff --git a/config/ibm-flags b/config/ibm-flags
new file mode 100644
index 0000000..9e63f79
--- /dev/null
+++ b/config/ibm-flags
@@ -0,0 +1,77 @@
+#							-*- shell-script -*-
+#
+# Copyright by The HDF Group.
+# Copyright by the Board of Trustees of the University of Illinois.
+# All rights reserved.
+#
+# This file is part of HDF5.  The full HDF5 copyright notice, including
+# terms governing use, modification, and redistribution, is contained in
+# the files COPYING and Copyright.html.  COPYING can be found at the root
+# of the source code distribution tree; Copyright.html can be found at the
+# root level of an installed copy of the electronic HDF5 document set and
+# is linked from the top-level documents page.  It can also be found at
+# http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
+# access to either file, you may request a copy from help@hdfgroup.org.
+
+
+# This file should be sourced into configure if the compiler is the
+# IBM XL compiler or a derivative.  It is careful not to do anything
+# if the compiler is not IBM; otherwise `cc_flags_set' is set to `yes'
+#
+
+# Get the compiler version in a way that works for pgcc
+# pgcc unless a compiler version is already known
+#
+#   cc_vendor:       The compiler product name: XL
+#   cc_version:      Version number: 10.1
+#   cc_version_info: More descriptive version information
+#
+if test X = "X$cc_flags_set"; then
+    # Verify this is an IBM XL compiler
+    cc_version="`$CC $CFLAGS -qversion 2>&1 | grep '^IBM XL C/C++'`"
+    if test X != "X$cc_version"; then
+        cc_vendor="XL"
+	cc_version="`$CC $CFLAGS -qversion 2>&1 | sed -n 's/Version: \([0-9\.]*\).*/\1/p'`"
+	cc_version_info="IBM XL C/C++ $cc_version"
+        echo "compiler '$CC' is IBM $cc_vendor-$cc_version"
+
+        # Some more version numbers.
+        # XL version numbers are of the form: "major.minor.X.Y"
+	# (Need to find out the official meaning of the 4 components.)
+        cc_vers_major=`echo $cc_version | cut -f1 -d.`
+        cc_vers_minor=`echo $cc_version | cut -f2 -d.`
+        cc_vers_patch=`echo $cc_version | cut -f3 -d.`
+        test -n "$cc_vers_major" || cc_vers_major=0
+        test -n "$cc_vers_minor" || cc_vers_minor=0
+        test -n "$cc_vers_patch" || cc_vers_patch=0
+        cc_vers_all=`expr \( \( $cc_vers_major \* 100 + $cc_vers_minor \) \* 100 \) + $cc_vers_patch`
+    fi
+fi
+
+# Common XL flags for various situations
+if test "XL" = "$cc_vendor"; then
+    # Insert section about version specific problems from gnu-flags here, if
+    # necessary.
+
+    # Turn off shared lib option.  It causes some test suite to fail.
+    enable_shared="${enable_shared:-no}"
+    # Make sure this is applied to other API compile options such as C++.
+    AM_CFLAGS="$AM_CFLAGS"
+    H5_CFLAGS="-qlanglvl=stdc99 $H5_CFLAGS"
+    DEBUG_CFLAGS="-g -qfullpath"
+    DEBUG_CPPFLAGS=
+    # -O causes test/dtypes to fail badly. Turn it off for now.
+    PROD_CFLAGS=""
+    PROD_CPPFLAGS=
+    PROFILE_CFLAGS="-g -qfullpath -pg"
+    PROFILE_CPPFLAGS=
+    # Flags are set
+    cc_flags_set=yes
+fi
+
+# Clear cc info if no flags set
+if test "X-$cc_flags_set" = "X-"; then
+  cc_vendor=
+  cc_version=
+  cc_version_info=
+fi
diff --git a/config/lt_vers.am b/config/lt_vers.am
index 766e2e3..71fa126 100644
--- a/config/lt_vers.am
+++ b/config/lt_vers.am
@@ -17,7 +17,7 @@
 # Add libtool shared library version numbers to the HDF5 library
 # See libtool versioning documentation online.
 LT_VERS_INTERFACE = 6
-LT_VERS_REVISION = 59
+LT_VERS_REVISION = 63
 LT_VERS_AGE = 0
 
 ## If the API changes *at all*, increment LT_VERS_INTERFACE and
diff --git a/config/powerpc-ibm-aix5.x b/config/powerpc-ibm-aix5.x
index 96ad26a..aecbf33 100644
--- a/config/powerpc-ibm-aix5.x
+++ b/config/powerpc-ibm-aix5.x
@@ -19,7 +19,6 @@
 # the various compile modes.
 
 # Use AIX supplied C compiler by default, xlc for serial, mpcc_r for parallel.
-# Use -D_LARGE_FILES by default to support large file size.
 # Make sure this is applied to other API compile options such as C++.
 if test "X-" =  "X-$CC"; then
   if test "X-$enable_parallel" = "X-yes"; then
@@ -46,9 +45,8 @@ case $CC_BASENAME in
   xlc|xlc-*|mpcc_r|mpcc_r-*)
     # Turn off shared lib option.  It causes some test suite to fail.
     enable_shared="${enable_shared:-no}"
-    # Use -D_LARGE_FILES by default to support large file size.
     # Make sure this is applied to other API compile options such as C++.
-    AM_CFLAGS="-D_LARGE_FILES $AM_CFLAGS"
+    AM_CFLAGS="$AM_CFLAGS"
     H5_CFLAGS="-qlanglvl=stdc99 $H5_CFLAGS"
     DEBUG_CFLAGS="-g -qfullpath"
     DEBUG_CPPFLAGS=
@@ -121,10 +119,6 @@ ac_cv_sizeof_uint_fast64_t=${ac_cv_sizeof_uint_fast64_t=8}
 # Don't cache long since it varies between 32 and 64 bits
 #ac_cv_sizeof_long=${ac_cv_sizeof_long=4}
 
-# Don't cache size_t and off_t because they depend on if -D_LARGE_FILES is used
-#ac_cv_sizeof_size_t=${ac_cv_sizeof_size_t=4}
-#ac_cv_sizeof_off_t=${ac_cv_sizeof_off_t=8}
-
 # The default Fortran 90 compiler
 
 if test "X-" = "X-$FC"; then
@@ -163,8 +157,7 @@ CXX=${CXX=xlC}
 
 # Added -qweaksymbol to suppress linker messages warning of duplicate
 # symbols; these warnings are harmless. - BMR
-# Use -D_LARGE_FILES by default to support large file size.
 H5_CXXFLAGS="$H5_CXXFLAGS -qweaksymbol"
-AM_CXXFLAGS="$AM_CXXFLAGS -D_LARGE_FILES"
+AM_CXXFLAGS="$AM_CXXFLAGS"