dougm 01/09/12 19:02:09
Modified: xs/APR/APR Makefile.PL
Log:
now that apr libs are installed, link against them
Revision Changes Path
1.3 +6 -26 modperl-2.0/xs/APR/APR/Makefile.PL
Index: Makefile.PL
===================================================================
RCS file: /home/cvs/modperl-2.0/xs/APR/APR/Makefile.PL,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile.PL 2001/04/04 05:32:33 1.2
+++ Makefile.PL 2001/09/13 02:02:09 1.3
@@ -4,34 +4,14 @@
use ModPerl::MM ();
use Config;
-my $root = ModPerl::MM::build_config('dir') || "";
-my $srclib = "$root/srclib";
-my $apr = "$srclib/apr";
+my $prefix = ModPerl::MM::build_config()->apxs(-q => 'PREFIX');
-my @libs;
-if ($root) {
- @libs = join ' ',
- "-L$apr/.libs -lapr",
- "-L$srclib/apr-util/.libs -laprutil",
- "-L$srclib/expat-lite/.libs -lexpat",
- "-L$apr/shmem/unix/mm/.libs -lmm";
-}
+my $libdir = "$prefix/lib";
+my @libs = map "-l$_", qw(apr aprutil);
+
ModPerl::MM::WriteMakefile(
- 'NAME' => 'APR',
+ 'NAME' => 'APR',
'VERSION_FROM' => 'APR.pm',
-# 'LIBS' => \@libs,
+ 'LIBS' => ["-L$libdir @libs"],
);
-
-sub XXX::MY::const_loadlibs {
- my $self = shift;
-
- my $string = $self->MM::const_loadlibs;
- return $string unless $Config{gccversion}; #XXX
-
- my $wa = '-Wl,--whole-archive';
- my $nwa = '-Wl,--no-whole-archive';
-
- $string =~ s/(LDLOADLIBS\s*=\s*)(.*)/$1$wa $2 $nwa/;
- $string;
-}
