diff mbox series

[v4,17/18] configure: Drop texinfo requirement

Message ID 20200309154405.13548-18-peter.maydell@linaro.org
State Superseded
Headers show
Series Convert QAPI doc comments to generate rST instead of texinfo | expand

Commit Message

Peter Maydell March 9, 2020, 3:44 p.m. UTC 
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 <peter.maydell@linaro.org>

---
 configure | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

-- 
2.20.1

Comments

Richard Henderson March 11, 2020, 6:31 a.m. UTC | #1 
On 3/9/20 8:44 AM, Peter Maydell wrote:
> 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 <peter.maydell@linaro.org>

> ---

>  configure | 12 ++----------

>  1 file changed, 2 insertions(+), 10 deletions(-)


Reviewed-by: Richard Henderson <richard.henderson@linaro.org>



r~
diff mbox series

Patch

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