]> git.0d.be Git - empathy.git/blobdiff - configure.ac
Merge branch 'folks-async-and-prepare'
[empathy.git] / configure.ac
index c881e75472c971a14f14cc05292774fc0d4af6cb..7d735187dc45e8bff14e1aaed02bd19e919b0554 100644 (file)
@@ -1,54 +1,67 @@
-AC_INIT(Empathy, 2.27.3, http://bugzilla.gnome.org/browse.cgi?product=empathy)
+dnl If not 1, append datestamp to the version number
+m4_define(empathy_released, 0)
+
+m4_define([empathy_major_version], [2])
+m4_define([empathy_minor_version], [31])
+m4_define([empathy_micro_version], [5])
+m4_define([empathy_nano_version], [1])
+
+dnl Display the nano_version only if it's not '0'
+m4_define([empathy_base_version],
+          [empathy_major_version.empathy_minor_version.empathy_micro_version])
+m4_define([empathy_full_version],
+          [m4_if(empathy_nano_version, 0, [empathy_base_version],
+              [empathy_base_version].[empathy_nano_version])])
+
+m4_define(empathy_maybe_datestamp,
+          m4_esyscmd([if test x]empathy_released[ != x1; then date +.%Y%m%d | tr -d '\n\r'; fi]))
+
+m4_define(empathy_version, empathy_full_version[]empathy_maybe_datestamp)
+
+
+AC_INIT(Empathy, empathy_version, http://bugzilla.gnome.org/browse.cgi?product=empathy)
+
+
 AC_PREREQ(2.59)
 AC_COPYRIGHT([
   Copyright (C) 2003-2007 Imendio AB
-  Copyright (C) 2007-2008 Collabora Ltd.
+  Copyright (C) 2007-2010 Collabora Ltd.
 ])
 
-# LT Version numbers, remember to change them just *before* a release.
-#   (Interfaces removed:    CURRENT++, AGE=0, REVISION=0)
-#   (Interfaces added:      CURRENT++, AGE++, REVISION=0)
-#   (No interfaces changed:                   REVISION++)
-LIBEMPATHY_CURRENT=25
-LIBEMPATHY_AGE=0
-LIBEMPATHY_REVISION=0
-
-LIBEMPATHY_GTK_CURRENT=23
-LIBEMPATHY_GTK_AGE=0
-LIBEMPATHY_GTK_REVISION=0
-
-AC_SUBST(LIBEMPATHY_CURRENT)
-AC_SUBST(LIBEMPATHY_AGE)
-AC_SUBST(LIBEMPATHY_REVISION)
-AC_SUBST(LIBEMPATHY_GTK_CURRENT)
-AC_SUBST(LIBEMPATHY_GTK_AGE)
-AC_SUBST(LIBEMPATHY_GTK_REVISION)
-
 # Minimal version required
-GLIB_REQUIRED=2.16.0
-GTK_REQUIRED=2.16.0
+
+# Hardp deps
+FOLKS_REQUIRED=0.1.11
 GCONF_REQUIRED=1.2.0
-LIBPANELAPPLET_REQUIRED=2.10.0
-TELEPATHY_GLIB_REQUIRED=0.7.31
-MISSION_CONTROL_REQUIRED=4.61
-ENCHANT_REQUIRED=1.2.0
-ISO_CODES_REQUIRED=0.35
-LIBNOTIFY_REQUIRED=0.4.4
+GLIB_REQUIRED=2.25.9
+GTK_REQUIRED=2.21.2
+KEYRING_REQUIRED=2.22
 LIBCANBERRA_GTK_REQUIRED=0.4
-LIBCHAMPLAIN_REQUIRED=0.3.3
-LIBCHAMPLAIN_GTK_REQUIRED=0.3.3
-CLUTTER_GTK_REQUIRED=0.8.2
+LIBNOTIFY_REQUIRED=0.4.4
+LIBNOTIFY_REQUIRED_GTK3=0.5.1
+TELEPATHY_FARSIGHT_REQUIRED=0.0.14
+TELEPATHY_GLIB_REQUIRED=0.11.7
+TELEPATHY_LOGGER=0.1.2
+UNIQUE_REQUIRED=1.1.2
+
+# Optionnal deps
+CLUTTER_GTK_REQUIRED=0.10
+ENCHANT_REQUIRED=1.2.0
 GEOCLUE_REQUIRED=0.11
-WEBKIT_REQUIRED=1.1.7
-
-# Use --enable-maintainer-mode to disabled deprecated symbols
+ISO_CODES_REQUIRED=0.35
+LIBCHAMPLAIN_GTK_REQUIRED=0.4
+LIBCHAMPLAIN_REQUIRED=0.4
+NAUTILUS_SENDTO_REQUIRED=2.28.1
+NAUTILUS_SENDTO_REQUIRED_GTK3=2.90.0
+NETWORK_MANAGER_REQUIRED=0.7.0
+WEBKIT_REQUIRED=1.1.15
+
+# Use --enable-maintainer-mode to disable deprecated symbols,
+# disable single include and enable GSEAL. If this is not a released empathy,
+# maintainer mode is forced
+ifelse(empathy_released, 1, [], [enable_maintainer_mode="yes"])
 GNOME_MAINTAINER_MODE_DEFINES
 
-# Uncomment that to build with single include disabled
-#AC_DEFINE(G_DISABLE_SINGLE_INCLUDES, [], [Disable single includes for GLib])
-#AC_DEFINE(GDK_PIXBUF_DISABLE_SINGLE_INCLUDES, [], [Disable single includes for GDK pixbuf])
-#AC_DEFINE(GTK_DISABLE_SINGLE_INCLUDES, [], [Disable single includes for GTK])
-
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_SRCDIR([configure.ac])
@@ -57,6 +70,12 @@ AC_CONFIG_AUX_DIR(.)
 GNOME_COMMON_INIT
 
 AM_INIT_AUTOMAKE(1.9 dist-bzip2 no-define -Wno-portability)
+
+# Support silent build rules, requires at least automake-1.11. Disable
+# by either passing --disable-silent-rules to configure or passing V=1
+# to make
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+
 AC_ISC_POSIX
 AC_PROG_CC
 AC_HEADER_STDC
@@ -65,12 +84,9 @@ AM_PROG_MKDIR_P
 AM_PATH_GLIB_2_0
 AC_PATH_XTRA
 IT_PROG_INTLTOOL([0.35.0])
-GTK_DOC_CHECK([1.3])
-GNOME_DOC_INIT
-IDT_COMPILE_WARNINGS
+GNOME_DOC_INIT([0.17.3])
 AC_PATH_PROG(DBUS_BINDING_TOOL, dbus-binding-tool)
-AC_PATH_PROG(GCONFTOOL, gconftool-2)
-AM_GCONF_SOURCE_2
+GLIB_GSETTINGS
 GLIB_GENMARSHAL=`$PKG_CONFIG glib-2.0 --variable=glib_genmarshal`
 AC_SUBST(GLIB_GENMARSHAL)
 
@@ -82,57 +98,111 @@ AM_PATH_PYTHON([2.3])
 
 EMPATHY_ARG_VALGRIND
 
+
+# -----------------------------------------------------------
+# Error flags
+# -----------------------------------------------------------
+AS_COMPILER_FLAG(-Wall, ERROR_CFLAGS="-Wall", ERROR_CFLAGS="")
+AS_COMPILER_FLAG(-Werror, werror=yes, werror=no)
+
+AC_ARG_ENABLE(Werror,
+  AC_HELP_STRING([--disable-Werror],[compile without -Werror (normally enabled in development builds)]),
+    werror=$enableval, :)
+
+AS_COMPILER_FLAG(-Wextra, wextra=yes, wextra=no)
+AS_COMPILER_FLAG(-Wno-missing-field-initializers,
+        wno_missing_field_initializers=yes,
+        wno_missing_field_initializers=no)
+AS_COMPILER_FLAG(-Wno-unused-parameter,
+        wno_unused_parameter=yes,
+        wno_unused_parameter=no)
+
+ifelse(empathy_released, 1, [],
+    [
+        if test x$werror = xyes; then
+            ERROR_CFLAGS="$ERROR_CFLAGS -Werror"
+        fi
+        if test x$wextra = xyes -a \
+            x$wno_missing_field_initializers = xyes -a \
+            x$wno_unused_parameter = xyes; then
+            ERROR_CFLAGS="$ERROR_CFLAGS -Wextra -Wno-missing-field-initializers -Wno-unused-parameter"
+        fi
+    ])
+
+AS_COMPILER_FLAG(-Wdeclaration-after-statement, ERROR_CFLAGS="$ERROR_CFLAGS -Wdeclaration-after-statement")
+AS_COMPILER_FLAG(-Wshadow, ERROR_CFLAGS="$ERROR_CFLAGS -Wshadow")
+AS_COMPILER_FLAG(-Wmissing-prototypes, ERROR_CFLAGS="$ERROR_CFLAGS -Wmissing-prototypes")
+AS_COMPILER_FLAG(-Wmissing-declarations, ERROR_CFLAGS="$ERROR_CFLAGS -Wmissing-declarations")
+# Disabled because some GTK+ headers (like gtkitemfactory.h) are bugged :(
+#AS_COMPILER_FLAG(-Wstrict-prototypes, ERROR_CFLAGS="$ERROR_CFLAGS -Wstrict-prototypes")
+
+AC_SUBST(ERROR_CFLAGS)
+
 # -----------------------------------------------------------
 # Pkg-Config dependency checks
 # -----------------------------------------------------------
 
-PKG_CHECK_MODULES(LIBEMPATHY,
+PKG_CHECK_MODULES(EMPATHY,
 [
-   glib-2.0 >= $GLIB_REQUIRED
-   gobject-2.0
+   dbus-glib-1
+   farsight2-0.10
+   folks >= $FOLKS_REQUIRED
+   folks-telepathy >= $FOLKS_REQUIRED
+   gconf-2.0 >= $GCONF_REQUIRED
    gio-2.0 >= $GLIB_REQUIRED
    gio-unix-2.0 >= $GLIB_REQUIRED
-   libxml-2.0
-   telepathy-glib >= $TELEPATHY_GLIB_REQUIRED
-   libmissioncontrol >= $MISSION_CONTROL_REQUIRED
-   telepathy-farsight
-])
-
-PKG_CHECK_MODULES(LIBEMPATHYGTK,
-[
-   glib-2.0 >= $GLIB_REQUIRED
+   gnome-keyring-1 >= $KEYRING_REQUIRED
    gobject-2.0
-   gio-2.0 >= $GLIB_REQUIRED
-   gconf-2.0 >= $GCONF_REQUIRED
-   x11
-   gtk+-2.0 >= $GTK_REQUIRED
-   libcanberra-gtk >= $LIBCANBERRA_GTK_REQUIRED
-   telepathy-glib >= $TELEPATHY_GLIB_REQUIRED
-   libmissioncontrol >= $MISSION_CONTROL_REQUIRED
-   telepathy-farsight
-   farsight2-0.10
    gstreamer-0.10
    gstreamer-interfaces-0.10
-])
-
-PKG_CHECK_MODULES(EMPATHY,
-[
-   glib-2.0 >= $GLIB_REQUIRED
-   gobject-2.0
-   gio-2.0 >= $GLIB_REQUIRED
-   gconf-2.0 >= $GCONF_REQUIRED
-   x11
-   gtk+-2.0 >= $GTK_REQUIRED
-   libcanberra-gtk >= $LIBCANBERRA_GTK_REQUIRED
    libebook-1.2
+   libxml-2.0
+   telepathy-farsight >= $TELEPATHY_FARSIGHT_REQUIRED
    telepathy-glib >= $TELEPATHY_GLIB_REQUIRED
-   libmissioncontrol >= $MISSION_CONTROL_REQUIRED
-   telepathy-farsight
-   gstreamer-0.10
-   gstreamer-interfaces-0.10
+   telepathy-logger-0.1 >= $TELEPATHY_LOGGER
+   x11
 ])
 
-PKG_CHECK_MODULES(LIBNOTIFY, libnotify >= $LIBNOTIFY_REQUIRED)
+# -----------------------------------------------------------
+# GTK+
+# -----------------------------------------------------------
+AC_ARG_ENABLE(gtk3,
+              AS_HELP_STRING([--enable-gtk3=@<:@no/yes/auto@:>@],
+                             [build with GTK+3]), ,
+                             enable_gtk3=auto)
+
+# Try to use GTK+3 if available
+if test "x$enable_gtk3" != "xno"; then
+   PKG_CHECK_MODULES(GTK,
+   [
+      gtk+-3.0 >= $GTK_REQUIRED
+   ], have_gtk3="yes", have_gtk3="no")
+else
+   have_gtk3="no"
+fi
+
+if test "x$enable_gtk3" = "xyes" -a "x$have_gtk3" != "xyes"; then
+   AC_MSG_ERROR([Could not find gtk3 dependencies.])
+fi
+
+if test "x$have_gtk3" == "xyes"; then
+   # GTK3 specific deps
+   PKG_CHECK_MODULES(CANBERRA, libcanberra-gtk3 >= $LIBCANBERRA_GTK_REQUIRED)
+   PKG_CHECK_MODULES(LIBNOTIFY, libnotify >= $LIBNOTIFY_REQUIRED_GTK3)
+   PKG_CHECK_MODULES(UNIQUE, unique-3.0 >= $UNIQUE_REQUIRED)
+else
+   PKG_CHECK_MODULES(GTK, gtk+-2.0 >= $GTK_REQUIRED)
+
+   # GTK2 specific deps
+   PKG_CHECK_MODULES(CANBERRA, libcanberra-gtk >= $LIBCANBERRA_GTK_REQUIRED)
+   PKG_CHECK_MODULES(LIBNOTIFY, libnotify >= $LIBNOTIFY_REQUIRED)
+   PKG_CHECK_MODULES(UNIQUE, unique-1.0 >= $UNIQUE_REQUIRED)
+
+   # Enable GSEAL checks if needed
+   if test $USE_MAINTAINER_MODE = yes; then
+      AC_DEFINE(GSEAL_ENABLE, [], [Seal public structs to force usage of accessors])
+   fi
+fi
 
 # -----------------------------------------------------------
 # Enable debug
@@ -156,6 +226,54 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[Gettext package name])
 
 AM_GLIB_GNU_GETTEXT
 
+# -----------------------------------------------------------
+# Connectivity integration
+# -----------------------------------------------------------
+AC_ARG_WITH(connectivity,
+              AS_HELP_STRING([--with-connectivity=@<:@nm/connman/auto/no@:>@],
+                             [build with connectivity support]), ,
+                             with_connectivity=auto)
+
+if test "x$with_connectivity" = "xno"; then
+   have_nm=no
+   have_connman=no
+
+elif test "x$with_connectivity" = "xconnman"; then
+   have_nm=no
+
+   PKG_CHECK_MODULES(CONNMAN,
+   [
+      dbus-glib-1
+   ], have_connman="yes", have_connman="no")
+
+   if test "x$have_connman" = "xyes"; then
+      AC_DEFINE(HAVE_CONNMAN, 1, [Define if you have connman dependencies])
+   fi
+
+else
+   have_connman=no
+
+   PKG_CHECK_MODULES(NETWORK_MANAGER,
+   [
+      libnm-glib >= $NETWORK_MANAGER_REQUIRED
+   ], have_nm="yes", have_nm="no")
+
+   if test "x$have_nm" = "xyes"; then
+      AC_DEFINE(HAVE_NM, 1, [Define if you have libnm-glib])
+   fi
+fi
+
+if test "x$with_connectivity" = "xconnman" -a "x$have_connman" != "xyes"; then
+   AC_MSG_ERROR([Couldn't find connman dependencies.])
+fi
+
+if test "x$with_connectivity" = "xnm" -a "x$have_nm" != "xyes"; then
+   AC_MSG_ERROR([Couldn't find libnm-glib dependencies.])
+fi
+
+AM_CONDITIONAL(HAVE_NM, test "x$have_nm" = "xyes")
+AM_CONDITIONAL(HAVE_CONNMAN, test "x$have_connman" = "xyes")
+
 # -----------------------------------------------------------
 # Webkit
 # -----------------------------------------------------------
@@ -165,10 +283,14 @@ AC_ARG_ENABLE(webkit,
                              enable_webkit=auto)
 
 if test "x$enable_webkit" != "xno"; then
-   PKG_CHECK_MODULES(WEBKIT,
-   [
-      webkit-1.0 >= $WEBKIT_REQUIRED
-   ], have_webkit="yes", have_webkit="no")
+
+   if test "x$have_gtk3" == "xno"; then
+      PKG_CHECK_MODULES(WEBKIT, [webkit-1.0 >= $WEBKIT_REQUIRED],
+          have_webkit="yes", have_webkit="no")
+   else
+      PKG_CHECK_MODULES(WEBKIT, [webkitgtk-3.0 >= $WEBKIT_REQUIRED],
+          have_webkit="yes", have_webkit="no")
+   fi
 
    if test "x$have_webkit" = "xyes"; then
       AC_DEFINE(HAVE_WEBKIT, 1, [Define if you have libwebkitgtk])
@@ -178,9 +300,8 @@ else
 fi
 
 if test "x$enable_webkit" = "xyes" -a "x$have_webkit" != "xyes"; then
-   AC_MSG_ERROR([Couldn't find webkit dependencies.])
+   AC_MSG_ERROR([Could not find webkit dependencies.])
 fi
-
 AM_CONDITIONAL(HAVE_WEBKIT, test "x$have_webkit" = "xyes")
 
 # -----------------------------------------------------------
@@ -216,7 +337,7 @@ else
 fi
 
 if test "x$enable_spell" = "xyes" -a "x$have_enchant" != "xyes"; then
-   AC_MSG_ERROR([Couldn't find spell dependencies.])
+   AC_MSG_ERROR([Could not find spell dependencies.])
 fi
 
 AM_CONDITIONAL(HAVE_ENCHANT, test "x$have_enchant" = "xyes")
@@ -230,12 +351,18 @@ AC_ARG_ENABLE(map,
                              enable_map=auto)
 
 if test "x$enable_map" != "xno"; then
-   PKG_CHECK_MODULES(LIBCHAMPLAIN,
-   [
-      champlain-0.3 >= $LIBCHAMPLAIN_REQUIRED,
-      champlain-gtk-0.3 >= $LIBCHAMPLAIN_GTK_REQUIRED
-      clutter-gtk-0.8 >= $CLUTTER_GTK_REQUIRED
-   ], have_libchamplain="yes", have_libchamplain="no")
+
+   if test "x$have_gtk3" == "xno"; then
+      PKG_CHECK_MODULES(LIBCHAMPLAIN,
+      [
+         champlain-0.4 >= $LIBCHAMPLAIN_REQUIRED,
+         champlain-gtk-0.4 >= $LIBCHAMPLAIN_GTK_REQUIRED
+         clutter-gtk-0.10 >= $CLUTTER_GTK_REQUIRED
+      ], have_libchamplain="yes", have_libchamplain="no")
+   else
+      # FIXME: check deps once clutter-gtk and champlain have been ported to GTK3
+      have_libchamplain="no"
+   fi
 
    if test "x$have_libchamplain" = "xyes"; then
       AC_DEFINE(HAVE_LIBCHAMPLAIN, 1, [Define if you have libchamplain])
@@ -245,7 +372,7 @@ else
 fi
 
 if test "x$enable_map" = "xyes" -a "x$have_libchamplain" != "xyes"; then
-   AC_MSG_ERROR([Couldn't find map view dependencies.])
+   AC_MSG_ERROR([Could not find map view dependencies.])
 fi
 
 AM_CONDITIONAL(HAVE_LIBCHAMPLAIN, test "x$have_libchamplain" = "xyes")
@@ -272,7 +399,7 @@ else
 fi
 
 if test "x$enable_location" = "xyes" -a "x$have_geoclue" != "xyes"; then
-   AC_MSG_ERROR([Couldn't find location dependencies.])
+   AC_MSG_ERROR([Could not find location dependencies.])
 fi
 
 AM_CONDITIONAL(HAVE_GEOCLUE, test "x$have_geoclue" = "xyes")
@@ -280,184 +407,157 @@ AC_SUBST(GEOCLUE_CFLAGS)
 AC_SUBST(GEOCLUE_LIBS)
 
 # -----------------------------------------------------------
-# Megaphone
+# meego widgets support
 # -----------------------------------------------------------
-AC_ARG_ENABLE(megaphone,
-              AS_HELP_STRING([--enable-megaphone=@<:@no/yes/auto@:>@],
-                             [build megaphone applet]), ,
-                             enable_megaphone=auto)
-
-if test "x$enable_megaphone" != "xno"; then
-   PKG_CHECK_MODULES(MEGAPHONE, 
-   [
-      libpanelapplet-2.0 >= $LIBPANELAPPLET_REQUIRED
-      glib-2.0 >= $GLIB_REQUIRED
-      gtk+-2.0 >= $GTK_REQUIRED
-      gconf-2.0 >= $GCONF_REQUIRED
-      libmissioncontrol >= $MISSION_CONTROL_REQUIRED
-   ], have_megaphone="yes", have_megaphone="no")
+AC_ARG_ENABLE(meego,
+              AS_HELP_STRING([--enable-meego=@<:no/yes@:>@],
+                             [Enable meego widgets]), ,
+                             enable_meego=no)
+
+if test "x$enable_meego" != "xno"; then
+    PKG_CHECK_MODULES(MEEGO,
+    [
+       mx-gtk-1.0
+    ], have_meego="yes", have_meego="no")
+
+    if test "x$have_meego" = "xyes"; then
+       AC_DEFINE(HAVE_MEEGO, 1, [Define if you have meego])
+    fi
 else
-   have_megaphone=no
+   have_meego="no"
 fi
 
-if test "x$enable_megaphone" = "xyes" -a "x$have_megaphone" != "xyes"; then
-   AC_MSG_ERROR([Couldn't find megaphone dependencies.])
+if test "x$enable_meego" = "xyes" -a "x$have_meego" != "xyes"; then
+   AC_MSG_ERROR([Could not find meego dependencies.])
 fi
 
-AM_CONDITIONAL(HAVE_MEGAPHONE, test "x$have_megaphone" = "xyes")
+AM_CONDITIONAL(HAVE_MEEGO, test "x$have_meego" = "xyes")
+AC_SUBST(MEEGO_CFLAGS)
+AC_SUBST(MEEGO_LIBS)
 
 # -----------------------------------------------------------
-# Nothere
+# nautilus-sendto
 # -----------------------------------------------------------
-AC_ARG_ENABLE(nothere,
-              AS_HELP_STRING([--enable-nothere=@<:@no/yes/auto@:>@],
-                             [build nothere applet]), ,
-                             enable_nothere=auto)
-
-if test "x$enable_nothere" != "xno"; then
-   PKG_CHECK_MODULES(NOTHERE, 
-   [
-      libpanelapplet-2.0 >= $LIBPANELAPPLET_REQUIRED
-      glib-2.0 >= $GLIB_REQUIRED
-      gtk+-2.0 >= $GTK_REQUIRED
-      gconf-2.0 >= $GCONF_REQUIRED
-      libmissioncontrol >= $MISSION_CONTROL_REQUIRED
-   ], have_nothere="yes", have_nothere="no")
+AC_ARG_ENABLE(nautilus-sendto,
+              AS_HELP_STRING([--enable-nautilus-sendto=@<:@no/yes/auto@:>@],
+                             [build nautilus-sendto plugin]), ,
+                             enable_nautilus_sendto=auto)
+
+if test "x$enable_nautilus_sendto" != "xno"; then
+   if test "x$have_gtk3" == "xno"; then
+      # Newer NST requires GTK+3 so we can't use it
+      PKG_CHECK_MODULES(NST,
+      [
+         nautilus-sendto >= $NAUTILUS_SENDTO_REQUIRED
+         nautilus-sendto < 2.90.0
+      ], have_nst="yes", have_nst="no")
+
+      AC_DEFINE(HAVE_OLD_NST, [], [Legacy compat mode with old nautilus-sendto] )
+   else
+      PKG_CHECK_MODULES(NST,
+      [
+         nautilus-sendto >= $NAUTILUS_SENDTO_REQUIRED_GTK3
+      ], have_nst="yes", have_nst="no")
+   fi
 else
-   have_nothere=no
+   have_nst=no
 fi
 
-if test "x$enable_nothere" = "xyes" -a "x$have_nothere" != "xyes"; then
-   AC_MSG_ERROR([Couldn't find nothere dependencies.])
+if test "x$enable_nautilus_sendto" = "xyes" -a "x$have_nst" != "xyes"; then
+   AC_MSG_ERROR([Could not find nautilus-sendto dependencies.])
 fi
 
-AM_CONDITIONAL(HAVE_NOTHERE, test "x$have_nothere" = "xyes")
+AM_CONDITIONAL(HAVE_NST, test "x$have_nst" = "xyes")
 
 # -----------------------------------------------------------
-# Tests
+# new, single-window control center
 # -----------------------------------------------------------
-AC_ARG_ENABLE(tests,
-              AS_HELP_STRING([--enable-tests=@<:@no/yes/auto@:>@],
-                             [build tests]), ,
-                             enable_tests=auto)
+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_tests" != "xno"; then
-   PKG_CHECK_MODULES(CHECK,
+if test "x$enable_control_center_embedding" != "xno"; then
+   PKG_CHECK_MODULES(CONTROL_CENTER_EMBEDDING,
    [
-      check >= 0.9.4
-   ], have_check="yes", have_check="no")
-else
-   have_check=no
-fi
+      libgnome-control-center
+   ], have_control_center_embedding="yes", have_control_center_embedding="no")
 
-if test "x$enable_tests" = "xyes" -a "x$have_check" != "xyes"; then
-   AC_MSG_ERROR([Couldn't find check dependencies.])
-fi
+   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])
 
-AM_CONDITIONAL(HAVE_TESTS, test "x$have_check" = "xyes")
-
-# -----------------------------------------------------------
-# Python Bindings
-# -----------------------------------------------------------
-AC_ARG_ENABLE(python,
-              AS_HELP_STRING([--enable-python=@<:@no/yes/auto@:>@],
-                             [build python bindings to libempathy and libempathy-gtk]), ,
-                             enable_python=auto)
-
-if test "x$enable_python" != "xno"; then
-   PKG_CHECK_MODULES(PYTHON_BINDING,
-   [
-      pygtk-2.0,
-      glib-2.0 >= $GLIB_REQUIRED
-      gobject-2.0
-      gconf-2.0 >= $GCONF_REQUIRED
-      libxml-2.0
-      libmissioncontrol >= $MISSION_CONTROL_REQUIRED
-      gtk+-2.0 >= $GTK_REQUIRED
-      gstreamer-0.10
-      gstreamer-interfaces-0.10
-      telepathy-farsight
-   ], have_python="yes", have_python="no")
-   if test "x$have_python" = "xyes" ; then
-      AM_CHECK_PYTHON_HEADERS(,have_python="no")
-      AC_CHECK_PROGS([PYGOBJECTCODEGEN], [pygobject-codegen-2.0 pygtk-codegen-2.0])
+      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_python=no
+   have_control_center_embedding="no"
 fi
 
-if test "x$enable_python" = "xyes" -a "x$have_python" != "xyes"; then
-   AC_MSG_ERROR([Couldn't find python.])
+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.])
 fi
 
-AM_CONDITIONAL(HAVE_PYTHON, test "x$have_python" = "xyes")
+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)
 
 # -----------------------------------------------------------
 # Coding style checks
 # -----------------------------------------------------------
 AC_ARG_ENABLE(coding-style-checks,
   AC_HELP_STRING([--disable-coding-style-checks],
-                 [don't check coding style using grep]),
+                 [do not check coding style using grep]),
     [ENABLE_CODING_STYLE_CHECKS=$enableval], [ENABLE_CODING_STYLE_CHECKS=yes])
 
 AC_SUBST([ENABLE_CODING_STYLE_CHECKS])
 # -----------------------------------------------------------
 
-SHAVE_INIT(.)
-
 AC_OUTPUT([
    Makefile
    data/Makefile
    data/empathy.desktop.in
+   data/empathy-accounts.desktop.in
    data/icons/Makefile
    extensions/Makefile
    po/Makefile.in
    libempathy/Makefile
-   libempathy/libempathy.pc
    libempathy-gtk/Makefile
-   libempathy-gtk/libempathy-gtk.pc
    src/Makefile
-   megaphone/Makefile
-   megaphone/src/Makefile
-   megaphone/data/Makefile
-   nothere/Makefile
-   nothere/src/Makefile
-   nothere/data/Makefile
-   docs/Makefile
-   docs/libempathy/Makefile
-   docs/libempathy/version.xml
-   docs/libempathy-gtk/Makefile
-   docs/libempathy-gtk/version.xml
+   nautilus-sendto-plugin/Makefile
    help/Makefile
-   python/Makefile
-   python/pyempathy/Makefile
-   python/pyempathygtk/Makefile
    tests/Makefile
+   tests/interactive/Makefile
    tests/xml/Makefile
    tools/Makefile
-   shave
-   shave-libtool
 ])
 
 echo "
 Configure summary:
 
        Compiler....................:  ${CC}
-       Compiler Flags..............:  ${CFLAGS}
+       Compiler Flags..............:  ${CFLAGS} ${ERROR_CFLAGS}
        Prefix......................:  ${prefix}
-       Shaved build................:  ${enable_shave}
-       Tests.......................:  ${have_check}
        Coding style checks.........:  ${ENABLE_CODING_STYLE_CHECKS}
+       Use GTK+3...................:  ${have_gtk3}
 
     Features:
        Spell checking (enchant)....:  ${have_enchant}
        Display maps (libchamplain).:  ${have_libchamplain}
        Location awareness (Geoclue):  ${have_geoclue}
        Adium themes (Webkit).......:  ${have_webkit}
+       Meego widgets ..............:  ${have_meego}
+       Control center embedding....:  ${have_control_center_embedding}
+
+    Connectivity:
+       NetworkManager integration..:  ${have_nm}
+       ConnMan integration.........:  ${have_connman}
 
     Extras:
-       Documentation...............:  ${enable_gtk_doc}
-       Python bindings.............:  ${have_python}
-       Megaphone applet............:  ${have_megaphone}
-       Nothere applet..............:  ${have_nothere}
+       Nautilus-sendto plugin......:  ${have_nst}
 "