X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=apache-apxs.patch;h=7ee05ad5f39e894e694ab40a89bf2e82870cce7d;hb=9d54f7b0e3d34e771ef1949a03902ee2e87d7230;hp=3229c8ef022d0da400f8b25847c01ce8f2aead89;hpb=ef10a487636332d179a2cca4578b53420c29eeec;p=packages%2Fapache.git

diff --git a/apache-apxs.patch b/apache-apxs.patch
index 3229c8e..7ee05ad 100644
--- a/apache-apxs.patch
+++ b/apache-apxs.patch
@@ -1,31 +1,62 @@
---- 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.3/support/apxs.in-orig	2006-11-01 00:59:27.000000000 +0100
++++ httpd-2.2.3/support/apxs.in	2006-11-01 00:59:54.000000000 +0100
+@@ -35,6 +35,7 @@
+ my $exec_prefix    = get_vars("exec_prefix");
+ my $datadir        = get_vars("datadir");
+ my $localstatedir  = get_vars("localstatedir");
++my $libdir	   = get_vars("libdir");
+ my $CFG_TARGET     = get_vars("progname");
+ my $CFG_SYSCONFDIR = get_vars("sysconfdir");
+ my $CFG_CFLAGS     = join ' ', map { get_vars($_) }
+@@ -44,6 +45,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 +173,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 +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";
  }
- 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 +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='" .
+-                 "$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