- apr_pool_sub_make also fixed

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

diff --git a/apache-apxs.patch b/apache-apxs.patch
index 3229c8ef022d0da400f8b25847c01ce8f2aead89..f4bed195e2af8f342982e12a78e49403aab24fd8 100644 (file)
--- a/apache-apxs.patch
+++ b/apache-apxs.patch
@@ -1,31 +1,40 @@
---- 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";
- }
- 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";
+--- httpd-2.0.46/support/apxs.in.orig  Wed May 21 13:39:52 2003
++++ httpd-2.0.46/support/apxs.in       Thu May 29 07:27:40 2003
+@@ -64,11 +64,11 @@
+ my %config_vars = ();
+ 
+ my $installbuilddir = "@exp_installbuilddir@";
+-get_config_vars("$installbuilddir/config_vars.mk",\%config_vars);
++get_config_vars("/usr/lib/apache/build/config_vars.mk",\%config_vars);
+ 
+ # read the configuration variables once
+ 
+-my $prefix         = get_vars("prefix");
++my $prefix         = "/usr/lib/apache";
+ my $CFG_PREFIX     = $prefix;
+ my $exec_prefix    = get_vars("exec_prefix");
+ my $datadir        = get_vars("datadir");
+@@ -228,9 +228,7 @@
+ my $httpd = get_vars("sbindir") . "/" . get_vars("progname");
+ $httpd = eval qq("$httpd");
+ $httpd = eval qq("$httpd");
+-my $envvars = get_vars("sbindir") . "/envvars";
+-$envvars = eval qq("$envvars");
+-$envvars = eval qq("$envvars");
++my $envvars = "";
+ 
+ #allow apxs to be run from the source tree, before installation
+ if ($0 =~ m:support/apxs$:) {
+@@ -376,9 +374,9 @@
+     exit(1);
  }
  
- ##
+-my $libtool = `$apr_bindir/apr-config --installbuilddir`;
+-chomp($libtool);
+-$libtool = "$libtool/libtool";
++#my $libtool = `$apr_bindir/apr-config --installbuilddir`;
++#chomp($libtool);
++$libtool = "/usr/bin/libtool";
+ 
+ my $apr_includedir = `$apr_bindir/apr-config --includes`;
+ chomp($apr_includedir);