Emit the run-time link path option in apr-config after installation if the user

is linking with libtool.


git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@111346 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 7 insertions, 2 deletions

diff --git a/CHANGES b/CHANGES
index 51e310842..462ee2159 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,8 @@
 Changes for APR 1.1.0
 
+  *) Emit the run-time link path option in apr-config after installation
+     if the user is linking with libtool.  [Justin Erenkrantz]
+
   *) Add apr_file_writev_full to ensure an entire iovec is writen to a file.
      [Paul Querna]
 
@@ -10,7 +13,7 @@ Changes for APR 1.1.0
   *) Remove the runtime test for Sendfile versions on FreeBSD. PR 25718.
      [Mike Silbersack <silby silby.com>, Paul Querna]
 
-  *( rename the fopen defines (APR_READ, APR_WRITE, etc.) to have
+  *) rename the fopen defines (APR_READ, APR_WRITE, etc.) to have
      prefix APR_FOPEN_ (keeping the old defines) [Stas]
 
   *) [NOT COMMITTED?] Add a new PRNG. Note that the implementation of SHA-256
diff --git a/apr-config.in b/apr-config.in
index 870cf888a..d2bca990c 100644
--- a/apr-config.in
+++ b/apr-config.in
@@ -196,7 +196,9 @@ while test $# -gt 0; do
         flags="$flags $LA_FILE"
     elif test "$location" = "installed"; then
         ### avoid using -L if libdir is a "standard" location like /usr/lib
-        flags="$flags -L$libdir -l${APR_LIBNAME}"
+        # Since the user is specifying they are linking with libtool, we
+        # *know* that -R will be recognized by libtool.
+        flags="$flags -L$libdir -R$libdir -l${APR_LIBNAME}"
     else
         flags="$flags $LA_FILE"
     fi