Commit 461a3c73 authored by George Kadianakis's avatar George Kadianakis
Browse files

Merge branch 'maint-0.4.5' into maint-0.4.6

parents e6d9dd91 925ec0e0

changes/autoconf-2.70

0 → 100644
+3 −0
Original line number Diff line number Diff line 
  o Minor features (compilation):

    - Make the autoconf script build correctly with autoconf versions 2.70

      and later. Closes part of ticket 40335.

configure.ac

+5 −1
Original line number Diff line number Diff line
@@ -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], [ \