- Fix Makefile for U in environment, since wrong U is more common than

  deansification necessity.

git-svn-id: file:///svn/unbound/trunk@2421 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/Makefile.in b/Makefile.in
index 326c9385af847f83b6befc8523179fc82a94f46f..9fcdbc69ab3cd5a5ceb209738799b85e2cb9347b 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -47,6 +47,10 @@ WITH_PYUNBOUND=@WITH_PYUNBOUND@
 PYTHON_SITE_PKG=@PYTHON_SITE_PKG@
 EXPORT_ALL_SYMBOLS=@EXPORT_ALL_SYMBOLS@
 
+# override $U variable which is used by autotools for deansification (for
+# K&R C compilers), but causes problems if $U is defined in the env).
+U=
+
 SWIG=@SWIG@
 YACC=@YACC@
 LEX=@LEX@

diff --git a/doc/Changelog b/doc/Changelog
index 3130c6838fb687d90ba22ea835d4a1446fcdc561..2b868755d2a5f6e68f0c666f4c1dcb5481da6795 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,7 @@
+30 May 2011: Wouter
+       - Fix Makefile for U in environment, since wrong U is more common than
+         deansification necessity.
+
 25 May 2011: Wouter
        - Fix assertion failure when unbound generates an empty error reply
          in response to a query, CVE-2011-1922 VU#531342.