richter 01/05/15 12:29:40
Modified: . Makefile.PL
Log:
some adaption for win32
Revision Changes Path
1.47 +35 -13 embperl/Makefile.PL
Index: Makefile.PL
===================================================================
RCS file: /home/cvs/embperl/Makefile.PL,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- Makefile.PL 2001/05/15 04:50:06 1.46
+++ Makefile.PL 2001/05/15 19:29:32 1.47
@@ -27,50 +27,58 @@
(
'mod_perl.c' => { name => 'perl_module',
path => ['$apache_src/modules/perl/libperl.so',
'$EPBINDIR/modules/libperl.so', '$apache_src/mod_perl.so'],
- win32path => ['$mpdll', '$mpdll/apachemoduleperl.dll',
'$mpdll/mod_perl.so', '$apache_src/../modules/mod_perl.so',
'$EPBINDIR/modules/apachemoduleperl.dll'],
+ win32path => ['$mpdll', '$mpdll/apachemoduleperl.dll',
'$mpdll/mod_perl.so', '$EPBINDIR/modules/apachemoduleperl.dll',
'$EPBINDIR/modules/mod_perl.so'],
file => 'libperl.so',
+ filetext => 'libperl.so or mod_perl.so',
win32file => 'apachemoduleperl.dll',
+ win32filetext => 'ApacheModulePerl.dll or mod_perl.so',
},
'mod_dir.c' => { name => 'dir_module',
path => ['$apache_src/modules/standard/mod_dir.so',
'$EPBINDIR/modules/mod_dir.so', '$apache_src/mod_dir.so'],
- win32path =>
['$apache_src/modules/standard/apachemoduledir.dll',
'$EPBINDIR/modules/apachemoduledir.dll'],
+ win32path =>
['$apache_src/modules/standard/apachemoduledir.dll',
'$EPBINDIR/modules/apachemoduledir.dll', '$EPBINDIR/modules/mod_dir.so'],
file => 'mod_dir.so',
win32file => 'apachemoduledir.dll',
+ win32filetext => 'ApacheModuleDir.dll or mod_dir.so',
},
'mod_env.c' => { name => 'env_module',
path => ['$apache_src/modules/standard/mod_env.so',
'$EPBINDIR/modules/mod_env.so', '$apache_src/mod_env.so'],
- win32path =>
['$apache_src/modules/standard/apachemoduleenv.dll',
'$EPBINDIR/modules/apachemoduleenv.dll'],
+ win32path =>
['$apache_src/modules/standard/apachemoduleenv.dll',
'$EPBINDIR/modules/apachemoduleenv.dll', '$EPBINDIR/modules/mod_env.so'],
file => 'mod_env.so',
win32file => 'apachemoduleenv.dll',
+ win32filetext => 'ApacheModuleEnv.dll or mod_env.so',
},
'mod_mime.c' => { name => 'mime_module',
path => ['$apache_src/modules/standard/mod_mime.so',
'$EPBINDIR/modules/mod_mime.so', '$apache_src/mod_mime.so'],
- win32path =>
['$apache_src/modules/standard/apachemodulemime.dll',
'$EPBINDIR/modules/apachemodulemime.dll'],
+ win32path =>
['$apache_src/modules/standard/apachemodulemime.dll',
'$EPBINDIR/modules/apachemodulemime.dll', '$EPBINDIR/modules/mod_mime.so'],
file => 'mod_mime.so',
win32file => 'apachemodulemime.dll',
+ win32filetext => 'ApacheModuleMime.dll or mod_mime.so',
},
'mod_alias.c' => { name => 'alias_module',
path => ['$apache_src/modules/standard/mod_alias.so',
'$EPBINDIR/modules/mod_alias.so', '$apache_src/mod_alias.so'],
- win32path =>
['$apache_src/modules/standard/apachemodulealias.dll',
'$EPBINDIR/modules/apachemodulealias.dll'],
+ win32path =>
['$apache_src/modules/standard/apachemodulealias.dll',
'$EPBINDIR/modules/apachemodulealias.dll', '$EPBINDIR/modules/mod_alias.so'],
file => 'mod_alias.so',
win32file => 'apachemodulealias.dll',
+ win32filetext => 'ApacheModuleAlias.dll or mod_alias.so',
},
'mod_cgi.c' => { name => 'cgi_module',
path => ['$apache_src/modules/standard/mod_cgi.so',
'$EPBINDIR/modules/mod_cgi.so', '$apache_src/mod_cgi.so'],
- win32path =>
['$apache_src/modules/standard/apachemodulecgi.dll',
'$EPBINDIR/modules/apachemodulecgi.dll'],
+ win32path =>
['$apache_src/modules/standard/apachemodulecgi.dll',
'$EPBINDIR/modules/apachemodulecgi.dll', '$EPBINDIR/modules/mod_cgi.so'],
file => 'mod_cgi.so',
win32file => 'apachemodulecgi.dll',
+ win32filetext => 'ApacheModuleCgi.dll or mod_cgi.so',
},
'mod_actions.c' => { name => 'action_module',
path => ['$apache_src/modules/standard/mod_actions.so',
'$EPBINDIR/modules/mod_actions.so', '$apache_src/mod_actions.so'],
- win32path =>
['$apache_src/modules/standard/apachemoduleactions.dll',
'$EPBINDIR/modules/apachemoduleactions.dll'],
+ win32path =>
['$apache_src/modules/standard/apachemoduleactions.dll',
'$EPBINDIR/modules/apachemoduleactions.dll', '$EPBINDIR/modules/mod_actions.so'],
file => 'mod_actions.so',
win32file => 'apachemoduleactions.dll',
+ win32filetext => 'ApacheModuleActions.dll or mod_actions.so',
},
@@ -521,8 +529,12 @@
if ($win32)
{
$i = "-I. -I\"$inc_dir\" -I\"$apache_src/regex\"
-I\"$apache_src/os/win32\"" ;
- if (-e "$apache_src/../libexec/ApacheCore.lib")
+ if (-e "$apache_src/libexec/ApacheCore.lib")
{
+ $o = " \"$apache_src/libexec/ApacheCore.lib\"" ;
+ }
+ elsif (-e "$apache_src/../libexec/ApacheCore.lib")
+ {
$o = " \"$apache_src/../libexec/ApacheCore.lib\"" ;
}
elsif (!-e "$apache_src/CoreD/ApacheCore.lib")
@@ -620,10 +632,15 @@
}
else
{
- $EPHTTPD = "$apache_src/../Apache.exe" ;
- $EPHTTPDDLL = "$apache_src/.." ;
+ $EPHTTPD = "$apache_src/Apache.exe" ;
+ $EPHTTPDDLL = "$apache_src" ;
if (!-e $EPHTTPD)
{
+ $EPHTTPD = "$apache_src/../Apache.exe" ;
+ $EPHTTPDDLL = "$apache_src/.." ;
+ }
+ if (!-e $EPHTTPD)
+ {
$EPHTTPD = "$apache_src/ApacheD/Apache.exe" ;
$EPHTTPDDLL = "$apache_src/CoreD" ;
}
@@ -644,7 +661,7 @@
### check the apache version ###
- $ENV{PATH} .= ";\"$EPHTTPDDLL\"" if ($win32) ;
+ $ENV{PATH} .= ";$EPHTTPDDLL" if ($win32) ;
@EPAPACHEVERSION = start ("$EPHTTPD -v") ;
@@ -667,6 +684,7 @@
{ # module not linked staticly
$paths = $win32?$opt->{win32path}:$opt->{path} ;
$modfile = $win32?$opt->{win32file}:$opt->{file} ;
+ $modfiletext = ($win32?$opt->{win32filetext}:$opt->{filetext}) || $modfile
;
$found = 2 ;
while ($found == 2)
{
@@ -714,7 +732,7 @@
{
my $w32msg = '' ;
$w32msg = "\nPlease enter full path including the drive letter!! "
if ($win32) ;
- $addmodpath = GetString ("Library for $mod not found, please enter
path to $modfile $w32msg", "") ;
+ $addmodpath = GetString ("Library for $mod not found, please enter
path to $modfiletext $w32msg", "") ;
$found = 2 ;
}
}
@@ -914,7 +932,11 @@
}
# Check for winsock2api
- if (open FH, "$inc_dir/../os/win32/os.h")
+
+ my $os_h = "$inc_dir/os.h" ;
+ $os_h = "$inc_dir/../os/win32/os.h" if (!-e $os_h) ;
+
+ if (open FH, $os_h )
{
my @conf = <FH> ;
close FH ;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
