From: Mark Andrews <marka@isc.org>
Date: Thu, 10 Jan 2013 06:34:28 +0000 (+1100)
Subject: 3460.   [bug]           Only link against readline where needed. [RT #29810]
X-Git-Tag: v9.10.0a1~592
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=dab4aac006fadcaf3c5a9ccd983188b37ead08ee;p=thirdparty%2Fbind9.git

3460.   [bug]           Only link against readline where needed. [RT #29810]
---

diff --git a/CHANGES b/CHANGES
index 705738547e0..6cfb4bf3409 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+3460.	[bug]		Only link against readline where needed. [RT #29810]
+
 3459.	[func]		Added -J option to named-checkzone/named-compilezone
 			to specify the path to the journal file. [RT #30958]
 
diff --git a/bin/dig/Makefile.in b/bin/dig/Makefile.in
index 2a3bc5d6fe8..7cd7b0e6829 100644
--- a/bin/dig/Makefile.in
+++ b/bin/dig/Makefile.in
@@ -23,6 +23,8 @@ top_srcdir =	@top_srcdir@
 
 @BIND9_MAKE_INCLUDES@
 
+READLINE_LIB = @READLINE_LIB@
+
 CINCLUDES =	-I${srcdir}/include ${DNS_INCLUDES} ${BIND9_INCLUDES} \
 		${ISC_INCLUDES} ${LWRES_INCLUDES} ${ISCCFG_INCLUDES}
 
@@ -78,7 +80,7 @@ host@EXEEXT@: host.@O@ dighost.@O@ ${UOBJS} ${DEPLIBS}
 	${FINALBUILDCMD}
 
 nslookup@EXEEXT@: nslookup.@O@ dighost.@O@ ${UOBJS} ${DEPLIBS}
-	export BASEOBJS="nslookup.@O@ dighost.@O@ ${UOBJS}"; \
+	export BASEOBJS="${READLINE_LIB} nslookup.@O@ dighost.@O@ ${UOBJS}"; \
 	${FINALBUILDCMD}
 
 doc man:: ${MANOBJS}
diff --git a/bin/nsupdate/Makefile.in b/bin/nsupdate/Makefile.in
index f62ee348663..2d156df009a 100644
--- a/bin/nsupdate/Makefile.in
+++ b/bin/nsupdate/Makefile.in
@@ -23,6 +23,8 @@ top_srcdir =	@top_srcdir@
 
 @BIND9_MAKE_INCLUDES@
 
+READLINE_LIB = @READLINE_LIB@
+
 CINCLUDES =	${LWRES_INCLUDES} ${DNS_INCLUDES} ${BIND9_INCLUDES} \
 		${ISC_INCLUDES} ${ISCCFG_INCLUDES} @DST_GSSAPI_INC@
 
@@ -72,7 +74,7 @@ nsupdate.@O@: nsupdate.c
 		-c ${srcdir}/nsupdate.c
 
 nsupdate@EXEEXT@: nsupdate.@O@ ${UOBJS} ${DEPLIBS}
-	export BASEOBJS="nsupdate.@O@ ${UOBJS}"; \
+	export BASEOBJS="${READLINE_LIB} nsupdate.@O@ ${UOBJS}"; \
 	${FINALBUILDCMD}
 
 doc man:: ${MANOBJS}
diff --git a/configure b/configure
index 2fb30516d79..c70d0960677 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2004-2012  Internet Systems Consortium, Inc. ("ISC")
+# Copyright (C) 2004-2013  Internet Systems Consortium, Inc. ("ISC")
 # Copyright (C) 1996-2003  Internet Software Consortium.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
@@ -1227,6 +1227,7 @@ LWRES_PLATFORM_NEEDVSNPRINTF
 ISC_PLATFORM_NEEDVSNPRINTF
 LWRES_PLATFORM_NEEDSPRINTF
 ISC_PLATFORM_NEEDSPRINTF
+READLINE_LIB
 ISC_PLATFORM_NEEDSTRLCAT
 ISC_PLATFORM_NEEDSTRLCPY
 GENRANDOMLIB
@@ -17472,6 +17473,7 @@ fi
 
 
 
+
 # Check whether --with-readline was given.
 if test "${with_readline+set}" = set; then :
   withval=$with_readline; readline="$withval"
@@ -17487,7 +17489,7 @@ no)	;;
 		readline=-lreadline
 	fi
 	saved_LIBS="$LIBS"
-	LIBS="$LIBS $readline"
+	LIBS="$readline"
 	for ac_func in readline
 do :
   ac_fn_c_check_func "$LINENO" "readline" "ac_cv_func_readline"
@@ -17499,10 +17501,8 @@ _ACEOF
 fi
 done
 
-	if test "$ac_cv_func_readline" = "no"
-	then
-		LIBS="$saved_LIBS"
-	fi
+	LIBS="$saved_LIBS"
+	READLINE_LIB="$readline"
         ;;
 esac
 
diff --git a/configure.in b/configure.in
index be438213cbc..04a4f159ee4 100644
--- a/configure.in
+++ b/configure.in
@@ -2355,6 +2355,7 @@ AC_CHECK_FUNC(strlcat,
 AC_SUBST(ISC_PLATFORM_NEEDSTRLCAT)
 
 
+AC_SUBST(READLINE_LIB)
 AC_ARG_WITH(readline,
         [  --with-readline[=LIBSPEC]    specify readline library [default -lreadline]],
         readline="$withval", readline="-lreadline")
@@ -2366,12 +2367,10 @@ no)	;;
 		readline=-lreadline
 	fi
 	saved_LIBS="$LIBS"
-	LIBS="$LIBS $readline"
+	LIBS="$readline"
 	AC_CHECK_FUNCS(readline)
-	if test "$ac_cv_func_readline" = "no" 
-	then
-		LIBS="$saved_LIBS"
-	fi
+	LIBS="$saved_LIBS"
+	READLINE_LIB="$readline"
         ;;
 esac