[master] e2b456919 Look for rst2html same way we look for rst2man and make it non-optional

[Dridi Boukelmoune]

On Tue, Apr 9, 2019 at 11:12 AM Poul-Henning Kamp <phk at freebsd.org> wrote:
>
>
> commit e2b456919d42b015c44358358e738ead18fd96c3
> Author: Poul-Henning Kamp <phk at FreeBSD.org>
> Date:   Tue Apr 9 09:11:33 2019 +0000
>
>     Look for rst2html same way we look for rst2man and make it non-optional

The whole point of `make dist` is that downstream users of a dist
archive don't need autoconf, automake, libtool or any of the things
that we build at dist-time.

Making rst2* and sphinx-build truly optional would solve the polishing
needed on the packaging side: we wouldn't even need them as build
dependencies anymore.

Can I revert this and send a patch to fix our documentation build instead?

Dridi

> diff --git a/configure.ac b/configure.ac
> index 78e47a8e4..fe4225069 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -60,14 +60,16 @@ if test "x$SPHINX" = "xno"; then
>  fi
>
>  AC_ARG_WITH([rst2html],
> -               AS_HELP_STRING([--with-rst2html=PATH],
> -                              [Location of rst2html (auto)]),
> -               [RST2HTML="$withval"],
> -               [AC_CHECK_PROGS(RST2HTML, [rst2html rst2html.py], "no")
> -               if test "x$RST2HTML" = "xno"; then
> -                  AC_MSG_WARN([rst2html not found - not building changelog])
> -               fi])
> -AM_CONDITIONAL(HAVE_RST2HTML,[test "x$RST2HTML" != "xno"])
> +  AS_HELP_STRING([--with-rst2html=PATH], [Location of rst2html (auto)]),
> +  [RST2HTML="$withval"],
> +  AC_CHECK_PROGS(RST2HTML,
> +     [rst2html rst2html.py rst2html-3.6 rst2html-3],
> +     "no"))
> +
> +if test "x$RST2HTML" = "xno"; then
> +   AC_MSG_ERROR(
> +     [rst2html not found - (Weird, we found rst2man?!)])
> +fi
>
>  AC_ARG_WITH([dot],
>    AS_HELP_STRING([--with-dot=PATH],
> diff --git a/doc/Makefile.am b/doc/Makefile.am
> index e420a99f1..f9f19ea27 100644
> --- a/doc/Makefile.am
> +++ b/doc/Makefile.am
> @@ -5,14 +5,7 @@ RST2ANY_FLAGS = --halt=2
>  EXTRA_DIST = changes.rst changes.html
>
>  changes.html: changes.rst
> -if HAVE_RST2HTML
>         ${RST2HTML} ${RST2ANY_FLAGS} $? $@
> -else
> -       @echo "========================================"
> -       @echo "You need rst2html installed to make dist"
> -       @echo "========================================"
> -       @false
> -endif
>
>  # build graphviz before sphinx, so sphinx docs can use svg output
>  SUBDIRS = graphviz sphinx
> _______________________________________________
> varnish-commit mailing list
> varnish-commit at varnish-cache.org
> https://www.varnish-cache.org/lists/mailman/listinfo/varnish-commit