Updated Russian translation

[empathy.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 1503cd810713d19c6cd06e015c70b3a8389ec5d4..df11d7ed7c6fcb76f809ac115130d27f145817ef 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, 1)
+m4_define(empathy_released, 0)
 
 m4_define([empathy_major_version], [2])
 m4_define([empathy_minor_version], [91])
-m4_define([empathy_micro_version], [3])
-m4_define([empathy_nano_version], [0])
+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],
@@ -31,15 +31,16 @@ AC_COPYRIGHT([
 # Minimal version required
 
 # Hardp deps
-FOLKS_REQUIRED=0.3.2
+FOLKS_REQUIRED=0.3.3
 GLIB_REQUIRED=2.27.2
 GNUTLS_REQUIRED=2.8.5
-GTK_REQUIRED=2.91.3
+GTK_REQUIRED=2.99.0
 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.7
+TELEPATHY_GLIB_REQUIRED=0.13.9
 TELEPATHY_LOGGER=0.1.5
 
 # Optional deps
@@ -57,8 +58,9 @@ 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,
 # maintainer mode is forced
-ifelse(empathy_released, 1, [], [enable_maintainer_mode="yes"])
-GNOME_MAINTAINER_MODE_DEFINES
+# FIXME: don't disable deprecated symbols until bgo #636654 has been fixed
+#ifelse(empathy_released, 1, [], [enable_maintainer_mode="yes"])
+#GNOME_MAINTAINER_MODE_DEFINES
 
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADERS([config.h])
@@ -163,7 +165,7 @@ PKG_CHECK_MODULES(EMPATHY,
    gtk+-3.0 >= $GTK_REQUIRED
    libcanberra-gtk3 >= $LIBCANBERRA_GTK_REQUIRED
    libnotify >= $LIBNOTIFY_REQUIRED
-   gcr-3 >= $KEYRING_REQUIRED
+   gcr-3 >= $GCR_REQUIRED
 ])
 
 # -----------------------------------------------------------
@@ -199,38 +201,6 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[Gettext package name])
 
 AM_GLIB_GNU_GETTEXT
 
-# -----------------------------------------------------------
-# Make CA certificates path configurable
-# Stolen from GIO's TLS
-# -----------------------------------------------------------
-AC_MSG_CHECKING([location of system Certificate Authority list])
-AC_ARG_WITH(ca-file,
-            [AC_HELP_STRING([--with-ca-file=@<:@path@:>@],
-                            [path to system Certificate Authority list])])
-if test "$with_ca_file" = "no"; then
-    AC_MSG_RESULT([disabled])
-else
-    if test -z "$with_ca_file"; then
-        for f in /etc/pki/tls/certs/ca-bundle.crt \
-                 /etc/ssl/certs/ca-certificates.crt; do
-            if test -f "$f"; then
-                with_ca_file="$f"
-            fi
-        done
-        if test -z "$with_ca_file"; then
-            AC_MSG_ERROR([could not find. Use --with-ca-file=path to set, or --without-ca-file to disable])
-        fi
-    fi
-
-    AC_MSG_RESULT($with_ca_file)
-    if ! test -f "$with_ca_file"; then
-        AC_MSG_ERROR([No such file '$with_ca_file'. Use --with-ca-file=path to set, or --without-ca-file to disable])
-    fi
-    GTLS_SYSTEM_CA_FILE="$with_ca_file"
-
-    AC_DEFINE_UNQUOTED([GTLS_SYSTEM_CA_FILE], ["$GTLS_SYSTEM_CA_FILE"], [path to system Certificate Authority list])
-fi
-
 # -----------------------------------------------------------
 # Connectivity integration
 # -----------------------------------------------------------
@@ -528,7 +498,6 @@ Configure summary:
        Compiler Flags..............:  ${CFLAGS} ${ERROR_CFLAGS}
        Prefix......................:  ${prefix}
        Coding style checks.........:  ${ENABLE_CODING_STYLE_CHECKS}
-       CA Cert Path................:  ${GTLS_SYSTEM_CA_FILE}
 
     Features:
        Spell checking (enchant)....:  ${have_enchant}