stas 2003/02/28 16:37:35
Modified: . Makefile.PL Changes
Log:
- do a better mod_perl version checking, including the test for mod_perl 2.0
- s/use/require/ inside the conditionals
- move out generally used modules to the top
Revision Changes Path
1.18 +17 -8 httpd-apreq/Makefile.PL
Index: Makefile.PL
===================================================================
RCS file: /home/cvs/httpd-apreq/Makefile.PL,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- Makefile.PL 24 Dec 2002 06:45:04 -0000 1.17
+++ Makefile.PL 1 Mar 2003 00:37:34 -0000 1.18
@@ -3,6 +3,20 @@
use FindBin;
use 5.005;
+use File::Path qw(mkpath);
+
+BEGIN {
+ unless (eval {require mod_perl}) {
+ die "Please install mod_perl: 1.25 < version < 1.99\n($@)";
+ }
+ if ($mod_perl::VERSION < 1.2402) {
+ die "Please upgrade mod_perl to 1.24_02 or greater";
+ }
+ elsif ($mod_perl::VERSION > 1.98) {
+ die "mod_perl 1.x ( < 1.99) is required";
+ }
+}
+
my $Is_Win32 = ($^O eq "MSWin32") || $ENV{WIN32_TEST};
my $conf_data = join '', <DATA>;
@@ -36,22 +50,17 @@
check_compat();
if ($Is_Win32) {
- use mod_perl;
- unless ($mod_perl::VERSION >= 1.2402) {
- die "Please upgrade mod_perl to 1.24_02 or greater";
- }
- use Cwd;
- my $cwd = cwd;
+ require Cwd;
+ my $cwd = Cwd::cwd();
$cwd =~ s#\\#/#g;
my $root = "$cwd/blib/arch/auto";
- use File::Path qw(mkpath);
mkpath $root, 1, 0755 unless -d $root;
mkpath "$root/libapreq", 1, 0755 unless -d "$root/libapreq";
$lib = "$root/libapreq/libapreq.lib";
open (FILE, ">>$lib")
or die "Cannot touch $lib: $!\n";
close FILE;
- use Apache::MyConfig;
+ require Apache::MyConfig;
$ENV{APREQ_LIB} = "$root/libapreq";
$ENV{AP_INC} = $Apache::MyConfig::Setup{APACHE_INC};
$ENV{MP_INC} = $Apache::MyConfig::Setup{MODPERL_INC};
1.49 +3 -0 httpd-apreq/Changes
Index: Changes
===================================================================
RCS file: /home/cvs/httpd-apreq/Changes,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- Changes 27 Feb 2003 21:42:13 -0000 1.48
+++ Changes 1 Mar 2003 00:37:34 -0000 1.49
@@ -4,6 +4,9 @@
=item 1.12 - February 27, 2003
+do a better mod_perl version checking, including the test for mod_perl
+2.0. [Stas]
+
Applied IKEBE Tomohiro's patch for handling %uXXXX strings.
=item 1.11 - February 27, 2003
