1 --- source3/configure.in Mon Jan 18 12:38:09 2010 |
|
2 +++ source3/configure.in Sat Mar 13 19:19:27 2010 |
|
3 @@ -3063,6 +3063,20 @@ |
|
4 with_ldap_support=yes |
|
5 AC_MSG_CHECKING(whether LDAP support is used) |
|
6 AC_MSG_RESULT(yes) |
|
7 + |
|
8 + ################################ |
|
9 + # Check if the Netscape LDAP SDK |
|
10 + AC_CACHE_CHECK([for LDAP_OPT_SIZELIMIT macro],samba_cv_HAVE_LDAP_NSC,[ |
|
11 + AC_TRY_COMPILE([ |
|
12 +#include <stdio.h> |
|
13 +#include <ldap.h>], |
|
14 + [printf("%s\n", LDAP_OPT_SIZELIMIT);], |
|
15 + samba_cv_HAVE_LDAP_NSC=yes,samba_cv_HAVE_LDAP_NSC=no)]) |
|
16 + if test x"$samba_cv_HAVE_LDAP_NSC" = x"yes"; then |
|
17 + AC_DEFINE(HAVE_HAVE_LDAP_NSC,1, |
|
18 + [Whether the LDAP API is Netscape SDK]) |
|
19 + fi |
|
20 + |
|
21 else |
|
22 if test x"$with_ldap_support" = x"yes"; then |
|
23 AC_MSG_ERROR(libldap is needed for LDAP support) |
|
24 @@ -3125,15 +3139,25 @@ |
|
25 fi |
|
26 ;; |
|
27 *) |
|
28 - AC_CHECK_FUNC_EXT(ldap_initialize,$LDAP_LIBS) |
|
29 + # Omit the ldap_initialize() test if there is a Netscape SDK |
|
30 + # (Mozilla Directory server 5) |
|
31 + if test x"$samba_cv_HAVE_LDAP_NSC" = x"no"; then |
|
32 |
|
33 - if test x"$ac_cv_func_ext_ldap_initialize" != x"yes"; then |
|
34 - if test x"$with_ads_support" = x"yes"; then |
|
35 - AC_MSG_ERROR(Active Directory support requires ldap_initialize) |
|
36 - elif test x"$with_ads_support" = x"auto"; then |
|
37 - AC_MSG_WARN(Disabling Active Directory support (requires ldap_initialize)) |
|
38 - with_ads_support=no |
|
39 + AC_CHECK_FUNC_EXT(ldap_initialize,$LDAP_LIBS) |
|
40 + |
|
41 + if test x"$ac_cv_func_ext_ldap_initialize" != x"yes"; then |
|
42 + if test x"$with_ads_support" = x"yes"; then |
|
43 + AC_MSG_ERROR(Active Directory support requires ldap_initialize) |
|
44 + elif test x"$with_ads_support" = x"auto"; then |
|
45 + AC_MSG_WARN(Disabling Active Directory support (requires ldap_in |
|
46 +itialize)) |
|
47 + with_ads_support=no |
|
48 + fi |
|
49 + |
|
50 fi |
|
51 + else |
|
52 + AC_MSG_RESULT(Active Directory support on Netscape LDAP SDK - limited fu |
|
53 +nctionality?) |
|
54 fi |
|
55 ;; |
|
56 esac |
|