X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=configure.ac;h=2139cd3c6bb283984363850523930fb1e926086d;hb=d893a65a0e39eb3bf06c9088ce8cb2c8dc36df98;hp=46b886033fd9620daaf7f945fe0a86484867d3e3;hpb=d05bfdc25f188177d1be28d05962e99f3e500191;p=lttng-tools.git

diff --git a/configure.ac b/configure.ac
index 46b886033..2139cd3c6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.64])
-AC_INIT([lttng-tools],[2.9.8],[jeremie.galarneau@efficios.com],[],[https://lttng.org])
+AC_INIT([lttng-tools],[2.9.10],[jeremie.galarneau@efficios.com],[],[https://lttng.org])
 
 AC_CONFIG_HEADERS([include/config.h])
 AC_CONFIG_AUX_DIR([config])
@@ -8,7 +8,7 @@ AC_CONFIG_MACRO_DIR([m4])
 AC_CANONICAL_TARGET
 AC_CANONICAL_HOST
 
-AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip tar-pax])
+AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip tar-pax nostdinc])
 AM_MAINTAINER_MODE([enable])
 
 # Enable silent rules if available (Introduced in AM 1.11)
@@ -59,9 +59,6 @@ AS_IF([test "x$ax_cv___attribute__" = "xyes"],
         [AC_MSG_ERROR([The compiler does not support __attribute__ extensions])])
 
 AX_PTHREAD(,[AC_MSG_ERROR([Could not configure pthreads support])])
-LIBS="$PTHREAD_LIBS $LIBS"
-CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-CC="$PTHREAD_CC"
 
 AX_LIB_SOCKET_NSL
 
@@ -436,7 +433,7 @@ AC_ARG_WITH(kmod-prefix,
 		[Specify the installation prefix of the kmod library.
 		Headers must be in PATH/include; libraries in PATH/lib.]),
 		[
-			CPPFLAGS="$CPPFLAGS -I${withval}/include"
+			AM_CPPFLAGS="$AM_CPPFLAGS -I${withval}/include"
 			LDFLAGS="$LDFLAGS -L${withval}/lib64 -L${withval}/lib"
 		])
 
@@ -461,7 +458,7 @@ AC_ARG_WITH(lttng-ust-prefix,
                  [Specify the installation prefix of the lttng-ust library.
 	          Headers must be in PATH/include; libraries in PATH/lib.]),
 		  [
-		    CPPFLAGS="$CPPFLAGS -I${withval}/include"
+		    AM_CPPFLAGS="$AM_CPPFLAGS -I${withval}/include"
 		    LDFLAGS="$LDFLAGS -L${withval}/lib64 -L${withval}/lib"
 		  ])
 
@@ -522,15 +519,6 @@ AC_CHECK_LIB([pfm], [pfm_initialize],
 	      ])
 AM_CONDITIONAL([LTTNG_TOOLS_BUILD_WITH_LIBPFM], [test "x$have_libpfm" = "xyes"])
 
-AC_ARG_ENABLE([git-version],
-              [AC_HELP_STRING([--disable-git-version],
-                              [Do not use the git version for the build])],
-              [have_git_version=$enableval], [have_git_version=yes]
-)
-
-AM_CONDITIONAL([LTTNG_TOOLS_BUILD_GIT_SOURCE],
-	[test "x${have_git_version}" = "xyes"])
-
 # For Python
 # SWIG version needed or newer:
 swig_version=2.0.0
@@ -967,9 +955,11 @@ modify their sources.
 # export flex condition
 AM_CONDITIONAL([HAVE_FLEX], [test "x$have_flex" = "xyes"])
 
-CFLAGS="-Wall $CFLAGS -g -fno-strict-aliasing"
+AM_CFLAGS="-Wall -fno-strict-aliasing $PTHREAD_CFLAGS"
+AC_SUBST(AM_CFLAGS)
 
-DEFAULT_INCLUDES="-I\$(top_srcdir) -I\$(top_builddir) -I\$(top_builddir)/src -I\$(top_builddir)/include -include config.h"
+AM_CPPFLAGS="-I\$(top_srcdir)/include -I\$(top_builddir)/include -I\$(top_srcdir)/src -include config.h $AM_CPPFLAGS"
+AC_SUBST(AM_CPPFLAGS)
 
 lttngincludedir="${includedir}/lttng"
 
@@ -1033,6 +1023,8 @@ AC_CONFIG_FILES([
 	tests/regression/tools/crash/Makefile
 	tests/regression/tools/regen-metadata/Makefile
 	tests/regression/tools/regen-statedump/Makefile
+	tests/regression/tools/working-directory/Makefile
+	tests/regression/tools/relayd-grouping/Makefile
 	tests/regression/ust/Makefile
 	tests/regression/ust/nprocesses/Makefile
 	tests/regression/ust/high-throughput/Makefile