upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-11 11:19:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

4515. [port] FreeBSD: Find readline headers when they are in

Browse source 
edit/readline/ instead of readline/. [RT #43658]
This commit is contained in:
Curtis Blackburn 2016-11-18 11:39:11 -08:00
parent d2ff14de43
commit bc3145ccd8
7 changed files with 82 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGES
View file

@ -1,3 +1,6 @@
4515. [port] FreeBSD: Find readline headers when they are in
edit/readline/ instead of readline/. [RT #43658]
4513. [cleanup] Minimum Python versions are now 2.7 and 3.2.
[RT #43566]

6
acconfig.h
View file

@ -70,12 +70,6 @@
/** define if gai_strerror() exists */
#undef HAVE_GAISTRERROR
/** define if arc4random() exists */
#undef HAVE_ARC4RANDOM
/** define if arc4random_addrandom() exists */
#undef HAVE_ARC4RANDOM_ADDRANDOM
/**
* define if pthread_setconcurrency() should be called to tell the
* OS how many threads we might want to run.

7
bin/dig/nslookup.c
View file

@ -45,7 +45,12 @@
#include <dig/dig.h>
#if defined(HAVE_READLINE)
#if defined(HAVE_EDITLINE_READLINE_H)
#if defined(HAVE_EDIT_READLINE_READLINE_H)
#include <edit/readline/readline.h>
#if defined(HAVE_EDIT_READLINE_HISTORY_H)
#include <edit/readline/history.h>
#endif
#elif defined(HAVE_EDITLINE_READLINE_H)
#include <editline/readline.h>
#elif defined(HAVE_READLINE_READLINE_H)
#include <readline/readline.h>

7
bin/nsupdate/nsupdate.c
View file

@ -88,7 +88,12 @@
#include <bind9/getaddresses.h>
#if defined(HAVE_READLINE)
#if defined(HAVE_EDITLINE_READLINE_H)
#if defined(HAVE_EDIT_READLINE_READLINE_H)
#include <edit/readline/readline.h>
#if defined(HAVE_EDIT_READLINE_HISTORY_H)
#include <edit/readline/history.h>
#endif
#elif defined(HAVE_EDITLINE_READLINE_H)
#include <editline/readline.h>
#else
#include <readline/readline.h>

26
config.h.in
View file

@ -70,15 +70,6 @@
/** define if gai_strerror() exists */
#undef HAVE_GAISTRERROR
/** define if arc4random() exists */
#undef HAVE_ARC4RANDOM
/** define if arc4random_stir() exists */
#undef HAVE_ARC4RANDOM_STIR
/** define if arc4random_addrandom() exists */
#undef HAVE_ARC4RANDOM_ADDRANDOM
/**
* define if pthread_setconcurrency() should be called to tell the
* OS how many threads we might want to run.
@ -221,6 +212,12 @@ int sigwait(const unsigned int *set, int *sig);
/* Define to 1 if you have the <editline/readline.h> header file. */
#undef HAVE_EDITLINE_READLINE_H
/* Define to 1 if you have the <edit/readline/history.h> header file. */
#undef HAVE_EDIT_READLINE_HISTORY_H
/* Define to 1 if you have the <edit/readline/readline.h> header file. */
#undef HAVE_EDIT_READLINE_READLINE_H
/* Define to 1 if you have the `EVP_sha256' function. */
#undef HAVE_EVP_SHA256
@ -422,8 +419,19 @@ int sigwait(const unsigned int *set, int *sig);
/* Define to 1 if you have the `usleep' function. */
#undef HAVE_USLEEP
<<<<<<< HEAD
/* HMAC_*() return ints */
#undef HMAC_RETURN_INT
=======
/* Define if zlib was found */
#undef HAVE_ZLIB
/* Use HMAC-SHA1 for Client Cookie generation */
#undef HMAC_SHA1_CC
/* Use HMAC-SHA256 for Client Cookie generation */
#undef HMAC_SHA256_CC
>>>>>>> eb4ffd6... 4515. [port] FreeBSD: Find readline headers when they are in
/* return type of gai_strerror */
#undef IRS_GAISTRERROR_RETURN_T

51
configure vendored
View file

@ -14725,23 +14725,38 @@ fi
# Do we have arc4random(), etc ?
# Will use stir and if not exist addrandom
#
ac_fn_c_check_func "$LINENO" "arc4random" "ac_cv_func_arc4random"
for ac_func in arc4random
do :
ac_fn_c_check_func "$LINENO" "arc4random" "ac_cv_func_arc4random"
if test "x$ac_cv_func_arc4random" = xyes; then :
$as_echo "#define HAVE_ARC4RANDOM 1" >>confdefs.h
cat >>confdefs.h <<_ACEOF
#define HAVE_ARC4RANDOM 1
_ACEOF
fi
done
ac_fn_c_check_func "$LINENO" "arc4random_stir" "ac_cv_func_arc4random_stir"
for ac_func in arc4random_stir
do :
ac_fn_c_check_func "$LINENO" "arc4random_stir" "ac_cv_func_arc4random_stir"
if test "x$ac_cv_func_arc4random_stir" = xyes; then :
$as_echo "#define HAVE_ARC4RANDOM_STIR 1" >>confdefs.h
cat >>confdefs.h <<_ACEOF
#define HAVE_ARC4RANDOM_STIR 1
_ACEOF
fi
done
ac_fn_c_check_func "$LINENO" "arc4random_addrandom" "ac_cv_func_arc4random_addrandom"
for ac_func in arc4random_addrandom
do :
ac_fn_c_check_func "$LINENO" "arc4random_addrandom" "ac_cv_func_arc4random_addrandom"
if test "x$ac_cv_func_arc4random_addrandom" = xyes; then :
$as_echo "#define HAVE_ARC4RANDOM_ADDRANDOM 1" >>confdefs.h
cat >>confdefs.h <<_ACEOF
#define HAVE_ARC4RANDOM_ADDRANDOM 1
_ACEOF
fi
done
#
@ -17762,6 +17777,30 @@ _ACEOF
fi
done
for ac_header in edit/readline/readline.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "edit/readline/readline.h" "ac_cv_header_edit_readline_readline_h" "$ac_includes_default"
if test "x$ac_cv_header_edit_readline_readline_h" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_EDIT_READLINE_READLINE_H 1
_ACEOF
fi
done
for ac_header in edit/readline/history.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "edit/readline/history.h" "ac_cv_header_edit_readline_history_h" "$ac_includes_default"
if test "x$ac_cv_header_edit_readline_history_h" = xyes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_EDIT_READLINE_HISTORY_H 1
_ACEOF
fi
done
;;

8
configure.in
View file

@ -1445,9 +1445,9 @@ AC_SUBST(CHECK_DSA)
# Do we have arc4random(), etc ?
# Will use stir and if not exist addrandom
#
AC_CHECK_FUNC(arc4random, AC_DEFINE(HAVE_ARC4RANDOM))
AC_CHECK_FUNC(arc4random_stir, AC_DEFINE(HAVE_ARC4RANDOM_STIR))
AC_CHECK_FUNC(arc4random_addrandom, AC_DEFINE(HAVE_ARC4RANDOM_ADDRANDOM))
AC_CHECK_FUNCS(arc4random)
AC_CHECK_FUNCS(arc4random_stir)
AC_CHECK_FUNCS(arc4random_addrandom)
sinclude(config.threads.in)dnl
@ -2763,6 +2763,8 @@ then
case "$READLINE_LIB" in
*edit*)
AC_CHECK_HEADERS(editline/readline.h)
AC_CHECK_HEADERS(edit/readline/readline.h)
AC_CHECK_HEADERS(edit/readline/history.h)
;;
esac
AC_CHECK_HEADERS(readline/readline.h)