]> git.lttng.org Git - lttng-ust.git/commitdiff
Fix: configure: support Autoconf 2.70
authorJérémie Galarneau <jeremie.galarneau@efficios.com>
Mon, 11 Jan 2021 17:09:05 +0000 (12:09 -0500)
committerMathieu Desnoyers <mathieu.desnoyers@efficios.com>
Wed, 13 Jan 2021 15:13:34 +0000 (10:13 -0500)
The newly-released autoconf 2.70 introduces a number of breaking
changes [1] and is being rolled-out by some distros.

Amongst those changes, the AC_PROG_CC_STDC macro is marked as obsolete
and was merged into AC_PROG_CC, which we already use. On 2.70, this
results in a warning which we handle as an error.

A version check is added to invoke the AC_PROG_CC_STDC macro only when
running a pre-2.70 version of autoconf, fixing the issue.

[1] https://lwn.net/Articles/839395/

[ Backport by Mathieu Desnoyers: removed ax_pthread.m4 bits which are
  not present in stable-2.12 and prior. ]

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Change-Id: I2f4eac788638924aa4960b54374d09de73957925

configure.ac

index 2c827d60932675072459920d2e12b2c0a9bd6024..25040598b569e15e55c61935cb65b2e039f44329 100644 (file)
@@ -53,7 +53,8 @@ AC_REQUIRE_AUX_FILE([tap-driver.sh])
 AC_USE_SYSTEM_EXTENSIONS
 AC_SYS_LARGEFILE
 AC_PROG_CC
-AC_PROG_CC_STDC
+# AC_PROG_CC_STDC was merged in AC_PROG_CC in autoconf 2.70
+m4_version_prereq([2.70], [], [AC_PROG_CC_STDC])
 AC_PROG_CXX
 rw_PROG_CXX_WORKS
 AM_CONDITIONAL([CXX_WORKS], [test "x$rw_cv_prog_cxx_works" = "xyes"])
This page took 0.028894 seconds and 4 git commands to generate.