X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;ds=sidebyside;f=configure.ac;h=b73cf0f0e6c273f45be1ddf98954fc1fb3becc72;hb=b1e0b6b6dd635faf8b7b0a506d0cea56e1d2e674;hp=32343868d3be1ccf8125fd05a0aceacf0ecac4b6;hpb=c615ee2f7b88dcd131787d9915d3b80b5e42e0f2;p=lttng-tools.git

diff --git a/configure.ac b/configure.ac
index 32343868d..b73cf0f0e 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-pre14],[david.goulet@polymtl.ca],[],[http://lttng.org])
 AC_CONFIG_AUX_DIR([config])
 AC_CANONICAL_TARGET
 AC_CANONICAL_HOST
@@ -14,6 +14,39 @@ 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([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([consumerd32-libdir],
+	AS_HELP_STRING([--with-consumerd32-libdir],
+	[Location of 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]),
+	[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_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.])
+
 # Check for pthread
 AC_CHECK_LIB([pthread], [pthread_create], [],
 	[AC_MSG_ERROR([Cannot find libpthread. Use [LDFLAGS]=-Ldir to specify its location.])]
@@ -53,7 +86,7 @@ AC_CHECK_DECL([caa_likely], [],
 # Check liblttng-ust-ctl library
 AC_ARG_ENABLE(lttng-ust,
 	[  --disable-lttng-ust     build without LTTng-UST (Userspace Tracing) support.],
-	lttng_ust_support=no, lttng_ust_support=yes)
+	lttng_ust_support=$enableval, lttng_ust_support=yes)
 
 [
 if test "x$lttng_ust_support" = "xno"; then
@@ -85,7 +118,7 @@ AX_CONFIG_FEATURE(
 AM_CONDITIONAL([COMPAT_EPOLL], [ test "$enable_epoll" = "yes" ])
 
 AC_PROG_CC
-AC_PROG_LIBTOOL
+LT_INIT
 
 CFLAGS="-Wall $CFLAGS -g -fno-strict-aliasing"