[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 17/18] configure: Drop texinfo requirement
From: |
Peter Maydell |
Subject: |
[PATCH v4 17/18] configure: Drop texinfo requirement |
Date: |
Mon, 9 Mar 2020 15:44:04 +0000 |
We don't need the texinfo and pod2man programs to build our documentation
any more, so remove them from configure's tests.
Signed-off-by: Peter Maydell <address@hidden>
---
configure | 12 ++----------
1 file changed, 2 insertions(+), 10 deletions(-)
diff --git a/configure b/configure
index fab6281eb70..3b642136211 100755
--- a/configure
+++ b/configure
@@ -4888,14 +4888,14 @@ if test "$docs" != "no" ; then
else
sphinx_ok=no
fi
- if has makeinfo && has pod2man && test "$sphinx_ok" = "yes"; then
+ if test "$sphinx_ok" = "yes"; then
docs=yes
else
if test "$docs" = "yes" ; then
if has $sphinx_build && test "$sphinx_ok" != "yes"; then
echo "Warning: $sphinx_build exists but it is either too old or uses
too old a Python version" >&2
fi
- feature_not_found "docs" "Install texinfo, Perl/perl-podlators and a
Python 3 version of python-sphinx"
+ feature_not_found "docs" "Install a Python 3 version of python-sphinx"
fi
docs=no
fi
@@ -6273,13 +6273,6 @@ if test "$solaris" = "no" ; then
fi
fi
-# test if pod2man has --utf8 option
-if pod2man --help | grep -q utf8; then
- POD2MAN="pod2man --utf8"
-else
- POD2MAN="pod2man"
-fi
-
# Use ASLR, no-SEH and DEP if available
if test "$mingw32" = "yes" ; then
for flag in --dynamicbase --no-seh --nxcompat; do
@@ -7672,7 +7665,6 @@ echo "LDFLAGS_SHARED=$LDFLAGS_SHARED" >> $config_host_mak
echo "LIBS_QGA+=$libs_qga" >> $config_host_mak
echo "TASN1_LIBS=$tasn1_libs" >> $config_host_mak
echo "TASN1_CFLAGS=$tasn1_cflags" >> $config_host_mak
-echo "POD2MAN=$POD2MAN" >> $config_host_mak
if test "$gcov" = "yes" ; then
echo "CONFIG_GCOV=y" >> $config_host_mak
echo "GCOV=$gcov_tool" >> $config_host_mak
--
2.20.1
- [PATCH v4 12/18] scripts/qapi: Remove texinfo generation support, (continued)
- [PATCH v4 12/18] scripts/qapi: Remove texinfo generation support, Peter Maydell, 2020/03/09
- [PATCH v4 11/18] qga/qapi-schema.json: Add some headings, Peter Maydell, 2020/03/09
- [PATCH v4 14/18] Makefile: Remove redundant Texinfo related rules, Peter Maydell, 2020/03/09
- [PATCH v4 15/18] scripts/texi2pod: Delete unused script, Peter Maydell, 2020/03/09
- [PATCH v4 16/18] Remove Texinfo related files from .gitignore and git.orderfile, Peter Maydell, 2020/03/09
- [PATCH v4 17/18] configure: Drop texinfo requirement,
Peter Maydell <=
- [PATCH v4 18/18] Remove texinfo dependency from docker and CI configs, Peter Maydell, 2020/03/09
- Re: [PATCH v4 00/18] Convert QAPI doc comments to generate rST instead of texinfo, Markus Armbruster, 2020/03/11