* configure.in, acinclude.m4: Substitute AP[RU]_CONFIG with location

of installed ap[ru]-config scripts so third-party modules can use
`apxs -q APR_CONFIG`.

* support/apxs.in: Use new AP[RU]_CONFIG variables; use apr-config
--apr-libtool.


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

3 files changed, 8 insertions, 11 deletions

diff --git a/acinclude.m4 b/acinclude.m4
index bf214addc3..38d3993fd6 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -91,9 +91,11 @@ AC_DEFUN(APACHE_GEN_CONFIG_VARS,[
   APACHE_SUBST(APR_BINDIR)
   APACHE_SUBST(APR_INCLUDEDIR)
   APACHE_SUBST(APR_VERSION)
+  APACHE_SUBST(APR_CONFIG)
   APACHE_SUBST(APU_BINDIR)
   APACHE_SUBST(APU_INCLUDEDIR)
   APACHE_SUBST(APU_VERSION)
+  APACHE_SUBST(APU_CONFIG)
 
   abs_srcdir="`(cd $srcdir && pwd)`"
 
diff --git a/configure.in b/configure.in
index 944159c7a7..702bbd131e 100644
--- a/configure.in
+++ b/configure.in
@@ -86,6 +86,7 @@ SHLIBPATH_VAR=`$apr_config --shlib-path-var`
 APR_BINDIR=`$apr_config --bindir`
 APR_INCLUDEDIR=`$apr_config --includedir`
 APR_VERSION=`$apr_config --version`
+APR_CONFIG="$APR_BINDIR/apr-`echo ${APR_VERSION} | sed 's,\..*,,'`-config"
 
 echo $ac_n "${nl}Configuring Apache Portable Runtime Utility library...${nl}"
 
@@ -109,6 +110,7 @@ APR_ADDTO(INCLUDES, `$apu_config --includes`)
 APU_BINDIR=`$apu_config --bindir`
 APU_INCLUDEDIR=`$apu_config --includedir`
 APU_VERSION=`$apu_config --version`
+APU_CONFIG="$APU_BINDIR/apu-`echo ${APU_VERSION} | sed 's,\..*,,'`-config"
 
 dnl In case we picked up CC and CPP from APR, get that info into the
 dnl config cache so that PCRE uses it.  Otherwise, CC and CPP used for
diff --git a/support/apxs.in b/support/apxs.in
index 8ad0799224..65ccdcdb1d 100644
--- a/support/apxs.in
+++ b/support/apxs.in
@@ -323,29 +323,22 @@ if ($opt_q) {
     print "$result\n";
 }
 
-my $apr_bindir = get_vars("APR_BINDIR");
-my $apr_version = get_vars("APR_VERSION");
-$apr_version =~ s/(\d+)\.(\d).(\d)/$1/;
-my $apr_config="$apr_bindir/apr-$apr_version-config";
+my $apr_config = get_vars("APR_CONFIG");
 
 if (! -x "$apr_config") {
-    error("$apr_bindir/apr-config not found!");
+    error("$apr_config not found!");
     exit(1);
 }
 
-my $apu_bindir = get_vars("APU_BINDIR");
-my $apu_version = get_vars("APU_VERSION");
-$apu_version =~ s/(\d+)\.(\d).(\d)/$1/;
-my $apu_config="$apu_bindir/apu-$apu_version-config";
+my $apu_config = get_vars("APU_CONFIG");
 
 if (! -x "$apu_config") {
     error("$apu_config not found!");
     exit(1);
 }
 
-my $libtool = `$apr_config --installbuilddir`;
+my $libtool = `$apr_config --apr-libtool`;
 chomp($libtool);
-$libtool = "$libtool/libtool";
 
 my $apr_includedir = `$apr_config --includes`;
 chomp($apr_includedir);