From: Kurt Zeilenga Date: Fri, 16 Jan 2009 23:29:09 +0000 (+0000) Subject: rebuild X-Git-Tag: ACLCHECK_0~1000 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=ae3e17194bcb69c0b6adffcd8d88ca38f31a8fc7;p=openldap rebuild --- diff --git a/configure b/configure index 7a1d5f5c1e..8b4a124aa9 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in OpenLDAP: pkg/ldap/configure.in,v 1.674 2009/01/16 21:05:05 kurt Exp . +# From configure.in OpenLDAP: pkg/ldap/configure.in,v 1.675 2009/01/16 22:28:31 kurt Exp . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61. # @@ -15293,7 +15293,8 @@ echo $ECHO_N "checking for winsock... $ECHO_C" >&6; } if test "${ol_cv_winsock+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - save_LIBS="$LIBS" + +save_LIBS="$LIBS" for curlib in ws2_32 wsock32; do LIBS="$LIBS -l$curlib" cat >conftest.$ac_ext <<_ACEOF @@ -15346,31 +15347,37 @@ fi rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext - if test $ol_cv_winsock = yes; then + if test $ol_cv_winsock = yes ; then + if test -a $curlib = ws2_32; then + ol_cv_winsock=winsock2 + fi + break + fi + + LIBS="$save_LIBS" +done + +fi +{ echo "$as_me:$LINENO: result: $ol_cv_winsock" >&5 +echo "${ECHO_T}$ol_cv_winsock" >&6; } +if test $ol_cv_winsock != no ; then cat >>confdefs.h <<\_ACEOF #define HAVE_WINSOCK 1 _ACEOF - ac_cv_func_socket=yes - ac_cv_func_select=yes - ac_cv_func_closesocket=yes - ac_cv_func_gethostname=yes - if test $curlib = ws2_32; then - ol_cv_winsock=winsock2 + ac_cv_func_socket=yes + ac_cv_func_select=yes + ac_cv_func_closesocket=yes + ac_cv_func_gethostname=yes + + if test $ol_cv_winock = winsock2 ; then cat >>confdefs.h <<\_ACEOF #define HAVE_WINSOCK2 1 _ACEOF - fi - break - fi - LIBS="$save_LIBS" -done -fi -{ echo "$as_me:$LINENO: result: $ol_cv_winsock" >&5 -echo "${ECHO_T}$ol_cv_winsock" >&6; } + fi fi