- add flush-logs target

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

--- 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";
 }
-
+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