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

Merge branch 'release'

Second gnugpg test suite fix
---

508b5c20fa38b17fa527af075857061f4ed81e2a
diff --cc configure
index d0d8f18a,f1773044..fa77eb8f
--- a/configure
+++ b/configure
@@@ -612,29 -602,6 +612,16 @@@ 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... "