X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=configure.ac;h=83154eb43fc8675d6dac22af8b307ac8ef84ab7e;hp=b341b6c87870c776ea65fe59f389e678b9b5fe20;hb=978b18de74be0b63ec896cca09ff5a8ab61ea156;hpb=0a904e930ffe4e5383c4405168cb876a1298af88

diff --git a/configure.ac b/configure.ac
index b341b6c8..83154eb4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,7 +29,7 @@ AC_PREREQ([2.50])
 m4_define([bt_version_major], [2])
 m4_define([bt_version_minor], [0])
 m4_define([bt_version_patch], [0])
-m4_define([bt_version_extra], [-pre5])
+m4_define([bt_version_extra], [-rc1])
 m4_define([bt_version], bt_version_major[.]bt_version_minor[.]bt_version_patch[]bt_version_extra)
 
 AC_INIT([babeltrace], bt_version, [jeremie dot galarneau at efficios dot com], [], [https://efficios.com/babeltrace/])
@@ -60,7 +60,7 @@ AC_CANONICAL_HOST
 ## Automake base setup ##
 ##                     ##
 
-AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip tar-ustar nostdinc])
+AM_INIT_AUTOMAKE([1.12 foreign dist-bzip2 no-dist-gzip tar-ustar nostdinc])
 AM_MAINTAINER_MODE([enable])
 
 # Enable silent rules if available (Introduced in AM 1.11)
@@ -248,9 +248,9 @@ AM_CONDITIONAL([HAVE_FLEX], [test "x$have_flex" = "xyes"])
 # Check what libraries are required on this platform to link sockets programs.
 AX_LIB_SOCKET_NSL
 
-# Check for glib >= 2.22 with gmodule support
-AM_PATH_GLIB_2_0([2.22.0], [],
-  AC_MSG_ERROR([glib >= 2.22 is required - download it from ftp://ftp.gtk.org/pub/gtk]),
+# Check for glib >= 2.28 with gmodule support
+AM_PATH_GLIB_2_0([2.28.0], [],
+  AC_MSG_ERROR([glib >= 2.28 is required - download it from ftp://ftp.gtk.org/pub/gtk]),
   [gmodule-no-export]
 )
 
@@ -307,26 +307,6 @@ AC_CHECK_LIB([c], [posix_fallocate],
   [AC_DEFINE_UNQUOTED([BABELTRACE_HAVE_POSIX_FALLOCATE], 1, [Has posix_fallocate support.])]
 )
 
-# Check libpopt
-PKG_CHECK_MODULES([POPT], [popt],
-  [
-    dnl PKG_CHECK_MODULES defines POPT_LIBS
-  ],
-  [
-    AC_MSG_WARN([pkg-config was unable to find a valid .pc for libpopt. Set PKG_CONFIG_PATH to specify the pkgconfig configuration file location])
-    AC_MSG_WARN([Finding libpopt without pkg-config.])
-    AC_CHECK_LIB([popt],
-      [poptGetContext],
-      [POPT_LIBS="-lpopt"],
-      [
-        AC_MSG_FAILURE([Cannot find libpopt. Either set PKG_CONFIG_PATH to the configuration file location or use LDFLAGS=-Ldir to specify the library location])
-      ]
-    )
-  ]
-)
-AC_SUBST(POPT_LIBS)
-
-
 ##                 ##
 ## User variables  ##
 ##                 ##
@@ -694,6 +674,7 @@ AC_CONFIG_FILES([
 	include/Makefile
 	Makefile
 	src/argpar/Makefile
+	src/autodisc/Makefile
 	src/babeltrace2-ctf-writer.pc
 	src/babeltrace2.pc
 	src/bindings/Makefile
@@ -715,6 +696,9 @@ AC_CONFIG_FILES([
 	src/lib/trace-ir/Makefile
 	src/logging/Makefile
 	src/Makefile
+	src/plugins/common/Makefile
+	src/plugins/common/muxing/Makefile
+	src/plugins/common/param-validation/Makefile
 	src/plugins/ctf/common/bfcr/Makefile
 	src/plugins/ctf/common/Makefile
 	src/plugins/ctf/common/metadata/Makefile
@@ -737,18 +721,22 @@ AC_CONFIG_FILES([
 	src/plugins/utils/trimmer/Makefile
 	src/py-common/Makefile
 	src/python-plugin-provider/Makefile
+	src/param-parse/Makefile
 	tests/bitfield/Makefile
 	tests/ctf-writer/Makefile
 	tests/argpar/Makefile
 	tests/lib/Makefile
 	tests/lib/test-plugin-plugins/Makefile
 	tests/Makefile
+	tests/param-validation/Makefile
 	tests/plugins/Makefile
 	tests/plugins/src.ctf.fs/Makefile
 	tests/plugins/src.ctf.fs/succeed/Makefile
 	tests/plugins/sink.ctf.fs/Makefile
 	tests/plugins/sink.ctf.fs/succeed/Makefile
 	tests/plugins/flt.lttng-utils.debug-info/Makefile
+	tests/plugins/flt.utils.muxer/Makefile
+	tests/plugins/flt.utils.muxer/succeed/Makefile
 	tests/plugins/flt.utils.trimmer/Makefile
 	tests/utils/Makefile
 	tests/utils/tap/Makefile