Skip to content

V
varnish-cache
Commit 7ec2391c authored by Simon Stridsberg's avatar Simon Stridsberg Committed by Martin Blix Grydeland
Browse files
Options

Fix autoconf error in version 2.70 

Fixes #3491
parent 9c4d8a47
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 6 deletions
configure.ac
View file @ 7ec2391c
...@@ -40,9 +40,9 @@ AC_PROG_INSTALL ...@@ -40,9 +40,9 @@ AC_PROG_INSTALL
AC_ARG_WITH([rst2man], AC_ARG_WITH([rst2man],
AS_HELP_STRING([--with-rst2man=PATH], [Location of rst2man (auto)]), AS_HELP_STRING([--with-rst2man=PATH], [Location of rst2man (auto)]),
[RST2MAN="$withval"], [RST2MAN="$withval"],
AC_CHECK_PROGS(RST2MAN, [AC_CHECK_PROGS(RST2MAN,
[rst2man-3.6 rst2man-3 rst2man rst2man.py], [rst2man-3.6 rst2man-3 rst2man rst2man.py],
[no])) [no])])
if test "x$RST2MAN" = "xno"; then if test "x$RST2MAN" = "xno"; then
AC_MSG_ERROR( AC_MSG_ERROR(
[rst2man is needed to build Varnish, please install python3-docutils.]) [rst2man is needed to build Varnish, please install python3-docutils.])
...@@ -51,9 +51,9 @@ fi ...@@ -51,9 +51,9 @@ fi
AC_ARG_WITH([sphinx-build], AC_ARG_WITH([sphinx-build],
AS_HELP_STRING([--with-sphinx-build=PATH], [Location of sphinx-build (auto)]), AS_HELP_STRING([--with-sphinx-build=PATH], [Location of sphinx-build (auto)]),
[SPHINX="$withval"], [SPHINX="$withval"],
AC_CHECK_PROGS(SPHINX, [AC_CHECK_PROGS(SPHINX,
[sphinx-build-3.6 sphinx-build-3 sphinx-build], [sphinx-build-3.6 sphinx-build-3 sphinx-build],
[no])) [no])])
if test "x$SPHINX" = "xno"; then if test "x$SPHINX" = "xno"; then
AC_MSG_ERROR( AC_MSG_ERROR(
[sphinx-build is needed to build Varnish, please install python3-sphinx.]) [sphinx-build is needed to build Varnish, please install python3-sphinx.])
...@@ -62,10 +62,11 @@ fi ...@@ -62,10 +62,11 @@ fi
AC_ARG_WITH([rst2html], AC_ARG_WITH([rst2html],
AS_HELP_STRING([--with-rst2html=PATH], [Location of rst2html (auto)]), AS_HELP_STRING([--with-rst2html=PATH], [Location of rst2html (auto)]),
[RST2HTML="$withval"], [RST2HTML="$withval"],
AC_CHECK_PROGS(RST2HTML, [AC_CHECK_PROGS(RST2HTML,
[rst2html-3.6 rst2html-3 rst2html rst2html.py], [rst2html-3.6 rst2html-3 rst2html rst2html.py],
"no")) "no")])
AM_CONDITIONAL(HAVE_RST2HTML,[test "x$RST2HTML" != "xno"]) AM_CONDITIONAL(HAVE_RST2HTML,[test "x$RST2HTML" != "xno"])
if test "x$RST2HTML" = "xno"; then if test "x$RST2HTML" = "xno"; then
AC_MSG_ERROR( AC_MSG_ERROR(
[rst2html not found - (Weird, we found rst2man?!)]) [rst2html not found - (Weird, we found rst2man?!)])
......
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