diff options
| author | Joshua Colp <jcolp@digium.com> | 2015-10-09 12:08:29 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2015-10-09 12:08:29 -0500 |
| commit | 7b2afcc92f320b45bf069cff7a0a2d6b25c8036a (patch) | |
| tree | 97cc2028b781305ff994fc25c0ccffedf4699902 | |
| parent | 38519aeadf1c0868d7f62475c45d9a01a02974b6 (diff) | |
| parent | ca030845ff2f46ad51d08e47d7664ff3dc24460c (diff) | |
Merge "configure: Fix check for libunbound to require v1.5.0 as minimum."
| -rwxr-xr-x | configure | 9 | ||||
| -rw-r--r-- | configure.ac | 9 |
2 files changed, 16 insertions, 2 deletions
@@ -22968,6 +22968,13 @@ fi +# libunbound v1.5.0 added the ub_ctx_add_ta_autr() API call that we can +# detect as a useable version so that is going to be the minimum version +# that we will require. +# Technically v1.4.21 and later could be used but v1.4.21 has a configure +# script bug which does not find the ldns library. The bug is fixed in +# v1.4.22 but that version is not easily detectable. +# if test "x${PBX_UNBOUND}" != "x1" -a "${USE_UNBOUND}" != "no"; then pbxlibdir="" @@ -22979,7 +22986,7 @@ if test "x${PBX_UNBOUND}" != "x1" -a "${USE_UNBOUND}" != "no"; then pbxlibdir="-L${UNBOUND_DIR}" fi fi - pbxfuncname="ub_ctx_create" + pbxfuncname="ub_ctx_add_ta_autr" if test "x${pbxfuncname}" = "x" ; then # empty lib, assume only headers AST_UNBOUND_FOUND=yes else diff --git a/configure.ac b/configure.ac index d22abdfb5..7f69430b7 100644 --- a/configure.ac +++ b/configure.ac @@ -2006,7 +2006,14 @@ AST_EXT_TOOL_CHECK([NETSNMP], [net-snmp-config], , [--agent-libs], AST_EXT_LIB_CHECK([NEWT], [newt], [newtBell], [newt.h]) -AST_EXT_LIB_CHECK([UNBOUND], [unbound], [ub_ctx_create], [unbound.h], []) +# libunbound v1.5.0 added the ub_ctx_add_ta_autr() API call that we can +# detect as a useable version so that is going to be the minimum version +# that we will require. +# Technically v1.4.21 and later could be used but v1.4.21 has a configure +# script bug which does not find the ldns library. The bug is fixed in +# v1.4.22 but that version is not easily detectable. +# +AST_EXT_LIB_CHECK([UNBOUND], [unbound], [ub_ctx_add_ta_autr], [unbound.h], []) AST_EXT_LIB_CHECK([UNIXODBC], [odbc], [SQLConnect], [sql.h], []) |