From e1ed6bb771ad03d584b465036dba79cbad2254c5 Mon Sep 17 00:00:00 2001
From: Albert Cheng <acheng@hdfgroup.org>
Date: Fri, 15 Apr 2011 15:10:47 -0500
Subject: [svn-r20520] Removed ibm-aix6.x file which just sourced ibm-aix file.
 Removed code in configure.in that tried to distinguish different versions of
 AIX. This is no longer needed.

Tested:
NCSA Blue-print. No h5committest since this affected AIX system only.
---
 MANIFEST                 |  1 -
 config/ibm-aix6.x        | 21 ---------------------
 configure                | 10 ++--------
 configure.in             | 10 ++--------
 release_docs/RELEASE.txt |  2 ++
 5 files changed, 6 insertions(+), 38 deletions(-)
 delete mode 100644 config/ibm-aix6.x

diff --git a/MANIFEST b/MANIFEST
index 724f41c..5d9c0a0 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -95,7 +95,6 @@
 ./config/i686-pc-cygwin
 ./config/ia64-linux-gnu
 ./config/ibm-aix
-./config/ibm-aix6.x
 ./config/ibm-flags
 ./config/intel-fflags
 ./config/intel-flags
diff --git a/config/ibm-aix6.x b/config/ibm-aix6.x
deleted file mode 100644
index 104008a..0000000
--- a/config/ibm-aix6.x
+++ /dev/null
@@ -1,21 +0,0 @@
-#							-*- shell-script -*-
-#
-# Copyright by The HDF Group.
-# 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.
-
-# Configuration file for building on the IBM AIX 6.X platforms.
-# 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.
-
-# Use the generic ibm-aix.
-. $srcdir/config/ibm-aix
diff --git a/configure b/configure
index 8a75400..26bb1fe 100755
--- a/configure
+++ b/configure
@@ -3891,14 +3891,8 @@ elif test $hdf5_cv_host != $host; then
 fi
 
 case $host_os in
-  aix4.*)
-    host_os_novers=aix4.x
-    ;;
-  aix5.*)
-    host_os_novers=aix5.x
-    ;;
-  aix6.*)
-    host_os_novers=aix6.x
+  aix*)
+    host_os_novers=aix
     ;;
   freebsd*)
     host_os_novers=freebsd
diff --git a/configure.in b/configure.in
index 42b552f..b42dd59 100644
--- a/configure.in
+++ b/configure.in
@@ -249,14 +249,8 @@ dnl
 dnl If the `OS' ends with a version number then remove it. For instance,
 dnl `freebsd3.1' would become `freebsd'
 case $host_os in
-  aix4.*)
-    host_os_novers=aix4.x
-    ;;
-  aix5.*)
-    host_os_novers=aix5.x
-    ;;
-  aix6.*)
-    host_os_novers=aix6.x
+  aix*)
+    host_os_novers=aix
     ;;
   freebsd*)
     host_os_novers=freebsd
diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt
index 288b7f1..02c67b7 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -463,6 +463,8 @@ Bug Fixes since HDF5-1.8.0 release
 
     Configuration
     -------------
+    - Removed config/ibm-aix6.x. All IBM-AIX settings are in one file,
+      ibm-aix. (AKC - 2011/4/14)
     - Shared C libraries are no longer disabled on Mac when Fortran
       is enabled. Shared Fortran libraries are still not supported on Mac,
       so configure will disable them by default, but this is overridable
-- 
cgit v0.12