diff options
| author | Jenkins2 <jenkins2@gerrit.asterisk.org> | 2017-06-14 10:39:13 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2017-06-14 10:39:13 -0500 |
| commit | e26d15fabbd266b33eff26370d503a9855fad5f7 (patch) | |
| tree | 3ba76d52859405e6fb5e3cfdc5e58f58d7a79b61 | |
| parent | 44d4b55697ecc2b1a6f814059f9cc5e221e0143d (diff) | |
| parent | 68de35a6a01e2a1fe732e156b73f800bb672a421 (diff) | |
Merge "CFLAGS for BIND8 support" into 13
| -rw-r--r-- | Makefile | 3 | ||||
| -rwxr-xr-x | configure | 28 | ||||
| -rw-r--r-- | configure.ac | 12 | ||||
| -rw-r--r-- | makeopts.in | 2 |
4 files changed, 45 insertions, 0 deletions
@@ -124,6 +124,9 @@ _ASTLDFLAGS+=$(LDOPTS) # libxml2 cflags _ASTCFLAGS+=$(LIBXML2_INCLUDE) +# BIND_8_COMPAT +_ASTCFLAGS+=$(BIND8_CFLAGS) + #Uncomment this to see all build commands instead of 'quiet' output #NOISY_BUILD=yes @@ -697,6 +697,7 @@ PBX_IP_MTU_DISCOVER PBX_RTLD_NOLOAD PBX_GLOB_BRACE PBX_GLOB_NOMAGIC +BIND8_CFLAGS AST_RPATH AST_NATIVE_ARCH AST_SHADOW_WARNINGS @@ -19181,6 +19182,33 @@ fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BIND_8_COMPAT required" >&5 +$as_echo_n "checking for BIND_8_COMPAT required... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#undef BIND_8_COMPAT +#include <arpa/nameser.h> + +int +main () +{ +int x = NXDOMAIN + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +BIND8_CFLAGS=-DBIND_8_COMPAT +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + if test "x${PBX_GLOB_NOMAGIC}" != "x1"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLOB_NOMAGIC in glob.h" >&5 diff --git a/configure.ac b/configure.ac index 120b0f831..de4bce247 100644 --- a/configure.ac +++ b/configure.ac @@ -1334,6 +1334,18 @@ AC_LINK_IFELSE( AC_MSG_RESULT(no) ) +AC_MSG_CHECKING(for BIND_8_COMPAT required) +AC_COMPILE_IFELSE([AC_LANG_PROGRAM( +[[ +#undef BIND_8_COMPAT +#include <arpa/nameser.h> +]], +[[int x = NXDOMAIN]])], +AC_MSG_RESULT(no), +AC_MSG_RESULT(yes) +[BIND8_CFLAGS=-DBIND_8_COMPAT]) +AC_SUBST(BIND8_CFLAGS) + AST_C_DEFINE_CHECK([GLOB_NOMAGIC], [GLOB_NOMAGIC], [glob.h]) AST_C_DEFINE_CHECK([GLOB_BRACE], [GLOB_BRACE], [glob.h]) diff --git a/makeopts.in b/makeopts.in index 56bf11ef7..8f83ed971 100644 --- a/makeopts.in +++ b/makeopts.in @@ -62,6 +62,8 @@ HOST_OS=@HOST_OS@ OSARCH=@OSARCH@ OSREV=@PBX_OSREV@ +BIND8_CFLAGS=@BIND8_CFLAGS@ + PTHREAD_CFLAGS=@PTHREAD_CFLAGS@ PTHREAD_LIBS=@PTHREAD_LIBS@ |