Backport of Justin and Jeff's fixes to allow apxs to work with an out of tree

apr and apr-util.
Reviewed by: jerenkrantz, trawick, gstein, me

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

diff --git a/CHANGES b/CHANGES
index 361503a2e24fbc66f3033399c0d8b8ff97d40370..e917b71e448deb8fc06a95b3ff042d46dfb107b3 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,11 @@
 Changes with Apache 2.0.46
 
+  *) Perform run-time query in apxs for apr and apr-util's includes.
+     [Justin Erenkrantz] 
+     
+  *) run libtool from the apr install directory (in case that is different
+     from the apache install directory) [Jeff Trawick]
+     
   *) configure.in: Play nice with libtool-1.5. [Wilfredo Sanchez]
 
   *) If mod_mime_magic does not know the content-type, do not attempt to

diff --git a/support/apxs.in b/support/apxs.in
index f4ba015f5bdbb5ebeb6383259f0e2a6dadfce266..adc5876a7999655b8f542ddc42a106dac7c92a3e 100644 (file)
--- a/support/apxs.in
+++ b/support/apxs.in
@@ -362,6 +362,29 @@ if ($opt_q) {
     print "$result\n";
 }
 
+my $apr_bindir = get_vars("APR_BINDIR");
+
+if (! -x "$apr_bindir/apr-config") {
+    error("$apr_bindir/apr-config not found!");
+    exit(1);
+}
+
+my $apu_bindir = get_vars("APU_BINDIR");
+
+if (! -x "$apu_bindir/apu-config") {
+    error("$apu_bindir/apu-config not found!");
+    exit(1);
+}
+
+my $libtool = `$apr_bindir/apr-config --installbuilddir`;
+chomp($libtool);
+$libtool = "$libtool/libtool";
+
+my $apr_includedir = `$apr_bindir/apr-config --includes`;
+chomp($apr_includedir);
+my $apu_includedir = `$apu_bindir/apu-config --includes`;
+chomp($apu_includedir);
+
 if ($opt_c) {
     ##
     ##  SHARED OBJECT COMPILATION
@@ -424,7 +447,7 @@ if ($opt_c) {
         $la =~ s|\.c$|.la|;
         my $o = $s;
         $o =~ s|\.c$|.o|;
-        push(@cmds, "$installbuilddir/libtool $ltflags --mode=compile $CFG_CC $cflags -I$CFG_INCLUDEDIR $opt -c -o $lo $s && touch $slo");
+        push(@cmds, "$libtool $ltflags --mode=compile $CFG_CC $cflags -I$CFG_INCLUDEDIR $apr_includedir $apu_includedir $opt -c -o $lo $s && touch $slo");
         unshift(@objs, $lo);
     }
 
@@ -449,20 +472,7 @@ if ($opt_c) {
         $opt .= " -l$opt_l";
     }
 
-    my $apr_bindir = get_vars("APR_BINDIR");
-
-    if (! -x "$apr_bindir/apr-config") {
-        error("$apr_bindir/apr-config not found!");
-        exit(1);
-    }
-
     if ($opt_p == 1) {
-        my $apu_bindir = get_vars("APU_BINDIR");
-
-        if (! -x "$apu_bindir/apu-config") {
-            error("$apu_bindir/apu-config not found!");
-            exit(1);
-        }
         
         my $apr_libs=`$apr_bindir/apr-config --ldflags --link-libtool --libs`;
         chomp($apr_libs);
@@ -477,7 +487,7 @@ if ($opt_c) {
         $opt .= " -rpath $CFG_LIBEXECDIR -module -avoid-version $apr_ldflags";
     }
 
-    push(@cmds, "$installbuilddir/libtool $ltflags --mode=link $CFG_CC -o $dso_file $opt $lo");
+    push(@cmds, "$libtool $ltflags --mode=link $CFG_CC -o $dso_file $opt $lo");
 
     #   execute the commands
     &execute_cmds(@cmds);
@@ -509,7 +519,7 @@ if ($opt_i or $opt_e) {
         $t =~ s|\.la$|\.so|;
         if ($opt_i) {
            push(@cmds, "$installbuilddir/instdso.sh SH_LIBTOOL='" .
-                 "$installbuilddir/libtool' $f $CFG_LIBEXECDIR");
+                 "$libtool' $f $CFG_LIBEXECDIR");
            push(@cmds, "chmod 755 $CFG_LIBEXECDIR/$t");
         }