X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=configure.ac;h=dc30060fcdeaaceedbcd435ab4c29efb70e6f135;hb=fe38d4afd3750c37dda6dbd98f5b72f86fd796b9;hp=8968d69666b79b6a3dd06294464dd8cbf2474b3e;hpb=6ee768ab9bf86874681e6f491272a5a7696d50bf;p=lttng-ust.git

diff --git a/configure.ac b/configure.ac
index 8968d696..dc30060f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,6 +29,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,6 +192,24 @@ 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
@@ -201,27 +224,11 @@ 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/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