X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=configure.ac;h=e5dcf8ba1ddc16f6131ec89584aeee6e22484214;hb=d5a22ce88b28f87cfcace263243510c1ad48b133;hp=a78b876c14a70c4f0bed959432ca4f7c9497e6e0;hpb=392df1b75e87e51f679c48aa3776d54ef02ee8d7;p=babeltrace.git

diff --git a/configure.ac b/configure.ac
index a78b876c..e5dcf8ba 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/])
@@ -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]
 )
 
@@ -616,17 +616,9 @@ AS_IF([test "x$exec_prefix" = xNONE], [
 
 AC_SUBST(LIBDIR)
 
-
-# Set global CFLAGS in AM_CFLAGS
-AM_CFLAGS="-Wall -Wformat -Werror=implicit-function-declaration $PTHREAD_CFLAGS $GLIB_CFLAGS"
-AC_SUBST(AM_CFLAGS)
-
-# Set global CPPFLAGS in AM_CPPFLAGS
-AM_CPPFLAGS="-I\$(top_srcdir)/include -I\$(top_builddir)/src -I\$(top_srcdir)/src -include common/config.h"
-AC_SUBST(AM_CPPFLAGS)
-
-# Add glib to global link libs
-LIBS="$LIBS $GLIB_LIBS"
+# CFLAGS from libraries (the glib ones are needed for the following sizeof
+# test).
+AM_CFLAGS="${PTHREAD_CFLAGS} ${GLIB_CFLAGS}"
 
 # Check that the current size_t matches the size that glib thinks it should
 # be. This catches problems on multi-arch where people try to do a 32-bit
@@ -634,6 +626,10 @@ LIBS="$LIBS $GLIB_LIBS"
 # glib.h is not platform specific but it includes glibconfig.h which is and
 # is usually installed in a non-standard path.
 
+# Do this before enabling all the warning flags, as the
+# AC_LANG_PROGRAM-generated program may generate some warning, which makes this
+# test fail unnecessarily.
+
 # Older versions of the pkg-config macros disallows PKG_* in the autoconf
 # output. Specifically allow pkg_config_libdir to be able to print the
 # error message.
@@ -657,6 +653,56 @@ target.
 ])
 CFLAGS=${save_CFLAGS}
 
+# Detect C and LD warning flags supported by the compiler.
+AX_COMPILER_FLAGS(
+	[WARN_CFLAGS], dnl CFLAGS variable name
+	[WARN_LDFLAGS], dnl LDFLAGS variable name (unused for now)
+	[], dnl is-release
+	[], dnl Extra base CFLAGS
+	[ dnl Extra "yes" CFLAGS
+		dnl Disable these flags, either because we don't want them
+		dnl or because we want them but are not ready to enable them
+		dnl yet.
+		-Wno-sign-compare dnl
+		-Wno-inline dnl
+		-Wno-declaration-after-statement dnl
+		-Wno-switch-enum dnl
+		-Wno-switch-default dnl
+		-Wno-packed dnl
+		-Wno-pointer-arith dnl
+		-Wno-format-nonliteral dnl
+		-Wno-undef dnl
+		-Wno-double-promotion dnl
+		-Wno-cast-align dnl
+	])
+
+# CFLAGS from AX_COMPILER_FLAGS.
+AM_CFLAGS="${AM_CFLAGS} ${WARN_CFLAGS}"
+
+# The test used in AX_COMPILER_FLAGS, generated using AC_LANG_PROGRAM, is
+# written in such a way that it triggers a -Wold-style-definition warning.  So
+# if the user has -Werror in their CFLAGS, that warning flag will end up
+# disabled, because the test program will not build.
+#
+# Enable it here unconditionally.  It is supported by GCC >= 4.8 and by Clang
+# (it is accepted for compatibility although it has no effect), and there is
+# not reason to not want it.
+
+AM_CFLAGS="${AM_CFLAGS} -Wold-style-definition"
+
+# We want this one to always be an error.
+AM_CFLAGS="${AM_CFLAGS} -Werror=implicit-function-declaration"
+
+# Done for AM_CFLAGS.
+AC_SUBST(AM_CFLAGS)
+
+# Set global CPPFLAGS in AM_CPPFLAGS
+AM_CPPFLAGS="-I\$(top_srcdir)/include -I\$(top_builddir)/src -I\$(top_srcdir)/src -include common/config.h"
+AC_SUBST(AM_CPPFLAGS)
+
+# Add glib to global link libs
+LIBS="$LIBS $GLIB_LIBS"
+
 # Abuse autoconf's AC_ARG_PROGRAM output variable 'program_transform_name'
 # to rename babeltrace2.bin to babeltrace2 at install time.
 program_transform_name="s&babeltrace2\.bin&babeltrace2&;$program_transform_name"
@@ -698,6 +744,7 @@ AC_CONFIG_FILES([
 	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
@@ -727,6 +774,7 @@ AC_CONFIG_FILES([
 	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