X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=configure.ac;h=dd0fb21da1288236db199e460af6f25432343da1;hp=2bb30edb325316b64307d67a9e968a5aa280e7c4;hb=808cb744a46310d2e5fbbe9ab025cd427bcfc0a8;hpb=7f08cc82e68617aa423952b8f9cc7c74bc247f8d

diff --git a/configure.ac b/configure.ac
index 2bb30edb3..dd0fb21da 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,10 +32,30 @@ AM_CONDITIONAL([CXX_WORKS], [test "x$rw_cv_prog_cxx_works" = "xyes"])
 # -Wunknown-warning-option diagnostic fatal with clang.
 AX_APPEND_COMPILE_FLAGS([ dnl
 		-Wall dnl
+		dnl We currently get this warning when building with Clang:
+		dnl
+		dnl /usr/include/setjmp.h:54:12: error: declaration of built-in function '__sigsetjmp' requires the declaration of the 'jmp_buf' type, commonly provided in the header <setjmp.h>. [-Werror,-Wincomplete-setjmp-declaration]
+		dnl extern int __sigsetjmp (struct __jmp_buf_tag __env[1], int __savemask) __THROWNL;
+		dnl            ^
+		-Wno-incomplete-setjmp-declaration dnl
+		-Wdiscarded-qualifiers dnl
+		-Wmissing-declarations dnl
+		-Wmissing-prototypes dnl
+		-Wmissing-parameter-type dnl
+		-Wold-style-definition dnl
+		-Wstrict-prototypes dnl
 	],
 	[WARN_CFLAGS],
 	[-Werror])
 
+# When given, add -Werror to WARN_CFLAGS.
+AC_ARG_ENABLE([Werror],
+	[AS_HELP_STRING([--enable-Werror], [Treat compiler warnings as errors.])]
+)
+AS_IF([test "x$enable_Werror" = "xyes"],
+	[WARN_CFLAGS="${WARN_CFLAGS} -Werror"]
+)
+
 # Checks for programs.
 AC_PROG_GREP
 AC_PROG_MAKE_SET
@@ -217,6 +237,9 @@ AC_CHECK_FUNCS([ \
 	sched_getcpu sysconf sync_file_range
 ])
 
+# Check for pthread_setname_np and its signature
+LTTNG_PTHREAD_SETNAME_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])
@@ -1051,13 +1074,17 @@ AM_CONDITIONAL([BUILD_LIB_UST_CONSUMER], [test x$build_lib_ust_consumer = xyes])
 AM_CFLAGS="${WARN_CFLAGS} -fno-strict-aliasing $PTHREAD_CFLAGS"
 AC_SUBST(AM_CFLAGS)
 
+# This is set even though it is empty, so Makefiles can do "AM_LDFLAGS += ...".
+AM_LDFLAGS=""
+AC_SUBST(AM_LDFLAGS)
+
 # The order in which the include folders are searched is important.
 # The top_builddir should always be searched first in the event that a build
 # time generated file is included. An example of this is the "version.i" file.
 # In a scenario where lttng-tools is built from a distribution tarball and in a
 # out-of-tree manner, the generated "version.i" has priority on the one from
 # the source (distribution tarball) and must be found first.
-AM_CPPFLAGS="-I\$(top_builddir)/include -I\$(top_srcdir)/include -I\$(top_srcdir)/src -include config.h $AM_CPPFLAGS"
+AM_CPPFLAGS="-I\$(top_builddir)/include -I\$(top_srcdir)/include -I\$(top_builddir)/src -I\$(top_srcdir)/src -include config.h $AM_CPPFLAGS"
 AC_SUBST(AM_CPPFLAGS)
 
 lttngincludedir="${includedir}/lttng"
@@ -1105,9 +1132,9 @@ AC_CONFIG_FILES([
 	src/common/config/Makefile
 	src/common/string-utils/Makefile
 	src/common/fd-tracker/Makefile
+	src/common/filter/Makefile
 	src/lib/Makefile
 	src/lib/lttng-ctl/Makefile
-	src/lib/lttng-ctl/filter/Makefile
 	src/lib/lttng-ctl/lttng-ctl.pc
 	src/bin/Makefile
 	src/bin/lttng-consumerd/Makefile