Add sdt.h integration option

[lttng-ust.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 9730ce602f0daaf909cff60458adabc1ee6e0f29..e175840f1b7b74c3df71f315e95ffe05fe38d6e2 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.4],[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
@@ -16,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
@@ -206,6 +209,23 @@ 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.
        #tests/hello2/Makefile
        #tests/basic/Makefile
@@ -234,9 +254,10 @@ AC_CONFIG_FILES([
        liblttng-ust-ctl/Makefile
        liblttng-ust-fork/Makefile
        liblttng-ust-java/Makefile
-       liblttng-ust-libc/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