Don't pass NULL hostname to ldap_pvt_tls_check_hostname, use "localhost"

[openldap] / libraries / libldap / Makefile.in

diff --git a/libraries/libldap/Makefile.in b/libraries/libldap/Makefile.in
index 53877ad0628cc288e66231881447e4b3b9194f01..731d3adb15e2d6e0fa0026284b62f4baff81216e 100644 (file)
--- a/libraries/libldap/Makefile.in
+++ b/libraries/libldap/Makefile.in
@@ -1,4 +1,5 @@
-## Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+# $OpenLDAP$
+## Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
 ## COPYING RESTRICTIONS APPLY, see COPYRIGHT file
 ##
 ## Makefile.in for LDAP -lldap
@@ -9,51 +10,74 @@ XLIBRARY = ../libldap.a
 PROGRAMS = apitest ltest ttest
 
 SRCS   = bind.c open.c result.c error.c compare.c search.c \
-       controls.c messages.c references.c \
-       modify.c add.c modrdn.c delete.c abandon.c ufn.c cache.c \
-       getfilter.c sbind.c kbind.c unbind.c friendly.c cldap.c \
+       controls.c messages.c references.c extended.c cyrus.c \
+       modify.c add.c modrdn.c delete.c abandon.c cache.c \
+       getfilter.c sasl.c sbind.c kbind.c unbind.c friendly.c \
        free.c disptmpl.c srchpref.c dsparse.c tmplout.c sort.c \
        getdn.c getentry.c getattr.c getvalues.c addentry.c \
-       request.c getdxbyname.c os-ip.c url.c charset.c \
-       init.c options.c strdup.c util-int.c
+       request.c os-ip.c url.c sortctrl.c vlvctrl.c \
+       init.c options.c print.c string.c util-int.c schema.c \
+       charray.c tls.c dn.c os-local.c dnssrv.c \
+       utf-8.c utf-8-conv.c
 OBJS   = bind.lo open.lo result.lo error.lo compare.lo search.lo \
-       controls.lo messages.lo references.lo \
-       modify.lo add.lo modrdn.lo delete.lo abandon.lo ufn.lo cache.lo \
-       getfilter.lo sbind.lo kbind.lo unbind.lo friendly.lo cldap.lo \
+       controls.lo messages.lo references.lo extended.lo cyrus.lo \
+       modify.lo add.lo modrdn.lo delete.lo abandon.lo cache.lo \
+       getfilter.lo sasl.lo sbind.lo kbind.lo unbind.lo friendly.lo \
        free.lo disptmpl.lo srchpref.lo dsparse.lo tmplout.lo sort.lo \
        getdn.lo getentry.lo getattr.lo getvalues.lo addentry.lo \
-       request.lo getdxbyname.lo os-ip.lo url.lo charset.lo \
-       init.lo options.lo strdup.lo util-int.lo
+       request.lo os-ip.lo url.lo sortctrl.lo vlvctrl.lo \
+       init.lo options.lo print.lo string.lo util-int.lo schema.lo \
+       charray.lo tls.lo dn.lo os-local.lo dnssrv.lo \
+       utf-8.lo utf-8-conv.lo
 
 LDAP_INCDIR= ../../include       
 LDAP_LIBDIR= ../../libraries
 
-LIBS = $(LDAP_LIBPATH) $(LDAP_LIBLDAP) $(LDAP_LIBLBER) $(AC_LIBS)
+XLIBS = -lldap -llber -llutil
+XXLIBS = $(SECURITY_LIBS) $(TLS_LIBS)
+
+LINKAGE = @LT_LIB_LINKAGE@
+
+NT_DYN_LIB_LIBS  = -llber -llutil $(AC_LIBS)
+NT_DYN_LIB_DEFS  = -DLBER_DECL=dllimport
+NT_DYN_TEST_DEFS = -DLBER_DECL=dllimport -DLDAP_DECL=dllimport
+
+NT_XXLIBS = $(SECURITY_LIBS)
+
+UNIX_DYN_LIB_LIBS  = -llber $(AC_LIBS)
+UNIX_XXLIBS = $(SECURITY_LIBS)
+
+# Extras for building the library
+EXTRA_DEFS = $(@PLAT@_@LIB_LINKAGE@_LIB_DEFS)
+EXTRA_LIBS = $(@PLAT@_@LIB_LINKAGE@_LIB_LIBS) $(@PLAT@_XXLIBS)
+
+# Only the test programs will pick up these defs.
+CPPFLAGS = $(@PLAT@_@LIB_LINKAGE@_TEST_DEFS)
 
 apitest:       $(LIBRARY) apitest.o $(LDAP_LIBLBER_DEPEND)
-       $(LTLINK) $(LDFLAGS) -o $@ apitest.o $(LIBS)
+       $(LTLINK) -o $@ apitest.o $(LIBS)
 ltest: $(LIBRARY) test.o $(LDAP_LIBLBER_DEPEND)
-       $(LTLINK) $(LDFLAGS) -o $@ test.o $(LIBS)
+       $(LTLINK) -o $@ test.o $(LIBS)
 ttest: $(LIBRARY) tmpltest.o $(LDAP_LIBLBER_DEPEND)
-       $(LTLINK) $(LDFLAGS) -o $@ tmpltest.o $(LIBS)
+       $(LTLINK) -o $@ tmpltest.o $(LIBS)
 
 CFFILES=ldap.conf ldapfilter.conf ldaptemplates.conf ldapsearchprefs.conf
 
 install-local: $(CFFILES) FORCE
-       -$(MKDIR) $(libdir)
-       $(LTINSTALL) $(INSTALLFLAGS) -m 644 $(LIBRARY) $(libdir)
-       -$(MKDIR) $(sysconfdir)
+       -$(MKDIR) $(DESTDIR)$(libdir)
+       $(LTINSTALL) $(INSTALLFLAGS) -m 644 $(LIBRARY) $(DESTDIR)$(libdir)
+       -$(MKDIR) $(DESTDIR)$(sysconfdir)
        @for i in $(CFFILES); do \
-               if test ! -f $(sysconfdir)/$$i; then \
+               if test ! -f $(DESTDIR)$(sysconfdir)/$$i; then \
                        echo "installing $$i in $(sysconfdir)"; \
-                       echo "$(INSTALL) $(INSTALLFLAGS) -m 644 $$i $(sysconfdir)/$$i"; \
-                       $(INSTALL) $(INSTALLFLAGS) -m 644 $$i $(sysconfdir)/$$i; \
+                       echo "$(INSTALL) $(INSTALLFLAGS) -m 644  $(srcdir)/$$i $(DESTDIR)$(sysconfdir)/$$i"; \
+                       $(INSTALL) $(INSTALLFLAGS) -m 644 $(srcdir)/$$i $(DESTDIR)$(sysconfdir)/$$i; \
                else \
                        echo "PRESERVING EXISTING CONFIGURATION FILE $(sysconfdir)/$$i" ; \
                fi; \
-               $(INSTALL) $(INSTALLFLAGS) -m 644 $$i $(sysconfdir)/$$i.default; \
+               $(INSTALL) $(INSTALLFLAGS) -m 644 $(srcdir)/$$i $(DESTDIR)$(sysconfdir)/$$i.default; \
        done
-       -$(MKDIR) $(datadir)
-       -$(MV) $(datadir)/ldapfriendly $(datadir)/ldapfriendly-
-       $(INSTALL) $(INSTALLFLAGS) -m 644 ldapfriendly $(datadir)/ldapfriendly
+       -$(MKDIR) $(DESTDIR)$(datadir)
+       -$(MV) $(DESTDIR)$(datadir)/ldapfriendly $(DESTDIR)$(datadir)/ldapfriendly-
+       $(INSTALL) $(INSTALLFLAGS) -m 644 $(srcdir)/ldapfriendly $(DESTDIR)$(datadir)/ldapfriendly