From 54d0f2819cf0b557a1c81f7724e384d974e56ef6 Mon Sep 17 00:00:00 2001 From: Murray Cumming Date: Tue, 8 May 2007 11:11:50 +0000 Subject: [PATCH] trying to commit pmo-trunk-r1785 --- ChangeLog2 | 8 +++++++- configure.ac | 2 -- src/Makefile.am | 12 +++--------- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/ChangeLog2 b/ChangeLog2 index c619606..d448754 100644 --- a/ChangeLog2 +++ b/ChangeLog2 @@ -1,11 +1,17 @@ 2007-05-08 Murray Cumming + * configure.ac: + * src/Makefile.am: Reverted the use of AM_CONDITIONAL(), because it + caused an undefined symbol error: + modest-platform.c:84: undefined reference to `modest_osso_cb_hw_state_handler + +2007-05-08 Murray Cumming + * src/modest-tny-account-store.c: (modest_tny_account_store_alert): Adapt to the changed tinymail API, using a GError instead of a string message, so we can translate it in Modest. - 2007-05-08 Murray Cumming * src/maemo/modest-address-book.c: diff --git a/configure.ac b/configure.ac index 58cf1a8..aa69fac 100644 --- a/configure.ac +++ b/configure.ac @@ -148,8 +148,6 @@ else fi -AM_CONDITIONAL(BUILD_DBUSAPI, test x$dbus_api = xdbus_api) - dnl do we have the easy setup stuff? have_easysetup=false if test -d src/${with_platform}/easysetup; then diff --git a/src/Makefile.am b/src/Makefile.am index e85f56b..3802668 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,11 +1,7 @@ # # Makefile.am # Time-stamp: <2007-04-21 11:15:36 (djcb)> -SUBDIRS=$(MODEST_PLATFORM) widgets - -if BUILD_DBUSAPI -SUBDIRS += dbus_api -endif +SUBDIRS=$(MODEST_PLATFORM) widgets $(dbus_api) DIST_SUBDIRS = widgets gnome maemo dbus_api @@ -97,10 +93,8 @@ modest_LDADD = \ $(MODEST_LIBTINYMAIL_MAEMO_LIBS) \ ${easysetupmaybe} \ $(MODEST_PLATFORM)/libmodest-ui.la \ - widgets/libmodest-widgets.la + widgets/libmodest-widgets.la \ + dbus_api/libmodest-dbus-api.la -if BUILD_DBUSAPI - modest_LDADD += dbus_api/libmodest-dbus-api.la -endif EXTRA_DIST=modest-marshal.list -- 1.7.9.5