Introduce --with-consumer32-bindir and --with-consumer64-bindir

[lttng-tools.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 8c0eb54d345d6561281793d01f5012cc5db4243e..aa185a6db07b60144536483fbba46324c7772adc 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ AC_CANONICAL_TARGET
 AC_CANONICAL_HOST
 AC_CONFIG_MACRO_DIR([config])
 AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip])
 AC_CANONICAL_HOST
 AC_CONFIG_MACRO_DIR([config])
 AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip])

-AM_SILENT_RULES([yes])
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])

 
 AC_CONFIG_HEADERS([include/config.h])
 
 
 AC_CONFIG_HEADERS([include/config.h])
 


@@ -14,6 +14,23 @@ AC_CHECK_HEADERS([ \
        getopt.h sys/ipc.h sys/shm.h popt.h grp.h \
 ])
 
        getopt.h sys/ipc.h sys/shm.h popt.h grp.h \
 ])
 

+AC_ARG_WITH([consumer32-bindir],
+       AC_HELP_STRING([--with-consumer32-bindir],
+       [Location of the 32-bit consumer executable]),
+       [LTTNG_TOOLS_32BIT_BINDIR="$withval"],
+       [LTTNG_TOOLS_32BIT_BINDIR=''])
+AC_SUBST([LTTNG_TOOLS_32BIT_BINDIR])
+
+AC_ARG_WITH([consumer64-bindir],
+       AC_HELP_STRING([--with-consumer64-bindir],
+       [Location of the 64-bit consumer executable]),
+       [LTTNG_TOOLS_64BIT_BINDIR="$withval"],
+       [LTTNG_TOOLS_64BIT_BINDIR=''])
+AC_SUBST([LTTNG_TOOLS_64BIT_BINDIR])
+
+AC_DEFINE_UNQUOTED([CONFIG_32BIT_BINDIR], $LTTNG_TOOLS_32BIT_BINDIR, [Search for LTTng Tools 32-bit binaries in this location.])
+AC_DEFINE_UNQUOTED([CONFIG_64BIT_BINDIR], $LTTNG_TOOLS_64BIT_BINDIR, [Search for LTTng Tools 64-bit binaries 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.])]
 # Check for pthread
 AC_CHECK_LIB([pthread], [pthread_create], [],
        [AC_MSG_ERROR([Cannot find libpthread. Use [LDFLAGS]=-Ldir to specify its location.])]


@@ -34,6 +51,9 @@ AC_CHECK_DECL([cds_list_add], [],
 AC_CHECK_DECL([cds_wfq_init], [],
        [AC_MSG_ERROR([liburcu $liburcu_version or newer is needed])], [[#include <urcu/wfqueue.h>]]
 )
 AC_CHECK_DECL([cds_wfq_init], [],
        [AC_MSG_ERROR([liburcu $liburcu_version or newer is needed])], [[#include <urcu/wfqueue.h>]]
 )

+AC_CHECK_DECL([cds_wfq_dequeue_blocking], [],
+    [AC_MSG_ERROR([liburcu $liburcu_version or newer is needed])], [[#include <urcu/wfqueue.h>]]
+)

 AC_CHECK_DECL([futex_async], [],
        [AC_MSG_ERROR([liburcu $liburcu_version or newer is needed])], [[#include <urcu/futex.h>]]
 )
 AC_CHECK_DECL([futex_async], [],
        [AC_MSG_ERROR([liburcu $liburcu_version or newer is needed])], [[#include <urcu/futex.h>]]
 )