- updated to work with 2.0.46

Changed files:
    apache-apxs.patch -> 1.4

diff --git a/apache-apxs.patch b/apache-apxs.patch
index d2a79f6a47e314bc3582e0ec3aa4615cb343a63f..f4bed195e2af8f342982e12a78e49403aab24fd8 100644 (file)
--- a/apache-apxs.patch
+++ b/apache-apxs.patch
@@ -1,5 +1,5 @@
---- httpd-2.0.43/support/apxs.in.wiget Thu Sep 19 07:43:16 2002
-+++ httpd-2.0.43/support/apxs.in       Fri Oct  4 11:35:05 2002
+--- 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 = ();
  
@@ -25,30 +25,16 @@
  
  #allow apxs to be run from the source tree, before installation
  if ($0 =~ m:support/apxs$:) {
-@@ -424,7 +422,7 @@
-         $la =~ s|\.c$|.la|;
-         my $o = $s;
-         $o =~ s|\.c$|.o|;
--        push(@cmds, "$installbuilddir/libtool $ltflags --mode=compile $CFG_CC $cflags -I$CFG_INCLUDEDIR $opt -c -o $lo $s && touch $slo");
-+        push(@cmds, "/usr/bin/libtool $ltflags --mode=compile $CFG_CC $cflags -I$CFG_INCLUDEDIR $opt -c -o $lo $s && touch $slo");
-         unshift(@objs, $lo);
-     }
- 
-@@ -473,7 +471,7 @@
-         $opt .= " -rpath $CFG_LIBEXECDIR -module -avoid-version";
-     }
- 
--    push(@cmds, "$installbuilddir/libtool $ltflags --mode=link $CFG_CC -o $dso_file $opt $lo");
-+    push(@cmds, "/usr/bin/libtool $ltflags --mode=link $CFG_CC -o $dso_file $opt $lo");
- 
-     #   execute the commands
-     &execute_cmds(@cmds);
-@@ -505,7 +503,7 @@
-         $t =~ s|\.la$|\.so|;
-         if ($opt_i) {
-           push(@cmds, "$installbuilddir/instdso.sh SH_LIBTOOL='" .
--                 "$installbuilddir/libtool' $f $CFG_LIBEXECDIR");
-+                 "/usr/bin/libtool' $f $CFG_LIBEXECDIR");
-           push(@cmds, "chmod 755 $CFG_LIBEXECDIR/$t");
-         }
- 
+@@ -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);