X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=configure;h=fad2655c39ad4d2b6fbb0c85042f70059b15d418;hb=2044c7aad9cbe2e87c773169a622e549b588d208;hp=b467643c6ce4cd07365e3986de545b875567e97b;hpb=3aaa8cfe941bd59730ae04df46da6aa3181f85e5;p=notmuch

diff --git a/configure b/configure
index b467643c..fad2655c 100755
--- a/configure
+++ b/configure
@@ -168,7 +168,7 @@ Fine tuning of some installation directories is available:
 	--emacslispdir=DIR	Emacs code [PREFIX/share/emacs/site-lisp]
 	--emacsetcdir=DIR	Emacs miscellaneous files [PREFIX/share/emacs/site-lisp]
 	--bashcompletiondir=DIR Bash completions files [PREFIX/share/bash-completion/completions]
-	--zshcompletiondir=DIR	Zsh completions files [PREFIX/share/zsh/functions/Completion/Unix]
+	--zshcompletiondir=DIR	Zsh completions files [PREFIX/share/zsh/site-functions]
 
 Some features can be disabled (--with-feature=no is equivalent to
 --without-feature) :
@@ -671,13 +671,38 @@ if [ $have_python -eq 0 ]; then
     errors=$((errors + 1))
 fi
 
-printf "Checking for python3 cffi... "
-if "$python" -c 'import sys,cffi; assert sys.version_info >= (3,0)' >/dev/null 2>&1; then
-    printf "Yes.\n"
-    have_python3_cffi=1
-else
-    printf "No.\n"
-    have_python3_cffi=0
+have_python3=0
+if [ $have_python -eq 1 ]; then
+    printf "Checking for python3..."
+    if "$python" -c 'import sys; assert sys.version_info >= (3,0)' > /dev/null 2>&1; then
+        printf "Yes.\n"
+        have_python3=1
+    else
+        printf "No.\n"
+    fi
+fi
+
+have_python3_cffi=0
+have_python3_pytest=0
+if [ $have_python3 -eq 1 ]; then
+    printf "Checking for python3 cffi... "
+    if "$python" -c 'import cffi' >/dev/null 2>&1; then
+        printf "Yes.\n"
+        have_python3_cffi=1
+    else
+        printf "No.\n"
+    fi
+
+    printf "Checking for python3 pytest (>= 3.0)... "
+    conf=$(mktemp)
+    printf "[pytest]\nminversion=3.0\n" > $conf
+    if pytest-3 -c $conf --version >/dev/null 2>&1; then
+        printf "Yes.\n"
+        have_python3_pytest=1
+    else
+        printf "No.\n"
+    fi
+    rm -f $conf
 fi
 
 printf "Checking for valgrind development files... "
@@ -1215,7 +1240,7 @@ desktop_dir = \$(prefix)/share/applications
 bash_completion_dir = ${BASHCOMPLETIONDIR:=\$(prefix)/share/bash-completion/completions}
 
 # The directory to which zsh completions files should be installed
-zsh_completion_dir = ${ZSHCOMLETIONDIR:=\$(prefix)/share/zsh/functions/Completion/Unix}
+zsh_completion_dir = ${ZSHCOMLETIONDIR:=\$(prefix)/share/zsh/site-functions}
 
 # Whether the canonicalize_file_name function is available (if not, then notmuch will
 # build its own version)