tor

commit 461a3c732b70fb8525dfa660dcab1605f11d7517
parent e6d9dd91577890dca0380e70ae65d3afe1f7dacb
Author: George Kadianakis <desnacked@riseup.net>
Date:   Mon, 19 Apr 2021 17:33:46 +0300

Merge branch 'maint-0.4.5' into maint-0.4.6

Diffstat:
A
changes/autoconf-2.70
 | 
3
+++
M
configure.ac
 | 
6
+++++-

2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/changes/autoconf-2.70 b/changes/autoconf-2.70
@@ -0,0 +1,3 @@
+  o Minor features (compilation):
+    - Make the autoconf script build correctly with autoconf versions 2.70
+      and later. Closes part of ticket 40335.
diff --git a/configure.ac b/configure.ac
@@ -454,7 +454,11 @@ AM_CONDITIONAL(BUILD_MANPAGE, [test "x$enable_manpage" != "xno"])
 AM_CONDITIONAL(BUILD_HTML_DOCS, [test "x$enable_html_manual" != "xno"])
 
 AM_PROG_CC_C_O
-AC_PROG_CC_C99
+
+dnl Before autoconf 2.70, AC_PROG_CC_C99 is supposedly necessary for some
+dnl compilers if you wan't C99 support. Starting with 2.70, it is obsolete and
+dnl forbidden.
+m4_version_prereq([2.70], [:], [AC_PROG_CC_C99])
 
 AC_CACHE_CHECK([for Python 3], [tor_cv_PYTHON],
    [AC_PATH_PROGS_FEATURE_CHECK([PYTHON], [ \