Merge tag '0.23.6'

[notmuch] / configure

diff --git a/configure b/configure
index 47130203d27be13c69b6d5a5af0fae0924741b41..d0d8f18acef8a3d2f5cfbbf2c70361b0410e0af0 100755 (executable)
--- a/configure
+++ b/configure
@@ -612,6 +612,19 @@ if [ $WITH_DOCS = "1" ] ; then
     fi
 fi
 
+have_gpgconf_socketdir=0
+printf "Checking for gpgconf --{create,remove}-socketdir... "
+if gpgconf --dump-options > /dev/null ; then
+    if gpgconf --dump-options | grep -q create-socketdir ; then
+       printf "Yes.\n"
+       have_gpgconf_socketdir=1
+    else
+       printf "No.\n"
+    fi
+else
+    printf "No. (missing or broken gpgconf?)\n"
+fi
+
 if [ $WITH_DESKTOP = "1" ]; then
     printf "Checking if desktop-file-install is available... "
     if command -v desktop-file-install > /dev/null; then
@@ -680,8 +693,6 @@ else
 EOF
 fi
 
-rm -f _byteorder _byteorder.c
-
 if [ $errors -gt 0 ]; then
     cat <<EOF
 
@@ -1188,6 +1199,9 @@ NOTMUCH_PYTHON=${python}
 # Are the ruby development files (and ruby) available? If not skip
 # building/testing ruby bindings.
 NOTMUCH_HAVE_RUBY_DEV=${have_ruby_dev}
+
+# Recent enough gnupg to support gpgconf --create-socketdir?
+NOTMUCH_HAVE_GPGCONF_SOCKETDIR=${have_gpgconf_socketdir}
 EOF
 
 # Finally, after everything configured, inform the user how to continue.