Fix: rework utils_parse_size_suffix

[lttng-tools.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 65503a3ffc12de1f71c751aa6a16dd4405d6a3b2..54f82cfbdfd94b86a8195aea22adbee9cea5cb02 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,9 +1,10 @@
-AC_INIT([lttng-tools],[2.4.0-rc2],[dgoulet@efficios.com],[],[http://lttng.org])
+AC_INIT([lttng-tools],[2.4.0],[dgoulet@efficios.com],[],[http://lttng.org])
 AC_CONFIG_AUX_DIR([config])
 AC_CANONICAL_TARGET
 AC_CANONICAL_HOST
 AC_CONFIG_MACRO_DIR([config])
 AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip])
+AM_MAINTAINER_MODE([enable])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
 # Compute minor/major/patchlevel version numbers
@@ -133,6 +134,8 @@ CONFDIR=`eval echo $sysconfdir`
 AC_SUBST(CONFDIR)
 AC_DEFINE_UNQUOTED([CONFIG_LTTNG_SYSTEM_CONFIGDIR],"$CONFDIR", [LTTng system configuration directory.])
 
+AC_DEFINE_DIR([CONFIG_LTTNG_SYSTEM_DATADIR],[datadir], [LTTng system data directory.])
+
 #
 # Check for pthread
 AC_CHECK_LIB([pthread], [pthread_create], [],
@@ -144,6 +147,8 @@ AC_CHECK_LIB([popt], [poptGetContext], [],
        [AC_MSG_ERROR([Cannot find libpopt. Use [LDFLAGS]=-Ldir to specify its location.])]
 )
 
+AM_PATH_XML2(2.7.6, 1, AC_MSG_ERROR(No supported version of libxml2 found.))
+
 # Check for libuuid
 AC_CHECK_LIB([uuid], [uuid_generate],
 [
@@ -421,6 +426,7 @@ AC_CONFIG_FILES([
        tests/regression/tools/snapshots/Makefile
        tests/regression/tools/live/Makefile
        tests/regression/tools/exclusion/Makefile
+       tests/regression/tools/save-load/Makefile
        tests/regression/ust/Makefile
        tests/regression/ust/nprocesses/Makefile
        tests/regression/ust/high-throughput/Makefile