Author: torsten
Date: Tue Aug 31 17:28:10 2010
New Revision: 991269
URL: http://svn.apache.org/viewvc?rev=991269&view=rev
Log:
Make sure perl is built either with multiplicity and ithreads or without both
Modified:
perl/modperl/trunk/Changes
perl/modperl/trunk/Makefile.PL
Modified: perl/modperl/trunk/Changes
URL:
http://svn.apache.org/viewvc/perl/modperl/trunk/Changes?rev=991269&r1=991268&r2=991269&view=diff
==============================================================================
--- perl/modperl/trunk/Changes (original)
+++ perl/modperl/trunk/Changes Tue Aug 31 17:28:10 2010
@@ -12,6 +12,9 @@ Also refer to the Apache::Test changes l
=item 2.0.5-dev
+Make sure perl is built either with multiplicity and ithreads or without
+both [Theory, Torsten]
+
Support for "install_vendor" and "install_site" make targets [Torsten]
Run tests on bundled pure perl Apache::* modules [Gozer, Phred]
Modified: perl/modperl/trunk/Makefile.PL
URL:
http://svn.apache.org/viewvc/perl/modperl/trunk/Makefile.PL?rev=991269&r1=991268&r2=991269&view=diff
==============================================================================
--- perl/modperl/trunk/Makefile.PL (original)
+++ perl/modperl/trunk/Makefile.PL Tue Aug 31 17:28:10 2010
@@ -540,6 +540,19 @@ sub perl_version_check {
"Upgrade to Perl 5.8.0 or higher";
exit 1;
}
+
+ if ($Config{usemultiplicity} xor $Config{usethreads}) {
+ error "mod_perl does not currently support multiplicity without ".
+ "ithreads.";
+ if ($build->mpm_is_threaded()) {
+ error "Please recompile Perl with -Duseithreads and ".
+ "-Dusemultiplicity";
+ } else {
+ error "Please recompile Perl with either -Duseithreads and ".
+ "-Dusemultiplicity or -Uuseithreads and -Uusemultiplicity";
+ }
+ exit 1;
+ }
}
sub system_sanity_check {
