Revert "Fix cross-compile"

[lttng-tools.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 0aede284dcee0db95d4e4ada0f0f0fede4a3b48e..a3120fc041568bc37ea919d708fec8c46ab86a74 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([lttng-tools],[2.1.0-rc4],[dgoulet@efficios.com],[],[http://lttng.org])
+AC_INIT([lttng-tools],[2.1.0-rc6],[dgoulet@efficios.com],[],[http://lttng.org])
 AC_CONFIG_AUX_DIR([config])
 AC_CANONICAL_TARGET
 AC_CANONICAL_HOST
@@ -39,6 +39,8 @@ AS_IF([test "x$libtool_fixup" = "xyes"],
                  ])
            ])
 
+AM_CONDITIONAL([NO_SHARED], [test x$enable_shared = xno])
+
 AC_CHECK_HEADERS([ \
        sys/types.h unistd.h fcntl.h string.h pthread.h limits.h \
        signal.h stdlib.h sys/un.h sys/socket.h stdlib.h stdio.h \
@@ -144,7 +146,7 @@ AS_IF([test "x$lttng_ust_support" = "xyes"], [
                        lttng_ust_ctl_found=yes
                ],
                [AC_MSG_ERROR([Cannot find LTTng-UST. Use [LDFLAGS]=-Ldir to specify its location, or specify --disable-lttng-ust to build lttng-tools without LTTng-UST support.])],
-               [-lurcu-common -lurcu-bp -lurcu-cds]
+               [-lurcu-common -lurcu-bp -lurcu-cds -lrt]
        )
 ])
 AM_CONDITIONAL([HAVE_LIBLTTNG_UST_CTL], [test "x$lttng_ust_ctl_found" = xyes])
@@ -275,6 +277,7 @@ AC_CONFIG_FILES([
        src/common/sessiond-comm/Makefile
        src/common/compat/Makefile
        src/common/relayd/Makefile
+       src/common/testpoint/Makefile
        src/lib/Makefile
        src/lib/lttng-ctl/Makefile
        src/lib/lttng-ctl/filter/Makefile
@@ -287,6 +290,8 @@ AC_CONFIG_FILES([
        tests/kernel/Makefile
        tests/tools/Makefile
        tests/tools/streaming/Makefile
+       tests/tools/filtering/Makefile
+       tests/tools/health/Makefile
        tests/ust/Makefile
        tests/ust/nprocesses/Makefile
        tests/ust/high-throughput/Makefile