[PATCH 2/3] Revert "configure: add test for gpgconf --create-socketdir"

David Bremner david at tethera.net
Mon Feb 27 16:26:49 PST 2017


This reverts commit 12f7d4e61d30fb9a5c99e128ab1aab0bf069cdb4.

Since we're not using gpgconf anymore, drop the unneeded test in
configure.
---
 configure | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/configure b/configure
index 46063b5d..f1773044 100755
--- a/configure
+++ b/configure
@@ -602,19 +602,6 @@ 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
-
 libdir_in_ldconfig=0
 
 printf "Checking which platform we are on... "
@@ -1192,9 +1179,6 @@ 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.
-- 
2.11.0



More information about the notmuch mailing list