Moved DBUSAPI to an AM_CONDITIONAL

pmo-trunk-r1780

diff --git a/configure.ac b/configure.ac
index aa69fac..58cf1a8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -148,6 +148,8 @@ 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 9d92a5a..e85f56b 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,12 @@
 #
 # Makefile.am
 # Time-stamp: <2007-04-21 11:15:36 (djcb)>
-SUBDIRS=$(MODEST_PLATFORM) widgets $(dbus_api)
+SUBDIRS=$(MODEST_PLATFORM) widgets
+
+if BUILD_DBUSAPI
+SUBDIRS += dbus_api
+endif
+
 DIST_SUBDIRS = widgets gnome maemo dbus_api
 
 INCLUDES=\
@@ -92,7 +97,10 @@ modest_LDADD =                                               \
        $(MODEST_LIBTINYMAIL_MAEMO_LIBS)                \
        ${easysetupmaybe}                               \
        $(MODEST_PLATFORM)/libmodest-ui.la              \
-       widgets/libmodest-widgets.la \
-       dbus_api/libmodest-dbus-api.la          
+       widgets/libmodest-widgets.la
+
+if BUILD_DBUSAPI
+       modest_LDADD += dbus_api/libmodest-dbus-api.la          
+endif
 
 EXTRA_DIST=modest-marshal.list