X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=configure;h=05ade05b5adaa9cfaa9023afec5e4c8e2da50de5;hp=f4b3c61afb95521a22acec5eb410edaa03e2ba67;hb=963e363a234f1c8bdf1ae68956f80a2538bee7dc;hpb=411229f26b8e71b78411b0e9dae1cd27a00f15b8

diff --git a/configure b/configure
index f4b3c61a..05ade05b 100755
--- a/configure
+++ b/configure
@@ -711,14 +711,12 @@ if [ $have_python -eq 0 ]; then
     errors=$((errors + 1))
 fi
 
-have_python3_dev=0
+have_python3=0
 if [ $have_python -eq 1 ]; then
-    printf "Checking for python3 dev (>= 3.5)..."
-    if "$python" -c 'import os, sys, sysconfig;
-assert sys.version_info >= (3,5)
-assert os.path.isfile(sysconfig.get_config_h_filename())' >/dev/null 2>&1; then
+    printf "Checking for python3 (>= 3.5)..."
+    if "$python" -c 'import sys, sysconfig; assert sys.version_info >= (3,5)'; >/dev/null 2>&1; then
         printf "Yes.\n"
-        have_python3_dev=1
+        have_python3=1
     else
         printf "No (will not install CFFI-based python bindings).\n"
     fi
@@ -726,14 +724,15 @@ fi
 
 have_python3_cffi=0
 have_python3_pytest=0
-if [ $have_python3_dev -eq 1 ]; then
+if [ $have_python3 -eq 1 ]; then
     printf "Checking for python3 cffi and setuptools... "
-    if "$python" -c 'import cffi; import setuptools' >/dev/null 2>&1; then
+    if "$python" -c 'import cffi,setuptools; cffi.FFI().verify()' >/dev/null 2>&1; then
         printf "Yes.\n"
         have_python3_cffi=1
     else
         printf "No (will not install CFFI-based python bindings).\n"
     fi
+    rm -rf __pycache__  # cffi.FFI().verify() uses this space
 
     printf "Checking for python3 pytest (>= 3.0)... "
     conf=$(mktemp)