+ - Configure errors if ldns is not found.

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

diff --git a/configure b/configure
index ccbff0b6142286464c3d1958588295be66ed8021..abb43c94316f0b96710a3628d4231f0c2c8eb7f1 100755 (executable)
--- a/configure
+++ b/configure
@@ -16480,9 +16480,10 @@ use_ldns_builtin="no"
 # Check whether --with-ldns was given.
 if test "${with_ldns+set}" = set; then :
   withval=$with_ldns;  specialldnsdir="$withval"
-       if test "$withval" != ""; then
-               CPPFLAGS="-I$withval/include $CPPFLAGS"
-               LDFLAGS="-L$withval -L$withval/lib $LDFLAGS"
+       if test "$withval" != "yes"; then
+               if test "$withval" != ""; then
+                       CPPFLAGS="-I$withval/include $CPPFLAGS"
+                       LDFLAGS="-L$withval -L$withval/lib $LDFLAGS"
 
        if test "x$enable_rpath" = xyes; then
                if echo "$withval/lib" | grep "^/" >/dev/null; then
@@ -16490,9 +16491,10 @@ if test "${with_ldns+set}" = set; then :
                fi
        fi
 
-       fi
-       ldnsdir="$withval"
+               fi
+               ldnsdir="$withval"
 
+       fi
 
 fi
 
@@ -16623,7 +16625,7 @@ done
            -a $ac_cv_func_ldns_key_EVP_load_gost_id = yes; then
                    :
        else
-           use_ldns_builtin="yes"
+           as_fn_error "No ldns library found (or not recent); install or update ldns library, use --with-ldns=path or --with-ldns-builtin" "$LINENO" 5
        fi
 fi
 

diff --git a/configure.ac b/configure.ac
index 68adea6edcf1573485663b0a86782fbc476a56b0..c625b97e413f14dcff8b6277b225987a9cfff45d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -701,13 +701,15 @@ use_ldns_builtin="no"
 AC_ARG_WITH(ldns, AC_HELP_STRING([--with-ldns=PATH], 
        [specify prefix of path of ldns library to use]), 
        [ specialldnsdir="$withval"
-       if test "$withval" != ""; then
-               CPPFLAGS="-I$withval/include $CPPFLAGS"
-               LDFLAGS="-L$withval -L$withval/lib $LDFLAGS"
-               ACX_RUNTIME_PATH_ADD([$withval/lib])
+       if test "$withval" != "yes"; then
+               if test "$withval" != ""; then
+                       CPPFLAGS="-I$withval/include $CPPFLAGS"
+                       LDFLAGS="-L$withval -L$withval/lib $LDFLAGS"
+                       ACX_RUNTIME_PATH_ADD([$withval/lib])
+               fi
+               ldnsdir="$withval"
+               AC_SUBST(ldnsdir)
        fi
-       ldnsdir="$withval"
-       AC_SUBST(ldnsdir)
 ])
 
 AC_ARG_WITH(ldns-builtin, AC_HELP_STRING([--with-ldns-builtin], 
@@ -755,7 +757,7 @@ if test "$use_ldns_builtin" = "no"; then
            dnl ldns was found
            :
        else
-           use_ldns_builtin="yes"
+           AC_MSG_ERROR([No ldns library found (or not recent); install or update ldns library, use --with-ldns=path or --with-ldns-builtin])
        fi
 fi
 

diff --git a/doc/Changelog b/doc/Changelog
index 94eb6cc95c3902e329b953014d7df55e2ace1a27..1c52aa83520f5ce7426fcdadececd854c78f0d47 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+25 October 2010: Wouter
+       - Configure errors if ldns is not found.
+
 22 October 2010: Wouter
        - Windows 7 fix for the installer.