[Fedora-directory-commits] ldapserver Makefile.am, 1.28, 1.29 Makefile.in, 1.32, 1.33

[Doctor Conrad]

Author: nkinder

Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30306

Modified Files:
	Makefile.am Makefile.in 
Log Message:
Resolves: 229428
Summary: Fixed issue with specifying linker to use for ns-slapd.



Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/ldapserver/Makefile.am,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- Makefile.am	21 Feb 2007 17:44:13 -0000	1.28
+++ Makefile.am	22 Feb 2007 19:29:47 -0000	1.29
@@ -914,6 +914,8 @@
 # some C++ shared libraries (such as icu).
 if HPUX
 ns_slapd_LINK = $(CXXLINK)
+else
+ns_slapd_LINK = $(LINK)
 endif
 
 #------------------------


Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/Makefile.in,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- Makefile.in	21 Feb 2007 17:44:13 -0000	1.32
+++ Makefile.in	22 Feb 2007 19:29:47 -0000	1.33
@@ -1778,6 +1778,7 @@
 ns_slapd_LDADD = libslapd.la libldaputil.a $(LDAPSDK_LINK) $(NSS_LINK) \
 	$(NSPR_LINK) $(SASL_LINK) $(SVRCORE_LINK) $(LIBNSL) $(LIBSOCKET)
 
+@HPUX_FALSE@ns_slapd_LINK = $(LINK)
 # We need to link ns-slapd with the C++ compiler on HP-UX since we load
 # some C++ shared libraries (such as icu).
 @HPUX_TRUE@ns_slapd_LINK = $(CXXLINK)