From 277b1a1c2d5c36fa01b1b117b3d69dff81e7e68a Mon Sep 17 00:00:00 2001
From: Wouter Wijngaards <wouter@nlnetlabs.nl>
Date: Sun, 27 May 2012 20:46:52 +0000
Subject: [PATCH] - Fix debian-bugs-658021: Please enable hardened build flags.

git-svn-id: file:///svn/unbound/trunk@2679 be551aaa-1e26-0410-a405-d3ace91eadb9
---
 acx_python.m4 | 7 +++++--
 configure     | 7 +++++--
 doc/Changelog | 3 +++
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/acx_python.m4 b/acx_python.m4
index 6fa925af1..99ffa254a 100644
--- a/acx_python.m4
+++ b/acx_python.m4
@@ -164,8 +164,11 @@ $ac_distutils_result])
         AC_MSG_CHECKING([consistency of all components of python development environment])
         AC_LANG_PUSH([C])
         # save current global flags
-        LIBS="$ac_save_LIBS $PYTHON_LDFLAGS"
-        CPPFLAGS="$ac_save_CPPFLAGS $PYTHON_CPPFLAGS"
+        ac_save_LIBS="$LIBS"
+        ac_save_CPPFLAGS="$CPPFLAGS"
+
+        LIBS="$LIBS $PYTHON_LDFLAGS"
+        CPPFLAGS="$CPPFLAGS $PYTHON_CPPFLAGS"
         AC_TRY_LINK([
                 #include <Python.h>
         ],[
diff --git a/configure b/configure
index 52713fcfd..a40f76bd3 100755
--- a/configure
+++ b/configure
@@ -15745,8 +15745,11 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
         # save current global flags
-        LIBS="$ac_save_LIBS $PYTHON_LDFLAGS"
-        CPPFLAGS="$ac_save_CPPFLAGS $PYTHON_CPPFLAGS"
+        ac_save_LIBS="$LIBS"
+        ac_save_CPPFLAGS="$CPPFLAGS"
+
+        LIBS="$LIBS $PYTHON_LDFLAGS"
+        CPPFLAGS="$CPPFLAGS $PYTHON_CPPFLAGS"
         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
diff --git a/doc/Changelog b/doc/Changelog
index cf78f70f4..2743e2aca 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+27 May 2012: Wouter
+	- Fix debian-bugs-658021: Please enable hardened build flags.
+
 25 May 2012: Wouter
 	- updated iana ports list.
 
-- 
2.47.2