fix bug 349

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

diff --git a/configure b/configure
index e2c2360cb29af96a00aeefe47da1d11f01810dc8..ab840f6863dd6488e418415113b44142eade74c0 100755 (executable)
--- 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 d33ef62088d418f9796274ef7459e4761eb89efa..a8fc9c828ec9ef9ef9398fdeeb991d433f2ffb23 100644 (file)
--- 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 cc920358b11fb14bcfb77bef6cbbdad9b6b5fb5c..c663c34d070a088fc2d7782eb9d4f7488c3438c9 100644 (file)
--- 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.