X-Git-Url: https://git.0d.be/?p=empathy.git;a=blobdiff_plain;f=configure.ac;h=4ed8d9e24e755caff1105c99574dfafddebbd700;hp=a180abca085ebf9c913a6a902ac718bc63943426;hb=6c5839c976407292715daf22cdddf6aca469fa75;hpb=733e7394cb7f805c41332c07336347e87b86c590 diff --git a/configure.ac b/configure.ac index a180abca..4ed8d9e2 100644 --- 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], [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' @@ -31,32 +31,28 @@ AC_COPYRIGHT([ # 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.22.0 +GTK_REQUIRED=2.91.3 KEYRING_REQUIRED=2.26.0 -LIBCANBERRA_GTK_REQUIRED=0.4 -LIBNOTIFY_REQUIRED=0.4.4 -LIBNOTIFY_REQUIRED_GTK3=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 -CLUTTER_GTK_REQUIRED=0.10 +# Optional deps +CLUTTER_GTK_REQUIRED=0.90.3 ENCHANT_REQUIRED=1.2.0 GEOCLUE_REQUIRED=0.11 ISO_CODES_REQUIRED=0.35 LIBCHAMPLAIN_GTK_REQUIRED=0.7.1 LIBCHAMPLAIN_REQUIRED=0.7.1 -NAUTILUS_SENDTO_REQUIRED=2.31.7 -NAUTILUS_SENDTO_REQUIRED_GTK3=2.90.0 +NAUTILUS_SENDTO_REQUIRED=2.90.0 NETWORK_MANAGER_REQUIRED=0.7.0 -WEBKIT_REQUIRED=1.1.15 -GNOME_CONTROL_CENTER_GTK3_REQUIRED=2.31.4 +WEBKIT_REQUIRED=1.3.2 +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, @@ -150,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 @@ -164,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 ]) # ----------------------------------------------------------- @@ -177,51 +177,6 @@ if test x"$with_eds" = x"yes" ; then AC_DEFINE(HAVE_EDS, 1, [Define if we have libebook]) fi -# ----------------------------------------------------------- -# GTK+ -# ----------------------------------------------------------- -AC_ARG_ENABLE(gtk3, - AS_HELP_STRING([--enable-gtk3=@<:@no/yes/auto@:>@], - [build with GTK+3]), , - enable_gtk3=auto) - -# Try to use GTK+3 if available -if test "x$enable_gtk3" != "xno"; then - PKG_CHECK_MODULES(GTK, - [ - gtk+-3.0 >= $GTK_REQUIRED - ], have_gtk3="yes", have_gtk3="no") -else - have_gtk3="no" -fi - -if test "x$enable_gtk3" = "xyes" -a "x$have_gtk3" != "xyes"; then - AC_MSG_ERROR([Could not find gtk3 dependencies.]) -fi - -if test "x$have_gtk3" == "xyes"; then - # GTK3 specific deps - PKG_CHECK_MODULES(CANBERRA, libcanberra-gtk3 >= $LIBCANBERRA_GTK_REQUIRED) - PKG_CHECK_MODULES(LIBNOTIFY, libnotify >= $LIBNOTIFY_REQUIRED_GTK3) - PKG_CHECK_MODULES(UNIQUE, unique-3.0 >= $UNIQUE_REQUIRED) - PKG_CHECK_MODULES(GCR, gcr-3 >= $KEYRING_REQUIRED) - - AC_DEFINE(HAVE_GTK3, 1, [Define if we're compiling against GTK+ 3]) -else - PKG_CHECK_MODULES(GTK, gtk+-2.0 >= $GTK_REQUIRED) - - # GTK2 specific deps - PKG_CHECK_MODULES(CANBERRA, libcanberra-gtk >= $LIBCANBERRA_GTK_REQUIRED) - PKG_CHECK_MODULES(LIBNOTIFY, libnotify >= $LIBNOTIFY_REQUIRED) - PKG_CHECK_MODULES(UNIQUE, unique-1.0 >= $UNIQUE_REQUIRED) - PKG_CHECK_MODULES(GCR, gcr-0 >= $KEYRING_REQUIRED) - - # Enable GSEAL checks if needed - if test $USE_MAINTAINER_MODE = yes; then - AC_DEFINE(GSEAL_ENABLE, [], [Seal public structs to force usage of accessors]) - fi -fi - # ----------------------------------------------------------- # Enable debug # ----------------------------------------------------------- @@ -244,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 # ----------------------------------------------------------- @@ -301,14 +288,8 @@ AC_ARG_ENABLE(webkit, enable_webkit=auto) if test "x$enable_webkit" != "xno"; then - - if test "x$have_gtk3" == "xno"; then - PKG_CHECK_MODULES(WEBKIT, [webkit-1.0 >= $WEBKIT_REQUIRED], - have_webkit="yes", have_webkit="no") - else - PKG_CHECK_MODULES(WEBKIT, [webkitgtk-3.0 >= $WEBKIT_REQUIRED], - have_webkit="yes", have_webkit="no") - fi + PKG_CHECK_MODULES(WEBKIT, [webkitgtk-3.0 >= $WEBKIT_REQUIRED], + have_webkit="yes", have_webkit="no") if test "x$have_webkit" = "xyes"; then AC_DEFINE(HAVE_WEBKIT, 1, [Define if you have libwebkitgtk]) @@ -370,17 +351,13 @@ AC_ARG_ENABLE(map, if test "x$enable_map" != "xno"; then - if test "x$have_gtk3" == "xno"; then - PKG_CHECK_MODULES(LIBCHAMPLAIN, - [ - champlain-0.8 >= $LIBCHAMPLAIN_REQUIRED, - champlain-gtk-0.8 >= $LIBCHAMPLAIN_GTK_REQUIRED - clutter-gtk-0.10 >= $CLUTTER_GTK_REQUIRED - ], have_libchamplain="yes", have_libchamplain="no") - else - # FIXME: check deps once clutter-gtk and champlain have been ported to GTK3 - have_libchamplain="no" - fi + PKG_CHECK_MODULES(LIBCHAMPLAIN, + [ + champlain-0.8 >= $LIBCHAMPLAIN_REQUIRED, +# champplain-gtk3 doesn't exist. Fix the name once bgo #631009 + champlain-gtk3-0.8 >= $LIBCHAMPLAIN_GTK_REQUIRED + clutter-gtk >= $CLUTTER_GTK_REQUIRED + ], have_libchamplain="yes", have_libchamplain="no") if test "x$have_libchamplain" = "xyes"; then AC_DEFINE(HAVE_LIBCHAMPLAIN, 1, [Define if you have libchamplain]) @@ -428,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) @@ -436,6 +413,7 @@ if test "x$enable_meego" != "xno"; then 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 @@ -462,19 +440,10 @@ AC_ARG_ENABLE(nautilus-sendto, enable_nautilus_sendto=auto) if test "x$enable_nautilus_sendto" != "xno"; then - if test "x$have_gtk3" == "xno"; then - # Newer NST requires GTK+3 so we can't use it - PKG_CHECK_MODULES(NST, - [ - nautilus-sendto >= $NAUTILUS_SENDTO_REQUIRED - nautilus-sendto < 2.90.0 - ], have_nst="yes", have_nst="no") - else - PKG_CHECK_MODULES(NST, - [ - nautilus-sendto >= $NAUTILUS_SENDTO_REQUIRED_GTK3 - ], have_nst="yes", have_nst="no") - fi + PKG_CHECK_MODULES(NST, + [ + nautilus-sendto >= $NAUTILUS_SENDTO_REQUIRED + ], have_nst="yes", have_nst="no") else have_nst=no fi @@ -495,13 +464,8 @@ AC_ARG_ENABLE(control_center_embedding, if test "x$enable_control_center_embedding" != "xno"; then - if test "x$have_gtk3" == "xno"; then - PKG_CHECK_MODULES(CONTROL_CENTER_EMBEDDING, [libgnome-control-center < GNOME_CONTROL_CENTER_GTK3_REQUIRED], - have_control_center_embedding="yes", have_control_center_embedding="no") - else - PKG_CHECK_MODULES(CONTROL_CENTER_EMBEDDING, [libgnome-control-center >= GNOME_CONTROL_CENTER_GTK3_REQUIRED], - have_control_center_embedding="yes", have_control_center_embedding="no") - fi + PKG_CHECK_MODULES(CONTROL_CENTER_EMBEDDING, [libgnome-control-center >= GNOME_CONTROL_CENTER_REQUIRED], + have_control_center_embedding="yes", have_control_center_embedding="no") if test "x$have_control_center_embedding" = "xyes"; then AC_DEFINE(HAVE_CONTROL_CENTER_EMBEDDING, 1, [Define if you have the single-window control center]) @@ -564,7 +528,7 @@ Configure summary: Compiler Flags..............: ${CFLAGS} ${ERROR_CFLAGS} Prefix......................: ${prefix} Coding style checks.........: ${ENABLE_CODING_STYLE_CHECKS} - Use GTK+3...................: ${have_gtk3} + CA Cert Path................: ${GTLS_SYSTEM_CA_FILE} Features: Spell checking (enchant)....: ${have_enchant}