Cleanup: Bump autoconf required version to 2.69

[lttng-ust.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 02d7f40cfe02e165b9d9bd42af3b7dd7a4ecd646..586affc9499515f4101e9d0ddd79e744f5d797c1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ m4_define([V_DESC], [[Description TBD]])
 m4_define([V_STRING], [V_MAJOR.V_MINOR.V_PATCH])
 m4_ifdef([V_EXTRA], [m4_append([V_STRING], [-V_EXTRA])])
 
-AC_PREREQ(2.59)
+AC_PREREQ([2.69])
 AC_INIT([lttng-ust], V_STRING, [mathieu dot desnoyers at efficios dot com], [], [https://lttng.org])
 
 dnl Substitute minor/major/patchlevel version numbers
@@ -33,7 +33,7 @@ AC_DEFINE([CONFIG_LTTNG_UST_LIBRARY_VERSION_MAJOR], [UST_LIB_V_MAJOR], [Major SO
 # liblttng-ust, lttng-sessiond, and lttng-consumerd.
 AC_SUBST([LTTNG_UST_CTL_LIBRARY_VERSION], [4:0:0])
 
-AC_CONFIG_HEADERS([config.h include/lttng/ust-config.h])
+AC_CONFIG_HEADERS([include/config.h include/lttng/ust-config.h])
 AC_CONFIG_AUX_DIR([config])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR([include/lttng/tracepoint.h])
@@ -41,7 +41,7 @@ AC_CONFIG_SRCDIR([include/lttng/tracepoint.h])
 AC_CANONICAL_TARGET
 AC_CANONICAL_HOST
 
-AM_INIT_AUTOMAKE([1.12 foreign dist-bzip2 no-dist-gzip tar-ustar])
+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)
@@ -242,7 +242,6 @@ AC_CHECK_LIB([$libdl_name], [dlmopen],
 AC_CHECK_HEADER([dlfcn.h])
 AS_IF([test "x${ac_cv_header_dlfcn_h}" = "xyes"], [
        AC_CHECK_DECLS([RTLD_DI_LINKMAP], [], [], [
-               #define _GNU_SOURCE /* Required on Linux to get GNU extensions */
                #include <dlfcn.h>
        ])
 ], [
@@ -524,6 +523,13 @@ _AC_DEFINE_AND_SUBST([LTTNG_UST_DEFAULT_CONSTRUCTOR_TIMEOUT_MS], [3000])
 
 AM_CFLAGS="-Wall $PTHREAD_CFLAGS"
 AC_SUBST(AM_CFLAGS)
+
+# 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.
+AM_CPPFLAGS="-I\$(top_builddir)/include -I\$(top_srcdir)/include -include config.h"
+AC_SUBST(AM_CPPFLAGS)
+
 AC_SUBST(JNI_CPPFLAGS)
 
 AC_CONFIG_FILES([
@@ -568,6 +574,7 @@ AC_CONFIG_FILES([
        tests/snprintf/Makefile
        tests/ust-elf/Makefile
        tests/benchmark/Makefile
+       tests/pthread_name/Makefile
        tests/utils/Makefile
        tests/test-app-ctx/Makefile
        tests/gcc-weak-hidden/Makefile