Author: pgollucci
Date: Sun Sep 11 20:28:27 2005
New Revision: 280242
URL: http://svn.apache.org/viewcvs?rev=280242&view=rev
Log:
Improve the detection of whether or not we are in an mp2 build tree
Modified:
perl/modperl/trunk/Changes
perl/modperl/trunk/lib/Apache2/Build.pm
Modified: perl/modperl/trunk/Changes
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/Changes?rev=280242&r1=280241&r2=280242&view=diff
==============================================================================
--- perl/modperl/trunk/Changes (original)
+++ perl/modperl/trunk/Changes Sun Sep 11 20:28:27 2005
@@ -12,6 +12,11 @@
=item 2.0.2-dev
+Improve the detection of whether or not we are in an mp2 build tree.
+This allows usage of ExtUtils::MakeMaker options such as PREFIX to
+not break the probe of mp2 build trees.
+[Stas, Philip M. Gollucci]
+
Add support for the newer Smaps (/proc/self/statm) on Linux
systems that support it (i.e. linux-2.6.13-rc4-mm1)
to accurately count the amount of shared memory.
Modified: perl/modperl/trunk/lib/Apache2/Build.pm
URL:
http://svn.apache.org/viewcvs/perl/modperl/trunk/lib/Apache2/Build.pm?rev=280242&r1=280241&r2=280242&view=diff
==============================================================================
--- perl/modperl/trunk/lib/Apache2/Build.pm (original)
+++ perl/modperl/trunk/lib/Apache2/Build.pm Sun Sep 11 20:28:27 2005
@@ -26,7 +26,7 @@
use ExtUtils::Embed ();
use File::Copy ();
-use constant IS_MOD_PERL_BUILD => grep { -e "$_/lib/mod_perl2.pm" } qw(. ..);
+use constant IS_MOD_PERL_BUILD => grep { -e "$_/Makefile.PL" && -e
"$_/lib/mod_perl2.pm" } qw(. ..);
use constant AIX => $^O eq 'aix';
use constant DARWIN => $^O eq 'darwin';
