X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=configure.in;h=34473f51525997153b605d05ef390d06a5c6e8d1;hb=5f6f7d06a6a3d3c4f8f842fae35361efb1bb3cf6;hp=9ef9f2038e75fa758860d8350bd8caf898b3f5cb;hpb=daa7907b4f88ae3cbb7e4ef011d7283bd6e499cb;p=openldap

diff --git a/configure.in b/configure.in
index 9ef9f2038e..34473f5152 100644
--- a/configure.in
+++ b/configure.in
@@ -522,7 +522,7 @@ if test $ol_enable_perl != no ; then
 
 	else
 		PERL_CPPFLAGS="`$PERLBIN -MExtUtils::Embed -e ccopts`"
-		if test x"$ol_with_perl_module" == "xstatic" ; then
+		if test x"$ol_with_perl_module" = "xstatic" ; then
 			SLAPD_PERL_LDFLAGS="`$PERLBIN -MExtUtils::Embed -e ldopts|sed -e s/-lc//`"
 		else
 			MOD_PERL_LDFLAGS="`$PERLBIN -MExtUtils::Embed -e ldopts|sed -e s/-lc//`"
@@ -681,25 +681,22 @@ dnl HP-UX requires -lV3
 AC_CHECK_LIB(V3, sigset)
 
 dnl Gotta check for winsock manually
-if test "${ac_cv_header_winsock_h}" = yes; then
-    AC_MSG_CHECKING(for winsock support)
-    AC_TRY_LINK([
-#include <winsock.h>
-    ],[
-socket(0,0,0);
-select(0,NULL,NULL,NULL,NULL);
-closesocket(0);
-gethostname(NULL,0);
-    ],[
-	AC_MSG_RESULT(yes)
-	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
-    ],[
-	AC_MSG_RESULT(no)
-    ])
+if test $ac_cv_header_winsock_h = yes; then
+	AC_CACHE_CHECK([for winsock], [ol_cv_winsock], 
+    	AC_TRY_LINK([#include <winsock.h>],[
+			socket(0,0,0);
+			select(0,NULL,NULL,NULL,NULL);
+			closesocket(0);
+			gethostname(NULL,0);
+    	],[ol_cv_winsock=yes],[ol_cv_winsock=no])])
+
+	if test $ol_cv_winsock = yes ; 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
+	fi
 fi
 
 dnl Find socket()
@@ -829,13 +826,13 @@ if test $ol_with_kerberos = auto -o $ol_with_kerberos = k5 ; then
 
 	if test $ac_cv_header_kerberosIV_krb_h = yes ; then
 		AC_CHECK_LIB(krb4, main, [have_k5=yes], [have_k5=no],
-			[-lkrb5 -ldes425])
+			[-lkrb5 -ldes425 -lcrypto -lcom_err])
 
 		if test $have_k5 = yes ; then
 			ol_with_kerberos=found
 			ol_link_kerberos=yes
 
-			KRB_LIBS="-lkrb4 -lkrb5 -ldes425"
+			KRB_LIBS="-lkrb4 -lkrb5 -ldes425 -lcrypto -lcom_err"
 
 			LIBS="$KRB_LIBS $LIBS"
 
@@ -1735,7 +1732,7 @@ if test $ol_enable_tcl != no ; then
 		for lib in tcl tcl7.6 tcl8.0 tcl8.2 ; do
 			AC_CHECK_LIB($lib,main,
 			  [have_tcl=yes
-			   if test x"$ol_with_tcl_module" == "xstatic" ; then
+			   if test x"$ol_with_tcl_module" = "xstatic" ; then
 			       SLAPD_LIBS="$SLAPD_LIBS -l${lib}"
 			   else
 			       MOD_TCL_LIB="-l${lib}"
@@ -1929,12 +1926,10 @@ AC_STRUCT_TM
 AC_TYPE_UID_T
 OL_TYPE_SIG_ATOMIC_T
 
-dnl only check these if we're not Mingw32
-if test "$ac_cv_mingw32" != yes ; then
-    AC_TYPE_GETGROUPS
-    OL_STRUCT_PASSWD_PW_GECOS
-    OL_STRUCT_PASSWD_PW_PASSWD
-fi
+dnl AC_TYPE_GETGROUPS
+
+OL_STRUCT_PASSWD_PW_GECOS
+OL_STRUCT_PASSWD_PW_PASSWD
 
 OL_C_UPPER_LOWER
 AC_C_CONST
@@ -1954,15 +1949,13 @@ if test "$ac_cv_sizeof_int" -lt 4 ; then
 	AC_MSG_WARN([OpenLDAP requires 'int' to be 32 bits or greater.])
 
 	AC_DEFINE(LBER_INT_T,long)
-	AC_DEFINE(LBER_TAG_T,long)
-	AC_DEFINE(LBER_SOCKET_T,int)
 else
 	AC_DEFINE(LBER_INT_T,int)
-	AC_DEFINE(LBER_TAG_T,long)
-	AC_DEFINE(LBER_SOCKET_T,int)
 fi
 
 AC_DEFINE(LBER_LEN_T,long)
+AC_DEFINE(LBER_SOCKET_T,int)
+AC_DEFINE(LBER_TAG_T,long)
 
 dnl ----------------------------------------------------------------
 dnl Checks for library functions.