kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 12:16:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "CFLAGS for BIND8 support"

Browse Source
This commit is contained in:
Joshua Colp
2017-06-14 11:07:04 -05:00
committed by Gerrit Code Review
parent 42f738e052 fcb1a0d7e8
commit c33168c147
4 changed files with 45 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@@ -124,6 +124,9 @@ _ASTLDFLAGS+=$(LDOPTS)
# libxml2 cflags # libxml2 cflags
_ASTCFLAGS+=$(LIBXML2_INCLUDE) _ASTCFLAGS+=$(LIBXML2_INCLUDE)
# BIND_8_COMPAT
_ASTCFLAGS+=$(BIND8_CFLAGS)
#Uncomment this to see all build commands instead of 'quiet' output #Uncomment this to see all build commands instead of 'quiet' output
#NOISY_BUILD=yes #NOISY_BUILD=yes

28
configure vendored
View File

@@ -697,6 +697,7 @@ PBX_IP_MTU_DISCOVER
PBX_RTLD_NOLOAD PBX_RTLD_NOLOAD
PBX_GLOB_BRACE PBX_GLOB_BRACE
PBX_GLOB_NOMAGIC PBX_GLOB_NOMAGIC
BIND8_CFLAGS
AST_RPATH AST_RPATH
AST_NATIVE_ARCH AST_NATIVE_ARCH
AST_SHADOW_WARNINGS AST_SHADOW_WARNINGS
@@ -19408,6 +19409,33 @@ fi
rm -f core conftest.err conftest.$ac_objext \ rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext 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 if test "x${PBX_GLOB_NOMAGIC}" != "x1"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLOB_NOMAGIC in glob.h" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLOB_NOMAGIC in glob.h" >&5

12
configure.ac
View File

@@ -1361,6 +1361,18 @@ AC_LINK_IFELSE(
AC_MSG_RESULT(no) 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_NOMAGIC], [GLOB_NOMAGIC], [glob.h])
AST_C_DEFINE_CHECK([GLOB_BRACE], [GLOB_BRACE], [glob.h]) AST_C_DEFINE_CHECK([GLOB_BRACE], [GLOB_BRACE], [glob.h])

2
makeopts.in
View File

@@ -62,6 +62,8 @@ HOST_OS=@HOST_OS@
OSARCH=@OSARCH@ OSARCH=@OSARCH@
OSREV=@PBX_OSREV@ OSREV=@PBX_OSREV@
BIND8_CFLAGS=@BIND8_CFLAGS@
PTHREAD_CFLAGS=@PTHREAD_CFLAGS@ PTHREAD_CFLAGS=@PTHREAD_CFLAGS@
PTHREAD_LIBS=@PTHREAD_LIBS@ PTHREAD_LIBS=@PTHREAD_LIBS@