Allow APR to install its own libtool into an installbuilddir.

Add --with-installbuilddir to configure.
Add --apr-libtool option to apr-config so that third-parties can figure
out where this generated libtool is.

(Previously, httpd-2.0 would copy libtool for APR which isn't very nice.)


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

1 files changed, 11 insertions, 0 deletions

diff --git a/apr-config.in b/apr-config.in
index 0f87a414a..6d829cdc5 100644
--- a/apr-config.in
+++ b/apr-config.in
@@ -59,6 +59,8 @@ prefix="@prefix@"
 exec_prefix="@exec_prefix@"
 bindir="@bindir@"
 libdir="@libdir@"
+datadir="@datadir@"
+installbuilddir="@installbuilddir@"
 includedir="@includedir@"
 
 CC="@CC@"
@@ -92,6 +94,7 @@ Known values for OPTION are:
   --apr-la-file     print the path to the .la file, if available
   --apr-so-ext      print the extensions of shared objects on this platform
   --apr-lib-target  print the libtool target information
+  --apr-libtool     print the path to APR's libtool
   --help            print this help
 
 When linking with libtool, an application should do something like:
@@ -199,6 +202,14 @@ while test $# -gt 0; do
     echo "$APR_LIB_TARGET"
     exit 0
     ;;
+    --apr-libtool)
+    if test "$location" = "installed"; then
+        echo "${SHELL} ${installbuilddir}/libtool"
+    else
+        echo "${SHELL} $thisdir/libtool"
+    fi
+    exit 0
+    ;;
     --help)
     show_usage
     exit 0