X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=configure.ac;h=89c016be0be6297540b86ef48a583a46d31da25e;hp=8db19ded3ec96d1dd9daca76749d796ac9b5f163;hb=69a8e3d5ea1a6a22bca24aebfda27b22074c4107;hpb=bb718435aa49c50a6eb73fa0a77f1a13900cd5bc diff --git a/configure.ac b/configure.ac index 8db19de..89c016b 100644 --- a/configure.ac +++ b/configure.ac @@ -69,6 +69,12 @@ 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) +__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) + 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) @@ -170,7 +176,7 @@ fi # if test "x$with_platform" == "xmaemo"; then PKG_CHECK_MODULES(MODEST_HILDON_NOTIFY,hildon-notify libnotify,have_hildon_notify=true,have_hildon_notify=false) - if test "x$have_hildon_notify"="xtrue"; then + if test "x$have_hildon_notify" == "xtrue"; then AC_DEFINE_UNQUOTED(MODEST_HAVE_HILDON_NOTIFY, 1, ["Whether hildon-notify is available"]) fi fi @@ -190,12 +196,32 @@ if test "x$with_platform" == "xmaemo"; then AC_MSG_ERROR([you need to have either osso-mime or hildon-mime installed]) fi else - helplib="hildon-mime" + mimelib="hildon-mime" AC_DEFINE_UNQUOTED(MODEST_HAVE_HILDON_MIME, 1, ["Whether hildon-mime is used."]) fi fi +PKG_CHECK_MODULES(MODEST_MOZEMBED, libtinymailui-mozembed-1.0, have_mozembed=true, have_mozembed=false) +AC_ARG_ENABLE(mozembed, +AC_HELP_STRING([--enable-mozembed], + [Build with GtkMozEmbed (yes, no)]), +[case "${enableval}" in + yes) + if test x$have_mozembed = xfalse; then + AC_MSG_ERROR([building of GtkMozEmbed support requested and gtkmozembed not found]) + fi + use_mozembed=true + ;; + *) + use_mozembed=false + ;; +esac],[use_mozembed=false]) + +AM_CONDITIONAL(BUILD_MOZEMBED, test x$use_mozembed = xtrue) +if test x$use_mozembed = xtrue; then + AC_DEFINE_UNQUOTED(MODEST_USE_MOZEMBED, 1, ["Whether we use GtkMozEmbed."]) +fi #dnl wether we can and should build the #dnl search plugin (on maemo) @@ -391,6 +417,7 @@ echo "Editor lib : $wpeditor" echo "Help lib : $helplib" echo "Hildon-Notify : $have_hildon_notify" echo "LibOGS support : $have_ogs_support" +echo "MozEmbed support : $use_mozembed" echo "CFLAGS : $CFLAGS" echo "Gettext Packages : $GETTEXT_PACKAGE" echo "Debug version : $with_debug"