X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=configure;h=e4c738e527ec2b5f4bca68f16469a41d379717ae;hb=16d073ebe8fe062bb733165bdb10d7d2937616b5;hp=37368bdacbd8535a0990125b7a9b557f2afb94e7;hpb=b14d9ae204dedab0b63ab54fc6d59ffe7090ba88;p=notmuch

diff --git a/configure b/configure
index 37368bda..e4c738e5 100755
--- a/configure
+++ b/configure
@@ -70,6 +70,14 @@ if [ "$srcdir" != "." ]; then
     mkdir bindings/ruby
     cp -a "$srcdir"/bindings/ruby/*.[ch] bindings/ruby
     cp -a "$srcdir"/bindings/ruby/extconf.rb bindings/ruby
+
+    # Use the same hack to replicate python-cffi source for
+    # out-of-tree builds (again, not ideal).
+    mkdir bindings/python-cffi
+    cp -a "$srcdir"/bindings/python-cffi/tests \
+       "$srcdir"/bindings/python-cffi/notmuch2 \
+       "$srcdir"/bindings/python-cffi/setup.py \
+       bindings/python-cffi/
 fi
 
 # Set several defaults (optionally specified by the user in
@@ -468,7 +476,7 @@ fi
 
 GMIME_MINVER=3.0.3
 
-printf "Checking for GMime development files... "
+printf "Checking for GMime development files (>= $GMIME_MINVER)... "
 if pkg-config --exists "gmime-3.0 >= $GMIME_MINVER"; then
     printf "Yes.\n"
     have_gmime=1
@@ -703,12 +711,14 @@ if [ $have_python -eq 0 ]; then
     errors=$((errors + 1))
 fi
 
-have_python3=0
+have_python3_dev=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 "Checking for python3 dev..."
+    if "$python" -c 'import os, sys, sysconfig;
+assert sys.version_info >= (3,0)
+assert os.path.isfile(sysconfig.get_config_h_filename())' >/dev/null 2>&1; then
         printf "Yes.\n"
-        have_python3=1
+        have_python3_dev=1
     else
         printf "No.\n"
     fi
@@ -716,9 +726,9 @@ 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
+if [ $have_python3_dev -eq 1 ]; then
+    printf "Checking for python3 cffi and setuptools... "
+    if "$python" -c 'import cffi; import setuptools' >/dev/null 2>&1; then
         printf "Yes.\n"
         have_python3_cffi=1
     else