aboutsummaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorGeorge Kadianakis <desnacked@riseup.net>2021-04-19 17:33:46 +0300
committerGeorge Kadianakis <desnacked@riseup.net>2021-04-19 17:33:46 +0300
commit874d2c8601146a0982bb16a8e6307da9a874b640 (patch)
tree8624060e0d3c4ee8a3445e5835d48613f9aa65d4 /configure.ac
parente7c407d927c80a947b11754860c89de8ef553171 (diff)
parent461a3c732b70fb8525dfa660dcab1605f11d7517 (diff)
downloadtor-874d2c8601146a0982bb16a8e6307da9a874b640.tar.gz
tor-874d2c8601146a0982bb16a8e6307da9a874b640.zip
Merge branch 'maint-0.4.6'
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac6
1 files changed, 5 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index 563d5afaf6..912c2f2dfe 100644
--- 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], [ \