Update version to 1.9.7

[deliverable/lttng-ust.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 77ba54afc22503dd26fd4996f193f7949a5e2e0f..63f13d0ef0a17db7db6333a6223de4b92eae73fc 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
 
-AC_INIT([lttng-ust],[1.9.6],[mathieu dot desnoyers at efficios dot com])
+AC_INIT([lttng-ust],[1.9.7],[mathieu dot desnoyers at efficios dot com])
 
 # Following the numbering scheme proposed by libtool for the library version
 # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
@@ -20,7 +20,7 @@ AC_CONFIG_SRCDIR([include/lttng/tracepoint.h])
 # Configuration options, which will be installed in the config.h
 AC_CONFIG_HEADERS([config.h include/lttng/ust-config.h])
 AH_TEMPLATE([LTTNG_UST_HAVE_EFFICIENT_UNALIGNED_ACCESS], [Use efficient unaligned access.])
-AH_TEMPLATE([LTTNG_UST_HAVE_SDT_INTEGRATION], [DTrace/GDB/SystemTap integration via sdt.h])
+AH_TEMPLATE([LTTNG_UST_HAVE_SDT_INTEGRATION], [SystemTap integration via sdt.h])
 
 # Compute minor/major/patchlevel version numbers
 AC_PROG_SED
@@ -211,18 +211,26 @@ AM_CONDITIONAL([BUILD_JNI_INTERFACE], [test "x$jni_interface" = "xyes"])
 
 # sdt.h integration
 AC_ARG_WITH([sdt],
-       [AS_HELP_STRING([--with-sdt],[provide DTrace, GDB and SystemTap integration via sdt.h [default=no]])],
+       [AS_HELP_STRING([--with-sdt],[provide SystemTap integration via sdt.h [default=no]])],
        [with_sdt=$withval],
        [with_sdt="no"]
 )
 
 AS_IF([test "x$with_sdt" = "xyes"],[
-       AC_CHECK_HEADERS([sys/sdt.h], [
+       AC_MSG_CHECKING([STAP_PROBEV()])
+       AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
+       #define SDT_USE_VARIADIC
+       #include <sys/sdt.h>
+       void fct(void)
+       {
+               STAP_PROBEV(provider,name,1,2,3,4,5,6,7,8,9,10);
+       }
+       ]])],[
+               AC_MSG_RESULT([yes])
                AC_DEFINE([LTTNG_UST_HAVE_SDT_INTEGRATION], [1])
        ],[
-               AC_MSG_ERROR([The sdt.h integration was requested
-but this header file cannot be found. Make sure it is installed
-or use CFLAGS=-I/path/ to specify a non-standard path to sys/sdt.h])
+               AC_MSG_RESULT([no])
+               AC_MSG_ERROR([The sdt.h integration was requested but the STAP_PROBEV define cannot be used. Make sure it is installed, and up to date, or use CFLAGS=-I/path/ to specify a non-standard path to sys/sdt.h])
        ])
 ])