Move NT Thread test into build/openldap.m4. Still bogus (only

enables if MINGW32 and always enables if MINGW32).

build/openldap.m4

@@ -697,6 +697,22 @@ AC_DEFUN([OL_HEADER_GNU_PTH_PTHREAD_H], [
 		])
 ])dnl
 dnl ====================================================================
+dnl Check for NT Threads
+AC_DEFUN([OL_NT_THREADS], [
+  	AC_CACHE_CHECK([for NT Threads], [ol_cv_nt_threads], [
+		# bogus test
+		if test $ac_cv_mingw32 = yes ; then
+			ol_cv_nt_threads=yes
+		else
+			ol_cv_nt_threads=no
+		fi
+	])
+
+	if test $ol_cv_nt_threads = yes ; then
+		AC_DEFINE(HAVE_NT_THREADS,1,[if you have NT Threads])
+	fi
+])
+dnl ====================================================================
 dnl Check LinuxThreads Header
 dnl
 dnl defines ol_cv_header linux_threads to 'yes' or 'no'

configure.in

@@ -993,18 +993,20 @@ ol_link_threads=no
 if test $ol_with_threads = auto -o $ol_with_threads = yes \
 	-o $ol_with_threads = nt ; then
 
-	dnl Not much to check. If we're in mingw32, we assume win32 threads.
-	if test "$ac_cv_mingw32" = yes ; then
+	OL_NT_THREADS
+
+	if test "$ol_cv_nt_threads" = yes ; then
     	ol_link_threads=nt
     	ol_with_threads=found
     	ol_with_yielding_select=yes
-    	AC_MSG_CHECKING(for NT threads)
-    	AC_MSG_RESULT(yes)
-    	AC_DEFINE(HAVE_NT_THREADS,1,[if you have NT threads])
 
 		AC_DEFINE(HAVE_NT_SERVICE_MANAGER,1,[if you have NT Service Manager])
 		AC_DEFINE(HAVE_NT_EVENT_LOG,1,[if you have NT Event Log])
 	fi
+
+	if test $ol_with_threads = nt ; then
+		AC_MSG_ERROR([could not locate NT Threads])
+	fi
 fi
 
 if test $ol_with_threads = auto -o $ol_with_threads = yes \

include/portable.h.in

@@ -661,7 +661,7 @@
 /* set to the number of arguments gethostbyaddr_r() expects */
 #undef GETHOSTBYADDR_R_NARGS
 
-/* if you have NT threads */
+/* if you have NT Threads */
 #undef HAVE_NT_THREADS
 
 /* if you have NT Service Manager */
@@ -909,7 +909,7 @@
 
 #ifdef _WIN32
 	/* don't suck in all of the win32 api */
-#	define WIN32_LEAN_AND_MEAN
+#	define WIN32_LEAN_AND_MEAN 1
 #endif
 
 #ifndef __NEED_PROTOTYPES