From: Mark Andrews <marka@isc.org>
Date: Mon, 31 Mar 2014 22:51:14 +0000 (+1100)
Subject: 3797.   [port]          netbsd: geoip support probing was broken. [RT #35642]
X-Git-Tag: v9.10.0rc1~22
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=568de8123acb1a94e2d7bfe9cc5eb5d099f6c1f5;p=thirdparty%2Fbind9.git

3797.   [port]          netbsd: geoip support probing was broken. [RT #35642]
---

diff --git a/CHANGES b/CHANGES
index f775e19dd87..886aefa0dd4 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+3797.	[port]		netbsd: geoip support probing was broken. [RT #35642]
+
 3796.	[bug]		Register dns and pkcs#11 error codes. [RT #35629]
 
 3795.	[bug]		Make named-checkconf detect raw masterfiles for
diff --git a/configure b/configure
index 4c9797ededb..074391866cd 100755
--- a/configure
+++ b/configure
@@ -13518,12 +13518,11 @@ $as_echo "disabled" >&6; }
 		then
 			CFLAGS="$CFLAGS -I$use_geoip/include"
 			CPPFLAGS="$CPPFLAGS -I$use_geoip/include"
+			LIBS="$LIBS -L$use_geoip/lib"
 			case "$host_os" in
 				netbsd*|openbsd*|solaris*)
 					LIBS="$LIBS -Wl,-rpath=$use_geoip/lib"
 					;;
-				*)
-					LIBS="$LIBS -L$use_geoip/lib"
 			esac
 		elif test "$use_geoip" = "yes"
 		then
diff --git a/configure.in b/configure.in
index e1978078c56..bd24b280311 100644
--- a/configure.in
+++ b/configure.in
@@ -644,12 +644,11 @@ case "$use_geoip" in
 		then
 			CFLAGS="$CFLAGS -I$use_geoip/include"
 			CPPFLAGS="$CPPFLAGS -I$use_geoip/include"
+			LIBS="$LIBS -L$use_geoip/lib"
 			case "$host_os" in
 				netbsd*|openbsd*|solaris*)
 					LIBS="$LIBS -Wl,-rpath=$use_geoip/lib"
 					;;
-				*)
-					LIBS="$LIBS -L$use_geoip/lib"
 			esac
 		elif test "$use_geoip" = "yes"
 		then