From ac8a485004f825ce0294a2c12220112186713b74 Mon Sep 17 00:00:00 2001 From: "richm%stanfordalumni.org" Date: Wed, 19 Apr 2006 03:03:54 +0000 Subject: [PATCH] only link with svrcore if HAVE_SVRCORE is set git-svn-id: svn://10.0.0.236/trunk@194661 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/directory/c-sdk/ldap/clients/tools/Makefile.in | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/mozilla/directory/c-sdk/ldap/clients/tools/Makefile.in b/mozilla/directory/c-sdk/ldap/clients/tools/Makefile.in index cbde82ec17e..33ba9e61467 100644 --- a/mozilla/directory/c-sdk/ldap/clients/tools/Makefile.in +++ b/mozilla/directory/c-sdk/ldap/clients/tools/Makefile.in @@ -148,7 +148,9 @@ EXTRA_LIBS += $(DIST)/$(OBJDIR_NAME)/lib/$(LDAP_LIBNAME).lib EXTRA_LIBS += $(DIST)/$(OBJDIR_NAME)/lib/$(LBER_LIBNAME).lib EXTRA_LIBS += $(DIST)/$(OBJDIR_NAME)/lib/$(LDIF_LIBNAME).lib EXTRA_LIBS += $(DIST)/$(OBJDIR_NAME)/lib/$(UTIL_LIBNAME).lib +ifeq ($(HAVE_SVRCORE), 1) EXTRA_LIBS += $(SVRCORE_LINK) +endif EXTRA_LIBS += $(NSSLINK) EXTRA_LIBS += $(NSPRLINK) else @@ -156,7 +158,11 @@ else # linkers EXTRA_LIBS = -L$(DIST)/$(OBJDIR_NAME)/lib -l$(SSLDAP_LIBNAME) \ -l$(PRLDAP_LIBNAME) -l$(LDAP_LIBNAME) -l$(LDIF_LIBNAME) \ - -L$(DIST)/lib $(SVRCORE_LINK) $(LDAPTOOLS_NSS_LINK) $(NSPRLINK) + -L$(DIST)/lib +ifeq ($(HAVE_SVRCORE), 1) +EXTRA_LIBS += $(SVRCORE_LINK) +endif +EXTRA_LIBS += $(LDAPTOOLS_NSS_LINK) $(NSPRLINK) endif # set platform specific libs