Merge branch 'folks-async-and-prepare'

[empathy.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index dc849ebcdfd732b94e62c13a40e5a03569d199b4..7d735187dc45e8bff14e1aaed02bd19e919b0554 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -31,7 +31,7 @@ AC_COPYRIGHT([
 # Minimal version required
 
 # Hardp deps
-FOLKS_REQUIRED=0.1.2
+FOLKS_REQUIRED=0.1.11
 GCONF_REQUIRED=1.2.0
 GLIB_REQUIRED=2.25.9
 GTK_REQUIRED=2.21.2
@@ -89,8 +89,6 @@ AC_PATH_PROG(DBUS_BINDING_TOOL, dbus-binding-tool)
 GLIB_GSETTINGS
 GLIB_GENMARSHAL=`$PKG_CONFIG glib-2.0 --variable=glib_genmarshal`
 AC_SUBST(GLIB_GENMARSHAL)
-CONTROL_CENTER_EXTENSIONDIR=`$PKG_CONFIG --variable=extensiondir libgnome-control-center-extension`
-AC_SUBST(CONTROL_CENTER_EXTENSIONDIR)
 
 AC_CHECK_PROGS([XSLTPROC], [xsltproc])
 if test -z "$XSLTPROC"; then
@@ -140,31 +138,6 @@ AS_COMPILER_FLAG(-Wmissing-declarations, ERROR_CFLAGS="$ERROR_CFLAGS -Wmissing-d
 
 AC_SUBST(ERROR_CFLAGS)
 
-# -----------------------------------------------------------
-# Enable TPL
-# -----------------------------------------------------------
-
-# It needs to be defined before PKG_CHECK_MODULES calls
-AC_ARG_ENABLE(tpl,
-  AC_HELP_STRING([--enable-tpl],[enable telepathy-logger code and disable the
-    empathy logger]), enable_tpl=$enableval, enable_tpl=no )
-AM_CONDITIONAL(ENABLE_TPL, test "x$enable_tpl" = "xyes")
-
-if test x${enable_tpl} = xyes; then
-  AC_DEFINE(ENABLE_TPL, [], [Enable TPL code])
-fi
-
-if test "x$enable_tpl" = "xyes"; then
-  PKG_CHECK_MODULES(TPL,
-  [
-     telepathy-logger = $TELEPATHY_LOGGER
-  ])
-  AC_SUBST(TPL_CFLAGS)
-  AC_SUBST(TPL_LIBS)
-fi
-
-
-
 # -----------------------------------------------------------
 # Pkg-Config dependency checks
 # -----------------------------------------------------------
@@ -209,7 +182,7 @@ else
 fi
 
 if test "x$enable_gtk3" = "xyes" -a "x$have_gtk3" != "xyes"; then
-   AC_MSG_ERROR([Couldn't find gtk3 dependencies.])
+   AC_MSG_ERROR([Could not find gtk3 dependencies.])
 fi
 
 if test "x$have_gtk3" == "xyes"; then
@@ -327,7 +300,7 @@ 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")
 
@@ -364,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")
@@ -399,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")
@@ -426,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")
@@ -455,7 +428,7 @@ else
 fi
 
 if test "x$enable_meego" = "xyes" -a "x$have_meego" != "xyes"; then
-   AC_MSG_ERROR([Couldn't find meego dependencies.])
+   AC_MSG_ERROR([Could not find meego dependencies.])
 fi
 
 AM_CONDITIONAL(HAVE_MEEGO, test "x$have_meego" = "xyes")
@@ -491,7 +464,7 @@ else
 fi
 
 if test "x$enable_nautilus_sendto" = "xyes" -a "x$have_nst" != "xyes"; then
-   AC_MSG_ERROR([Couldn't find nautilus-sendto dependencies.])
+   AC_MSG_ERROR([Could not find nautilus-sendto dependencies.])
 fi
 
 AM_CONDITIONAL(HAVE_NST, test "x$have_nst" = "xyes")
@@ -507,18 +480,27 @@ AC_ARG_ENABLE(control_center_embedding,
 if test "x$enable_control_center_embedding" != "xno"; then
    PKG_CHECK_MODULES(CONTROL_CENTER_EMBEDDING,
    [
-      libgnome-control-center-extension
+      libgnome-control-center
    ], 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([Couldn't find single-window control center dependencies.])
+   AC_MSG_ERROR([Could not find single-window control center dependencies.])
 fi
 
 AM_CONDITIONAL(HAVE_CONTROL_CENTER_EMBEDDING, test "x$have_control_center_embedding" = "xyes")
@@ -530,7 +512,7 @@ AC_SUBST(CONTROL_CENTER_EMBEDDING_LIBS)
 # -----------------------------------------------------------
 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])