X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=configure;h=ab73317a4b57c79de9f9d48abc49ffa5ca10f035;hb=68c2c5d31ccbfd43052e4e5e9abcfe285fc205c8;hp=2eaed4a1697301303d440162331bb17787b9e5a5;hpb=28d7544ae2adfe6467c6b64a3284f5ed13f81e1a;p=notmuch diff --git a/configure b/configure index 2eaed4a1..ab73317a 100755 --- a/configure +++ b/configure @@ -19,11 +19,14 @@ readonly DEFAULT_IFS="$IFS" srcdir=$(dirname "$0") +subdirs="util compat lib parse-time-string completion doc emacs" +subdirs="${subdirs} performance-test test test/test-databases" + # For a non-srcdir configure invocation (such as ../configure), create # the directory structure and copy Makefiles. if [ "$srcdir" != "." ]; then - for dir in . $(grep "^subdirs *=" "$srcdir"/Makefile | sed -e "s/subdirs *= *//"); do + for dir in . ${subdirs}; do mkdir -p "$dir" cp "$srcdir"/"$dir"/Makefile.local "$dir" cp "$srcdir"/"$dir"/Makefile "$dir" @@ -393,6 +396,25 @@ else have_emacs=0 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 + printf "Yes.\n" + have_sphinx=1 + have_rst2man=0 +else + printf "No (falling back to rst2man).\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 printf "Checking which platform we are on... " @@ -679,6 +701,9 @@ cat > Makefile.config <