stas 2003/08/06 14:59:04
Modified: . Makefile.PL Changes
Log:
- now requiring 5.8.x/ithreads for threaded mpms (now doing the check
against the mpm, rather than OS name)
Revision Changes Path
1.110 +13 -6 modperl-2.0/Makefile.PL
Index: Makefile.PL
===================================================================
RCS file: /home/cvs/modperl-2.0/Makefile.PL,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- Makefile.PL 6 Aug 2003 21:40:04 -0000 1.109
+++ Makefile.PL 6 Aug 2003 21:59:03 -0000 1.110
@@ -41,9 +41,10 @@
our $VERSION;
-perl_version_check();
-
my $build = Apache::Build->new(init => 1);
+
+perl_version_check($build);
+
my $code = ModPerl::Code->new;
configure();
@@ -316,15 +317,21 @@
}
sub perl_version_check {
+ my $build = shift;
- if (Apache::Build::REQUIRE_ITHREADS()) {
+ # the following mpms require threaded perl (== 5.8.0/ithreads+)
+ my %threaded_mpms = map { $_ => 1}
+ qw(worker winnt beos mpmt_os2 netware leader
+ perchild threadpool);
+ my $mpm = $build->apxs(-q => 'MPM_NAME') || 'unknown' ;
+ if ($threaded_mpms{$mpm}) {
unless (Apache::Build::HAS_ITHREADS()) {
- die "your system requires an ithreads enabled Perl";
+ die "this httpd ($mpm mpm) requires Perl w/ ithreads enabled\n";
}
# 5.6.x ithreads aren't good
unless ($] >= 5.008) {
- die "Perl 5.8 or higher w/ ithreads is required. " .
- "This is only Perl $]";
+ die "Perl 5.8 or higher w/ ithreads enabled is required. " .
+ "This is only Perl $]\n";
}
}
1.203 +3 -0 modperl-2.0/Changes
Index: Changes
===================================================================
RCS file: /home/cvs/modperl-2.0/Changes,v
retrieving revision 1.202
retrieving revision 1.203
diff -u -r1.202 -r1.203
--- Changes 6 Aug 2003 06:46:35 -0000 1.202
+++ Changes 6 Aug 2003 21:59:03 -0000 1.203
@@ -12,6 +12,9 @@
=item 1.99_10-dev
+mod_perl now refuses to build against threaded mpms (non-prefork)
+unless perl 5.8+ w/ithreads is used [Stas]
+
don't try to read PERL_HASH_SEED env var, where apr_env_get is not
available (apr < 0.9.3) [Stas]
