svn commit: r523626 - in head/dns: bind911/files bind914/files

[Mathieu Arnold]

Author: mat
Date: Mon Jan 20 14:48:03 2020
New Revision: 523626
URL: https://svnweb.freebsd.org/changeset/ports/523626

Log:
  Fix build when devel/jsoncpp is installed.
  
  PR:		243387
  Submitted by:	dron kubstu ru

Modified:
  head/dns/bind911/files/patch-configure   (contents, props changed)
  head/dns/bind914/files/patch-configure   (contents, props changed)

Modified: head/dns/bind911/files/patch-configure
==============================================================================
--- head/dns/bind911/files/patch-configure	Mon Jan 20 14:47:54 2020	(r523625)
+++ head/dns/bind911/files/patch-configure	Mon Jan 20 14:48:03 2020	(r523626)
@@ -1,5 +1,6 @@
 - Axe the kerberos/gssapi discovery code to make sure it uses the correct
   libraries.
+- Make sure only json-c is detected.
 - Cleanup the BDB discovery code to find more recent versions.
 
 --- configure.orig	2019-12-12 05:17:55 UTC
@@ -83,7 +84,47 @@
  		DNS_GSSAPI_LIBS="$LIBS"
  
  		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: using GSSAPI from $use_gssapi/lib and $use_gssapi/include" >&5
-@@ -24683,7 +24625,7 @@ $as_echo "" >&6; }
+@@ -18438,7 +18380,7 @@ case "$use_libjson" in
+ 	auto|yes)
+ 		for d in /usr /usr/local /opt/local
+ 		do
+-			if test -f "${d}/include/json/json.h"
++			if test -f "${d}/include/json-c/json.h"
+ 			then
+ 				if test ${d} != /usr
+ 				then
+@@ -18446,29 +18388,16 @@ case "$use_libjson" in
+ 					LIBS="$LIBS -L${d}/lib"
+ 				fi
+ 				have_libjson="yes"
+-			elif test -f "${d}/include/json-c/json.h"
+-			then
+-				if test ${d} != /usr
+-				then
+-					libjson_cflags="-I ${d}/include"
+-					LIBS="$LIBS -L${d}/lib"
+-				fi
+-				have_libjson="yes"
+ 				have_libjson_c="yes"
+ 			fi
+ 		done
+ 		;;
+ 	*)
+-		if test -f "${use_libjson}/include/json/json.h"
++		if test -f "${use_libjson}/include/json-c/json.h"
+ 		then
+ 			libjson_cflags="-I${use_libjson}/include"
+ 			LIBS="$LIBS -L${use_libjson}/lib"
+ 			have_libjson="yes"
+-		elif test -f "${use_libjson}/include/json-c/json.h"
+-		then
+-			libjson_cflags="-I${use_libjson}/include"
+-			LIBS="$LIBS -L${use_libjson}/lib"
+-			have_libjson="yes"
+ 			have_libjson_c="yes"
+ 		else
+ 			as_fn_error $? "$use_libjson/include/json{,-c}/json.h not found." "$LINENO" 5
+@@ -24683,7 +24612,7 @@ $as_echo "" >&6; }
  			# Check other locations for includes.
  			# Order is important (sigh).
  

Modified: head/dns/bind914/files/patch-configure
==============================================================================
--- head/dns/bind914/files/patch-configure	Mon Jan 20 14:47:54 2020	(r523625)
+++ head/dns/bind914/files/patch-configure	Mon Jan 20 14:48:03 2020	(r523626)
@@ -1,5 +1,6 @@
 - Axe the kerberos/gssapi discovery code to make sure it uses the correct
   libraries.
+- Make sure only json-c is detected.
 - Cleanup the BDB discovery code to find more recent versions.
 
 --- configure.orig	2019-12-12 06:12:17 UTC
@@ -83,7 +84,47 @@
  		DNS_GSSAPI_LIBS="$LIBS"
  
  		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: using GSSAPI from $use_gssapi/lib and $use_gssapi/include" >&5
-@@ -21375,7 +21317,7 @@ $as_echo "" >&6; }
+@@ -17218,7 +17160,7 @@ case "$use_libjson" in
+ 	auto|yes)
+ 		for d in /usr /usr/local /opt/local
+ 		do
+-			if test -f "${d}/include/json/json.h"
++			if test -f "${d}/include/json-c/json.h"
+ 			then
+ 				if test ${d} != /usr
+ 				then
+@@ -17226,29 +17168,16 @@ case "$use_libjson" in
+ 					LIBS="$LIBS -L${d}/lib"
+ 				fi
+ 				have_libjson="yes"
+-			elif test -f "${d}/include/json-c/json.h"
+-			then
+-				if test ${d} != /usr
+-				then
+-					libjson_cflags="-I ${d}/include"
+-					LIBS="$LIBS -L${d}/lib"
+-				fi
+-				have_libjson="yes"
+ 				have_libjson_c="yes"
+ 			fi
+ 		done
+ 		;;
+ 	*)
+-		if test -f "${use_libjson}/include/json/json.h"
++		if test -f "${use_libjson}/include/json-c/json.h"
+ 		then
+ 			libjson_cflags="-I${use_libjson}/include"
+ 			LIBS="$LIBS -L${use_libjson}/lib"
+ 			have_libjson="yes"
+-		elif test -f "${use_libjson}/include/json-c/json.h"
+-		then
+-			libjson_cflags="-I${use_libjson}/include"
+-			LIBS="$LIBS -L${use_libjson}/lib"
+-			have_libjson="yes"
+ 			have_libjson_c="yes"
+ 		else
+ 			as_fn_error $? "$use_libjson/include/json{,-c}/json.h not found." "$LINENO" 5
+@@ -21375,7 +21304,7 @@ $as_echo "" >&6; }
  			# Check other locations for includes.
  			# Order is important (sigh).