Add ax_config_dir from audacity

[empathy.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 80aa724f3e37ea1ec7c6e4d5414386fc6a6a4977..1692810bb03a3cf8d198a3d6fc652f070ddbb586 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,10 +1,10 @@
 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], [91])
-m4_define([empathy_micro_version], [6])
-m4_define([empathy_nano_version], [1])
+m4_define([empathy_major_version], [3])
+m4_define([empathy_minor_version], [1])
+m4_define([empathy_micro_version], [1])
+m4_define([empathy_nano_version], [0])
 
 dnl Display the nano_version only if it's not '0'
 m4_define([empathy_base_version],
@@ -31,17 +31,17 @@ AC_COPYRIGHT([
 # Minimal version required
 
 # Hardp deps
-FOLKS_REQUIRED=0.3.5
-GLIB_REQUIRED=2.27.2
+FOLKS_REQUIRED=0.5.1
+GLIB_REQUIRED=2.28.0
 GNUTLS_REQUIRED=2.8.5
-GTK_REQUIRED=2.99.0
+GTK_REQUIRED=3.0.2
 KEYRING_REQUIRED=2.26.0
 GCR_REQUIRED=2.91.4
 LIBCANBERRA_GTK_REQUIRED=0.25
 LIBNOTIFY_REQUIRED=0.7.0
 TELEPATHY_FARSIGHT_REQUIRED=0.0.14
-TELEPATHY_GLIB_REQUIRED=0.13.12
-TELEPATHY_LOGGER=0.1.5
+TELEPATHY_GLIB_REQUIRED=0.15.1
+TELEPATHY_LOGGER=0.2.0
 
 # Optional deps
 CLUTTER_GTK_REQUIRED=0.90.3
@@ -158,7 +158,7 @@ PKG_CHECK_MODULES(EMPATHY,
    gstreamer-interfaces-0.10
    libxml-2.0
    telepathy-glib >= $TELEPATHY_GLIB_REQUIRED
-   telepathy-logger-0.1 >= $TELEPATHY_LOGGER
+   telepathy-logger-0.2 >= $TELEPATHY_LOGGER
    x11
    gtk+-3.0 >= $GTK_REQUIRED
    libcanberra-gtk3 >= $LIBCANBERRA_GTK_REQUIRED
@@ -327,9 +327,9 @@ if test "x$enable_map" != "xno"; then
 
    PKG_CHECK_MODULES(LIBCHAMPLAIN,
     [
-       champlain-0.10
-       champlain-gtk-0.10
        clutter-gtk-1.0
+       champlain-gtk-0.10
+       champlain-0.10
     ], have_libchamplain="yes", have_libchamplain="no")
 
    if test "x$have_libchamplain" = "xyes"; then
@@ -464,6 +464,25 @@ AM_CONDITIONAL(HAVE_CONTROL_CENTER_EMBEDDING, test "x$have_control_center_embedd
 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], [enable cheese webcam support]),,
+            with_cheese=auto)
+
+if test x"$with_cheese" != x"no" ; then
+   PKG_CHECK_MODULES(CHEESE, gstreamer-0.10 cheese-gtk >= 2.91.91.1, [have_cheese=yes], [have_cheese=no])
+   if test x${have_cheese} = xyes; then
+     AC_DEFINE(HAVE_CHEESE, 1, [Define to 1 to enable cheese webcam support])
+   fi
+   if test x${with_cheese} = xyes && test x${have_cheese} = xno; then
+     AC_MSG_ERROR([Cheese configured but not found])
+   fi
+else
+   have_cheese=no
+fi
+AM_CONDITIONAL(BUILD_CHEESE, test x${have_cheese} = xyes)
+
+
 # -----------------------------------------------------------
 # Coding style checks
 # -----------------------------------------------------------
@@ -509,6 +528,7 @@ Configure summary:
        Adium themes (Webkit).......:  ${have_webkit}
        Meego widgets ..............:  ${have_meego}
        Control center embedding....:  ${have_control_center_embedding}
+       Cheese webcam support ......:  ${have_cheese}
 
     Connectivity:
        NetworkManager integration..:  ${have_nm}