m4_define(empathy_released, 0)
m4_define([empathy_major_version], [2])
-m4_define([empathy_minor_version], [90])
-m4_define([empathy_micro_version], [99])
+m4_define([empathy_minor_version], [91])
+m4_define([empathy_micro_version], [3])
m4_define([empathy_nano_version], [0])
dnl Display the nano_version only if it's not '0'
# Minimal version required
# Hardp deps
-FOLKS_REQUIRED=0.1.15
-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.90.8
+GTK_REQUIRED=2.91.3
KEYRING_REQUIRED=2.26.0
-LIBCANBERRA_GTK_REQUIRED=0.4
-LIBNOTIFY_REQUIRED=0.5.1
+LIBCANBERRA_GTK_REQUIRED=0.25
+LIBNOTIFY_REQUIRED=0.7.0
TELEPATHY_FARSIGHT_REQUIRED=0.0.14
-TELEPATHY_GLIB_REQUIRED=0.11.16
+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
LIBCHAMPLAIN_REQUIRED=0.7.1
NAUTILUS_SENDTO_REQUIRED=2.90.0
NETWORK_MANAGER_REQUIRED=0.7.0
-WEBKIT_REQUIRED=1.1.15
+WEBKIT_REQUIRED=1.3.2
GNOME_CONTROL_CENTER_REQUIRED=2.31.4
# Use --enable-maintainer-mode to disable deprecated symbols,
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
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
])
# -----------------------------------------------------------
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
# -----------------------------------------------------------
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
# -----------------------------------------------------------
# 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)
PKG_CHECK_MODULES(MEEGO,
[
mx-gtk-1.0
+ gio-unix-2.0
], have_meego="yes", have_meego="no")
if test "x$have_meego" = "xyes"; then
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}