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], [91])
-m4_define([empathy_micro_version], [3])
+m4_define([empathy_major_version], [3])
+m4_define([empathy_minor_version], [1])
+m4_define([empathy_micro_version], [1])
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.3.2
-GLIB_REQUIRED=2.27.2
+FOLKS_REQUIRED=0.5.1
+GLIB_REQUIRED=2.28.0
GNUTLS_REQUIRED=2.8.5
-GTK_REQUIRED=2.91.3
+GTK_REQUIRED=3.0.2
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_LOGGER=0.1.5
+TELEPATHY_GLIB_REQUIRED=0.15.1
+TELEPATHY_LOGGER=0.2.0
# Optional deps
CLUTTER_GTK_REQUIRED=0.90.3
GEOCLUE_REQUIRED=0.11
ISO_CODES_REQUIRED=0.35
LIBCHAMPLAIN_GTK_REQUIRED=0.7.1
-LIBCHAMPLAIN_REQUIRED=0.7.1
+LIBCHAMPLAIN_REQUIRED=0.9
NAUTILUS_SENDTO_REQUIRED=2.90.0
NETWORK_MANAGER_REQUIRED=0.7.0
WEBKIT_REQUIRED=1.3.2
# 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])
AS_COMPILER_FLAG(-Wshadow, ERROR_CFLAGS="$ERROR_CFLAGS -Wshadow")
AS_COMPILER_FLAG(-Wmissing-prototypes, ERROR_CFLAGS="$ERROR_CFLAGS -Wmissing-prototypes")
AS_COMPILER_FLAG(-Wmissing-declarations, ERROR_CFLAGS="$ERROR_CFLAGS -Wmissing-declarations")
-# Disabled because some GTK+ headers (like gtkitemfactory.h) are bugged :(
-#AS_COMPILER_FLAG(-Wstrict-prototypes, ERROR_CFLAGS="$ERROR_CFLAGS -Wstrict-prototypes")
+AS_COMPILER_FLAG(-Wstrict-prototypes, ERROR_CFLAGS="$ERROR_CFLAGS -Wstrict-prototypes")
AC_SUBST(ERROR_CFLAGS)
PKG_CHECK_MODULES(EMPATHY,
[
dbus-glib-1
- farsight2-0.10
folks >= $FOLKS_REQUIRED
folks-telepathy >= $FOLKS_REQUIRED
+ glib-2.0 >= $GLIB_REQUIRED
gio-2.0 >= $GLIB_REQUIRED
gio-unix-2.0 >= $GLIB_REQUIRED
gnome-keyring-1 >= $KEYRING_REQUIRED
gstreamer-0.10
gstreamer-interfaces-0.10
libxml-2.0
- telepathy-farsight >= $TELEPATHY_FARSIGHT_REQUIRED
telepathy-glib >= $TELEPATHY_GLIB_REQUIRED
- telepathy-logger-0.1 >= $TELEPATHY_LOGGER
+ telepathy-logger-0.2 >= $TELEPATHY_LOGGER
x11
gtk+-3.0 >= $GTK_REQUIRED
libcanberra-gtk3 >= $LIBCANBERRA_GTK_REQUIRED
libnotify >= $LIBNOTIFY_REQUIRED
- gcr-3 >= $KEYRING_REQUIRED
+ gcr-3 >= $GCR_REQUIRED
+])
+
+PKG_CHECK_MODULES(EMPATHY_AV,
+[
+ farsight2-0.10
+ telepathy-farsight >= $TELEPATHY_FARSIGHT_REQUIRED
])
# -----------------------------------------------------------
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
# -----------------------------------------------------------
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
+ clutter-gtk-1.0
+ champlain-gtk-0.10
+ champlain-0.10
], have_libchamplain="yes", have_libchamplain="no")
if test "x$have_libchamplain" = "xyes"; then
AC_SUBST(CONTROL_CENTER_EMBEDDING_CFLAGS)
AC_SUBST(CONTROL_CENTER_EMBEDDING_LIBS)
+# Optional dependency for avatar selection
+AC_ARG_WITH([cheese],
+ AS_HELP_STRING([--with-cheese], [enable cheese webcam support]),,
+ with_cheese=auto)
+
+if test x"$with_cheese" != x"no" ; then
+ PKG_CHECK_MODULES(CHEESE, gstreamer-0.10 cheese-gtk >= 2.91.91.1, [have_cheese=yes], [have_cheese=no])
+ if test x${have_cheese} = xyes; then
+ AC_DEFINE(HAVE_CHEESE, 1, [Define to 1 to enable cheese webcam support])
+ fi
+ if test x${with_cheese} = xyes && test x${have_cheese} = xno; then
+ AC_MSG_ERROR([Cheese configured but not found])
+ fi
+else
+ have_cheese=no
+fi
+AM_CONDITIONAL(BUILD_CHEESE, test x${have_cheese} = xyes)
+
+
# -----------------------------------------------------------
# Coding style checks
# -----------------------------------------------------------
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}
Adium themes (Webkit).......: ${have_webkit}
Meego widgets ..............: ${have_meego}
Control center embedding....: ${have_control_center_embedding}
+ Cheese webcam support ......: ${have_cheese}
Connectivity:
NetworkManager integration..: ${have_nm}
projects / empathy.git / blobdiff