diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-09-25 17:23:15 +0100 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2020-09-29 17:55:39 +0200 |
| commit | 1615aeaf1ff2581aa4a595433f72e5c79d3171aa (patch) | |
| tree | ed4fb27f0c60a0b4ba137186a673de17e3857e4a | |
| parent | 5752d6cab9172a371cb3bcc3cf45a4f90ef8df76 (diff) | |
| download | focaccia-qemu-1615aeaf1ff2581aa4a595433f72e5c79d3171aa.tar.gz focaccia-qemu-1615aeaf1ff2581aa4a595433f72e5c79d3171aa.zip | |
configure: Drop texinfo requirement
We don't need the texinfo and pod2man programs to build our documentation any more, so remove them from configure's tests. Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Message-Id: <20200925162316.21205-21-peter.maydell@linaro.org> Reviewed-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Markus Armbruster <armbru@redhat.com>
| -rwxr-xr-x | configure | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/configure b/configure index 8ee15810c8..ecc8e90e8b 100755 --- a/configure +++ b/configure @@ -4874,14 +4874,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 @@ -6301,13 +6301,6 @@ if test "$solaris" = "no" && test "$tsan" = "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 @@ -7456,7 +7449,6 @@ echo "HOST_DSOSUF=$HOST_DSOSUF" >> $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 fi |