X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;ds=sidebyside;f=configure.ac;h=e0ed0b79d380087710cb48058f32944f577cebbc;hb=1f9eff07ad19cfd5e1ac935c8711894e4b499e10;hp=3bc9964bbd4a8b4d34936f864d543afd834d5e5b;hpb=31b073500ae4d866bcc3ca1bb925c6365991ae4c;p=lttng-ust.git

diff --git a/configure.ac b/configure.ac
index 3bc9964b..e0ed0b79 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.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
@@ -87,7 +90,6 @@ This error can also occur when the liburcu package's configure script has not be
 AC_MSG_CHECKING([caa_likely()])
 AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
 #include <urcu/compiler.h>
-]], [[
 void fct(void)
 {
 	if (caa_likely(1)) {
@@ -157,7 +159,6 @@ AC_MSG_RESULT($LIBFORMAT)
 if test "x$host_cpu" = "xarm" ; then
 AC_MSG_CHECKING([checking for armv5])
 AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
-]], [[
 #ifndef __ARM_ARCH_5TEJ__
 #error "no arm5 here"
 #endif
@@ -208,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
@@ -236,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
@@ -246,4 +265,21 @@ AC_CONFIG_FILES([
 	tests/ust-multi-test/Makefile
 	lttng-ust.pc
 ])
+
 AC_OUTPUT
+
+# Report on the configuration options
+AS_ECHO()
+AS_ECHO("LTTng-UST will be built with the following options:")
+AS_ECHO("Library format: $LIBFORMAT")
+
+AS_ECHO()
+AS_ECHO_N("Java support (JNI): ")
+AS_IF([test "x$jni_interface" = "xyes"], [AS_ECHO("Enabled")], [AS_ECHO("Disabled")])
+
+AS_ECHO_N("sdt.h integration:  ")
+AS_IF([test "x$with_sdt" = "xyes"], [AS_ECHO("Enabled")], [AS_ECHO("Disabled")])
+
+AS_ECHO()
+AS_ECHO("Type 'make' to compile.")
+