From: Wouter Wijngaards <wouter@nlnetlabs.nl>
Date: Mon, 25 Oct 2010 07:44:33 +0000 (+0000)
Subject: +        - Configure errors if ldns is not found.
X-Git-Tag: release-1.4.7rc1~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d0f2287d44d7ad584db25c5962217e83fac273d1;p=thirdparty%2Funbound.git

+        - 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 ccbff0b61..abb43c943 100755
--- 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 68adea6ed..c625b97e4 100644
--- 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 94eb6cc95..1c52aa835 100644
--- 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.