diff options
| -rwxr-xr-x | configure | 197 | ||||
| -rw-r--r-- | configure.ac | 30 | ||||
| -rw-r--r-- | include/asterisk/autoconfig.h.in | 3 |
3 files changed, 221 insertions, 9 deletions
@@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Revision: 115331 . +# From configure.ac Revision: 115343 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61 for asterisk 1.6. # @@ -10264,7 +10264,8 @@ fi -for ac_header in arpa/inet.h fcntl.h inttypes.h libintl.h limits.h locale.h malloc.h netdb.h netinet/in.h stddef.h stdint.h stdlib.h string.h strings.h sys/file.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h syslog.h termios.h unistd.h utime.h + +for ac_header in arpa/inet.h fcntl.h inttypes.h libintl.h limits.h locale.h malloc.h netdb.h netinet/in.h stddef.h stdint.h stdlib.h string.h strings.h sys/file.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h syslog.h termios.h unistd.h utime.h arpa/nameser.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then @@ -17073,6 +17074,89 @@ fi rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext +{ echo "$as_me:$LINENO: checking for library containing res_9_ninit" >&5 +echo $ECHO_N "checking for library containing res_9_ninit... $ECHO_C" >&6; } +if test "${ac_cv_search_res_9_ninit+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_func_search_save_LIBS=$LIBS +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char res_9_ninit (); +int +main () +{ +return res_9_ninit (); + ; + return 0; +} +_ACEOF +for ac_lib in '' resolv; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_search_res_9_ninit=$ac_res +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext + if test "${ac_cv_search_res_9_ninit+set}" = set; then + break +fi +done +if test "${ac_cv_search_res_9_ninit+set}" = set; then + : +else + ac_cv_search_res_9_ninit=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ echo "$as_me:$LINENO: result: $ac_cv_search_res_9_ninit" >&5 +echo "${ECHO_T}$ac_cv_search_res_9_ninit" >&6; } +ac_res=$ac_cv_search_res_9_ninit +if test "$ac_res" != no; then + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + +fi + { echo "$as_me:$LINENO: checking for res_ninit" >&5 echo $ECHO_N "checking for res_ninit... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF @@ -17081,7 +17165,17 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include <resolv.h> + + #ifdef HAVE_SYS_SOCKET_H + #include <sys/socket.h> + #endif + #ifdef HAVE_NETINET_IN_H + #include <netinet/in.h> + #endif + #ifdef HAVE_ARPA_NAMESER_H + #include <arpa/nameser.h> + #endif + #include <resolv.h> int main () { @@ -17115,6 +17209,89 @@ cat >>confdefs.h <<\_ACEOF #define HAVE_RES_NINIT 1 _ACEOF + { echo "$as_me:$LINENO: checking for library containing res_9_ndestroy" >&5 +echo $ECHO_N "checking for library containing res_9_ndestroy... $ECHO_C" >&6; } +if test "${ac_cv_search_res_9_ndestroy+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_func_search_save_LIBS=$LIBS +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char res_9_ndestroy (); +int +main () +{ +return res_9_ndestroy (); + ; + return 0; +} +_ACEOF +for ac_lib in '' resolv; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_search_res_9_ndestroy=$ac_res +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext + if test "${ac_cv_search_res_9_ndestroy+set}" = set; then + break +fi +done +if test "${ac_cv_search_res_9_ndestroy+set}" = set; then + : +else + ac_cv_search_res_9_ndestroy=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ echo "$as_me:$LINENO: result: $ac_cv_search_res_9_ndestroy" >&5 +echo "${ECHO_T}$ac_cv_search_res_9_ndestroy" >&6; } +ac_res=$ac_cv_search_res_9_ndestroy +if test "$ac_res" != no; then + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + +fi + { echo "$as_me:$LINENO: checking for res_ndestroy" >&5 echo $ECHO_N "checking for res_ndestroy... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF @@ -17123,11 +17300,21 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include <resolv.h> + + #ifdef HAVE_SYS_SOCKET_H + #include <sys/socket.h> + #endif + #ifdef HAVE_NETINET_IN_H + #include <netinet/in.h> + #endif + #ifdef HAVE_ARPA_NAMESER_H + #include <arpa/nameser.h> + #endif + #include <resolv.h> int main () { -int foo = res_ndestroy(NULL); +res_ndestroy(NULL); ; return 0; } diff --git a/configure.ac b/configure.ac index 935959dfc..069124c6a 100644 --- a/configure.ac +++ b/configure.ac @@ -263,7 +263,7 @@ AC_FUNC_ALLOCA AC_HEADER_DIRENT AC_HEADER_STDC AC_HEADER_SYS_WAIT -AC_CHECK_HEADERS([arpa/inet.h fcntl.h inttypes.h libintl.h limits.h locale.h malloc.h netdb.h netinet/in.h stddef.h stdint.h stdlib.h string.h strings.h sys/file.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h syslog.h termios.h unistd.h utime.h]) +AC_CHECK_HEADERS([arpa/inet.h fcntl.h inttypes.h libintl.h limits.h locale.h malloc.h netdb.h netinet/in.h stddef.h stdint.h stdlib.h string.h strings.h sys/file.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h syslog.h termios.h unistd.h utime.h arpa/nameser.h]) AC_CHECK_HEADERS([winsock.h winsock2.h]) @@ -490,16 +490,38 @@ AC_LINK_IFELSE( AC_MSG_RESULT(no) ) +AC_SEARCH_LIBS(res_9_ninit, resolv) AC_MSG_CHECKING(for res_ninit) AC_LINK_IFELSE( - AC_LANG_PROGRAM([#include <resolv.h>], + AC_LANG_PROGRAM([ + #ifdef HAVE_SYS_SOCKET_H + #include <sys/socket.h> + #endif + #ifdef HAVE_NETINET_IN_H + #include <netinet/in.h> + #endif + #ifdef HAVE_ARPA_NAMESER_H + #include <arpa/nameser.h> + #endif + #include <resolv.h>], [int foo = res_ninit(NULL);]), AC_MSG_RESULT(yes) AC_DEFINE([HAVE_RES_NINIT], 1, [Define to 1 if your system has the re-entrant resolver functions.]) + AC_SEARCH_LIBS(res_9_ndestroy, resolv) AC_MSG_CHECKING(for res_ndestroy) AC_LINK_IFELSE( - AC_LANG_PROGRAM([#include <resolv.h>], - [int foo = res_ndestroy(NULL);]), + AC_LANG_PROGRAM([ + #ifdef HAVE_SYS_SOCKET_H + #include <sys/socket.h> + #endif + #ifdef HAVE_NETINET_IN_H + #include <netinet/in.h> + #endif + #ifdef HAVE_ARPA_NAMESER_H + #include <arpa/nameser.h> + #endif + #include <resolv.h>], + [res_ndestroy(NULL);]), AC_MSG_RESULT(yes) AC_DEFINE([HAVE_RES_NDESTROY], 1, [Define to 1 if your system has the ndestroy resolver function.]), AC_MSG_RESULT(no) diff --git a/include/asterisk/autoconfig.h.in b/include/asterisk/autoconfig.h.in index 4b9e73494..4887ed5e7 100644 --- a/include/asterisk/autoconfig.h.in +++ b/include/asterisk/autoconfig.h.in @@ -46,6 +46,9 @@ /* Define to 1 if you have the <arpa/inet.h> header file. */ #undef HAVE_ARPA_INET_H +/* Define to 1 if you have the <arpa/nameser.h> header file. */ +#undef HAVE_ARPA_NAMESER_H + /* Define this to indicate the ${ASIN_DESCRIP} library */ #undef HAVE_ASIN |