[svn-r5727] Purpose:

    Porting to AIX 5.x
Description:
These have been tested out in v1.4.  Folding them in here.
    aclocal.m4:
	Snow's names were not included in the special hack.
	Added its names in.
	Removed the trailing * in pacific.llnl.gov too.
    configure.in:
    fortran/configure.in:
	Added a case to group all AIX 5.* versions as aix5.x.  This allows
	them to share one common config/*aix5.x file.
    configure:
    fortran/configure:
	Derived from configure.in (done in eirene).
    config/powerpc-ibm-aix4.x:
	Added a comment explaining why not to cache sizeof size_t and off_t
    fortran/config/powerpc-ibm-aix4.x:
	Turned of cache of sizeof size_t and off_t because they are depedent
	on compiler options.
    config/powerpc-ibm-aix5.x:
    fortran/config/powerpc-ibm-aix5.x:
	New config file for AIX 5.X
Platforms tests:
    LLNL Blue, Frost, Snow, both serial and parallel.

7 files changed, 114 insertions, 13 deletions

diff --git a/aclocal.m4 b/aclocal.m4
index 0966dc7..0ecf501 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1509,7 +1509,7 @@ else
         hname="`hostname`"
 
         case "$hname" in
-          *pacific.llnl.gov* | *s0*)
+          *pacific.llnl.gov | snow*.llnl.gov | *s0*)
             hardcode_libdir_flag_spec=' '
             ;;
           *)
diff --git a/config/powerpc-ibm-aix4.x b/config/powerpc-ibm-aix4.x
index ebfc2a1..8b8ae02 100644
--- a/config/powerpc-ibm-aix4.x
+++ b/config/powerpc-ibm-aix4.x
@@ -14,6 +14,9 @@
 #CFLAGS="$CFLAGS -ansi"
 #CPPFLAGS="$CPPFLAGS -I."
 
+# CFLAGS must be set else configure set it to -g
+CFLAGS="$CFLAGS"
+
 # What compiler flags should be used for code development?
 DEBUG_CFLAGS=
 DEBUG_CPPFLAGS=
@@ -39,7 +42,7 @@ hdf5_cv_printf_ll=${hdf5_cv_printf_ll='ll'}
 ac_cv_c_bigendian=${ac_cv_c_bigendian='yes'}
 ac_cv_header_stdc=${ac_cv_header_stdc='yes'}
 ac_cv_header_sys_ioctl_h=${ac_cv_header_sys_ioctl_h=yes}
-RUNPARALLEL="MP_PROCS=2 poe"
+RUNPARALLEL=${RUNPARALLEL="MP_PROCS=3 MP_TASKS_PER_NODE=3 poe"}
 
 # cache the sizeof of "standard C types" so that configure can run faster.
 ac_cv_sizeof_char=${ac_cv_sizeof_char=1}
@@ -75,5 +78,7 @@ ac_cv_sizeof_int_least64_t=${ac_cv_sizeof_int_least64_t=8}
 ac_cv_sizeof_uint_least64_t=${ac_cv_sizeof_uint_least64_t=8}
 ac_cv_sizeof_int_fast64_t=${ac_cv_sizeof_int_fast64_t=8}
 ac_cv_sizeof_uint_fast64_t=${ac_cv_sizeof_uint_fast64_t=8}
-ac_cv_sizeof_size_t=${ac_cv_sizeof_size_t=4}
-ac_cv_sizeof_off_t=${ac_cv_sizeof_off_t=8}
+
+# 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}
diff --git a/config/powerpc-ibm-aix5.x b/config/powerpc-ibm-aix5.x
new file mode 100644
index 0000000..8b8ae02
--- /dev/null
+++ b/config/powerpc-ibm-aix5.x
@@ -0,0 +1,84 @@
+#							-*- shell-script -*-
+#
+# This file is part of the HDF5 build script.  It is processed shortly
+# after configure starts and defines, among other things, flags for
+# the various compile modes.
+
+
+#----------------------------------------------------------------------------
+# Compiler flags. The CPPFLAGS values should not include package debug
+# flags like `-DH5G_DEBUG' since these are added with the
+# `--enable-debug' switch of configure.
+
+# What must *always* be present for things to compile correctly?
+#CFLAGS="$CFLAGS -ansi"
+#CPPFLAGS="$CPPFLAGS -I."
+
+# CFLAGS must be set else configure set it to -g
+CFLAGS="$CFLAGS"
+
+# What compiler flags should be used for code development?
+DEBUG_CFLAGS=
+DEBUG_CPPFLAGS=
+
+# What compiler flags should be used for building a production
+# library?
+PROD_CFLAGS=
+PROD_CPPFLAGS=
+
+# What compiler flags enable code profiling?
+PROFILE_CFLAGS=
+PROFILE_CPPFLAGS=
+
+
+#----------------------------------------------------------------------------
+# Values for overriding configuration tests when cross compiling.
+# This includes compiling on some machines where the serial front end
+# compiles for a parallel back end.
+
+# Set this to `yes' or `no' depending on whether the target is big
+# endian or little endian.
+hdf5_cv_printf_ll=${hdf5_cv_printf_ll='ll'}
+ac_cv_c_bigendian=${ac_cv_c_bigendian='yes'}
+ac_cv_header_stdc=${ac_cv_header_stdc='yes'}
+ac_cv_header_sys_ioctl_h=${ac_cv_header_sys_ioctl_h=yes}
+RUNPARALLEL=${RUNPARALLEL="MP_PROCS=3 MP_TASKS_PER_NODE=3 poe"}
+
+# cache the sizeof of "standard C types" so that configure can run faster.
+ac_cv_sizeof_char=${ac_cv_sizeof_char=1}
+ac_cv_sizeof_short=${ac_cv_sizeof_short=2}
+ac_cv_sizeof_int=${ac_cv_sizeof_int=4}
+ac_cv_sizeof_long=${ac_cv_sizeof_long=4}
+ac_cv_sizeof_long_long=${ac_cv_sizeof_long_long=8}
+ac_cv_sizeof___int64=${ac_cv_sizeof___int64=8}
+ac_cv_sizeof_float=${ac_cv_sizeof_float=4}
+ac_cv_sizeof_double=${ac_cv_sizeof_double=8}
+ac_cv_sizeof_long_double=${ac_cv_sizeof_long_double=8}
+ac_cv_sizeof_int8_t=${ac_cv_sizeof_int8_t=1}
+ac_cv_sizeof_uint8_t=${ac_cv_sizeof_uint8_t=1}
+ac_cv_sizeof_int_least8_t=${ac_cv_sizeof_int_least8_t=1}
+ac_cv_sizeof_uint_least8_t=${ac_cv_sizeof_uint_least8_t=1}
+ac_cv_sizeof_int_fast8_t=${ac_cv_sizeof_int_fast8_t=1}
+ac_cv_sizeof_uint_fast8_t=${ac_cv_sizeof_uint_fast8_t=4}
+ac_cv_sizeof_int16_t=${ac_cv_sizeof_int16_t=2}
+ac_cv_sizeof_uint16_t=${ac_cv_sizeof_uint16_t=2}
+ac_cv_sizeof_int_least16_t=${ac_cv_sizeof_int_least16_t=2}
+ac_cv_sizeof_uint_least16_t=${ac_cv_sizeof_uint_least16_t=2}
+ac_cv_sizeof_int_fast16_t=${ac_cv_sizeof_int_fast16_t=4}
+ac_cv_sizeof_uint_fast16_t=${ac_cv_sizeof_uint_fast16_t=4}
+ac_cv_sizeof_int32_t=${ac_cv_sizeof_int32_t=4}
+ac_cv_sizeof_uint32_t=${ac_cv_sizeof_uint32_t=4}
+ac_cv_sizeof_int_least32_t=${ac_cv_sizeof_int_least32_t=4}
+ac_cv_sizeof_uint_least32_t=${ac_cv_sizeof_uint_least32_t=4}
+ac_cv_sizeof_int_fast32_t=${ac_cv_sizeof_int_fast32_t=4}
+ac_cv_sizeof_uint_fast32_t=${ac_cv_sizeof_uint_fast32_t=4}
+ac_cv_sizeof_int64_t=${ac_cv_sizeof_int64_t=8}
+ac_cv_sizeof_uint64_t=${ac_cv_sizeof_uint64_t=8}
+ac_cv_sizeof_int_least64_t=${ac_cv_sizeof_int_least64_t=8}
+ac_cv_sizeof_uint_least64_t=${ac_cv_sizeof_uint_least64_t=8}
+ac_cv_sizeof_int_fast64_t=${ac_cv_sizeof_int_fast64_t=8}
+ac_cv_sizeof_uint_fast64_t=${ac_cv_sizeof_uint_fast64_t=8}
+
+# 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}
diff --git a/configure b/configure
index 0763999..d2a0326 100755
--- a/configure
+++ b/configure
@@ -1525,6 +1525,9 @@ case $host_os in
   aix4.*)
     host_os_novers=aix4.x
     ;;
+  aix5.*)
+    host_os_novers=aix5.x
+    ;;
   freebsd*)
     host_os_novers=freebsd
     ;;
@@ -4097,7 +4100,7 @@ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
 case $host in
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 4100 "configure"' > conftest.$ac_ext
+  echo '#line 4103 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -4638,7 +4641,7 @@ chmod -w .
 save_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
 compiler_c_o=no
-if { (eval echo configure:4641: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
+if { (eval echo configure:4644: \"$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
@@ -5174,7 +5177,7 @@ else
         hname="`hostname`"
 
         case "$hname" in
-          *pacific.llnl.gov* | *s0*)
+          *pacific.llnl.gov | snow*.llnl.gov | *s0*)
             hardcode_libdir_flag_spec=' '
             ;;
           *)
@@ -6449,7 +6452,7 @@ else
     lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 6452 "configure"
+#line 6455 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -6547,7 +6550,7 @@ else
     lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 6550 "configure"
+#line 6553 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
diff --git a/configure.in b/configure.in
index d802210..e3576bd 100644
--- a/configure.in
+++ b/configure.in
@@ -79,6 +79,9 @@ case $host_os in
   aix4.*)
     host_os_novers=aix4.x
     ;;
+  aix5.*)
+    host_os_novers=aix5.x
+    ;;
   freebsd*)
     host_os_novers=freebsd
     ;;
diff --git a/fortran/configure b/fortran/configure
index a98abef..bc35ae2 100755
--- a/fortran/configure
+++ b/fortran/configure
@@ -1508,6 +1508,9 @@ case "$host_os" in
    aix4.*)
       host_os_novers=aix4.x
       ;;
+   aix5.*)
+      host_os_novers=aix5.x
+      ;;
    freebsd*)
       host_os_novers=freebsd
       ;;
@@ -3878,7 +3881,7 @@ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
 case $host in
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 3881 "configure"' > conftest.$ac_ext
+  echo '#line 3884 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -4419,7 +4422,7 @@ chmod -w .
 save_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
 compiler_c_o=no
-if { (eval echo configure:4422: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
+if { (eval echo configure:4425: \"$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
@@ -6230,7 +6233,7 @@ else
     lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 6233 "configure"
+#line 6236 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -6328,7 +6331,7 @@ else
     lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 6331 "configure"
+#line 6334 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
diff --git a/fortran/configure.in b/fortran/configure.in
index a25697a..a683c71 100644
--- a/fortran/configure.in
+++ b/fortran/configure.in
@@ -113,6 +113,9 @@ case "$host_os" in
    aix4.*)
       host_os_novers=aix4.x
       ;;
+   aix5.*)
+      host_os_novers=aix5.x
+      ;;
    freebsd*)
       host_os_novers=freebsd
       ;;