Limit badness only to IE2-5. See

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

diff --git a/apache-apxs.patch b/apache-apxs.patch
index fdc2bee0a673eb3b63c19858fdc163a8c1d4847c..9cabf9c93c9efbae14b3b43165ac08839c9806b3 100644 (file)
--- a/apache-apxs.patch
+++ b/apache-apxs.patch
@@ -1,25 +1,38 @@
---- apache_1.3.9/src/support/apxs.pl.apxs      Sat Jul 24 14:05:02 1999
-+++ apache_1.3.9/src/support/apxs.pl   Fri Aug 27 11:28:09 1999
-@@ -92,15 +92,15 @@
- ##  Initial shared object 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";
- }
- if (not grep(/mod_so/, `$CFG_SBINDIR/$CFG_TARGET -l`)) {
--    print STDERR "apxs:Error: Sorry, no shared object support for Apache\n";
--    print STDERR "apxs:Error: available under your platform. Make sure\n";
--    print STDERR "apxs:Error: the Apache module mod_so is compiled into\n";
--    print STDERR "apxs:Error: your server binary `$CFG_SBINDIR/$CFG_TARGET'.\n";
--    exit(1);
-+    print STDERR "apxs:Warning: No shared object support for Apache\n";
-+    print STDERR "apxs:Warning: available under your platform. Make sure\n";
-+    print STDERR "apxs:Warning: the Apache module mod_so is compiled into\n";
-+    print STDERR "apxs:Warning: your server binary `$CFG_SBINDIR/$CFG_TARGET'.\n";
-+    print STDERR "apsx: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;
+           }
+@@ -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