m4_define([empathy_major_version], [2])
m4_define([empathy_minor_version], [29])
-m4_define([empathy_micro_version], [1])
+m4_define([empathy_micro_version], [4])
m4_define([empathy_nano_version], [0])
dnl Display the nano_version only if it's not '0'
# Minimal version required
GLIB_REQUIRED=2.22.0
-GTK_REQUIRED=2.16.0
+GTK_REQUIRED=2.18.0
GCONF_REQUIRED=1.2.0
-LIBPANELAPPLET_REQUIRED=2.10.0
-TELEPATHY_GLIB_REQUIRED=0.7.35
+TELEPATHY_GLIB_REQUIRED=0.9.0
ENCHANT_REQUIRED=1.2.0
ISO_CODES_REQUIRED=0.35
LIBNOTIFY_REQUIRED=0.4.4
WEBKIT_REQUIRED=1.1.15
KEYRING_REQUIRED=2.22
NETWORK_MANAGER_REQUIRED=0.7.0
-NAUTILUS_SENDTO_REQUIRED=2.28.0.1
+NAUTILUS_SENDTO_REQUIRED=2.28.1
# Use --enable-maintainer-mode to disabled deprecated symbols
GNOME_MAINTAINER_MODE_DEFINES
-# Uncomment that to build with single include disabled
-#AC_DEFINE(G_DISABLE_SINGLE_INCLUDES, [], [Disable single includes for GLib])
-#AC_DEFINE(GDK_PIXBUF_DISABLE_SINGLE_INCLUDES, [], [Disable single includes for GDK pixbuf])
-#AC_DEFINE(GTK_DISABLE_SINGLE_INCLUDES, [], [Disable single includes for GTK])
+# Warning if GLib/GDK/GTK headers are included
+AC_DEFINE(G_DISABLE_SINGLE_INCLUDES, [], [Disable single includes for GLib])
+AC_DEFINE(GDK_PIXBUF_DISABLE_SINGLE_INCLUDES, [], [Disable single includes for GDK pixbuf])
+AC_DEFINE(GTK_DISABLE_SINGLE_INCLUDES, [], [Disable single includes for GTK])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_HEADERS([config.h])
dbus-glib-1
telepathy-glib >= $TELEPATHY_GLIB_REQUIRED
telepathy-farsight
+ farsight2-0.10
gstreamer-0.10
unique-1.0
gnome-keyring-1 >= $KEYRING_REQUIRED
if test "x$have_nm" = "xyes"; then
AC_DEFINE(HAVE_NM, 1, [Define if you have libnm-glib])
have_connman=no
+ else
+ PKG_CHECK_MODULES(NETWORK_MANAGER,
+ [
+ libnm-glib >= $NETWORK_MANAGER_REQUIRED
+ ], have_nm="yes", have_nm="no")
+
+ if test "x$have_nm" = "xyes"; then
+ AC_DEFINE(HAVE_NM, 1, [Define if you have libnm-glib])
+ have_connman=no
+ fi
fi
fi
AC_ARG_ENABLE(nautilus-sendto,
AS_HELP_STRING([--enable-nautilus-sendto=@<:@no/yes/auto@:>@],
[build nautilus-sendto plugin]), ,
- enable_nst=auto)
+ enable_nautilus_sendto=auto)
-if test "x$enable_nst" != "xno"; then
+if test "x$enable_nautilus_sendto" != "xno"; then
PKG_CHECK_MODULES(NST,
[
nautilus-sendto >= $NAUTILUS_SENDTO_REQUIRED
have_nst=no
fi
-if test "x$enable_nst" = "xyes" -a "x$have_nst" != "xyes"; then
+if test "x$enable_nautilus_sendto" = "xyes" -a "x$have_nst" != "xyes"; then
AC_MSG_ERROR([Couldn't find nautilus-sendto dependencies.])
fi
AM_CONDITIONAL(HAVE_NST, test "x$have_nst" = "xyes")
-# -----------------------------------------------------------
-# Tests
-# -----------------------------------------------------------
-AC_ARG_ENABLE(tests,
- AS_HELP_STRING([--enable-tests=@<:@no/yes/auto@:>@],
- [build tests]), ,
- enable_tests=auto)
-
-if test "x$enable_tests" != "xno"; then
- PKG_CHECK_MODULES(CHECK,
- [
- check >= 0.9.4
- ], have_check="yes", have_check="no")
-else
- have_check=no
-fi
-
-if test "x$enable_tests" = "xyes" -a "x$have_check" != "xyes"; then
- AC_MSG_ERROR([Couldn't find check dependencies.])
-fi
-
-AM_CONDITIONAL(HAVE_TESTS, test "x$have_check" = "xyes")
-
# -----------------------------------------------------------
# Coding style checks
# -----------------------------------------------------------
nautilus-sendto-plugin/Makefile
help/Makefile
tests/Makefile
+ tests/interactive/Makefile
tests/xml/Makefile
tools/Makefile
shave
Compiler Flags..............: ${CFLAGS} ${ERROR_CFLAGS}
Prefix......................: ${prefix}
Shaved build................: ${enable_shave}
- Tests.......................: ${have_check}
Coding style checks.........: ${ENABLE_CODING_STYLE_CHECKS}
Features: