* 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

diff --git a/CHANGES b/CHANGES
index ac1904f8bd48ea281e2b6260ed2ca0c720239ee3..ac8fc569cc2d11467ed5497b7f9bafae0ff334a9 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -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]

diff --git a/configure.in b/configure.in
index 336ea6a63b4f47172252b1ca9d75ad2dc6e5c37a..e906f681038145e98e056baf50b53f0707f6eb09 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -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)

diff --git a/support/apxs.in b/support/apxs.in
index 1dcc82ede464bbb4c75d0afa41ea88a4ca272c89..385d71e5ca660f2659ccef795de3d689c2c8a22d 100644 (file)
--- a/support/apxs.in
+++ b/support/apxs.in
@@ -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;
 }