* fix the fallout of the configuration changes - builds again now

pmo-trunk-r2385

diff --git a/configure.ac b/configure.ac
index ca2e615..5f2f9ea 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -82,17 +82,18 @@ AC_ARG_WITH(platform,
 esac], [MODEST_PLATFORM=gnome
                with_platform=gnome])
 
-
+have_easysetup=false
 if test "x$with_platform" == "xgnome"; then
       PKG_CHECK_MODULES(MODEST_PLATFORM,libtinymail-gnome-desktop-1.0 libnm_glib glib-2.0 >= 2.8 gtk+-2.0 >= 2.10 libnotify)
     AC_DEFINE_UNQUOTED(MODEST_PLATFORM_GNOME, 1, ["Whether modest is being built for the GNOME platform."])
 else
+    have_easysetup=true
     PKG_CHECK_MODULES(MODEST_PLATFORM,libosso conic libtinymail-maemo-1.0 osso-addressbook-1.0 libebook-1.2 libalarm)
     AC_DEFINE_UNQUOTED(MODEST_PLATFORM_MAEMO, 1, ["Whether modest is being built for the MAEMO platform."])
+    AC_DEFINE_UNQUOTED(MODEST_HAVE_EASYSETUP, 1, ["Whether we have the easysetup feature"])
 fi                 
 
-
-
+AM_CONDITIONAL(MODEST_HAVE_EASYSETUP,test "x$have_easysetup" == "xtrue")
 AC_SUBST(MODEST_PLATFORM)
 
 
@@ -100,8 +101,6 @@ AC_SUBST(MODEST_PLATFORM)
 
 
 
-
-
 #
 # check for wpeditor or libwpeditor-plus
 #

diff --git a/src/Makefile.am b/src/Makefile.am
index a755674..ee460a5 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -9,7 +9,10 @@ DIST_SUBDIRS = widgets gnome maemo dbus_api
 INCLUDES=\
        $(MODEST_GSTUFF_CFLAGS)\
        $(MODEST_PLATFORM_CFLAGS) \
+       $(MODEST_HILDON_WIDGETS_CFLAGS) \
        $(MODEST_OGS_CFLAGS) \
+       $(MODEST_HILDON_HELP_CFLAGS) \
+       $(MODEST_HILDON_NOTIFY_CFLAGS) \
        -I$(MODEST_PLATFORM) \
        -DPREFIX=\"@prefix@\" \
        -DMAEMO_CHANGES \
@@ -110,6 +113,9 @@ modest_LDFLAGS = $(MAEMO_LAUNCHER_LDFLAGS)
 modest_LDADD =                                                 \
        $(MODEST_GSTUFF_LIBS)                           \
        $(MODEST_PLATFORM_LIBS)                         \
+       $(MODEST_HILDON_WIDGETS_LIBS)                   \
+       $(MODEST_HILDON_HELP_LIBS)                      \
+       $(MODEST_HILDON_NOTIFY_LIBS)                    \
        $(MODEST_OGS_LIBS)                              \
        ${easysetupmaybe}                               \
        $(MODEST_PLATFORM)/libmodest-ui.la              \

diff --git a/src/dbus_api/Makefile.am b/src/dbus_api/Makefile.am
index 9105bae..b5b31f8 100644 (file)
--- a/src/dbus_api/Makefile.am
+++ b/src/dbus_api/Makefile.am
@@ -29,9 +29,9 @@
 
 INCLUDES=\
        $(MODEST_GSTUFF_CFLAGS) \
-       $(MODEST_LIBTINYMAIL_MAEMO_CFLAGS) \
-       $(OGS_CFLAGS) \
-       -DMODEST_PLATFORM_ID=$(MODEST_PLATFORM_ID) \
+       $(MODEST_PLATFORM_CFLAGS) \
+       $(MODEST_HILDON_WIDGETS_CFLAGS)\
+       $(MODEST_OGS_CFLAGS) \
        -I ${top_srcdir}/src/widgets  \
        -I ${top_srcdir}/src  \
        -DPREFIX=\"@prefix@\" \
@@ -50,6 +50,7 @@ libmodest_dbus_api_la_SOURCES=              \
 
 LDADD = \
        $(MODEST_GSTUFF_LIBS) \
-       $(MODEST_LIBTINYMAIL_MAEMO_LIBS) \
-       $(OGS_LIBS)
+       $(MODEST_PLATFORM_LIBS) \
+       $(MODEST_HILDON_WIDGETS_LIBS) \
+       $(MODEST_OGS_LIBS)
 

diff --git a/src/maemo/modest-address-book.c b/src/maemo/modest-address-book.c
index 977357b..fc4d186 100644 (file)
--- a/src/maemo/modest-address-book.c
+++ b/src/maemo/modest-address-book.c
@@ -326,9 +326,9 @@ commit_contact(EContact * contact)
                return;
 
 #ifdef MODEST_HAVE_OLD_ABOOK   
-       osso_abook_contact_commit(contact, FALSE, book, NULL);
-#else
        osso_abook_contact_commit(contact, FALSE, book);
+#else
+       osso_abook_contact_commit(contact, FALSE, book, NULL);
 #endif /* MODEST_HILDON_VERSION_0 */
 }
 

diff --git a/src/widgets/Makefile.am b/src/widgets/Makefile.am
index 62bfc5f..a8fdc3b 100644 (file)
--- a/src/widgets/Makefile.am
+++ b/src/widgets/Makefile.am
@@ -5,6 +5,7 @@
 INCLUDES=\
        $(MODEST_GSTUFF_CFLAGS) \
        $(MODEST_PLATFORM_CFLAGS) \
+       $(MODEST_HILDON_WIDGETS_CFLAGS) \
        -I ${top_srcdir}/src/$(MODEST_PLATFORM) \
        -I ${top_srcdir}/src \
        -DPREFIX=\"@prefix@\" \
@@ -68,4 +69,5 @@ libmodest_widgets_la_SOURCES=          \
 
 LDADD = \
        $(MODEST_GSTUFF_LIBS)                           \
-       $(MODEST_PLATFORM_LIBS)
+       $(MODEST_PLATFORM_LIBS)                         \
+       $(MODEST_HILDON_WIDGETS_LIBS)