X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=configure.ac;h=db5552b870b9ae81b02e41cc06d0034ee8fb4c9c;hp=ca2e6150e1e558ccd1d49924ba677350b3b291dd;hb=4e0cd4cd2c87db28d9bacf8b21cd509af36c0d84;hpb=de8ac9aa1f0d03dffda84e55ad31c094923ad70f

diff --git a/configure.ac b/configure.ac
index ca2e615..db5552b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -82,29 +82,28 @@ AC_ARG_WITH(platform,
 esac], [MODEST_PLATFORM=gnome
                with_platform=gnome])
 
-
+have_easysetup=false
 if test "x$with_platform" == "xgnome"; then
       PKG_CHECK_MODULES(MODEST_PLATFORM,libtinymail-gnome-desktop-1.0 libnm_glib glib-2.0 >= 2.8 gtk+-2.0 >= 2.10 libnotify)
     AC_DEFINE_UNQUOTED(MODEST_PLATFORM_GNOME, 1, ["Whether modest is being built for the GNOME platform."])
+    AC_MSG_ERROR([The GNOME Build is currently broken; please try the Maemo build instead])
 else
+    have_easysetup=true
     PKG_CHECK_MODULES(MODEST_PLATFORM,libosso conic libtinymail-maemo-1.0 osso-addressbook-1.0 libebook-1.2 libalarm)
     AC_DEFINE_UNQUOTED(MODEST_PLATFORM_MAEMO, 1, ["Whether modest is being built for the MAEMO platform."])
+    AC_DEFINE_UNQUOTED(MODEST_HAVE_EASYSETUP, 1, ["Whether we have the easysetup feature"])
 fi		    
 
-
-
+AM_CONDITIONAL(MODEST_HAVE_EASYSETUP,test "x$have_easysetup" == "xtrue")
 AC_SUBST(MODEST_PLATFORM)
 
 
 
 
-
-
-
-
 #
-# check for wpeditor or libwpeditor-plus
+# check for wpeditor or libwpeditor-plus (on maemo)
 #
+if test "x$with_platform" == "xmaemo"; then  
 PKG_CHECK_MODULES(MODEST_WPEDITOR,wpeditor,have_wpeditor=true,have_wpeditor=false)
 if test "x$have_wpeditor" == "xfalse"; then
    PKG_CHECK_MODULES(MODEST_WPEDITOR,libwpeditor-plus,have_libwpeditorplus=true,have_libwpeditorplus=false)	
@@ -118,12 +117,13 @@ else
    wpeditor="wpeditor"	
    AC_DEFINE_UNQUOTED(MODEST_HAVE_WPEDITOR, 1, ["Whether wpeditor is used."])		
 fi
-
+fi
 
 
 #
-# check the providers-data
+# check the providers-data (on maemo)
 #
+if test "x$with_platform" == "xmaemo"; then  
 PKG_CHECK_MODULES(MODEST_PROVIDERS_DATA,modest-providers-data,have_modest_providers_data=true,have_modest_providers_data=false)
 if test "x$have_modest_providers_data" == "xfalse"; then
    PKG_CHECK_MODULES(MODEST_PROVIDERS_DATA,maemo-providers-data,have_maemo_providers_data=true,have_maemo_providers_data=false)
@@ -140,7 +140,7 @@ else
   AC_DEFINE_UNQUOTED([MODEST_PROVIDERS_DATA_PATH],["`$PKG_CONFIG --variable=path modest-providers-data`"],[modest-providers-data file path])
   providers_data="modest-providers-data"								
 fi
-      
+fi      
    
 
 
@@ -170,7 +170,7 @@ fi
 #
 if test "x$with_platform" == "xmaemo"; then  
    PKG_CHECK_MODULES(MODEST_HILDON_NOTIFY,hildon-notify libnotify,have_hildon_notify=true,have_hildon_notify=false)
-   if test "x$have_hildon_notify"="xtrue"; then
+   if test "x$have_hildon_notify" == "xtrue"; then
       AC_DEFINE_UNQUOTED(MODEST_HAVE_HILDON_NOTIFY, 1, ["Whether hildon-notify is available"])      
    fi
 fi
@@ -190,7 +190,7 @@ if test "x$with_platform" == "xmaemo"; then
 	AC_MSG_ERROR([you need to have either osso-mime or hildon-mime installed])
       fi
    else
-     helplib="hildon-mime"	
+     mimelib="hildon-mime"	
      AC_DEFINE_UNQUOTED(MODEST_HAVE_HILDON_MIME, 1, ["Whether hildon-mime is used."])		
    fi
 fi
@@ -198,7 +198,8 @@ fi
 
 
 #dnl wether we can and should build the 
-#dnl search plugin
+#dnl search plugin (on maemo)
+if test "x$with_platform" == "xmaemo"; then  
 PKG_CHECK_MODULES(MODEST_OGS, libosso >= 0.8.5 libogs-1.2, have_ogs=true, have_ogs=false)
 have_ogs_support=false
 AC_ARG_ENABLE(ogs_support,
@@ -218,6 +219,7 @@ 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
+fi