X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;ds=sidebyside;f=configure.ac;h=9c45270850c7a0d95d233d9ac590fdf7837138d1;hb=b25c5b37ef536d7b09fe901d97e678220ec69c9a;hp=e0ed0b79d380087710cb48058f32944f577cebbc;hpb=1f9eff07ad19cfd5e1ac935c8711894e4b499e10;p=lttng-ust.git

diff --git a/configure.ac b/configure.ac
index e0ed0b79..9c452708 100644
--- 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
@@ -18,9 +18,9 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 AC_CONFIG_SRCDIR([include/lttng/tracepoint.h])
 
 # Configuration options, which will be installed in the config.h
-AC_CONFIG_HEADERS([config.h include/lttng/config.h])
-AH_TEMPLATE([HAVE_EFFICIENT_UNALIGNED_ACCESS], [Use efficient unaligned access.])
-AH_TEMPLATE([HAVE_SDT_INTEGRATION], [DTrace/GDB/SystemTap integration via sdt.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], [SystemTap integration via sdt.h])
 
 # Compute minor/major/patchlevel version numbers
 AC_PROG_SED
@@ -70,7 +70,7 @@ AC_C_INLINE
 
 # Checks for library functions.
 AC_FUNC_MALLOC
-AC_CHECK_FUNCS([gettimeofday munmap socket strerror strtol])
+AC_CHECK_FUNCS([gettimeofday munmap socket strerror strtol sched_getcpu sysconf])
 
 CFLAGS="-Wall $CFLAGS"
 
@@ -172,7 +172,7 @@ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
 ])
 fi
 if test x$NO_UNALIGNED_ACCESS = x ; then
-AC_DEFINE([HAVE_EFFICIENT_UNALIGNED_ACCESS], [1])
+AC_DEFINE([LTTNG_UST_HAVE_EFFICIENT_UNALIGNED_ACCESS], [1])
 fi
 
 # Set compile flags to java include files if given
@@ -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_DEFINE([HAVE_SDT_INTEGRATION], [1])
+	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])
 	])
 ])
 
@@ -255,6 +263,7 @@ AC_CONFIG_FILES([
 	liblttng-ust-fork/Makefile
 	liblttng-ust-java/Makefile
 	liblttng-ust-libc-wrapper/Makefile
+	tools/Makefile
 	tests/Makefile
 	tests/hello/Makefile
 	tests/hello-static-lib/Makefile