[Fedora-directory-commits] ldapserver/ldap/clients/dsgw Makefile, 1.6, 1.7

[Richard Allen Megginson (rmeggins)]

Author: rmeggins

Update of /cvs/dirsec/ldapserver/ldap/clients/dsgw
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13289

Modified Files:
	Makefile 
Log Message:
Some DSGW programs must not be linked with SSL, including the LDAP ssl library.  On RHEL3, this causes a linker error, but appears to be fine on other platforms.  So, just use the LDAP_NOSSL_LINK macro for those programs, and use the LDAPLINK macro for the other programs.



Index: Makefile
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/clients/dsgw/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Makefile	19 Apr 2005 22:07:01 -0000	1.6
+++ Makefile	25 Feb 2006 03:17:14 -0000	1.7
@@ -148,7 +148,7 @@
 LIBS_DEP = $(LIBLDAPU_DEP) $(LDAP_LIBLDBM_DEP) $(LDAP_LIBLDIF_DEP)
 LIBS_DEP += $(LDAPSDK_DEP) $(ICU_DEP) $(NSPR_DEP) $(DB_LIB_DEP)
 NSECLIBS = $(DISTLIBFLAG) $(SSLLIBFLAG) $(LINKOPTIONS) $(LIBLDAPU) \
-	$(LDAPLINK) $(ADMINUTIL_LINK) \
+	$(LDAP_NOSSL_LINK) $(ADMINUTIL_LINK) \
 	$(LDAP_LIBLDBM) $(ICULINK) $(NOSSLLIBS) \
 	$(LDAP_LIBLDIF) $(DBMLINK) $(ALIBS) \
 	$(THREADSLIB) $(NSPRLINK) $(LDAP_LIBLITEKEY)