diff options
| author | Nathan Kinder <nkinder@redhat.com> | 2007-05-15 23:36:10 +0000 |
|---|---|---|
| committer | Nathan Kinder <nkinder@redhat.com> | 2007-05-15 23:36:10 +0000 |
| commit | 6949bf2301e9f2fc5c64f6f9f60f7c24c0f7f68e (patch) | |
| tree | 5a285ed000be7b94d0d9193e85ebe78277ac989a | |
| parent | 5b23a738b302e27b3d0d2d9b7c15381c0a30c4c0 (diff) | |
| download | ds-6949bf2301e9f2fc5c64f6f9f60f7c24c0f7f68e.tar.gz ds-6949bf2301e9f2fc5c64f6f9f60f7c24c0f7f68e.tar.xz ds-6949bf2301e9f2fc5c64f6f9f60f7c24c0f7f68e.zip | |
Resolves: 240240
Summary: Fixed linker problems when linking with ldap c sdk.
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | Makefile.in | 10 |
2 files changed, 8 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am index a4d87e8a..57fc66b3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -264,7 +264,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 = $(LDAPSDK_LINK) $(NSS_LINK) $(NSPR_LINK) +libds_admin_la_LIBADD = $(LDAPSDK_LINK) $(SASL_LINK) $(NSS_LINK) $(NSPR_LINK) #------------------------ # libns-dshttpd @@ -417,7 +417,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) $(SVRCORE_LINK) $(NSS_LINK) $(NSPR_LINK) +libslapd_la_LIBADD = $(LDAPSDK_LINK) $(SASL_LINK) $(SVRCORE_LINK) $(NSS_LINK) $(NSPR_LINK) #//////////////////////////////////////////////////////////////// diff --git a/Makefile.in b/Makefile.in index 9bc1ee33..c85fcc52 100644 --- a/Makefile.in +++ b/Makefile.in @@ -239,7 +239,8 @@ 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__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 \ @@ -431,7 +432,8 @@ 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__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 +1171,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 = $(LDAPSDK_LINK) $(NSS_LINK) $(NSPR_LINK) +libds_admin_la_LIBADD = $(LDAPSDK_LINK) $(SASL_LINK) $(NSS_LINK) $(NSPR_LINK) #------------------------ # libns-dshttpd @@ -1322,7 +1324,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) $(SVRCORE_LINK) $(NSS_LINK) $(NSPR_LINK) +libslapd_la_LIBADD = $(LDAPSDK_LINK) $(SASL_LINK) $(SVRCORE_LINK) $(NSS_LINK) $(NSPR_LINK) #//////////////////////////////////////////////////////////////// # |