X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=configure.ac;h=d16b7bae330ed9b929f2456e31bac9b91bc98ab1;hp=6ae4832ea2df221b9d5546877afd5060764129cd;hb=f1b54c4a866e1449165c22314474a0d0bdda1cf0;hpb=7526e2e3e5db9c9c16632084763a2b577ab0ef30 diff --git a/configure.ac b/configure.ac index 6ae4832..d16b7ba 100644 --- a/configure.ac +++ b/configure.ac @@ -1,10 +1,10 @@ # Copyright (c) 2006,2007 Nokia Corporation # All rights reserved. -# +# # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are # met: -# +# # * Redistributions of source code must retain the above copyright # notice, this list of conditions and the following disclaimer. # * Redistributions in binary form must reproduce the above copyright @@ -13,7 +13,7 @@ # * Neither the name of the Nokia Corporation nor the names of its # contributors may be used to endorse or promote products derived from # this software without specific prior written permission. -# +# # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS # IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED # TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A @@ -26,7 +26,7 @@ # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -AC_INIT([modest],[3.90],[http://maemo.org]) +AC_INIT([modest],[3.90.5],[http://maemo.org]) AC_CONFIG_HEADERS([config.h]) m4_define([modest_api_major_version], [1]) @@ -38,6 +38,11 @@ m4_define([modest_api_version], [modest_api_major_version.modest_api_minor_versi AC_CONFIG_SRCDIR(src/modest-main.c) AM_INIT_AUTOMAKE([dist-bzip2]) +# Support silent build rules, requires at least automake-1.11. Disable +# by either passing --disable-silent-rules to configure or passing V=1 +# to make +m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) + MODEST_API_MAJOR_VERSION=modest_api_major_version MODEST_API_MINOR_VERSION=modest_api_minor_version MODEST_API_MICRO_VERSION=modest_api_micro_version @@ -65,6 +70,8 @@ AM_PROG_CC_C_O AC_HEADER_STDC AC_PROG_LIBTOOL +# Initialize pkg-config stuff +PKG_PROG_PKG_CONFIG() # Option to enable debugging AC_ARG_ENABLE(debug, @@ -87,6 +94,24 @@ if test "x$with_gcov" == "xyes" ; then LDFLAGS="$LDFLAGS -lgcov" fi +dnl ------ +dnl WebKit +dnl ------ + +# Option to enable debugging +with_webkit=no +AC_ARG_ENABLE(webkit, + [AC_HELP_STRING([--enable-webkit],[Enable webkit support (default=no)])], + [with_webkit=yes], [with_webkit=no]) + +if test "x$with_webkit" == "xyes" ; then + PKG_CHECK_EXISTS(MODEST_WEBKIT,webkit-1.0,have_webkit=true,have_webkit=false) + AC_SUBST(MODEST_WEBKIT_CFLAGS) + AC_SUBST(MODEST_WEBKIT_LIBS) + AC_DEFINE_UNQUOTED(MODEST_USE_WEBKIT, 1, ["Whether modest is being build with webkit support."]) +fi + +AM_CONDITIONAL(MODEST_USE_WEBKIT,test "x$with_webkit" == "xyes") dnl ------- @@ -120,10 +145,9 @@ else AC_MSG_ERROR([install gtkhtml 3.8 or newer]) fi -PKG_CHECK_MODULES(LIBMODEST_DBUS_CLIENT,libmodest-dbus-client-1.0 >= 3.1.0) 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-${gtk_html_version} 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) @@ -171,11 +195,13 @@ fi if test "$with_platform" = "maemo"; then MODEST_PLUGIN_DEFINES=" -DMODEST_PLATFORM_MAEMO -DMODEST_API_VERSION=${MODEST_API_VERSION}" - PKG_CHECK_MODULES(LIBMODEST_DBUS_CLIENT,libmodest-dbus-client-1.0) + PKG_CHECK_MODULES(LIBMODEST_DBUS_CLIENT,libmodest-dbus-client-1.0 >= 3.2.0) elif test "$with_platform" = "gnome"; then MODEST_PLUGIN_DEFINES=" -DMODEST_PLATFORM_GNOME -DMODEST_API_VERSION=${MODEST_API_VERSION}" fi AC_SUBST(MODEST_PLUGIN_DEFINES) +AM_CONDITIONAL(MODEST_BUILD_ASDBUS,test "x$with_platform" == "xmaemo") + dnl ---------- PLATFORM: *DBUS API* ----------- if test "x$with_platform" == "xgnome"; then @@ -206,37 +232,39 @@ have_hildon2=false have_gtk=false if test "$MODEST_TOOLKIT" = "detect"; then - PKG_CHECK_EXISTS(hildon-1 >= 2.1.0 hildon-fm-2, have_hildon2=true, have_gtk=true) + PKG_CHECK_EXISTS(hildon-1 >= 2.1.0 hildon-fm-2, have_hildon2=true, have_hildon2=false) + PKG_CHECK_EXISTS(glib-2.0 >= 2.8 gtk+-2.0 >= 2.10 libnotify, have_gtk=true, have_gtk=false) if test "x$have_hildon2" = "xtrue"; then - PKG_CHECK_MODULES(MODEST_HILDON_WIDGETS,hildon-1 hildon-fm-2) - hildonpkgs="hildon-1 hildon-fm-2" detected_toolkit=hildon2 hildon_api=`$PKG_CONFIG --modversion hildon-1 | cut -d. -f1` - echo "DETECTED HILDON 2 $have_hildon2." + echo "DETECTED HILDON 2 $have_hildon2 (API is $hildon_api)." + elif test "x$have_gtk" == "xtrue"; then + detected_toolkit=gtk + echo "DETECTED GTK." fi MODEST_TOOLKIT="$detected_toolkit" with_toolkit=$detected_toolkit fi dnl -------- TOOLKIT SELECTION: *HILDON API* ----------- -if test "$with_toolkit" = "hildon2"; then +if test "x$with_toolkit" == "xhildon2"; then + hildonpkgs="hildon-1 hildon-fm-2" + hildon_api=`$PKG_CONFIG --modversion hildon-1 | cut -d. -f1` AC_DEFINE_UNQUOTED(MODEST_HILDON_API, $hildon_api, ["the API version of hildon"]) MODEST_PLUGIN_DEFINES="$MODEST_PLUGIN_DEFINES -DMODEST_HILDON_API=$hildon_api" MODEST_PLUGIN_DEFINES="$MODEST_PLUGIN_DEFINES -DMODEST_TOOLKIT_HILDON2" -elif test "$with_toolkit" = "gtk"; then +elif test "x$with_toolkit" == "xgtk"; then MODEST_PLUGIN_DEFINES="$MODEST_PLUGIN_DEFINES -DMODEST_TOOLKIT_GTK" fi dnl -------- TOOLKIT SELECTION: *TOOLKIT DIR* ----------- if test "x$with_toolkit" == "xgtk"; then - PKG_CHECK_MODULES(MODEST_TOOLKIT,glib-2.0 >= 2.8 gtk+-2.0 >= 2.10 libnotify gtksourceview-2.0) + PKG_CHECK_MODULES(MODEST_TOOLKIT,glib-2.0 >= 2.8 gtk+-2.0 >= 2.10 libnotify) AC_DEFINE_UNQUOTED(MODEST_TOOLKIT_GTK, 1, ["Whether modest is being build for the gtk toolkit."]) - MODEST_TOOLKIT_DIR=gnome -else - if test "$with_toolkit" = "hildon2"; then - AC_DEFINE_UNQUOTED(MODEST_TOOLKIT_HILDON2, 1, ["Whether modest is being build for the hildon2 toolkit."]) - MODEST_TOOLKIT_DIR=hildon2 - fi + MODEST_TOOLKIT_DIR=gtk +elif test "$with_toolkit" = "hildon2"; then + AC_DEFINE_UNQUOTED(MODEST_TOOLKIT_HILDON2, 1, ["Whether modest is being build for the hildon2 toolkit."]) + MODEST_TOOLKIT_DIR=hildon2 fi AC_SUBST(MODEST_TOOLKIT) AC_SUBST(MODEST_TOOLKIT_DIR) @@ -249,7 +277,7 @@ AC_SUBST(pluginpkgs) use_profile_data=false # Plugin packages must not include libcanberra and libprofile -if test "$with_platform" = "maemo"; then +if test "x$with_platform" == "xmaemo"; then hildonpkgs="$hildonpkgs libcanberra" AC_CHECK_HEADER([profiled/keys_nokia.h], use_profile_data=true, use_profile_data=false) if test "$use_profile_data" = "true"; then @@ -282,22 +310,18 @@ fi AC_SUBST(MAEMO_LAUNCHER_MODEST_LDFLAGS) dnl --------------- EDITOR ----------- -if test "x$with_toolkit" != "xgtk"; then - PKG_CHECK_MODULES(MODEST_WPEDITOR,wpeditor,have_wpeditor=true,have_wpeditor=false) - if test "x$have_wpeditor" == "xfalse"; then - PKG_CHECK_MODULES(MODEST_WPEDITOR,libwpeditor-plus,have_libwpeditorplus=true,have_libwpeditorplus=false) - if test "x$have_libwpeditorplus" == "xtrue"; then - wpeditor="libwpeditor-plus" - AC_DEFINE_UNQUOTED(MODEST_HAVE_LIBWPEDITOR_PLUS, 1, ["Whether libwpeditor-plus is used."]) - else - AC_MSG_ERROR([you need to have either wpeditor or libwpeditor-plus installed]) - fi +PKG_CHECK_MODULES(MODEST_WPEDITOR,wpeditor,have_wpeditor=true,have_wpeditor=false) +if test "x$have_wpeditor" == "xfalse"; then + PKG_CHECK_MODULES(MODEST_WPEDITOR,libwpeditor-plus,have_libwpeditorplus=true,have_libwpeditorplus=false) + if test "x$have_libwpeditorplus" == "xtrue"; then + wpeditor="libwpeditor-plus" + AC_DEFINE_UNQUOTED(MODEST_HAVE_LIBWPEDITOR_PLUS, 1, ["Whether libwpeditor-plus is used."]) else - wpeditor="wpeditor" - AC_DEFINE_UNQUOTED(MODEST_HAVE_WPEDITOR, 1, ["Whether wpeditor is used."]) + AC_MSG_ERROR([you need to have either wpeditor or libwpeditor-plus installed]) fi else - PKG_CHECK_EXISTS(gtksourceview-2.0, []. []) + wpeditor="wpeditor" + AC_DEFINE_UNQUOTED(MODEST_HAVE_WPEDITOR, 1, ["Whether wpeditor is used."]) fi dnl --------------- LIBALARM ----------- @@ -341,6 +365,10 @@ else fi fi +if test "x$with_toolkit" != "xgtk"; then +MODEST_TOOLKIT_CFLAGS="$MODEST_TOOLKIT_CFLAGS -DMAEMO_CHANGES" +fi + dnl --------------- NOTIFICATION STUFF ----------- if test "x$with_toolkit" != "xgtk"; then PKG_CHECK_MODULES(MODEST_HILDON_NOTIFY,hildon-notify libnotify,have_hildon_notify=true,have_hildon_notify=false) @@ -381,6 +409,14 @@ if test "x$with_platform" == "xmaemo"; then 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"]) fi + + # Check the presence of the calendar widgets + PKG_CHECK_MODULES(MODEST_CALENDAR_WIDGETS,calendar-ui-widgets,have_calendar_widgets=true,have_calendar_widgets=false) + AC_SUBST(MODEST_CALENDAR_WIDGETS_CFLAGS) + AC_SUBST(MODEST_CALENDAR_WIDGETS_LIBS) + if test "x$have_calendar_widgets" == "xtrue"; then + AC_DEFINE_UNQUOTED(MODEST_USE_CALENDAR_WIDGETS, 1, ["Use the Calendar color widgets"]) + fi fi AM_CONDITIONAL(MODEST_USE_DUMMY_ADDRESS_BOOK,test "x$have_abook" != "xtrue") @@ -459,7 +495,9 @@ if test "x$with_platform" == "xmaemo"; then AC_SUBST(icon_scalabledir) AC_SUBST(pluginlibdir) AC_SUBST(plugindesktopentrydir) - +else + desktopentrydir=$datadir/applications + AC_SUBST(desktopentrydir) fi dnl --------------- TESTING ------------------- @@ -500,17 +538,13 @@ man/Makefile src/Makefile src/modest-plugin-1.0.pc src/dbus_api/Makefile -src/gnome/Makefile -src/maemo/Makefile -src/maemo/easysetup/Makefile +src/gtk/Makefile src/hildon2/Makefile src/widgets/Makefile docs/Makefile docs/reference/Makefile tests/Makefile tests/dbus_api/Makefile -src/maemo/modest.desktop -src/maemo/com.nokia.modest.service src/hildon2/modest.desktop src/hildon2/com.nokia.modest.service ]) @@ -534,6 +568,7 @@ if test "x$with_platform" == "xmaemo"; then echo "Alarm : $have_libalarm" echo "MCE : $have_mce" echo "Hildon-Notify : $have_hildon_notify" + echo "Calendar widgets : $have_calendar_widgets" fi if [ $gtk_html_found = "true" ]; then