From e6cc70b01f04726bec55199ef2cfe9d29a5924b9 Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Tue, 21 Aug 2012 18:18:24 +0200
Subject: httpd: sync with rawhide, update to 2.4.3

---
 httpd-2.4.1-apxs.patch | 56 --------------------------------------------------
 1 file changed, 56 deletions(-)
 delete mode 100644 httpd-2.4.1-apxs.patch

(limited to 'httpd-2.4.1-apxs.patch')

diff --git a/httpd-2.4.1-apxs.patch b/httpd-2.4.1-apxs.patch
deleted file mode 100644
index 62003ec..0000000
--- a/httpd-2.4.1-apxs.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- httpd-2.4.1/support/apxs.in.apxs
-+++ httpd-2.4.1/support/apxs.in
-@@ -25,7 +25,18 @@ package apxs;
- 
- my %config_vars = ();
- 
--my $installbuilddir = "@exp_installbuilddir@";
-+# Awful hack to make apxs libdir-agnostic:
-+my $pkg_config = "/usr/bin/pkg-config";
-+if (! -x "$pkg_config") {
-+    error("$pkg_config not found!");
-+    exit(1);
-+}
-+
-+my $libdir = `pkg-config --variable=libdir apr-1`;
-+chomp $libdir;
-+
-+my $installbuilddir = $libdir . "/httpd/build";
-+
- get_config_vars("$installbuilddir/config_vars.mk",\%config_vars);
- 
- # read the configuration variables once
-@@ -273,7 +284,7 @@ if ($opt_g) {
-     $data =~ s|%NAME%|$name|sg;
-     $data =~ s|%TARGET%|$CFG_TARGET|sg;
-     $data =~ s|%PREFIX%|$prefix|sg;
--    $data =~ s|%INSTALLBUILDDIR%|$installbuilddir|sg;
-+    $data =~ s|%LIBDIR%|$libdir|sg;
- 
-     my ($mkf, $mods, $src) = ($data =~ m|^(.+)-=#=-\n(.+)-=#=-\n(.+)|s);
- 
-@@ -450,11 +461,11 @@ if ($opt_c) {
- 
-     if ($opt_p == 1) {
-         
--        my $apr_libs=`$apr_config --cflags --ldflags --link-libtool --libs`;
-+        my $apr_libs=`$apr_config --cflags --ldflags --link-libtool`;
-         chomp($apr_libs);
-         my $apu_libs="";
-         if ($apr_major_version < 2) {
--            $apu_libs=`$apu_config --ldflags --link-libtool --libs`;
-+            $apu_libs=`$apu_config --ldflags --link-libtool`;
-             chomp($apu_libs);
-         }
-         
-@@ -669,8 +680,8 @@ __DATA__
- 
- builddir=.
- top_srcdir=%PREFIX%
--top_builddir=%PREFIX%
--include %INSTALLBUILDDIR%/special.mk
-+top_builddir=%LIBDIR%/httpd
-+include %LIBDIR%/httpd/build/special.mk
- 
- #   the used tools
- APXS=apxs
-- 
cgit