X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=configure.ac;h=161895215f6bc4e178983f065ce94946b058980e;hp=0ed0071f227f4232b995de70bfe7f3c60c80be45;hb=a03c1d759b6d81276acc0e3f5c407aae40b2dc87;hpb=4ea4d5b68567ae01749d68c348e13f935814d0a8 diff --git a/configure.ac b/configure.ac index 0ed0071..1618952 100644 --- 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 @@ -64,29 +64,97 @@ else fi + +dnl ------- +dnl GtkHTML +dnl ------- + +AC_MSG_CHECKING(for installed version of libgtkhtml3) +pkg-config --exists libgtkhtml-3.14 +retval=$? +gtk_html_found=false +if test $retval -eq 0 ; then + gtk_html_found=true + gtk_html_version=3.14 +else + pkg-config --exists libgtkhtml-3.8 + retval=$? + if test $retval -eq 0 ; then + gtk_html_found=true + gtk_html_version=3.8 + else + if [ $gui = "true" ]; then + AC_MSG_RESULT(libgtkhtml 3.4 or higher is not found!) + fi + fi +fi + +if [ $gtk_html_found = "true" ]; then + version=`pkg-config --modversion libgtkhtml-${gtk_html_version}` + AC_MSG_RESULT(found version $version) +else + AC_MSG_ERROR([install gtkhtml 3.8 or newer]) +fi + + dnl # GLib/Gobject/Gtk/Gconf => mandatory -PKG_CHECK_MODULES(MODEST_GSTUFF,glib-2.0 >= 2.6 gobject-2.0 gtk+-2.0 >= 2.6 gconf-2.0 gnome-vfs-2.0 libgtkhtml-3.8 libtinymail-1.0 libtinymail-camel-1.0 libtinymail-gnomevfs-1.0 libtinymailui-1.0 libtinymailui-gtk-1.0) + +PKG_CHECK_MODULES(MODEST_GSTUFF,glib-2.0 >= 2.6 gobject-2.0 gtk+-2.0 >= 2.6 gconf-2.0 gnome-vfs-2.0 libgtkhtml-${gtk_html_version} libtinymail-1.0 libtinymail-camel-1.0 libtinymail-gnomevfs-1.0 libtinymailui-1.0 libtinymailui-gtk-1.0) 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 ]) +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 +175,6 @@ AC_SUBST(MODEST_PLATFORM) - # # check for wpeditor or libwpeditor-plus (on maemo) # @@ -143,7 +210,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 @@ -289,12 +369,11 @@ if test "x$with_platform" == "xmaemo"; then 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"]) + if test "x$have_abook" == "xtrue"; then + abook_api=`$PKG_CONFIG --modversion osso-addressbook-1.0 | cut -d. -f1` + AC_DEFINE_UNQUOTED(OSSO_ABOOK_ENABLE_DEPRECATED, 1, ["use deprecated addressbook API"]) + AC_DEFINE_UNQUOTED(MODEST_ABOOK_API, $abook_api, ["the API version of osso-addressbook"]) + AC_DEFINE_UNQUOTED(MODEST_HAVE_ABOOK, 1, ["whether we have osso-addressbook"]) addressbook="osso-addressbook" fi fi @@ -433,14 +512,20 @@ echo "Prefix : ${prefix}" echo "Build tests : $build_tests" echo "Build docs : $build_docs" echo "Gettext Package : $GETTEXT_PACKAGE" -echo "Editor lib : $wpeditor" -echo "Addressbook : $have_abook" -echo "Help lib : $helplib" -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" + +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 ""