Skip to content

GitLab

Commit 2fc077e6 authored by George Kadianakis's avatar George Kadianakis
Browse files

Merge branch 'maint-0.4.5' into release-0.4.5

parents eddb3e26 925ec0e0
Pipeline #5131 passed with stage
in 19 minutes and 37 seconds
Show whitespace changes
Inline Side-by-side
changes/autoconf-2.70 0 → 100644
View file @ 2fc077e6
o Minor features (compilation):
- Make the autoconf script build correctly with autoconf versions 2.70
and later. Closes part of ticket 40335.
configure.ac
View file @ 2fc077e6
...@@ -441,7 +441,11 @@ AM_CONDITIONAL(BUILD_MANPAGE, [test "x$enable_manpage" != "xno"]) ...@@ -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_CONDITIONAL(BUILD_HTML_DOCS, [test "x$enable_html_manual" != "xno"])
AM_PROG_CC_C_O 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_CACHE_CHECK([for Python 3], [tor_cv_PYTHON],
[AC_PATH_PROGS_FEATURE_CHECK([PYTHON], [ \ [AC_PATH_PROGS_FEATURE_CHECK([PYTHON], [ \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment