# If not 1, append datestamp to the version number
-m4_define([folks_released], [0])
+m4_define([folks_released], [1])
m4_define([folks_major_version], [0])
-m4_define([folks_minor_version], [6])
-m4_define([folks_micro_version], [7])
-m4_define([folks_nano_version], [1])
+m4_define([folks_minor_version], [7])
+m4_define([folks_micro_version], [1])
+m4_define([folks_nano_version], [0])
# If library source has changed since last release, increment revision
# If public symbols have been added, removed or changed since last release,
# increment current and set revision to 0
# If public symbols have been added since last release, increment age
# If public symbols have been removed since last release, set age to 0
-m4_define([folks_lt_current], [31])
+m4_define([folks_lt_current], [34])
m4_define([folks_lt_revision], [0])
-m4_define([folks_lt_age], [6])
+m4_define([folks_lt_age], [9])
# Display the nano_version only if it's not '0'
m4_define([folks_base_version],
AC_DISABLE_STATIC
LT_INIT
PKG_PROG_PKG_CONFIG([0.21])
+GLIB_GSETTINGS
AC_SUBST([CFLAGS])
AC_SUBST([CPPFLAGS])
AM_CONDITIONAL([ENABLE_EDS], [test "x$enable_eds_backend" = "xyes"])
+
+AC_ARG_ENABLE(zeitgeist,
+ AC_HELP_STRING([--enable-zeitgeist],
+ [ build the Zeitgeist]),
+ enable_zeitgeist=$enableval,
+ enable_zeitgeist=no )
+
+AM_CONDITIONAL([ENABLE_ZEITGEIST], [test "x$enable_zeitgeist" = "xyes"])
+
+if test "x$enable_zeitgeist" = "xyes"; then
+ AC_DEFINE(HAVE_ZEITGEIST, [1],
+ [Define as 1 if you have the Zeitgeist support])
+else
+ AC_DEFINE(HAVE_ZEITGEIST, [0],
+ [Define as 1 if you have the Zeitgeist support])
+fi
+
+
# Automatically check the dependencies for the libsocialweb backend
-SW_CLIENT_REQUIRED=0.25.15
+SW_CLIENT_REQUIRED=0.25.20
AC_ARG_ENABLE(libsocialweb-backend,
AC_HELP_STRING([--enable-libsocialweb-backend=@<:@no/yes/auto@:>@],
[build the Libsocialweb backend (default: auto)]),
# Dependencies
# -----------------------------------------------------------
-GLIB_REQUIRED=2.24.0
-TP_GLIB_REQUIRED=0.13.1
-VALA_REQUIRED=0.15.1
+GLIB_REQUIRED=2.26.0
+VALA_REQUIRED=0.15.2
VALADOC_REQUIRED=0.3.1
-TRACKER_SPARQL_MAJOR=0.12
-TRACKER_SPARQL_REQUIRED=0.12.0
-GCONF2_REQUIRED=2.31
-EBOOK_REQUIRED=3.1.5
-EDATASERVER_REQUIRED=3.1.5
+TRACKER_SPARQL_MAJOR=0.14
+TRACKER_SPARQL_REQUIRED=0.13.1
+EBOOK_REQUIRED=3.5.3
+EDATASERVER_REQUIRED=3.5.3
+ZEITGEIST_REQUIRED=0.3.14
+
+AC_SUBST([TRACKER_SPARQL_MAJOR])
PKG_CHECK_MODULES([GLIB],
[glib-2.0 >= $GLIB_REQUIRED
PKG_CHECK_MODULES([GMODULE], [gmodule-no-export-2.0])
PKG_CHECK_MODULES([GIO], [gio-2.0 >= $GLIB_REQUIRED])
PKG_CHECK_MODULES([DBUS_GLIB], [dbus-glib-1])
-PKG_CHECK_MODULES([GCONF2], [gconf-2.0 >= $GCONF2_REQUIRED])
# FIXME: We depend on libgee < 0.7 because 0.7 breaks API. bgo#627746
PKG_CHECK_MODULES([GEE], [gee-1.0 < 0.7],
Gee 0.6.x)])
fi
+TP_GLIB_REQUIRED=0.19.0
PKG_CHECK_MODULES([TP_GLIB], [telepathy-glib >= $TP_GLIB_REQUIRED])
+# Ignore post 0.20 deprecations
+TP_GLIB_CFLAGS="$TP_GLIB_CFLAGS -DTP_VERSION_MIN_REQUIRED=TP_VERSION_0_20"
+# Prevent post 0.20 APIs
+TP_GLIB_CFLAGS="$TP_GLIB_CFLAGS -DTP_VERSION_MAX_ALLOWED=TP_VERSION_0_20"
+
if test x$enable_tracker_backend = xyes; then
PKG_CHECK_MODULES([TRACKER_SPARQL],
[tracker-sparql-$TRACKER_SPARQL_MAJOR >= \
PKG_CHECK_MODULES([EDATASERVER], [libedataserver-1.2 >= $EDATASERVER_REQUIRED])
fi
+if test x$enable_zeitgeist = xyes; then
+ PKG_CHECK_MODULES([ZEITGEIST], [zeitgeist-1.0 >= $ZEITGEIST_REQUIRED])
+fi
+
#
# Vala building options -- allows tarball builds without installing Vala
#
if test x$enable_eds_backend = xyes; then
VALA_CHECK_PACKAGES([libebook-1.2 libedataserver-1.2 libxml-2.0])
fi
+
+ if test x$enable_zeitgeist = xyes; then
+ VALA_CHECK_PACKAGES([zeitgeist-1.0])
+ fi
+
fi
# this will set HAVE_INTROSPECTION
GETTEXT_PACKAGE=AC_PACKAGE_NAME
AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, ["$GETTEXT_PACKAGE"], [Define the gettext package to be used])
-IT_PROG_INTLTOOL([0.35.0])
+IT_PROG_INTLTOOL([0.50.0])
# -----------------------------------------------------------
# Error flags
AC_SUBST([CODE_COVERAGE_LDFLAGS])
# Vala-related flags
-AS_IF([test "x$enable_vala" = "xyes"],
+AC_ARG_ENABLE([fatal-warnings],
+ AS_HELP_STRING([--disable-fatal-warnings],
+ [Make warnings from valac and g-ir-scanner non-fatal]),
+ [enable_fatal_warnings=$enableval], [enable_fatal_warnings=yes])
+AS_IF([test "x$enable_vala" = "xyes" && test "x$enable_fatal_warnings" = "xyes"],
[ERROR_INTROSPECTION_SCANNER_ARGS="\
$ERROR_INTROSPECTION_SCANNER_ARGS --warn-error"
ERROR_VALAFLAGS="$ERROR_VALAFLAGS --fatal-warnings"])
# Final output
# -----------------------------------------------------------
+# FIXME: We can't remove gconf.path until bgo#635379 is fixed, since we need to
+# safely contain EDS' use of GConf for the EDS backend tests.
+# Note that our use of gconf.path doesn't actually need GConf to be installed,
+# though, so it's not a hard dependency of folks.
+
AC_CONFIG_FILES([
backends/telepathy/lib/folks-telepathy.pc
backends/telepathy/lib/folks-telepathy-uninstalled.pc
+ backends/tracker/lib/folks-tracker.deps
backends/tracker/lib/folks-tracker.pc
backends/tracker/lib/folks-tracker-uninstalled.pc
backends/eds/lib/folks-eds.pc
backends/eds/lib/folks-eds-uninstalled.pc
folks/folks.pc
folks/folks-uninstalled.pc
+ folks/org.freedesktop.folks.gschema.xml
Makefile
backends/Makefile
backends/key-file/Makefile
Tracker backend.............: ${enable_tracker_backend}
Libsocialweb backend........: ${have_libsocialweb_backend}
E-D-S backend...............: ${enable_eds_backend}
+ Zeitgeist support...........: ${enable_zeitgeist}
"