X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=configure.ac;h=76b1980b991399d2f6f8277b7a9524b58460351a;hp=e258e1f3764d392b98efeb4ad6cd99424efca083;hb=0f092ed43eb331d03c0db9ca1e76ab12cba678b5;hpb=8304760be43b3afcc8002d7e3588e29fc74ae12e diff --git a/configure.ac b/configure.ac index e258e1f..76b1980 100644 --- a/configure.ac +++ b/configure.ac @@ -33,16 +33,17 @@ AC_CONFIG_SRCDIR(src/modest-main.c) AM_INIT_AUTOMAKE([dist-bzip2]) # Check for gettext support -QGETTEXT_PACKAGE=modest +GETTEXT_PACKAGE=modest AC_SUBST(GETTEXT_PACKAGE) AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", ["Description"]) ALL_LINGUAS="en_GB gl nl" -#AM_GLIB_DEFINE_LOCALEDIR([MODEST_LOCALE_DIR]) + +MODEST_LOCALE_DIR='$prefix/${DATADIRNAME}/locale' +AM_GLIB_DEFINE_LOCALEDIR([MODEST_LOCALE_DIR]) AM_GLIB_GNU_GETTEXT -modestlocaledir='$prefix/${DATADIRNAME}/locale' -AC_SUBST(modestlocaledir) + if test x$prefix = xNONE; then prefix=/usr/local @@ -68,31 +69,40 @@ 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 libgtkhtml-3.8 libtinymail-1.0 libtinymail-camel-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-3.8 libtinymail-1.0 libtinymail-camel-1.0 libtinymailui-1.0 libtinymailui-gtk-1.0) AC_SUBST(MODEST_GSTUFF_CFLAGS) AC_SUBST(MODEST_GSTUFF_LIBS) - dnl dnl now, determine what to build AC_MSG_NOTICE([Determining what platform to build]) -PKG_CHECK_MODULES(MODEST_LIBTINYMAIL_MAEMO,libosso,[with_platform=maemo],true) - +PKG_CHECK_MODULES(LIBOSSO,libosso,[with_platform=maemo],true) AC_ARG_WITH(platform, -[--with-platform=gtk platform to build for [gtk]], +[--with-platform=gnome platform to build for [gnome]], [case "${with_platform}" in - gtk) MODEST_PLATFORM=gtk;; + gnome) MODEST_PLATFORM=gnome;; maemo) MODEST_PLATFORM=maemo;; *) MODEST_PLATFORM=${with_platform} -esac], [MODEST_PLATFORM=gtk - with_platform=gtk]) +esac], [MODEST_PLATFORM=gnome + with_platform=gnome]) AC_SUBST(MODEST_PLATFORM) if test "x$with_platform" = "xmaemo"; then - PKG_CHECK_MODULES(MODEST_LIBTINYMAIL_MAEMO,libtinymail-maemo-1.0 hildon-libs libosso) + + PKG_CHECK_MODULES(HILDON, hildon-1 >= 0.9.9, hildon1=yes, hildon1=no) + if test "$hildon1" == "yes"; then # the 'new' hildon + PKG_CHECK_MODULES(MODEST_LIBTINYMAIL_MAEMO, libtinymail-maemo-1.0 hildon-libs libosso libhildonmime osso-addressbook-1.0 wpeditor hildon-help libebook-1.2) + + else # the old hildon + PKG_CHECK_MODULES(MODEST_LIBTINYMAIL_MAEMO,libtinymail-maemo-1.0 hildon-libs >= 0.12.0 libosso libossomime libossohelp osso-addressbook-1.0 wpeditor libebook-1.2) + AC_DEFINE_UNQUOTED(MODEST_HILDON_VERSION_0, 1, ["The Hildon version we support."]) + fi + AC_SUBST(MODEST_LIBTINYMAIL_MAEMO_CFLAGS) AC_SUBST(MODEST_LIBTINYMAIL_MAEMO_LIBS) + + AC_DEFINE_UNQUOTED(MODEST_PLATFORM_MAEMO, 1, ["Whether modest is being built for the Maemo platform."]) desktopentrydir=`$PKG_CONFIG osso-af-settings --variable=desktopentrydir` serviceentrydir=`$PKG_CONFIG dbus-glib-1 --variable=prefix`/share/dbus-1/services @@ -119,20 +129,24 @@ if test "x$with_platform" = "xmaemo"; then AC_SUBST(pluginlibdir) AC_SUBST(plugindesktopentrydir) - MODEST_PLATFORM_ID=2 - + # warnings are errors, but don't check format errors, because + # it breaks with logical id's + CFLAGS="$CFLAGS -Wno-format-extra-args -Werror" else - PKG_CHECK_MODULES(MODEST_LIBTINYMAIL_GNOME_DESKTOP,libtinymail-gnome-desktop-1.0 libnm_glib glib-2.0 >= 2.8) + # gnome frontend + PKG_CHECK_MODULES(MODEST_LIBTINYMAIL_GNOME_DESKTOP,libtinymail-gnome-desktop-1.0 libnm_glib glib-2.0 >= 2.8 gtk+-2.0 >= 2.10) AC_SUBST(MODEST_LIBTINYMAIL_GNOME_DESKTOP_CFLAGS) - AC_SUBST(MODEST_LIBTINYMAIL_GNOME_DESKTOP_LIBS) - MODEST_PLATFORM_ID=1 + AC_SUBST(MODEST_LIBTINYMAIL_GNOME_DESKTOP_LIBS) + AC_DEFINE_UNQUOTED(MODEST_PLATFORM_GNOME, 1, ["Whether modest is being built for the GNOME platform."]) fi -dnl 1==>gtk, 2==>maemo -AC_SUBST(MODEST_PLATFORM_ID) - - - +dnl do we have the easy setup stuff? +have_easysetup=false +if test -d src/${with_platform}/easysetup; then + have_easysetup=true + AC_DEFINE_UNQUOTED(MODEST_HAVE_EASYSETUP, 1, ["Whether the easysetup feature is available."]) +fi +AM_CONDITIONAL(MODEST_HAVE_EASYSETUP,test x$have_easysetup = xtrue) dnl ## setup the testing framework (ie., make check) @@ -147,6 +161,8 @@ AC_HELP_STRING([--enable-tests], esac],[build_tests=false]) AM_CONDITIONAL(BUILD_TESTS, test x$build_tests = xtrue) + + dnl ## is the check package installed? if test x$build_tests = xtrue; then PKG_CHECK_MODULES(CHECK, check >= 0.9.4 glib-2.0) @@ -170,15 +186,17 @@ dnl ## gtk-doc GTK_DOC_CHECK([1.0]) dnl Intltool utility programs -#AC_PROG_INTLTOOL([0.33.0],[no-xml]) +AC_PROG_INTLTOOL([0.33.0],[no-xml]) AC_OUTPUT([ po/Makefile.in Makefile +man/Makefile src/Makefile -src/gtk/Makefile +src/gnome/Makefile src/maemo/Makefile +src/maemo/easysetup/Makefile src/widgets/Makefile docs/Makefile docs/reference/Makefile @@ -188,14 +206,14 @@ src/maemo/modest.service ]) - echo echo "modest configure results" echo "-----------------------------------" -echo "Platform : $with_platform" -echo "Build tests : $build_tests" -echo "Build docs : $build_docs" -echo "Debug version : $with_debug" +echo "Platform : $with_platform" +echo "Build easy setup : $have_easysetup" +echo "Build tests : $build_tests" +echo "Build docs : $build_docs" +echo "Debug version : $with_debug" echo "" -echo "NOTE: you should do a 'make clean' after changing platform (--with-platform=)" +echo "NOTE: you should do a 'make clean' after changing architecture or platform (--with-platform=)" echo ""