You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by tr...@apache.org on 2003/01/23 12:54:45 UTC
cvs commit: httpd-2.0/support apxs.in
trawick 2003/01/23 03:54:44
Modified: . CHANGES
support apxs.in
Log:
apxs: Include any special APR ld flags when linking the DSO.
This resolves problems on AIX when building a DSO with apxs+gcc.
Revision Changes Path
1.1035 +4 -0 httpd-2.0/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/httpd-2.0/CHANGES,v
retrieving revision 1.1034
retrieving revision 1.1035
diff -u -r1.1034 -r1.1035
--- CHANGES 23 Jan 2003 00:55:47 -0000 1.1034
+++ CHANGES 23 Jan 2003 11:54:43 -0000 1.1035
@@ -2,6 +2,10 @@
[Remove entries to the current 2.0 section below, when backported]
+ *) apxs: Include any special APR ld flags when linking the DSO.
+ This resolves problems on AIX when building a DSO with apxs+gcc.
+ [Jeff Trawick]
+
*) mod_file_cache: fixed a segfault when multiple MMapFile directives
were used. PR 16313. [Cliff Woolley]
1.50 +10 -6 httpd-2.0/support/apxs.in
Index: apxs.in
===================================================================
RCS file: /home/cvs/httpd-2.0/support/apxs.in,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- apxs.in 23 Dec 2002 19:21:15 -0000 1.49
+++ apxs.in 23 Jan 2003 11:54:44 -0000 1.50
@@ -449,14 +449,16 @@
$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 $apr_bindir = get_vars("APR_BINDIR");
my $apu_bindir = get_vars("APU_BINDIR");
- if (! -x "$apr_bindir/apr-config") {
- error("$apr_bindir/apr-config not found!");
- exit(1);
- }
if (! -x "$apu_bindir/apu-config") {
error("$apu_bindir/apu-config not found!");
exit(1);
@@ -470,7 +472,9 @@
$opt .= " ".$apu_libs." ".$apr_libs;
}
else {
- $opt .= " -rpath $CFG_LIBEXECDIR -module -avoid-version";
+ my $apr_ldflags=`$apr_bindir/apr-config --ldflags`;
+ chomp($apr_ldflags);
+ $opt .= " -rpath $CFG_LIBEXECDIR -module -avoid-version $apr_ldflags";
}
push(@cmds, "$installbuilddir/libtool $ltflags --mode=link $CFG_CC -o $dso_file $opt $lo");