X-Git-Url: https://git.efficios.com/?a=blobdiff_plain;f=configure.ac;h=63eef1bcf611f16ff7103c8f0cb891f30882fdfc;hb=6567934701fb3446f1ef943aaa8f24844c81bfdc;hp=e52538bd6770b76d6b7e209f47a53ad65fed7733;hpb=ba64dfcccb1f1bd7a259dc5d563ba422b8375582;p=babeltrace.git

diff --git a/configure.ac b/configure.ac
index e52538bd..63eef1bc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -330,6 +330,7 @@ AC_ARG_VAR([BABELTRACE_DEV_MODE], [Set to 1 to enable the Babeltrace developer m
 AS_IF([test "x$BABELTRACE_DEV_MODE" = x1], [
 	AC_DEFINE([BT_DEV_MODE], 1, [Babeltrace developer mode])
 ], [BABELTRACE_DEV_MODE=0])
+AM_CONDITIONAL([DEV_MODE], [test "x$BABELTRACE_DEV_MODE" = x1])
 
 # BABELTRACE_DEBUG_MODE:
 AC_ARG_VAR([BABELTRACE_DEBUG_MODE], [Set to 1 to enable the Babeltrace debug mode (enables internal assertions for Babeltrace maintainers)])
@@ -416,15 +417,6 @@ AM_CONDITIONAL([ENABLE_PYTHON_COMMON_DEPS], [test "x$enable_python_bindings" = x
 
 # Set defines for optionnal features conditionnals in the source code
 
-## jgalar: still used?
-AS_IF([test "x$enable_python_plugins" = xyes],
-  [AC_DEFINE([PYTHON_PLUGINS], [1], [Python plugin support.])]
-)
-
-AS_IF([test "x$enable_debug_info" = xyes],
-  [AC_DEFINE([ENABLE_DEBUG_INFO], [1], [Define to 1 if you enable the 'debug info' feature])]
-)
-
 AS_IF([test "x$enable_built_in_plugins" = xyes],
   [AC_DEFINE([BT_BUILT_IN_PLUGINS], [1], [Define to 1 to register plug-in attributes in static executable sections])]
 )
@@ -674,7 +666,6 @@ CFLAGS=${save_CFLAGS}
 AX_APPEND_COMPILE_FLAGS([ dnl
 		-Wall dnl
 		-Wextra dnl
-		-Wstrict-prototypes dnl
 		-Wmissing-prototypes dnl
 		-Wmissing-declarations dnl
 		-Wnull-dereference dnl
@@ -722,15 +713,13 @@ AS_IF([test "x$enable_Werror" = "xyes"],
 )
 
 # The test used in AX_APPEND_COMPILE_FLAGS, generated using AC_LANG_PROGRAM, is
-# written in such a way that it triggers a -Wold-style-definition warning.  So
-# this warning always ends up disabled if we put it there, because the test
-# program does not build.
+# written in such a way that it triggers warnings with the following warning
+# flags.  So they would always end up disabled if we put them there, because
+# the test program would 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.
-
-WARN_CFLAGS="${WARN_CFLAGS} -Wold-style-definition"
+# Enable them here unconditionally.  They are supported by GCC >= 4.8 and by
+# Clang >= 4.0.
+WARN_CFLAGS="${WARN_CFLAGS} -Wold-style-definition -Wstrict-prototypes"
 
 # CFLAGS from AX_APPEND_COMPILE_FLAGS.
 AM_CFLAGS="${AM_CFLAGS} ${WARN_CFLAGS}"
@@ -816,6 +805,7 @@ AC_CONFIG_FILES([
 	tests/ctf-writer/Makefile
 	tests/lib/Makefile
 	tests/lib/test-plugin-plugins/Makefile
+	tests/lib/conds/Makefile
 	tests/Makefile
 	tests/param-validation/Makefile
 	tests/plugins/Makefile