- don't fail if no httpd installed

Changed files:
    apache-apxs.patch -> 1.5

diff --git a/apache-apxs.patch b/apache-apxs.patch
index f4bed195e2af8f342982e12a78e49403aab24fd8..2c025c6774d5bac8a044a82af0d689da8f5673a5 100644 (file)
--- a/apache-apxs.patch
+++ b/apache-apxs.patch
@@ -1,40 +1,26 @@
---- 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);
+--- httpd-2.0.50/support/apxs.in.orig  2004-07-25 21:25:37.955097000 +0000
++++ httpd-2.0.50/support/apxs.in       2004-07-25 22:25:01.093725664 +0000
+@@ -198,11 +198,10 @@
+     ($httpd = $0) =~ s:support/apxs$::;
  }
  
--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";
+-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";
+ }
+-
++else {
+ unless (grep /mod_so/, `. $envvars && $httpd -l`) {
+     error("Sorry, no shared object support for Apache");
+     error("available under your platform. Make sure");
+@@ -210,7 +209,7 @@
+     error("your server binary `$httpd'.");
+     exit 1;
+ }
+-
++}
+ sub get_config_vars{
+     my ($file, $rh_config) = @_;
  
- my $apr_includedir = `$apr_bindir/apr-config --includes`;
- chomp($apr_includedir);