From c867fd3e2ef9df4637a0f9a43259718d2782b3e8 Mon Sep 17 00:00:00 2001
From: Love Hornquist Astrand <lha@h5l.org>
Date: Tue, 8 Dec 2009 00:15:10 -0800
Subject: [PATCH] Make libtool pull in the depenency on libldap

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

Patch from Jan Rekorajski
---
 kadmin/Makefile.am    | 1 -
 kcm/Makefile.am       | 1 -
 kdc/Makefile.am       | 4 ----
 kpasswd/Makefile.am   | 1 -
 lib/hdb/Makefile.am   | 6 ++++--
 lib/kadm5/Makefile.am | 2 --
 6 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/kadmin/Makefile.am b/kadmin/Makefile.am
index 03617ee79..327ee1d05 100644
--- a/kadmin/Makefile.am
+++ b/kadmin/Makefile.am
@@ -61,7 +61,6 @@ check_PROGRAMS = $(TESTS)
 
 LDADD_common = \
 	$(top_builddir)/lib/hdb/libhdb.la \
-	$(LIB_openldap) \
 	$(top_builddir)/lib/krb5/libkrb5.la \
 	$(LIB_hcrypto) \
 	$(top_builddir)/lib/asn1/libasn1.la \
diff --git a/kcm/Makefile.am b/kcm/Makefile.am
index 5973d9759..519a8aab6 100644
--- a/kcm/Makefile.am
+++ b/kcm/Makefile.am
@@ -31,7 +31,6 @@ $(kcm_OBJECTS): $(srcdir)/kcm-protos.h
 man_MANS = kcm.8
 
 LDADD = $(top_builddir)/lib/hdb/libhdb.la \
-	$(LIB_openldap) \
 	$(top_builddir)/lib/krb5/libkrb5.la \
 	$(LIB_krb4) \
 	$(LIB_hcrypto) \
diff --git a/kdc/Makefile.am b/kdc/Makefile.am
index cd3ab84a7..b87fa02d5 100644
--- a/kdc/Makefile.am
+++ b/kdc/Makefile.am
@@ -70,7 +70,6 @@ $(srcdir)/kdc-private.h:
 
 hprop_LDADD = \
 	$(top_builddir)/lib/hdb/libhdb.la \
-	$(LIB_openldap) \
 	$(top_builddir)/lib/krb5/libkrb5.la \
 	$(LIB_kdb) $(LIB_krb4) \
 	$(LIB_hcrypto) \
@@ -80,7 +79,6 @@ hprop_LDADD = \
 
 hpropd_LDADD = \
 	$(top_builddir)/lib/hdb/libhdb.la \
-	$(LIB_openldap) \
 	$(top_builddir)/lib/krb5/libkrb5.la \
 	$(LIB_kdb) $(LIB_krb4) \
 	$(LIB_hcrypto) \
@@ -95,7 +93,6 @@ endif
 libkdc_la_LIBADD = \
 	$(LIB_pkinit) \
 	$(top_builddir)/lib/hdb/libhdb.la \
-	$(LIB_openldap) \
 	$(top_builddir)/lib/krb5/libkrb5.la \
 	$(LIB_kdb) $(LIB_krb4) \
 	$(top_builddir)/lib/ntlm/libheimntlm.la \
@@ -105,7 +102,6 @@ libkdc_la_LIBADD = \
 	$(DBLIB) 
 
 LDADD = $(top_builddir)/lib/hdb/libhdb.la \
-	$(LIB_openldap) \
 	$(top_builddir)/lib/krb5/libkrb5.la \
 	$(LIB_krb4) \
 	$(LIB_hcrypto) \
diff --git a/kpasswd/Makefile.am b/kpasswd/Makefile.am
index 83509053e..2c1d3056c 100644
--- a/kpasswd/Makefile.am
+++ b/kpasswd/Makefile.am
@@ -19,7 +19,6 @@ kpasswdd_SOURCES = kpasswdd.c kpasswd_locl.h
 kpasswdd_LDADD = \
 	$(top_builddir)/lib/kadm5/libkadm5srv.la \
 	$(top_builddir)/lib/hdb/libhdb.la \
-	$(LIB_openldap) \
 	$(LDADD) \
 	$(LIB_pidfile) \
 	$(LIB_dlopen) \
diff --git a/lib/hdb/Makefile.am b/lib/hdb/Makefile.am
index 2310f4c44..6925cc601 100644
--- a/lib/hdb/Makefile.am
+++ b/lib/hdb/Makefile.am
@@ -47,11 +47,13 @@ if OPENLDAP_MODULE
 
 ldap_so = hdb_ldap.la
 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
 
 ldap = hdb-ldap.c
+ldap_lib = $(LIB_openldap)
 
 endif
 
@@ -95,7 +97,7 @@ libhdb_la_LIBADD = \
 	../asn1/libasn1.la \
 	$(LIB_sqlite3) \
 	$(LIBADD_roken) \
-	$(LIB_openldap) \
+	$(ldap_lib) \
 	$(LIB_dlopen) \
 	$(DBLIB) \
 	$(LIB_NDBM)
diff --git a/lib/kadm5/Makefile.am b/lib/kadm5/Makefile.am
index 6a56c0221..09f6d4b95 100644
--- a/lib/kadm5/Makefile.am
+++ b/lib/kadm5/Makefile.am
@@ -125,7 +125,6 @@ man_MANS = kadm5_pwcheck.3 iprop.8 iprop-log.8
 LDADD = \
 	libkadm5srv.la \
 	$(top_builddir)/lib/hdb/libhdb.la \
-	$(LIB_openldap) \
 	$(top_builddir)/lib/krb5/libkrb5.la \
 	$(top_builddir)/lib/asn1/libasn1.la \
 	$(LIB_hcrypto) \
@@ -137,7 +136,6 @@ LDADD = \
 iprop_log_LDADD = \
 	libkadm5srv.la \
 	$(top_builddir)/lib/hdb/libhdb.la \
-	$(LIB_openldap) \
 	$(top_builddir)/lib/krb5/libkrb5.la \
 	$(top_builddir)/lib/asn1/libasn1.la \
 	$(LIB_hcrypto) \