stas 2004/08/06 12:35:34
Modified: . Makefile.PL
Log:
refactoring the ap(r|u)(-1?)config code and acquiring of the linking flags
(missed file)
Revision Changes Path
1.153 +1 -10 modperl-2.0/Makefile.PL
Index: Makefile.PL
===================================================================
RCS file: /home/cvs/modperl-2.0/Makefile.PL,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -u -r1.152 -r1.153
--- Makefile.PL 6 Aug 2004 12:55:47 -0000 1.152
+++ Makefile.PL 6 Aug 2004 19:35:34 -0000 1.153
@@ -101,16 +101,7 @@
# 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 (should it define PASTHRU_DEFINE instead?)
- my @configs = $build->httpd_version_as_int =~ m/21\d+/
- ? qw(apr-1 apu-1)
- : qw(apr apu);
-
- if (my $apr_bindir = $build->apr_bindir()) {
- my $ext = WIN32 ? '.bat' : '';
- my @apr_libs = grep $_, map { -x $_ && qx{$_ --link-ld} }
- map { qq{$apr_bindir/$_-config$ext} } @configs;
- $opt_define = '-DMP_HAVE_APR_LIBS' if @apr_libs;
- }
+ $opt_define = '-DMP_HAVE_APR_LIBS' if $build->apru_link_flags;
# preserve any DEFINE opts from outside and combine them with our
# local DEFINE
