Commit dab4aac0 authored by Mark Andrews's avatar Mark Andrews

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

parent 578e3196
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]
......
......@@ -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}
......
......@@ -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}
......
#! /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
......
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment