shlibpath.m4: Add AIX 6 support.

2008-01-24  David Edelsohn  <edelsohn@gnu.org>

        * shlibpath.m4: Add AIX 6 support.
        * configure: Regenerate.

From-SVN: r133185

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 1e76e6a27e9d17e8706087965aeaea5a3195b9af..b2944a7f0d2d4781d64dbcbfe51b53653a601477 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,11 @@
+2008-03-13  David Edelsohn  <edelsohn@gnu.org>
+
+       Backport from mainline:
+       2008-01-24  David Edelsohn  <edelsohn@gnu.org>
+
+       * shlibpath.m4: Add AIX 6 support.
+       * configure: Regenerate.
+
 2008-02-01  Release Manager
 
        * GCC 4.2.3 released.

diff --git a/libjava/configure b/libjava/configure
index c987edc7378787e9765fc21b03da5f44f2b94a36..7b6b89cc04cf7334d6856b15abf0e2d5f95cf2fc 100755 (executable)
--- a/libjava/configure
+++ b/libjava/configure
@@ -4375,7 +4375,7 @@ aix3*)
   soname_spec='${libname}${release}${shared_ext}$major'
   ;;
 
-aix4* | aix5*)
+aix[4-9]*)
   version_type=linux
   need_lib_prefix=no
   need_version=no

diff --git a/libjava/shlibpath.m4 b/libjava/shlibpath.m4
index 4bdd362ff5e0857627b392798c2a44625182d99f..7fada302420d614ae04fb99aed00df6faa529198 100644 (file)
--- a/libjava/shlibpath.m4
+++ b/libjava/shlibpath.m4
@@ -71,7 +71,7 @@ aix3*)
   soname_spec='${libname}${release}${shared_ext}$major'
   ;;
 
-aix4* | aix5*)
+aix[4-9]*)
   version_type=linux
   need_lib_prefix=no
   need_version=no