You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ma...@apache.org on 2001/04/27 17:30:25 UTC
cvs commit: httpd-2.0/support apxs.in
martin 01/04/27 08:30:25
Modified: support apxs.in
Log:
Fix APXS: treat sbindir as expected, fix "link" command.
Submitted by: GOMEZ Henri <hg...@slib.fr>
Revision Changes Path
1.18 +14 -3 httpd-2.0/support/apxs.in
Index: apxs.in
===================================================================
RCS file: /home/cvs/httpd-2.0/support/apxs.in,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -u -r1.17 -r1.18
--- apxs.in 2001/02/16 04:26:53 1.17
+++ apxs.in 2001/04/27 15:30:21 1.18
@@ -73,7 +73,7 @@
my $prefix = "$CFG_PREFIX";
my $CFG_EXEC_PREFIX = "@exec_prefix@";
my $exec_prefix = "$CFG_EXEC_PREFIX";
-my $CFG_SBINDIR = "@bindir@";
+my $CFG_SBINDIR = "@sbindir@";
my $CFG_INCLUDEDIR = "@includedir@";
my $CFG_LIBEXECDIR = "@libexecdir@";
my $CFG_SYSCONFDIR = "@sysconfdir@";
@@ -372,6 +372,7 @@
}
my $cflags = "$CFG_CFLAGS";
my $s;
+ my $mod;
foreach $s (@srcs) {
my $slo = $s;
$slo =~ s|\.c$|.slo|;
@@ -379,10 +380,20 @@
$lo =~ s|\.c$|.lo|;
my $la = $s;
$la =~ s|\.c$|.la|;
- push(@cmds, "libtool --silent --mode=compile $CFG_CC $cflags -I$CFG_INCLUDEDIR $opt -c $s && touch $slo");
- push(@cmds, "libtool --silent --mode=link $CFG_CC $cflags -o $la -rpath $CFG_LIBEXECDIR -module -avoid-version $lo");
+ 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");
+ unshift(@objs, $lo);
+ }
+ # create link command
+ my $o;
+ my $lo;
+ foreach $o (@objs) {
+ $lo .= " $o";
}
+
+ push(@cmds, "libtool --silent --mode=link $CFG_CC $cflags -o $dso_file -rpath $CFG_LIBEXECDIR -module -avoid-version $lo");
# execute the commands
&execute_cmds(@cmds);