diff options
| author | Rich Megginson <rmeggins@redhat.com> | 2007-08-09 23:59:59 +0000 |
|---|---|---|
| committer | Rich Megginson <rmeggins@redhat.com> | 2007-08-09 23:59:59 +0000 |
| commit | e381e43811ed2657c7f6a599abcc7c08b2a1bdc8 (patch) | |
| tree | deb59c0a0797155f15549fd4943125e614faa6eb | |
| parent | f3dac3953846e21ff457674da6fee0c907789f99 (diff) | |
| download | ds-e381e43811ed2657c7f6a599abcc7c08b2a1bdc8.tar.gz ds-e381e43811ed2657c7f6a599abcc7c08b2a1bdc8.tar.xz ds-e381e43811ed2657c7f6a599abcc7c08b2a1bdc8.zip | |
using ldap also pulls in nss and nspr, so we have to add those - also, put those first in the link line, so that the build finds the dirsec versions of those components and not the mozilla/seamonkey ones in libdir
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | Makefile.in | 3 | ||||
| -rwxr-xr-x | wrappers/ldap-agent.in | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index 6e9934b8..b0c943d8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -859,7 +859,7 @@ ldap_agent_bin_SOURCES = ldap/servers/snmp/main.c \ ldap/servers/slapd/agtmmap.c ldap_agent_bin_CPPFLAGS = $(AM_CPPFLAGS) @netsnmp_inc@ @ldapsdk_inc@ @nss_inc@ @nspr_inc@ -ldap_agent_bin_LDADD = $(NETSNMP_LINK) $(LDAPSDK_LINK) +ldap_agent_bin_LDADD = $(LDAPSDK_LINK) $(NSS_LINK) $(NSPR_LINK) $(NETSNMP_LINK) #------------------------ # ldclt diff --git a/Makefile.in b/Makefile.in index 56635e0d..403ad13f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -560,6 +560,7 @@ am_ldap_agent_bin_OBJECTS = \ ldap/servers/slapd/ldap_agent_bin-agtmmap.$(OBJEXT) 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__ldclt_bin_SOURCES_DIST = ldap/servers/slapd/tools/ldaptool-sasl.c \ ldap/servers/slapd/tools/ldclt/data.c \ @@ -1751,7 +1752,7 @@ ldap_agent_bin_SOURCES = ldap/servers/snmp/main.c \ ldap/servers/slapd/agtmmap.c ldap_agent_bin_CPPFLAGS = $(AM_CPPFLAGS) @netsnmp_inc@ @ldapsdk_inc@ @nss_inc@ @nspr_inc@ -ldap_agent_bin_LDADD = $(NETSNMP_LINK) $(LDAPSDK_LINK) +ldap_agent_bin_LDADD = $(LDAPSDK_LINK) $(NSS_LINK) $(NSPR_LINK) $(NETSNMP_LINK) #------------------------ # ldclt diff --git a/wrappers/ldap-agent.in b/wrappers/ldap-agent.in index f2fa57b7..0ee44a65 100755 --- a/wrappers/ldap-agent.in +++ b/wrappers/ldap-agent.in @@ -4,7 +4,7 @@ ## (1) Specify variables used by this script. ## ############################################################################### -LIB_DIR=@netsnmp_libdir@ +LIB_DIR=@nss_libdir@:@nspr_libdir@:@ldapsdk_libdir@:@netsnmp_libdir@ BIN_DIR=@bindir@ COMMAND=ldap-agent-bin |