X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=configure.ac;h=a55efb9a777dd926b5885cdbf93bae603926b990;hp=9e0f26c409b937bfe6b461f46667e62256258518;hb=e69d1c9a5dc560d8a37d0f94b2526b7a97209253;hpb=3fd0a78294445622ec284044bf465bed079c1c49 diff --git a/configure.ac b/configure.ac index 9e0f26c..a55efb9 100644 --- a/configure.ac +++ b/configure.ac @@ -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],[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) @@ -37,7 +37,7 @@ GETTEXT_PACKAGE=modest AC_SUBST(GETTEXT_PACKAGE) AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", ["Description"]) -ALL_LINGUAS="en_GB gl nl" +ALL_LINGUAS="en_GB" MODEST_LOCALE_DIR='$prefix/${DATADIRNAME}/locale' AM_GLIB_DEFINE_LOCALEDIR([MODEST_LOCALE_DIR]) @@ -69,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) @@ -92,10 +92,10 @@ if test "x$with_platform" = "xmaemo"; then 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) + PKG_CHECK_MODULES(MODEST_LIBTINYMAIL_MAEMO, conic libtinymail-maemo-1.0 hildon-1 libosso libhildonmime osso-addressbook-1.0 wpeditor libossohelp libebook-1.2 libalarm) 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) + 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) AC_DEFINE_UNQUOTED(MODEST_HILDON_VERSION_0, 1, ["The Hildon version we support."]) fi @@ -107,6 +107,7 @@ if test "x$with_platform" = "xmaemo"; then 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 @@ -116,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) @@ -130,14 +135,21 @@ if test "x$with_platform" = "xmaemo"; then AC_SUBST(plugindesktopentrydir) # warnings are errors, but don't check format errors, because - # it breaks with logical id's + # it breaks with logical ids CFLAGS="$CFLAGS -Wno-format-extra-args -Werror" else # gnome frontend + AC_MSG_ERROR([Sorry, the GNOME Frontend is currently not working]) + 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) 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? @@ -145,6 +157,15 @@ 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) @@ -194,6 +215,7 @@ po/Makefile.in Makefile man/Makefile src/Makefile +src/dbus_api/Makefile src/gnome/Makefile src/maemo/Makefile src/maemo/easysetup/Makefile @@ -201,8 +223,11 @@ 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 ])