[Pkg-apache-commits] [SCM] Debian packaging for apache2 (Apache HTTPD 2.x) branch, next, updated. cb189a0529448b97bc2ab9db3f7bd24f9b435167

[Stefan Fritsch]

The following commit has been merged in the next branch:
commit b72b1d9790e0e200f4fcd891b4247c6ba0674f03
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Sun Apr 15 20:37:33 2012 +0200

    use CPPFLAGS in apxs, too

diff --git a/debian/patches/customize_apxs.patch b/debian/patches/customize_apxs.patch
index 233333c..2d44fe9 100644
--- a/debian/patches/customize_apxs.patch
+++ b/debian/patches/customize_apxs.patch
@@ -6,12 +6,16 @@ Forwarded: not-needed
 Author: Stefan Fritsch <sf at debian.org>
 Last-Update: 2012-03-17
 
---- a/support/apxs.in
-+++ b/support/apxs.in
-@@ -39,6 +39,8 @@
+Index: apache2/support/apxs.in
+===================================================================
+--- apache2.orig/support/apxs.in
++++ apache2/support/apxs.in
+@@ -38,7 +38,9 @@
+ my $CFG_TARGET     = get_vars("progname");
  my $CFG_SYSCONFDIR = get_vars("sysconfdir");
  my $CFG_CFLAGS     = join ' ', map { get_vars($_) }
-   qw(SHLTCFLAGS CFLAGS NOTEST_CPPFLAGS EXTRA_CPPFLAGS EXTRA_CFLAGS);
+-  qw(SHLTCFLAGS CFLAGS NOTEST_CPPFLAGS EXTRA_CPPFLAGS EXTRA_CFLAGS);
++  qw(SHLTCFLAGS CFLAGS CPPFLAGS NOTEST_CPPFLAGS EXTRA_CPPFLAGS EXTRA_CFLAGS);
 +my $CFG_LDFLAGS    = join ' ', map { get_vars($_) }
 +  qw(LDFLAGS NOTEST_LDFLAGS SH_LDFLAGS);
  my $includedir     = get_vars("includedir");

-- 
Debian packaging for apache2 (Apache HTTPD 2.x)