diff options
| author | George Kadianakis <desnacked@riseup.net> | 2021-04-19 17:32:56 +0300 |
|---|---|---|
| committer | George Kadianakis <desnacked@riseup.net> | 2021-04-19 17:32:56 +0300 |
| commit | 925ec0e0ea03357537f22f5e5c774d2c5aa02ecf (patch) | |
| tree | 94cdaadb88ba15146c292b81656b5cb90084dc7c | |
| parent | 30fa80c0fc1a1996d72b4fb3dead58cf877395f9 (diff) | |
| parent | 02816d60591a6b3887f47df81fb99cb72d5ad2db (diff) | |
| download | tor-925ec0e0ea03357537f22f5e5c774d2c5aa02ecf.tar.gz tor-925ec0e0ea03357537f22f5e5c774d2c5aa02ecf.zip | |
Merge remote-tracking branch 'tor-gitlab/mr/355' into maint-0.4.5
| -rw-r--r-- | changes/autoconf-2.70 | 3 | ||||
| -rw-r--r-- | configure.ac | 6 |
2 files changed, 8 insertions, 1 deletions
diff --git a/changes/autoconf-2.70 b/changes/autoconf-2.70 new file mode 100644 index 0000000000..27a9f243b1 --- /dev/null +++ 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 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], [ \ |