X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=configure.ac;h=4461b12a23cdf929eb9b1f22d1612988039b552f;hp=8db19ded3ec96d1dd9daca76749d796ac9b5f163;hb=305b5f8ec558ffedb3b531618b7877cf8ee722b6;hpb=bb718435aa49c50a6eb73fa0a77f1a13900cd5bc diff --git a/configure.ac b/configure.ac index 8db19de..4461b12 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) @@ -86,15 +92,17 @@ 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."]) - AC_MSG_ERROR([The GNOME Build is currently broken; please try the Maemo build instead]) +dnl AC_MSG_ERROR([The GNOME Build is currently broken; please try the Maemo build instead]) else have_easysetup=true - PKG_CHECK_MODULES(MODEST_PLATFORM,libosso conic libtinymail-maemo-1.0 osso-addressbook-1.0 libebook-1.2 libalarm) + have_dbusapi=true + PKG_CHECK_MODULES(MODEST_PLATFORM,libosso conic libtinymail-maemo-1.0 libebook-1.2 microb-engine-nss) 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") +AM_CONDITIONAL(MODEST_HAVE_DBUS_API,test "x$have_dbusapi" == "xtrue") AC_SUBST(MODEST_PLATFORM) @@ -121,27 +129,19 @@ fi # -# check the providers-data (on maemo) +# check libalarm # if test "x$with_platform" == "xmaemo"; then -PKG_CHECK_MODULES(MODEST_PROVIDERS_DATA,modest-providers-data,have_modest_providers_data=true,have_modest_providers_data=false) -if test "x$have_modest_providers_data" == "xfalse"; then - PKG_CHECK_MODULES(MODEST_PROVIDERS_DATA,maemo-providers-data,have_maemo_providers_data=true,have_maemo_providers_data=false) - if test "x$have_maemo_providers_data" == "xfalse"; then - echo "x$have_maemo_providers_data" - AC_MSG_ERROR([you need to have either modest-providers-data or maemo-providers-data installed]) - else - AC_DEFINE_UNQUOTED(MODEST_HAVE_MAEMO_PROVIDERS_DATA, 1, ["Whether maemo-providers-data is used."]) - AC_DEFINE_UNQUOTED([MODEST_PROVIDERS_DATA_PATH],["`$PKG_CONFIG --variable=path maemo-providers-data`"],[maemo-providers-data file path]) - providers_data="maemo-providers-data" - fi +PKG_CHECK_MODULES(MODEST_LIBALARM,libalarm,have_libalarm=true,have_libalarm=false) +if test "x$have_libalarm" == "xtrue"; then + libalarm="libalarm" + AC_DEFINE_UNQUOTED(MODEST_HAVE_LIBALARM, 1, ["Whether libalarm is used."]) + AC_SUBST(MODEST_LIBALARM_CFLAGS) + AC_SUBST(MODEST_LIBALARM_LIBS) else - AC_DEFINE_UNQUOTED(MODEST_HAVE_MODEST_PROVIDERS_DATA, 1, ["Whether modest-providers-data is used."]) - AC_DEFINE_UNQUOTED([MODEST_PROVIDERS_DATA_PATH],["`$PKG_CONFIG --variable=path modest-providers-data`"],[modest-providers-data file path]) - providers_data="modest-providers-data" + libalarm="" +fi fi -fi - # @@ -170,7 +170,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 +190,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) @@ -246,21 +266,29 @@ fi # check the version of the addressbook on maemo # if test "x$with_platform" == "xmaemo"; then - PKG_CHECK_MODULES(MODEST_ABOOK, osso-addressbook-1.0 < 2.0, have_old_abook=true,have_old_abook=false) - if test "x$have_old_abook" == "xtrue"; then - AC_DEFINE_UNQUOTED(MODEST_HAVE_OLD_ABOOK, 1, ["whether we have an old osso-addressbook"]) + PKG_CHECK_MODULES(MODEST_ABOOK,osso-addressbook-1.0,have_abook=true,have_abook=false) + AC_SUBST(MODEST_ABOOK_CFLAGS) + AC_SUBST(MODEST_ABOOK_LIBS) + + if test "x$have_abook" == "xtrue"; then + PKG_CHECK_MODULES(MODEST_ABOOK_OLD, osso-addressbook-1.0 < 2.0, have_old_abook=true,have_old_abook=false) + if test "x$have_old_abook" == "xtrue"; then + AC_DEFINE_UNQUOTED(MODEST_HAVE_OLD_ABOOK, 1, ["whether we have an old osso-addressbook"]) + fi + AC_DEFINE_UNQUOTED(MODEST_HAVE_ABOOK,1, ["whether we have osso-addressbook"]) + addressbook="osso-addressbook" fi fi +# +# if we don't have an addressbook, use the dummy one +# +AM_CONDITIONAL(MODEST_USE_DUMMY_ADDRESS_BOOK,test "x$have_abook" != "xtrue") -#FIXME: hack to set the right gettext package.. -if test "x$have_hildon1" == "xtrue"; then - GETTEXT_PACKAGE=osso-email -else - GETTEXT_PACKAGE=modest -fi -# Check for gettext support + +# gettext support +GETTEXT_PACKAGE=modest AC_SUBST(GETTEXT_PACKAGE) AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", ["gettext package"]) @@ -386,13 +414,14 @@ echo "Prefix : ${prefix}" echo "Build tests : $build_tests" echo "Build docs : $build_docs" echo "Gettext Packages : $GETTEXT_PACKAGE" -echo "Easysetup data : $providers_data" 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 "CFLAGS : $CFLAGS" -echo "Gettext Packages : $GETTEXT_PACKAGE" echo "Debug version : $with_debug" echo "" echo "NOTE: you should do a 'make clean' after changing architecture or platform (--with-platform=)"