- updated manual files

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

diff --git a/apache-apxs.patch b/apache-apxs.patch
index 3229c8ef022d0da400f8b25847c01ce8f2aead89..2c025c6774d5bac8a044a82af0d689da8f5673a5 100644 (file)
--- a/apache-apxs.patch
+++ b/apache-apxs.patch
@@ -1,31 +1,26 @@
---- apache_1.3.11/src/support/apxs.pl.apxs     Thu Dec 16 17:10:30 1999
-+++ apache_1.3.11/src/support/apxs.pl  Tue Jan 25 01:19:16 2000
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- ## ====================================================================
- ## Copyright (c) 1998-1999 The Apache Group.  All rights reserved.
- ##
-@@ -220,15 +220,15 @@
- ##  Initial DSO support check
- ##
- if (not -x "$CFG_SBINDIR/$CFG_TARGET") {
--    print STDERR "apxs:Error: $CFG_SBINDIR/$CFG_TARGET not found or not executable\n";
--    exit(1);
-+    print STDERR "apxs:Warning: $CFG_SBINDIR/$CFG_TARGET not found or not executable\n";
-+    print STDERR "apxs:Warning: Continuing anyway...\n";
+--- httpd-2.0.50/support/apxs.in.orig  2004-07-25 21:25:37.955097000 +0000
++++ httpd-2.0.50/support/apxs.in       2004-07-25 22:25:01.093725664 +0000
+@@ -198,11 +198,10 @@
+     ($httpd = $0) =~ s:support/apxs$::;
  }
- if (not grep(/mod_so/, `$CFG_SBINDIR/$CFG_TARGET -l`)) {
--    print STDERR "apxs:Error: Sorry, no DSO support for Apache available\n";
--    print STDERR "apxs:Error: under your platform. Make sure the Apache\n";
--    print STDERR "apxs:Error: module mod_so is compiled into your server\n";
--    print STDERR "apxs:Error: binary `$CFG_SBINDIR/$CFG_TARGET'.\n";
--    exit(1);
-+    print STDERR "apxs:Warning: Sorry, no DSO support for Apache available\n";
-+    print STDERR "apxs:Warning: under your platform. Make sure the Apache\n";
-+    print STDERR "apxs:Warning: module mod_so is compiled into your server\n";
-+    print STDERR "apxs:Warning: binary `$CFG_SBINDIR/$CFG_TARGET'.\n";
-+    print STDERR "apxs:Warning: Continuing anyway...\n";
+ 
+-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");
+@@ -210,7 +209,7 @@
+     error("your server binary `$httpd'.");
+     exit 1;
  }
+-
++}
+ sub get_config_vars{
+     my ($file, $rh_config) = @_;
  
- ##