m4_define(empathy_released, 0)
m4_define([empathy_major_version], [2])
-m4_define([empathy_minor_version], [31])
-m4_define([empathy_micro_version], [92])
-m4_define([empathy_nano_version], [0])
+m4_define([empathy_minor_version], [91])
+m4_define([empathy_micro_version], [90])
+m4_define([empathy_nano_version], [2])
dnl Display the nano_version only if it's not '0'
m4_define([empathy_base_version],
# Minimal version required
# Hardp deps
-FOLKS_REQUIRED=0.1.15
-GCONF_REQUIRED=1.2.0
-GLIB_REQUIRED=2.25.9
+FOLKS_REQUIRED=0.3.5
+GLIB_REQUIRED=2.27.2
GNUTLS_REQUIRED=2.8.5
-GTK_REQUIRED=2.21.2
+GTK_REQUIRED=2.99.0
KEYRING_REQUIRED=2.26.0
-LIBCANBERRA_GTK_REQUIRED=0.4
-LIBNOTIFY_REQUIRED=0.4.4
-LIBNOTIFY_REQUIRED_GTK3=0.5.1
+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.11.15
-TELEPATHY_LOGGER=0.1.5
-UNIQUE_REQUIRED=1.1.2
+TELEPATHY_GLIB_REQUIRED=0.13.16
+TELEPATHY_LOGGER=0.2.0
-# 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
+LIBCHAMPLAIN_REQUIRED=0.9
+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,
# 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
- gconf-2.0 >= $GCONF_REQUIRED
+ glib-2.0 >= $GLIB_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-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 >= $GCR_REQUIRED
+])
+
+PKG_CHECK_MODULES(EMPATHY_AV,
+[
+ farsight2-0.10
+ telepathy-farsight >= $TELEPATHY_FARSIGHT_REQUIRED
])
# -----------------------------------------------------------
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
# -----------------------------------------------------------
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])
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,
+ [
+ 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_DEFINE(HAVE_LIBCHAMPLAIN, 1, [Define if you have libchamplain])
# 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
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
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])
Compiler Flags..............: ${CFLAGS} ${ERROR_CFLAGS}
Prefix......................: ${prefix}
Coding style checks.........: ${ENABLE_CODING_STYLE_CHECKS}
- Use GTK+3...................: ${have_gtk3}
Features:
Spell checking (enchant)....: ${have_enchant}
projects / empathy.git / blobdiff