summaryrefslogtreecommitdiffstats
path: root/httpd-2.3.8-apxs.patch
diff options
context:
space:
mode:
Diffstat (limited to 'httpd-2.3.8-apxs.patch')
-rw-r--r--httpd-2.3.8-apxs.patch57
1 files changed, 0 insertions, 57 deletions
diff --git a/httpd-2.3.8-apxs.patch b/httpd-2.3.8-apxs.patch
deleted file mode 100644
index e30702f..0000000
--- a/httpd-2.3.8-apxs.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff -up httpd-2.3.8/support/apxs.in.apxs httpd-2.3.8/support/apxs.in
---- httpd-2.3.8/support/apxs.in.apxs 2010-06-22 19:12:44.000000000 +0200
-+++ httpd-2.3.8/support/apxs.in 2010-10-01 18:32:32.292091906 +0200
-@@ -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