[Fedora-directory-commits] ldapserver Makefile.am, 1.34, 1.35 aclocal.m4, 1.28, 1.29 configure, 1.37, 1.38 missing, 1.22, 1.23 install-sh, 1.22, 1.23 depcomp, 1.22, 1.23 compile, 1.22, 1.23 Makefile.in, 1.40, 1.41 config.sub, 1.21, 1.22 config.guess, 1.21, 1.22

[Richard Allen Megginson (rmeggins)]

Author: rmeggins

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

Modified Files:
	Makefile.am aclocal.m4 configure missing install-sh depcomp 
	compile Makefile.in config.sub config.guess 
Log Message:
Resolves: bug 233410
Description: version 1.1.0: bugs in build system (linking)
Fix Description: libds_admin needs to link with LDAPSDK_LINK and the server needs to link with SVRCORE



Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/ldapserver/Makefile.am,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- Makefile.am	16 Mar 2007 23:06:57 -0000	1.34
+++ Makefile.am	22 Mar 2007 15:16:26 -0000	1.35
@@ -262,7 +262,7 @@
 	ldap/admin/lib/dsalib_util.c
 
 libds_admin_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/ldap/admin/include @ldapsdk_inc@ @nss_inc@ @nspr_inc@
-libds_admin_la_LIBADD = $(NSS_LINK) $(NSPR_LINK)
+libds_admin_la_LIBADD = $(LDAPSDK_LINK) $(NSS_LINK) $(NSPR_LINK)
 
 #------------------------
 # libns-dshttpd
@@ -416,7 +416,7 @@
 	$(libavl_a_SOURCES)
 
 libslapd_la_CPPFLAGS = $(PLUGIN_CPPFLAGS) @db_inc@ @svrcore_inc@
-libslapd_la_LIBADD = $(LDAPSDK_LINK) $(NSS_LINK) $(NSPR_LINK)
+libslapd_la_LIBADD = $(LDAPSDK_LINK) $(SVRCORE_LINK) $(NSS_LINK) $(NSPR_LINK)
 
 
 #////////////////////////////////////////////////////////////////














Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/Makefile.in,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- Makefile.in	20 Mar 2007 18:46:45 -0000	1.40
+++ Makefile.in	22 Mar 2007 15:16:26 -0000	1.41
@@ -239,7 +239,7 @@
 libdna_plugin_la_OBJECTS = $(am_libdna_plugin_la_OBJECTS)
 @enable_dna_TRUE at am_libdna_plugin_la_rpath = -rpath $(serverplugindir)
 libds_admin_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1)
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 am_libds_admin_la_OBJECTS =  \
 	ldap/admin/lib/libds_admin_la-dsalib_conf.lo \
 	ldap/admin/lib/libds_admin_la-dsalib_confs.lo \
@@ -432,7 +432,7 @@
 	ldap/servers/plugins/roles/libroles_plugin_la-roles_plugin.lo
 libroles_plugin_la_OBJECTS = $(am_libroles_plugin_la_OBJECTS)
 libslapd_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1)
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
 am__objects_2 = ldap/libraries/libavl/libslapd_la-avl.lo
 am_libslapd_la_OBJECTS = ldap/servers/slapd/libslapd_la-add.lo \
 	ldap/servers/slapd/libslapd_la-agtmmap.lo \
@@ -1169,7 +1169,7 @@
 	ldap/admin/lib/dsalib_util.c
 
 libds_admin_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/ldap/admin/include @ldapsdk_inc@ @nss_inc@ @nspr_inc@
-libds_admin_la_LIBADD = $(NSS_LINK) $(NSPR_LINK)
+libds_admin_la_LIBADD = $(LDAPSDK_LINK) $(NSS_LINK) $(NSPR_LINK)
 
 #------------------------
 # libns-dshttpd
@@ -1323,7 +1323,7 @@
 	$(libavl_a_SOURCES)
 
 libslapd_la_CPPFLAGS = $(PLUGIN_CPPFLAGS) @db_inc@ @svrcore_inc@
-libslapd_la_LIBADD = $(LDAPSDK_LINK) $(NSS_LINK) $(NSPR_LINK)
+libslapd_la_LIBADD = $(LDAPSDK_LINK) $(SVRCORE_LINK) $(NSS_LINK) $(NSPR_LINK)
 
 #////////////////////////////////////////////////////////////////
 #