svn commit: samba r7669 - in branches/SAMBA_4_0/source: . lib/ldb

[tridge at samba.org]

Author: tridge
Date: 2005-06-17 03:07:30 +0000 (Fri, 17 Jun 2005)
New Revision: 7669

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

Log:
removed ldap from our configure tests

This takes our link dependencies from this:

tridge at blu:~/samba/samba4/source$ ldd bin/ldbsearch
        libdl.so.2 => /lib/tls/libdl.so.2 (0xb7fc9000)
        libldap_r.so.2 => /usr/lib/libldap_r.so.2 (0xb7f92000)
        liblber.so.2 => /usr/local/lib/liblber.so.2 (0xb7f85000)
        libpam.so.0 => /lib/libpam.so.0 (0xb7f7d000)
        libc.so.6 => /lib/tls/libc.so.6 (0xb7e48000)
        /lib/ld-linux.so.2 => /lib/ld-linux.so.2 (0xb7fea000)
        libresolv.so.2 => /lib/tls/libresolv.so.2 (0xb7e36000)
        libcrypt.so.1 => /lib/tls/libcrypt.so.1 (0xb7e09000)
        libsasl2.so.2 => /usr/lib/libsasl2.so.2 (0xb7df3000)
        libgnutls.so.11 => /usr/lib/libgnutls.so.11 (0xb7d8c000)
        libpthread.so.0 => /lib/tls/libpthread.so.0 (0xb7d7d000)
        libtasn1.so.2 => /usr/lib/libtasn1.so.2 (0xb7d6d000)
        libgcrypt.so.11 => /usr/lib/libgcrypt.so.11 (0xb7d20000)
        libgpg-error.so.0 => /usr/lib/libgpg-error.so.0 (0xb7d1c000)
        libz.so.1 => /usr/lib/libz.so.1 (0xb7d09000)
        libnsl.so.1 => /lib/tls/libnsl.so.1 (0xb7cf5000)

to this:

tridge at blu:~/samba/samba4/source$ ldd bin/ldbsearch
        libdl.so.2 => /lib/tls/libdl.so.2 (0xb7fc9000)
        libpam.so.0 => /lib/libpam.so.0 (0xb7fc0000)
        libc.so.6 => /lib/tls/libc.so.6 (0xb7e8b000)
        /lib/ld-linux.so.2 => /lib/ld-linux.so.2 (0xb7fea000)

this finally gets rid of the implicit dependency on pthreads! Yay!

Modified:
   branches/SAMBA_4_0/source/configure.in
   branches/SAMBA_4_0/source/lib/ldb/config.m4
   branches/SAMBA_4_0/source/lib/ldb/config.mk


Changeset:
Modified: branches/SAMBA_4_0/source/configure.in
===================================================================
--- branches/SAMBA_4_0/source/configure.in	2005-06-17 02:48:48 UTC (rev 7668)
+++ branches/SAMBA_4_0/source/configure.in	2005-06-17 03:07:30 UTC (rev 7669)
@@ -15,7 +15,6 @@
 sinclude(lib/socket/config.m4)
 sinclude(lib/talloc/config.m4)
 sinclude(lib/tdb/config.m4)
-sinclude(lib/ldb/ldap.m4)
 sinclude(lib/ldb/sqlite3.m4)
 sinclude(lib/ldb/config.m4)
 sinclude(lib/events/config.m4)

Modified: branches/SAMBA_4_0/source/lib/ldb/config.m4
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/config.m4	2005-06-17 02:48:48 UTC (rev 7668)
+++ branches/SAMBA_4_0/source/lib/ldb/config.m4	2005-06-17 03:07:30 UTC (rev 7669)
@@ -1,8 +1,3 @@
-SMB_MODULE_DEFAULT(libldb_ldap,NOT)
-if test x"$with_ldap_support" = x"yes"; then
-    SMB_MODULE_DEFAULT(libldb_ldap,STATIC)
-fi
-
 SMB_MODULE_DEFAULT(libldb_sqlite3,NOT)
 if test x"$with_sqlite3_support" = x"yes"; then
     SMB_MODULE_DEFAULT(libldb_sqlite3,STATIC)

Modified: branches/SAMBA_4_0/source/lib/ldb/config.mk
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/config.mk	2005-06-17 02:48:48 UTC (rev 7668)
+++ branches/SAMBA_4_0/source/lib/ldb/config.mk	2005-06-17 03:07:30 UTC (rev 7669)
@@ -17,18 +17,6 @@
 ################################################
 
 ################################################
-# Start MODULE libldb_ldap
-[MODULE::libldb_ldap]
-SUBSYSTEM = LIBLDB
-INIT_OBJ_FILES = \
-		lib/ldb/ldb_ldap/ldb_ldap.o
-REQUIRED_SUBSYSTEMS = \
-		EXT_LIB_LDAP
-NOPROTO = YES
-# End MODULE libldb_ldap
-################################################
-
-################################################
 # Start MODULE libldb_ildap
 [MODULE::libldb_ildap]
 SUBSYSTEM = LIBLDB