thommay 2003/05/21 04:39:52
Modified: . Tag: APACHE_2_0_BRANCH CHANGES
support Tag: APACHE_2_0_BRANCH apxs.in
Log:
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
Revision Changes Path
No revision
No revision
1.988.2.109 +6 -0 httpd-2.0/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/httpd-2.0/CHANGES,v
retrieving revision 1.988.2.108
retrieving revision 1.988.2.109
diff -u -r1.988.2.108 -r1.988.2.109
--- CHANGES 21 May 2003 04:46:00 -0000 1.988.2.108
+++ CHANGES 21 May 2003 11:39:49 -0000 1.988.2.109
@@ -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
No revision
No revision
1.47.2.4 +26 -16 httpd-2.0/support/apxs.in
Index: apxs.in
===================================================================
RCS file: /home/cvs/httpd-2.0/support/apxs.in,v
retrieving revision 1.47.2.3
retrieving revision 1.47.2.4
diff -u -r1.47.2.3 -r1.47.2.4
--- apxs.in 22 Feb 2003 15:50:13 -0000 1.47.2.3
+++ apxs.in 21 May 2003 11:39:52 -0000 1.47.2.4
@@ -362,6 +362,29 @@
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 @@
$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 @@
$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 @@
$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 @@
$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");
}
|