m4_define([empathy_major_version], [2])
m4_define([empathy_minor_version], [31])
m4_define([empathy_micro_version], [5])
-m4_define([empathy_nano_version], [0])
+m4_define([empathy_nano_version], [1])
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.11
GCONF_REQUIRED=1.2.0
GLIB_REQUIRED=2.25.9
GTK_REQUIRED=2.21.2
LIBCANBERRA_GTK_REQUIRED=0.4
LIBNOTIFY_REQUIRED=0.4.4
LIBNOTIFY_REQUIRED_GTK3=0.5.1
+TELEPATHY_FARSIGHT_REQUIRED=0.0.14
TELEPATHY_GLIB_REQUIRED=0.11.7
TELEPATHY_LOGGER=0.1.2
UNIQUE_REQUIRED=1.1.2
GLIB_GSETTINGS
GLIB_GENMARSHAL=`$PKG_CONFIG glib-2.0 --variable=glib_genmarshal`
AC_SUBST(GLIB_GENMARSHAL)
-CONTROL_CENTER_EXTENSIONDIR=`$PKG_CONFIG --variable=extensiondir libgnome-control-center-extension`
-AC_SUBST(CONTROL_CENTER_EXTENSIONDIR)
AC_CHECK_PROGS([XSLTPROC], [xsltproc])
if test -z "$XSLTPROC"; then
[
dbus-glib-1
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
gstreamer-interfaces-0.10
libebook-1.2
libxml-2.0
- telepathy-farsight
+ telepathy-farsight >= $TELEPATHY_FARSIGHT_REQUIRED
telepathy-glib >= $TELEPATHY_GLIB_REQUIRED
telepathy-logger-0.1 >= $TELEPATHY_LOGGER
x11
fi
if test "x$enable_gtk3" = "xyes" -a "x$have_gtk3" != "xyes"; then
- AC_MSG_ERROR([Couldn't find gtk3 dependencies.])
+ AC_MSG_ERROR([Could not find gtk3 dependencies.])
fi
if test "x$have_gtk3" == "xyes"; then
fi
if test "x$enable_webkit" = "xyes" -a "x$have_webkit" != "xyes"; then
- AC_MSG_ERROR([Couldn't find webkit dependencies.])
+ AC_MSG_ERROR([Could not find webkit dependencies.])
fi
AM_CONDITIONAL(HAVE_WEBKIT, test "x$have_webkit" = "xyes")
fi
if test "x$enable_spell" = "xyes" -a "x$have_enchant" != "xyes"; then
- AC_MSG_ERROR([Couldn't find spell dependencies.])
+ AC_MSG_ERROR([Could not find spell dependencies.])
fi
AM_CONDITIONAL(HAVE_ENCHANT, test "x$have_enchant" = "xyes")
fi
if test "x$enable_map" = "xyes" -a "x$have_libchamplain" != "xyes"; then
- AC_MSG_ERROR([Couldn't find map view dependencies.])
+ AC_MSG_ERROR([Could not find map view dependencies.])
fi
AM_CONDITIONAL(HAVE_LIBCHAMPLAIN, test "x$have_libchamplain" = "xyes")
fi
if test "x$enable_location" = "xyes" -a "x$have_geoclue" != "xyes"; then
- AC_MSG_ERROR([Couldn't find location dependencies.])
+ AC_MSG_ERROR([Could not find location dependencies.])
fi
AM_CONDITIONAL(HAVE_GEOCLUE, test "x$have_geoclue" = "xyes")
fi
if test "x$enable_meego" = "xyes" -a "x$have_meego" != "xyes"; then
- AC_MSG_ERROR([Couldn't find meego dependencies.])
+ AC_MSG_ERROR([Could not find meego dependencies.])
fi
AM_CONDITIONAL(HAVE_MEEGO, test "x$have_meego" = "xyes")
fi
if test "x$enable_nautilus_sendto" = "xyes" -a "x$have_nst" != "xyes"; then
- AC_MSG_ERROR([Couldn't find nautilus-sendto dependencies.])
+ AC_MSG_ERROR([Could not find nautilus-sendto dependencies.])
fi
AM_CONDITIONAL(HAVE_NST, test "x$have_nst" = "xyes")
if test "x$enable_control_center_embedding" != "xno"; then
PKG_CHECK_MODULES(CONTROL_CENTER_EMBEDDING,
[
- libgnome-control-center-extension
+ libgnome-control-center
], 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])
+
+ AC_MSG_CHECKING([gnome-control-center extension dir])
+ CONTROL_CENTER_EXTENSIONDIR=`$PKG_CONFIG --variable=extensiondir libgnome-control-center`
+ if test "x$CONTROL_CENTER_EXTENSIONDIR" = "x"; then
+ AC_MSG_ERROR([Could not determine extensiondir])
+ else
+ AC_MSG_RESULT([$CONTROL_CENTER_EXTENSIONDIR])
+ fi
+ AC_SUBST(CONTROL_CENTER_EXTENSIONDIR)
fi
else
have_control_center_embedding="no"
fi
if test "x$enable_control_center_embedding" = "xyes" -a "x$have_control_center_embedding" != "xyes"; then
- AC_MSG_ERROR([Couldn't find single-window control center dependencies.])
+ AC_MSG_ERROR([Could not find single-window control center dependencies.])
fi
AM_CONDITIONAL(HAVE_CONTROL_CENTER_EMBEDDING, test "x$have_control_center_embedding" = "xyes")
# -----------------------------------------------------------
AC_ARG_ENABLE(coding-style-checks,
AC_HELP_STRING([--disable-coding-style-checks],
- [don't check coding style using grep]),
+ [do not check coding style using grep]),
[ENABLE_CODING_STYLE_CHECKS=$enableval], [ENABLE_CODING_STYLE_CHECKS=yes])
AC_SUBST([ENABLE_CODING_STYLE_CHECKS])