upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-23 16:19:35 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Another winsock2 fix attempt

Browse source
This commit is contained in:
Kurt Zeilenga 2009-01-16 23:45:24 +00:00
parent ae3e17194b
commit e71f21959c
2 changed files with 25 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
configure vendored
View file

@ -15295,8 +15295,10 @@ if test "${ol_cv_winsock+set}" = set; then
else else
save_LIBS="$LIBS" save_LIBS="$LIBS"
for curlib in ws2_32 wsock32; do for curlib in none ws2_32 wsock32; do
LIBS="$LIBS -l$curlib" if test curlib != none ; then
LIBS="$save_LIBS -l$curlib"
fi
cat >conftest.$ac_ext <<_ACEOF cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */ /* confdefs.h. */
_ACEOF _ACEOF
@ -15348,14 +15350,11 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext 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=$curlib
ol_cv_winsock=winsock2
fi
break
fi fi
break
LIBS="$save_LIBS"
done done
LIBS="$save_LIBS"
fi fi
{ echo "$as_me:$LINENO: result: $ol_cv_winsock" >&5 { echo "$as_me:$LINENO: result: $ol_cv_winsock" >&5
@ -15371,7 +15370,11 @@ _ACEOF
ac_cv_func_closesocket=yes ac_cv_func_closesocket=yes
ac_cv_func_gethostname=yes ac_cv_func_gethostname=yes
if test $ol_cv_winock = winsock2 ; then if test $ol_cv_winsock != none ; then
LIBS="$LIBS -l$ol_cv_winsock"
fi
if test $ol_cv_winsock = ws2_32 ; then
cat >>confdefs.h <<\_ACEOF cat >>confdefs.h <<\_ACEOF
#define HAVE_WINSOCK2 1 #define HAVE_WINSOCK2 1

23
configure.in
View file

@ -880,8 +880,10 @@ dnl autoconf would try to generate if one merely used AC_SEARCH_LIBS
if test "$ac_cv_header_winsock_h" = yes; then if test "$ac_cv_header_winsock_h" = yes; then
AC_CACHE_CHECK([for winsock], [ol_cv_winsock],[ AC_CACHE_CHECK([for winsock], [ol_cv_winsock],[
save_LIBS="$LIBS" save_LIBS="$LIBS"
for curlib in ws2_32 wsock32; do for curlib in none ws2_32 wsock32; do
LIBS="$LIBS -l$curlib" if test curlib != none ; then
LIBS="$save_LIBS -l$curlib"
fi
AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <winsock.h> AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <winsock.h>
]], [[ ]], [[
socket(0,0,0); socket(0,0,0);
@ -891,14 +893,11 @@ for curlib in ws2_32 wsock32; do
]])],[ol_cv_winsock=yes],[ol_cv_winsock=no]) ]])],[ol_cv_winsock=yes],[ol_cv_winsock=no])
if test $ol_cv_winsock = yes ; then if test $ol_cv_winsock = yes ; then
if test -a $curlib = ws2_32; then ol_cv_winsock=$curlib
ol_cv_winsock=winsock2
fi
break
fi fi
break
LIBS="$save_LIBS"
done done
LIBS="$save_LIBS"
]) ])
if test $ol_cv_winsock != no ; then if test $ol_cv_winsock != no ; then
AC_DEFINE(HAVE_WINSOCK, 1, [define if you have winsock]) AC_DEFINE(HAVE_WINSOCK, 1, [define if you have winsock])
@ -907,8 +906,12 @@ if test $ol_cv_winsock != no ; then
ac_cv_func_closesocket=yes ac_cv_func_closesocket=yes
ac_cv_func_gethostname=yes ac_cv_func_gethostname=yes
if test $ol_cv_winock = winsock2 ; then if test $ol_cv_winsock != none ; then
AC_DEFINE(HAVE_WINSOCK2, 1, [define if you have winsock2]) LIBS="$LIBS -l$ol_cv_winsock"
fi
if test $ol_cv_winsock = ws2_32 ; then
AC_DEFINE(HAVE_WINSOCK2, 1, [define if you have winsock2])
fi fi
fi fi