diff options
author | Joshua Colp <jcolp@digium.com> | 2007-08-01 17:47:05 +0000 |
---|---|---|
committer | Joshua Colp <jcolp@digium.com> | 2007-08-01 17:47:05 +0000 |
commit | 021c0ca0d667821141e2265bb9de0a818552474f (patch) | |
tree | c15ed41245330601d5c5df69ba8291140760210a | |
parent | d51079b70aa2b166db035a1c93ddcb7f9d21719f (diff) |
Merged revisions 77865 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r77865 | file | 2007-08-01 14:42:52 -0300 (Wed, 01 Aug 2007) | 2 lines
And for my last trick... make sure that if gethostbyname_r is exported by a library that it is used.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@77866 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rwxr-xr-x | configure | 86 | ||||
-rw-r--r-- | configure.ac | 2 |
2 files changed, 87 insertions, 1 deletions
@@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Revision: 76523 . +# From configure.ac Revision: 77864 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61. # @@ -15019,6 +15019,90 @@ done # some systems already have gethostbyname_r so we don't need to build ours in main/utils.c +{ echo "$as_me:$LINENO: checking for library containing gethostbyname_r" >&5 +echo $ECHO_N "checking for library containing gethostbyname_r... $ECHO_C" >&6; } +if test "${ac_cv_search_gethostbyname_r+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 gethostbyname_r (); +int +main () +{ +return gethostbyname_r (); + ; + return 0; +} +_ACEOF +for ac_lib in '' socket nsl; 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_gethostbyname_r=$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_gethostbyname_r+set}" = set; then + break +fi +done +if test "${ac_cv_search_gethostbyname_r+set}" = set; then + : +else + ac_cv_search_gethostbyname_r=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ echo "$as_me:$LINENO: result: $ac_cv_search_gethostbyname_r" >&5 +echo "${ECHO_T}$ac_cv_search_gethostbyname_r" >&6; } +ac_res=$ac_cv_search_gethostbyname_r +if test "$ac_res" != no; then + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + +fi + + { echo "$as_me:$LINENO: checking for gethostbyname_r with 6 arguments" >&5 echo $ECHO_N "checking for gethostbyname_r with 6 arguments... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF diff --git a/configure.ac b/configure.ac index 66e1cf76b..dd2e95d86 100644 --- a/configure.ac +++ b/configure.ac @@ -284,6 +284,8 @@ AC_CHECK_FUNCS([asprintf atexit bzero dup2 endpwent floor ftruncate getcwd getho AC_CHECK_FUNCS([funopen fopencookie]) # some systems already have gethostbyname_r so we don't need to build ours in main/utils.c +AC_SEARCH_LIBS(gethostbyname_r, [socket nsl]) + AC_MSG_CHECKING(for gethostbyname_r with 6 arguments) AC_LINK_IFELSE( AC_LANG_PROGRAM([#include <netdb.h>], |