as stated in my earlier post, apache-1.3.15-dev was just changed so all
modules on win32 look exactly like unix (e.g. mod_status.so). i
proposed we should stay in sync with the httpd group. here is a minimal
patch that seems to work: note
1) no docs have been updated in this patch
2) only the ApacheModulePerl.dll has been changed to mod_perl.so to
limit the diff
3) i included the earlier patch to Makefile.PL so it looks in
APACHE_SRC/src/Release as well as APACHE_SRC/src/CoreR for
ApacheCore.lib
4) it does not patch the test directory
if any win32 folks have opinions, or randy if you want to do it your own
way thats great. i just figured i'd get the ball rolling so to speak.
if this patch is acceptable, i will update the docs/test as well. i
thought it would be easies to review with minimal changes.
sterling
Index: Makefile.PL
===================================================================
RCS file: /home/cvspublic/modperl/Makefile.PL,v
retrieving revision 1.173
diff -u -w -r1.173 Makefile.PL
--- Makefile.PL 2000/12/21 20:00:09 1.173
+++ Makefile.PL 2000/12/22 01:18:52
@@ -1301,7 +1301,7 @@
($win32_args{DEBUG} == 1) ? 'Debug' : 'Release';
if ($win32_args{INSTALL_DLL}) {
$string .= sprintf qq{\namp_install:\n\t\$(CP) "%s" "%s"},
- "$win32_path{MODPERL_LIB}/ApacheModulePerl.dll", $win32_args{INSTALL_DLL};
+ "$win32_path{MODPERL_LIB}/mod_perl.so", $win32_args{INSTALL_DLL};
}
return $string;
}
@@ -2023,6 +2023,15 @@
$win32_path{APACHE_LIB} = ($win32_args{DEBUG} == 1) ?
$win32_args{APACHE_SRC} . '/CoreD' :
$win32_args{APACHE_SRC} . '/CoreR';
+
+ # in apache_1.3.15 Apache.exe and ApacheCore.lib were
+ # moved into Release/Debug directory.... this catches that case
+ unless ( -f "$win32_path{APACHE_LIB}/ApacheCore.lib" ) {
+ $win32_path{APACHE_LIB} = ($win32_args{DEBUG} == 1) ?
+ $win32_args{APACHE_SRC} . '/Debug' :
+ $win32_args{APACHE_SRC} . '/Release';
+ }
+
die "Cannot find ApacheCore.lib under $win32_path{APACHE_LIB}\n"
unless -f "$win32_path{APACHE_LIB}/ApacheCore.lib";
@@ -2042,7 +2051,7 @@
print <<'END';
**** The Apache/modules directory was not found. *******
-**** Please install ApacheModulePerl.dll manually. *******
+**** Please install mod_perl.so manually. *******
END
}
Index: src/modules/ApacheModulePerl/ApacheModulePerl.dsp
===================================================================
RCS file: /home/cvspublic/modperl/src/modules/ApacheModulePerl/ApacheModulePerl.dsp,v
retrieving revision 1.7
diff -u -w -r1.7 ApacheModulePerl.dsp
--- src/modules/ApacheModulePerl/ApacheModulePerl.dsp 2000/09/13 06:06:43 1.7
+++ src/modules/ApacheModulePerl/ApacheModulePerl.dsp 2000/12/22 01:18:55
@@ -52,8 +52,8 @@
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib
/nologo /subsystem:windows /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib
shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo
/subsystem:windows /dll /machine:I386
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
+advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib
+/nologo /subsystem:windows /dll /machine:I386 /out:"Release/mod_perl.so"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib
+shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo
+/subsystem:windows /dll /machine:I386 /out:"Release/mod_perl.so"
!ELSEIF "$(CFG)" == "ApacheModulePerl - Win32 Debug"
@@ -77,8 +77,8 @@
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib
/nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib
shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo
/subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
+advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib
+/nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
+/out:"Debug/mod_perl.so"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib
+shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo
+/subsystem:windows /dll /debug /machine:I386 /pdbtype:sept /out:"Debug/mod_perl.so"
!ENDIF
Index: src/modules/ApacheModulePerl/ApacheModulePerl.mak
===================================================================
RCS file: /home/cvspublic/modperl/src/modules/ApacheModulePerl/ApacheModulePerl.mak,v
retrieving revision 1.1
diff -u -w -r1.1 ApacheModulePerl.mak
--- src/modules/ApacheModulePerl/ApacheModulePerl.mak 1997/12/06 17:56:56 1.1
+++ src/modules/ApacheModulePerl/ApacheModulePerl.mak 2000/12/22 01:18:58
@@ -43,11 +43,11 @@
!IF "$(RECURSE)" == "0"
-ALL : "$(OUTDIR)\ApacheModulePerl.dll"
+ALL : "$(OUTDIR)\mod_perl.so"
!ELSE
-ALL : "$(OUTDIR)\ApacheModulePerl.dll"
+ALL : "$(OUTDIR)\mod_perl.so"
!ENDIF
@@ -60,7 +60,7 @@
-@erase "$(INTDIR)\perlio.obj"
-@erase "$(INTDIR)\perlxsi.obj"
-@erase "$(INTDIR)\vc50.idb"
- -@erase "$(OUTDIR)\ApacheModulePerl.dll"
+ -@erase "$(OUTDIR)\mod_perl.so"
-@erase "$(OUTDIR)\ApacheModulePerl.exp"
-@erase "$(OUTDIR)\ApacheModulePerl.lib"
@@ -82,7 +82,7 @@
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib\
odbccp32.lib /nologo /subsystem:windows /dll /incremental:no\
/pdb:"$(OUTDIR)\ApacheModulePerl.pdb" /machine:I386\
- /out:"$(OUTDIR)\ApacheModulePerl.dll" /implib:"$(OUTDIR)\ApacheModulePerl.lib"
+ /out:"$(OUTDIR)\mod_perl.so" /implib:"$(OUTDIR)\ApacheModulePerl.lib"
LINK32_OBJS= \
"$(INTDIR)\Apache.obj" \
"$(INTDIR)\Constants.obj" \
@@ -94,7 +94,7 @@
"..\..\..\..\..\Apache\ApacheCore.lib" \
"..\..\..\..\..\perl\lib\CORE\perl.lib"
-"$(OUTDIR)\ApacheModulePerl.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+"$(OUTDIR)\mod_perl.so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
$(LINK32_FLAGS) $(LINK32_OBJS)
<<
@@ -109,11 +109,11 @@
!IF "$(RECURSE)" == "0"
-ALL : "$(OUTDIR)\ApacheModulePerl.dll" "$(OUTDIR)\ApacheModulePerl.bsc"
+ALL : "$(OUTDIR)\mod_perl.so" "$(OUTDIR)\ApacheModulePerl.bsc"
!ELSE
-ALL : "$(OUTDIR)\ApacheModulePerl.dll" "$(OUTDIR)\ApacheModulePerl.bsc"
+ALL : "$(OUTDIR)\mod_perl.so" "$(OUTDIR)\ApacheModulePerl.bsc"
!ENDIF
@@ -135,7 +135,7 @@
-@erase "$(INTDIR)\vc50.idb"
-@erase "$(INTDIR)\vc50.pdb"
-@erase "$(OUTDIR)\ApacheModulePerl.bsc"
- -@erase "$(OUTDIR)\ApacheModulePerl.dll"
+ -@erase "$(OUTDIR)\mod_perl.so"
-@erase "$(OUTDIR)\ApacheModulePerl.exp"
-@erase "$(OUTDIR)\ApacheModulePerl.ilk"
-@erase "$(OUTDIR)\ApacheModulePerl.lib"
@@ -171,7 +171,7 @@
advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib\
odbccp32.lib /nologo /subsystem:windows /dll /incremental:yes\
/pdb:"$(OUTDIR)\ApacheModulePerl.pdb" /debug /machine:I386\
- /out:"$(OUTDIR)\ApacheModulePerl.dll" /implib:"$(OUTDIR)\ApacheModulePerl.lib"\
+ /out:"$(OUTDIR)\mod_perl.so" /implib:"$(OUTDIR)\ApacheModulePerl.lib"\
/pdbtype:sept
LINK32_OBJS= \
"$(INTDIR)\Apache.obj" \
@@ -184,7 +184,7 @@
"..\..\..\..\..\Apache\ApacheCore.lib" \
"..\..\..\..\..\perl\lib\CORE\perl.lib"
-"$(OUTDIR)\ApacheModulePerl.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
+"$(OUTDIR)\mod_perl.so" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
$(LINK32) @<<
$(LINK32_FLAGS) $(LINK32_OBJS)
<<
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
