qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update. 

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

	* config.make.in: Remove LDAP support.
	* nss/Makefile: Likewise.
This commit is contained in:
Ulrich Drepper 1998-06-23 09:06:34 +00:00
parent a53bad166c
commit 520e73a231
3 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -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> 1998-06-22 17:02 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/generic/enbl-secure.c: Don't use __libc_uid. * sysdeps/generic/enbl-secure.c: Don't use __libc_uid.

2
config.make.in
View File

@ -59,8 +59,6 @@ add-ons = @subdirs@
cross-compiling = @cross_compiling@ cross-compiling = @cross_compiling@
force-install = @force_install@ force-install = @force_install@
LDAP = @LDAP@
# Build tools. # Build tools.
CC = @CC@ CC = @CC@
BUILD_CC = @BUILD_CC@ BUILD_CC = @BUILD_CC@

13
nss/Makefile
View File

@ -41,7 +41,7 @@ tests = test-netdb
include ../Makeconfig include ../Makeconfig
# Specify rules for the nss_* modules. We have some services. # Specify rules for the nss_* modules. We have some services.
services := files db $(LDAP) services := files db
extra-libs = $(services:%=libnss_%) extra-libs = $(services:%=libnss_%)
# These libraries will be built in the `others' pass rather than # 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))) $(addsuffix .c,$(libnss_db-routines)))
distribute += db-XXX.c distribute += db-XXX.c
libnss_ldap-routines := $(addprefix ldap-,proto) util ldap-nss
# Build static module if requested # Build static module if requested
ifneq ($(build-static-nss),yes) ifneq ($(build-static-nss),yes)
libnss_files-inhibit-o = $(filter-out .os,$(object-suffixes)) libnss_files-inhibit-o = $(filter-out .os,$(object-suffixes))
endif endif
libnss_db-inhibit-o = $(filter-out .os,$(object-suffixes)) 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 include ../Rules
@ -89,9 +81,6 @@ $(libnss_db-routines:%=$(objpfx)%.c): $(objpfx)db-%.c: nss_files/files-%.c
echo '#include <$<>') > $@.new echo '#include <$<>') > $@.new
mv -f $@.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. # 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 # This ensures they will load libc.so for needed symbols if loaded by
# a statically-linked program that hasn't already loaded it. # a statically-linked program that hasn't already loaded it.