mirror of
https://gitlab.isc.org/isc-projects/bind9
synced 2025-08-22 10:10:06 +00:00
4515. [port] FreeBSD: Find readline headers when they are in
edit/readline/ instead of readline/. [RT #43658]
This commit is contained in:
Curtis Blackburn
parent
cbd3082c62
commit
eb4ffd6685
3
CHANGES
3
CHANGES
@ -1,3 +1,6 @@
|
||||
4515. [port] FreeBSD: Find readline headers when they are in
|
||||
edit/readline/ instead of readline/. [RT #43658]
|
||||
|
||||
4514. [port] NetBSD: strip -WL, from ld command line. [RT #43204]
|
||||
|
||||
4513. [cleanup] Minimum Python versions are now 2.7 and 3.2.
|
||||
|
||||
@ -61,12 +61,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.
|
||||
|
||||
@ -36,7 +36,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>
|
||||
|
||||
@ -81,7 +81,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>
|
||||
|
||||
27
config.h.in
27
config.h.in
@ -61,15 +61,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.
|
||||
@ -188,6 +179,15 @@ int sigwait(const unsigned int *set, int *sig);
|
||||
MSVC and with C++ compilers. */
|
||||
#undef FLEXIBLE_ARRAY_MEMBER
|
||||
|
||||
/* Define to 1 if you have the `arc4random' function. */
|
||||
#undef HAVE_ARC4RANDOM
|
||||
|
||||
/* Define to 1 if you have the `arc4random_addrandom' function. */
|
||||
#undef HAVE_ARC4RANDOM_ADDRANDOM
|
||||
|
||||
/* Define to 1 if you have the `arc4random_stir' function. */
|
||||
#undef HAVE_ARC4RANDOM_STIR
|
||||
|
||||
/* Define to 1 if the compiler supports __builtin_clz. */
|
||||
#undef HAVE_BUILTIN_CLZ
|
||||
|
||||
@ -221,6 +221,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
|
||||
|
||||
@ -479,9 +485,6 @@ int sigwait(const unsigned int *set, int *sig);
|
||||
/* Define if zlib was found */
|
||||
#undef HAVE_ZLIB
|
||||
|
||||
/* HMAC_*() return ints */
|
||||
#undef HMAC_RETURN_INT
|
||||
|
||||
/* Use HMAC-SHA1 for Client Cookie generation */
|
||||
#undef HMAC_SHA1_CC
|
||||
|
||||
|
||||
51
configure
vendored
51
configure
vendored
@ -14607,23 +14607,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
|
||||
|
||||
|
||||
#
|
||||
@ -19194,6 +19209,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
|
||||
|
||||
;;
|
||||
|
||||
@ -1178,9 +1178,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
|
||||
|
||||
@ -3531,6 +3531,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)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user