Merge branch 'release'

diff --combined configure
index 554e10c9ad599f20763484d9a163465be00f8dc6,6e73b22ef68d044f63074bbd7b9a1775a23e12af..1e7b9f7a47e1a2efc40e6dc1d8f513bb0a73a672
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -529,7 -529,7 +529,7 @@@ int main () 
      return 0;
  }
  EOF
-     if ! TEMP_GPG=$(mktemp -d); then
+     if ! TEMP_GPG=$(mktemp -d "${TMPDIR:-/tmp}/notmuch.XXXXXX"); then
          printf 'No.\nCould not make tempdir for testing session-key support.\n'
          errors=$((errors + 1))
      elif ${CC} ${CFLAGS} ${gmime_cflags} _check_session_keys.c ${gmime_ldflags} -o _check_session_keys \
@@@ -677,14 -677,13 +677,14 @@@ if [ -z "${EMACSETCDIR-}" ]; the
      EMACSETCDIR="\$(prefix)/share/emacs/site-lisp"
  fi
  
 -printf "Checking if emacs (>= 24) is available... "
 -if emacs --quick --batch --eval '(if (< emacs-major-version 24) (kill-emacs 1))' > /dev/null 2>&1; then
 -    printf "Yes.\n"
 -    have_emacs=1
 -else
 -    printf "No (so will not byte-compile emacs code)\n"
 -    have_emacs=0
 +if [ $WITH_EMACS = "1" ]; then
 +    printf "Checking if emacs (>= 24) is available... "
 +    if emacs --quick --batch --eval '(if (< emacs-major-version 24) (kill-emacs 1))' > /dev/null 2>&1; then
 +        printf "Yes.\n"
 +    else
 +        printf "No (disabling emacs related parts of build)\n"
 +        WITH_EMACS=0
 +    fi
  fi
  
  have_doxygen=0
@@@ -1166,6 -1165,9 +1166,6 @@@ BASH_ABSOLUTE = ${bash_absolute
  HAVE_PERL = ${have_perl}
  PERL_ABSOLUTE = ${perl_absolute}
  
 -# Whether there's an emacs binary available for byte-compiling
 -HAVE_EMACS = ${have_emacs}
 -
  # Whether there's a sphinx-build binary available for building documentation
  HAVE_SPHINX=${have_sphinx}