X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=configure.ac;h=6bddf8783c61556ea368408f30115ee566167011;hp=ba5f7bde88003e5ad966977d0640bbc0298b9c09;hb=daee53455d4227b223c22fdeff84722f924cc0d2;hpb=7e60e3edd26d83b98b2192cd7478c2d99e30f333

diff --git a/configure.ac b/configure.ac
index ba5f7bde8..6bddf8783 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([lttng-tools],[2.0-pre14],[david.goulet@polymtl.ca],[],[http://lttng.org])
+AC_INIT([lttng-tools],[2.0-pre16],[david.goulet@polymtl.ca],[],[http://lttng.org])
 AC_CONFIG_AUX_DIR([config])
 AC_CANONICAL_TARGET
 AC_CANONICAL_HOST
@@ -14,36 +14,36 @@ AC_CHECK_HEADERS([ \
 	getopt.h sys/ipc.h sys/shm.h popt.h grp.h \
 ])
 
-AC_ARG_WITH([consumerd32-path],
-	AS_HELP_STRING([--with-consumerd32-path],
-	[Location of the 32-bit consumerd executable]),
-	[CONSUMERD32_PATH="$withval"],
-	[CONSUMERD32_PATH=''])
-AC_SUBST([CONSUMERD32_PATH])
+AC_ARG_WITH([consumerd32-bin],
+	AS_HELP_STRING([--with-consumerd32-bin],
+	[Location of the 32-bit consumerd executable (including the filename)]),
+	[CONSUMERD32_BIN="$withval"],
+	[CONSUMERD32_BIN=''])
+AC_SUBST([CONSUMERD32_BIN])
 
-AC_ARG_WITH([consumerd64-path],
-	AS_HELP_STRING([--with-consumerd64-path],
-	[Location of the 64-bit consumerd executable]),
-	[CONSUMERD64_PATH="$withval"],
-	[CONSUMERD64_PATH=''])
-AC_SUBST([CONSUMERD64_PATH])
+AC_ARG_WITH([consumerd64-bin],
+	AS_HELP_STRING([--with-consumerd64-bin],
+	[Location of the 64-bit consumerd executable (including the filename)]),
+	[CONSUMERD64_BIN="$withval"],
+	[CONSUMERD64_BIN=''])
+AC_SUBST([CONSUMERD64_BIN])
 
 AC_ARG_WITH([consumerd32-libdir],
 	AS_HELP_STRING([--with-consumerd32-libdir],
-	[Location of the 32-bit consumerd libraries]),
+	[Directory containing the 32-bit consumerd libraries]),
 	[CONSUMERD32_LIBDIR="$withval"],
 	[CONSUMERD32_LIBDIR=''])
 AC_SUBST([CONSUMERD32_LIBDIR])
 
 AC_ARG_WITH([consumer64d-libdir],
 	AS_HELP_STRING([--with-consumerd64-libdir],
-	[Location of the 64-bit consumerd libraries]),
+	[Directory containing the 64-bit consumerd libraries]),
 	[CONSUMERD64_LIBDIR="$withval"],
 	[CONSUMERD64_LIBDIR=''])
 AC_SUBST([CONSUMERD64_LIBDIR])
 
-AC_DEFINE_UNQUOTED([CONFIG_CONSUMERD32_PATH], $CONSUMERD32_PATH, [Location of the 32-bit consumerd executable.])
-AC_DEFINE_UNQUOTED([CONFIG_CONSUMERD64_PATH], $CONSUMERD64_PATH, [Location of the 64-bit consumerd executable])
+AC_DEFINE_UNQUOTED([CONFIG_CONSUMERD32_BIN], $CONSUMERD32_BIN, [Location of the 32-bit consumerd executable.])
+AC_DEFINE_UNQUOTED([CONFIG_CONSUMERD64_BIN], $CONSUMERD64_BIN, [Location of the 64-bit consumerd executable])
 AC_DEFINE_UNQUOTED([CONFIG_CONSUMERD32_LIBDIR], $CONSUMERD32_LIBDIR, [Search for consumerd 32-bit libraries in this location.])
 AC_DEFINE_UNQUOTED([CONFIG_CONSUMERD64_LIBDIR], $CONSUMERD64_LIBDIR, [Search for consumerd 64-bit libraries in this location.])
 
@@ -58,7 +58,7 @@ AC_CHECK_LIB([popt], [poptGetContext], [],
 )
 
 # URCU library version needed or newer
-liburcu_version=">= 0.6.6"
+liburcu_version=">= 0.6.7"
 
 # Check liburcu needed function calls
 AC_CHECK_DECL([cds_list_add], [],
@@ -118,7 +118,7 @@ AX_CONFIG_FEATURE(
 AM_CONDITIONAL([COMPAT_EPOLL], [ test "$enable_epoll" = "yes" ])
 
 AC_PROG_CC
-m4_ifdef([LT_INIT], [LT_INIT], [AC_PROG_LIBTOOL])
+LT_INIT
 
 CFLAGS="-Wall $CFLAGS -g -fno-strict-aliasing"
 
@@ -132,12 +132,14 @@ AC_SUBST(DEFAULT_INCLUDES)
 AC_CONFIG_FILES([
 	Makefile
 	include/Makefile
+	common/Makefile
 	libkernelctl/Makefile
 	liblttng-consumer/Makefile
 	liblttng-kconsumer/Makefile
 	liblttng-ustconsumer/Makefile
 	liblttngctl/Makefile
 	liblttng-sessiond-comm/Makefile
+	liblttng-ht/Makefile
 	lttng-consumerd/Makefile
 	lttng-sessiond/Makefile
 	lttng/Makefile