X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=configure.ac;h=77ba54afc22503dd26fd4996f193f7949a5e2e0f;hb=88392ad78380766c2361e70ec7b7a7527690e167;hp=5c646cb053ca8c5d6cda85d5fd2d6d1b75fad7fd;hpb=94b6d0d14032fe9ac4e35b0521b3746a2e6e05d4;p=lttng-ust.git

diff --git a/configure.ac b/configure.ac
index 5c646cb0..77ba54af 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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])
-AC_CONFIG_HEADERS([config.h include/lttng/config.h])
-AH_TEMPLATE([HAVE_EFFICIENT_UNALIGNED_ACCESS], [Use efficient unaligned access.])
+
+# 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])
 
 # Compute minor/major/patchlevel version numbers
 AC_PROG_SED
@@ -169,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
@@ -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([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])
+	])
+])
+
 #currently disabled.
 	#tests/hello2/Makefile
 	#tests/basic/Makefile
@@ -245,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.")
+