--- a/ChangeLog	Wed Jan 09 02:15:36 2008 +0100
+++ b/ChangeLog	Wed Jan 09 07:18:35 2008 +0100
@@ -1,3 +1,9 @@
+2008-01-09  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	Support AIX 6.1 and higher.
+	* build-aux/config.libpath: Likewise.
+	* build-aux/config.rpath: Likewise.
+
 2008-01-08  Jim Meyering  <meyering@redhat.com>
             Bruno Haible  <bruno@clisp.org>
 

--- a/build-aux/config.libpath	Wed Jan 09 02:15:36 2008 +0100
+++ b/build-aux/config.libpath	Wed Jan 09 07:18:35 2008 +0100
@@ -2,7 +2,7 @@
 # Output a system dependent set of variables, describing how to set the
 # run time search path of shared libraries in an executable at run time.
 #
-#   Copyright 1996-2007 Free Software Foundation, Inc.
+#   Copyright 1996-2008 Free Software Foundation, Inc.
 #   Taken from GNU libtool, 2003
 #   Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 #
@@ -42,7 +42,7 @@
   aix3*)
     shlibpath_var=LIBPATH
     ;;
-  aix4* | aix5*)
+  aix[4-9]*)
     if test "$host_cpu" = ia64; then
       # AIX 5 supports IA64
       shlibpath_var=LD_LIBRARY_PATH

--- a/build-aux/config.rpath	Wed Jan 09 02:15:36 2008 +0100
+++ b/build-aux/config.rpath	Wed Jan 09 07:18:35 2008 +0100
@@ -2,7 +2,7 @@
 # Output a system dependent set of variables, describing how to set the
 # run time search path of shared libraries in an executable.
 #
-#   Copyright 1996-2007 Free Software Foundation, Inc.
+#   Copyright 1996-2008 Free Software Foundation, Inc.
 #   Taken from GNU libtool, 2001
 #   Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 #
@@ -158,7 +158,7 @@
   # option of GNU ld is called -rpath, not --rpath.
   hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
   case "$host_os" in
-    aix3* | aix4* | aix5*)
+    aix[3-9]*)
       # On AIX/PPC, the GNU linker is very broken
       if test "$host_cpu" != ia64; then
         ld_shlibs=no
@@ -254,7 +254,7 @@
         hardcode_direct=unsupported
       fi
       ;;
-    aix4* | aix5*)
+    aix[4-9]*)
       if test "$host_cpu" = ia64; then
         # On IA64, the linker does run time linking by default, so we don't
         # have to do anything special.
@@ -264,7 +264,7 @@
         # Test if we are trying to use run time linking or normal
         # AIX style linking. If -brtl is somewhere in LDFLAGS, we
         # need to do runtime linking.
-        case $host_os in aix4.[23]|aix4.[23].*|aix5*)
+        case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
           for ld_flag in $LDFLAGS; do
             if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
               aix_use_runtimelinking=yes
@@ -505,7 +505,7 @@
   aix3*)
     library_names_spec='$libname.a'
     ;;
-  aix4* | aix5*)
+  aix[4-9]*)
     library_names_spec='$libname$shrext'
     ;;
   amigaos*)