From 98e4907048238b99ed5e19af2dac2b53b5338e80 Mon Sep 17 00:00:00 2001 From: file Date: Fri, 9 May 2008 16:38:38 +0000 Subject: Merged revisions 115580 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ................ r115580 | file | 2008-05-09 13:36:58 -0300 (Fri, 09 May 2008) | 10 lines Merged revisions 115579 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r115579 | file | 2008-05-09 13:34:08 -0300 (Fri, 09 May 2008) | 2 lines Improve res_ninit and res_ndestroy autoconf logic on the Darwin platform. ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@115581 f38db490-d61c-443f-a65b-d21fe96a405b --- configure | 197 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 192 insertions(+), 5 deletions(-) (limited to 'configure') diff --git a/configure b/configure index 8e7c2486b..714e6bd01 100755 --- a/configure +++ b/configure @@ -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 + + #ifdef HAVE_SYS_SOCKET_H + #include + #endif + #ifdef HAVE_NETINET_IN_H + #include + #endif + #ifdef HAVE_ARPA_NAMESER_H + #include + #endif + #include 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 + + #ifdef HAVE_SYS_SOCKET_H + #include + #endif + #ifdef HAVE_NETINET_IN_H + #include + #endif + #ifdef HAVE_ARPA_NAMESER_H + #include + #endif + #include int main () { -int foo = res_ndestroy(NULL); +res_ndestroy(NULL); ; return 0; } -- cgit v1.2.3