beagle r4721 - in trunk/beagle: . conf-data/config-files

[dbera svn gnome org]

Author: dbera
Date: Fri Apr 18 21:51:37 2008
New Revision: 4721
URL: http://svn.gnome.org/viewvc/beagle?rev=4721&view=rev

Log:
Enable googlebackends by default during building but disable the backend by default in the conf-file.


Modified:
   trunk/beagle/conf-data/config-files/Daemon.xml
   trunk/beagle/configure.in

Modified: trunk/beagle/conf-data/config-files/Daemon.xml
==============================================================================
--- trunk/beagle/conf-data/config-files/Daemon.xml	(original)
+++ trunk/beagle/conf-data/config-files/Daemon.xml	Fri Apr 18 21:51:37 2008
@@ -8,6 +8,7 @@
     <ListOption Name="DeniedBackends" Description="Disabled backends" Params="Backend name" Separator=",">
 	<!-- Disabled by default EXPERIMENTAL -->
 	<Value>NetworkServices</Value>
+	<Value>GMailSearch</Value>
 	<!-- Directly use locate; needed for exceptional uses only -->
 	<Value>Locate</Value>
     </ListOption>

Modified: trunk/beagle/configure.in
==============================================================================
--- trunk/beagle/configure.in	(original)
+++ trunk/beagle/configure.in	Fri Apr 18 21:51:37 2008
@@ -191,9 +191,9 @@
 dnl ----------------------------------------------
 
 AC_ARG_ENABLE([googlebackends],
-        AC_HELP_STRING([--disable-googlebackends], [Disable GMail and other Google backends (default yes)]),
+        AC_HELP_STRING([--disable-googlebackends], [Disable GMail and other Google backends (default no)]),
         enable_google=$enableval,
-        enable_google=no)
+        enable_google=yes)
 AM_CONDITIONAL(ENABLE_GOOGLEBACKENDS, test "x$enable_google" = "xyes")
 
 if test "x$enable_google" = "xyes"; then