X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=configure.ac;h=134ed145dbe669db9ad42c3287bfbd1d37356b67;hb=b728d87e617189fe9898a9492a559ecf949d2348;hp=88a31e9c5364a8d5073829ffb9c779903b73cf9d;hpb=69400ac4a4e6575f749c6326df7c2a2c8ac3bdc5;p=lttng-ust.git

diff --git a/configure.ac b/configure.ac
index 88a31e9c..134ed145 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
 
-AC_INIT([ust], [1.9.0], [mathieu dot desnoyers at efficios dot com])
+AC_INIT([lttng-ust], [1.9.0], [mathieu dot desnoyers at efficios dot com])
 AC_CONFIG_AUX_DIR([config])
 AC_CANONICAL_TARGET
 AC_CANONICAL_HOST
@@ -11,13 +11,16 @@ 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.])
-# Compute minor/major version numbers
-major_version=`echo AC_PACKAGE_VERSION | sed 's/\..*//'`
-minor_version=`echo AC_PACKAGE_VERSION | sed 's/.*\.//' | sed 's/^0//'`
+# Compute minor/major/patchlevel version numbers
+major_version=$(echo AC_PACKAGE_VERSION | sed 's/\([^.]\)*\.\([^.]*\)\.\([^.]*\)/\1/)'
+minor_version=$(echo AC_PACKAGE_VERSION | sed 's/\([^.]\)*\.\([^.]*\)\.\([^.]*\)/\2/)'
+patchlevel_version=$(echo AC_PACKAGE_VERSION | sed 's/\([^.]\)*\.\([^.]*\)\.\([^.]*\)/\3/)'
 AC_SUBST([MAJOR_VERSION], [$major_version])
 AC_SUBST([MINOR_VERSION], [$minor_version])
+AC_SUBST([PATCHLEVEL_VERSION], [$patchlevel_version])
 AC_DEFINE_UNQUOTED([VERSION_MAJOR], $major_version, [UST major version number])
 AC_DEFINE_UNQUOTED([VERSION_MINOR], $minor_version, [UST minor version number])
+AC_DEFINE_UNQUOTED([VERSION_PATCHLEVEL], $patchlevel_version, [UST patchlevel version number])
 
 
 # Checks for programs.
@@ -29,6 +32,11 @@ AC_PROG_LIBTOOL
 AC_CHECK_LIB([dl], [dlopen])
 AC_CHECK_LIB([pthread], [pthread_create])
 
+# Check for libuuid
+AC_CHECK_LIB([uuid], [uuid_generate], [],
+	[AC_MSG_ERROR([Cannot find libuuid. Use [LDFLAGS]=-Ldir to specify its location.])]
+)
+
 # Checks for header files.
 #AC_CHECK_HEADERS([fcntl.h stdint.h stdlib.h string.h sys/socket.h sys/time.h unistd.h])
 
@@ -187,10 +195,28 @@ Use --with-java-jdk=DIR flag to point to your java include files or desactivate
 fi
 AM_CONDITIONAL(BUILD_JNI_INTERFACE, test "$with_jni_interface" = "yes")
 
+#currently disabled.
+	#liblttng-ust-malloc/Makefile
+	#tests/hello2/Makefile
+	#tests/basic/Makefile
+	#tests/simple_include/Makefile
+	#tests/snprintf/Makefile
+	#tests/test-nevents/Makefile
+	#tests/test-libustinstr-malloc/Makefile
+	#tests/dlopen/Makefile
+	#tests/same_line_marker/Makefile
+	#tests/trace_event/Makefile
+	#tests/tracepoint/Makefile
+	#tests/tracepoint/benchmark/Makefile
+	#tests/register_test/Makefile
+	#tests/libustctl_function_#tests/Makefile
+	#tests/exit-fast/Makefile
+	#tests/basic_long/Makefile
+
 AC_CONFIG_FILES([
 	Makefile
 	include/Makefile
-	include/lttng/version.h
+	include/lttng/ust-version.h
 	doc/Makefile
 	doc/man/Makefile
 	doc/info/Makefile
@@ -201,27 +227,12 @@ AC_CONFIG_FILES([
 	liblttng-ust-ctl/Makefile
 	liblttng-ust-fork/Makefile
 	liblttng-ust-java/Makefile
-	liblttng-ust-malloc/Makefile
 	tests/Makefile
 	tests/hello/Makefile
+	tests/demo/Makefile
+	tests/fork/Makefile
 	tests/ust-basic-tracing/Makefile
 	tests/ust-multi-test/Makefile
-	tests/hello2/Makefile
-	tests/basic/Makefile
-	tests/basic_long/Makefile
-	tests/fork/Makefile
-	tests/simple_include/Makefile
-	tests/snprintf/Makefile
-	tests/test-nevents/Makefile
-	tests/test-libustinstr-malloc/Makefile
-	tests/dlopen/Makefile
-	tests/same_line_marker/Makefile
-	tests/trace_event/Makefile
-	tests/tracepoint/Makefile
-	tests/tracepoint/benchmark/Makefile
-	tests/register_test/Makefile
-	tests/libustctl_function_tests/Makefile
-	tests/exit-fast/Makefile
-	ust.pc
+	lttng-ust.pc
 ])
 AC_OUTPUT