[med-svn] [igraph] 03/05: fix incorrect CPPFLAGS handling in configure script

[Tamás Nepusz]

This is an automated email from the git hooks/post-receive script.

ntamas-guest pushed a commit to branch master
in repository igraph.

commit 2880b13750cc834123fb6d6d42511f29ee998c46
Author: Tamas Nepusz <ntamas at gmail.com>
Date:   Fri Aug 29 08:36:12 2014 +0000

    fix incorrect CPPFLAGS handling in configure script
---
 debian/changelog                      |  2 ++
 debian/patches/cppflags_restore.patch | 18 ++++++++++++++++++
 debian/patches/series                 |  1 +
 3 files changed, 21 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index b3434bf..d5adfe2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ igraph (0.7.1-2) UNRELEASED; urgency=medium
     dh_auto_test work
   * debian/patches/fix_failing_tests.patch added to fix some failing
     test cases 
+  * debian/patches/cppflags_restore.patch added to fix incorrect
+    handling of CPPFLAGS in the configure script
 
  -- Andreas Tille <tille at debian.org>  Tue, 19 Aug 2014 11:55:17 +0200
 
diff --git a/debian/patches/cppflags_restore.patch b/debian/patches/cppflags_restore.patch
new file mode 100644
index 0000000..c4942fa
--- /dev/null
+++ b/debian/patches/cppflags_restore.patch
@@ -0,0 +1,18 @@
+Author: Tamas Nepusz <ntamas at gmail.com>
+Last-Changed: Wed, 27 Aug 2014 21:39:48 +0100
+Description: Restore CPPFLAGS properly after the detection of libxml
+Bug: https://github.com/igraph/igraph/issues/674
+Applied-Upstream: 0.7.2, https://github.com/igraph/igraph/commit/a1a333bb
+
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -146,7 +146,7 @@
+       HAVE_LIBXML=1
+       AC_DEFINE([HAVE_LIBXML], [1], [Define to 1 if you have the libxml2 libraries installed])
+ 	  CFLAGS="${OLDCFLAGS} ${XML2_CFLAGS}"
+-      CPPFLAGS="${OLDCFLAGS} ${XML2_CFLAGS}"
++      CPPFLAGS="${OLDCPPFLAGS} ${XML2_CFLAGS}"
+       AC_SUBST(XML2_LIBS)
+       AC_SUBST(XML2_CFLAGS)
+     ], [
diff --git a/debian/patches/series b/debian/patches/series
index 9a22185..60a1d77 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 remove_unused_test_target.patch
 fix_test_cases.patch
+cppflags_restore.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/igraph.git