From 4ea4d5b68567ae01749d68c348e13f935814d0a8 Mon Sep 17 00:00:00 2001 From: "Dirk-Jan C. Binnema" Date: Mon, 26 Nov 2007 21:02:51 +0000 Subject: [PATCH] * fix some of the fallout of the last commit pmo-trunk-r3822 --- configure.ac | 12 +++++++++--- src/Makefile.am | 1 + src/maemo/Makefile.am | 6 ++++-- src/maemo/modest-maemo-global-settings-dialog.c | 5 ++++- src/widgets/Makefile.am | 1 + 5 files changed, 19 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index 7530d50..0ed0071 100644 --- a/configure.ac +++ b/configure.ac @@ -155,6 +155,11 @@ PKG_CHECK_MODULES(MODEST_LIBCONIC,conic,have_libconic=true,have_libconic=false) if test "x$have_libconic" == "xtrue"; then AC_DEFINE_UNQUOTED(MODEST_HAVE_HILDON_GTK,1,["Whether modest is being built with Hildon/Gtk"]) AC_DEFINE_UNQUOTED(MODEST_HAVE_CONIC,1,["Whether modest has conic available"]) + AC_SUBST(MODEST_LIBCONIC_CLAGS) + AC_SUBST(MODEST_LIBCONIC_LIBS) +else +# if we define this, tinymail will not try to #include conic headers + CFLAGS="$CFLAGS -DLIBTINYMAIL_MAEMO_WITHOUT_CONIC" fi fi @@ -427,11 +432,12 @@ echo "Platform : $with_platform" echo "Prefix : ${prefix}" echo "Build tests : $build_tests" echo "Build docs : $build_docs" -echo "Gettext Packages : $GETTEXT_PACKAGE" +echo "Gettext Package : $GETTEXT_PACKAGE" echo "Editor lib : $wpeditor" -echo "Addressbook : $addressbook" +echo "Addressbook : $have_abook" echo "Help lib : $helplib" -echo "Alarm : $libalarm" +echo "libconic support : $have_libconic" +echo "Alarm : $have_libalarm" echo "Hildon-Notify : $have_hildon_notify" echo "LibOGS support : $have_ogs_support" echo "MozEmbed support : $use_mozembed" diff --git a/src/Makefile.am b/src/Makefile.am index 65922a1..def0b21 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -12,6 +12,7 @@ INCLUDES=\ $(MODEST_HILDON_WIDGETS_CFLAGS) \ $(MODEST_OGS_CFLAGS) \ $(MODEST_HILDON_HELP_CFLAGS) \ + $(MODEST_LIBCONIC_CFLAGS) \ $(MODEST_HILDON_NOTIFY_CFLAGS) \ $(MODEST_MOZEMBED_CFLAGS) \ -I$(MODEST_PLATFORM) \ diff --git a/src/maemo/Makefile.am b/src/maemo/Makefile.am index 27657af..5993b02 100644 --- a/src/maemo/Makefile.am +++ b/src/maemo/Makefile.am @@ -35,6 +35,7 @@ INCLUDES=\ $(MODEST_ABOOK_CFLAGS) \ $(MODEST_HILDON_WIDGETS_CFLAGS) \ $(MODEST_HILDON_HELP_CFLAGS) \ + $(MODEST_LIBCONIC_CFLAGS) \ $(MODEST_HILDON_MIME_CFLAGS) \ $(MODEST_HILDON_NOTIFY_CFLAGS) \ $(MODEST_LIBALARM_CFLAGS) \ @@ -92,9 +93,10 @@ libmodest_ui_la_LIBADD = \ $(MODEST_WPEDITOR_LIBS) \ $(MODEST_HILDON_WIDGETS_LIBS) \ $(MODEST_HILDON_MIME_LIBS) \ + $(MODEST_LIBCONIC_LIBS) \ $(MODEST_HILDON_HELP_LIBS) \ - $(MODEST_LIBALARM_LIBS) \ - $(MODEST_HILDON_NOTIFY_LIBS)\ + $(MODEST_LIBALARM_LIBS) \ + $(MODEST_HILDON_NOTIFY_LIBS) \ easysetup/libmodest-easysetup.la PIXMAP_FILES=\ diff --git a/src/maemo/modest-maemo-global-settings-dialog.c b/src/maemo/modest-maemo-global-settings-dialog.c index 8499fb9..9ff3ea4 100644 --- a/src/maemo/modest-maemo-global-settings-dialog.c +++ b/src/maemo/modest-maemo-global-settings-dialog.c @@ -31,6 +31,10 @@ #include #endif /*HAVE_CONFIG_H*/ +#ifdef MODEST_HAVE_CONIC +#include +#endif /*MODEST_HAVE_CONIC*/ + #include #include @@ -51,7 +55,6 @@ #include - #define MSG_SIZE_MAX_VAL 5000 #define MSG_SIZE_DEF_VAL 1000 #define MSG_SIZE_MIN_VAL 1 diff --git a/src/widgets/Makefile.am b/src/widgets/Makefile.am index 6c8370b..f332e03 100644 --- a/src/widgets/Makefile.am +++ b/src/widgets/Makefile.am @@ -8,6 +8,7 @@ INCLUDES=\ $(MODEST_HILDON_WIDGETS_CFLAGS) \ $(MODEST_HILDON_HELP_CFLAGS) \ $(MODEST_MOZEMBED_CFLAGS) \ + $(MODEST_HILDON_NOTIFY_CFLAGS) \ -I ${top_srcdir}/src/$(MODEST_PLATFORM) \ -I ${top_srcdir}/src \ -DPREFIX=\"@prefix@\" \ -- 1.7.9.5