aboutsummaryrefslogtreecommitdiffstats
path: root/wombat
diff options
context:
space:
mode:
Diffstat (limited to 'wombat')
-rw-r--r--wombat/ChangeLog6
-rw-r--r--wombat/Makefile.am6
2 files changed, 9 insertions, 3 deletions
diff --git a/wombat/ChangeLog b/wombat/ChangeLog
index 6ff500c3d7..6a50f43730 100644
--- a/wombat/ChangeLog
+++ b/wombat/ChangeLog
@@ -1,3 +1,9 @@
+2002-04-04 Ettore Perazzoli <ettore@ximian.com>
+
+ * Makefile.am (wombat_LDADD): Put DB3_LDADD and LDAP_LIBS on the
+ top so the PAS backend uses the right version of DB3 and always
+ links to LDAP.
+
2002-03-19 Dan Winship <danw@ximian.com>
* Makefile.am (wombat_LDADD): s/libversit.la/libversit.a/
diff --git a/wombat/Makefile.am b/wombat/Makefile.am
index d7f57d9e91..9d7443da6c 100644
--- a/wombat/Makefile.am
+++ b/wombat/Makefile.am
@@ -25,6 +25,8 @@ wombat_SOURCES = \
wombat_LDADD = \
$(top_builddir)/addressbook/backend/pas/libpas.a \
+ $(DB3_LDADD) \
+ $(LDAP_LIBS) \
$(top_builddir)/addressbook/backend/ebook/libebook.la \
$(top_builddir)/camel/libcamel.la \
$(top_builddir)/libibex/libibex.la \
@@ -35,9 +37,7 @@ wombat_LDADD = \
$(top_builddir)/libversit/libversit.a \
$(top_builddir)/e-util/libedb3util.la \
$(top_builddir)/e-util/libeutil.la \
- $(top_builddir)/libwombat/libwombat.la \
- $(WOMBAT_LIBS) \
- $(DB3_LDADD)
+ $(top_builddir)/libwombat/libwombat.la
oafdir = $(datadir)/oaf