From: Justin Erenkrantz <jerenkrantz@apache.org>
Date: Sun, 23 Sep 2001 18:01:15 +0000 (+0000)
Subject: We need to use the APR-generated libtool for building modules.
X-Git-Tag: 2.0.26~193
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=27edf0b4a33ca92e7ba081ab4f3fb09e3dc6e4ad;p=thirdparty%2Fapache%2Fhttpd.git

We need to use the APR-generated libtool for building modules.


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

diff --git a/support/apxs.in b/support/apxs.in
index 5632271e4a3..c17dc7e2b11 100644
--- a/support/apxs.in
+++ b/support/apxs.in
@@ -412,7 +412,7 @@ if ($opt_c) {
         $la =~ s|\.c$|.la|;
         my $o = $s;
         $o =~ s|\.c$|.o|;
-        push(@cmds, "libtool --silent --mode=compile $CFG_CC $cflags -I$CFG_INCLUDEDIR $opt -c -o $lo $s && touch $slo");
+        push(@cmds, "$prefix/build/libtool --silent --mode=compile $CFG_CC $cflags -I$CFG_INCLUDEDIR $opt -c -o $lo $s && touch $slo");
         unshift(@objs, $lo);
     }
 
@@ -437,7 +437,7 @@ if ($opt_c) {
         $opt .= " -l$opt_l";
     }
 
-    push(@cmds, "libtool --silent --mode=link $CFG_CC -o $dso_file -rpath $CFG_LIBEXECDIR -module -avoid-version $opt $lo");
+    push(@cmds, "$prefix/build/libtool --silent --mode=link $CFG_CC -o $dso_file -rpath $CFG_LIBEXECDIR -module -avoid-version $opt $lo");
 
     #   execute the commands
     &execute_cmds(@cmds);
@@ -467,7 +467,7 @@ if ($opt_i or $opt_e) {
         my $t = $f;
         $t =~ s|^.+/([^/]+)$|$1|;
         if ($opt_i) {
-	    push(@cmds, "libtool --mode=install cp $f $CFG_LIBEXECDIR/$t");
+	    push(@cmds, "$prefix/build/libtool --mode=install cp $f $CFG_LIBEXECDIR/$t");
 	    push(@cmds, "chmod 755 $CFG_LIBEXECDIR/$t");
         }