tracker r2795 - in trunk: . src/plugins/evolution

[mr svn gnome org]

Author: mr
Date: Thu Jan 15 14:36:12 2009
New Revision: 2795
URL: http://svn.gnome.org/viewvc/tracker?rev=2795&view=rev

Log:
	* configure.ac:
	* src/plugins/evolution/Makefile.am: Change
	EVOPLUG_{CFLAGS|LDFLAGS} to EVOLUTION_PLUGIN_*. Also make the
	evolution plugin a build time option so we error if it is
	expicitly enabled but not available. This is disabled by default
	for the up and coming release.


Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/src/plugins/evolution/Makefile.am

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Thu Jan 15 14:36:12 2009
@@ -183,28 +183,6 @@
   AC_DEFINE(HAVE_RAPTOR, 1, [Raptor RDF parsers])
 fi
 
-# Check for Evolution's plugin system
-PKG_CHECK_MODULES(EVOPLUG, [
-	evolution-plugin >= $EVO_REQUIRED
-	evolution-data-server-1.2 >= $EDS_REQUIRED], 
-	have_evoplug=yes, have_evoplug=no)
-AC_SUBST(EVOPLUG_CFLAGS)
-AC_SUBST(EVOPLUG_LIBS)
-
-if test x$have_evoplug == "xyes"; then
-EVOLUTION_PLUGIN_INSTALL_DIR=`$PKG_CONFIG evolution-plugin --variable=plugindir`
-else
-EVOLUTION_PLUGIN_INSTALL_DIR=/dev/null
-fi
-
-AC_SUBST(EVOLUTION_PLUGIN_INSTALL_DIR)
-
-if test x$have_evoplug == "xyes"; then
-  AC_DEFINE(HAVE_EVOLUTION_PLUGIN, 1, [Evolution plugin])
-fi
-
-AM_CONDITIONAL(HAVE_EVOLUTION_PLUGIN, test "$have_evoplug" = "yes")
-
 # Check we have the DBUS binding tool we need
 AC_PATH_PROG(DBUSBINDINGTOOL, dbus-binding-tool)
 if test -z $DBUSBINDINGTOOL; then
@@ -1105,6 +1083,48 @@
 AM_CONDITIONAL(HAVE_TOTEM_PL_PARSER, test "x$have_playlist" = "xyes")
 
 ##################################################################
+# Enable Evolution plugin support?
+##################################################################
+
+AC_ARG_ENABLE(evolution-plugin, 
+	      AS_HELP_STRING([--disable-evolution-plugin],
+			     [disable evolution plugin support]),,
+	      [enable_evolution_plugin=no])
+
+if test "x$enable_evolution_plugin" != "xno" ; then
+   PKG_CHECK_MODULES(EVOLUTION_PLUGIN, [
+   		     evolution-plugin >= $EVO_REQUIRED
+		     evolution-data-server-1.2 >= $EDS_REQUIRED], 
+		     have_evolution_plugin=yes, 
+		     have_evolution_plugin=no)
+
+   AC_SUBST(EVOLUTION_PLUGIN_CFLAGS)
+   AC_SUBST(EVOLUTION_PLUGIN_LIBS)
+
+   if test x$have_evolution_plugin == "xyes"; then
+      EVOLUTION_PLUGIN_INSTALL_DIR=`$PKG_CONFIG evolution-plugin --variable=plugindir`
+   else
+      EVOLUTION_PLUGIN_INSTALL_DIR=/dev/null
+   fi
+
+   AC_SUBST(EVOLUTION_PLUGIN_INSTALL_DIR)
+
+   if test "x$have_evolution_plugin" = "xyes"; then
+      AC_DEFINE(HAVE_EVOLUTION_PLUGIN, 1, [Define if we have Evolution plugin ])
+   fi
+else
+   have_evolution_plugin="no  (disabled)"
+fi
+
+if test "x$enable_evolution_plugin" = "xyes"; then
+   if test "x$have_evolution_plugin" != "xyes"; then
+      AC_MSG_ERROR([Couldn't find Evolution plugin requirements (evolution-dev, evolution-data-server-dev).])
+   fi
+fi
+
+AM_CONDITIONAL(HAVE_EVOLUTION_PLUGIN, test "$have_evolution_plugin" = "yes")
+
+##################################################################
 # Enable SQLite FTS support?
 ##################################################################
 
@@ -1284,8 +1304,8 @@
 
 Plugins:
 
-	Evolution support (old):	yes
-	Evolution plugin:			$have_evoplug
+	Evolution extracter (data-pull):	yes (old)
+	Evolution plugin    (data-push):	$have_evolution_plugin
 
 Warning:
 

Modified: trunk/src/plugins/evolution/Makefile.am
==============================================================================
--- trunk/src/plugins/evolution/Makefile.am	(original)
+++ trunk/src/plugins/evolution/Makefile.am	Thu Jan 15 14:36:12 2009
@@ -5,13 +5,13 @@
 	-DTRACKER_COMPILATION				\
 	$(DBUS_CFLAGS)					\
 	$(GMIME_CFLAGS)					\
-	$(EVOPLUG_CFLAGS)
+	$(EVOLUTION_PLUGIN_CFLAGS)
 
 %.eplug.in: %.eplug.xml
 	LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< $@
 
 %.eplug: %.eplug.in
-	sed -e "s%+PLUGIN_INSTALL_DIR+%$(EVOPLUG_INSTALL_DIR)%" \
+	sed -e "s%+PLUGIN_INSTALL_DIR+%$(EVOLUTION_PLUGIN_INSTALL_DIR)%" \
 	-e "s%+GETTEXT_PACKAGE+%$(GETTEXT_PACKAGE)%" \
 	-e "s%+LOCALEDIR+%$(LOCALEDIR)%" \
 	$< > $@
@@ -67,7 +67,7 @@
 
 liborg_freedesktop_Tracker_evolution_plugin_la_LDFLAGS = -module -avoid-version
 liborg_freedesktop_Tracker_evolution_plugin_la_LDLIBS = 		\
-	$(EVOPLUG_LIBS)							\
+	$(EVOLUTION_PLUGIN_LIBS)					\
 	$(DBUS_LIBS)
 
 dbus_sources = 								\