X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=configure.in;h=bde0b0ba4a7a750a5b7c0dfb66be86a4f509da44;hb=b50f9c7aa943375c185007efbf27ab6e6ead9d06;hp=3b7383f4b7ab38ce8f4fed2682597e6147a14406;hpb=df018dd97539f574cc50fc0c97e4036716a1d4bf;p=openldap

diff --git a/configure.in b/configure.in
index 3b7383f4b7..bde0b0ba4a 100644
--- a/configure.in
+++ b/configure.in
@@ -879,7 +879,7 @@ if test $ac_cv_func_sigaction = no && test $ac_cv_func_sigaction = no ; then
 	AC_CHECK_LIB(V3, sigset)
 fi
 
-if test $ol_cv_msvc ; then
+if test $ol_cv_msvc = yes ; then
    ol_cv_winsock=yes
 fi
 
@@ -890,7 +890,7 @@ if test "$ac_cv_header_winsock_h" = yes; then
 	AC_CACHE_CHECK([for winsock], [ol_cv_winsock],[
 	save_LIBS="$LIBS"
 	for curlib in none ws2_32 wsock32; do
-		if test curlib != none ; then
+		if test $curlib != none ; then
 	    	LIBS="$save_LIBS -l$curlib"
 		fi
 		AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <winsock.h>
@@ -1012,9 +1012,11 @@ dnl UUID Support
 
 have_uuid=no
 AC_CHECK_HEADERS(sys/uuid.h)
+dnl The HAVE_UUID_TO_STR code path also needs uuid_create
 if test $ac_cv_header_sys_uuid_h = yes ; then
 	save_LIBS="$LIBS"
 	AC_SEARCH_LIBS([uuid_to_str], [uuid], [have_uuid=yes], :)
+	AC_SEARCH_LIBS([uuid_create], [uuid], :, [have_uuid=no])
 	LIBS="$save_LIBS"
 
 	if test $have_uuid = yes ; then
@@ -1027,11 +1029,13 @@ if test $ac_cv_header_sys_uuid_h = yes ; then
 fi
 
 dnl Look for uuid_generate
+dnl The HAVE_UUID_GENERATE code path also needs uuid_unparse_lower
 if test $have_uuid = no ; then
 	AC_CHECK_HEADERS(uuid/uuid.h)
 	if test $ac_cv_header_uuid_uuid_h = yes ; then
 		save_LIBS="$LIBS"
 		AC_SEARCH_LIBS([uuid_generate], [uuid], [have_uuid=yes], :)
+		AC_SEARCH_LIBS([uuid_unparse_lower], [uuid], :, [have_uuid=no])
 		LIBS="$save_LIBS"
 
 		if test $have_uuid = yes ; then