randyk 2003/07/02 08:57:54
Modified: . Makefile.PL INSTALL.win32
Log:
For Win32, use a default of APACHE_SRC/modules to install
mod_perl.so, if this directory exists and if INSTALL_DLL is
not provided. Update the INSTALL.win32 documentation accordingly,
and also add some discussion of the limitations of mod_perl 1
on Win32.
Revision Changes Path
1.214 +4 -11 modperl/Makefile.PL
Index: Makefile.PL
===================================================================
RCS file: /home/cvs/modperl/Makefile.PL,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -r1.213 -r1.214
--- Makefile.PL 5 Jun 2003 07:38:46 -0000 1.213
+++ Makefile.PL 2 Jul 2003 15:57:53 -0000 1.214
@@ -370,6 +370,10 @@
(-d "$fixed_apsrc/src/include" ? $fixed_apsrc . '/src' :
die "Cannot find the Apache include directory under $fixed_apsrc");
$win32_auto = 1;
+ if (not defined $win32_args{INSTALL_DLL}) {
+ my $w32_ap_mod = $fixed_apsrc . '/modules';
+ $win32_args{INSTALL_DLL} = $w32_ap_mod if -d $w32_ap_mod;
+ }
}
my %very_experimental = map {$_,1}
@@ -1293,17 +1297,6 @@
FILES => "@do_clean",
}
);
-
-if ($Is_Win32) {
- print <<'END';
-
-Beginning with version 1.3.15, Apache uses a different convention for
-Win32 module names. Correspondingly, the name of the mod_perl module
-built here has been changed from ApacheModulePerl.dll to mod_perl.so.
-Please see INSTALL.win32 for further details.
-
-END
-}
print "*** BSDI users: be sure to read the INSTALL `Notes' section ***\n"
if $Config{osname} =~ /bsdos/i;
1.9 +24 -9 modperl/INSTALL.win32
Index: INSTALL.win32
===================================================================
RCS file: /home/cvs/modperl/INSTALL.win32,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- INSTALL.win32 9 Jul 2001 15:03:05 -0000 1.8
+++ INSTALL.win32 2 Jul 2003 15:57:54 -0000 1.9
@@ -15,7 +15,8 @@
MSVC++ 5.0+, Apache version 1.3-dev or higher and Perl 5.004_02 or higher.
As of version 1.24_01, mod_perl will build on Win32 ActivePerls
-based on Perl-5.6.0 (builds 6xx).
+based on Perl-5.6.0 (builds 6xx). It will not build on ActivePerl
+8xx builds at present due to the enabling of LARGE_FILES support.
=back
@@ -108,7 +109,7 @@
Generating the Makefile as, for example,
- perl Makefile.PL APACHE_SRC=..\apache_1.3.xx INSTALL_DLL=\Apache\modules
+ perl Makefile.PL APACHE_SRC=\Apache
will build mod_perl (including mod_perl.so) entirely from
the command line. The arguments accepted include
@@ -120,13 +121,15 @@
This can be one of two values: either the path to the Apache build
directory (eg, ..\apache_1.3.xx), or to the installed Apache location
(eg, \Apache). This is used to set the locations of ApacheCore.lib
-and the Apache header files.
+and the Apache header files. Also, mod_perl.so will be installed
+to APACHE_SRC\modules, if such a directory exists and if an
+INSTALL_DLL argument isn't used.
=item INSTALL_DLL
This gives the location of where to install mod_perl.so
-(eg, \Apache\modules). No default is assumed - if this argument
-is not given, mod_perl.so must be copied manually.
+(eg, \Apache\modules). If not given, a value of APACHE_SRC\modules
+will be used, if this directory exists.
=item DEBUG
@@ -161,18 +164,24 @@
LoadModule perl_module modules/mod_perl.so
-Be sure that 'C:\perl\bin' is in your path so apache can find perl.dll
+Be sure that 'C:\perl\bin' is in your path so apache can find perl.dll.
+You may also want to use the directive
+
+ LoadFile "C:/Perl/bin/perl56.dll"
+
+(before loading mod_perl.so) to load your perl dll.
See the cgi_to_mod_perl.pod and mod_perl.pod documents for general
configuration.
=head1 NOTES
-mod_perl-win32 is considered alpha, at the time of this writing, so is
-Apache-NT (1.3a1)
+mod_perl-win32 is considered alpha, at the time of this writing,
+and Apache 1.xx is not as well developed for Win32 as the
+Unix counterpart.
CGI::Switch does not work with apache_1.3a1 because basic_http_header()
-is not exported by the ApacheCore.dll For now, just change:
+is not exported by the ApacheCore.dll. For now, just change:
use CGI::Switch ();
my $q = CGI::Switch->new;
@@ -181,3 +190,9 @@
use CGI ();
my $q = CGI->new;
+
+There are basic multi-threading limitations of mod_perl 1 on
+Win32. See the Win32 documentation at http://perl.apache.org/
+for a discussion, and also for details of the use of mod_perl 2
+(with Apache 2) which overcomes this limitation.
+