summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorGeorge Kadianakis <desnacked@riseup.net>2021-04-19 17:33:45 +0300
committerGeorge Kadianakis <desnacked@riseup.net>2021-04-19 17:33:45 +0300
commit2fc077e6766d66b6b4954c2d9a95a663f484da21 (patch)
tree854572cba785f357beb5064783fa4d9ecab5254e /configure.ac
parenteddb3e262e3dd69c93082d1b7db872bff47fad87 (diff)
parent925ec0e0ea03357537f22f5e5c774d2c5aa02ecf (diff)
downloadtor-2fc077e6766d66b6b4954c2d9a95a663f484da21.tar.gz
tor-2fc077e6766d66b6b4954c2d9a95a663f484da21.zip
Merge branch 'maint-0.4.5' into release-0.4.5
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 dfd7a495bb..a85d530bed 100644
--- a/configure.ac
+++ b/configure.ac
@@ -441,7 +441,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], [ \