X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=configure.ac;h=fc82d1a4bd39dc310c130284d2e8613ddea0f817;hp=9a86a09c10c2b49c36c09091f6a4711e17ce7496;hb=62b2744caac1ec1fd692dddde4fe33397e9ce0fe;hpb=0c709695e5764821aeea6ea9c35821507b326ce7 diff --git a/configure.ac b/configure.ac index 9a86a09..fc82d1a 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 @@ -69,6 +69,14 @@ 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 ]) +CFLAGS="$modest_save_cflags" +LIBS="$modest_save_libs" + __COPY_LIBS="$LIBS" LIBS="$LIBS $MODEST_GSTUFF_LIBS" AC_CHECK_FUNCS(gtk_html_get_selection_area) @@ -76,31 +84,40 @@ 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) - -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 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 libebook-1.2 microb-engine-nss) + have_dbusapi=true + PKG_CHECK_MODULES(MODEST_PLATFORM,libosso dbus-1 libtinymail-maemo-1.0 libebook-1.2 ) 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) @@ -142,29 +159,24 @@ fi fi + # -# check the providers-data (on maemo) +# check for libconic; this is a trick to check whether we run +# on a 'real' maemo platform, or on, say, ubuntu embedded +# this determines whether we build with the non-hildon GTK+ # 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_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 - 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" +# if we define this, tinymail will not try to #include conic headers + CFLAGS="$CFLAGS -DLIBTINYMAIL_MAEMO_WITHOUT_CONIC" +fi fi -fi - - # # check hildon-help (only for maemo) @@ -435,17 +447,20 @@ echo "Platform : $with_platform" 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 "Gettext Package : $GETTEXT_PACKAGE" + +if test "x$with_platform" == "xmaemo"; then + 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" +fi + 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=)"