svn commit: samba r23901 - in branches/SAMBA_3_2_0/source: .

[metze at samba.org]

Author: metze
Date: 2007-07-16 16:22:36 +0000 (Mon, 16 Jul 2007)
New Revision: 23901

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23901

Log:
merge from SAMBA_3_2:
LDAP_OPT_SOCKBUF doesn't exists on all platforms

metze
Modified:
   branches/SAMBA_3_2_0/source/configure.in


Changeset:
Modified: branches/SAMBA_3_2_0/source/configure.in
===================================================================
--- branches/SAMBA_3_2_0/source/configure.in	2007-07-16 16:22:05 UTC (rev 23900)
+++ branches/SAMBA_3_2_0/source/configure.in	2007-07-16 16:22:36 UTC (rev 23901)
@@ -3355,7 +3355,15 @@
   # If ber_sockbuf_add_io() is available we can add
   # SASL wrapping hooks
   AC_CHECK_FUNC_EXT(ber_sockbuf_add_io,$LDAP_LIBS)
-  if test x"$ac_cv_func_ext_ber_sockbuf_add_io" = x"yes"; then
+
+  AC_CACHE_CHECK([for LDAP_OPT_SOCKBUF],samba_cv_HAVE_LDAP_OPT_SOCKBUF,[
+		 AC_TRY_COMPILE([#include <ldap.h>],
+				[int val = LDAP_OPT_SOCKBUF;],
+      			samba_cv_HAVE_LDAP_OPT_SOCKBUF=yes,
+			samba_cv_HAVE_LDAP_OPT_SOCKBUF=no)])
+
+  if test x"$ac_cv_func_ext_ber_sockbuf_add_io" = x"yes" -a \
+  	  x"$samba_cv_HAVE_LDAP_OPT_SOCKBUF" = x"yes"; then
   	AC_DEFINE(HAVE_LDAP_SASL_WRAPPING, 1, [Support for SASL wrapping])
   fi