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([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.])]