Skip to content
Snippets Groups Projects
Commit 93a8cac3 authored by Quanah Gibson-Mount's avatar Quanah Gibson-Mount
Browse files

ITS#6102,ITS#6078

parent 17b69bb4
No related branches found
No related tags found
No related merge requests found
...@@ -23,6 +23,7 @@ OpenLDAP 2.4.17 Engineering ...@@ -23,6 +23,7 @@ OpenLDAP 2.4.17 Engineering
Build Environment Build Environment
Added test056-monitor (ITS#5540) Added test056-monitor (ITS#5540)
Added test057-memberof-refint (ITS#5395) Added test057-memberof-refint (ITS#5395)
Fixed winsock detection for windows (ITS#6102, ITS#6078)
Documentation Documentation
admin24 fixed example regex (ITS#6052) admin24 fixed example regex (ITS#6052)
slapd.conf(5) pidfile/argsfile description fix (ITS#5975) slapd.conf(5) pidfile/argsfile description fix (ITS#5975)
......
This diff is collapsed.
...@@ -879,7 +879,7 @@ if test $ac_cv_func_sigaction = no && test $ac_cv_func_sigaction = no ; then ...@@ -879,7 +879,7 @@ if test $ac_cv_func_sigaction = no && test $ac_cv_func_sigaction = no ; then
AC_CHECK_LIB(V3, sigset) AC_CHECK_LIB(V3, sigset)
fi fi
if test $ol_cv_msvc ; then if test $ol_cv_msvc = yes ; then
ol_cv_winsock=yes ol_cv_winsock=yes
fi fi
...@@ -890,7 +890,7 @@ if test "$ac_cv_header_winsock_h" = yes; then ...@@ -890,7 +890,7 @@ 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 none ws2_32 wsock32; do for curlib in none ws2_32 wsock32; do
if test curlib != none ; then if test $curlib != none ; then
LIBS="$save_LIBS -l$curlib" LIBS="$save_LIBS -l$curlib"
fi fi
AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <winsock.h> AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <winsock.h>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment