diff options
| author | Danielle Madeley <danielle.madeley@collabora.co.uk> | 2011-09-06 16:54:03 +0800 |
|---|---|---|
| committer | Danielle Madeley <danielle.madeley@collabora.co.uk> | 2011-09-06 16:54:03 +0800 |
| commit | b77af8e37dff739e55a69f85f89fc3031620e1e3 (patch) | |
| tree | f2ca25e6fc738b3c1d77da40f472ed73c2c8c7c2 /configure.ac | |
| parent | 64a35d4c6eddc71236c8883b8b057a48538020b4 (diff) | |
| parent | 5bc58b637fe191eabddef9517e4a810e6f667baa (diff) | |
| download | gsoc2013-empathy-b77af8e37dff739e55a69f85f89fc3031620e1e3.tar gsoc2013-empathy-b77af8e37dff739e55a69f85f89fc3031620e1e3.tar.gz gsoc2013-empathy-b77af8e37dff739e55a69f85f89fc3031620e1e3.tar.bz2 gsoc2013-empathy-b77af8e37dff739e55a69f85f89fc3031620e1e3.tar.lz gsoc2013-empathy-b77af8e37dff739e55a69f85f89fc3031620e1e3.tar.xz gsoc2013-empathy-b77af8e37dff739e55a69f85f89fc3031620e1e3.tar.zst gsoc2013-empathy-b77af8e37dff739e55a69f85f89fc3031620e1e3.zip | |
Merge branch 'remove-cc-plugin'
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/configure.ac b/configure.ac index fa43c0603..3a5dc72e3 100644 --- a/configure.ac +++ b/configure.ac @@ -57,7 +57,6 @@ LIBCHAMPLAIN_GTK_REQUIRED=0.7.1 LIBCHAMPLAIN_REQUIRED=0.9 NAUTILUS_SENDTO_REQUIRED=2.90.0 NETWORK_MANAGER_REQUIRED=0.7.0 -GNOME_CONTROL_CENTER_REQUIRED=2.31.4 # Use --enable-maintainer-mode to disable deprecated symbols, # disable single include and enable GSEAL. If this is not a released empathy, @@ -608,45 +607,6 @@ 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], @@ -717,7 +677,6 @@ Configure summary: Location awareness (Geoclue): ${have_geoclue} Geocode support (Geocode)...: ${have_geocode} Meego widgets...............: ${have_meego} - Control center embedding....: ${have_control_center_embedding} Cheese webcam support ......: ${have_cheese} Camera monitoring...........: ${have_gudev} |