mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-18 11:05:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix winsock test to properly use cache

Browse Source
This commit is contained in:
Kurt Zeilenga 2009-01-16 23:28:31 +00:00
parent 863754cb82
commit c31eef293f
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
configure.in
View File

@ -878,7 +878,7 @@ dnl The following is INTENTIONALLY scripted out because shell does not
dnl support variable names with the '@' character, which is what dnl support variable names with the '@' character, which is what
dnl autoconf would try to generate if one merely used AC_SEARCH_LIBS 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 ws2_32 wsock32; do
LIBS="$LIBS -l$curlib" LIBS="$LIBS -l$curlib"
@ -890,21 +890,26 @@ for curlib in ws2_32 wsock32; do
gethostname(NULL,0); gethostname(NULL,0);
]])],[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
AC_DEFINE(HAVE_WINSOCK, 1, [define if you have winsock]) if test -a $curlib = ws2_32; then
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 ol_cv_winsock=winsock2
AC_DEFINE(HAVE_WINSOCK2, 1,
[define if you have winsock2])
fi fi
break break
fi fi
LIBS="$save_LIBS" LIBS="$save_LIBS"
done) done
])
if test $ol_cv_winsock != no ; then
AC_DEFINE(HAVE_WINSOCK, 1, [define if you have winsock])
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
AC_DEFINE(HAVE_WINSOCK2, 1, [define if you have winsock2])
fi
fi fi
dnl Find socket() dnl Find socket()