Merge LDAP_TCP_WRAPPER fix from -devel

diff --git a/build/Make-append b/build/Make-append
index 67a2f29bb05ed286bbce22a89c0354552081bf69..bd782ee9ab326033fafd2da45f6b44aae573d45d 100644 (file)
--- a/build/Make-append
+++ b/build/Make-append
@@ -1,8 +1,21 @@
-#
+#-----------------------------------------------------------------------------
 # Do NOT edit this file -- it is automatically appended to all Makefiles
 # except the LDAP top-level Makefile. See the LDAP INSTALL file for more
 # information.
+#-----------------------------------------------------------------------------
+# Copyright 1998 The OpenLDAP Foundation, Redwood City, California, USA
+# All rights reserved.
 #
+# Redistribution and use in source and binary forms are permitted only
+# as authorized by the OpenLDAP Public License.  A copy of this
+# license is available at http://www.OpenLDAP.org/license.html or
+# in file LICENSE in the top-level directory of the distribution.
+#
+# This work is derived from the University of Michigan LDAP v3.3
+# distribution.  Information concerning is available at
+#      http://www.umich.edu/~dirsvcs/ldap/ldap.html.
+#
+# This work also contains materials derived from public sources.
 #-----------------------------------------------------------------------------
 # Copyright (c) 1994 Regents of the University of Michigan.
 # All rights reserved.
@@ -22,13 +35,18 @@
 DEFS   = $(PLATFORMCFLAGS) $(LDAP_DEBUG) $(KERBEROS) $(AFSKERBEROS) \
                $(UOFM) $(UOFA) $(NO_USERINTERFACE) $(CLDAP) $(NO_CACHE) \
                $(LDAP_REFERRALS) $(LDAP_DNS) $(STR_TRANSLATION) \
-               $(LIBLDAP_CHARSETS) $(LIBLDAP_DEF_CHARSET) \
-               $(SLAPD_BACKENDS) $(LDBMBACKEND) $(LDBMINCLUDE) $(PHONETIC)
+               $(LIBLDAP_CHARSETS) $(LIBLDAP_DEF_CHARSET)
+
+# LDBMDEFS are included by servers (though only slapd only cares)
+# and libldbm 
+LDBMDEFS = $(SLAPD_BACKENDS) $(LDBMBACKEND) $(LDBMINCLUDE)
 
 # SERVERDEFS are added to server builds CFLAGS (in addition to DEFS)
 SERVERDEFS     = $(ISODEPACKAGE) $(ICRELEASE) $(LDAP_USE_PP) \
-                       $(NO_SETPROCTITLE) $(PEPSY_DUMP)
-
+                       $(NO_SETPROCTITLE) $(PEPSY_DUMP) \
+                       $(LDAP_REVERSE_LOOKUP) $(LDAP_CRYPT) $(LDAP_ACLGROUP) \
+                       $(LDAP_TCP_WRAPPERS) \
+                       $(PHONETIC) $(LDBMDEFS)
 #
 # ISODELIBS are used in server/ldapd builds
 #
@@ -65,7 +83,7 @@ INSTALL       = install
 INSTALLFLAGS = -c
 BASENAME= basename
 DIRNAME        = dirname
-MKDEP  = $(LDAPSRC)/build/mkdep -s -f Make-template
+MKDEP  = $(LDAPSRC)/build/mkdep -s -f Makefile
 PWD    = pwd
 DATE   = date
 HOSTNAME= hostname