X-Git-Url: https://git.0d.be/?p=empathy.git;a=blobdiff_plain;f=configure.ac;h=4ed8d9e24e755caff1105c99574dfafddebbd700;hp=21fb15966978a0d01f1b41acf5825314706b25b1;hb=6c5839c976407292715daf22cdddf6aca469fa75;hpb=643dc00f6a6e60f1dae91647301505169e8c7791

diff --git a/configure.ac b/configure.ac
index 21fb1596..4ed8d9e2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ m4_define(empathy_released, 0)
 
 m4_define([empathy_major_version], [2])
 m4_define([empathy_minor_version], [91])
-m4_define([empathy_micro_version], [0])
+m4_define([empathy_micro_version], [3])
 m4_define([empathy_nano_version], [0])
 
 dnl Display the nano_version only if it's not '0'
@@ -31,20 +31,18 @@ AC_COPYRIGHT([
 # Minimal version required
 
 # Hardp deps
-FOLKS_REQUIRED=0.3.1
-GCONF_REQUIRED=1.2.0
-GLIB_REQUIRED=2.25.9
+FOLKS_REQUIRED=0.3.2
+GLIB_REQUIRED=2.27.2
 GNUTLS_REQUIRED=2.8.5
-GTK_REQUIRED=2.91.0
+GTK_REQUIRED=2.91.3
 KEYRING_REQUIRED=2.26.0
 LIBCANBERRA_GTK_REQUIRED=0.25
-LIBNOTIFY_REQUIRED=0.5.1
+LIBNOTIFY_REQUIRED=0.7.0
 TELEPATHY_FARSIGHT_REQUIRED=0.0.14
-TELEPATHY_GLIB_REQUIRED=0.13.1.1
+TELEPATHY_GLIB_REQUIRED=0.13.7
 TELEPATHY_LOGGER=0.1.5
-UNIQUE_REQUIRED=1.1.2
 
-# Optionnal deps
+# Optional deps
 CLUTTER_GTK_REQUIRED=0.90.3
 ENCHANT_REQUIRED=1.2.0
 GEOCLUE_REQUIRED=0.11
@@ -148,13 +146,13 @@ PKG_CHECK_MODULES(EMPATHY,
    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
    gnome-keyring-1 >= $KEYRING_REQUIRED
    gnutls >= $GNUTLS_REQUIRED
    gmodule-export-2.0
    gobject-2.0
+   gsettings-desktop-schemas
    gstreamer-0.10
    gstreamer-interfaces-0.10
    libxml-2.0
@@ -162,6 +160,10 @@ PKG_CHECK_MODULES(EMPATHY,
    telepathy-glib >= $TELEPATHY_GLIB_REQUIRED
    telepathy-logger-0.1 >= $TELEPATHY_LOGGER
    x11
+   gtk+-3.0 >= $GTK_REQUIRED
+   libcanberra-gtk3 >= $LIBCANBERRA_GTK_REQUIRED
+   libnotify >= $LIBNOTIFY_REQUIRED
+   gcr-3 >= $KEYRING_REQUIRED
 ])
 
 # -----------------------------------------------------------
@@ -175,16 +177,6 @@ if test x"$with_eds" = x"yes" ; then
    AC_DEFINE(HAVE_EDS, 1, [Define if we have libebook])
 fi
 
-# -----------------------------------------------------------
-# GTK+
-# -----------------------------------------------------------
-PKG_CHECK_MODULES(GTK, gtk+-3.0 >= $GTK_REQUIRED)
-
-PKG_CHECK_MODULES(CANBERRA, libcanberra-gtk3 >= $LIBCANBERRA_GTK_REQUIRED)
-PKG_CHECK_MODULES(LIBNOTIFY, libnotify >= $LIBNOTIFY_REQUIRED)
-PKG_CHECK_MODULES(UNIQUE, unique-3.0 >= $UNIQUE_REQUIRED)
-PKG_CHECK_MODULES(GCR, gcr-3 >= $KEYRING_REQUIRED)
-
 # -----------------------------------------------------------
 # Enable debug
 # -----------------------------------------------------------
@@ -207,6 +199,38 @@ 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
 # -----------------------------------------------------------
@@ -381,7 +405,7 @@ AC_SUBST(GEOCLUE_LIBS)
 # meego widgets support
 # -----------------------------------------------------------
 AC_ARG_ENABLE(meego,
-              AS_HELP_STRING([--enable-meego=@<:no/yes@:>@],
+              AS_HELP_STRING([--enable-meego=@<:@no/yes@:>@],
                              [Enable meego widgets]), ,
                              enable_meego=no)
 
@@ -504,6 +528,7 @@ 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}