Module: wine Branch: refs/heads/master Commit: eebb1112214a68762d2e9d3663e95fef51c4b6dc URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=eebb1112214a68762d2e9d36...
Author: Alexandre Julliard julliard@winehq.org Date: Fri Aug 4 23:17:56 2006 +0200
configure: Only link against libresolv where necessary.
---
configure | 87 --------------------------------------------- configure.ac | 2 - dlls/iphlpapi/Makefile.in | 1 + 3 files changed, 1 insertions(+), 89 deletions(-)
diff --git a/configure b/configure index 448115d..4ad1108 100755 --- a/configure +++ b/configure @@ -7861,93 +7861,6 @@ _ACEOF
fi
- -{ echo "$as_me:$LINENO: checking for res_9_init in -lresolv" >&5 -echo $ECHO_N "checking for res_9_init in -lresolv... $ECHO_C" >&6; } -if test "${ac_cv_lib_resolv_res_9_init+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lresolv $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_init (); -int -main () -{ -return res_9_init (); - ; - return 0; -} -_ACEOF -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); } && - { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (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_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: $? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (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_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: $? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_lib_resolv_res_9_init=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_resolv_res_9_init=no -fi - -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_res_9_init" >&5 -echo "${ECHO_T}$ac_cv_lib_resolv_res_9_init" >&6; } -if test $ac_cv_lib_resolv_res_9_init = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBRESOLV 1 -_ACEOF - - LIBS="-lresolv $LIBS" - -fi - { echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5 echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6; } if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then diff --git a/configure.ac b/configure.ac index f375c59..5782654 100644 --- a/configure.ac +++ b/configure.ac @@ -146,8 +146,6 @@ dnl Check for -lxpg4 for FreeBSD AC_CHECK_LIB(xpg4,_xpg4_setrunelocale) dnl Check for -lpoll for Mac OS X/Darwin AC_CHECK_LIB(poll,poll) -dnl Check for -lresolv for Mac OS X/Darwin -AC_CHECK_LIB(resolv,res_9_init) dnl Check for -lpthread AC_CHECK_LIB(pthread,pthread_create,AC_SUBST(LIBPTHREAD,"-lpthread"))
diff --git a/dlls/iphlpapi/Makefile.in b/dlls/iphlpapi/Makefile.in index 713f1f1..163593f 100644 --- a/dlls/iphlpapi/Makefile.in +++ b/dlls/iphlpapi/Makefile.in @@ -5,6 +5,7 @@ VPATH = @srcdir@ MODULE = iphlpapi.dll IMPORTLIB = libiphlpapi.$(IMPLIBEXT) IMPORTS = advapi32 kernel32 +EXTRALIBS = @RESOLVLIBS@
C_SRCS = \ ifenum.c \