summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortrawick <trawick@13f79535-47bb-0310-9956-ffa450edef68>2004-06-11 14:59:26 +0000
committertrawick <trawick@13f79535-47bb-0310-9956-ffa450edef68>2004-06-11 14:59:26 +0000
commit311d95f8dfddee0c54e8afc664344f8e41cad9cb (patch)
tree0e3a1cb214e7c802aa75b84246eef5a84d09279a
parentbab4903d162b16d093e1e23d398c98dd61301edb (diff)
downloadlibapr-311d95f8dfddee0c54e8afc664344f8e41cad9cb.tar.gz
Don't try to enable run-time linking on AIX < 4.2, as this
results in invalid linker options being used. PR: 29170 git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/APR_0_9_BRANCH@65181 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--CHANGES4
-rw-r--r--build/apr_hints.m48
2 files changed, 11 insertions, 1 deletions
diff --git a/CHANGES b/CHANGES
index b3f6066b4..890bc37fc 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,9 @@
Changes with APR 0.9.5
+ *) Don't try to enable run-time linking on AIX < 4.2, as this
+ results in invalid linker options being used. PR 29170.
+ [Jeff Trawick]
+
*) Remove apr_file_copy()'s 2Gb file size limit on some platforms.
[Joe Orton]
diff --git a/build/apr_hints.m4 b/build/apr_hints.m4
index d4da5aed0..224360812 100644
--- a/build/apr_hints.m4
+++ b/build/apr_hints.m4
@@ -63,7 +63,13 @@ if test "x$apr_preload_done" != "xyes" ; then
fi
APR_SETIFNULL(apr_sysvsem_is_global, [yes])
APR_SETIFNULL(apr_lock_method, [USE_SYSVSEM_SERIALIZE])
- APR_ADDTO(LDFLAGS, [-Wl,-brtl])
+ case $host in
+ *-ibm-aix3* | *-ibm-aix4.1.*)
+ ;;
+ *)
+ APR_ADDTO(LDFLAGS, [-Wl,-brtl])
+ ;;
+ esac
;;
*-apollo-*)
APR_ADDTO(CPPFLAGS, [-DAPOLLO])