diff options
| -rw-r--r-- | MANIFEST | 1 | ||||
| -rw-r--r-- | config/ibm-aix6.x | 21 | ||||
| -rwxr-xr-x | configure | 10 | ||||
| -rw-r--r-- | configure.in | 10 | ||||
| -rw-r--r-- | release_docs/RELEASE.txt | 3 |
5 files changed, 6 insertions, 39 deletions
@@ -89,7 +89,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 @@ -3877,14 +3877,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 b8382bc..47ecd32 100644 --- a/configure.in +++ b/configure.in @@ -248,14 +248,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 716140d..93d0be4 100644 --- a/release_docs/RELEASE.txt +++ b/release_docs/RELEASE.txt @@ -115,7 +115,8 @@ Bug Fixes since HDF5-1.8.6 Configuration ------------- - - None + - Removed config/ibm-aix6.x. All IBM-AIX settings are in one file, + ibm-aix. (AKC - 2011/4/14) Library ------- |