stas 2003/08/06 16:53:23
Modified: . Makefile.PL
xs/APR/APR Makefile.PL
Log:
use the new build method apr_bindir to get the location of ap[ru]-config
Revision Changes Path
1.111 +3 -3 modperl-2.0/Makefile.PL
Index: Makefile.PL
===================================================================
RCS file: /home/cvs/modperl-2.0/Makefile.PL,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- Makefile.PL 6 Aug 2003 21:59:03 -0000 1.110
+++ Makefile.PL 6 Aug 2003 23:53:23 -0000 1.111
@@ -93,10 +93,10 @@
# XXX: this define is really needed in xs/APR/APR/Makefile.PL, but this
# top-level Makefile.PL overrides MY::pasthru, and defines DEFINE= which
# overrides any local definition, not sure what's the right fix, for
- # now just define it here
- my $bin_prefix = $build->apxs(-q => 'PREFIX');
+ # now just define it here (should it define PASTHRU_DEFINE instead?)
+ my $apr_bindir = $build->apr_bindir();
my @apr_libs = grep $_, map { -x $_ && qx{$_ --link-ld} }
- map { qq{$bin_prefix/bin/$_-config} } qw(apr apu);
+ map { qq{$apr_bindir/$_-config} } qw(apr apu);
my $opt_define = @apr_libs ? '-DMP_HAVE_APR_LIBS' : '';
# preserve any DEFINE opts from outside and combine them with our
1.14 +6 -2 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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Makefile.PL 6 Aug 2003 19:02:24 -0000 1.13
+++ Makefile.PL 6 Aug 2003 23:53:23 -0000 1.14
@@ -1,12 +1,16 @@
+use strict;
+use warnings;
+
use lib qw(../lib);
use ModPerl::BuildMM ();
+use File::Basename qw(dirname);
use Config;
-my $prefix = ModPerl::BuildMM::build_config()->apxs(-q => 'PREFIX');
+my $apr_bindir = ModPerl::BuildMM::build_config()->apr_bindir();
# XXX: this works only with libapr 0.9.2+ (not on win32)
my @libs = grep $_, map { -x $_ && qx{$_ --link-ld --libs} }
- map { qq{$prefix/bin/$_-config} } qw(apr apu);
+ map { qq{$apr_bindir/$_-config} } qw(apr apu);
chomp @libs;
my $libs = join ' ', @libs;
