oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Make libtool pull in the depenency on libldap

Browse Source 
Put in explicy depenency on libdap so that libtool
might to the right thing for us.

Patch from Jan Rekorajski
This commit is contained in:
Love Hornquist Astrand
2009-12-08 00:15:10 -08:00
parent d57236a520
commit c867fd3e2e
6 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
kadmin/Makefile.am
View File

@@ -61,7 +61,6 @@ check_PROGRAMS = $(TESTS)
LDADD_common = \ LDADD_common = \
$(top_builddir)/lib/hdb/libhdb.la \ $(top_builddir)/lib/hdb/libhdb.la \
$(LIB_openldap) \
$(top_builddir)/lib/krb5/libkrb5.la \ $(top_builddir)/lib/krb5/libkrb5.la \
$(LIB_hcrypto) \ $(LIB_hcrypto) \
$(top_builddir)/lib/asn1/libasn1.la \ $(top_builddir)/lib/asn1/libasn1.la \

1
kcm/Makefile.am
View File

@@ -31,7 +31,6 @@ $(kcm_OBJECTS): $(srcdir)/kcm-protos.h
man_MANS = kcm.8 man_MANS = kcm.8
LDADD = $(top_builddir)/lib/hdb/libhdb.la \ LDADD = $(top_builddir)/lib/hdb/libhdb.la \
$(LIB_openldap) \
$(top_builddir)/lib/krb5/libkrb5.la \ $(top_builddir)/lib/krb5/libkrb5.la \
$(LIB_krb4) \ $(LIB_krb4) \
$(LIB_hcrypto) \ $(LIB_hcrypto) \

4
kdc/Makefile.am
View File

@@ -70,7 +70,6 @@ $(srcdir)/kdc-private.h:
hprop_LDADD = \ hprop_LDADD = \
$(top_builddir)/lib/hdb/libhdb.la \ $(top_builddir)/lib/hdb/libhdb.la \
$(LIB_openldap) \
$(top_builddir)/lib/krb5/libkrb5.la \ $(top_builddir)/lib/krb5/libkrb5.la \
$(LIB_kdb) $(LIB_krb4) \ $(LIB_kdb) $(LIB_krb4) \
$(LIB_hcrypto) \ $(LIB_hcrypto) \
@@ -80,7 +79,6 @@ hprop_LDADD = \
hpropd_LDADD = \ hpropd_LDADD = \
$(top_builddir)/lib/hdb/libhdb.la \ $(top_builddir)/lib/hdb/libhdb.la \
$(LIB_openldap) \
$(top_builddir)/lib/krb5/libkrb5.la \ $(top_builddir)/lib/krb5/libkrb5.la \
$(LIB_kdb) $(LIB_krb4) \ $(LIB_kdb) $(LIB_krb4) \
$(LIB_hcrypto) \ $(LIB_hcrypto) \
@@ -95,7 +93,6 @@ endif
libkdc_la_LIBADD = \ libkdc_la_LIBADD = \
$(LIB_pkinit) \ $(LIB_pkinit) \
$(top_builddir)/lib/hdb/libhdb.la \ $(top_builddir)/lib/hdb/libhdb.la \
$(LIB_openldap) \
$(top_builddir)/lib/krb5/libkrb5.la \ $(top_builddir)/lib/krb5/libkrb5.la \
$(LIB_kdb) $(LIB_krb4) \ $(LIB_kdb) $(LIB_krb4) \
$(top_builddir)/lib/ntlm/libheimntlm.la \ $(top_builddir)/lib/ntlm/libheimntlm.la \
@@ -105,7 +102,6 @@ libkdc_la_LIBADD = \
$(DBLIB) $(DBLIB)
LDADD = $(top_builddir)/lib/hdb/libhdb.la \ LDADD = $(top_builddir)/lib/hdb/libhdb.la \
$(LIB_openldap) \
$(top_builddir)/lib/krb5/libkrb5.la \ $(top_builddir)/lib/krb5/libkrb5.la \
$(LIB_krb4) \ $(LIB_krb4) \
$(LIB_hcrypto) \ $(LIB_hcrypto) \

1
kpasswd/Makefile.am
View File

@@ -19,7 +19,6 @@ kpasswdd_SOURCES = kpasswdd.c kpasswd_locl.h
kpasswdd_LDADD = \ kpasswdd_LDADD = \
$(top_builddir)/lib/kadm5/libkadm5srv.la \ $(top_builddir)/lib/kadm5/libkadm5srv.la \
$(top_builddir)/lib/hdb/libhdb.la \ $(top_builddir)/lib/hdb/libhdb.la \
$(LIB_openldap) \
$(LDADD) \ $(LDADD) \
$(LIB_pidfile) \ $(LIB_pidfile) \
$(LIB_dlopen) \ $(LIB_dlopen) \

6
lib/hdb/Makefile.am
View File

@@ -47,11 +47,13 @@ if OPENLDAP_MODULE
ldap_so = hdb_ldap.la ldap_so = hdb_ldap.la
hdb_ldap_la_SOURCES = hdb-ldap.c hdb_ldap_la_SOURCES = hdb-ldap.c
hdb_ldap_la_LDFLAGS = -module hdb_ldap_la_LDFLAGS = -module -avoid-version
hdb_ldap_la_LIBADD = $(LIB_openldap) libhdb.la
else else
ldap = hdb-ldap.c ldap = hdb-ldap.c
ldap_lib = $(LIB_openldap)
endif endif
@@ -95,7 +97,7 @@ libhdb_la_LIBADD = \
../asn1/libasn1.la \ ../asn1/libasn1.la \
$(LIB_sqlite3) \ $(LIB_sqlite3) \
$(LIBADD_roken) \ $(LIBADD_roken) \
$(LIB_openldap) \ $(ldap_lib) \
$(LIB_dlopen) \ $(LIB_dlopen) \
$(DBLIB) \ $(DBLIB) \
$(LIB_NDBM) $(LIB_NDBM)

2
lib/kadm5/Makefile.am
View File

@@ -125,7 +125,6 @@ man_MANS = kadm5_pwcheck.3 iprop.8 iprop-log.8
LDADD = \ LDADD = \
libkadm5srv.la \ libkadm5srv.la \
$(top_builddir)/lib/hdb/libhdb.la \ $(top_builddir)/lib/hdb/libhdb.la \
$(LIB_openldap) \
$(top_builddir)/lib/krb5/libkrb5.la \ $(top_builddir)/lib/krb5/libkrb5.la \
$(top_builddir)/lib/asn1/libasn1.la \ $(top_builddir)/lib/asn1/libasn1.la \
$(LIB_hcrypto) \ $(LIB_hcrypto) \
@@ -137,7 +136,6 @@ LDADD = \
iprop_log_LDADD = \ iprop_log_LDADD = \
libkadm5srv.la \ libkadm5srv.la \
$(top_builddir)/lib/hdb/libhdb.la \ $(top_builddir)/lib/hdb/libhdb.la \
$(LIB_openldap) \
$(top_builddir)/lib/krb5/libkrb5.la \ $(top_builddir)/lib/krb5/libkrb5.la \
$(top_builddir)/lib/asn1/libasn1.la \ $(top_builddir)/lib/asn1/libasn1.la \
$(LIB_hcrypto) \ $(LIB_hcrypto) \