Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
ISC Open Source Projects
BIND
Commits
6fbb2b51
Commit
6fbb2b51
authored
Oct 27, 2016
by
Mark Andrews
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
4494. [bug] Look for <editline/readline.h>. [RT #43429]
parent
c910fc24
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
74 additions
and
0 deletions
+74
-0
CHANGES
CHANGES
+2
-0
bin/dig/nslookup.c
bin/dig/nslookup.c
+6
-0
bin/nsupdate/nsupdate.c
bin/nsupdate/nsupdate.c
+4
-0
config.h.in
config.h.in
+9
-0
configure
configure
+43
-0
configure.in
configure.in
+10
-0
No files found.
CHANGES
View file @
6fbb2b51
4494. [bug] Look for
<editline
/
readline.h
>
. [RT #43429]
4493. [bug] bin/tests/system/dyndb/driver/Makefile.in should use
SO_TARGETS. [RT# 43336]
...
...
bin/dig/nslookup.c
View file @
6fbb2b51
...
...
@@ -36,9 +36,15 @@
#include <dig/dig.h>
#if defined(HAVE_READLINE)
#if defined(HAVE_EDITLINE_READLINE_H)
#include <editline/readline.h>
#elif defined(HAVE_READLINE_READLINE_H)
#include <readline/readline.h>
#if defined (HAVE_READLINE_HISTORY_H)
#include <readline/history.h>
#endif
#endif
#endif
static
isc_boolean_t
short_form
=
ISC_TRUE
,
tcpmode
=
ISC_FALSE
,
...
...
bin/nsupdate/nsupdate.c
View file @
6fbb2b51
...
...
@@ -81,9 +81,13 @@
#include <bind9/getaddresses.h>
#if defined(HAVE_READLINE)
#if defined(HAVE_EDITLINE_READLINE_H)
#include <editline/readline.h>
#else
#include <readline/readline.h>
#include <readline/history.h>
#endif
#endif
#ifdef HAVE_ADDRINFO
#ifdef HAVE_GETADDRINFO
...
...
config.h.in
View file @
6fbb2b51
...
...
@@ -215,6 +215,9 @@ int sigwait(const unsigned int *set, int *sig);
/* Define to 1 to enable dnstap support */
#undef HAVE_DNSTAP
/* Define to 1 if you have the <editline/readline.h> header file. */
#undef HAVE_EDITLINE_READLINE_H
/* Define to 1 if you have the `EVP_sha256' function. */
#undef HAVE_EVP_SHA256
...
...
@@ -377,6 +380,12 @@ int sigwait(const unsigned int *set, int *sig);
/* Define to 1 if you have the `readline' function. */
#undef HAVE_READLINE
/* Define to 1 if you have the <readline/history.h> header file. */
#undef HAVE_READLINE_HISTORY_H
/* Define to 1 if you have the <readline/readline.h> header file. */
#undef HAVE_READLINE_READLINE_H
/* Define to 1 if you have the <regex.h> header file. */
#undef HAVE_REGEX_H
...
...
configure
View file @
6fbb2b51
...
...
@@ -19161,6 +19161,49 @@ done
LIBS="$saved_LIBS"
;;
esac
if test yes = "$ac_cv_func_readline"
then
case "$READLINE_LIB" in
*edit*)
for ac_header in editline/readline.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "editline/readline.h" "ac_cv_header_editline_readline_h" "$ac_includes_default"
if test "x$ac_cv_header_editline_readline_h" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_EDITLINE_READLINE_H 1
_ACEOF
fi
done
;;
esac
for ac_header in readline/readline.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "readline/readline.h" "ac_cv_header_readline_readline_h" "$ac_includes_default"
if test "x$ac_cv_header_readline_readline_h" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_READLINE_READLINE_H 1
_ACEOF
fi
done
for ac_header in readline/history.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "readline/history.h" "ac_cv_header_readline_history_h" "$ac_includes_default"
if test "x$ac_cv_header_readline_history_h" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_READLINE_HISTORY_H 1
_ACEOF
fi
done
fi
ISC_PRINT_OBJS=
ISC_PRINT_SRCS=
...
...
configure.in
View file @
6fbb2b51
...
...
@@ -3497,6 +3497,16 @@ no) ;;
LIBS="$saved_LIBS"
;;
esac
if test yes = "$ac_cv_func_readline"
then
case "$READLINE_LIB" in
*edit*)
AC_CHECK_HEADERS(editline/readline.h)
;;
esac
AC_CHECK_HEADERS(readline/readline.h)
AC_CHECK_HEADERS(readline/history.h)
fi
ISC_PRINT_OBJS=
ISC_PRINT_SRCS=
...
...
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