X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=configure.ac;h=1edbfadd0d010f7b4ab4ed912ff6d44f5973f1e5;hb=refs%2Fheads%2Fsow-2020-0002-rev2;hp=cbb3ee596d00b3d4ec0a5f7b33918f37d5253781;hpb=3f3e7eb74963e75f9b0bb76b854d8be2dcbb0443;p=lttng-tools.git

diff --git a/configure.ac b/configure.ac
index cbb3ee596..1edbfadd0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,8 @@ AC_REQUIRE_AUX_FILE([tap-driver.sh])
 AC_USE_SYSTEM_EXTENSIONS
 AC_SYS_LARGEFILE
 AC_PROG_CC
-AC_PROG_CC_STDC
+# AC_PROG_CC_STDC was merged in AC_PROG_CC in autoconf 2.70
+m4_version_prereq([2.70], [], [AC_PROG_CC_STDC])
 AC_PROG_CXX
 RW_PROG_CXX_WORKS
 AM_CONDITIONAL([CXX_WORKS], [test "x$rw_cv_prog_cxx_works" = "xyes"])
@@ -102,7 +103,9 @@ detection.
 AM_CONDITIONAL([HAVE_BISON], [test "x$have_bison" = "xyes"])
 
 # check for flex
-AC_PROG_LEX
+# Prior to autoconf 2.70, AC_PROG_FLEX did not take an argument. This is not a
+# problem since the argument is silently ignored by older versions.
+AC_PROG_LEX([noyywrap])
 FLEX=$LEX
 AX_PROG_FLEX_VERSION([2.5.35], [have_flex=yes])
 
@@ -244,6 +247,7 @@ LTTNG_PTHREAD_GETNAME_NP
 # Check if clock_gettime, timer_create, timer_settime, and timer_delete are available in lib rt, and if so,
 # add -lrt to LIBS
 AC_CHECK_LIB([rt], [clock_gettime, timer_create, timer_settime, timer_delete])
+AC_CHECK_LIB([m], [floor, log10])
 
 # Checks for dl.
 AC_CHECK_LIB([dl], [dlopen], [
@@ -422,6 +426,7 @@ _AC_DEFINE_AND_SUBST([DEFAULT_ROTATE_PENDING_TIMER], [500000])
 
 # Command short descriptions
 _AC_DEFINE_QUOTED_AND_SUBST([CMD_DESCR_ADD_CONTEXT], [Add context fields to a channel])
+_AC_DEFINE_QUOTED_AND_SUBST([CMD_DESCR_ADD_MAP], [Add map])
 _AC_DEFINE_QUOTED_AND_SUBST([CMD_DESCR_CREATE], [Create a tracing session])
 _AC_DEFINE_QUOTED_AND_SUBST([CMD_DESCR_CLEAR], [Clear a tracing session])
 _AC_DEFINE_QUOTED_AND_SUBST([CMD_DESCR_DESTROY], [Tear down tracing sessions])
@@ -558,7 +563,7 @@ AM_CONDITIONAL([LTTNG_TOOLS_BUILD_WITH_LIBPFM], [test "x$have_libpfm" = "xyes"])
 swig_version=2.0.0
 
 AC_ARG_ENABLE([python-bindings],
-              [AC_HELP_STRING([--enable-python-bindings],
+              [AS_HELP_STRING([--enable-python-bindings],
                               [compile Python bindings])],
               [enable_python_binding=$enableval], [enable_python_binding=no])
 
@@ -1076,6 +1081,9 @@ AC_SUBST(lttngactionincludedir)
 lttngconditionincludedir="${includedir}/lttng/condition"
 AC_SUBST(lttngconditionincludedir)
 
+lttngmapincludedir="${includedir}/lttng/map"
+AC_SUBST(lttngmapincludedir)
+
 lttngnotificationincludedir="${includedir}/lttng/notification"
 AC_SUBST(lttngnotificationincludedir)
 
@@ -1101,6 +1109,8 @@ AC_CONFIG_FILES([
 	extras/core-handler/Makefile
 	src/Makefile
 	src/common/Makefile
+	src/common/argpar/Makefile
+	src/common/bytecode/Makefile
 	src/common/kernel-ctl/Makefile
 	src/common/kernel-consumer/Makefile
 	src/common/consumer/Makefile
@@ -1125,6 +1135,8 @@ AC_CONFIG_FILES([
 	src/bin/lttng-relayd/Makefile
 	src/bin/lttng/Makefile
 	src/bin/lttng-crash/Makefile
+	src/vendor/Makefile
+	src/vendor/msgpack/Makefile
 	tests/Makefile
 	tests/destructive/Makefile
 	tests/regression/Makefile
@@ -1147,11 +1159,15 @@ AC_CONFIG_FILES([
 	tests/regression/tools/notification/Makefile
 	tests/regression/tools/rotation/Makefile
 	tests/regression/tools/base-path/Makefile
+	tests/regression/tools/map/Makefile
 	tests/regression/tools/metadata/Makefile
 	tests/regression/tools/tracker/Makefile
 	tests/regression/tools/working-directory/Makefile
 	tests/regression/tools/relayd-grouping/Makefile
 	tests/regression/tools/clear/Makefile
+	tests/regression/tools/trigger/Makefile
+	tests/regression/tools/trigger/start-stop/Makefile
+	tests/regression/tools/trigger/utils/Makefile
 	tests/regression/ust/Makefile
 	tests/regression/ust/nprocesses/Makefile
 	tests/regression/ust/high-throughput/Makefile