diff options
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 73 |
1 files changed, 26 insertions, 47 deletions
diff --git a/configure.ac b/configure.ac index 65de92674..881406f23 100644 --- a/configure.ac +++ b/configure.ac @@ -10,17 +10,25 @@ AC_PREREQ([2.59]) # set nano_version to 1 m4_define([tp_glib_major_version], [0]) -m4_define([tp_glib_minor_version], [12]) -m4_define([tp_glib_micro_version], [6]) +m4_define([tp_glib_minor_version], [13]) +m4_define([tp_glib_micro_version], [8]) m4_define([tp_glib_nano_version], [1]) # If library source has changed since last release, increment revision # If interfaces have been added, removed or changed since last release, -# you're on the wrong branch :-) - -m4_define([tp_glib_lt_current], [45]) -m4_define([tp_glib_lt_revision], [5]) -m4_define([tp_glib_lt_age], [45]) +# increment current and set revision to 0 +# If interfaces have been added since last release, increment age +# If interfaces have been removed since last release, set age to 0 +# +# If interfaces have been added, release builds will fail unless you add a new +# file like telepathy-glib/versions/0.7.3.abi to add them to the official ABI. +# This also forces binaries built against devel versions to be rebuilt +# (we don't guarantee that we won't add ABI then remove it again, if it was +# never seen in a release). + +m4_define([tp_glib_lt_current], [53]) +m4_define([tp_glib_lt_revision], [0]) +m4_define([tp_glib_lt_age], [53]) # Some magic m4_define([tp_glib_base_version], @@ -30,21 +38,14 @@ m4_define([tp_glib_version], [tp_glib_base_version].[tp_glib_nano_version])]) AC_INIT([Telepathy-GLib], [tp_glib_version], - [https://bugs.freedesktop.org/enter_bug.cgi?product=Telepathy&component=tp-glib&version=0.12]) + [https://bugs.freedesktop.org/enter_bug.cgi?product=Telepathy&component=tp-glib]) AC_CONFIG_MACRO_DIR([m4]) -AM_INIT_AUTOMAKE([1.9 -Wno-portability]) +AM_INIT_AUTOMAKE([1.11 -Wno-portability]) AM_CONFIG_HEADER(config.h) -dnl We're compatible with automake 1.9 (to be nice to Maemo 5), but with -dnl reduced functionality -m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES]) -m4_ifdef([AM_PROG_VALAC], - [have_automake_for_dist=true], - [AC_MSG_WARN([You have Automake < 1.11, 'make dist' will not work]) - have_automake_for_dist=false]) -AM_CONDITIONAL([HAVE_AUTOMAKE_FOR_DIST], [$have_automake_for_dist]) +AM_SILENT_RULES dnl check for tools AC_PROG_CC @@ -58,16 +59,7 @@ PKG_PROG_PKG_CONFIG([0.21]) GTK_DOC_CHECK([1.15]) -GOBJECT_INTROSPECTION_CHECK([0.6.14]) -# Check if we have a new gobject-introspection, with different command-line -# arguments. Eventually this will go away and we can only depend on the new -# version -AC_MSG_CHECKING([what arguments g-ir-scanner requires]) -PKG_CHECK_EXISTS([gobject-introspection-1.0 >= 0.9.5], - g_ir_scanner_args=new, - g_ir_scanner_args=old) -AC_MSG_RESULT([$g_ir_scanner_args]) -AM_CONDITIONAL(G_IR_SCANNER_NEW_ARGS, test "x$g_ir_scanner_args" = "xnew") +GOBJECT_INTROSPECTION_CHECK([0.9.6]) LT_CURRENT=tp_glib_lt_current LT_REVISION=tp_glib_lt_revision @@ -99,8 +91,7 @@ TP_COMPILER_WARNINGS([ERROR_CFLAGS], [test "x$official_release" = xno], format-security \ init-self], [missing-field-initializers \ - unused-parameter \ - deprecated-declarations]) + unused-parameter]) AC_SUBST([ERROR_CFLAGS]) AM_CONDITIONAL([OFFICIAL_RELEASE], [test "x$official_release" = xyes]) @@ -129,16 +120,14 @@ ifelse(tp_glib_nano_version, 0, [ENABLE_DOC_CHECKS=$enableval], [ENABLE_DOC_CHECKS=no] ) ], [ # tp-glib is version x.y.z.1 - enable extra checks by default - # (but only partially, because this is a stable branch and gtk-doc's - # definition of "complete" sometimes changes) AC_ARG_ENABLE(coding-style-checks, AC_HELP_STRING([--disable-coding-style-checks], [do not check coding style using grep]), [ENABLE_CODING_STYLE_CHECKS=$enableval], [ENABLE_CODING_STYLE_CHECKS=yes]) AC_ARG_ENABLE(doc-checks, - AC_HELP_STRING([--enable-doc-checks], - [check for complete documentation coverage]), - [ENABLE_DOC_CHECKS=$enableval], [ENABLE_DOC_CHECKS=no]) + AC_HELP_STRING([--disable-doc-checks], + [do not check for complete documentation coverage]), + [ENABLE_DOC_CHECKS=$enableval], [ENABLE_DOC_CHECKS=yes]) ]) AC_SUBST([ENABLE_CODING_STYLE_CHECKS]) @@ -148,16 +137,10 @@ if test x$enable_debug = xyes; then AC_DEFINE(ENABLE_DEBUG, [], [Enable debug code]) fi -if test x$enable_handle_leak_debug = xyes; then - AC_DEFINE(ENABLE_HANDLE_LEAK_DEBUG, [], [Enable handle leak debug code]) - HANDLE_LEAK_DEBUG_CFLAGS="-rdynamic" -fi - if test x$enable_backtrace = xyes; then AC_DEFINE(ENABLE_BACKTRACE, [], [Enable backtrace output on crashes]) fi -AC_SUBST(HANDLE_LEAK_DEBUG_CFLAGS) AC_SUBST(COVERAGE_CFLAGS) AC_ARG_ENABLE([installed-examples], @@ -173,7 +156,7 @@ AM_CONDITIONAL([OUT_OF_TREE_BUILD], [test "z$ac_srcdir" != z.]) dnl Check for Glib PKG_CHECK_MODULES(GLIB, - [glib-2.0 >= 2.24, gobject-2.0 >= 2.24, gio-2.0 >= 2.24]) + [glib-2.0 >= 2.25.16, gobject-2.0 >= 2.25.16, gio-2.0 >= 2.25.16]) dnl Check for GIO-Unix PKG_CHECK_MODULES(GIO_UNIX, [gio-unix-2.0], @@ -212,12 +195,7 @@ if test x$enable_vala_bindings = xyes; then AC_MSG_ERROR([GObject-Introspection must be enabled for Vala bindings]) fi - PKG_CHECK_EXISTS([gobject-introspection-1.0 >= 0.9.6], - [], - [AC_MSG_ERROR([gobject-introspection 0.9.6 required for Vala bindings])]) - - m4_ifdef([AM_PROG_VALAC], [AM_PROG_VALAC(0.10.0)], - [AC_MSG_ERROR([Automake >= 1.11 required for Vala bindings])]) + AM_PROG_VALAC([0.10.0]) have_vala=yes AC_PATH_PROG(VALAC, valac, valac) @@ -292,6 +270,7 @@ AC_OUTPUT( Makefile \ docs/reference/Makefile \ examples/Makefile \ examples/client/Makefile \ + examples/client/stream-tubes/Makefile \ examples/cm/Makefile \ examples/cm/callable/Makefile \ examples/cm/channelspecific/Makefile \ |