* added modest_conf_key_escape and modest_conf_key_unescape, to

[modest] / configure.ac

diff --git a/configure.ac b/configure.ac
index a919477..be861ad 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,7 @@ AM_INIT_AUTOMAKE(AC_PACKAGE_NAME,AC_PACKAGE_VERSION)
 
 AC_CONFIG_HEADERS([config.h])
 
-if test x$prefix=xNONE; then
+if test x$prefix = xNONE; then
    prefix=/usr/local
 fi
 AC_SUBST(prefix)
@@ -38,7 +38,7 @@ if test "x$hildon_support" = "xyes"; then
 
       AC_SUBST(MODEST_UI_DIR,"hildon-libs")
       AC_DEFINE([MODEST_ENABLE_HILDON_UI],1,[Enable Hildon UI])
-      PKG_CHECK_MODULES(MODEST_LIBTINYMAIL_MAEMO,libtinymail-maemo-1.0 hildon-libs hildon-lgpl)
+      PKG_CHECK_MODULES(MODEST_LIBTINYMAIL_MAEMO,libtinymail-maemo-1.0 hildon-libs hildon-lgpl libosso)
       AC_SUBST(MODEST_LIBTINYMAIL_MAEMO_CFLAGS)
       AC_SUBST(MODEST_LIBTINYMAIL_MAEMO_LIBS) 
       modest_ui="hildon"
@@ -53,6 +53,7 @@ else
       modest_ui="gtk-glade"                                            
 fi
 
+AM_CONDITIONAL(HILDON, test x$hildon_support = xyes)
 
 dnl now, determine what to build
 AC_MSG_NOTICE([Determining what UI to build])
@@ -73,6 +74,8 @@ src/Makefile
 src/gtk/Makefile
 src/gtk-glade/Makefile
 src/hildon/Makefile
+src/hildon/com.nokia.modest.service
+src/hildon/modest.desktop.in
 docs/Makefile
 docs/reference/Makefile
 ])