[svn-r8202] Purpose:

    Code cleanup/bug fix

Description:
    Fix configuration files to allow 64-bit compilation of the library with
a 64-bit version of zlib.

Solution:
    Moved important compiler flags settings from CC macro to CFLAGS macro.
Instead of setting CC (F9X, CXX) environment variable for compiling for 64-bit
code, users should just set the CFLAGS (FFLAGS, CXXFLAGS) to -q64.
    Updated INSTALL file to reflect this change.

Platforms tested:
    IBM p690 (copper) w/parallel, FORTRAN, C++, srcdir.
    Platforms specific - h5committest does not apply.

4 files changed, 11 insertions, 19 deletions

diff --git a/config/powerpc-ibm-aix5.x b/config/powerpc-ibm-aix5.x
index 41e2c6a..97a6115 100644
--- a/config/powerpc-ibm-aix5.x
+++ b/config/powerpc-ibm-aix5.x
@@ -5,13 +5,12 @@
 # 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.
 if test "X-" =  "X-$CC"; then
   if test "X-$enable_parallel" = "X-yes"; then
-    CC='mpcc_r -qlanglvl=ansi -D_LARGE_FILES'
+    CC=mpcc_r
     CC_BASENAME=mpcc_r
   else
-    CC='xlc -qlanglvl=ansi -D_LARGE_FILES'
+    CC=xlc
     CC_BASENAME=xlc
   fi
 fi
@@ -31,8 +30,8 @@ case $CC_BASENAME in
     xlc|mpcc_r)
 	# Turn off shared lib option.  It causes some test suite to fail.
 	enable_shared="${enable_shared:-no}"
-	# CFLAGS must be set else configure set it to -g
-	CFLAGS="$CFLAGS"
+        # Use -D_LARGE_FILES by default to support large file size.
+        CFLAGS="-qlanglvl=ansi -D_LARGE_FILES $CFLAGS"
 	DEBUG_CFLAGS="-g"
 	DEBUG_CPPFLAGS=
 	# -O causes test/dtypes to fail badly. Turn it off for now.
diff --git a/fortran/config/powerpc-ibm-aix5.x b/fortran/config/powerpc-ibm-aix5.x
index 6efb1e8..80ea78c 100644
--- a/fortran/config/powerpc-ibm-aix5.x
+++ b/fortran/config/powerpc-ibm-aix5.x
@@ -8,10 +8,10 @@
 # Use -D_LARGE_FILES by default to support large file size.
 if test "X-" =  "X-$CC"; then
   if test "X-$enable_parallel" = "X-yes"; then
-    CC='mpcc_r -qlanglvl=ansi -D_LARGE_FILES'
+    CC=mpcc_r
     CC_BASENAME=mpcc_r
   else
-    CC='xlc -qlanglvl=ansi -D_LARGE_FILES'
+    CC=xlc
     CC_BASENAME=xlc
   fi
 fi
@@ -31,8 +31,8 @@ case $CC_BASENAME in
     xlc|mpcc_r)
 	# Turn off shared lib option.  It causes some test suite to fail.
 	enable_shared="${enable_shared:-no}"
-	# CFLAGS must be set else configure set it to -g
-	CFLAGS="$CFLAGS"
+        # Use -D_LARGE_FILES by default to support large file size.
+        CFLAGS="-qlanglvl=ansi -D_LARGE_FILES $CFLAGS"
 	DEBUG_CFLAGS="-g"
 	DEBUG_CPPFLAGS=
 	# -O causes test/dtypes to fail badly. Turn it off for now.
diff --git a/release_docs/INSTALL b/release_docs/INSTALL
index ccb92ac..a0412bb 100644
--- a/release_docs/INSTALL
+++ b/release_docs/INSTALL
@@ -265,14 +265,11 @@
 	To configure AIX 64 bits including fortran API and C++,
 	(Remark: need to hardset $AR to 'ar -X 64'.)
 	Serial:
-	    $ CC='xlc -q64' F9X='xlf -q64' CXX='xlC -q64' AR='ar -X 64'\
+	    $ CFLAGS=-q64 FFLAGS=-q64 CXXFLAGS=-q64 AR='ar -X 64'\
 	    $ ./configure --enable-fortran
 	Parallel:
-	    $ CC='mpcc_r -q64' F9X='mpxlf_r -q64' AR='ar -X 64'\
-	    $ ./configure --enable-fortran
-
-	Specifying these machine architecture flags in the CFLAGS variable
-	(see below) will not work correctly.
+	    $ CFLAGS=-q64 FFLAGS=-q64 AR='ar -X 64'\
+	    $ ./configure --enable-fortran --enable-parallel
 
 5.3.3. Additional compilation flags
 	If addtional flags must be passed to the compilation commands
diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt
index dbe3a44..32a3df7 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -344,7 +344,3 @@ Known Problems
   If -ieee is not used, the converted double values are mostly 0.0 but
   occassionaly as 1**-308.  This has been reported to the system staff.
   All other tests have passed.
-
-* On AIX 5.1 when 64-bit parallel C Library is built with zlib configured in,
-  compilation fails for H5Zdeflate.c. To bypass the problem, remove "const"
-  definition in front of H5Z_DEFLATE in H5Zpkg.h line 29.