stas 2003/08/08 18:47:06
Modified: . Makefile.PL
Log:
move the apr-config check into configure() *after* apxs has been found if
at all
Revision Changes Path
1.117 +10 -18 modperl-2.0/Makefile.PL
Index: Makefile.PL
===================================================================
RCS file: /home/cvs/modperl-2.0/Makefile.PL,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- Makefile.PL 7 Aug 2003 16:46:32 -0000 1.116
+++ Makefile.PL 9 Aug 2003 01:47:06 -0000 1.117
@@ -45,8 +45,6 @@
perl_version_check($build);
-apache_check($build);
-
my $code = ModPerl::Code->new;
configure();
@@ -186,10 +184,19 @@
}
printf "Configuring Apache/%s mod_perl/%s Perl/v%vd\n",
- $httpd_version, $VERSION, $^V;
+ $httpd_version, $VERSION, $^V;
my $apr_config = $build->get_apr_config; #cache it
+ # we need to know where apr-config and apu-configs are
+ # which sometimes aren't placed into the same dir with apxs/httpd
+ # XXX: need to fix that for WIN32
+ unless (WIN32 || $build->apr_config_path) {
+ error "can't find 'apr-config', please pass " .
+ "MP_APR_CONFIG=/full/path/to/apr-config to 'perl Makefile.PL'";
+ exit 1;
+ }
+
for (@{ clean_files() }) {
debug "unlink...$_" if -e $_ && unlink;
}
@@ -351,21 +358,6 @@
error "$perl_string.",
"5.7.x development versions of Perl are no longer supported",
"Upgrade to Perl 5.8.0 or higher";
- exit 1;
- }
-}
-
-sub apache_check {
- my $build = shift;
-
- # XXX: need to fix that
- return if WIN32;
-
- # we need to know where apr-config and apu-configs are
- # which sometimes aren't placed into the same dir with apxs/httpd
- unless ($build->apr_config_path) {
- error "can't find 'apr-config', please pass " .
- "MP_APR_CONFIG=/full/path/to/apr-config to 'perl Makefile.PL'";
exit 1;
}
}
