X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=configure.ac;h=93d462eec1d48bd455d7a17b1fa89c57479f7b5c;hp=84688bc75ffd40fc977ba663ce950bfc12fbd703;hb=ab8473048344d936ba2b3a09a3feecd2de37f7c6;hpb=195217886a8d79743a5b1a2844992a8e6d833d26;ds=sidebyside diff --git a/configure.ac b/configure.ac index 84688bc..93d462e 100644 --- a/configure.ac +++ b/configure.ac @@ -26,23 +26,24 @@ # 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],[0.0.1],[http://maemo.org]) +AC_INIT([modest],[1.0],[http://maemo.org]) AC_CONFIG_HEADERS([config.h]) 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]) +ALL_LINGUAS="en_GB" + +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,7 +69,7 @@ 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 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 libtinymail-gnomevfs-1.0 libtinymailui-1.0 libtinymailui-gtk-1.0) AC_SUBST(MODEST_GSTUFF_CFLAGS) AC_SUBST(MODEST_GSTUFF_LIBS) @@ -86,14 +87,27 @@ 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 libossomime osso-addressbook-1.0 wpeditor) + + 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, conic libtinymail-maemo-1.0 hildon-1 libosso libhildonmime osso-addressbook-1.0 wpeditor hildon-help libebook-1.2 libalarm hildon-notify libnotify) + + else # the old hildon + PKG_CHECK_MODULES(MODEST_LIBTINYMAIL_MAEMO, conic libtinymail-maemo-1.0 hildon-libs >= 0.12.0 libosso libossomime libossohelp osso-addressbook-1.0 libwpeditor-plus libebook-1.2 libalarm gnome-vfs-module-2.0 hildon-notify libnotify) + 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 localedir=`$PKG_CONFIG osso-af-settings --variable=localedir` + backupsettingsdir=/etc/osso-backup/applications pixmapdir=`$PKG_CONFIG osso-af-settings --variable=hildonpixmapdir` icon_26x26dir=$datadir/icons/hicolor/26x26/hildon icon_34x34dir=$datadir/icons/hicolor/34x34/hildon @@ -103,9 +117,13 @@ if test "x$with_platform" = "xmaemo"; then pluginlibdir=`$PKG_CONFIG hildon-control-panel --variable=plugindir` plugindesktopentrydir=`$PKG_CONFIG hildon-control-panel --variable=plugindesktopentrydir` + dbus_api="dbus_api" + AC_SUBST(dbus_api) + # Define as variables in Makefiles AC_SUBST(desktopentrydir) AC_SUBST(serviceentrydir) + AC_SUBST(backupsettingsdir) AC_SUBST(localedir) AC_SUBST(pixmapdir) AC_SUBST(icon_26x26dir) @@ -116,21 +134,40 @@ 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 ids + CFLAGS="$CFLAGS -Wno-format-extra-args -Werror" else # 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 -fi + AC_MSG_ERROR([Sorry, the GNOME Frontend is currently not working]) -dnl 1==>gnome, 2==>maemo -AC_SUBST(MODEST_PLATFORM_ID) + PKG_CHECK_MODULES(MODEST_LIBTINYMAIL_GNOME_DESKTOP,libtinymail-gnome-desktop-1.0 libnm_glib glib-2.0 >= 2.8 gtk+-2.0 >= 2.10 libnotify) + AC_SUBST(MODEST_LIBTINYMAIL_GNOME_DESKTOP_CFLAGS) + AC_SUBST(MODEST_LIBTINYMAIL_GNOME_DESKTOP_LIBS) + AC_DEFINE_UNQUOTED(MODEST_PLATFORM_GNOME, 1, ["Whether modest is being built for the GNOME platform."]) + # no dbus api for gnome + dbus_api="" + AC_SUBST(dbus_api) +fi +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."]) + + if test "$hildon1" == "yes"; then # the 'new' hildon + # Just check that the dependency exists: + PKG_CHECK_MODULES(MODEST_PROVIDERS_DATA, modest-providers-data) + AC_DEFINE_UNQUOTED([MODEST_PROVIDERS_DATA_PATH],["`$PKG_CONFIG --variable=path modest-providers-data`"],[modest-providers-data file path]) + else + PKG_CHECK_MODULES(MODEST_PROVIDERS_DATA, maemo-providers-data) + AC_DEFINE_UNQUOTED([MODEST_PROVIDERS_DATA_PATH],["`$PKG_CONFIG --variable=path maemo-providers-data`"],[maemo-providers-data file path]) + fi +fi +AM_CONDITIONAL(MODEST_HAVE_EASYSETUP,test x$have_easysetup = xtrue) dnl ## setup the testing framework (ie., make check) @@ -145,6 +182,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,31 +209,59 @@ GTK_DOC_CHECK([1.0]) dnl Intltool utility programs #AC_PROG_INTLTOOL([0.33.0],[no-xml]) +#dnl wether we can and should build the +#dnl search plugin +PKG_CHECK_MODULES(OGS, libosso >= 0.8.5 libogs-1.2, have_ogs=true, have_ogs=false) + +have_ogs_support=false +AC_ARG_ENABLE(ogs_support, +AC_HELP_STRING([--enable-ogs-support], + [Build with osso global search support (yes, no)]), +[case "${enableval}" in + yes) + if test x$have_ogs = xfalse; then + AC_MSG_ERROR([building of ogs support requested and libogs-1.2 not found]) + fi + ;; + *) + have_ogs_support=false + ;; +esac],[have_ogs_support=$have_ogs]) + +if test x$have_ogs_support = xtrue; then + AC_DEFINE_UNQUOTED(MODEST_HAVE_OGS, 1, ["Whether ogs is available."]) +fi AC_OUTPUT([ po/Makefile.in Makefile man/Makefile src/Makefile +src/dbus_api/Makefile src/gnome/Makefile src/maemo/Makefile +src/maemo/easysetup/Makefile src/widgets/Makefile docs/Makefile docs/reference/Makefile tests/Makefile +tests/dbus_api/Makefile src/maemo/modest.desktop -src/maemo/modest.service +src/maemo/com.nokia.modest.service +libmodest-dbus-client/Makefile +libmodest-dbus-client/libmodest-dbus-client-1.0.pc ]) - 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 "libogs support : $have_ogs_support" +echo "Debug version : $with_debug" echo "" echo "NOTE: you should do a 'make clean' after changing architecture or platform (--with-platform=)" echo ""