randyk 2003/09/27 13:06:59
Modified: . Makefile.PL INSTALL.win32 Changes
Log:
Reviewed by: stas
Add an INSTALL_LIB attribute to Makefile.PL for Win32 to specify where
to install mod_perl.lib [suggested by STeve Hay]
Revision Changes Path
1.217 +36 -9 modperl/Makefile.PL
Index: Makefile.PL
===================================================================
RCS file: /home/cvs/modperl/Makefile.PL,v
retrieving revision 1.216
retrieving revision 1.217
diff -u -r1.216 -r1.217
--- Makefile.PL 19 Aug 2003 05:07:44 -0000 1.216
+++ Makefile.PL 27 Sep 2003 20:06:58 -0000 1.217
@@ -330,7 +330,8 @@
my $vcpp = ($Config{cc} =~ /^cl(\.exe)?$/);
my %win32_args;
-my %win32_accept = map {$_ => 1} qw(APACHE_SRC INSTALL_DLL DEBUG EAPI);
+my %win32_accept = map {$_ => 1}
+ qw(APACHE_SRC INSTALL_DLL INSTALL_LIB DEBUG EAPI);
while($_ = shift) {
($k,$v) = split /=/, $_, 2;
@@ -375,6 +376,10 @@
my $w32_ap_mod = $fixed_apsrc . '/modules';
$win32_args{INSTALL_DLL} = $w32_ap_mod if -d $w32_ap_mod;
}
+ unless ($win32_args{INSTALL_LIB}) {
+ my $w32_ap_lib = $fixed_apsrc . '/libexec';
+ $win32_args{INSTALL_LIB} = $w32_ap_lib if -d $w32_ap_lib;
+ }
}
my %very_experimental = map {$_,1}
@@ -1341,7 +1346,8 @@
if($USE_APXS) {
$add = "apxs_install";
}
- elsif ($win32_auto and $win32_args{INSTALL_DLL}) {
+ elsif ($win32_auto and
+ ($win32_args{INSTALL_DLL} or $win32_args{INSTALL_LIB})) {
$add = 'amp_install';
}
elsif($USE_APACI) {
@@ -1372,12 +1378,11 @@
$win32_args{INSTALL_DLL} .
($win32_args{APACHE_VERS} < 1315 ?
'/ApacheModulePerl.dll' : '/mod_perl.so');
- if (-d "$win32_args{APACHE_SRC}/libexec") {
- my $libexec = win32_fix_path($win32_args{APACHE_SRC}) . '/libexec';
- $string .= sprintf qq{\n\t\$(CP) "%s" "%s"},
- "$win32_path{MODPERL_LIB}/mod_perl.lib",
- $libexec . '/mod_perl.lib';
- }
+ }
+ if ($win32_args{INSTALL_LIB}) {
+ $string .= sprintf qq{\n\t\$(CP) "%s" "%s"},
+ "$win32_path{MODPERL_LIB}/mod_perl.lib",
+ $win32_args{INSTALL_LIB} . '/mod_perl.lib';
}
return $string;
}
@@ -2155,7 +2160,7 @@
if ($win32_args{INSTALL_DLL} ) {
$win32_args{INSTALL_DLL} =
- win32_fix_path($win32_args{INSTALL_DLL});
+ win32_fix_path($win32_args{INSTALL_DLL});
unless ( -d $win32_args{INSTALL_DLL}) {
my @dirs = grep {-d}
('\Program Files\Apache Group\Apache\modules',
@@ -2170,6 +2175,28 @@
**** The Apache/modules directory was not found. *******
**** Please install mod_perl.so manually. *******
+
+END
+ }
+ }
+ }
+ if ($win32_args{INSTALL_LIB} ) {
+ $win32_args{INSTALL_LIB} =
+ win32_fix_path($win32_args{INSTALL_LIB});
+ unless ( -d $win32_args{INSTALL_LIB}) {
+ my @dirs = grep {-d}
+ ('\Program Files\Apache Group\Apache\libexec',
+ '\Apache\libexec', '\Program Files\Apache\libexec');
+ $win32_args{INSTALL_LIB} = find_dir([EMAIL PROTECTED], 'Apache/libexec');
+ if ($win32_args{INSTALL_LIB} and -d $win32_args{INSTALL_LIB}) {
+ $win32_args{INSTALL_LIB} =
+ win32_fix_path($win32_args{INSTALL_LIB});
+ }
+ else {
+ print <<'END';
+
+**** The Apache/libexec directory was not found. *******
+**** Please install mod_perl.lib manually. *******
END
}
1.11 +6 -0 modperl/INSTALL.win32
Index: INSTALL.win32
===================================================================
RCS file: /home/cvs/modperl/INSTALL.win32,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- INSTALL.win32 6 Jul 2003 13:42:56 -0000 1.10
+++ INSTALL.win32 27 Sep 2003 20:06:59 -0000 1.11
@@ -131,6 +131,12 @@
(eg, \Apache\modules). If not given, a value of APACHE_SRC\modules
will be used, if this directory exists.
+=item INSTALL_LIB
+
+This gives the location of where to install mod_perl.lib
+(eg, \Apache\libexec). If not given, a value of APACHE_SRC\libexec
+will be used, if this directory exists.
+
=item DEBUG
If true (DEBUG=1), a Debug version will be built (this assumes
1.679 +5 -0 modperl/Changes
Index: Changes
===================================================================
RCS file: /home/cvs/modperl/Changes,v
retrieving revision 1.678
retrieving revision 1.679
diff -u -r1.678 -r1.679
--- Changes 17 Sep 2003 01:57:35 -0000 1.678
+++ Changes 27 Sep 2003 20:06:59 -0000 1.679
@@ -10,6 +10,11 @@
=item 1.28_01-dev
+For Win32, add an INSTALL_LIB option to 'perl Makefile.PL' to
+allow one to specify where to install mod_perl.lib. If not
+given, this defaults to APACHE_SRC\libexec, if this exists.
+Suggested by Steve Hay [randyk]
+
Fix t/net/perl/sym.pl (called by modules/symbol) not to affect other
tests (internal/http-get and internal/http-post, which were failing to
call exit) [Stas]
