* src/modest-mail-operation.[ch]:

[modest] / configure.ac

diff --git a/configure.ac b/configure.ac
index 7530d50..6083367 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -32,7 +32,6 @@ AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_SRCDIR(src/modest-main.c)
 AM_INIT_AUTOMAKE([dist-bzip2])
 
-
 ALL_LINGUAS="en_GB"
 
 MODEST_LOCALE_DIR='$prefix/${DATADIRNAME}/locale'
@@ -47,6 +46,7 @@ fi
 AC_SUBST(prefix)
 
 AC_PROG_CC
+AC_PROG_CXX
 AM_PROG_CC_STDC
 AC_HEADER_STDC
 AC_PROG_LIBTOOL
@@ -69,24 +69,58 @@ PKG_CHECK_MODULES(MODEST_GSTUFF,glib-2.0 >= 2.6 gobject-2.0 gtk+-2.0 >= 2.6 gcon
 AC_SUBST(MODEST_GSTUFF_CFLAGS)
 AC_SUBST(MODEST_GSTUFF_LIBS)
 
+modest_save_cflags="$CFLAGS"
+modest_save_libs="$LIBS"
+CFLAGS="$MODEST_GSTUFF_CFLAGS"
+LIBS="$MODEST_GSTUFF_LIBS"
+AC_CHECK_DECLS([gtk_widget_tap_and_hold_setup],[],[], [#include <gtk/gtk.h>])
+CFLAGS="$modest_save_cflags"
+LIBS="$modest_save_libs"
+
 __COPY_LIBS="$LIBS"
 LIBS="$LIBS $MODEST_GSTUFF_LIBS"
 AC_CHECK_FUNCS(gtk_html_get_selection_area)
-LIBS="$__COPY_LIBS"
 AC_SUBST(HAVE_GTK_HTML_GET_SELECTION_AREA)
+AC_CHECK_FUNCS(gtk_tree_view_column_get_cell_data_hint)
+AC_SUBST(HAVE_GTK_TREE_VIEW_COLUMN_GET_CELL_DATA_HINT)
+LIBS="$__COPY_LIBS"
 
 dnl dnl now, determine what to build
-AC_MSG_NOTICE([Determining what platform to build])
-PKG_CHECK_MODULES(MODEST_MAEMO_LIBS,libosso,[with_platform=maemo],true)
-
-AC_ARG_WITH(platform,
-[--with-platform=gnome         platform to build for [gnome]],
+dnl AC_MSG_NOTICE([Determining what platform to build])
+PKG_CHECK_MODULES(MODEST_MAEMO_LIBS,conic,[detected_platform=maemo],[detected_platform=gnome])
+
+AC_ARG_WITH(platform, [
+Target platform:
+  --with-platform=detect  detect target platform (default)
+  --with-platform=gnome   build for Gnome
+  --with-platform=maemo   build for Maemo
+],
 [case "${with_platform}" in
-       gnome)    MODEST_PLATFORM=gnome;;
-       maemo) MODEST_PLATFORM=maemo;;
-       *)      MODEST_PLATFORM=${with_platform}
-esac], [MODEST_PLATFORM=gnome
-               with_platform=gnome])
+       gnome|maemo|detect)    MODEST_PLATFORM=${with_platform};;
+       *)        AC_MSG_ERROR([Unknown platform selected]);;
+esac], [MODEST_PLATFORM=detect])
+
+if test "$MODEST_PLATFORM" = "detect"; then
+       MODEST_PLATFORM="$detected_platform"
+       with_platform=$detected_platform
+fi
+
+
+dnl Whether to use maemo-launcher or not
+AC_ARG_ENABLE([maemo-launcher],
+             [AS_HELP_STRING([--enable-maemo-launcher],
+                             [build with maemo-launcher support])],
+                             [case "${enableval}" in
+                              yes) maemo_launcher=true ;;
+                              no)  maemo_launcher=false ;;
+                              *) AC_MSG_ERROR([bad value ${enableval} for --enable-maemo-launcher]) ;;
+                              esac], [maemo_launcher=false])
+if test x$maemo_launcher = xtrue
+then
+       PKG_CHECK_MODULES(MAEMO_LAUNCHER, [maemo-launcher-app])
+       AC_SUBST(MAEMO_LAUNCHER_CFLAGS)
+       AC_SUBST(MAEMO_LAUNCHER_LIBS)
+fi
 
 have_easysetup=false
 if test "x$with_platform" == "xgnome"; then
@@ -107,7 +141,6 @@ AC_SUBST(MODEST_PLATFORM)
 
 
 
-
 #
 # check for wpeditor or libwpeditor-plus (on maemo)
 #
@@ -143,7 +176,20 @@ else
 fi
 fi
 
-
+#
+# check for MCE
+#
+if test "x$with_platform" == "xmaemo"; then  
+PKG_CHECK_MODULES(MODEST_MCE,mce,have_mce=true,have_mce=false)
+if test "x$have_mce" == "xtrue"; then
+   mce="mce"   
+   AC_DEFINE_UNQUOTED(MODEST_HAVE_MCE, 1, ["Whether mce is used."])
+   AC_SUBST(MODEST_MCE_CFLAGS)
+   AC_SUBST(MODEST_MCE_LIBS)
+else
+   mce=""
+fi
+fi
 
 #
 # check for libconic; this is a trick to check whether we run
@@ -155,6 +201,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,14 +478,21 @@ echo "Platform         : $with_platform"
 echo "Prefix           : ${prefix}"
 echo "Build tests      : $build_tests"
 echo "Build docs       : $build_docs"
-echo "Gettext Packages : $GETTEXT_PACKAGE"
-echo "Editor lib       : $wpeditor"
-echo "Addressbook      : $addressbook"
-echo "Help lib         : $helplib"
-echo "Alarm            : $libalarm"
-echo "Hildon-Notify    : $have_hildon_notify"    
-echo "LibOGS support   : $have_ogs_support"
-echo "MozEmbed support : $use_mozembed"
+echo "Gettext Package  : $GETTEXT_PACKAGE"
+
+if test "x$with_platform" == "xmaemo"; then
+   echo "Maemo Launcher   : $maemo_launcher"
+   echo "Editor lib       : $wpeditor"
+   echo "Addressbook      : $have_abook"
+   echo "Help lib         : $helplib"
+   echo "libconic support : $have_libconic"
+   echo "Alarm            : $have_libalarm"
+   echo "MCE              : $have_mce"
+   echo "Hildon-Notify    : $have_hildon_notify"    
+   echo "LibOGS support   : $have_ogs_support"
+   echo "MozEmbed support : $use_mozembed"
+fi 
+
 echo "CFLAGS           : $CFLAGS"
 echo "Debug version    : $with_debug"
 echo ""