- conflict before package split

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

diff --git a/apache1-apxs.patch b/apache1-apxs.patch
index 3229c8ef022d0da400f8b25847c01ce8f2aead89..85935223d5db355b49db4b7c2bbb71ee22bc60a5 100644 (file)
--- a/apache1-apxs.patch
+++ b/apache1-apxs.patch
@@ -3,29 +3,29 @@
 @@ -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 @@
+ #
+ # Copyright 1999-2004 The Apache Software Foundation
+ #
+@@ -220,15 +220,14 @@
  ##  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";
++    print STDERR "apxs:Note: $CFG_SBINDIR/$CFG_TARGET not found or not executable\n";
  }
- if (not grep(/mod_so/, `$CFG_SBINDIR/$CFG_TARGET -l`)) {
+-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);
++else { if (not grep(/mod_so/, `$CFG_SBINDIR/$CFG_TARGET -l`)) {
 +    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";
++    print STDERR "apxs:Warning: Continuing anyway...\n"; }
  }
  
  ##