96e0b33
96e0b33
- remove unnecessary stuff which runs httpd during build
96e0b33
- drop unnecessary --libs output from ap?-?-config
96e0b33
96e0b33
--- httpd-2.1.10/support/apxs.in.apxs
96e0b33
+++ httpd-2.1.10/support/apxs.in
96e0b33
@@ -184,34 +184,6 @@
96e0b33
     }
96e0b33
 }
96e0b33
 
96e0b33
-##
96e0b33
-##  Initial shared object support check
96e0b33
-##
96e0b33
-my $httpd = get_vars("sbindir") . "/" . get_vars("progname");
96e0b33
-$httpd = eval qq("$httpd");
96e0b33
-$httpd = eval qq("$httpd");
96e0b33
-my $envvars = get_vars("sbindir") . "/envvars";
96e0b33
-$envvars = eval qq("$envvars");
96e0b33
-$envvars = eval qq("$envvars");
96e0b33
-
96e0b33
-#allow apxs to be run from the source tree, before installation
96e0b33
-if ($0 =~ m:support/apxs$:) {
96e0b33
-    ($httpd = $0) =~ s:support/apxs$::;
96e0b33
-}
96e0b33
-
96e0b33
-unless (-x "$httpd") {
96e0b33
-	error("$httpd not found or not executable");
96e0b33
-	exit 1;
96e0b33
-}
96e0b33
-
96e0b33
-unless (grep /mod_so/, `. $envvars && $httpd -l`) {
96e0b33
-    error("Sorry, no shared object support for Apache");
96e0b33
-    error("available under your platform. Make sure");
96e0b33
-    error("the Apache module mod_so is compiled into");
96e0b33
-    error("your server binary `$httpd'.");
96e0b33
-    exit 1;
96e0b33
-}
96e0b33
-
96e0b33
 sub get_config_vars{
96e0b33
     my ($file, $rh_config) = @_;
96e0b33
 
96e0b33
@@ -433,9 +405,9 @@
96e0b33
 
96e0b33
     if ($opt_p == 1) {
96e0b33
         
96e0b33
-        my $apr_libs=`$apr_config --cflags --ldflags --link-libtool --libs`;
96e0b33
+        my $apr_libs=`$apr_config --cflags --ldflags --link-libtool`;
96e0b33
         chomp($apr_libs);
96e0b33
-        my $apu_libs=`$apu_config --ldflags --link-libtool --libs`;
96e0b33
+        my $apu_libs=`$apu_config --ldflags --link-libtool`;
96e0b33
         chomp($apu_libs);
96e0b33
         
96e0b33
         $opt .= " ".$apu_libs." ".$apr_libs;