Author: richter
Date: Sun Mar 16 13:22:57 2014
New Revision: 1578065
URL: http://svn.apache.org/r1578065
Log:
Adapt Makefile.PL to autodetect if apache2 as binary name and if mpm_prefork
needs tpo be loaded as module
Modified:
perl/embperl/trunk/Makefile.PL
Modified: perl/embperl/trunk/Makefile.PL
URL:
http://svn.apache.org/viewvc/perl/embperl/trunk/Makefile.PL?rev=1578065&r1=1578064&r2=1578065&view=diff
==============================================================================
--- perl/embperl/trunk/Makefile.PL (original)
+++ perl/embperl/trunk/Makefile.PL Sun Mar 16 13:22:57 2014
@@ -41,6 +41,11 @@ $EP2 = -f "epcmd2.c" ;
win32filetext => 'ApacheModuleDir.dll or mod_dir.so',
},
+ 'prefork.c' => { name => 'mpm_prefork_module',
+ path =>
['$apache_src/modules/standard/mod_mpm_prefork.so',
'$EPBINDIR/modules/mod_mpm_prefork.so', '$apache_src/mod_mpm_prefork.so'],
+ file => ['mod_mpm_prefork.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', '$EPBINDIR/modules/mod_env.so'],
@@ -871,6 +876,7 @@ if ($b && $apache)
chomp ($sbindir) ;
$EPHTTPD = "$sbindir/httpd" ;
$EPHTTPD = "$sbindir/httpd2" if (-e "$sbindir/httpd2") ;
+ $EPHTTPD = "$sbindir/apache2" if (-e "$sbindir/apache2") ;
}
if (!-e $EPHTTPD)
@@ -906,7 +912,7 @@ if ($b && $apache)
@EPAPACHEVERSION = start ("\"$EPHTTPD\" -v") ;
@modules = start ("\"$EPHTTPD\" -l") ;
- @apacheinfo = start ("\"$EPHTTPD\" -V") ;
+ @apacheinfo = eval { start ("\"$EPHTTPD\" -V") ; } ;
my ($mpm) = grep /Server MPM/, @apacheinfo ;
---------------------------------------------------------------------
To unsubscribe, e-mail: embperl-cvs-unsubscr...@perl.apache.org
For additional commands, e-mail: embperl-cvs-h...@perl.apache.org
