mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-29 21:47:59 +00:00
Code Issues Releases Wiki Activity

4494. [bug] Look for <editline/readline.h>. [RT #43429]

Browse Source
This commit is contained in:
Mark Andrews 2016-10-27 15:48:51 +11:00
parent c910fc24ce
commit 6fbb2b51d8
6 changed files with 74 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES
View File

@ -1,3 +1,5 @@
4494. [bug] Look for <editline/readline.h>. [RT #43429]
4493. [bug] bin/tests/system/dyndb/driver/Makefile.in should use 4493. [bug] bin/tests/system/dyndb/driver/Makefile.in should use
SO_TARGETS. [RT# 43336] SO_TARGETS. [RT# 43336]

6
bin/dig/nslookup.c
View File

@ -36,9 +36,15 @@
#include <dig/dig.h> #include <dig/dig.h>
#if defined(HAVE_READLINE) #if defined(HAVE_READLINE)
#if defined(HAVE_EDITLINE_READLINE_H)
#include <editline/readline.h>
#elif defined(HAVE_READLINE_READLINE_H)
#include <readline/readline.h> #include <readline/readline.h>
#if defined (HAVE_READLINE_HISTORY_H)
#include <readline/history.h> #include <readline/history.h>
#endif #endif
#endif
#endif
static isc_boolean_t short_form = ISC_TRUE, static isc_boolean_t short_form = ISC_TRUE,
tcpmode = ISC_FALSE, tcpmode = ISC_FALSE,

4
bin/nsupdate/nsupdate.c
View File

@ -81,9 +81,13 @@
#include <bind9/getaddresses.h> #include <bind9/getaddresses.h>
#if defined(HAVE_READLINE) #if defined(HAVE_READLINE)
#if defined(HAVE_EDITLINE_READLINE_H)
#include <editline/readline.h>
#else
#include <readline/readline.h> #include <readline/readline.h>
#include <readline/history.h> #include <readline/history.h>
#endif #endif
#endif
#ifdef HAVE_ADDRINFO #ifdef HAVE_ADDRINFO
#ifdef HAVE_GETADDRINFO #ifdef HAVE_GETADDRINFO

9
config.h.in
View File

@ -215,6 +215,9 @@ int sigwait(const unsigned int *set, int *sig);
/* Define to 1 to enable dnstap support */ /* Define to 1 to enable dnstap support */
#undef HAVE_DNSTAP #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. */ /* Define to 1 if you have the `EVP_sha256' function. */
#undef HAVE_EVP_SHA256 #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. */ /* Define to 1 if you have the `readline' function. */
#undef HAVE_READLINE #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. */ /* Define to 1 if you have the <regex.h> header file. */
#undef HAVE_REGEX_H #undef HAVE_REGEX_H

43
configure vendored
View File

@ -19161,6 +19161,49 @@ done
LIBS="$saved_LIBS" LIBS="$saved_LIBS"
;; ;;
esac 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_OBJS=
ISC_PRINT_SRCS= ISC_PRINT_SRCS=

10
configure.in
View File

@ -3497,6 +3497,16 @@ no) ;;
LIBS="$saved_LIBS" LIBS="$saved_LIBS"
;; ;;
esac 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_OBJS=
ISC_PRINT_SRCS= ISC_PRINT_SRCS=