X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=configure;h=4af7ba94f7bd344cba6fb9e355e10ae5034717a4;hp=137aceab42b9b1d10465d83776e5335caec9a640;hb=91ef2ae52421c3e20a903109bfca3d87d7c2e61d;hpb=bd96b4c4ba7eb87a18e73c2808834431e4590f34

diff --git a/configure b/configure
index 137aceab..4af7ba94 100755
--- a/configure
+++ b/configure
@@ -378,7 +378,7 @@ printf "Checking for python... "
 have_python=0
 
 for name in python python2 python3; do
-    if command -v $name > /dev/null 2>&1; then
+    if command -v $name > /dev/null; then
 	have_python=1
 	python=$name
 	printf "Yes ($name).\n"
@@ -435,7 +435,7 @@ else
 fi
 
 printf "Checking if doxygen is available... "
-if command -v doxygen > /dev/null 2>&1; then
+if command -v doxygen > /dev/null; then
     printf "Yes.\n"
     have_doxygen=1
 else
@@ -444,22 +444,12 @@ else
 fi
 
 printf "Checking if sphinx is available and supports nroff output... "
-if hash sphinx-build > /dev/null 2>&1 && ${python} -m sphinx.writers.manpage > /dev/null 2>&1 ; then
+if command -v sphinx-build > /dev/null && ${python} -m sphinx.writers.manpage > /dev/null 2>&1 ; then
     printf "Yes.\n"
     have_sphinx=1
-    have_rst2man=0
 else
-    printf "No (falling back to rst2man).\n"
+    printf "No (so will not install man pages).\n"
     have_sphinx=0
-
-    printf "Checking if rst2man is available... "
-    if rst2man -V > /dev/null 2>&1; then
-       printf "Yes.\n"
-       have_rst2man=1
-    else
-       printf "No (so will not install man pages).\n"
-       have_rst2man=0
-    fi
 fi
 
 libdir_in_ldconfig=0
@@ -848,9 +838,6 @@ HAVE_EMACS = ${have_emacs}
 # Whether there's a sphinx-build binary available for building documentation
 HAVE_SPHINX=${have_sphinx}
 
-# Whether there's a rst2man binary available for building documentation
-HAVE_RST2MAN=${have_rst2man}
-
 # Whether there's a doxygen binary available for building api documentation
 HAVE_DOXYGEN=${have_doxygen}
 
@@ -978,9 +965,8 @@ cat > sh.config <<EOF
 # Whether the Xapian version in use supports compaction
 NOTMUCH_HAVE_XAPIAN_COMPACT=${have_xapian_compact}
 
-# Whether there's either sphinx or rst2man available for building
-# documentation
-NOTMUCH_HAVE_MAN=$((have_sphinx || have_rst2man))
+# do we have man pages?
+NOTMUCH_HAVE_MAN=$((have_sphinx))
 
 # Name of python interpreter
 NOTMUCH_PYTHON=${python}