Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
BIND
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
633
Issues
633
List
Boards
Labels
Service Desk
Milestones
Merge Requests
107
Merge Requests
107
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ISC Open Source Projects
BIND
Commits
dab4aac0
Commit
dab4aac0
authored
Jan 10, 2013
by
Mark Andrews
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
3460. [bug] Only link against readline where needed. [RT #29810]
parent
578e3196
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
18 additions
and
13 deletions
+18
-13
CHANGES
CHANGES
+2
-0
bin/dig/Makefile.in
bin/dig/Makefile.in
+3
-1
bin/nsupdate/Makefile.in
bin/nsupdate/Makefile.in
+3
-1
configure
configure
+6
-6
configure.in
configure.in
+4
-5
No files found.
CHANGES
View file @
dab4aac0
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]
...
...
bin/dig/Makefile.in
View file @
dab4aac0
...
...
@@ -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}
...
...
bin/nsupdate/Makefile.in
View file @
dab4aac0
...
...
@@ -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}
...
...
configure
View file @
dab4aac0
#! /bin/sh
# Copyright (C) 2004-201
2
Internet Systems Consortium, Inc. ("ISC")
# Copyright (C) 2004-201
3
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
...
...
configure.in
View file @
dab4aac0
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment