Cleanup configure.ac

[lttng-tools.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index e3efec8f2c84a18037cdbe8d522791f904708270..01e15d3b2689d2a79cc96f51f8db14ae0b85ccb6 100644 (file)
--- 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,8 +14,38 @@ AC_CHECK_HEADERS([ \
        getopt.h sys/ipc.h sys/shm.h popt.h grp.h \
 ])
 
-AC_ARG_VAR([LTTNG_TOOLS_COMPAT_BIN_PREFIX], [Search for LTTng Tools 32-bit compatibility binaries in this location.])
-AC_DEFINE_UNQUOTED([CONFIG_COMPAT_BIN_PREFIX], $LTTNG_TOOLS_COMPAT_BIN_PREFIX, [Search for LTTng Tools 32-bit compatibility binaries in this location.])
+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], [],
@@ -55,21 +85,14 @@ 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)
-
-[
-if test "x$lttng_ust_support" = "xno"; then
-       echo "LTTng-UST support disabled."
-else
-]
+       AS_HELP_STRING([--disable-lttng-ust],[build without LTTng-UST (Userspace Tracing) support]),
+       lttng_ust_support=$enableval, lttng_ust_support=yes)
+
+AS_IF([test "x$lttng_ust_support" = "xyes"], [
        AC_CHECK_LIB([lttng-ust-ctl], [ustctl_create_session], [],
                [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.])]
        )
-[
-       echo "LTTng-UST support enabled."
-fi
-]
+])
 
 AM_CONDITIONAL([HAVE_LIBLTTNG_UST_CTL], [ test "x$ac_cv_lib_lttng_ust_ctl_ustctl_create_session" = "xyes" ])
 
@@ -88,7 +111,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"
 
@@ -116,3 +139,13 @@ AC_CONFIG_FILES([
 ])
 
 AC_OUTPUT
+
+# Mini-report on what will be built
+AS_ECHO("")
+
+AS_ECHO_N("Lttng-UST support: ")
+AS_IF([test "x$lttng_ust_support" = "xyes"], [AS_ECHO("Enabled")],
+       [AS_ECHO("Disabled")])
+
+AS_ECHO("")
+