Cleanup: simplify 'poll' wrapper build

[lttng-tools.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index e3b23f4658b87874b857eec6774050c93474fda3..2d4fcb7b96a594575a5ccea3817caa9ab3b5c9d0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 dnl SPDX-License-Identifier: GPL-2.0-only
 AC_PREREQ([2.64])
-AC_INIT([lttng-tools],[2.12.0-rc1],[jeremie.galarneau@efficios.com],[],[https://lttng.org])
+AC_INIT([lttng-tools],[2.13.0-pre],[jeremie.galarneau@efficios.com],[],[https://lttng.org])
 
 AC_CONFIG_HEADERS([include/config.h])
 AC_CONFIG_AUX_DIR([config])
@@ -38,6 +38,12 @@ AX_APPEND_COMPILE_FLAGS([ dnl
                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])
@@ -178,8 +184,8 @@ AC_DEFINE_UNQUOTED([VERSION_MAJOR], $major_version, [LTTng-Tools major version n
 AC_DEFINE_UNQUOTED([VERSION_MINOR], $minor_version, [LTTng-Tools minor version number])
 AC_DEFINE_UNQUOTED([VERSION_PATCHLEVEL], $patchlevel_version, [LTTng-Tools patchlevel version number])
 
-version_name="(Ta) Meilleure"
-version_description="Ta Meilleure is a Northeast IPA beer brewed by Lagabière. Translating to \"Your best one\", this beer gives out strong aromas of passion fruit, lemon, and peaches. Tastewise, expect a lot of fruit, a creamy texture, and a smooth lingering hop bitterness."
+version_name="N-Beer"
+version_description="An alcoholic drink made from yeast-fermented malt flavored with hops."
 version_description_c=$(echo $version_description | $SED 's/"/\\"/g')
 
 AC_DEFINE_UNQUOTED([VERSION_NAME], ["$version_name"], "")
@@ -231,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])
@@ -612,10 +621,8 @@ AX_HAVE_EPOLL(
 )
 AX_CONFIG_FEATURE(
        [epoll], [This platform supports epoll(7)],
-       [HAVE_EPOLL], [This platform supports epoll(7).],
-       [enable_epoll="yes"], [enable_epoll="no"]
+       [HAVE_EPOLL], [This platform supports epoll(7).]
 )
-AM_CONDITIONAL([COMPAT_EPOLL], [ test "$enable_epoll" = "yes" ])
 
 AS_IF([test "x$ac_cv_func_dirfd" = "xyes"],
        [AX_CONFIG_FEATURE_ENABLE(dirfd)],
@@ -623,10 +630,8 @@ AS_IF([test "x$ac_cv_func_dirfd" = "xyes"],
 )
 AX_CONFIG_FEATURE(
        [dirfd], [Use directory file descriptors],
-       [COMPAT_DIRFD], [This platform supports directory file descriptors.],
-       [enable_dirfd="yes"], [enable_dirfd="no"]
+       [HAVE_DIRFD], [This platform supports directory file descriptors.]
 )
-AM_CONDITIONAL([COMPAT_DIRFD], [ test "$enable_dirfd" = "yes" ])
 
 AM_CONDITIONAL([TEST_JAVA_JUL_AGENT], [test "x$test_java_agent_jul" = "xyes"])
 AM_CONDITIONAL([TEST_JAVA_LOG4J_AGENT], [test "x$test_java_agent_log4j" = "xyes"])
@@ -1075,7 +1080,7 @@ AC_SUBST(AM_LDFLAGS)
 # 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"
@@ -1093,6 +1098,9 @@ AC_SUBST(lttngnotificationincludedir)
 lttngtriggerincludedir="${includedir}/lttng/trigger"
 AC_SUBST(lttngtriggerincludedir)
 
+lttngeventruleincludedir="${includedir}/lttng/event-rule"
+AC_SUBST(lttngeventruleincludedir)
+
 lttnglibexecdir="${libdir}/lttng/libexec"
 AC_SUBST(lttnglibexecdir)
 
@@ -1123,9 +1131,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