X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=configure.ac;h=e175840f1b7b74c3df71f315e95ffe05fe38d6e2;hb=4846fadcf9aebf5ec93dc6614aa36ddfe29a3898;hp=56cc5e46feb79d113bb4ac7353b2967c5fa667b5;hpb=de92d63652504720717f8e4badc3a6a5bb0fc0df;p=lttng-ust.git

diff --git a/configure.ac b/configure.ac
index 56cc5e46..e175840f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,14 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
 
-AC_INIT([lttng-ust],[1.9.0],[mathieu dot desnoyers at efficios dot com])
+AC_INIT([lttng-ust],[1.9.6],[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
+AC_SUBST([LTTNG_UST_LIBRARY_VERSION], [0:0:0])
+# note: remember to update tracepoint.h dlopen() to match this version
+# number. TODO: eventually automate by exporting the major number.
+
 AC_CONFIG_AUX_DIR([config])
 AC_CANONICAL_TARGET
 AC_CANONICAL_HOST
@@ -9,8 +16,11 @@ AC_CONFIG_MACRO_DIR([config])
 AM_INIT_AUTOMAKE([foreign])
 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])
 
 # Compute minor/major/patchlevel version numbers
 AC_PROG_SED
@@ -78,9 +88,8 @@ AC_CHECK_HEADERS([urcu-bp.h], [], [AC_MSG_ERROR([Cannot find [URCU] headers (urc
 This error can also occur when the liburcu package's configure script has not been run.])])
 
 AC_MSG_CHECKING([caa_likely()])
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
 #include <urcu/compiler.h>
-]], [[
 void fct(void)
 {
 	if (caa_likely(1)) {
@@ -149,8 +158,7 @@ AC_MSG_RESULT($LIBFORMAT)
 
 if test "x$host_cpu" = "xarm" ; then
 AC_MSG_CHECKING([checking for armv5])
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-]], [[
+AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
 #ifndef __ARM_ARCH_5TEJ__
 #error "no arm5 here"
 #endif
@@ -201,8 +209,24 @@ Use the --with-java-jdk=DIR flag to point to your Java include files, or disable
 ])
 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]])],
+	[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_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])
+	])
+])
+
 #currently disabled.
-	#liblttng-ust-malloc/Makefile
 	#tests/hello2/Makefile
 	#tests/basic/Makefile
 	#tests/simple_include/Makefile
@@ -230,8 +254,10 @@ AC_CONFIG_FILES([
 	liblttng-ust-ctl/Makefile
 	liblttng-ust-fork/Makefile
 	liblttng-ust-java/Makefile
+	liblttng-ust-libc-wrapper/Makefile
 	tests/Makefile
 	tests/hello/Makefile
+	tests/hello-static-lib/Makefile
 	tests/hello.cxx/Makefile
 	tests/demo/Makefile
 	tests/fork/Makefile