desktop-data-model r7289 - in trunk: . engine-dbus

[otaylor svn gnome org]

Author: otaylor
Date: Tue Oct 28 16:55:59 2008
New Revision: 7289
URL: http://svn.gnome.org/viewvc/desktop-data-model?rev=7289&view=rev

Log:
Add --without-empathy option

Allow specifying --without-empathy on the command line to compile without
empathy.


Modified:
   trunk/configure.ac
   trunk/engine-dbus/hippo-dbus-empathy.c

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Tue Oct 28 16:55:59 2008
@@ -345,10 +345,36 @@
    AC_DEFINE(HIPPO_LOUDMOUTH_IS_10, 0, [Define if Loudmouth is version 1.0 or below])
 fi
 
+# Check for libempathy
+AC_ARG_WITH(empathy,
+	    AC_HELP_STRING([--without-empathy],
+		           [Disable Empathy support]),
+	    ,
+	    with_empathy=yes)
+
+AC_MSG_CHECKING([for empathy])
+if test x"$with_empathy" = xno ; then
+   found_empathy=no
+   AC_MSG_RESULT(disabled)
+else
+   HIPPO_PKG_CHECK_EXISTS(libempathy, found_empathy=yes, found_empathy=no)
+   AC_MSG_RESULT([$found_empathy])
+   extra_engine_packages="$extra_engine_packages libempathy"
+
+   if test $found_empathy = yes ; then
+      EMPATHY_MODULES=empathy
+      AC_DEFINE(HAVE_EMPATHY, 1, [Define if you have the empathy library])
+   else
+      if test x"$with_empathy" = xyes ; then
+         AC_MSG_ERROR([Empathy not found])
+      fi
+   fi
+fi
+
 PKG_CHECK_MODULES(LIBDDM, gobject-2.0 >= $GLIB2_REQUIRED dbus-glib-1 >= $DBUS_REQUIRED)
 PKG_CHECK_MODULES(LIBHIPPO, gobject-2.0 >= $GLIB2_REQUIRED gthread-2.0)
 PKG_CHECK_MODULES(LIBENGINE, gobject-2.0 >= $GLIB2_REQUIRED gthread-2.0 loudmouth-1.0 >= $LOUDMOUTH_REQUIRED $PCRE_MODULES $SQLITE_MODULES)
-PKG_CHECK_MODULES(DESKTOP_DATA_ENGINE, gtk+-2.0 >= $GTK2_REQUIRED gthread-2.0 loudmouth-1.0 >= $LOUDMOUTH_REQUIRED dbus-1 >= $DBUS_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED gnome-vfs-2.0 $XSCREENSAVER_PACKAGES libempathy $extra_engine_packages)
+PKG_CHECK_MODULES(DESKTOP_DATA_ENGINE, gtk+-2.0 >= $GTK2_REQUIRED gthread-2.0 loudmouth-1.0 >= $LOUDMOUTH_REQUIRED dbus-1 >= $DBUS_REQUIRED dbus-glib-1 >= $DBUS_GLIB_REQUIRED gnome-vfs-2.0 $XSCREENSAVER_PACKAGES $extra_engine_packages)
 
 DESKTOP_DATA_ENGINE_LIBS="$DESKTOP_DATA_ENGINE_LIBS $XSCREENSAVER_LIBS $RESOLV_LIBS"
 DESKTOP_DATA_ENGINE_CFLAGS="$DESKTOP_DATA_ENGINE_CFLAGS $XSCREENSAVER_CFLAGS"

Modified: trunk/engine-dbus/hippo-dbus-empathy.c
==============================================================================
--- trunk/engine-dbus/hippo-dbus-empathy.c	(original)
+++ trunk/engine-dbus/hippo-dbus-empathy.c	Tue Oct 28 16:55:59 2008
@@ -1,5 +1,9 @@
 /* -*- mode: C; c-basic-offset: 4; indent-tabs-mode: nil; -*- */
 #include <config.h>
+
+/* Only compile with Empathy support if it is enabled */
+#ifdef HAVE_LIBEMPATHY
+
 #include <string.h>
 #include <libempathy/empathy-contact-manager.h>
 #include <libempathy/empathy-contact-list.h>
@@ -108,10 +112,12 @@
         }
     }
 }
+#endif /* HAVE_LIBEMPATHY */
 
 void
 hippo_dbus_init_empathy(void)
 {
+#ifdef HAVE_LIBEMPATHY
     EmpathyContactManager *manager;
 
     manager = empathy_contact_manager_new ();
@@ -120,4 +126,5 @@
                       "members-changed",
                       G_CALLBACK (contact_list_members_changed_cb),
                       NULL);
+#endif
 }