use Cogl versioning macros

[empathy.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 8296ec97519166c71728cfdf7ed0a312a18f525d..67206478aeed83834f0265d262ab7b5cc7a35cf9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2,8 +2,8 @@ dnl If not 1, append datestamp to the version number
 m4_define(empathy_released, 0)
 
 m4_define([empathy_major_version], [3])
-m4_define([empathy_minor_version], [9])
-m4_define([empathy_micro_version], [4])
+m4_define([empathy_minor_version], [10])
+m4_define([empathy_micro_version], [0])
 m4_define([empathy_nano_version], [0])
 
 dnl Display the nano_version only if it's not '0'
@@ -34,16 +34,16 @@ AC_COPYRIGHT([
 # Minimal version required
 
 # Hardp deps
-FOLKS_REQUIRED=0.9.0
+FOLKS_REQUIRED=0.9.5
 GNUTLS_REQUIRED=2.8.5
 
-GLIB_REQUIRED=2.33.3
+GLIB_REQUIRED=2.37.6
 AC_DEFINE(GLIB_VERSION_MIN_REQUIRED, GLIB_VERSION_2_30, [Ignore post 2.30 deprecations])
-AC_DEFINE(GLIB_VERSION_MAX_ALLOWED, GLIB_VERSION_2_34, [Prevent post 2.34 APIs])
+AC_DEFINE(GLIB_VERSION_MAX_ALLOWED, GLIB_VERSION_2_38, [Prevent post 2.38 APIs])
 
-GTK_REQUIRED=3.5.1
-AC_DEFINE(GDK_VERSION_MIN_REQUIRED, GDK_VERSION_3_4, [Ignore post 3.4 deprecations])
-AC_DEFINE(GDK_VERSION_MAX_ALLOWED, GDK_VERSION_3_4, [Prevent post 3.4 APIs])
+GTK_REQUIRED=3.9.4
+AC_DEFINE(GDK_VERSION_MIN_REQUIRED, GDK_VERSION_3_8, [Ignore post 3.8 deprecations])
+AC_DEFINE(GDK_VERSION_MAX_ALLOWED, GDK_VERSION_3_10, [Prevent post 3.10 APIs])
 
 CLUTTER_REQUIRED=1.10.0
 AC_DEFINE(CLUTTER_VERSION_MIN_REQUIRED, CLUTTER_VERSION_1_8, [Ignore post 1.8 deprecations])
@@ -69,7 +69,7 @@ GOA_REQUIRED=3.5.1
 
 # Optional deps
 ENCHANT_REQUIRED=1.2.0
-GEOCLUE_REQUIRED=0.12
+GEOCLUE_REQUIRED=1.99.3
 GEOCODE_GLIB_REQUIRED=0.99.1
 ISO_CODES_REQUIRED=0.35
 NAUTILUS_SENDTO_REQUIRED=2.90.0
@@ -77,9 +77,13 @@ NETWORK_MANAGER_REQUIRED=0.7.0
 CHAMPLAIN_REQUIRED=0.12.1
 CHEESE_GTK_REQUIRED=3.4.0
 LIBACCOUNTS_REQUIRED=1.4
-LIBSIGNON_REQUIRED=1.1
+LIBSIGNON_REQUIRED=1.8
 MC_PLUGINS_REQUIRED=5.13.1
 
+COGL_REQUIRED=1.14
+AC_DEFINE(COGL_VERSION_MIN_REQUIRED, COGL_VERSION_1_14, [Ignore post 1.14 deprecations])
+AC_DEFINE(COGL_VERSION_MAX_ALLOWED, COGL_VERSION_1_14, [Ignore post 1.14 deprecations])
+
 # 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
@@ -91,6 +95,7 @@ MC_PLUGINS_REQUIRED=5.13.1
 prev_top_build_prefix=$ac_top_build_prefix
 prev_ac_configure_args=$ac_configure_args
 ac_configure_args="$ac_configure_args --with-pkgdatadir=${datadir}/empathy"
+ac_configure_args="$ac_configure_args --with-gettext-package=empathy-tpaw"
 ifelse(empathy_released, 1, [],
     [
         ac_configure_args="$ac_configure_args --enable-unreleased-checks"
@@ -102,15 +107,9 @@ ac_configure_args=$prev_ac_configure_args
 export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:"$ac_top_build_prefix"telepathy-account-widgets/
 PKG_CHECK_MODULES(TPAW, telepathy-account-widgets)
 
-# egg-list-box
-prev_top_build_prefix=$ac_top_build_prefix
-prev_ac_configure_args=$ac_configure_args
-AX_CONFIG_DIR([libempathy-gtk/egg-list-box])
-ac_top_build_prefix=$prev_top_build_prefix
-ac_configure_args=$prev_ac_configure_args
-
-export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:"$ac_top_build_prefix"libempathy-gtk/egg-list-box
-PKG_CHECK_MODULES(EGGLISTBOX, egg-list-box)
+EMPATHY_UOA_PROVIDER=`pkg-config --variable=uoa_provider telepathy-account-widgets`
+AC_DEFINE_UNQUOTED(EMPATHY_UOA_PROVIDER, "$EMPATHY_UOA_PROVIDER",
+   [Name of provider for accounts imported from libaccounts])
 
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADERS([config.h])
@@ -259,7 +258,7 @@ if test "x$enable_gst1" != "xno"; then
      gstreamer-1.0
      gstreamer-audio-1.0
      gstreamer-video-1.0
-     cogl-1.0
+     cogl-1.0 >= $COGL_REQUIRED
   ], have_gst1="yes", have_gst1="no")
 
   if test "x$have_gst1" = "xyes"; then
@@ -289,10 +288,6 @@ fi
 AC_DEFINE(EMPATHY_GOA_PROVIDER, "org.gnome.OnlineAccounts",
    [Name of provider for accounts imported from GOA])
 
-AC_DEFINE(EMPATHY_UOA_PROVIDER,
-    "im.telepathy.Account.Storage.UOA",
-   [Name of provider for accounts imported from libaccounts])
-
 # -----------------------------------------------------------
 # Enable debug
 # -----------------------------------------------------------
@@ -425,11 +420,18 @@ AC_ARG_ENABLE(location,
 if test "x$enable_location" != "xno"; then
    PKG_CHECK_MODULES(GEOCLUE,
    [
-      geoclue >= $GEOCLUE_REQUIRED
+      geoclue-2.0 >= $GEOCLUE_REQUIRED
    ], have_geoclue="yes", have_geoclue="no")
 
    if test "x$have_geoclue" = "xyes"; then
-      AC_DEFINE(HAVE_GEOCLUE, 1, [Define if you have geoclue])
+      GEOCLUE_XML_FILE=`pkg-config --variable=dbus_interface geoclue-2.0`
+      if test "x$GEOCLUE_XML_FILE" = "x"; then
+        echo "Can't find dbus_interface variable in geoclue-2.0.pc"
+        have_geoclue="no"
+      else
+        AC_DEFINE(HAVE_GEOCLUE, 1, [Define if you have geoclue-2])
+        AC_SUBST(GEOCLUE_XML_FILE)
+      fi
    fi
 else
    have_geoclue="no"