* 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

1 files changed, 2 insertions, 19 deletions

diff --git a/support/apxs.in b/support/apxs.in
index 1dcc82ede4..385d71e5ca 100644
--- 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;
 }