From 5e2a137562f62fe81c977616a040076e26719d89 Mon Sep 17 00:00:00 2001
From: Wouter Wijngaards <wouter@nlnetlabs.nl>
Date: Wed, 19 Jan 2011 06:59:24 +0000
Subject: [PATCH] fix bug 349

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

diff --git a/configure b/configure
index e2c2360cb..ab840f686 100755
--- a/configure
+++ b/configure
@@ -16490,9 +16490,9 @@ use_ldns_builtin="no"
 if test "${with_ldns+set}" = set; then :
   withval=$with_ldns;  specialldnsdir="$withval"
 	if test "$withval" != "yes"; then
-		if test "$withval" != ""; then
+		if test "$withval" != "/usr" -a "$withval" != ""; then
 			CPPFLAGS="-I$withval/include $CPPFLAGS"
-			LDFLAGS="-L$withval -L$withval/lib $LDFLAGS"
+			LDFLAGS="-L$withval/lib $LDFLAGS"
 
 	if test "x$enable_rpath" = xyes; then
 		if echo "$withval/lib" | grep "^/" >/dev/null; then
diff --git a/configure.ac b/configure.ac
index d33ef6208..a8fc9c828 100644
--- a/configure.ac
+++ b/configure.ac
@@ -700,9 +700,9 @@ AC_ARG_WITH(ldns, AC_HELP_STRING([--with-ldns=PATH],
 	[specify prefix of path of ldns library to use]), 
 	[ specialldnsdir="$withval"
 	if test "$withval" != "yes"; then
-		if test "$withval" != ""; then
+		if test "$withval" != "/usr" -a "$withval" != ""; then
 			CPPFLAGS="-I$withval/include $CPPFLAGS"
-			LDFLAGS="-L$withval -L$withval/lib $LDFLAGS"
+			LDFLAGS="-L$withval/lib $LDFLAGS"
 			ACX_RUNTIME_PATH_ADD([$withval/lib])
 		fi
 		ldnsdir="$withval"
diff --git a/doc/Changelog b/doc/Changelog
index cc920358b..c663c34d0 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+19 January 2011: Wouter
+	- fix bug#349: no -L/usr for ldns.
+
 18 January 2011: Wouter
 	- ldns 1.6.8 tarball included.
 
-- 
2.47.2