m4_define(empathy_released, 0)
m4_define([empathy_major_version], [2])
-m4_define([empathy_minor_version], [29])
-m4_define([empathy_micro_version], [90])
+m4_define([empathy_minor_version], [31])
+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
GLIB_REQUIRED=2.22.0
-GTK_REQUIRED=2.18.0
+GTK_REQUIRED=2.20.0
GCONF_REQUIRED=1.2.0
-TELEPATHY_GLIB_REQUIRED=0.9.2
+TELEPATHY_GLIB_REQUIRED=0.11.6
+TELEPATHY_LOGGER=0.1.1
ENCHANT_REQUIRED=1.2.0
ISO_CODES_REQUIRED=0.35
LIBNOTIFY_REQUIRED=0.4.4
NETWORK_MANAGER_REQUIRED=0.7.0
NAUTILUS_SENDTO_REQUIRED=2.28.1
-# Use --enable-maintainer-mode to disabled deprecated symbols
+# 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
-
-# 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])
+#if test $USE_MAINTAINER_MODE = yes; then
+# AC_DEFINE(GSEAL_ENABLE, [], [Seal public structs to force usage of accessors])
+#fi
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_HEADERS([config.h])
AC_SUBST(ERROR_CFLAGS)
+# -----------------------------------------------------------
+# Enable TPL
+# -----------------------------------------------------------
+
+# It needs to be defined before PKG_CHECK_MODULES calls
+AC_ARG_ENABLE(tpl,
+ AC_HELP_STRING([--enable-tpl],[enable telepathy-logger code and disable the
+ empathy logger]), enable_tpl=$enableval, enable_tpl=no )
+AM_CONDITIONAL(ENABLE_TPL, test "x$enable_tpl" = "xyes")
+
+if test x${enable_tpl} = xyes; then
+ AC_DEFINE(ENABLE_TPL, [], [Enable TPL code])
+fi
+
+if test "x$enable_tpl" = "xyes"; then
+ PKG_CHECK_MODULES(TPL,
+ [
+ telepathy-logger = $TELEPATHY_LOGGER
+ ])
+ AC_SUBST(TPL_CFLAGS)
+ AC_SUBST(TPL_LIBS)
+fi
+
+
# -----------------------------------------------------------
# Pkg-Config dependency checks
# -----------------------------------------------------------
AC_SUBST(GEOCLUE_LIBS)
# -----------------------------------------------------------
-# moblin widgets support
+# meego widgets support
# -----------------------------------------------------------
-AC_ARG_ENABLE(moblin,
- AS_HELP_STRING([--enable-moblin=@<:no/yes@:>@],
- [Enable moblin widgets]), ,
- enable_moblin=no)
+AC_ARG_ENABLE(meego,
+ AS_HELP_STRING([--enable-meego=@<:no/yes@:>@],
+ [Enable meego widgets]), ,
+ enable_meego=no)
-if test "x$enable_moblin" != "xno"; then
- PKG_CHECK_MODULES(MOBLIN,
+if test "x$enable_meego" != "xno"; then
+ PKG_CHECK_MODULES(MEEGO,
[
mx-gtk-1.0
- ], have_moblin="yes", have_moblin="no")
+ ], have_meego="yes", have_meego="no")
- if test "x$have_moblin" = "xyes"; then
- AC_DEFINE(HAVE_MOBLIN, 1, [Define if you have moblin])
+ if test "x$have_meego" = "xyes"; then
+ AC_DEFINE(HAVE_MEEGO, 1, [Define if you have meego])
+ chain_enable_favourite_contacts="yes"
fi
else
- have_moblin="no"
+ have_meego="no"
fi
-if test "x$enable_moblin" = "xyes" -a "x$have_moblin" != "xyes"; then
- AC_MSG_ERROR([Couldn't find moblin dependencies.])
+if test "x$enable_meego" = "xyes" -a "x$have_meego" != "xyes"; then
+ AC_MSG_ERROR([Couldn't find meego dependencies.])
fi
-AM_CONDITIONAL(HAVE_MOBLIN, test "x$have_moblin" = "xyes")
-AC_SUBST(MOBLIN_CFLAGS)
-AC_SUBST(MOBLIN_LIBS)
+AM_CONDITIONAL(HAVE_MEEGO, test "x$have_meego" = "xyes")
+AC_SUBST(MEEGO_CFLAGS)
+AC_SUBST(MEEGO_LIBS)
+
+# -----------------------------------------------------------
+# favourite contacts support
+# -----------------------------------------------------------
+AC_ARG_ENABLE(favourite_contacts,
+ AS_HELP_STRING([--enable-favourite-contacts=@<:no/yes@:>@],
+ [Enable favourite contacts]), ,
+ enable_favourite_contacts=no)
+
+if test "x$enable_favourite_contacts" != "xno" || test "x$chain_enable_favourite_contacts" = "xyes"; then
+ PKG_CHECK_MODULES(TELEPATHY_LOGGER,
+ [
+ telepathy-logger
+ ], have_telepathy_logger="yes", have_telepathy_logger="no")
+
+ if test "x$have_telepathy_logger" = "xyes"; then
+ have_favourite_contacts="yes"
+ AC_DEFINE(HAVE_FAVOURITE_CONTACTS, 1, [Define if you want favourite contacts support])
+ fi
+else
+ have_favourite_contacts="no"
+fi
+
+if test "x$enable_favourite_contacts" = "xyes" && test "x$have_favourite_contacts" != "xyes"; then
+ AC_MSG_ERROR([Couldn't find favourite contacts dependencies.])
+fi
+
+AM_CONDITIONAL(HAVE_FAVOURITE_CONTACTS, test "x$have_telepathy_logger" = "xyes")
# -----------------------------------------------------------
# nautilus-sendto
Display maps (libchamplain).: ${have_libchamplain}
Location awareness (Geoclue): ${have_geoclue}
Adium themes (Webkit).......: ${have_webkit}
- Moblin widgets .............: ${have_moblin}
+ Meego widgets ..............: ${have_meego}
+ Favourite contacts .........: ${have_favourite_contacts}
Control center embedding....: ${have_control_center_embedding}
+ Logging:
+ Telepathy Logger............: ${enable_tpl}
+
Connectivity:
NetworkManager integration..: ${have_nm}
ConnMan integration.........: ${have_connman}
projects / empathy.git / blobdiff