X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=configure.ac;h=25fad32b8662fec9fc268a9353f5b9365923012b;hb=00ac9f5399d0da7e925ee161dfd8779033e8402f;hp=8520c7f937aaf26241afdcfc9b976de4224e8bd2;hpb=c958cc1082f00b01a30489bb1b6e6b10f7f9cf16;p=modest

diff --git a/configure.ac b/configure.ac
index 8520c7f..25fad32 100644
--- a/configure.ac
+++ b/configure.ac
@@ -92,11 +92,11 @@ 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, conic libtinymail-maemo-1.0 hildon-1 libosso libhildonmime osso-addressbook-1.0 wpeditor libossohelp libebook-1.2 libalarm)     	
+      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 wpeditor libebook-1.2 libalarm gnome-vfs-module-2.0)     	 
-        AC_DEFINE_UNQUOTED(MODEST_HILDON_VERSION_0, 1, ["The Hildon version we support."])   
+     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 	
    
    AC_SUBST(MODEST_LIBTINYMAIL_MAEMO_CFLAGS)
@@ -135,11 +135,13 @@ 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 
-   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_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 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."])
@@ -156,11 +158,14 @@ 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)	
-    
-	# Get the location of the ISO-Codes (currencies, languages) files:
+	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) 
 
@@ -204,7 +209,28 @@ 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
@@ -234,6 +260,7 @@ 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=)"