r158: cope with or without LDAP in samba build of ldb

(This used to be commit e776ce4f9e6fead235b3cec86d85eb95704f10ef)

diff --git a/source4/lib/ldb/common/ldb.c b/source4/lib/ldb/common/ldb.c
index 146745043fa514789632fdc8915f921e40c065bf..e84473efabcd776d87f0b65951b8a2df66f84f21 100644 (file)
--- a/source4/lib/ldb/common/ldb.c
+++ b/source4/lib/ldb/common/ldb.c
@@ -52,11 +52,11 @@ struct ldb_context *ldb_connect(const char *url, unsigned int flags,
                return ltdb_connect(url, flags, options);
        }
 
-#ifdef HAVE_LDAP
+#if HAVE_LDAP
        if (strncmp(url, "ldap", 4) == 0) {
                return lldb_connect(url, flags, options);
        }
-#endif /*HAVE_LDAP*/
+#endif
 
        errno = EINVAL;
        return NULL;

diff --git a/source4/lib/ldb/config.m4 b/source4/lib/ldb/config.m4
index 7c4749ab0262c721edb160de6a43916d89813bb4..1541dd67362072c35732e812043336a1ab49d07a 100644 (file)
--- a/source4/lib/ldb/config.m4
+++ b/source4/lib/ldb/config.m4
@@ -1,3 +1,7 @@
+if test x"$HAVE_LDAP" = x"yes"; then
+SMB_SUBSYSTEM(LIBLDB_LDAP,[lib/ldb/ldb_ldap/ldb_ldap.o])
+fi
+
 SMB_SUBSYSTEM(LIBLDB,[lib/ldb/common/ldb.o],
                [lib/ldb/common/ldb_ldif.o \
                lib/ldb/common/ldb_parse.o \
@@ -8,7 +12,7 @@ SMB_SUBSYSTEM(LIBLDB,[lib/ldb/common/ldb.o],
                lib/ldb/ldb_tdb/ldb_pack.o \
                lib/ldb/ldb_tdb/ldb_index.o \
                lib/ldb/ldb_tdb/ldb_match.o \
-               lib/ldb/ldb_ldap/ldb_ldap.o],
+               \$(LIBLDAP_LDAP_OBJS)],
                lib/ldb/include/ldb.h)
 
 SMB_SUBSYSTEM(LDBADD,[],