[svn-r4223] Purpose:

    Improvement
Description:
    Combined all powerpc-ibm config files into one.
    Added parallel fortran configuration stuff in it too.
Platforms tested:
    LLNL Blue (parallel)

3 files changed, 31 insertions, 85 deletions

diff --git a/fortran/config/powerpc-ibm-aix4.2.1.0 b/fortran/config/powerpc-ibm-aix4.2.1.0
deleted file mode 100644
index cab0d8b..0000000
--- a/fortran/config/powerpc-ibm-aix4.2.1.0
+++ /dev/null
@@ -1,22 +0,0 @@
-#							-*- 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.
-#
-# See BlankForm in this directory for details.
-
-# Cross compiling defaults
-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_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_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_int=${ac_cv_sizeof_int=4}
-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/fortran/config/powerpc-ibm-aix4.3.2.0 b/fortran/config/powerpc-ibm-aix4.3.2.0
deleted file mode 100644
index db5eb05..0000000
--- a/fortran/config/powerpc-ibm-aix4.3.2.0
+++ /dev/null
@@ -1,63 +0,0 @@
-#							-*- 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."
-
-# 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_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_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_int=${ac_cv_sizeof_int=4}
-ac_cv_sizeof_size_t=${ac_cv_sizeof_size_t=4}
-ac_cv_sizeof_off_t=${ac_cv_sizeof_off_t=8}
-ac_cv_sizeof_uint8_t=${ac_cv_sizeof_uint8_t=1}
-ac_cv_sizeof_uint16_t=${ac_cv_sizeof_uint16_t=2}
-ac_cv_sizeof_uint32_t=${ac_cv_sizeof_uint32_t=4}
-ac_cv_sizeof_uint64_t=${ac_cv_sizeof_uint64_t=8}
-ac_cv_sizeof_int8_t=${ac_cv_sizeof_int8_t=1}
-ac_cv_sizeof_int16_t=${ac_cv_sizeof_int16_t=2}
-ac_cv_sizeof_int32_t=${ac_cv_sizeof_int32_t=4}
-ac_cv_sizeof_int64_t=${ac_cv_sizeof_int64_t=8}
-ac_cv_sizeof___int64=${ac_cv_sizeof___int64=8}
-ac_cv_sizeof_char=${ac_cv_sizeof_char=1}
-ac_cv_header_sys_ioctl_h=${ac_cv_header_sys_ioctl_h=yes}
-ac_cv_path_install=${ac_cv_path_install='cp -r'}
-RUNPARALLEL="MP_PROCS=2 poe"
diff --git a/fortran/config/powerpc-ibm-aix4.x b/fortran/config/powerpc-ibm-aix4.x
index 24176a5..454ec76 100644
--- a/fortran/config/powerpc-ibm-aix4.x
+++ b/fortran/config/powerpc-ibm-aix4.x
@@ -19,3 +19,34 @@ ac_cv_sizeof_long_double=${ac_cv_sizeof_long_double=8}
 ac_cv_sizeof_int=${ac_cv_sizeof_int=4}
 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
+
+#
+# HDF5 integers
+#
+# 	R_LARGE is the number of digits for the bigest integer supported.
+#	R_INTEGER is the number of digits in INTEGER
+#
+# (for the AIX architechture)
+#
+R_LARGE=18
+R_INTEGER=9
+HSIZE_T='SELECTED_INT_KIND(R_LARGE)'
+HSSIZE_T='SELECTED_INT_KIND(R_LARGE)'
+HID_T='SELECTED_INT_KIND(R_INTEGER)'
+SIZE_T='SELECTED_INT_KIND(R_INTEGER)'
+OBJECT_NAMELEN_DEFAULT_F=-1
+
+if test "X-" = "X-$F9X"; then
+    F9X=xlf
+fi
+
+if test "X-" = "X-$f9x_flags_set"; then
+    FFLAGS="-static -O -qsuffix=f=f90 -qmoddir=./ -I./ -k"
+    DEBUG_FFLAGS="-O"
+    PROD_FFLAGS="-O"
+    PROFILE_FFLAGS="-O"
+    f9x_flags_set=yes
+fi