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])
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.])]
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>]]
)
# 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