From: Danielle Madeley <danielle.madeley@collabora.co.uk>
Date: Tue, 6 Sep 2011 08:54:03 +0000 (+1000)
Subject: Merge branch 'remove-cc-plugin'
X-Git-Url: https://git.0d.be/?p=empathy.git;a=commitdiff_plain;h=b77af8e37dff739e55a69f85f89fc3031620e1e3

Merge branch 'remove-cc-plugin'
---

b77af8e37dff739e55a69f85f89fc3031620e1e3
diff --cc configure.ac
index fa43c060,f9a89cf3..3a5dc72e
--- a/configure.ac
+++ b/configure.ac
@@@ -579,74 -578,6 +578,35 @@@ f
  
  AM_CONDITIONAL(HAVE_NST, test "x$have_nst" = "xyes")
  
 +# -----------------------------------------------------------
 +# goa-mc-plugin
 +# -----------------------------------------------------------
 +AC_ARG_ENABLE(goa,
 +              AS_HELP_STRING([--enable-goa=@<:@no/yes/auto@:>@],
 +                             [build GOA MC plugin]), ,
 +                             enable_goa=auto)
 +
 +if test "x$enable_goa" != "xno"; then
 +   PKG_CHECK_MODULES(GOA,
 +    [
 +       mission-control-plugins
 +       goa-1.0
 +    ], have_goa="yes", have_goa="no")
 +
 +   AC_MSG_CHECKING([Mission Control plugins dir])
 +   MISSION_CONTROL_PLUGINS_DIR=`pkg-config --variable=plugindir mission-control-plugins`
 +
 +   AC_SUBST(MISSION_CONTROL_PLUGINS_DIR)
 +else
 +   have_goa=no
 +fi
 +
 +if test "x$enable_goa" = "xyes" -a "x$have_goa" != "xyes"; then
 +   AC_MSG_ERROR([Could not find GOA dependencies.])
 +fi
 +
 +AM_CONDITIONAL(HAVE_GOA, test "x$have_goa" = "xyes")
 +
- # -----------------------------------------------------------
- # new, single-window control center
- # -----------------------------------------------------------
- AC_ARG_ENABLE(control_center_embedding,
-               AS_HELP_STRING([--enable-control-center-embedding=@<:@no/yes/auto@:>@],
-                              [Enable support for single-window control center]),
-                              , enable_control_center_embedding=auto)
- 
- if test "x$enable_control_center_embedding" != "xno"; then
- 
-    PKG_CHECK_MODULES(CONTROL_CENTER_EMBEDDING, [libgnome-control-center >= GNOME_CONTROL_CENTER_REQUIRED],
-         have_control_center_embedding="yes", have_control_center_embedding="no")
- 
-    if test "x$have_control_center_embedding" = "xyes"; then
-       AC_DEFINE(HAVE_CONTROL_CENTER_EMBEDDING, 1, [Define if you have the single-window control center])
- 
-       AC_MSG_CHECKING([gnome-control-center extension dir])
-       CONTROL_CENTER_EXTENSIONDIR=`$PKG_CONFIG --variable=extensiondir libgnome-control-center`
-       if test "x$CONTROL_CENTER_EXTENSIONDIR" = "x"; then
-           AC_MSG_ERROR([Could not determine extensiondir])
-       else
-           AC_MSG_RESULT([$CONTROL_CENTER_EXTENSIONDIR])
-       fi
-       AC_SUBST(CONTROL_CENTER_EXTENSIONDIR)
-    fi
- else
-    have_control_center_embedding="no"
- fi
- 
- if test "x$enable_control_center_embedding" = "xyes" -a "x$have_control_center_embedding" != "xyes"; then
-    AC_MSG_ERROR([Could not find single-window control center dependencies:
- 
- $CONTROL_CENTER_EMBEDDING_PKG_ERRORS])
- fi
- 
- AM_CONDITIONAL(HAVE_CONTROL_CENTER_EMBEDDING, test "x$have_control_center_embedding" = "xyes")
- AC_SUBST(CONTROL_CENTER_EMBEDDING_CFLAGS)
- AC_SUBST(CONTROL_CENTER_EMBEDDING_LIBS)
- 
  # Optional dependency for avatar selection
  AC_ARG_WITH([cheese],
              AS_HELP_STRING([--with-cheese],