Update.

1998-06-23  Ulrich Drepper  <drepper@cygnus.com>

	* config.make.in: Remove LDAP support.
	* nss/Makefile: Likewise.

diff --git a/ChangeLog b/ChangeLog
index 66df815..a4f756a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1998-06-23  Ulrich Drepper  <drepper@cygnus.com>
+
+       * config.make.in: Remove LDAP support.
+       * nss/Makefile: Likewise.
+
 1998-06-22 17:02  Ulrich Drepper  <drepper@cygnus.com>
 
        * sysdeps/generic/enbl-secure.c: Don't use __libc_uid.

diff --git a/config.make.in b/config.make.in
index f87169f..f957357 100644 (file)
--- a/config.make.in
+++ b/config.make.in
@@ -59,8 +59,6 @@ add-ons = @subdirs@
 cross-compiling = @cross_compiling@
 force-install = @force_install@
 
-LDAP = @LDAP@
-
 # Build tools.
 CC = @CC@
 BUILD_CC = @BUILD_CC@

diff --git a/nss/Makefile b/nss/Makefile
index e71794e..07529c7 100644 (file)
--- a/nss/Makefile
+++ b/nss/Makefile
@@ -41,7 +41,7 @@ tests                 = test-netdb
 include ../Makeconfig
 
 # Specify rules for the nss_* modules.  We have some services.
-services               := files db $(LDAP)
+services               := files db
 
 extra-libs             = $(services:%=libnss_%)
 # These libraries will be built in the `others' pass rather than
@@ -62,20 +62,12 @@ generated           += $(filter-out db-alias.c db-netgrp.c, \
                                        $(addsuffix .c,$(libnss_db-routines)))
 distribute             += db-XXX.c
 
-libnss_ldap-routines   := $(addprefix ldap-,proto) util ldap-nss
-
 
 # Build static module if requested
 ifneq ($(build-static-nss),yes)
 libnss_files-inhibit-o = $(filter-out .os,$(object-suffixes))
 endif
 libnss_db-inhibit-o    = $(filter-out .os,$(object-suffixes))
-libnss_ldap-inhibit-o  = $(filter-out .os,$(object-suffixes))
-
-# If we compile the LDAP module we need the headers from the LDAP library.
-ifneq ($(LDAP),)
-CPPFLAGS += -I../ldap
-endif
 
 include ../Rules
 
@@ -89,9 +81,6 @@ $(libnss_db-routines:%=$(objpfx)%.c): $(objpfx)db-%.c: nss_files/files-%.c
         echo '#include <$<>') > $@.new
        mv -f $@.new $@
 
-# To complete the LDAP NSS module we need functions from the LDAP library.
-$(objpfx)libnss_ldap.so: $(common-objpfx)ldap/libldap.so
-
 # Depend on libc.so so a DT_NEEDED is generated in the shared objects.
 # This ensures they will load libc.so for needed symbols if loaded by
 # a statically-linked program that hasn't already loaded it.