From: David Bremner <david@tethera.net>
Date: Tue, 21 Feb 2017 12:16:07 +0000 (-0400)
Subject: Merge branch 'release'
X-Git-Tag: 0.24_rc0~38
X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=commitdiff_plain;h=9951598d11f9e883374d295f886009cdb64d8f63

Merge branch 'release'

Merge changes to use gpgconf --create-socketdir
---

9951598d11f9e883374d295f886009cdb64d8f63
diff --cc configure
index fa77eb8f,46063b5d..d0d8f18a
--- a/configure
+++ b/configure
@@@ -612,16 -602,19 +612,29 @@@ if [ $WITH_DOCS = "1" ] ; the
      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
 +	printf "Yes.\n"
 +    else
 +	printf "No (so will not install .desktop file).\n"
 +	WITH_DESKTOP=0
 +    fi
 +fi
 +
  libdir_in_ldconfig=0
  
  printf "Checking which platform we are on... "