X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=configure.ac;h=5cfe9731584b11e23b35a1d19934148611b67ad8;hp=c94da7adc32c46308df2fd01e28fd94f5a6aff8e;hb=395d6b02dda3db1acd08936f49c1dc8efc48e613;hpb=c4ee49840e6233047717851e7731477481500f44

diff --git a/configure.ac b/configure.ac
index c94da7adc..5cfe97315 100644
--- a/configure.ac
+++ b/configure.ac
@@ -127,6 +127,10 @@ AC_CHECK_FUNCS([ \
 	strtoull dirfd gethostbyname2 getipnodebyname epoll_create1 \
 ])
 
+# Check if clock_gettime, timer_create, timer_settime, and timer_delete are available in lib rt, and if so,
+# add -lrt to LIBS
+AC_CHECK_LIB([rt], [clock_gettime, timer_create, timer_settime, timer_delete])
+
 # Babeltrace viewer check
 AC_ARG_WITH([babeltrace-bin],
 	AS_HELP_STRING([--with-babeltrace-bin],
@@ -322,21 +326,28 @@ PKG_CHECK_MODULES([POPT], [popt],
 
 AM_PATH_XML2(2.7.6, true, AC_MSG_ERROR(No supported version of libxml2 found.))
 
-# Check for libuuid
+# Check for uuid in system libs
+AC_CHECK_FUNCS([uuid_generate],
+[
+	AC_DEFINE_UNQUOTED([LTTNG_HAVE_LIBUUID], 1, [Has libuuid support.])
+	link_with_libuuid=no
+],
+[
+# First, check the pkg-config module is available, otherwise explicitly check
+# for libuuid, or uuid support in the C-library.
 PKG_CHECK_MODULES([UUID], [uuid],
 [
 	LIBS="$LIBS $UUID_LIBS"
 	AC_DEFINE_UNQUOTED([LTTNG_HAVE_LIBUUID], 1, [Has libuuid support.])
-	have_libuuid=yes
+	link_with_libuuid=yes
 ],
 [
-	AC_MSG_WARN([pkg-config was unable to find a valid .pc for libuuid. Set PKG_CONFIG_PATH to specify the pkgconfig configuration file location])
-	AC_MSG_WARN([Finding libuuid without pkg-config.])
+	# Check for libuuid
 	AC_CHECK_LIB([uuid],
 		[uuid_generate],
 		[
 			AC_DEFINE_UNQUOTED([LTTNG_HAVE_LIBUUID], 1, [Has libuuid support.])
-			have_libuuid=yes
+			link_with_libuuid=yes
 		],
 		[
 			# libuuid not found, check for uuid_create in libc.
@@ -344,7 +355,7 @@ PKG_CHECK_MODULES([UUID], [uuid],
 				[uuid_create],
 				[
 					AC_DEFINE_UNQUOTED([LTTNG_HAVE_LIBC_UUID], 1, [Has libc uuid support.])
-					have_libc_uuid=yes
+					link_with_libc_uuid=yes
 				],
 				[
 					AC_MSG_ERROR([Cannot find libuuid uuid_generate nor libc uuid_create. Either set PKG_CONFIG_PATH to the configuration file location or use LDFLAGS=-Ldir to specify the library location])
@@ -353,8 +364,10 @@ PKG_CHECK_MODULES([UUID], [uuid],
 		]
 	)
 ])
-AM_CONDITIONAL([LTTNG_BUILD_WITH_LIBUUID], [test "x$have_libuuid" = "xyes"])
-AM_CONDITIONAL([LTTNG_BUILD_WITH_LIBC_UUID], [test "x$have_libc_uuid" = "xyes"])
+])
+
+AM_CONDITIONAL([LTTNG_BUILD_WITH_LIBUUID], [test "x$link_with_libuuid" = "xyes"])
+AM_CONDITIONAL([LTTNG_BUILD_WITH_LIBC_UUID], [test "x$link_with_libc_uuid" = "xyes"])
 
 # URCU library version needed or newer
 m4_define([WRONG_LIBURCU_MSG], [Userspace RCU (liburcu) >= 0.8.0 is needed])
@@ -394,7 +407,7 @@ AC_ARG_WITH(kmod-prefix,
 
 AC_ARG_ENABLE(kmod,
 	AS_HELP_STRING([--disable-kmod],[build without kmod support]),
-	kmod_support=zz$enableval, kmod_support=yes)
+	kmod_support=$enableval, kmod_support=yes)
 
 AS_IF([test "x$kmod_support" = "xyes"], [
 	AC_CHECK_LIB([kmod], [kmod_module_probe_insert_module],
@@ -621,6 +634,8 @@ and installing the man pages.
 AM_CONDITIONAL([MAN_PAGES_OPT], [test "x$man_pages_opt" != "xno"])
 AM_CONDITIONAL([HAVE_ASCIIDOC_XMLTO], [test "x$have_asciidoc_xmlto" = "xyes"])
 
+AC_DEFINE_UNQUOTED([MANPATH], ["`eval eval echo $mandir`"], [Path to man pages.])
+
 # Python agent test
 UST_PYTHON_AGENT="lttngust"
 
@@ -978,7 +993,8 @@ AC_CONFIG_FILES([
 	tests/regression/tools/mi/Makefile
 	tests/regression/tools/wildcard/Makefile
 	tests/regression/tools/crash/Makefile
-	tests/regression/tools/metadata-regen/Makefile
+	tests/regression/tools/regen-metadata/Makefile
+	tests/regression/tools/regen-statedump/Makefile
 	tests/regression/ust/Makefile
 	tests/regression/ust/nprocesses/Makefile
 	tests/regression/ust/high-throughput/Makefile