From: Wouter Wijngaards <wouter@nlnetlabs.nl>
Date: Mon, 30 May 2011 11:52:14 +0000 (+0000)
Subject: - Fix Makefile for U in environment, since wrong U is more common than
X-Git-Tag: release-1.4.11rc1~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=62eea8745555b58e0667760d0232f56c54f624a0;p=thirdparty%2Funbound.git

- 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 326c9385a..9fcdbc69a 100644
--- 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 3130c6838..2b868755d 100644
--- 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.