diff options
| author | Rich Megginson <rmeggins@redhat.com> | 2007-02-06 15:51:22 +0000 |
|---|---|---|
| committer | Rich Megginson <rmeggins@redhat.com> | 2007-02-06 15:51:22 +0000 |
| commit | 27a8e752935491cb6c259f7bb15efb23d592ff8b (patch) | |
| tree | abb00d1cc95ec735431d53e5a18e858b9e371322 /Makefile.am | |
| parent | 12dd2b111c0188fd1e2aebb5fbca11ba11ab76ef (diff) | |
| download | ds-27a8e752935491cb6c259f7bb15efb23d592ff8b.tar.gz ds-27a8e752935491cb6c259f7bb15efb23d592ff8b.tar.xz ds-27a8e752935491cb6c259f7bb15efb23d592ff8b.zip | |
Resolves: bug 227452
Bug Description: Solaris build: Need to add other libs for autotool build
Reviewed by: nhosoi (Thanks!)
Fix Description: The AC_CHECK_LIB test for db_create needs -lnsl because libdb links with it on Solaris. Other executables require -lnsl, -lsocket, and -ldl. The strategy is to put these in the platform specific section in configure.ac so they can be exported to the Makefile. Then we can just use the macros directly in Makefile. On platforms where these are not required, they will evaluate to empty.
There was a bug in the regexp that derived the libdir from pkg-config in several m4 files. We needed to use .* instead of just *. pkg-config --libs-only-L returns multiple paths on Solaris but not on linux.
Platforms tested: Solaris 9
Flag Day: no
Doc impact: no
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am index 9b25d020..12bbe65c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -37,6 +37,10 @@ ICU_LINK = @icu_lib@ -licui18n -licuuc -licudata NETSNMP_LINK = @netsnmp_lib@ @netsnmp_link@ PAM_LINK = -lpam +LIBSOCKET=@LIBSOCKET@ +LIBNSL=@LIBNSL@ +LIBDL=@LIBDL@ + #------------------------ # Generated Sources #------------------------ @@ -680,7 +684,7 @@ libreplication_plugin_la_SOURCES = ldap/servers/plugins/replication/cl5_api.c \ ldap/servers/plugins/replication/windows_protocol_util.c \ ldap/servers/plugins/replication/windows_tot_protocol.c -libreplication_plugin_la_CPPFLAGS = @icu_inc@ @db_inc@ $(PLUGIN_CPPFLAGS) +libreplication_plugin_la_CPPFLAGS = $(PLUGIN_CPPFLAGS) @icu_inc@ @db_inc@ libreplication_plugin_la_LIBADD = $(ICU_LINK) $(DB_LINK) #------------------------ @@ -764,7 +768,7 @@ ds_newinst_bin_SOURCES = ldap/admin/src/cfg_sspt.c \ ldap/admin/src/script-gen.c ds_newinst_bin_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/ldap/admin/include @ldapsdk_inc@ @nss_inc@ @nspr_inc@ -ds_newinst_bin_LDADD = libds_admin.la $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) +ds_newinst_bin_LDADD = libds_admin.la $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) $(LIBNSL) $(LIBSOCKET) #------------------------ # dsktune @@ -780,7 +784,7 @@ infadd_bin_SOURCES = ldap/servers/slapd/tools/rsearch/addthread.c \ ldap/servers/slapd/tools/rsearch/nametable.c infadd_bin_CPPFLAGS = $(AM_CPPFLAGS) @ldapsdk_inc@ @nss_inc@ @nspr_inc@ -infadd_bin_LDADD = $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) +infadd_bin_LDADD = $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) $(LIBSOCKET) #------------------------ # ldap-agent @@ -812,7 +816,7 @@ ldclt_bin_SOURCES += ldap/servers/slapd/tools/ldclt/opCheck.c endif ldclt_bin_CPPFLAGS = $(AM_CPPFLAGS) @ldapsdk_inc@ @nss_inc@ @nspr_inc@ -ldclt_bin_LDADD = $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) +ldclt_bin_LDADD = $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) $(LIBNSL) $(LIBSOCKET) $(LIBDL) #------------------------ # ldif @@ -878,7 +882,7 @@ ns_slapd_SOURCES = ldap/servers/slapd/abandon.c \ ns_slapd_CPPFLAGS = $(AM_CPPFLAGS) @sasl_inc@ @ldapsdk_inc@ @nss_inc@ \ @nspr_inc@ @svrcore_inc@ ns_slapd_LDADD = libslapd.la libldaputil.a $(LDAPSDK_LINK) $(NSS_LINK) \ - $(NSPR_LINK) $(SASL_LINK) $(SVRCORE_LINK) + $(NSPR_LINK) $(SASL_LINK) $(SVRCORE_LINK) $(LIBNSL) $(LIBSOCKET) #------------------------ # pwdhash @@ -897,7 +901,7 @@ rsearch_bin_SOURCES = ldap/servers/slapd/tools/rsearch/nametable.c \ ldap/servers/slapd/tools/rsearch/searchthread.c rsearch_bin_CPPFLAGS = $(AM_CPPFLAGS) @ldapsdk_inc@ @nss_inc@ @nspr_inc@ -rsearch_bin_LDADD = $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) +rsearch_bin_LDADD = $(NSPR_LINK) $(NSS_LINK) $(LDAPSDK_LINK) $(SASL_LINK) $(LIBSOCKET) # these are for the config files and scripts that we need to generate and replace # the paths and other tokens with the real values set during configure/make |