stas 2004/02/09 10:31:41
Modified: . Makefile.PL Changes
todo release
Log:
When 'perl Makefile.PL PREFIX=/foo/bar' is used and mod_perl 1 is
found, but at different prefix no longer require
MP_INST_APACHE2=1.
Revision Changes Path
1.136 +20 -5 modperl-2.0/Makefile.PL
Index: Makefile.PL
===================================================================
RCS file: /home/cvs/modperl-2.0/Makefile.PL,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -u -r1.135 -r1.136
--- Makefile.PL 23 Dec 2003 04:28:00 -0000 1.135
+++ Makefile.PL 9 Feb 2004 18:31:40 -0000 1.136
@@ -124,11 +124,26 @@
print "ok (installing relative to Apache2/)\n";
}
else {
- print "not ok\n";
- error "cannot install mod_perl/$VERSION on top of $vstring",
- "use MP_INST_APACHE2=1 option " .
- "or to force installation delete:\n $old_modperl_pm";
- exit 1;
+ my $prefix;
+ /^PREFIX=(.*)/ && $1 && ($prefix = canonpath glob($1)) for @ARGV;
+
+ # check that it's a full path
+ my $mp1_path = canonpath $old_modperl_version;
+ # XXX: doesn't handle relative paths yet
+ # if PREFIX=/foo/bar is used, and it's not the same as the
+ # path where mod_perl 1 is installed, we don't need to require
+ # MP_INST_APACHE2
+ if ($prefix && $mp1_path !~ /^$prefix/) {
+ print "ok (will install mod_perl 2 into PREFIX=$prefix, " .
+ "no collision)\n";
+ }
+ else {
+ error "not ok";
+ error "cannot install mod_perl/$VERSION on top of $vstring",
+ "use MP_INST_APACHE2=1 option " .
+ "or to force installation delete:\n $old_modperl_pm";
+ exit 1;
+ }
}
}
1.320 +5 -1 modperl-2.0/Changes
Index: Changes
===================================================================
RCS file: /home/cvs/modperl-2.0/Changes,v
retrieving revision 1.319
retrieving revision 1.320
diff -u -u -r1.319 -r1.320
--- Changes 9 Feb 2004 18:21:36 -0000 1.319
+++ Changes 9 Feb 2004 18:31:40 -0000 1.320
@@ -12,8 +12,12 @@
=item 1.99_13-dev
+When 'perl Makefile.PL PREFIX=/foo/bar' is used and mod_perl 1 is
+found, but at different prefix no longer require
+MP_INST_APACHE2=1. [Stas]
+
modperl_mgv_resolve now croaks when a module scheduled for autoloading
-fails to load. AutoLoaded modules shouldn't silently fail.[Stas]
+fails to load. AutoLoaded modules shouldn't silently fail. [Stas]
Perl(Input|Output)FilterHandler handlers are now always AutoLoaded, as
if '+' prefix was used. This must be performed to get the access to
1.10 +0 -8 modperl-2.0/todo/release
Index: release
===================================================================
RCS file: /home/cvs/modperl-2.0/todo/release,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -u -r1.9 -r1.10
--- release 9 Feb 2004 18:18:16 -0000 1.9
+++ release 9 Feb 2004 18:31:41 -0000 1.10
@@ -14,14 +14,6 @@
that, though they use autoconf, which is not quite what we
want. Anyway it's something to look at.
-* perl Makefile.PL PREFIX=/foo/bar works fine, however Makefile.PL'll
- still refuse to build unless MP_INST_APACHE2=1 is passed. It should
- refuse to do so only if it finds mod_perl 1.0 installed under that
- PREFIX, which can be a tricky check, since the exact logic to figure
- out the paths is deep inside EU::MM. Probably it's better to run
- 'File::Find' and search for 'mod_perl.pm' under PREFIX, if found
- check its version and assert only if it's 1.xx
-
* META.yml. Generate META.yml (make dist does that), add Apache-Test
as a private resource, so it won't be attempted to be indexed by
PAUSE, add NO_META=>1 to WriteMakefile() which tells EU::MM not to
