[Fedora-directory-commits] ldapserver Makefile.am, 1.76, 1.77 Makefile.in, 1.100, 1.101

Noriko Hosoi nhosoi at fedoraproject.org
Sun Oct 26 04:04:59 UTC 2008


Author: nhosoi

Update of /cvs/dirsec/ldapserver
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17390

Modified Files:
	Makefile.am Makefile.in 
Log Message:
Fixing the build on Solaris (ldap_agent_bin-main.o)



Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/ldapserver/Makefile.am,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- Makefile.am	23 Oct 2008 22:42:54 -0000	1.76
+++ Makefile.am	26 Oct 2008 04:04:56 -0000	1.77
@@ -970,6 +970,10 @@
 
 ldap_agent_bin_CPPFLAGS = $(AM_CPPFLAGS) @netsnmp_inc@ @ldapsdk_inc@ @nss_inc@ @nspr_inc@
 ldap_agent_bin_LDADD = $(LDAPSDK_LINK) $(SASL_LINK) $(NSS_LINK) $(NSPR_LINK) $(NETSNMP_LINK) 
+if SOLARIS
+ldap_agent_bin_LDADD += -lrt
+endif
+
 
 #------------------------
 # ldclt


Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/Makefile.in,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- Makefile.in	23 Oct 2008 22:48:01 -0000	1.100
+++ Makefile.in	26 Oct 2008 04:04:56 -0000	1.101
@@ -47,7 +47,8 @@
 	pwdhash-bin$(EXEEXT) rsearch-bin$(EXEEXT)
 noinst_PROGRAMS = makstrdb$(EXEEXT)
 @SOLARIS_TRUE at am__append_1 = ldap/servers/slapd/slapi_counter_sunos_sparcv9.S
- at SOLARIS_TRUE@am__append_2 = ldap/servers/slapd/tools/ldclt/opCheck.c
+ at SOLARIS_TRUE@am__append_2 = -lrt
+ at SOLARIS_TRUE@am__append_3 = ldap/servers/slapd/tools/ldclt/opCheck.c
 DIST_COMMON = $(am__configure_deps) $(dist_man_MANS) \
 	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(srcdir)/config.h.in $(top_srcdir)/configure compile \
@@ -628,7 +629,8 @@
 ldap_agent_bin_OBJECTS = $(am_ldap_agent_bin_OBJECTS)
 ldap_agent_bin_DEPENDENCIES = $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
 am__ldclt_bin_SOURCES_DIST = ldap/servers/slapd/tools/ldaptool-sasl.c \
 	ldap/servers/slapd/tools/ldclt/data.c \
 	ldap/servers/slapd/tools/ldclt/ldapfct.c \
@@ -1907,7 +1909,8 @@
 	ldap/servers/slapd/agtmmap.c
 
 ldap_agent_bin_CPPFLAGS = $(AM_CPPFLAGS) @netsnmp_inc@ @ldapsdk_inc@ @nss_inc@ @nspr_inc@
-ldap_agent_bin_LDADD = $(LDAPSDK_LINK) $(SASL_LINK) $(NSS_LINK) $(NSPR_LINK) $(NETSNMP_LINK) 
+ldap_agent_bin_LDADD = $(LDAPSDK_LINK) $(SASL_LINK) $(NSS_LINK) \
+	$(NSPR_LINK) $(NETSNMP_LINK) $(am__append_2)
 
 #------------------------
 # ldclt
@@ -1923,7 +1926,7 @@
 	ldap/servers/slapd/tools/ldclt/threadMain.c \
 	ldap/servers/slapd/tools/ldclt/utils.c \
 	ldap/servers/slapd/tools/ldclt/version.c \
-	ldap/servers/slapd/tools/ldclt/workarounds.c $(am__append_2)
+	ldap/servers/slapd/tools/ldclt/workarounds.c $(am__append_3)
 ldclt_bin_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/ldap/servers/slapd/tools @ldapsdk_inc@ @sasl_inc@ @nss_inc@ @nspr_inc@
 ldclt_bin_LDADD = $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) $(LIBNSL) $(LIBSOCKET) $(LIBDL)
 




More information about the Fedora-directory-commits mailing list