- Up to 2.4.52

[packages/apache.git] / apache-apxs.patch

diff --git a/apache-apxs.patch b/apache-apxs.patch
index 7ee05ad5f39e894e694ab40a89bf2e82870cce7d..309ee24e982302d6f9a383b4450ed40122b288bf 100644 (file)
--- a/apache-apxs.patch
+++ b/apache-apxs.patch
@@ -25,34 +25,10 @@
                print STDERR "apxs:Error: no config variable $var\n";
                &usage;
            }
-@@ -199,11 +201,10 @@
-     ($httpd = $0) =~ s:support/apxs$::;
- }
- 
--unless (-x "$httpd") {
--      error("$httpd not found or not executable");
--      exit 1;
-+if (not -x "$httpd") {
-+      print STDERR "Note: $httpd not found or not executable.\n";
- }
--
-+else {
- unless (grep /mod_so/, `. $envvars && $httpd -l`) {
-     error("Sorry, no shared object support for Apache");
-     error("available under your platform. Make sure");
-@@ -211,7 +212,7 @@
-     error("your server binary `$httpd'.");
-     exit 1;
- }
--
-+}
- sub get_config_vars{
-     my ($file, $rh_config) = @_;
- 
 @@ -479,8 +480,8 @@
          $t =~ s|\.[^./\\]+$|\.so|;
          if ($opt_i) {
-           push(@cmds, "$installbuilddir/instdso.sh SH_LIBTOOL='" .
+           push(@cmds, $destdir . "$installbuilddir/instdso.sh SH_LIBTOOL='" .
 -                 "$libtool' $f $CFG_LIBEXECDIR");
 -          push(@cmds, "chmod 755 $CFG_LIBEXECDIR/$t");
 +                 "$libtool' $f $CFG_DESTDIR$CFG_LIBEXECDIR");