On Fri, 14 Feb 2020 at 17:18, Markus Armbruster <arm...@redhat.com> wrote: > I decided I prefer this as a separate patch, between PATCH 01 and 02. > > Hmm, maybe I should squash the last hunk into PATCH 01. > > > From 10d174a9f811708807fb60a610e88084f282c222 Mon Sep 17 00:00:00 2001 > From: Markus Armbruster <arm...@redhat.com> > Date: Fri, 14 Feb 2020 07:33:43 +0100 > Subject: [PATCH] configure: Pick sphinx-build-3 when available > > The next commit will require a sphinx-build that uses Python 3. On > some systems, sphinx-build is fine, on others you need to use > sphinx-build-3. To keep things working out of the box on both kinds > of systems, try sphinx-build-3, then sphinx-build. > > Signed-off-by: Markus Armbruster <arm...@redhat.com> > --- > configure | 15 +++++++++++++-- > 1 file changed, 13 insertions(+), 2 deletions(-) > > diff --git a/configure b/configure > index 14172909f0..4cbeb06b86 100755 > --- a/configure > +++ b/configure > @@ -584,7 +584,6 @@ query_pkg_config() { > } > pkg_config=query_pkg_config > sdl2_config="${SDL2_CONFIG-${cross_prefix}sdl2-config}" > -sphinx_build=sphinx-build > > # If the user hasn't specified ARFLAGS, default to 'rv', just as make does. > ARFLAGS="${ARFLAGS-rv}" > @@ -903,6 +902,7 @@ fi > > : ${make=${MAKE-make}} > : ${install=${INSTALL-install}} > + > # We prefer python 3.x. A bare 'python' is traditionally > # python 2.x, but some distros have it as python 3.x, so > # we check that too
Stray whitespace change. > @@ -915,6 +915,17 @@ do > break > fi > done > + > +sphinx_build= > +for binary in sphinx-build-3 sphinx-build > +do > + if has "$binary" > + then > + sphinx_build=$(command -v "$binary") > + break > + fi > +done > + > : ${smbd=${SMBD-/usr/sbin/smbd}} > > # Default objcc to clang if available, otherwise use CC > @@ -4803,7 +4814,7 @@ has_sphinx_build() { > # sphinx-build doesn't exist at all or if it is too old. > mkdir -p "$TMPDIR1/sphinx" > touch "$TMPDIR1/sphinx/index.rst" > - $sphinx_build -c "$source_path/docs" -b html "$TMPDIR1/sphinx" > "$TMPDIR1/sphinx/out" >/dev/null 2>&1 > + "$sphinx_build" -c "$source_path/docs" -b html "$TMPDIR1/sphinx" > "$TMPDIR1/sphinx/out" >/dev/null 2>&1 > } > > # Check if tools are available to build documentation. > -- > 2.21.1 Otherwise Reviewed-by: Peter Maydell <peter.mayd...@linaro.org> -- PMM