diff --git a/CHANGES b/CHANGES index d0e25727c9..288ee88c06 100644 --- a/CHANGES +++ b/CHANGES @@ -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] diff --git a/acconfig.h b/acconfig.h index 762b11ba44..cb6363cdc0 100644 --- a/acconfig.h +++ b/acconfig.h @@ -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. diff --git a/bin/dig/nslookup.c b/bin/dig/nslookup.c index 08ad1e1548..36652e533c 100644 --- a/bin/dig/nslookup.c +++ b/bin/dig/nslookup.c @@ -45,7 +45,12 @@ #include #if defined(HAVE_READLINE) -#if defined(HAVE_EDITLINE_READLINE_H) +#if defined(HAVE_EDIT_READLINE_READLINE_H) +#include +#if defined(HAVE_EDIT_READLINE_HISTORY_H) +#include +#endif +#elif defined(HAVE_EDITLINE_READLINE_H) #include #elif defined(HAVE_READLINE_READLINE_H) #include diff --git a/bin/nsupdate/nsupdate.c b/bin/nsupdate/nsupdate.c index 0054e47657..f8737167d2 100644 --- a/bin/nsupdate/nsupdate.c +++ b/bin/nsupdate/nsupdate.c @@ -88,7 +88,12 @@ #include #if defined(HAVE_READLINE) -#if defined(HAVE_EDITLINE_READLINE_H) +#if defined(HAVE_EDIT_READLINE_READLINE_H) +#include +#if defined(HAVE_EDIT_READLINE_HISTORY_H) +#include +#endif +#elif defined(HAVE_EDITLINE_READLINE_H) #include #else #include diff --git a/config.h.in b/config.h.in index 28f4568a5d..1219e519b9 100644 --- a/config.h.in +++ b/config.h.in @@ -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 header file. */ #undef HAVE_EDITLINE_READLINE_H +/* Define to 1 if you have the header file. */ +#undef HAVE_EDIT_READLINE_HISTORY_H + +/* Define to 1 if you have the 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 diff --git a/configure b/configure index 2510a03bb8..3a1ae72ff4 100755 --- a/configure +++ b/configure @@ -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 ;; diff --git a/configure.in b/configure.in index e659078a77..2b63c54e69 100644 --- a/configure.in +++ b/configure.in @@ -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)