Commit c8f1a00d authored by Joe Orton's avatar Joe Orton
Browse files

* configure.in: Substitute MOD_SO_ENABLED variable. 

* support/apxs.in: Use it to eliminate run-time check for whether
httpd has mod_so built-in.

Submitted by: David M. Lee <dmlee crossroads.com>
PR: 40653


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@494781 13f79535-47bb-0310-9956-ffa450edef68
parent 041c890f

CHANGES

+3 −0
Changes for CHANGES: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -2,6 +2,9 @@ 
Changes with Apache 2.3.0

  [Remove entries to the current 2.0 and 2.2 section below, when backported]









  *) apxs: Eliminate run-time check for mod_so.  PR 40653.









     [David M. Lee <dmlee crossroads.com>]

















  *) beos MPM: Create pmain pool and run modules' child_init hooks when









     entering ap_mpm_run(), then destroy pmain when exiting ap_mpm_run().









     [Chris Darroch]


































configure.in



+2
−0



























Changes for configure.in: 2 added lines, 0 removed lines.



Original line number
Diff line number
Diff line







@@ -540,7 +540,9 @@ if test "$enable_so" = "yes"; then







      HTTPD_LDFLAGS="$HTTPD_LDFLAGS --main=$abs_srcdir/server/main.o --core-dll=$abs_srcdir/apachecore.dll"









      SH_LDFLAGS="$SH_LDFLAGS --core-dll=$abs_srcdir/apachecore.dll"









  esac









  MOD_SO_ENABLED=yes









fi









AC_SUBST(MOD_SO_ENABLED)



















APACHE_SUBST(PRE_SHARED_CMDS)









APACHE_SUBST(POST_SHARED_CMDS)


































support/apxs.in



+2
−19



























Changes for support/apxs.in: 2 added lines, 19 removed lines.



Original line number
Diff line number
Diff line







@@ -187,28 +187,11 @@ if (@opt_S) {







##









##  Initial shared object support check









##









my $httpd = get_vars("sbindir") . "/" . get_vars("progname");









$httpd = eval qq("$httpd");









$httpd = eval qq("$httpd");









my $envvars = get_vars("sbindir") . "/envvars";









$envvars = eval qq("$envvars");









$envvars = eval qq("$envvars");



















#allow apxs to be run from the source tree, before installation









if ($0 =~ m:support/apxs$:) {









    ($httpd = $0) =~ s:support/apxs$::;









}



















unless (-x "$httpd") {









	error("$httpd not found or not executable");









	exit 1;









}



















unless (grep /mod_so/, `. $envvars && $httpd -l`) {









unless ("@MOD_SO_ENABLED@" eq "yes") {









    error("Sorry, no shared object support for Apache");









    error("available under your platform. Make sure");









    error("the Apache module mod_so is compiled into");









    error("your server binary `$httpd'.");









    error("the server binary.");









    exit 1;









}