* 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

1 files changed, 4 insertions, 11 deletions

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);