diff options
| author | Andrew Tridgell <tridge@samba.org> | 2005-06-17 03:07:30 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:18:20 -0500 |
| commit | 1f052665f304360e4c3a59f19dc98b9c70fa1299 (patch) | |
| tree | 28404d016efce2480650d8508bddcad9d572595e /source4 | |
| parent | 44a04d74cdcc4b4dc75312a40b34d60e1d9a001b (diff) | |
| download | samba-1f052665f304360e4c3a59f19dc98b9c70fa1299.tar.gz samba-1f052665f304360e4c3a59f19dc98b9c70fa1299.tar.bz2 samba-1f052665f304360e4c3a59f19dc98b9c70fa1299.zip | |
r7669: removed ldap from our configure tests
This takes our link dependencies from this:
tridge@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@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!
(This used to be commit 844d2a20830a4666b6c38f6a58305be64b6b76fa)
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/configure.in | 1 | ||||
| -rw-r--r-- | source4/lib/ldb/config.m4 | 5 | ||||
| -rw-r--r-- | source4/lib/ldb/config.mk | 12 |
3 files changed, 0 insertions, 18 deletions
diff --git a/source4/configure.in b/source4/configure.in index 57816d566a..0155576443 100644 --- a/source4/configure.in +++ b/source4/configure.in @@ -15,7 +15,6 @@ sinclude(lib/iconv.m4) 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) diff --git a/source4/lib/ldb/config.m4 b/source4/lib/ldb/config.m4 index dfa72e4cd3..2b251befbb 100644 --- a/source4/lib/ldb/config.m4 +++ b/source4/lib/ldb/config.m4 @@ -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) diff --git a/source4/lib/ldb/config.mk b/source4/lib/ldb/config.mk index 1a6f006ea0..05255fdec5 100644 --- a/source4/lib/ldb/config.mk +++ b/source4/lib/ldb/config.mk @@ -17,18 +17,6 @@ INIT_OBJ_FILES = \ ################################################ ################################################ -# 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 |