mirror of
https://github.com/apache/httpd.git
synced 2026-01-06 09:01:14 +03:00
finish getting apxs to work with a binary build
it now picks up any necessary ld environment variables from the envvars file when invoking "httpd -l" to verify that mod_so was included in the build git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94865 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
@@ -223,6 +223,9 @@ if (@opt_S) {
|
||||
my $httpd = get_vars("sbindir") . "/" . get_vars("progname");
|
||||
$httpd = eval qq("$httpd");
|
||||
$httpd = eval qq("$httpd");
|
||||
my $envvars = get_vars("bindir") . "/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$:) {
|
||||
@@ -234,7 +237,7 @@ unless (-x "$httpd") {
|
||||
exit 1;
|
||||
}
|
||||
|
||||
unless (grep /mod_so/, `$httpd -l`) {
|
||||
unless (grep /mod_so/, `. $envvars && $httpd -l`) {
|
||||
error("Sorry, no shared object support for Apache");
|
||||
error("available under your platform. Make sure");
|
||||
error("the Apache module mod_so is compiled into");
|
||||
|
||||
Reference in New Issue
Block a user