- rel 2

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

diff --git a/apache-apxs.patch b/apache-apxs.patch
index 3229c8ef022d0da400f8b25847c01ce8f2aead89..6299bb70d45e5932f6e2288dfa60b2104c707927 100644 (file)
--- a/apache-apxs.patch
+++ b/apache-apxs.patch
@@ -1,31 +1,54 @@
---- 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.2.0/support/apxs.in.save   2005-06-10 12:18:14.000000000 +0300
++++ httpd-2.2.0/support/apxs.in        2006-01-02 15:08:43.000000000 +0200
+@@ -44,6 +44,7 @@
+ my $CFG_CC         = get_vars("CC");
+ my $libexecdir     = get_vars("libexecdir");
+ my $CFG_LIBEXECDIR = eval qq("$libexecdir");
++my $CFG_DESTDIR    = '';
+ my $sbindir        = get_vars("sbindir");
+ my $CFG_SBINDIR    = eval qq("$sbindir");
+ my $ltflags        = $ENV{'LTFLAGS'};
+@@ -171,7 +172,7 @@
+           my ($val) = $2;
+           my $oldval = eval "\$CFG_$var";
+ 
+-          unless ($var and $oldval) {
++          unless ($var and defined $oldval) {
+               print STDERR "apxs:Error: no config variable $var\n";
+               &usage;
+           }
+@@ -199,11 +200,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";
  }
- 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";
+-
++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 +211,7 @@
+     error("your server binary `$httpd'.");
+     exit 1;
  }
+-
++}
+ sub get_config_vars{
+     my ($file, $rh_config) = @_;
+ 
+@@ -479,8 +479,8 @@
+         $t =~ s|\.[^./\\]+$|\.so|;
+         if ($opt_i) {
+           push(@cmds, "$installbuilddir/instdso.sh SH_LIBTOOL='" .
+-                 "$libtool' $f $CFG_LIBEXECDIR");
+-          push(@cmds, "chmod 755 $CFG_LIBEXECDIR/$t");
++                 "$libtool' $f $CFG_DESTDIR$CFG_LIBEXECDIR");
++          push(@cmds, "chmod 755 $CFG_DESTDIR$CFG_LIBEXECDIR/$t");
+         }
  
- ##
+         #   determine module symbolname and filename