[packages/openssh.git] / openssh-ldns.patch

--- openssh-7.5p1/configure.ac.orig	2017-04-17 10:38:47.458291317 +0200
+++ openssh-7.5p1/configure.ac	2017-04-17 11:03:41.491607590 +0200
@@ -1479,15 +1479,15 @@
 	ldns=""
 	if test "x$withval" = "xyes" ; then
 		AC_PATH_TOOL([LDNSCONFIG], [ldns-config], [no])
-		if test "x$PKGCONFIG" = "xno"; then
+		if test "x$LDNSCONFIG" = "xno"; then
 			CPPFLAGS="$CPPFLAGS -I${withval}/include"
 			LDFLAGS="$LDFLAGS -L${withval}/lib"
 			LIBS="-lldns $LIBS"
-			ldns=yes
 		else
 			LIBS="$LIBS `$LDNSCONFIG --libs`"
 			CPPFLAGS="$CPPFLAGS `$LDNSCONFIG --cflags`"
 		fi
+		ldns=yes
 	elif test "x$withval" != "xno" ; then
 			CPPFLAGS="$CPPFLAGS -I${withval}/include"
 			LDFLAGS="$LDFLAGS -L${withval}/lib"
Commit	Line	Data
be127028 JB	1	--- openssh-7.5p1/configure.ac.orig 2017-04-17 10:38:47.458291317 +0200
	2	+++ openssh-7.5p1/configure.ac 2017-04-17 11:03:41.491607590 +0200
	3	@@ -1479,15 +1479,15 @@
	4	ldns=""
	5	if test "x$withval" = "xyes" ; then
	6	AC_PATH_TOOL([LDNSCONFIG], [ldns-config], [no])
	7	- if test "x$PKGCONFIG" = "xno"; then
	8	+ if test "x$LDNSCONFIG" = "xno"; then
	9	CPPFLAGS="$CPPFLAGS -I${withval}/include"
	10	LDFLAGS="$LDFLAGS -L${withval}/lib"
	11	LIBS="-lldns $LIBS"
	12	- ldns=yes
	13	else
	14	LIBS="$LIBS `$LDNSCONFIG --libs`"
	15	CPPFLAGS="$CPPFLAGS `$LDNSCONFIG --cflags`"
	16	fi
	17	+ ldns=yes
	18	elif test "x$withval" != "xno" ; then
	19	CPPFLAGS="$CPPFLAGS -I${withval}/include"
	20	LDFLAGS="$LDFLAGS -L${withval}/lib"