From: Kurt Zeilenga <kurt@openldap.org>
Date: Sat, 17 Jan 2009 04:32:15 +0000 (+0000)
Subject: working vsnprintf (at least on MSVC++ 2008)
X-Git-Tag: ACLCHECK_0~985
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=606393aa8081d421fc9b7c0d360152c38683f88d;p=openldap

working vsnprintf (at least on MSVC++ 2008)
---

diff --git a/configure b/configure
index 1372958a3b..29433dcdca 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in OpenLDAP: pkg/ldap/configure.in,v 1.688 2009/01/17 01:08:10 kurt Exp .
+# From configure.in OpenLDAP: pkg/ldap/configure.in,v 1.689 2009/01/17 01:09:14 kurt Exp .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61.
 #
@@ -15339,18 +15339,18 @@ if test $ol_cv_msvc ; then
 fi
 
 if test "$ac_cv_header_winsock_h" = yes; then
-{ echo "$as_me:$LINENO: checking for winsock" >&5
+	{ echo "$as_me:$LINENO: checking for winsock" >&5
 echo $ECHO_N "checking for winsock... $ECHO_C" >&6; }
 if test "${ol_cv_winsock+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
 
-save_LIBS="$LIBS"
-for curlib in none ws2_32 wsock32; do
-	if test curlib != none ; then
-	    LIBS="$save_LIBS -l$curlib"
-	fi
-	cat >conftest.$ac_ext <<_ACEOF
+	save_LIBS="$LIBS"
+	for curlib in none ws2_32 wsock32; do
+		if test curlib != none ; then
+	    	LIBS="$save_LIBS -l$curlib"
+		fi
+		cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -15400,37 +15400,37 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
 
-	test "$ol_cv_winsock" != no && break
-done
-LIBS="$save_LIBS"
+		test "$ol_cv_winsock" != no && break
+	done
+	LIBS="$save_LIBS"
 
 fi
 { echo "$as_me:$LINENO: result: $ol_cv_winsock" >&5
 echo "${ECHO_T}$ol_cv_winsock" >&6; }
 
-if test $ol_cv_winsock != no ; then
+	if test $ol_cv_winsock != no ; then
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_WINSOCK 1
 _ACEOF
 
-    ac_cv_func_socket=yes
-    ac_cv_func_select=yes
-    ac_cv_func_closesocket=yes
-    ac_cv_func_gethostname=yes
+    	ac_cv_func_socket=yes
+    	ac_cv_func_select=yes
+    	ac_cv_func_closesocket=yes
+    	ac_cv_func_gethostname=yes
 
-	if test $ol_cv_winsock != none -a $ol_cv_winsock != yes ; then
-        LIBS="$LIBS -l$ol_cv_winsock"
-	fi
+		if test $ol_cv_winsock != none -a $ol_cv_winsock != yes ; then
+        	LIBS="$LIBS -l$ol_cv_winsock"
+		fi
 
-    if test $ol_cv_winsock = ws2_32 -o $ol_cv_winsock = yes ; then
+    	if test $ol_cv_winsock = ws2_32 -o $ol_cv_winsock = yes ; then
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_WINSOCK2 1
 _ACEOF
 
-    fi
-fi
+    	fi
+	fi
 fi
 
 
@@ -16904,7 +16904,6 @@ fi
 
 fi
 
-# strerror checks
 { echo "$as_me:$LINENO: checking declaration of sys_errlist" >&5
 echo $ECHO_N "checking declaration of sys_errlist... $ECHO_C" >&6; }
 if test "${ol_cv_dcl_sys_errlist+set}" = set; then
diff --git a/configure.in b/configure.in
index 633783bdd3..ee1d6462dc 100644
--- a/configure.in
+++ b/configure.in
@@ -883,13 +883,13 @@ dnl The following is INTENTIONALLY scripted out because shell does not
 dnl support variable names with the '@' character, which is what
 dnl autoconf would try to generate if one merely used AC_SEARCH_LIBS
 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
-	    LIBS="$save_LIBS -l$curlib"
-	fi
-	AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <winsock.h>
+	AC_CACHE_CHECK([for winsock], [ol_cv_winsock],[
+	save_LIBS="$LIBS"
+	for curlib in none ws2_32 wsock32; do
+		if test curlib != none ; then
+	    	LIBS="$save_LIBS -l$curlib"
+		fi
+		AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <winsock.h>
 			]], [[
 			socket(0,0,0);
 			select(0,NULL,NULL,NULL,NULL);
@@ -897,26 +897,26 @@ for curlib in none ws2_32 wsock32; do
 			gethostname(NULL,0);
 			]])],[ol_cv_winsock=$curlib],[ol_cv_winsock=no])
 
-	test "$ol_cv_winsock" != no && break
-done
-LIBS="$save_LIBS"
-])
+		test "$ol_cv_winsock" != no && break
+	done
+	LIBS="$save_LIBS"
+	])
 
-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_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_winsock != none -a $ol_cv_winsock != yes ; then
-        LIBS="$LIBS -l$ol_cv_winsock"
-	fi
+		if test $ol_cv_winsock != none -a $ol_cv_winsock != yes ; then
+        	LIBS="$LIBS -l$ol_cv_winsock"
+		fi
 
-    if test $ol_cv_winsock = ws2_32 -o $ol_cv_winsock = yes ; then
-		AC_DEFINE(HAVE_WINSOCK2, 1, [define if you have winsock2])
-    fi
-fi
+    	if test $ol_cv_winsock = ws2_32 -o $ol_cv_winsock = yes ; then
+			AC_DEFINE(HAVE_WINSOCK2, 1, [define if you have winsock2])
+    	fi
+	fi
 fi
 
 dnl Find socket()
@@ -981,7 +981,6 @@ then
 fi
 
 dnl ----------------------------------------------------------------
-# strerror checks
 OL_STRERROR
 
 dnl ----------------------------------------------------------------