diff options
| author | Rich Megginson <rmeggins@redhat.com> | 2007-03-22 15:16:26 +0000 |
|---|---|---|
| committer | Rich Megginson <rmeggins@redhat.com> | 2007-03-22 15:16:26 +0000 |
| commit | 82706f78cb737a55c2f904be9ff33fc0f3bfc6de (patch) | |
| tree | a31ff905860c0af6e450c9e6ab1e06a9405e1692 | |
| parent | 50f75f5520e36c793d7ebecf7137d30607501cc9 (diff) | |
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
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | Makefile.in | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am index a18ccddb..cf7c2659 100644 --- a/Makefile.am +++ b/Makefile.am @@ -262,7 +262,7 @@ libds_admin_la_SOURCES = ldap/admin/lib/dsalib_conf.c \ 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 @@ libslapd_la_SOURCES = ldap/servers/slapd/add.c \ $(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) #//////////////////////////////////////////////////////////////// diff --git a/Makefile.in b/Makefile.in index dd765dca..c685a108 100644 --- a/Makefile.in +++ b/Makefile.in @@ -239,7 +239,7 @@ am_libdna_plugin_la_OBJECTS = \ libdna_plugin_la_OBJECTS = $(am_libdna_plugin_la_OBJECTS) @enable_dna_TRUE@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 @@ am_libroles_plugin_la_OBJECTS = \ 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 @@ libds_admin_la_SOURCES = ldap/admin/lib/dsalib_conf.c \ 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 @@ libslapd_la_SOURCES = ldap/servers/slapd/add.c \ $(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) #//////////////////////////////////////////////////////////////// # |