From 27c4333ef552804d10a2d8eba00a2755e4ecc286 Mon Sep 17 00:00:00 2001 From: Kevin Easton Date: Mon, 28 May 2012 13:54:19 +0000 Subject: [PATCH] Respin configure and defs.h.in for configure.in r198. git-svn-id: svn://svn.code.sf.net/p/bitchx/code/trunk@199 13b04d17-f746-0410-82c6-800466cd88b0 --- configure | 128 +++++++++++++++++++++++++++++++++++++++++++++- include/defs.h.in | 3 ++ 2 files changed, 130 insertions(+), 1 deletion(-) diff --git a/configure b/configure index cb6f229..e45437d 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 196 . +# From configure.in Revision: 198 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.59. # @@ -6334,6 +6334,132 @@ _ACEOF if test x"$bx_cv_lib_resolver" != x"none required"; then LIBS="$bx_cv_lib_resolver $LIBS" fi + echo "$as_me:$LINENO: checking for iphlpapi.h" >&5 +echo $ECHO_N "checking for iphlpapi.h... $ECHO_C" >&6 +if test "${ac_cv_header_iphlpapi_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include + +#include +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 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' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_header_iphlpapi_h=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_header_iphlpapi_h=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_header_iphlpapi_h" >&5 +echo "${ECHO_T}$ac_cv_header_iphlpapi_h" >&6 +if test $ac_cv_header_iphlpapi_h = yes; then + +echo "$as_me:$LINENO: checking for GetNetworkParams in -liphlpapi" >&5 +echo $ECHO_N "checking for GetNetworkParams in -liphlpapi... $ECHO_C" >&6 +if test "${ac_cv_lib_iphlpapi_GetNetworkParams+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-liphlpapi $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 gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char GetNetworkParams (); +int +main () +{ +GetNetworkParams (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&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' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_iphlpapi_GetNetworkParams=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_iphlpapi_GetNetworkParams=no +fi +rm -f 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_iphlpapi_GetNetworkParams" >&5 +echo "${ECHO_T}$ac_cv_lib_iphlpapi_GetNetworkParams" >&6 +if test $ac_cv_lib_iphlpapi_GetNetworkParams = yes; then + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBIPHLPAPI 1 +_ACEOF + + LIBS="-liphlpapi $LIBS" + +fi + +fi + + else { echo "$as_me:$LINENO: WARNING: No resolver library found, /nslookup will be disabled." >&5 echo "$as_me: WARNING: No resolver library found, /nslookup will be disabled." >&2;} diff --git a/include/defs.h.in b/include/defs.h.in index 3b43c3a..68efe91 100644 --- a/include/defs.h.in +++ b/include/defs.h.in @@ -129,6 +129,9 @@ /* Define to 1 if you have the `killpg' function. */ #undef HAVE_KILLPG +/* Define to 1 if you have the `iphlpapi' library (-liphlpapi). */ +#undef HAVE_LIBIPHLPAPI + /* Define to 1 if you have the `ssl' library (-lssl). */ #undef HAVE_LIBSSL