Imported Upstream version 1.5.4upstream/1.5.4

40 files changed, 6201 insertions, 4401 deletions

diff --git a/ChangeLog b/ChangeLog
index 5a598e0..cd2c5db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,28 @@
+2015-04-13  Werner Koch  <wk@gnupg.org>
+
+	Release 1.5.4.
+
+	w32: Use -static-libgcc to avoid linking to libgcc_s_sjlj-1.dll.
+	* src/Makefile.am (extra_ltoptions): New.
+	(libgpgme_la_LDFLAGS): Use it.
+	(libgpgme_pthread_la_LDFLAGS): Ditto.
+	(libgpgme_glib_la_LDFLAGS): Ditto.
+
+2015-03-16  Werner Koch  <wk@gnupg.org>
+
+	Fix potential crash in trace macro.
+	* src/signers.c (gpgme_signers_add): Avoid deref of a NULL KEY in the
+	trace macro.
+	* src/engine-spawn.c (engspawn_release): Remove always true condition.
+	* src/engine-gpg.c (gpg_release): Ditto.
+
+	Fix one byte too short malloc.
+	* src/engine-spawn.c (add_data): Fix malloc
+
+2015-01-30  Werner Koch  <wk@gnupg.org>
+
+	Switch to automake 1.14 and update  build-aux files.
+
 2014-12-11  Werner Koch  <wk@gnupg.org>
 
 	Release 1.5.3.
diff --git a/Makefile.am b/Makefile.am
index 28f9eca..cb22a91 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,7 +20,6 @@
 ## Process this file with automake to produce Makefile.in
 
 ACLOCAL_AMFLAGS = -I m4
-AUTOMAKE_OPTIONS = dist-bzip2
 
 DISTCHECK_CONFIGURE_FLAGS =
 
diff --git a/Makefile.in b/Makefile.in
index 0681c98..d469e6a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -34,23 +33,51 @@
 # You should have received a copy of the GNU Lesser General Public
 # License along with this program; if not, see <http://www.gnu.org/licenses/>.
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -70,14 +97,21 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = .
-DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
-	$(top_srcdir)/configure AUTHORS COPYING COPYING.LESSER \
-	ChangeLog INSTALL NEWS THANKS TODO build-aux/compile \
+DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \
+	$(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/configure $(am__configure_deps) \
+	$(srcdir)/config.h.in $(top_srcdir)/build-aux/mkinstalldirs \
+	COPYING COPYING.LESSER THANKS TODO build-aux/compile \
 	build-aux/config.guess build-aux/config.sub build-aux/depcomp \
-	build-aux/install-sh build-aux/ltmain.sh build-aux/mdate-sh \
+	build-aux/install-sh build-aux/mdate-sh missing \
 	build-aux/missing build-aux/mkinstalldirs \
-	build-aux/texinfo.tex missing
+	build-aux/texinfo.tex build-aux/ltmain.sh \
+	$(top_srcdir)/build-aux/compile \
+	$(top_srcdir)/build-aux/config.guess \
+	$(top_srcdir)/build-aux/config.sub \
+	$(top_srcdir)/build-aux/install-sh \
+	$(top_srcdir)/build-aux/ltmain.sh \
+	$(top_srcdir)/build-aux/missing
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/glib-2.0.m4 \
 	$(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/gnupg-ttyname.m4 \
@@ -94,21 +128,28 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs
 CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
 AM_V_GEN = $(am__v_GEN_@AM_V@)
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
 AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -116,11 +157,33 @@ am__can_run_installinfo = \
   esac
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
-	distdir dist dist-all distcheck
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
+	cscope distdir dist dist-all distcheck
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
+	$(LISP)config.h.in
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
+CSCOPE = cscope
 DIST_SUBDIRS = src tests doc lang
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
@@ -131,6 +194,7 @@ am__remove_distdir = \
       && rm -rf "$(distdir)" \
       || { sleep 5 && rm -rf "$(distdir)"; }; \
   else :; fi
+am__post_remove_distdir = $(am__remove_distdir)
 am__relativize = \
   dir0=`pwd`; \
   sed_first='s,^\([^/]*\)/.*$$,\1,'; \
@@ -156,8 +220,9 @@ am__relativize = \
     dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
   done; \
   reldir="$$dir2"
-DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
 GZIP_ENV = --best
+DIST_ARCHIVES = $(distdir).tar.bz2
+DIST_TARGETS = dist-bzip2
 distuninstallcheck_listfiles = find . -type f -print
 am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
   | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
@@ -319,7 +384,6 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 ACLOCAL_AMFLAGS = -I m4
-AUTOMAKE_OPTIONS = dist-bzip2
 DISTCHECK_CONFIGURE_FLAGS = 
 EXTRA_DIST = autogen.sh autogen.rc gpgme.spec.in                   	\
              ChangeLog-2011 m4/ChangeLog-2011 contrib/ChangeLog-2011
@@ -368,8 +432,8 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 $(am__aclocal_m4_deps):
 
 config.h: stamp-h1
-	@if test ! -f $@; then rm -f stamp-h1; else :; fi
-	@if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
+	@test -f $@ || rm -f stamp-h1
+	@test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
 
 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
 	@rm -f stamp-h1
@@ -392,22 +456,25 @@ distclean-libtool:
 	-rm -f libtool config.lt
 
 # This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
 	  echo "Making $$target in $$subdir"; \
 	  if test "$$subdir" = "."; then \
 	    dot_seen=yes; \
@@ -422,57 +489,12 @@ $(RECURSIVE_TARGETS):
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-$(RECURSIVE_CLEAN_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
@@ -488,12 +510,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
 	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
-	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -505,15 +522,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -522,9 +535,31 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscope: cscope.files
+	test ! -s cscope.files \
+	  || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS)
+clean-cscope:
+	-rm -f cscope.files
+cscope.files: clean-cscope cscopelist
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+	-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
 
 distdir: $(DISTFILES)
 	$(am__remove_distdir)
@@ -595,40 +630,41 @@ distdir: $(DISTFILES)
 	|| chmod -R a+r "$(distdir)"
 dist-gzip: distdir
 	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 dist-bzip2: distdir
 	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 
 dist-lzip: distdir
 	tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
-	$(am__remove_distdir)
-
-dist-lzma: distdir
-	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 
 dist-xz: distdir
 	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 
 dist-tarZ: distdir
+	@echo WARNING: "Support for shar distribution archives is" \
+	               "deprecated." >&2
+	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 
 dist-shar: distdir
+	@echo WARNING: "Support for distribution archives compressed with" \
+		       "legacy program 'compress' is deprecated." >&2
+	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
 	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 
 dist-zip: distdir
 	-rm -f $(distdir).zip
 	zip -rq $(distdir).zip $(distdir)
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 
-dist dist-all: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
-	$(am__remove_distdir)
+dist dist-all:
+	$(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:'
+	$(am__post_remove_distdir)
 
 # This target untars the dist file and tries a VPATH configuration.  Then
 # it guarantees that the distribution is self-contained by making another
@@ -639,8 +675,6 @@ distcheck: dist
 	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
 	*.tar.bz2*) \
 	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
-	*.tar.lzma*) \
-	  lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
 	*.tar.lz*) \
 	  lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
 	*.tar.xz*) \
@@ -652,18 +686,19 @@ distcheck: dist
 	*.zip*) \
 	  unzip $(distdir).zip ;;\
 	esac
-	chmod -R a-w $(distdir); chmod u+w $(distdir)
-	mkdir $(distdir)/_build
-	mkdir $(distdir)/_inst
+	chmod -R a-w $(distdir)
+	chmod u+w $(distdir)
+	mkdir $(distdir)/_build $(distdir)/_inst
 	chmod a-w $(distdir)
 	test -d $(distdir)/_build || exit 0; \
 	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
 	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
 	  && am__cwd=`pwd` \
 	  && $(am__cd) $(distdir)/_build \
-	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
+	  && ../configure \
 	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
 	    $(DISTCHECK_CONFIGURE_FLAGS) \
+	    --srcdir=.. --prefix="$$dc_install_base" \
 	  && $(MAKE) $(AM_MAKEFLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
 	  && $(MAKE) $(AM_MAKEFLAGS) check \
@@ -686,7 +721,7 @@ distcheck: dist
 	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
 	  && cd "$$am__cwd" \
 	  || exit 1
-	$(am__remove_distdir)
+	$(am__post_remove_distdir)
 	@(echo "$(distdir) archives ready for distribution: "; \
 	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
 	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
@@ -821,25 +856,24 @@ ps-am:
 
 uninstall-am:
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \
-	ctags-recursive install-am install-strip tags-recursive
-
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am am--refresh check check-am clean clean-generic \
-	clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
-	dist-gzip dist-hook dist-lzip dist-lzma dist-shar dist-tarZ \
-	dist-xz dist-zip distcheck distclean distclean-generic \
-	distclean-hdr distclean-libtool distclean-tags distcleancheck \
-	distdir distuninstallcheck dvi dvi-am html html-am info \
-	info-am install install-am install-data install-data-am \
-	install-dvi install-dvi-am install-exec install-exec-am \
-	install-html install-html-am install-info install-info-am \
-	install-man install-pdf install-pdf-am install-ps \
-	install-ps-am install-strip installcheck installcheck-am \
-	installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
-	uninstall uninstall-am
+.MAKE: $(am__recursive_targets) all install-am install-strip
+
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
+	am--refresh check check-am clean clean-cscope clean-generic \
+	clean-libtool cscope cscopelist-am ctags ctags-am dist \
+	dist-all dist-bzip2 dist-gzip dist-hook dist-lzip dist-shar \
+	dist-tarZ dist-xz dist-zip distcheck distclean \
+	distclean-generic distclean-hdr distclean-libtool \
+	distclean-tags distcleancheck distdir distuninstallcheck dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs installdirs-am \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am
 
 
 # Fix the version of the spec file and create a file named VERSION
diff --git a/NEWS b/NEWS
index a429101..dc3bbfc 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,11 @@
+Noteworthy changes in version 1.5.4 (2015-04-13) [C24/A13/R3]
+------------------------------------------------
+
+ * Fixed a possible crash in the debug code.
+
+ * Fixed building for Windows with newer versions of Mingw.
+
+
 Noteworthy changes in version 1.5.3 (2014-12-11) [C24/A13/R2]
 -------------------------------------------------------------
 
diff --git a/README b/README
index a16a066..6da94e5 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
                   GPGME - GnuPG Made Easy
                 ---------------------------
 
-         Copyright 2004, 2006, 2010, 2012, 2013, 2014 g10 Code GmbH
+         Copyright 2004, 2006, 2010, 2012, 2013, 2014, 2015 g10 Code GmbH
 
 This file is free software; as a special exception the author gives
 unlimited permission to copy and/or distribute it, with or without
diff --git a/VERSION b/VERSION
index 8af85be..94fe62c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.5.3
+1.5.4
diff --git a/aclocal.m4 b/aclocal.m4
index 58cabf4..149aed2 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,8 +1,7 @@
-# generated automatically by aclocal 1.11.6 -*- Autoconf -*-
+# generated automatically by aclocal 1.14.1 -*- Autoconf -*-
+
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
 
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
-# Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -12,33 +11,31 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
+m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
 [m4_warning([this file was generated for autoconf 2.69.
 You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
-To do so, use the procedure documented by the package, typically `autoreconf'.])])
+To do so, use the procedure documented by the package, typically 'autoreconf'.])])
 
-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 2002-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 1
-
 # AM_AUTOMAKE_VERSION(VERSION)
 # ----------------------------
 # Automake X.Y traces this macro to ensure aclocal.m4 has been
 # generated from the m4 files accompanying Automake X.Y.
 # (This private macro should not be called outside this file.)
 AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.11'
+[am__api_version='1.14'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.11.6], [],
+m4_if([$1], [1.14.1], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -54,24 +51,22 @@ m4_define([_AM_AUTOCONF_VERSION], [])
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.11.6])dnl
+[AM_AUTOMAKE_VERSION([1.14.1])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
 
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
-# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 1
-
 # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
-# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
-# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
+# $ac_aux_dir to '$srcdir/foo'.  In other projects, it is set to
+# '$srcdir', '$srcdir/..', or '$srcdir/../..'.
 #
 # Of course, Automake must honor this variable whenever it calls a
 # tool from the auxiliary directory.  The problem is that $srcdir (and
@@ -90,7 +85,7 @@ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
 #
 # The reason of the latter failure is that $top_srcdir and $ac_aux_dir
 # are both prefixed by $srcdir.  In an in-source build this is usually
-# harmless because $srcdir is `.', but things will broke when you
+# harmless because $srcdir is '.', but things will broke when you
 # start a VPATH build or use an absolute $srcdir.
 #
 # So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
@@ -108,30 +103,26 @@ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
 # configured tree to be moved without reconfiguration.
 
 AC_DEFUN([AM_AUX_DIR_EXPAND],
-[dnl Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])dnl
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
+[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
 ])
 
 # AM_CONDITIONAL                                            -*- Autoconf -*-
 
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1997-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 9
-
 # AM_CONDITIONAL(NAME, SHELL-CONDITION)
 # -------------------------------------
 # Define a conditional.
 AC_DEFUN([AM_CONDITIONAL],
-[AC_PREREQ(2.52)dnl
- ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
-	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
+[AC_PREREQ([2.52])dnl
+ m4_if([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
+       [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
 AC_SUBST([$1_TRUE])dnl
 AC_SUBST([$1_FALSE])dnl
 _AM_SUBST_NOTMAKE([$1_TRUE])dnl
@@ -150,16 +141,14 @@ AC_CONFIG_COMMANDS_PRE(
 Usually this means the macro was only invoked conditionally.]])
 fi])])
 
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009,
-# 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 12
 
-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
+# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be
 # written in clear, in which case automake, when reading aclocal.m4,
 # will think it sees a *use*, and therefore will trigger all it's
 # C support machinery.  Also note that it means that autoscan, seeing
@@ -169,7 +158,7 @@ fi])])
 # _AM_DEPENDENCIES(NAME)
 # ----------------------
 # See how the compiler implements dependency checking.
-# NAME is "CC", "CXX", "GCJ", or "OBJC".
+# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC".
 # We try a few techniques and use that to set a single cache variable.
 #
 # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
@@ -182,12 +171,13 @@ AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
 AC_REQUIRE([AM_MAKE_INCLUDE])dnl
 AC_REQUIRE([AM_DEP_TRACK])dnl
 
-ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
-       [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
-       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
-       [$1], UPC,  [depcc="$UPC"  am_compiler_list=],
-       [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
-                   [depcc="$$1"   am_compiler_list=])
+m4_if([$1], [CC],   [depcc="$CC"   am_compiler_list=],
+      [$1], [CXX],  [depcc="$CXX"  am_compiler_list=],
+      [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
+      [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'],
+      [$1], [UPC],  [depcc="$UPC"  am_compiler_list=],
+      [$1], [GCJ],  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
+                    [depcc="$$1"   am_compiler_list=])
 
 AC_CACHE_CHECK([dependency style of $depcc],
                [am_cv_$1_dependencies_compiler_type],
@@ -195,8 +185,8 @@ AC_CACHE_CHECK([dependency style of $depcc],
   # We make a subdir and do the tests there.  Otherwise we can end up
   # making bogus files that we don't know about and never remove.  For
   # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
+  # making a dummy file named 'D' -- because '-MD' means "put the output
+  # in D".
   rm -rf conftest.dir
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
@@ -236,16 +226,16 @@ AC_CACHE_CHECK([dependency style of $depcc],
     : > sub/conftest.c
     for i in 1 2 3 4 5 6; do
       echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
+      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+      # Solaris 10 /bin/sh.
+      echo '/* dummy */' > sub/conftst$i.h
     done
     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # We check with '-c' and '-o' for the sake of the "dashmstdout"
     # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs
+    # handle '-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs.
     am__obj=sub/conftest.${OBJEXT-o}
     am__minus_obj="-o $am__obj"
     case $depmode in
@@ -254,8 +244,8 @@ AC_CACHE_CHECK([dependency style of $depcc],
       test "$am__universal" = false || continue
       ;;
     nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
+      # After this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested.
       if test "x$enable_dependency_tracking" = xyes; then
 	continue
       else
@@ -263,7 +253,7 @@ AC_CACHE_CHECK([dependency style of $depcc],
       fi
       ;;
     msvc7 | msvc7msys | msvisualcpp | msvcmsys)
-      # This compiler won't grok `-c -o', but also, the minuso test has
+      # This compiler won't grok '-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
       # so weak that their functioning should not be impacted.
       am__obj=conftest.${OBJEXT-o}
@@ -311,7 +301,7 @@ AM_CONDITIONAL([am__fastdep$1], [
 # AM_SET_DEPDIR
 # -------------
 # Choose a directory name for dependency files.
-# This macro is AC_REQUIREd in _AM_DEPENDENCIES
+# This macro is AC_REQUIREd in _AM_DEPENDENCIES.
 AC_DEFUN([AM_SET_DEPDIR],
 [AC_REQUIRE([AM_SET_LEADING_DOT])dnl
 AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
@@ -321,9 +311,13 @@ AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
 # AM_DEP_TRACK
 # ------------
 AC_DEFUN([AM_DEP_TRACK],
-[AC_ARG_ENABLE(dependency-tracking,
-[  --disable-dependency-tracking  speeds up one-time build
-  --enable-dependency-tracking   do not reject slow dependency extractors])
+[AC_ARG_ENABLE([dependency-tracking], [dnl
+AS_HELP_STRING(
+  [--enable-dependency-tracking],
+  [do not reject slow dependency extractors])
+AS_HELP_STRING(
+  [--disable-dependency-tracking],
+  [speeds up one-time build])])
 if test "x$enable_dependency_tracking" != xno; then
   am_depcomp="$ac_aux_dir/depcomp"
   AMDEPBACKSLASH='\'
@@ -338,20 +332,18 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl
 
 # Generate code to set up dependency tracking.              -*- Autoconf -*-
 
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-#serial 5
 
 # _AM_OUTPUT_DEPENDENCY_COMMANDS
 # ------------------------------
 AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
 [{
-  # Autoconf 2.62 quotes --file arguments for eval, but not when files
+  # Older Autoconf quotes --file arguments for eval, but not when files
   # are listed without --file.  Let's play safe and only enable the eval
   # if we detect the quoting.
   case $CONFIG_FILES in
@@ -364,7 +356,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
     # Strip MF so we end up with the name of the file.
     mf=`echo "$mf" | sed -e 's/:.*$//'`
     # Check whether this is an Automake generated Makefile or not.
-    # We used to match only the files named `Makefile.in', but
+    # We used to match only the files named 'Makefile.in', but
     # some people rename them; so instead we look at the file content.
     # Grep'ing the first line is not enough: some people post-process
     # each Makefile.in and add a new line on top of each file to say so.
@@ -376,21 +368,19 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
       continue
     fi
     # Extract the definition of DEPDIR, am__include, and am__quote
-    # from the Makefile without running `make'.
+    # from the Makefile without running 'make'.
     DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
     test -z "$DEPDIR" && continue
     am__include=`sed -n 's/^am__include = //p' < "$mf"`
-    test -z "am__include" && continue
+    test -z "$am__include" && continue
     am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-    # When using ansi2knr, U may be empty or an underscore; expand it
-    U=`sed -n 's/^U = //p' < "$mf"`
     # Find all dependency output files, they are included files with
     # $(DEPDIR) in their names.  We invoke sed twice because it is the
     # simplest approach to changing $(DEPDIR) to its actual value in the
     # expansion.
     for file in `sed -n "
       s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
       # Make sure the directory exists.
       test -f "$dirpart/$file" && continue
       fdir=`AS_DIRNAME(["$file"])`
@@ -408,7 +398,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
 # This macro should only be invoked once -- use via AC_REQUIRE.
 #
 # This code is only required when automatic dependency tracking
-# is enabled.  FIXME.  This creates each `.P' file that we will
+# is enabled.  FIXME.  This creates each '.P' file that we will
 # need in order to bootstrap the dependency handling code.
 AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
 [AC_CONFIG_COMMANDS([depfiles],
@@ -418,18 +408,21 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
 
 # Do all the work for Automake.                             -*- Autoconf -*-
 
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 16
-
 # This macro actually does too much.  Some checks are only needed if
 # your package does certain things.  But this isn't really a big deal.
 
+dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O.
+m4_define([AC_PROG_CC],
+m4_defn([AC_PROG_CC])
+[_AM_PROG_CC_C_O
+])
+
 # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
 # AM_INIT_AUTOMAKE([OPTIONS])
 # -----------------------------------------------
@@ -442,7 +435,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
 # arguments mandatory, and then we can depend on a new Autoconf
 # release and drop the old call support.
 AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.62])dnl
+[AC_PREREQ([2.65])dnl
 dnl Autoconf wants to disallow AM_ names.  We explicitly allow
 dnl the ones we care about.
 m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
@@ -471,31 +464,40 @@ AC_SUBST([CYGPATH_W])
 # Define the identity of the package.
 dnl Distinguish between old-style and new-style calls.
 m4_ifval([$2],
-[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
+[AC_DIAGNOSE([obsolete],
+             [$0: two- and three-arguments forms are deprecated.])
+m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
  AC_SUBST([PACKAGE], [$1])dnl
  AC_SUBST([VERSION], [$2])],
 [_AM_SET_OPTIONS([$1])dnl
 dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
-m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
+m4_if(
+  m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]),
+  [ok:ok],,
   [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
  AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
  AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
 
 _AM_IF_OPTION([no-define],,
-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
+[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package])
+ AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl
 
 # Some tools Automake needs.
 AC_REQUIRE([AM_SANITY_CHECK])dnl
 AC_REQUIRE([AC_ARG_PROGRAM])dnl
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
-AM_MISSING_PROG(AUTOCONF, autoconf)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
-AM_MISSING_PROG(AUTOHEADER, autoheader)
-AM_MISSING_PROG(MAKEINFO, makeinfo)
+AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}])
+AM_MISSING_PROG([AUTOCONF], [autoconf])
+AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}])
+AM_MISSING_PROG([AUTOHEADER], [autoheader])
+AM_MISSING_PROG([MAKEINFO], [makeinfo])
 AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
 AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
-AC_REQUIRE([AM_PROG_MKDIR_P])dnl
+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+# For better backward compatibility.  To be removed once Automake 1.9.x
+# dies out for good.  For more background, see:
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
 AC_REQUIRE([AC_PROG_AWK])dnl
@@ -506,34 +508,79 @@ _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
 			     [_AM_PROG_TAR([v7])])])
 _AM_IF_OPTION([no-dependencies],,
 [AC_PROVIDE_IFELSE([AC_PROG_CC],
-		  [_AM_DEPENDENCIES(CC)],
-		  [define([AC_PROG_CC],
-			  defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
+		  [_AM_DEPENDENCIES([CC])],
+		  [m4_define([AC_PROG_CC],
+			     m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl
 AC_PROVIDE_IFELSE([AC_PROG_CXX],
-		  [_AM_DEPENDENCIES(CXX)],
-		  [define([AC_PROG_CXX],
-			  defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+		  [_AM_DEPENDENCIES([CXX])],
+		  [m4_define([AC_PROG_CXX],
+			     m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl
 AC_PROVIDE_IFELSE([AC_PROG_OBJC],
-		  [_AM_DEPENDENCIES(OBJC)],
-		  [define([AC_PROG_OBJC],
-			  defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
+		  [_AM_DEPENDENCIES([OBJC])],
+		  [m4_define([AC_PROG_OBJC],
+			     m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
+		  [_AM_DEPENDENCIES([OBJCXX])],
+		  [m4_define([AC_PROG_OBJCXX],
+			     m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl
 ])
-_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
-dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
-dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This macro
-dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
+AC_REQUIRE([AM_SILENT_RULES])dnl
+dnl The testsuite driver may need to know about EXEEXT, so add the
+dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This
+dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below.
 AC_CONFIG_COMMANDS_PRE(dnl
 [m4_provide_if([_AM_COMPILER_EXEEXT],
   [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
+
+# POSIX will say in a future version that running "rm -f" with no argument
+# is OK; and we want to be able to make that assumption in our Makefile
+# recipes.  So use an aggressive probe to check that the usage we want is
+# actually supported "in the wild" to an acceptable degree.
+# See automake bug#10828.
+# To make any issue more visible, cause the running configure to be aborted
+# by default if the 'rm' program in use doesn't match our expectations; the
+# user can still override this though.
+if rm -f && rm -fr && rm -rf; then : OK; else
+  cat >&2 <<'END'
+Oops!
+
+Your 'rm' program seems unable to run without file operands specified
+on the command line, even when the '-f' option is present.  This is contrary
+to the behaviour of most rm programs out there, and not conforming with
+the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
+
+Please tell bug-automake@gnu.org about your system, including the value
+of your $PATH and any error possibly output before this message.  This
+can help us improve future automake versions.
+
+END
+  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
+    echo 'Configuration will proceed anyway, since you have set the' >&2
+    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
+    echo >&2
+  else
+    cat >&2 <<'END'
+Aborting the configuration process, to ensure you take notice of the issue.
+
+You can download and install GNU coreutils to get an 'rm' implementation
+that behaves properly: <http://www.gnu.org/software/coreutils/>.
+
+If you want to complete the configuration process using your problematic
+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
+to "yes", and re-run configure.
+
+END
+    AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
+  fi
+fi
 ])
 
-dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
+dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
 dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
 dnl mangled by Autoconf and run in a shell conditional statement.
 m4_define([_AC_COMPILER_EXEEXT],
 m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
 
-
 # When config.status generates a header, we must update the stamp-h file.
 # This file resides in the same directory as the config header
 # that is generated.  The stamp files are numbered to have different names.
@@ -555,15 +602,12 @@ for _am_header in $config_headers :; do
 done
 echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
 
-# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation,
-# Inc.
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 1
-
 # AM_PROG_INSTALL_SH
 # ------------------
 # Define $install_sh.
@@ -577,16 +621,14 @@ if test x"${install_sh}" != xset; then
     install_sh="\${SHELL} $am_aux_dir/install-sh"
   esac
 fi
-AC_SUBST(install_sh)])
+AC_SUBST([install_sh])])
 
-# Copyright (C) 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2003-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 2
-
 # Check whether the underlying file-system supports filenames
 # with a leading dot.  For instance MS-DOS doesn't.
 AC_DEFUN([AM_SET_LEADING_DOT],
@@ -603,20 +645,17 @@ AC_SUBST([am__leading_dot])])
 # Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
 # From Jim Meyering
 
-# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008,
-# 2011 Free Software Foundation, Inc.
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 5
-
 # AM_MAINTAINER_MODE([DEFAULT-MODE])
 # ----------------------------------
 # Control maintainer-specific portions of Makefiles.
-# Default is to disable them, unless `enable' is passed literally.
-# For symmetry, `disable' may be passed as well.  Anyway, the user
+# Default is to disable them, unless 'enable' is passed literally.
+# For symmetry, 'disable' may be passed as well.  Anyway, the user
 # can override the default with the --enable/--disable switch.
 AC_DEFUN([AM_MAINTAINER_MODE],
 [m4_case(m4_default([$1], [disable]),
@@ -627,10 +666,11 @@ AC_DEFUN([AM_MAINTAINER_MODE],
 AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
   dnl maintainer-mode's default is 'disable' unless 'enable' is passed
   AC_ARG_ENABLE([maintainer-mode],
-[  --][am_maintainer_other][-maintainer-mode  am_maintainer_other make rules and dependencies not useful
-			  (and sometimes confusing) to the casual installer],
-      [USE_MAINTAINER_MODE=$enableval],
-      [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
+    [AS_HELP_STRING([--]am_maintainer_other[-maintainer-mode],
+      am_maintainer_other[ make rules and dependencies not useful
+      (and sometimes confusing) to the casual installer])],
+    [USE_MAINTAINER_MODE=$enableval],
+    [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
   AC_MSG_RESULT([$USE_MAINTAINER_MODE])
   AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])
   MAINT=$MAINTAINER_MODE_TRUE
@@ -638,18 +678,14 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
 ]
 )
 
-AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
-
 # Check to see how 'make' treats includes.	            -*- Autoconf -*-
 
-# Copyright (C) 2001, 2002, 2003, 2005, 2009  Free Software Foundation, Inc.
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 4
-
 # AM_MAKE_INCLUDE()
 # -----------------
 # Check to see how make treats includes.
@@ -667,7 +703,7 @@ am__quote=
 _am_result=none
 # First try GNU make style include.
 echo "include confinc" > confmf
-# Ignore all kinds of additional output from `make'.
+# Ignore all kinds of additional output from 'make'.
 case `$am_make -s -f confmf 2> /dev/null` in #(
 *the\ am__doit\ target*)
   am__include=include
@@ -694,15 +730,12 @@ rm -f confinc confmf
 
 # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
 
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 1997-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 6
-
 # AM_MISSING_PROG(NAME, PROGRAM)
 # ------------------------------
 AC_DEFUN([AM_MISSING_PROG],
@@ -710,11 +743,10 @@ AC_DEFUN([AM_MISSING_PROG],
 $1=${$1-"${am_missing_run}$2"}
 AC_SUBST($1)])
 
-
 # AM_MISSING_HAS_RUN
 # ------------------
-# Define MISSING if not defined so far and test if it supports --run.
-# If it does, set am_missing_run to use it, otherwise, to nothing.
+# Define MISSING if not defined so far and test if it is modern enough.
+# If it is, set am_missing_run to use it, otherwise, to nothing.
 AC_DEFUN([AM_MISSING_HAS_RUN],
 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
 AC_REQUIRE_AUX_FILE([missing])dnl
@@ -727,54 +759,22 @@ if test x"${MISSING+set}" != xset; then
   esac
 fi
 # Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
+if eval "$MISSING --is-lightweight"; then
+  am_missing_run="$MISSING "
 else
   am_missing_run=
-  AC_MSG_WARN([`missing' script is too old or missing])
+  AC_MSG_WARN(['missing' script is too old or missing])
 fi
 ])
 
-# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation,
-# Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 1
-
-# AM_PROG_MKDIR_P
-# ---------------
-# Check for `mkdir -p'.
-AC_DEFUN([AM_PROG_MKDIR_P],
-[AC_PREREQ([2.60])dnl
-AC_REQUIRE([AC_PROG_MKDIR_P])dnl
-dnl Automake 1.8 to 1.9.6 used to define mkdir_p.  We now use MKDIR_P,
-dnl while keeping a definition of mkdir_p for backward compatibility.
-dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
-dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
-dnl Makefile.ins that do not define MKDIR_P, so we do our own
-dnl adjustment using top_builddir (which is defined more often than
-dnl MKDIR_P).
-AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
-case $mkdir_p in
-  [[\\/$]]* | ?:[[\\/]]*) ;;
-  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
-])
-
 # Helper functions for option handling.                     -*- Autoconf -*-
 
-# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 5
-
 # _AM_MANGLE_OPTION(NAME)
 # -----------------------
 AC_DEFUN([_AM_MANGLE_OPTION],
@@ -784,7 +784,7 @@ AC_DEFUN([_AM_MANGLE_OPTION],
 # --------------------
 # Set option NAME.  Presently that only means defining a flag for this option.
 AC_DEFUN([_AM_SET_OPTION],
-[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
+[m4_define(_AM_MANGLE_OPTION([$1]), [1])])
 
 # _AM_SET_OPTIONS(OPTIONS)
 # ------------------------
@@ -798,24 +798,82 @@ AC_DEFUN([_AM_SET_OPTIONS],
 AC_DEFUN([_AM_IF_OPTION],
 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
 
-# Check to make sure that the build environment is sane.    -*- Autoconf -*-
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# _AM_PROG_CC_C_O
+# ---------------
+# Like AC_PROG_CC_C_O, but changed for automake.  We rewrite AC_PROG_CC
+# to automatically call this.
+AC_DEFUN([_AM_PROG_CC_C_O],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+AC_REQUIRE_AUX_FILE([compile])dnl
+AC_LANG_PUSH([C])dnl
+AC_CACHE_CHECK(
+  [whether $CC understands -c and -o together],
+  [am_cv_prog_cc_c_o],
+  [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])])
+  # Make sure it works both with $CC and with simple cc.
+  # Following AC_PROG_CC_C_O, we do the test twice because some
+  # compilers refuse to overwrite an existing .o file with -o,
+  # though they will create one.
+  am_cv_prog_cc_c_o=yes
+  for am_i in 1 2; do
+    if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \
+         && test -f conftest2.$ac_objext; then
+      : OK
+    else
+      am_cv_prog_cc_c_o=no
+      break
+    fi
+  done
+  rm -f core conftest*
+  unset am_i])
+if test "$am_cv_prog_cc_c_o" != yes; then
+   # Losing compiler, so override with the script.
+   # FIXME: It is wrong to rewrite CC.
+   # But if we don't then we get into trouble of one sort or another.
+   # A longer-term fix would be to have automake use am__CC in this case,
+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+   CC="$am_aux_dir/compile $CC"
+fi
+AC_LANG_POP([C])])
+
+# For backward compatibility.
+AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
 
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
-# Free Software Foundation, Inc.
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 5
+# AM_RUN_LOG(COMMAND)
+# -------------------
+# Run COMMAND, save the exit status in ac_status, and log it.
+# (This has been adapted from Autoconf's _AC_RUN_LOG macro.)
+AC_DEFUN([AM_RUN_LOG],
+[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
+   ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   (exit $ac_status); }])
+
+# Check to make sure that the build environment is sane.    -*- Autoconf -*-
+
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
 
 # AM_SANITY_CHECK
 # ---------------
 AC_DEFUN([AM_SANITY_CHECK],
 [AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
-sleep 1
-echo timestamp > conftest.file
 # Reject unsafe characters in $srcdir or the absolute working directory
 # name.  Accept space and tab only in the latter.
 am_lf='
@@ -826,32 +884,40 @@ case `pwd` in
 esac
 case $srcdir in
   *[[\\\"\#\$\&\'\`$am_lf\ \	]]*)
-    AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
+    AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);;
 esac
 
-# Do `set' in a subshell so we don't clobber the current shell's
+# Do 'set' in a subshell so we don't clobber the current shell's
 # arguments.  Must try -L first in case configure is actually a
 # symlink; some systems play weird games with the mod time of symlinks
 # (eg FreeBSD returns the mod time of the symlink's containing
 # directory).
 if (
-   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
-   if test "$[*]" = "X"; then
-      # -L didn't work.
-      set X `ls -t "$srcdir/configure" conftest.file`
-   fi
-   rm -f conftest.file
-   if test "$[*]" != "X $srcdir/configure conftest.file" \
-      && test "$[*]" != "X conftest.file $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-alias in your environment])
-   fi
-
+   am_has_slept=no
+   for am_try in 1 2; do
+     echo "timestamp, slept: $am_has_slept" > conftest.file
+     set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+     if test "$[*]" = "X"; then
+	# -L didn't work.
+	set X `ls -t "$srcdir/configure" conftest.file`
+     fi
+     if test "$[*]" != "X $srcdir/configure conftest.file" \
+	&& test "$[*]" != "X conftest.file $srcdir/configure"; then
+
+	# If neither matched, then we have a broken ls.  This can happen
+	# if, for instance, CONFIG_SHELL is bash and it inherits a
+	# broken ls alias from the environment.  This has actually
+	# happened.  Such a system could not be considered "sane".
+	AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
+  alias in your environment])
+     fi
+     if test "$[2]" = conftest.file || test $am_try -eq 2; then
+       break
+     fi
+     # Just in case.
+     sleep 1
+     am_has_slept=yes
+   done
    test "$[2]" = conftest.file
    )
 then
@@ -861,31 +927,50 @@ else
    AC_MSG_ERROR([newly created file is older than distributed files!
 Check your system clock])
 fi
-AC_MSG_RESULT(yes)])
+AC_MSG_RESULT([yes])
+# If we didn't sleep, we still need to ensure time stamps of config.status and
+# generated files are strictly newer.
+am_sleep_pid=
+if grep 'slept: no' conftest.file >/dev/null 2>&1; then
+  ( sleep 1 ) &
+  am_sleep_pid=$!
+fi
+AC_CONFIG_COMMANDS_PRE(
+  [AC_MSG_CHECKING([that generated files are newer than configure])
+   if test -n "$am_sleep_pid"; then
+     # Hide warnings about reused PIDs.
+     wait $am_sleep_pid 2>/dev/null
+   fi
+   AC_MSG_RESULT([done])])
+rm -f conftest.file
+])
 
-# Copyright (C) 2009, 2011  Free Software Foundation, Inc.
+# Copyright (C) 2009-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 2
-
 # AM_SILENT_RULES([DEFAULT])
 # --------------------------
 # Enable less verbose build rules; with the default set to DEFAULT
-# (`yes' being less verbose, `no' or empty being verbose).
+# ("yes" being less verbose, "no" or empty being verbose).
 AC_DEFUN([AM_SILENT_RULES],
-[AC_ARG_ENABLE([silent-rules],
-[  --enable-silent-rules          less verbose build output (undo: `make V=1')
-  --disable-silent-rules         verbose build output (undo: `make V=0')])
-case $enable_silent_rules in
-yes) AM_DEFAULT_VERBOSITY=0;;
-no)  AM_DEFAULT_VERBOSITY=1;;
-*)   AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
+[AC_ARG_ENABLE([silent-rules], [dnl
+AS_HELP_STRING(
+  [--enable-silent-rules],
+  [less verbose build output (undo: "make V=1")])
+AS_HELP_STRING(
+  [--disable-silent-rules],
+  [verbose build output (undo: "make V=0")])dnl
+])
+case $enable_silent_rules in @%:@ (((
+  yes) AM_DEFAULT_VERBOSITY=0;;
+   no) AM_DEFAULT_VERBOSITY=1;;
+    *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
 esac
 dnl
-dnl A few `make' implementations (e.g., NonStop OS and NextStep)
+dnl A few 'make' implementations (e.g., NonStop OS and NextStep)
 dnl do not support nested variable expansions.
 dnl See automake bug#9928 and bug#10237.
 am_make=${MAKE-make}
@@ -903,7 +988,7 @@ else
   am_cv_make_support_nested_variables=no
 fi])
 if test $am_cv_make_support_nested_variables = yes; then
-  dnl Using `$V' instead of `$(V)' breaks IRIX make.
+  dnl Using '$V' instead of '$(V)' breaks IRIX make.
   AM_V='$(V)'
   AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
 else
@@ -920,44 +1005,40 @@ AC_SUBST([AM_BACKSLASH])dnl
 _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
 ])
 
-# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 1
-
 # AM_PROG_INSTALL_STRIP
 # ---------------------
-# One issue with vendor `install' (even GNU) is that you can't
+# One issue with vendor 'install' (even GNU) is that you can't
 # specify the program used to strip binaries.  This is especially
 # annoying in cross-compiling environments, where the build's strip
 # is unlikely to handle the host's binaries.
 # Fortunately install-sh will honor a STRIPPROG variable, so we
-# always use install-sh in `make install-strip', and initialize
+# always use install-sh in "make install-strip", and initialize
 # STRIPPROG with the value of the STRIP variable (set by the user).
 AC_DEFUN([AM_PROG_INSTALL_STRIP],
 [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'.  However `strip' might not be the right
+# Installed binaries are usually stripped using 'strip' when the user
+# run "make install-strip".  However 'strip' might not be the right
 # tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
+# will honor the 'STRIP' environment variable to overrule this program.
+dnl Don't test for $cross_compiling = yes, because it might be 'maybe'.
 if test "$cross_compiling" != no; then
   AC_CHECK_TOOL([STRIP], [strip], :)
 fi
 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 AC_SUBST([INSTALL_STRIP_PROGRAM])])
 
-# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc.
+# Copyright (C) 2006-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 3
-
 # _AM_SUBST_NOTMAKE(VARIABLE)
 # ---------------------------
 # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
@@ -971,18 +1052,16 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
 # Check how to create a tarball.                            -*- Autoconf -*-
 
-# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc.
+# Copyright (C) 2004-2013 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 2
-
 # _AM_PROG_TAR(FORMAT)
 # --------------------
 # Check how to create a tarball in format FORMAT.
-# FORMAT should be one of `v7', `ustar', or `pax'.
+# FORMAT should be one of 'v7', 'ustar', or 'pax'.
 #
 # Substitute a variable $(am__tar) that is a command
 # writing to stdout a FORMAT-tarball containing the directory
@@ -992,76 +1071,114 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 # Substitute a variable $(am__untar) that extract such
 # a tarball read from stdin.
 #     $(am__untar) < result.tar
+#
 AC_DEFUN([_AM_PROG_TAR],
 [# Always define AMTAR for backward compatibility.  Yes, it's still used
 # in the wild :-(  We should find a proper way to deprecate it ...
 AC_SUBST([AMTAR], ['$${TAR-tar}'])
-m4_if([$1], [v7],
-     [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
-     [m4_case([$1], [ustar],, [pax],,
-              [m4_fatal([Unknown tar format])])
-AC_MSG_CHECKING([how to create a $1 tar archive])
-# Loop over all known methods to create a tar archive until one works.
+
+# We'll loop over all known methods to create a tar archive until one works.
 _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
-_am_tools=${am_cv_prog_tar_$1-$_am_tools}
-# Do not fold the above two line into one, because Tru64 sh and
-# Solaris sh will not grok spaces in the rhs of `-'.
-for _am_tool in $_am_tools
-do
-  case $_am_tool in
-  gnutar)
-    for _am_tar in tar gnutar gtar;
-    do
-      AM_RUN_LOG([$_am_tar --version]) && break
-    done
-    am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
-    am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
-    am__untar="$_am_tar -xf -"
-    ;;
-  plaintar)
-    # Must skip GNU tar: if it does not support --format= it doesn't create
-    # ustar tarball either.
-    (tar --version) >/dev/null 2>&1 && continue
-    am__tar='tar chf - "$$tardir"'
-    am__tar_='tar chf - "$tardir"'
-    am__untar='tar xf -'
-    ;;
-  pax)
-    am__tar='pax -L -x $1 -w "$$tardir"'
-    am__tar_='pax -L -x $1 -w "$tardir"'
-    am__untar='pax -r'
-    ;;
-  cpio)
-    am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
-    am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
-    am__untar='cpio -i -H $1 -d'
-    ;;
-  none)
-    am__tar=false
-    am__tar_=false
-    am__untar=false
-    ;;
-  esac
 
-  # If the value was cached, stop now.  We just wanted to have am__tar
-  # and am__untar set.
-  test -n "${am_cv_prog_tar_$1}" && break
+m4_if([$1], [v7],
+  [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
+
+  [m4_case([$1],
+    [ustar],
+     [# The POSIX 1988 'ustar' format is defined with fixed-size fields.
+      # There is notably a 21 bits limit for the UID and the GID.  In fact,
+      # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343
+      # and bug#13588).
+      am_max_uid=2097151 # 2^21 - 1
+      am_max_gid=$am_max_uid
+      # The $UID and $GID variables are not portable, so we need to resort
+      # to the POSIX-mandated id(1) utility.  Errors in the 'id' calls
+      # below are definitely unexpected, so allow the users to see them
+      # (that is, avoid stderr redirection).
+      am_uid=`id -u || echo unknown`
+      am_gid=`id -g || echo unknown`
+      AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format])
+      if test $am_uid -le $am_max_uid; then
+         AC_MSG_RESULT([yes])
+      else
+         AC_MSG_RESULT([no])
+         _am_tools=none
+      fi
+      AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format])
+      if test $am_gid -le $am_max_gid; then
+         AC_MSG_RESULT([yes])
+      else
+        AC_MSG_RESULT([no])
+        _am_tools=none
+      fi],
+
+  [pax],
+    [],
+
+  [m4_fatal([Unknown tar format])])
+
+  AC_MSG_CHECKING([how to create a $1 tar archive])
+
+  # Go ahead even if we have the value already cached.  We do so because we
+  # need to set the values for the 'am__tar' and 'am__untar' variables.
+  _am_tools=${am_cv_prog_tar_$1-$_am_tools}
+
+  for _am_tool in $_am_tools; do
+    case $_am_tool in
+    gnutar)
+      for _am_tar in tar gnutar gtar; do
+        AM_RUN_LOG([$_am_tar --version]) && break
+      done
+      am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
+      am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
+      am__untar="$_am_tar -xf -"
+      ;;
+    plaintar)
+      # Must skip GNU tar: if it does not support --format= it doesn't create
+      # ustar tarball either.
+      (tar --version) >/dev/null 2>&1 && continue
+      am__tar='tar chf - "$$tardir"'
+      am__tar_='tar chf - "$tardir"'
+      am__untar='tar xf -'
+      ;;
+    pax)
+      am__tar='pax -L -x $1 -w "$$tardir"'
+      am__tar_='pax -L -x $1 -w "$tardir"'
+      am__untar='pax -r'
+      ;;
+    cpio)
+      am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
+      am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
+      am__untar='cpio -i -H $1 -d'
+      ;;
+    none)
+      am__tar=false
+      am__tar_=false
+      am__untar=false
+      ;;
+    esac
 
-  # tar/untar a dummy directory, and stop if the command works
-  rm -rf conftest.dir
-  mkdir conftest.dir
-  echo GrepMe > conftest.dir/file
-  AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
+    # If the value was cached, stop now.  We just wanted to have am__tar
+    # and am__untar set.
+    test -n "${am_cv_prog_tar_$1}" && break
+
+    # tar/untar a dummy directory, and stop if the command works.
+    rm -rf conftest.dir
+    mkdir conftest.dir
+    echo GrepMe > conftest.dir/file
+    AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
+    rm -rf conftest.dir
+    if test -s conftest.tar; then
+      AM_RUN_LOG([$am__untar <conftest.tar])
+      AM_RUN_LOG([cat conftest.dir/file])
+      grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
+    fi
+  done
   rm -rf conftest.dir
-  if test -s conftest.tar; then
-    AM_RUN_LOG([$am__untar <conftest.tar])
-    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
-  fi
-done
-rm -rf conftest.dir
 
-AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
-AC_MSG_RESULT([$am_cv_prog_tar_$1])])
+  AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
+  AC_MSG_RESULT([$am_cv_prog_tar_$1])])
+
 AC_SUBST([am__tar])
 AC_SUBST([am__untar])
 ]) # _AM_PROG_TAR
diff --git a/build-aux/compile b/build-aux/compile
index 9bb997a..531136b 100755
--- a/build-aux/compile
+++ b/build-aux/compile
@@ -1,8 +1,9 @@
 #! /bin/sh
+# Wrapper for compilers which do not understand '-c -o'.
 
-# Wrapper for compilers which do not understand `-c -o'.
+scriptversion=2012-10-14.11; # UTC
 
-# Copyright 1999, 2000 Free Software Foundation, Inc.
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
 # Written by Tom Tromey <tromey@cygnus.com>.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -16,84 +17,331 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 
-# Usage:
-# compile PROGRAM [ARGS]...
-# `-o FOO.o' is removed from the args passed to the actual compile.
+# This file is maintained in Automake, please report
+# bugs to <bug-automake@gnu.org> or send patches to
+# <automake-patches@gnu.org>.
 
-prog=$1
-shift
+nl='
+'
+
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent tools from complaining about whitespace usage.
+IFS=" ""	$nl"
+
+file_conv=
+
+# func_file_conv build_file lazy
+# Convert a $build file to $host form and store it in $file
+# Currently only supports Windows hosts. If the determined conversion
+# type is listed in (the comma separated) LAZY, no conversion will
+# take place.
+func_file_conv ()
+{
+  file=$1
+  case $file in
+    / | /[!/]*) # absolute file, and not a UNC file
+      if test -z "$file_conv"; then
+	# lazily determine how to convert abs files
+	case `uname -s` in
+	  MINGW*)
+	    file_conv=mingw
+	    ;;
+	  CYGWIN*)
+	    file_conv=cygwin
+	    ;;
+	  *)
+	    file_conv=wine
+	    ;;
+	esac
+      fi
+      case $file_conv/,$2, in
+	*,$file_conv,*)
+	  ;;
+	mingw/*)
+	  file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
+	  ;;
+	cygwin/*)
+	  file=`cygpath -m "$file" || echo "$file"`
+	  ;;
+	wine/*)
+	  file=`winepath -w "$file" || echo "$file"`
+	  ;;
+      esac
+      ;;
+  esac
+}
+
+# func_cl_dashL linkdir
+# Make cl look for libraries in LINKDIR
+func_cl_dashL ()
+{
+  func_file_conv "$1"
+  if test -z "$lib_path"; then
+    lib_path=$file
+  else
+    lib_path="$lib_path;$file"
+  fi
+  linker_opts="$linker_opts -LIBPATH:$file"
+}
+
+# func_cl_dashl library
+# Do a library search-path lookup for cl
+func_cl_dashl ()
+{
+  lib=$1
+  found=no
+  save_IFS=$IFS
+  IFS=';'
+  for dir in $lib_path $LIB
+  do
+    IFS=$save_IFS
+    if $shared && test -f "$dir/$lib.dll.lib"; then
+      found=yes
+      lib=$dir/$lib.dll.lib
+      break
+    fi
+    if test -f "$dir/$lib.lib"; then
+      found=yes
+      lib=$dir/$lib.lib
+      break
+    fi
+    if test -f "$dir/lib$lib.a"; then
+      found=yes
+      lib=$dir/lib$lib.a
+      break
+    fi
+  done
+  IFS=$save_IFS
+
+  if test "$found" != yes; then
+    lib=$lib.lib
+  fi
+}
+
+# func_cl_wrapper cl arg...
+# Adjust compile command to suit cl
+func_cl_wrapper ()
+{
+  # Assume a capable shell
+  lib_path=
+  shared=:
+  linker_opts=
+  for arg
+  do
+    if test -n "$eat"; then
+      eat=
+    else
+      case $1 in
+	-o)
+	  # configure might choose to run compile as 'compile cc -o foo foo.c'.
+	  eat=1
+	  case $2 in
+	    *.o | *.[oO][bB][jJ])
+	      func_file_conv "$2"
+	      set x "$@" -Fo"$file"
+	      shift
+	      ;;
+	    *)
+	      func_file_conv "$2"
+	      set x "$@" -Fe"$file"
+	      shift
+	      ;;
+	  esac
+	  ;;
+	-I)
+	  eat=1
+	  func_file_conv "$2" mingw
+	  set x "$@" -I"$file"
+	  shift
+	  ;;
+	-I*)
+	  func_file_conv "${1#-I}" mingw
+	  set x "$@" -I"$file"
+	  shift
+	  ;;
+	-l)
+	  eat=1
+	  func_cl_dashl "$2"
+	  set x "$@" "$lib"
+	  shift
+	  ;;
+	-l*)
+	  func_cl_dashl "${1#-l}"
+	  set x "$@" "$lib"
+	  shift
+	  ;;
+	-L)
+	  eat=1
+	  func_cl_dashL "$2"
+	  ;;
+	-L*)
+	  func_cl_dashL "${1#-L}"
+	  ;;
+	-static)
+	  shared=false
+	  ;;
+	-Wl,*)
+	  arg=${1#-Wl,}
+	  save_ifs="$IFS"; IFS=','
+	  for flag in $arg; do
+	    IFS="$save_ifs"
+	    linker_opts="$linker_opts $flag"
+	  done
+	  IFS="$save_ifs"
+	  ;;
+	-Xlinker)
+	  eat=1
+	  linker_opts="$linker_opts $2"
+	  ;;
+	-*)
+	  set x "$@" "$1"
+	  shift
+	  ;;
+	*.cc | *.CC | *.cxx | *.CXX | *.[cC]++)
+	  func_file_conv "$1"
+	  set x "$@" -Tp"$file"
+	  shift
+	  ;;
+	*.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO])
+	  func_file_conv "$1" mingw
+	  set x "$@" "$file"
+	  shift
+	  ;;
+	*)
+	  set x "$@" "$1"
+	  shift
+	  ;;
+      esac
+    fi
+    shift
+  done
+  if test -n "$linker_opts"; then
+    linker_opts="-link$linker_opts"
+  fi
+  exec "$@" $linker_opts
+  exit 1
+}
+
+eat=
+
+case $1 in
+  '')
+     echo "$0: No command.  Try '$0 --help' for more information." 1>&2
+     exit 1;
+     ;;
+  -h | --h*)
+    cat <<\EOF
+Usage: compile [--help] [--version] PROGRAM [ARGS]
+
+Wrapper for compilers which do not understand '-c -o'.
+Remove '-o dest.o' from ARGS, run PROGRAM with the remaining
+arguments, and rename the output as expected.
+
+If you are trying to build a whole package this is not the
+right script to run: please start by reading the file 'INSTALL'.
+
+Report bugs to <bug-automake@gnu.org>.
+EOF
+    exit $?
+    ;;
+  -v | --v*)
+    echo "compile $scriptversion"
+    exit $?
+    ;;
+  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
+    func_cl_wrapper "$@"      # Doesn't return...
+    ;;
+esac
 
 ofile=
 cfile=
-args=
-while test $# -gt 0; do
-   case "$1" in
-    -o)
-       # configure might choose to run compile as `compile cc -o foo foo.c'.
-       # So we do something ugly here.
-       ofile=$2
-       shift
-       case "$ofile" in
-	*.o | *.obj)
-	   ;;
-	*)
-	   args="$args -o $ofile"
-	   ofile=
-	   ;;
-       esac
-       ;;
-    *.c)
-       cfile=$1
-       args="$args $1"
-       ;;
-    *)
-       args="$args $1"
-       ;;
-   esac
-   shift
+
+for arg
+do
+  if test -n "$eat"; then
+    eat=
+  else
+    case $1 in
+      -o)
+	# configure might choose to run compile as 'compile cc -o foo foo.c'.
+	# So we strip '-o arg' only if arg is an object.
+	eat=1
+	case $2 in
+	  *.o | *.obj)
+	    ofile=$2
+	    ;;
+	  *)
+	    set x "$@" -o "$2"
+	    shift
+	    ;;
+	esac
+	;;
+      *.c)
+	cfile=$1
+	set x "$@" "$1"
+	shift
+	;;
+      *)
+	set x "$@" "$1"
+	shift
+	;;
+    esac
+  fi
+  shift
 done
 
 if test -z "$ofile" || test -z "$cfile"; then
-   # If no `-o' option was seen then we might have been invoked from a
-   # pattern rule where we don't need one.  That is ok -- this is a
-   # normal compilation that the losing compiler can handle.  If no
-   # `.c' file was seen then we are probably linking.  That is also
-   # ok.
-   exec "$prog" $args
+  # If no '-o' option was seen then we might have been invoked from a
+  # pattern rule where we don't need one.  That is ok -- this is a
+  # normal compilation that the losing compiler can handle.  If no
+  # '.c' file was seen then we are probably linking.  That is also
+  # ok.
+  exec "$@"
 fi
 
 # Name of file we expect compiler to create.
-cofile=`echo $cfile | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
+cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
 
 # Create the lock directory.
-# Note: use `[/.-]' here to ensure that we don't use the same name
+# Note: use '[/\\:.-]' here to ensure that we don't use the same name
 # that we are using for the .o file.  Also, base the name on the expected
 # object file name, since that is what matters with a parallel build.
-lockdir=`echo $cofile | sed -e 's|[/.-]|_|g'`.d
+lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
 while true; do
-   if mkdir $lockdir > /dev/null 2>&1; then
-      break
-   fi
-   sleep 1
+  if mkdir "$lockdir" >/dev/null 2>&1; then
+    break
+  fi
+  sleep 1
 done
 # FIXME: race condition here if user kills between mkdir and trap.
-trap "rmdir $lockdir; exit 1" 1 2 15
+trap "rmdir '$lockdir'; exit 1" 1 2 15
 
 # Run the compile.
-"$prog" $args
-status=$?
+"$@"
+ret=$?
 
 if test -f "$cofile"; then
-   mv "$cofile" "$ofile"
+  test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
+elif test -f "${cofile}bj"; then
+  test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
 fi
 
-rmdir $lockdir
-exit $status
+rmdir "$lockdir"
+exit $ret
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
diff --git a/build-aux/config.guess b/build-aux/config.guess
index d622a44..dbfb978 100755
--- a/build-aux/config.guess
+++ b/build-aux/config.guess
@@ -1,14 +1,12 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-#   2011, 2012 Free Software Foundation, Inc.
+#   Copyright 1992-2015 Free Software Foundation, Inc.
 
-timestamp='2012-02-10'
+timestamp='2015-01-01'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful, but
@@ -22,19 +20,17 @@ timestamp='2012-02-10'
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-
-# Originally written by Per Bothner.  Please send patches (context
-# diff format) to <config-patches@gnu.org> and include a ChangeLog
-# entry.
+# the same distribution terms that you use for the rest of that
+# program.  This Exception is an additional permission under section 7
+# of the GNU General Public License, version 3 ("GPLv3").
 #
-# This script attempts to guess a canonical system name similar to
-# config.sub.  If it succeeds, it prints the system name on stdout, and
-# exits with 0.  Otherwise, it exits with 1.
+# Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
 #
 # You can get the latest version of this script from:
 # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+#
+# Please send patches to <config-patches@gnu.org>.
+
 
 me=`echo "$0" | sed -e 's,.*/,,'`
 
@@ -54,9 +50,7 @@ version="\
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
-Free Software Foundation, Inc.
+Copyright 1992-2015 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -138,6 +132,27 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
 UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 
+case "${UNAME_SYSTEM}" in
+Linux|GNU|GNU/*)
+	# If the system lacks a compiler, then just pick glibc.
+	# We could probably try harder.
+	LIBC=gnu
+
+	eval $set_cc_for_build
+	cat <<-EOF > $dummy.c
+	#include <features.h>
+	#if defined(__UCLIBC__)
+	LIBC=uclibc
+	#elif defined(__dietlibc__)
+	LIBC=dietlibc
+	#else
+	LIBC=gnu
+	#endif
+	EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
+	;;
+esac
+
 # Note: order is significant - the case branches are not exclusive.
 
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
@@ -200,6 +215,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
 	echo "${machine}-${os}${release}"
 	exit ;;
+    *:Bitrig:*:*)
+	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
+	echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
+	exit ;;
     *:OpenBSD:*:*)
 	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
 	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
@@ -302,7 +321,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
 	exit ;;
-    arm:riscos:*:*|arm:RISCOS:*:*)
+    arm*:riscos:*:*|arm*:RISCOS:*:*)
 	echo arm-unknown-riscos
 	exit ;;
     SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
@@ -560,8 +579,9 @@ EOF
 	else
 		IBM_ARCH=powerpc
 	fi
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
+	if [ -x /usr/bin/lslpp ] ; then
+		IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc |
+			   awk -F: '{ print $3 }' | sed s/[0-9]*$/0/`
 	else
 		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
 	fi
@@ -801,10 +821,13 @@ EOF
     i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
 	exit ;;
+    *:MINGW64*:*)
+	echo ${UNAME_MACHINE}-pc-mingw64
+	exit ;;
     *:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit ;;
-    i*:MSYS*:*)
+    *:MSYS*:*)
 	echo ${UNAME_MACHINE}-pc-msys
 	exit ;;
     i*:windows32*:*)
@@ -852,21 +875,21 @@ EOF
 	exit ;;
     *:GNU:*:*)
 	# the GNU system
-	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
 	exit ;;
     *:GNU/*:*:*)
 	# other systems with GNU libc and userland
-	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
+	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
 	exit ;;
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
 	exit ;;
     aarch64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     aarch64_be:Linux:*:*)
 	UNAME_MACHINE=aarch64_be
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     alpha:Linux:*:*)
 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
@@ -879,59 +902,54 @@ EOF
 	  EV68*) UNAME_MACHINE=alphaev68 ;;
 	esac
 	objdump --private-headers /bin/sh | grep -q ld.so.1
-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+	if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    arc:Linux:*:* | arceb:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     arm*:Linux:*:*)
 	eval $set_cc_for_build
 	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
 	    | grep -q __ARM_EABI__
 	then
-	    echo ${UNAME_MACHINE}-unknown-linux-gnu
+	    echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	else
 	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
 		| grep -q __ARM_PCS_VFP
 	    then
-		echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
 	    else
-		echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
+		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
 	    fi
 	fi
 	exit ;;
     avr32*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     cris:Linux:*:*)
-	echo ${UNAME_MACHINE}-axis-linux-gnu
+	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
 	exit ;;
     crisv32:Linux:*:*)
-	echo ${UNAME_MACHINE}-axis-linux-gnu
+	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
 	exit ;;
     frv:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     hexagon:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     i*86:Linux:*:*)
-	LIBC=gnu
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#ifdef __dietlibc__
-	LIBC=dietlibc
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
-	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+	echo ${UNAME_MACHINE}-pc-linux-${LIBC}
 	exit ;;
     ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     m32r*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     m68*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     mips:Linux:*:* | mips64:Linux:*:*)
 	eval $set_cc_for_build
@@ -950,54 +968,63 @@ EOF
 	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
 	;;
-    or32:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+    openrisc*:Linux:*:*)
+	echo or1k-unknown-linux-${LIBC}
+	exit ;;
+    or32:Linux:*:* | or1k*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     padre:Linux:*:*)
-	echo sparc-unknown-linux-gnu
+	echo sparc-unknown-linux-${LIBC}
 	exit ;;
     parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-gnu
+	echo hppa64-unknown-linux-${LIBC}
 	exit ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
-	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
-	  *)    echo hppa-unknown-linux-gnu ;;
+	  PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
+	  PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
+	  *)    echo hppa-unknown-linux-${LIBC} ;;
 	esac
 	exit ;;
     ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-gnu
+	echo powerpc64-unknown-linux-${LIBC}
 	exit ;;
     ppc:Linux:*:*)
-	echo powerpc-unknown-linux-gnu
+	echo powerpc-unknown-linux-${LIBC}
+	exit ;;
+    ppc64le:Linux:*:*)
+	echo powerpc64le-unknown-linux-${LIBC}
+	exit ;;
+    ppcle:Linux:*:*)
+	echo powerpcle-unknown-linux-${LIBC}
 	exit ;;
     s390:Linux:*:* | s390x:Linux:*:*)
-	echo ${UNAME_MACHINE}-ibm-linux
+	echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
 	exit ;;
     sh64*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     sh*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     tile*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     vax:Linux:*:*)
-	echo ${UNAME_MACHINE}-dec-linux-gnu
+	echo ${UNAME_MACHINE}-dec-linux-${LIBC}
 	exit ;;
     x86_64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     xtensa*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     i*86:DYNIX/ptx:4*:*)
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
@@ -1201,6 +1228,9 @@ EOF
     BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
 	echo i586-pc-haiku
 	exit ;;
+    x86_64:Haiku:*:*)
+	echo x86_64-unknown-haiku
+	exit ;;
     SX-4:SUPER-UX:*:*)
 	echo sx4-nec-superux${UNAME_RELEASE}
 	exit ;;
@@ -1227,19 +1257,31 @@ EOF
 	exit ;;
     *:Darwin:*:*)
 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-	case $UNAME_PROCESSOR in
-	    i386)
-		eval $set_cc_for_build
-		if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
-		  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
-		      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-		      grep IS_64BIT_ARCH >/dev/null
-		  then
-		      UNAME_PROCESSOR="x86_64"
-		  fi
-		fi ;;
-	    unknown) UNAME_PROCESSOR=powerpc ;;
-	esac
+	eval $set_cc_for_build
+	if test "$UNAME_PROCESSOR" = unknown ; then
+	    UNAME_PROCESSOR=powerpc
+	fi
+	if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
+	    if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+		if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
+		    (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+		    grep IS_64BIT_ARCH >/dev/null
+		then
+		    case $UNAME_PROCESSOR in
+			i386) UNAME_PROCESSOR=x86_64 ;;
+			powerpc) UNAME_PROCESSOR=powerpc64 ;;
+		    esac
+		fi
+	    fi
+	elif test "$UNAME_PROCESSOR" = i386 ; then
+	    # Avoid executing cc on OS X 10.9, as it ships with a stub
+	    # that puts up a graphical alert prompting to install
+	    # developer tools.  Any system running Mac OS X 10.7 or
+	    # later (Darwin 11 and later) is required to have a 64-bit
+	    # processor. This is not true of the ARM version of Darwin
+	    # that Apple uses in portable devices.
+	    UNAME_PROCESSOR=x86_64
+	fi
 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
 	exit ;;
     *:procnto*:*:* | *:QNX:[0123456789]*:*)
@@ -1256,7 +1298,7 @@ EOF
     NEO-?:NONSTOP_KERNEL:*:*)
 	echo neo-tandem-nsk${UNAME_RELEASE}
 	exit ;;
-    NSE-?:NONSTOP_KERNEL:*:*)
+    NSE-*:NONSTOP_KERNEL:*:*)
 	echo nse-tandem-nsk${UNAME_RELEASE}
 	exit ;;
     NSR-?:NONSTOP_KERNEL:*:*)
@@ -1330,157 +1372,6 @@ EOF
 	exit ;;
 esac
 
-#echo '(No uname command or uname output not recognized.)' 1>&2
-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
-
-eval $set_cc_for_build
-cat >$dummy.c <<EOF
-#ifdef _SEQUENT_
-# include <sys/types.h>
-# include <sys/utsname.h>
-#endif
-main ()
-{
-#if defined (sony)
-#if defined (MIPSEB)
-  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
-     I don't know....  */
-  printf ("mips-sony-bsd\n"); exit (0);
-#else
-#include <sys/param.h>
-  printf ("m68k-sony-newsos%s\n",
-#ifdef NEWSOS4
-	"4"
-#else
-	""
-#endif
-	); exit (0);
-#endif
-#endif
-
-#if defined (__arm) && defined (__acorn) && defined (__unix)
-  printf ("arm-acorn-riscix\n"); exit (0);
-#endif
-
-#if defined (hp300) && !defined (hpux)
-  printf ("m68k-hp-bsd\n"); exit (0);
-#endif
-
-#if defined (NeXT)
-#if !defined (__ARCHITECTURE__)
-#define __ARCHITECTURE__ "m68k"
-#endif
-  int version;
-  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
-  if (version < 4)
-    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
-  else
-    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
-  exit (0);
-#endif
-
-#if defined (MULTIMAX) || defined (n16)
-#if defined (UMAXV)
-  printf ("ns32k-encore-sysv\n"); exit (0);
-#else
-#if defined (CMU)
-  printf ("ns32k-encore-mach\n"); exit (0);
-#else
-  printf ("ns32k-encore-bsd\n"); exit (0);
-#endif
-#endif
-#endif
-
-#if defined (__386BSD__)
-  printf ("i386-pc-bsd\n"); exit (0);
-#endif
-
-#if defined (sequent)
-#if defined (i386)
-  printf ("i386-sequent-dynix\n"); exit (0);
-#endif
-#if defined (ns32000)
-  printf ("ns32k-sequent-dynix\n"); exit (0);
-#endif
-#endif
-
-#if defined (_SEQUENT_)
-    struct utsname un;
-
-    uname(&un);
-
-    if (strncmp(un.version, "V2", 2) == 0) {
-	printf ("i386-sequent-ptx2\n"); exit (0);
-    }
-    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
-	printf ("i386-sequent-ptx1\n"); exit (0);
-    }
-    printf ("i386-sequent-ptx\n"); exit (0);
-
-#endif
-
-#if defined (vax)
-# if !defined (ultrix)
-#  include <sys/param.h>
-#  if defined (BSD)
-#   if BSD == 43
-      printf ("vax-dec-bsd4.3\n"); exit (0);
-#   else
-#    if BSD == 199006
-      printf ("vax-dec-bsd4.3reno\n"); exit (0);
-#    else
-      printf ("vax-dec-bsd\n"); exit (0);
-#    endif
-#   endif
-#  else
-    printf ("vax-dec-bsd\n"); exit (0);
-#  endif
-# else
-    printf ("vax-dec-ultrix\n"); exit (0);
-# endif
-#endif
-
-#if defined (alliant) && defined (i860)
-  printf ("i860-alliant-bsd\n"); exit (0);
-#endif
-
-  exit (1);
-}
-EOF
-
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
-	{ echo "$SYSTEM_NAME"; exit; }
-
-# Apollos put the system type in the environment.
-
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
-
-# Convex versions that predate uname can use getsysinfo(1)
-
-if [ -x /usr/convex/getsysinfo ]
-then
-    case `getsysinfo -f cpu_type` in
-    c1*)
-	echo c1-convex-bsd
-	exit ;;
-    c2*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-	exit ;;
-    c34*)
-	echo c34-convex-bsd
-	exit ;;
-    c38*)
-	echo c38-convex-bsd
-	exit ;;
-    c4*)
-	echo c4-convex-bsd
-	exit ;;
-    esac
-fi
-
 cat >&2 <<EOF
 $0: unable to guess system type
 
diff --git a/build-aux/config.sub b/build-aux/config.sub
index c894da4..6d2e94c 100755
--- a/build-aux/config.sub
+++ b/build-aux/config.sub
@@ -1,24 +1,18 @@
 #! /bin/sh
 # Configuration validation subroutine script.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-#   2011, 2012 Free Software Foundation, Inc.
+#   Copyright 1992-2015 Free Software Foundation, Inc.
 
-timestamp='2012-02-10'
+timestamp='2015-01-01'
 
-# This file is (in principle) common to ALL GNU software.
-# The presence of a machine in this file suggests that SOME GNU software
-# can handle that machine.  It does not imply ALL GNU software can.
-#
-# This file is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, see <http://www.gnu.org/licenses/>.
@@ -26,11 +20,12 @@ timestamp='2012-02-10'
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
+# the same distribution terms that you use for the rest of that
+# program.  This Exception is an additional permission under section 7
+# of the GNU General Public License, version 3 ("GPLv3").
 
 
-# Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted GNU ChangeLog entry.
+# Please send patches to <config-patches@gnu.org>.
 #
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
@@ -73,9 +68,7 @@ Report bugs and patches to <config-patches@gnu.org>."
 version="\
 GNU config.sub ($timestamp)
 
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
-Free Software Foundation, Inc.
+Copyright 1992-2015 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -123,7 +116,7 @@ esac
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
   nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
-  linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
+  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
   knetbsd*-gnu* | netbsd*-gnu* | \
   kopensolaris*-gnu* | \
   storm-chaos* | os2-emx* | rtmk-nova*)
@@ -156,7 +149,7 @@ case $os in
 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis | -knuth | -cray | -microblaze)
+	-apple | -axis | -knuth | -cray | -microblaze*)
 		os=
 		basic_machine=$1
 		;;
@@ -225,6 +218,12 @@ case $os in
 	-isc*)
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
+	-lynx*178)
+		os=-lynxos178
+		;;
+	-lynx*5)
+		os=-lynxos5
+		;;
 	-lynx*)
 		os=-lynxos
 		;;
@@ -253,21 +252,24 @@ case $basic_machine in
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
 	| am33_2.0 \
-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
-        | be32 | be64 \
+	| arc | arceb \
+	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
+	| avr | avr32 \
+	| be32 | be64 \
 	| bfin \
-	| c4x | clipper \
+	| c4x | c8051 | clipper \
 	| d10v | d30v | dlx | dsp16xx \
 	| epiphany \
-	| fido | fr30 | frv \
+	| fido | fr30 | frv | ft32 \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| hexagon \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
+	| k1om \
 	| le32 | le64 \
 	| lm32 \
 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
-	| maxq | mb | microblaze | mcore | mep | metag \
+	| maxq | mb | microblaze | microblazeel | mcore | mep | metag \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
@@ -281,23 +283,26 @@ case $basic_machine in
 	| mips64vr5900 | mips64vr5900el \
 	| mipsisa32 | mipsisa32el \
 	| mipsisa32r2 | mipsisa32r2el \
+	| mipsisa32r6 | mipsisa32r6el \
 	| mipsisa64 | mipsisa64el \
 	| mipsisa64r2 | mipsisa64r2el \
+	| mipsisa64r6 | mipsisa64r6el \
 	| mipsisa64sb1 | mipsisa64sb1el \
 	| mipsisa64sr71k | mipsisa64sr71kel \
+	| mipsr5900 | mipsr5900el \
 	| mipstx39 | mipstx39el \
 	| mn10200 | mn10300 \
 	| moxie \
 	| mt \
 	| msp430 \
 	| nds32 | nds32le | nds32be \
-	| nios | nios2 \
+	| nios | nios2 | nios2eb | nios2el \
 	| ns16k | ns32k \
-	| open8 \
-	| or32 \
+	| open8 | or1k | or1knd | or32 \
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle \
 	| pyramid \
+	| riscv32 | riscv64 \
 	| rl78 | rx \
 	| score \
 	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
@@ -308,6 +313,7 @@ case $basic_machine in
 	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
 	| ubicom32 \
 	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
+	| visium \
 	| we32k \
 	| x86 | xc16x | xstormy16 | xtensa \
 	| z8k | z80)
@@ -322,7 +328,10 @@ case $basic_machine in
 	c6x)
 		basic_machine=tic6x-unknown
 		;;
-	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
+	leon|leon[3-9])
+		basic_machine=sparc-$basic_machine
+		;;
+	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
 		basic_machine=$basic_machine-unknown
 		os=-none
 		;;
@@ -364,13 +373,13 @@ case $basic_machine in
 	| aarch64-* | aarch64_be-* \
 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
+	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
 	| avr-* | avr32-* \
 	| be32-* | be64-* \
 	| bfin-* | bs2000-* \
 	| c[123]* | c30-* | [cjt]90-* | c4x-* \
-	| clipper-* | craynv-* | cydra-* \
+	| c8051-* | clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
 	| elxsi-* \
 	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
@@ -379,11 +388,13 @@ case $basic_machine in
 	| hexagon-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
 	| ip2k-* | iq2000-* \
+	| k1om-* \
 	| le32-* | le64-* \
 	| lm32-* \
 	| m32c-* | m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
+	| microblaze-* | microblazeel-* \
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
 	| mips16-* \
 	| mips64-* | mips64el-* \
@@ -397,18 +408,22 @@ case $basic_machine in
 	| mips64vr5900-* | mips64vr5900el-* \
 	| mipsisa32-* | mipsisa32el-* \
 	| mipsisa32r2-* | mipsisa32r2el-* \
+	| mipsisa32r6-* | mipsisa32r6el-* \
 	| mipsisa64-* | mipsisa64el-* \
 	| mipsisa64r2-* | mipsisa64r2el-* \
+	| mipsisa64r6-* | mipsisa64r6el-* \
 	| mipsisa64sb1-* | mipsisa64sb1el-* \
 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
+	| mipsr5900-* | mipsr5900el-* \
 	| mipstx39-* | mipstx39el-* \
 	| mmix-* \
 	| mt-* \
 	| msp430-* \
 	| nds32-* | nds32le-* | nds32be-* \
-	| nios-* | nios2-* \
+	| nios-* | nios2-* | nios2eb-* | nios2el-* \
 	| none-* | np1-* | ns16k-* | ns32k-* \
 	| open8-* \
+	| or1k*-* \
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
@@ -426,6 +441,7 @@ case $basic_machine in
 	| ubicom32-* \
 	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
 	| vax-* \
+	| visium-* \
 	| we32k-* \
 	| x86-* | x86_64-* | xc16x-* | xps100-* \
 	| xstormy16-* | xtensa*-* \
@@ -763,6 +779,9 @@ case $basic_machine in
 		basic_machine=m68k-isi
 		os=-sysv
 		;;
+	leon-*|leon[3-9]-*)
+		basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'`
+		;;
 	m68knommu)
 		basic_machine=m68k-unknown
 		os=-linux
@@ -782,11 +801,15 @@ case $basic_machine in
 		basic_machine=ns32k-utek
 		os=-sysv
 		;;
-	microblaze)
+	microblaze*)
 		basic_machine=microblaze-xilinx
 		;;
+	mingw64)
+		basic_machine=x86_64-pc
+		os=-mingw64
+		;;
 	mingw32)
-		basic_machine=i386-pc
+		basic_machine=i686-pc
 		os=-mingw32
 		;;
 	mingw32ce)
@@ -814,6 +837,10 @@ case $basic_machine in
 		basic_machine=powerpc-unknown
 		os=-morphos
 		;;
+	moxiebox)
+		basic_machine=moxie-unknown
+		os=-moxiebox
+		;;
 	msdos)
 		basic_machine=i386-pc
 		os=-msdos
@@ -822,7 +849,7 @@ case $basic_machine in
 		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
 		;;
 	msys)
-		basic_machine=i386-pc
+		basic_machine=i686-pc
 		os=-msys
 		;;
 	mvs)
@@ -1013,7 +1040,11 @@ case $basic_machine in
 		basic_machine=i586-unknown
 		os=-pw32
 		;;
-	rdos)
+	rdos | rdos64)
+		basic_machine=x86_64-pc
+		os=-rdos
+		;;
+	rdos32)
 		basic_machine=i386-pc
 		os=-rdos
 		;;
@@ -1340,29 +1371,29 @@ case $os in
 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
 	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
-	      | -sym* | -kopensolaris* \
+	      | -sym* | -kopensolaris* | -plan9* \
 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
 	      | -aos* | -aros* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
 	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-	      | -openbsd* | -solidbsd* \
+	      | -bitrig* | -openbsd* | -solidbsd* \
 	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -chorusos* | -chorusrdb* | -cegcc* \
 	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -linux-android* \
-	      | -linux-newlib* | -linux-uclibc* \
-	      | -uxpv* | -beos* | -mpeix* | -udk* \
+	      | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
+	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
+	      | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1486,9 +1517,6 @@ case $os in
 	-aros*)
 		os=-aros
 		;;
-	-kaos*)
-		os=-kaos
-		;;
 	-zvmoe)
 		os=-zvmoe
 		;;
@@ -1537,6 +1565,12 @@ case $basic_machine in
 	c4x-* | tic4x-*)
 		os=-coff
 		;;
+	c8051-*)
+		os=-elf
+		;;
+	hexagon-*)
+		os=-elf
+		;;
 	tic54x-*)
 		os=-coff
 		;;
diff --git a/build-aux/depcomp b/build-aux/depcomp
index e5f9736..4ebd5b3 100755
--- a/build-aux/depcomp
+++ b/build-aux/depcomp
@@ -1,10 +1,9 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
 
-scriptversion=2007-03-29.01
+scriptversion=2013-05-30.07; # UTC
 
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007 Free Software
-# Foundation, Inc.
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -17,9 +16,7 @@ scriptversion=2007-03-29.01
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -30,9 +27,9 @@ scriptversion=2007-03-29.01
 
 case $1 in
   '')
-     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
-     exit 1;
-     ;;
+    echo "$0: No command.  Try '$0 --help' for more information." 1>&2
+    exit 1;
+    ;;
   -h | --h*)
     cat <<\EOF
 Usage: depcomp [--help] [--version] PROGRAM [ARGS]
@@ -42,11 +39,11 @@ as side-effects.
 
 Environment variables:
   depmode     Dependency tracking mode.
-  source      Source file read by `PROGRAMS ARGS'.
-  object      Object file output by `PROGRAMS ARGS'.
+  source      Source file read by 'PROGRAMS ARGS'.
+  object      Object file output by 'PROGRAMS ARGS'.
   DEPDIR      directory where to store dependencies.
   depfile     Dependency file to output.
-  tmpdepfile  Temporary file to use when outputing dependencies.
+  tmpdepfile  Temporary file to use when outputting dependencies.
   libtool     Whether libtool is used (yes/no).
 
 Report bugs to <bug-automake@gnu.org>.
@@ -59,6 +56,66 @@ EOF
     ;;
 esac
 
+# Get the directory component of the given path, and save it in the
+# global variables '$dir'.  Note that this directory component will
+# be either empty or ending with a '/' character.  This is deliberate.
+set_dir_from ()
+{
+  case $1 in
+    */*) dir=`echo "$1" | sed -e 's|/[^/]*$|/|'`;;
+      *) dir=;;
+  esac
+}
+
+# Get the suffix-stripped basename of the given path, and save it the
+# global variable '$base'.
+set_base_from ()
+{
+  base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.[^.]*$//'`
+}
+
+# If no dependency file was actually created by the compiler invocation,
+# we still have to create a dummy depfile, to avoid errors with the
+# Makefile "include basename.Plo" scheme.
+make_dummy_depfile ()
+{
+  echo "#dummy" > "$depfile"
+}
+
+# Factor out some common post-processing of the generated depfile.
+# Requires the auxiliary global variable '$tmpdepfile' to be set.
+aix_post_process_depfile ()
+{
+  # If the compiler actually managed to produce a dependency file,
+  # post-process it.
+  if test -f "$tmpdepfile"; then
+    # Each line is of the form 'foo.o: dependency.h'.
+    # Do two passes, one to just change these to
+    #   $object: dependency.h
+    # and one to simply output
+    #   dependency.h:
+    # which is needed to avoid the deleted-header problem.
+    { sed -e "s,^.*\.[$lower]*:,$object:," < "$tmpdepfile"
+      sed -e "s,^.*\.[$lower]*:[$tab ]*,," -e 's,$,:,' < "$tmpdepfile"
+    } > "$depfile"
+    rm -f "$tmpdepfile"
+  else
+    make_dummy_depfile
+  fi
+}
+
+# A tabulation character.
+tab='	'
+# A newline character.
+nl='
+'
+# Character ranges might be problematic outside the C locale.
+# These definitions help.
+upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ
+lower=abcdefghijklmnopqrstuvwxyz
+digits=0123456789
+alpha=${upper}${lower}
+
 if test -z "$depmode" || test -z "$source" || test -z "$object"; then
   echo "depcomp: Variables source, object and depmode must be set" 1>&2
   exit 1
@@ -71,6 +128,9 @@ tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
 
 rm -f "$tmpdepfile"
 
+# Avoid interferences from the environment.
+gccflag= dashmflag=
+
 # Some modes work just like other modes, but use different flags.  We
 # parameterize here, but still list the modes in the big case below,
 # to make depend.m4 easier to write.  Note that we *cannot* use a case
@@ -82,9 +142,32 @@ if test "$depmode" = hp; then
 fi
 
 if test "$depmode" = dashXmstdout; then
-   # This is just like dashmstdout with a different argument.
-   dashmflag=-xM
-   depmode=dashmstdout
+  # This is just like dashmstdout with a different argument.
+  dashmflag=-xM
+  depmode=dashmstdout
+fi
+
+cygpath_u="cygpath -u -f -"
+if test "$depmode" = msvcmsys; then
+  # This is just like msvisualcpp but w/o cygpath translation.
+  # Just convert the backslash-escaped backslashes to single forward
+  # slashes to satisfy depend.m4
+  cygpath_u='sed s,\\\\,/,g'
+  depmode=msvisualcpp
+fi
+
+if test "$depmode" = msvc7msys; then
+  # This is just like msvc7 but w/o cygpath translation.
+  # Just convert the backslash-escaped backslashes to single forward
+  # slashes to satisfy depend.m4
+  cygpath_u='sed s,\\\\,/,g'
+  depmode=msvc7
+fi
+
+if test "$depmode" = xlc; then
+  # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information.
+  gccflag=-qmakedep=gcc,-MF
+  depmode=gcc
 fi
 
 case "$depmode" in
@@ -107,8 +190,7 @@ gcc3)
   done
   "$@"
   stat=$?
-  if test $stat -eq 0; then :
-  else
+  if test $stat -ne 0; then
     rm -f "$tmpdepfile"
     exit $stat
   fi
@@ -116,13 +198,17 @@ gcc3)
   ;;
 
 gcc)
+## Note that this doesn't just cater to obsosete pre-3.x GCC compilers.
+## but also to in-use compilers like IMB xlc/xlC and the HP C compiler.
+## (see the conditional assignment to $gccflag above).
 ## There are various ways to get dependency output from gcc.  Here's
 ## why we pick this rather obscure method:
 ## - Don't want to use -MD because we'd like the dependencies to end
 ##   up in a subdir.  Having to rename by hand is ugly.
 ##   (We might end up doing this anyway to support other compilers.)
 ## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
-##   -MM, not -M (despite what the docs say).
+##   -MM, not -M (despite what the docs say).  Also, it might not be
+##   supported by the other compilers which use the 'gcc' depmode.
 ## - Using -M directly means running the compiler twice (even worse
 ##   than renaming).
   if test -z "$gccflag"; then
@@ -130,31 +216,31 @@ gcc)
   fi
   "$@" -Wp,"$gccflag$tmpdepfile"
   stat=$?
-  if test $stat -eq 0; then :
-  else
+  if test $stat -ne 0; then
     rm -f "$tmpdepfile"
     exit $stat
   fi
   rm -f "$depfile"
   echo "$object : \\" > "$depfile"
-  alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
-## The second -e expression handles DOS-style file names with drive letters.
+  # The second -e expression handles DOS-style file names with drive
+  # letters.
   sed -e 's/^[^:]*: / /' \
       -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
-## This next piece of magic avoids the `deleted header file' problem.
+## This next piece of magic avoids the "deleted header file" problem.
 ## The problem is that when a header file which appears in a .P file
 ## is deleted, the dependency causes make to die (because there is
 ## typically no way to rebuild the header).  We avoid this by adding
 ## dummy dependencies for each header file.  Too bad gcc doesn't do
 ## this for us directly.
-  tr ' ' '
-' < "$tmpdepfile" |
-## Some versions of gcc put a space before the `:'.  On the theory
+## Some versions of gcc put a space before the ':'.  On the theory
 ## that the space means something, we add a space to the output as
-## well.
+## well.  hp depmode also adds that space, but also prefixes the VPATH
+## to the object.  Take care to not repeat it in the output.
 ## Some versions of the HPUX 10.20 sed can't process this invocation
 ## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+  tr ' ' "$nl" < "$tmpdepfile" \
+    | sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
+    | sed -e 's/$/ :/' >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
 
@@ -172,8 +258,7 @@ sgi)
     "$@" -MDupdate "$tmpdepfile"
   fi
   stat=$?
-  if test $stat -eq 0; then :
-  else
+  if test $stat -ne 0; then
     rm -f "$tmpdepfile"
     exit $stat
   fi
@@ -181,43 +266,41 @@ sgi)
 
   if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
     echo "$object : \\" > "$depfile"
-
     # Clip off the initial element (the dependent).  Don't try to be
     # clever and replace this with sed code, as IRIX sed won't handle
     # lines with more than a fixed number of characters (4096 in
     # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
-    # the IRIX cc adds comments like `#:fec' to the end of the
+    # the IRIX cc adds comments like '#:fec' to the end of the
     # dependency line.
-    tr ' ' '
-' < "$tmpdepfile" \
-    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
-    tr '
-' ' ' >> $depfile
-    echo >> $depfile
-
+    tr ' ' "$nl" < "$tmpdepfile" \
+      | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \
+      | tr "$nl" ' ' >> "$depfile"
+    echo >> "$depfile"
     # The second pass generates a dummy entry for each header file.
-    tr ' ' '
-' < "$tmpdepfile" \
-   | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
-   >> $depfile
+    tr ' ' "$nl" < "$tmpdepfile" \
+      | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
+      >> "$depfile"
   else
-    # The sourcefile does not contain any dependencies, so just
-    # store a dummy comment line, to avoid errors with the Makefile
-    # "include basename.Plo" scheme.
-    echo "#dummy" > "$depfile"
+    make_dummy_depfile
   fi
   rm -f "$tmpdepfile"
   ;;
 
+xlc)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
 aix)
   # The C for AIX Compiler uses -M and outputs the dependencies
   # in a .u file.  In older versions, this file always lives in the
-  # current directory.  Also, the AIX compiler puts `$object:' at the
+  # current directory.  Also, the AIX compiler puts '$object:' at the
   # start of each line; $object doesn't have directory information.
   # Version 6 uses the directory in both cases.
-  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-  test "x$dir" = "x$object" && dir=
-  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+  set_dir_from "$object"
+  set_base_from "$object"
   if test "$libtool" = yes; then
     tmpdepfile1=$dir$base.u
     tmpdepfile2=$base.u
@@ -230,9 +313,7 @@ aix)
     "$@" -M
   fi
   stat=$?
-
-  if test $stat -eq 0; then :
-  else
+  if test $stat -ne 0; then
     rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
     exit $stat
   fi
@@ -241,44 +322,100 @@ aix)
   do
     test -f "$tmpdepfile" && break
   done
-  if test -f "$tmpdepfile"; then
-    # Each line is of the form `foo.o: dependent.h'.
-    # Do two passes, one to just change these to
-    # `$object: dependent.h' and one to simply `dependent.h:'.
-    sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-    # That's a tab and a space in the [].
-    sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
-  else
-    # The sourcefile does not contain any dependencies, so just
-    # store a dummy comment line, to avoid errors with the Makefile
-    # "include basename.Plo" scheme.
-    echo "#dummy" > "$depfile"
+  aix_post_process_depfile
+  ;;
+
+tcc)
+  # tcc (Tiny C Compiler) understand '-MD -MF file' since version 0.9.26
+  # FIXME: That version still under development at the moment of writing.
+  #        Make that this statement remains true also for stable, released
+  #        versions.
+  # It will wrap lines (doesn't matter whether long or short) with a
+  # trailing '\', as in:
+  #
+  #   foo.o : \
+  #    foo.c \
+  #    foo.h \
+  #
+  # It will put a trailing '\' even on the last line, and will use leading
+  # spaces rather than leading tabs (at least since its commit 0394caf7
+  # "Emit spaces for -MD").
+  "$@" -MD -MF "$tmpdepfile"
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
   fi
+  rm -f "$depfile"
+  # Each non-empty line is of the form 'foo.o : \' or ' dep.h \'.
+  # We have to change lines of the first kind to '$object: \'.
+  sed -e "s|.*:|$object :|" < "$tmpdepfile" > "$depfile"
+  # And for each line of the second kind, we have to emit a 'dep.h:'
+  # dummy dependency, to avoid the deleted-header problem.
+  sed -n -e 's|^  *\(.*\) *\\$|\1:|p' < "$tmpdepfile" >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
 
-icc)
-  # Intel's C compiler understands `-MD -MF file'.  However on
-  #    icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
-  # ICC 7.0 will fill foo.d with something like
-  #    foo.o: sub/foo.c
-  #    foo.o: sub/foo.h
-  # which is wrong.  We want:
-  #    sub/foo.o: sub/foo.c
-  #    sub/foo.o: sub/foo.h
-  #    sub/foo.c:
-  #    sub/foo.h:
-  # ICC 7.1 will output
+## The order of this option in the case statement is important, since the
+## shell code in configure will try each of these formats in the order
+## listed in this file.  A plain '-MD' option would be understood by many
+## compilers, so we must ensure this comes after the gcc and icc options.
+pgcc)
+  # Portland's C compiler understands '-MD'.
+  # Will always output deps to 'file.d' where file is the root name of the
+  # source file under compilation, even if file resides in a subdirectory.
+  # The object file name does not affect the name of the '.d' file.
+  # pgcc 10.2 will output
   #    foo.o: sub/foo.c sub/foo.h
-  # and will wrap long lines using \ :
+  # and will wrap long lines using '\' :
   #    foo.o: sub/foo.c ... \
   #     sub/foo.h ... \
   #     ...
+  set_dir_from "$object"
+  # Use the source, not the object, to determine the base name, since
+  # that's sadly what pgcc will do too.
+  set_base_from "$source"
+  tmpdepfile=$base.d
+
+  # For projects that build the same source file twice into different object
+  # files, the pgcc approach of using the *source* file root name can cause
+  # problems in parallel builds.  Use a locking strategy to avoid stomping on
+  # the same $tmpdepfile.
+  lockdir=$base.d-lock
+  trap "
+    echo '$0: caught signal, cleaning up...' >&2
+    rmdir '$lockdir'
+    exit 1
+  " 1 2 13 15
+  numtries=100
+  i=$numtries
+  while test $i -gt 0; do
+    # mkdir is a portable test-and-set.
+    if mkdir "$lockdir" 2>/dev/null; then
+      # This process acquired the lock.
+      "$@" -MD
+      stat=$?
+      # Release the lock.
+      rmdir "$lockdir"
+      break
+    else
+      # If the lock is being held by a different process, wait
+      # until the winning process is done or we timeout.
+      while test -d "$lockdir" && test $i -gt 0; do
+        sleep 1
+        i=`expr $i - 1`
+      done
+    fi
+    i=`expr $i - 1`
+  done
+  trap - 1 2 13 15
+  if test $i -le 0; then
+    echo "$0: failed to acquire lock after $numtries attempts" >&2
+    echo "$0: check lockdir '$lockdir'" >&2
+    exit 1
+  fi
 
-  "$@" -MD -MF "$tmpdepfile"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
+  if test $stat -ne 0; then
     rm -f "$tmpdepfile"
     exit $stat
   fi
@@ -290,8 +427,8 @@ icc)
   sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
   # Some versions of the HPUX 10.20 sed can't process this invocation
   # correctly.  Breaking it into two sed invocations is a workaround.
-  sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
-    sed -e 's/$/ :/' >> "$depfile"
+  sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" \
+    | sed -e 's/$/ :/' >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
 
@@ -302,9 +439,8 @@ hp2)
   # 'foo.d', which lands next to the object file, wherever that
   # happens to be.
   # Much of this is similar to the tru64 case; see comments there.
-  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-  test "x$dir" = "x$object" && dir=
-  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
+  set_dir_from  "$object"
+  set_base_from "$object"
   if test "$libtool" = yes; then
     tmpdepfile1=$dir$base.d
     tmpdepfile2=$dir.libs/$base.d
@@ -315,8 +451,7 @@ hp2)
     "$@" +Maked
   fi
   stat=$?
-  if test $stat -eq 0; then :
-  else
+  if test $stat -ne 0; then
      rm -f "$tmpdepfile1" "$tmpdepfile2"
      exit $stat
   fi
@@ -326,72 +461,107 @@ hp2)
     test -f "$tmpdepfile" && break
   done
   if test -f "$tmpdepfile"; then
-    sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
-    # Add `dependent.h:' lines.
-    sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile"
+    sed -e "s,^.*\.[$lower]*:,$object:," "$tmpdepfile" > "$depfile"
+    # Add 'dependent.h:' lines.
+    sed -ne '2,${
+               s/^ *//
+               s/ \\*$//
+               s/$/:/
+               p
+             }' "$tmpdepfile" >> "$depfile"
   else
-    echo "#dummy" > "$depfile"
+    make_dummy_depfile
   fi
   rm -f "$tmpdepfile" "$tmpdepfile2"
   ;;
 
 tru64)
-   # The Tru64 compiler uses -MD to generate dependencies as a side
-   # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
-   # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
-   # dependencies in `foo.d' instead, so we check for that too.
-   # Subdirectories are respected.
-   dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-   test "x$dir" = "x$object" && dir=
-   base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
-
-   if test "$libtool" = yes; then
-      # With Tru64 cc, shared objects can also be used to make a
-      # static library.  This mechanism is used in libtool 1.4 series to
-      # handle both shared and static libraries in a single compilation.
-      # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
-      #
-      # With libtool 1.5 this exception was removed, and libtool now
-      # generates 2 separate objects for the 2 libraries.  These two
-      # compilations output dependencies in $dir.libs/$base.o.d and
-      # in $dir$base.o.d.  We have to check for both files, because
-      # one of the two compilations can be disabled.  We should prefer
-      # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
-      # automatically cleaned when .libs/ is deleted, while ignoring
-      # the former would cause a distcleancheck panic.
-      tmpdepfile1=$dir.libs/$base.lo.d   # libtool 1.4
-      tmpdepfile2=$dir$base.o.d          # libtool 1.5
-      tmpdepfile3=$dir.libs/$base.o.d    # libtool 1.5
-      tmpdepfile4=$dir.libs/$base.d      # Compaq CCC V6.2-504
-      "$@" -Wc,-MD
-   else
-      tmpdepfile1=$dir$base.o.d
-      tmpdepfile2=$dir$base.d
-      tmpdepfile3=$dir$base.d
-      tmpdepfile4=$dir$base.d
-      "$@" -MD
-   fi
-
-   stat=$?
-   if test $stat -eq 0; then :
-   else
-      rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
-      exit $stat
-   fi
-
-   for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
-   do
-     test -f "$tmpdepfile" && break
-   done
-   if test -f "$tmpdepfile"; then
-      sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-      # That's a tab and a space in the [].
-      sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
-   else
-      echo "#dummy" > "$depfile"
-   fi
-   rm -f "$tmpdepfile"
-   ;;
+  # The Tru64 compiler uses -MD to generate dependencies as a side
+  # effect.  'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'.
+  # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
+  # dependencies in 'foo.d' instead, so we check for that too.
+  # Subdirectories are respected.
+  set_dir_from  "$object"
+  set_base_from "$object"
+
+  if test "$libtool" = yes; then
+    # Libtool generates 2 separate objects for the 2 libraries.  These
+    # two compilations output dependencies in $dir.libs/$base.o.d and
+    # in $dir$base.o.d.  We have to check for both files, because
+    # one of the two compilations can be disabled.  We should prefer
+    # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
+    # automatically cleaned when .libs/ is deleted, while ignoring
+    # the former would cause a distcleancheck panic.
+    tmpdepfile1=$dir$base.o.d          # libtool 1.5
+    tmpdepfile2=$dir.libs/$base.o.d    # Likewise.
+    tmpdepfile3=$dir.libs/$base.d      # Compaq CCC V6.2-504
+    "$@" -Wc,-MD
+  else
+    tmpdepfile1=$dir$base.d
+    tmpdepfile2=$dir$base.d
+    tmpdepfile3=$dir$base.d
+    "$@" -MD
+  fi
+
+  stat=$?
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+    exit $stat
+  fi
+
+  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+  do
+    test -f "$tmpdepfile" && break
+  done
+  # Same post-processing that is required for AIX mode.
+  aix_post_process_depfile
+  ;;
+
+msvc7)
+  if test "$libtool" = yes; then
+    showIncludes=-Wc,-showIncludes
+  else
+    showIncludes=-showIncludes
+  fi
+  "$@" $showIncludes > "$tmpdepfile"
+  stat=$?
+  grep -v '^Note: including file: ' "$tmpdepfile"
+  if test $stat -ne 0; then
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  # The first sed program below extracts the file names and escapes
+  # backslashes for cygpath.  The second sed program outputs the file
+  # name when reading, but also accumulates all include files in the
+  # hold buffer in order to output them again at the end.  This only
+  # works with sed implementations that can handle large buffers.
+  sed < "$tmpdepfile" -n '
+/^Note: including file:  *\(.*\)/ {
+  s//\1/
+  s/\\/\\\\/g
+  p
+}' | $cygpath_u | sort -u | sed -n '
+s/ /\\ /g
+s/\(.*\)/'"$tab"'\1 \\/p
+s/.\(.*\) \\/\1:/
+H
+$ {
+  s/.*/'"$tab"'/
+  G
+  p
+}' >> "$depfile"
+  echo >> "$depfile" # make sure the fragment doesn't end with a backslash
+  rm -f "$tmpdepfile"
+  ;;
+
+msvc7msys)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
 
 #nosideeffect)
   # This comment above is used by automake to tell side-effect
@@ -404,13 +574,13 @@ dashmstdout)
 
   # Remove the call to Libtool.
   if test "$libtool" = yes; then
-    while test $1 != '--mode=compile'; do
+    while test "X$1" != 'X--mode=compile'; do
       shift
     done
     shift
   fi
 
-  # Remove `-o $object'.
+  # Remove '-o $object'.
   IFS=" "
   for arg
   do
@@ -430,18 +600,18 @@ dashmstdout)
   done
 
   test -z "$dashmflag" && dashmflag=-M
-  # Require at least two characters before searching for `:'
+  # Require at least two characters before searching for ':'
   # in the target name.  This is to cope with DOS-style filenames:
-  # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
+  # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise.
   "$@" $dashmflag |
-    sed 's:^[  ]*[^: ][^:][^:]*\:[    ]*:'"$object"'\: :' > "$tmpdepfile"
+    sed "s|^[$tab ]*[^:$tab ][^:][^:]*:[$tab ]*|$object: |" > "$tmpdepfile"
   rm -f "$depfile"
   cat < "$tmpdepfile" > "$depfile"
-  tr ' ' '
-' < "$tmpdepfile" | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+  # Some versions of the HPUX 10.20 sed can't process this sed invocation
+  # correctly.  Breaking it into two sed invocations is a workaround.
+  tr ' ' "$nl" < "$tmpdepfile" \
+    | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
+    | sed -e 's/$/ :/' >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
 
@@ -455,41 +625,51 @@ makedepend)
   "$@" || exit $?
   # Remove any Libtool call
   if test "$libtool" = yes; then
-    while test $1 != '--mode=compile'; do
+    while test "X$1" != 'X--mode=compile'; do
       shift
     done
     shift
   fi
   # X makedepend
   shift
-  cleared=no
-  for arg in "$@"; do
+  cleared=no eat=no
+  for arg
+  do
     case $cleared in
     no)
       set ""; shift
       cleared=yes ;;
     esac
+    if test $eat = yes; then
+      eat=no
+      continue
+    fi
     case "$arg" in
     -D*|-I*)
       set fnord "$@" "$arg"; shift ;;
     # Strip any option that makedepend may not understand.  Remove
     # the object too, otherwise makedepend will parse it as a source file.
+    -arch)
+      eat=yes ;;
     -*|$object)
       ;;
     *)
       set fnord "$@" "$arg"; shift ;;
     esac
   done
-  obj_suffix="`echo $object | sed 's/^.*\././'`"
+  obj_suffix=`echo "$object" | sed 's/^.*\././'`
   touch "$tmpdepfile"
   ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
   rm -f "$depfile"
-  cat < "$tmpdepfile" > "$depfile"
-  sed '1,2d' "$tmpdepfile" | tr ' ' '
-' | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+  # makedepend may prepend the VPATH from the source file name to the object.
+  # No need to regex-escape $object, excess matching of '.' is harmless.
+  sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile"
+  # Some versions of the HPUX 10.20 sed can't process the last invocation
+  # correctly.  Breaking it into two sed invocations is a workaround.
+  sed '1,2d' "$tmpdepfile" \
+    | tr ' ' "$nl" \
+    | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \
+    | sed -e 's/$/ :/' >> "$depfile"
   rm -f "$tmpdepfile" "$tmpdepfile".bak
   ;;
 
@@ -500,13 +680,13 @@ cpp)
 
   # Remove the call to Libtool.
   if test "$libtool" = yes; then
-    while test $1 != '--mode=compile'; do
+    while test "X$1" != 'X--mode=compile'; do
       shift
     done
     shift
   fi
 
-  # Remove `-o $object'.
+  # Remove '-o $object'.
   IFS=" "
   for arg
   do
@@ -525,10 +705,10 @@ cpp)
     esac
   done
 
-  "$@" -E |
-    sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
-       -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
-    sed '$ s: \\$::' > "$tmpdepfile"
+  "$@" -E \
+    | sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
+             -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
+    | sed '$ s: \\$::' > "$tmpdepfile"
   rm -f "$depfile"
   echo "$object : \\" > "$depfile"
   cat < "$tmpdepfile" >> "$depfile"
@@ -538,35 +718,56 @@ cpp)
 
 msvisualcpp)
   # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout, regardless of -o,
-  # because we must use -o when running libtool.
+  # always write the preprocessed file to stdout.
   "$@" || exit $?
+
+  # Remove the call to Libtool.
+  if test "$libtool" = yes; then
+    while test "X$1" != 'X--mode=compile'; do
+      shift
+    done
+    shift
+  fi
+
   IFS=" "
   for arg
   do
     case "$arg" in
+    -o)
+      shift
+      ;;
+    $object)
+      shift
+      ;;
     "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
-	set fnord "$@"
-	shift
-	shift
-	;;
+        set fnord "$@"
+        shift
+        shift
+        ;;
     *)
-	set fnord "$@" "$arg"
-	shift
-	shift
-	;;
+        set fnord "$@" "$arg"
+        shift
+        shift
+        ;;
     esac
   done
-  "$@" -E |
-  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
+  "$@" -E 2>/dev/null |
+  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile"
   rm -f "$depfile"
   echo "$object : \\" > "$depfile"
-  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
-  echo "	" >> "$depfile"
-  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile"
+  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile"
+  echo "$tab" >> "$depfile"
+  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
 
+msvcmsys)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
 none)
   exec "$@"
   ;;
@@ -585,5 +786,6 @@ exit 0
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
 # End:
diff --git a/build-aux/install-sh b/build-aux/install-sh
index a5897de..377bb86 100755
--- a/build-aux/install-sh
+++ b/build-aux/install-sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2006-12-25.00
+scriptversion=2011-11-20.07; # UTC
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -35,7 +35,7 @@ scriptversion=2006-12-25.00
 # FSF changes to this file are in the public domain.
 #
 # Calling this script install-sh is preferred over install.sh, to prevent
-# `make' implicit rules from creating a file called install from it
+# 'make' implicit rules from creating a file called install from it
 # when there is no Makefile.
 #
 # This script is compatible with the BSD install script, but was written
@@ -156,6 +156,10 @@ while test $# -ne 0; do
     -s) stripcmd=$stripprog;;
 
     -t) dst_arg=$2
+	# Protect names problematic for 'test' and other utilities.
+	case $dst_arg in
+	  -* | [=\(\)!]) dst_arg=./$dst_arg;;
+	esac
 	shift;;
 
     -T) no_target_directory=true;;
@@ -186,6 +190,10 @@ if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
     fi
     shift # arg
     dst_arg=$arg
+    # Protect names problematic for 'test' and other utilities.
+    case $dst_arg in
+      -* | [=\(\)!]) dst_arg=./$dst_arg;;
+    esac
   done
 fi
 
@@ -194,13 +202,17 @@ if test $# -eq 0; then
     echo "$0: no input file specified." >&2
     exit 1
   fi
-  # It's OK to call `install-sh -d' without argument.
+  # It's OK to call 'install-sh -d' without argument.
   # This can happen when creating conditional directories.
   exit 0
 fi
 
 if test -z "$dir_arg"; then
-  trap '(exit $?); exit' 1 2 13 15
+  do_exit='(exit $ret); exit $ret'
+  trap "ret=129; $do_exit" 1
+  trap "ret=130; $do_exit" 2
+  trap "ret=141; $do_exit" 13
+  trap "ret=143; $do_exit" 15
 
   # Set umask so as not to create temps with too-generous modes.
   # However, 'strip' requires both read and write access to temps.
@@ -228,9 +240,9 @@ fi
 
 for src
 do
-  # Protect names starting with `-'.
+  # Protect names problematic for 'test' and other utilities.
   case $src in
-    -*) src=./$src;;
+    -* | [=\(\)!]) src=./$src;;
   esac
 
   if test -n "$dir_arg"; then
@@ -252,12 +264,7 @@ do
       echo "$0: no destination specified." >&2
       exit 1
     fi
-
     dst=$dst_arg
-    # Protect names starting with `-'.
-    case $dst in
-      -*) dst=./$dst;;
-    esac
 
     # If destination is a directory, append the input filename; won't work
     # if double slashes aren't ignored.
@@ -347,7 +354,7 @@ do
 	      if test -z "$dir_arg" || {
 		   # Check for POSIX incompatibilities with -m.
 		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
-		   # other-writeable bit of parent directory when it shouldn't.
+		   # other-writable bit of parent directory when it shouldn't.
 		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
 		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
 		   case $ls_ld_tmpdir in
@@ -385,7 +392,7 @@ do
 
       case $dstdir in
 	/*) prefix='/';;
-	-*) prefix='./';;
+	[-=\(\)!]*) prefix='./';;
 	*)  prefix='';;
       esac
 
@@ -403,7 +410,7 @@ do
 
       for d
       do
-	test -z "$d" && continue
+	test X"$d" = X && continue
 
 	prefix=$prefix$d
 	if test -d "$prefix"; then
@@ -515,5 +522,6 @@ done
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
 # End:
diff --git a/build-aux/missing b/build-aux/missing
index 86a8fc3..db98974 100755
--- a/build-aux/missing
+++ b/build-aux/missing
@@ -1,11 +1,10 @@
 #! /bin/sh
-# Common stub for a few missing GNU programs while installing.
+# Common wrapper for a few potentially missing GNU programs.
 
-scriptversion=2012-01-06.13; # UTC
+scriptversion=2013-10-28.13; # UTC
 
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
-# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
-# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -26,68 +25,40 @@ scriptversion=2012-01-06.13; # UTC
 # the same distribution terms that you use for the rest of that program.
 
 if test $# -eq 0; then
-  echo 1>&2 "Try \`$0 --help' for more information"
+  echo 1>&2 "Try '$0 --help' for more information"
   exit 1
 fi
 
-run=:
-sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
-sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
-
-# In the cases where this matters, `missing' is being run in the
-# srcdir already.
-if test -f configure.ac; then
-  configure_ac=configure.ac
-else
-  configure_ac=configure.in
-fi
+case $1 in
 
-msg="missing on your system"
+  --is-lightweight)
+    # Used by our autoconf macros to check whether the available missing
+    # script is modern enough.
+    exit 0
+    ;;
 
-case $1 in
---run)
-  # Try to run requested program, and just exit if it succeeds.
-  run=
-  shift
-  "$@" && exit 0
-  # Exit code 63 means version mismatch.  This often happens
-  # when the user try to use an ancient version of a tool on
-  # a file that requires a minimum version.  In this case we
-  # we should proceed has if the program had been absent, or
-  # if --run hadn't been passed.
-  if test $? = 63; then
-    run=:
-    msg="probably too old"
-  fi
-  ;;
+  --run)
+    # Back-compat with the calling convention used by older automake.
+    shift
+    ;;
 
   -h|--h|--he|--hel|--help)
     echo "\
 $0 [OPTION]... PROGRAM [ARGUMENT]...
 
-Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
-error status if there is no known handling for PROGRAM.
+Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due
+to PROGRAM being missing or too old.
 
 Options:
   -h, --help      display this help and exit
   -v, --version   output version information and exit
-  --run           try to run the given command, and emulate it if it fails
 
 Supported PROGRAM values:
-  aclocal      touch file \`aclocal.m4'
-  autoconf     touch file \`configure'
-  autoheader   touch file \`config.h.in'
-  autom4te     touch the output file, or create a stub one
-  automake     touch all \`Makefile.in' files
-  bison        create \`y.tab.[ch]', if possible, from existing .[ch]
-  flex         create \`lex.yy.c', if possible, from existing .c
-  help2man     touch the output file
-  lex          create \`lex.yy.c', if possible, from existing .c
-  makeinfo     touch the output file
-  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
+  aclocal   autoconf  autoheader   autom4te  automake  makeinfo
+  bison     yacc      flex         lex       help2man
 
-Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
-\`g' are ignored when checking the name.
+Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and
+'g' are ignored when checking the name.
 
 Send bug reports to <bug-automake@gnu.org>."
     exit $?
@@ -99,228 +70,141 @@ Send bug reports to <bug-automake@gnu.org>."
     ;;
 
   -*)
-    echo 1>&2 "$0: Unknown \`$1' option"
-    echo 1>&2 "Try \`$0 --help' for more information"
+    echo 1>&2 "$0: unknown '$1' option"
+    echo 1>&2 "Try '$0 --help' for more information"
     exit 1
     ;;
 
 esac
 
-# normalize program name to check for.
-program=`echo "$1" | sed '
-  s/^gnu-//; t
-  s/^gnu//; t
-  s/^g//; t'`
-
-# Now exit if we have it, but it failed.  Also exit now if we
-# don't have it and --version was passed (most likely to detect
-# the program).  This is about non-GNU programs, so use $1 not
-# $program.
-case $1 in
-  lex*|yacc*)
-    # Not GNU programs, they don't have --version.
-    ;;
-
-  *)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-       # Could not run --version or --help.  This is probably someone
-       # running `$TOOL --version' or `$TOOL --help' to check whether
-       # $TOOL exists and not knowing $TOOL uses missing.
-       exit 1
-    fi
-    ;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case $program in
-  aclocal*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
-         to install the \`Automake' and \`Perl' packages.  Grab them from
-         any GNU archive site."
-    touch aclocal.m4
-    ;;
-
-  autoconf*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`${configure_ac}'.  You might want to install the
-         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
-         archive site."
-    touch configure
-    ;;
-
-  autoheader*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
-         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
-         from any GNU archive site."
-    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
-    test -z "$files" && files="config.h"
-    touch_files=
-    for f in $files; do
-      case $f in
-      *:*) touch_files="$touch_files "`echo "$f" |
-				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
-      *) touch_files="$touch_files $f.in";;
-      esac
-    done
-    touch $touch_files
-    ;;
-
-  automake*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
-         You might want to install the \`Automake' and \`Perl' packages.
-         Grab them from any GNU archive site."
-    find . -type f -name Makefile.am -print |
-	   sed 's/\.am$/.in/' |
-	   while read f; do touch "$f"; done
-    ;;
-
-  autom4te*)
-    echo 1>&2 "\
-WARNING: \`$1' is needed, but is $msg.
-         You might have modified some files without having the
-         proper tools for further handling them.
-         You can get \`$1' as part of \`Autoconf' from any GNU
-         archive site."
-
-    file=`echo "$*" | sed -n "$sed_output"`
-    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-    if test -f "$file"; then
-	touch $file
-    else
-	test -z "$file" || exec >$file
-	echo "#! /bin/sh"
-	echo "# Created by GNU Automake missing as a replacement of"
-	echo "#  $ $@"
-	echo "exit 0"
-	chmod +x $file
-	exit 1
-    fi
-    ;;
-
-  bison*|yacc*)
-    echo 1>&2 "\
-WARNING: \`$1' $msg.  You should only need it if
-         you modified a \`.y' file.  You may need the \`Bison' package
-         in order for those modifications to take effect.  You can get
-         \`Bison' from any GNU archive site."
-    rm -f y.tab.c y.tab.h
-    if test $# -ne 1; then
-        eval LASTARG=\${$#}
-	case $LASTARG in
-	*.y)
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
-	    if test -f "$SRCFILE"; then
-	         cp "$SRCFILE" y.tab.c
-	    fi
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
-	    if test -f "$SRCFILE"; then
-	         cp "$SRCFILE" y.tab.h
-	    fi
-	  ;;
-	esac
-    fi
-    if test ! -f y.tab.h; then
-	echo >y.tab.h
-    fi
-    if test ! -f y.tab.c; then
-	echo 'main() { return 0; }' >y.tab.c
-    fi
-    ;;
-
-  lex*|flex*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified a \`.l' file.  You may need the \`Flex' package
-         in order for those modifications to take effect.  You can get
-         \`Flex' from any GNU archive site."
-    rm -f lex.yy.c
-    if test $# -ne 1; then
-        eval LASTARG=\${$#}
-	case $LASTARG in
-	*.l)
-	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
-	    if test -f "$SRCFILE"; then
-	         cp "$SRCFILE" lex.yy.c
-	    fi
-	  ;;
-	esac
-    fi
-    if test ! -f lex.yy.c; then
-	echo 'main() { return 0; }' >lex.yy.c
-    fi
-    ;;
-
-  help2man*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-	 you modified a dependency of a manual page.  You may need the
-	 \`Help2man' package in order for those modifications to take
-	 effect.  You can get \`Help2man' from any GNU archive site."
-
-    file=`echo "$*" | sed -n "$sed_output"`
-    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-    if test -f "$file"; then
-	touch $file
-    else
-	test -z "$file" || exec >$file
-	echo ".ab help2man is required to generate this page"
-	exit $?
-    fi
-    ;;
-
-  makeinfo*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified a \`.texi' or \`.texinfo' file, or any other file
-         indirectly affecting the aspect of the manual.  The spurious
-         call might also be the consequence of using a buggy \`make' (AIX,
-         DU, IRIX).  You might want to install the \`Texinfo' package or
-         the \`GNU make' package.  Grab either from any GNU archive site."
-    # The file to touch is that specified with -o ...
-    file=`echo "$*" | sed -n "$sed_output"`
-    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-    if test -z "$file"; then
-      # ... or it is the one specified with @setfilename ...
-      infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-      file=`sed -n '
-	/^@setfilename/{
-	  s/.* \([^ ]*\) *$/\1/
-	  p
-	  q
-	}' $infile`
-      # ... or it is derived from the source name (dir/f.texi becomes f.info)
-      test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
-    fi
-    # If the file does not exist, the user really needs makeinfo;
-    # let's fail without touching anything.
-    test -f $file || exit 1
-    touch $file
-    ;;
+# Run the given program, remember its exit status.
+"$@"; st=$?
+
+# If it succeeded, we are done.
+test $st -eq 0 && exit 0
+
+# Also exit now if we it failed (or wasn't found), and '--version' was
+# passed; such an option is passed most likely to detect whether the
+# program is present and works.
+case $2 in --version|--help) exit $st;; esac
+
+# Exit code 63 means version mismatch.  This often happens when the user
+# tries to use an ancient version of a tool on a file that requires a
+# minimum version.
+if test $st -eq 63; then
+  msg="probably too old"
+elif test $st -eq 127; then
+  # Program was missing.
+  msg="missing on your system"
+else
+  # Program was found and executed, but failed.  Give up.
+  exit $st
+fi
 
-  *)
-    echo 1>&2 "\
-WARNING: \`$1' is needed, and is $msg.
-         You might have modified some files without having the
-         proper tools for further handling them.  Check the \`README' file,
-         it often tells you about the needed prerequisites for installing
-         this package.  You may also peek at any GNU archive site, in case
-         some other package would contain this missing \`$1' program."
-    exit 1
+perl_URL=http://www.perl.org/
+flex_URL=http://flex.sourceforge.net/
+gnu_software_URL=http://www.gnu.org/software
+
+program_details ()
+{
+  case $1 in
+    aclocal|automake)
+      echo "The '$1' program is part of the GNU Automake package:"
+      echo "<$gnu_software_URL/automake>"
+      echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:"
+      echo "<$gnu_software_URL/autoconf>"
+      echo "<$gnu_software_URL/m4/>"
+      echo "<$perl_URL>"
+      ;;
+    autoconf|autom4te|autoheader)
+      echo "The '$1' program is part of the GNU Autoconf package:"
+      echo "<$gnu_software_URL/autoconf/>"
+      echo "It also requires GNU m4 and Perl in order to run:"
+      echo "<$gnu_software_URL/m4/>"
+      echo "<$perl_URL>"
+      ;;
+  esac
+}
+
+give_advice ()
+{
+  # Normalize program name to check for.
+  normalized_program=`echo "$1" | sed '
+    s/^gnu-//; t
+    s/^gnu//; t
+    s/^g//; t'`
+
+  printf '%s\n' "'$1' is $msg."
+
+  configure_deps="'configure.ac' or m4 files included by 'configure.ac'"
+  case $normalized_program in
+    autoconf*)
+      echo "You should only need it if you modified 'configure.ac',"
+      echo "or m4 files included by it."
+      program_details 'autoconf'
+      ;;
+    autoheader*)
+      echo "You should only need it if you modified 'acconfig.h' or"
+      echo "$configure_deps."
+      program_details 'autoheader'
+      ;;
+    automake*)
+      echo "You should only need it if you modified 'Makefile.am' or"
+      echo "$configure_deps."
+      program_details 'automake'
+      ;;
+    aclocal*)
+      echo "You should only need it if you modified 'acinclude.m4' or"
+      echo "$configure_deps."
+      program_details 'aclocal'
+      ;;
+   autom4te*)
+      echo "You might have modified some maintainer files that require"
+      echo "the 'autom4te' program to be rebuilt."
+      program_details 'autom4te'
+      ;;
+    bison*|yacc*)
+      echo "You should only need it if you modified a '.y' file."
+      echo "You may want to install the GNU Bison package:"
+      echo "<$gnu_software_URL/bison/>"
+      ;;
+    lex*|flex*)
+      echo "You should only need it if you modified a '.l' file."
+      echo "You may want to install the Fast Lexical Analyzer package:"
+      echo "<$flex_URL>"
+      ;;
+    help2man*)
+      echo "You should only need it if you modified a dependency" \
+           "of a man page."
+      echo "You may want to install the GNU Help2man package:"
+      echo "<$gnu_software_URL/help2man/>"
     ;;
-esac
-
-exit 0
+    makeinfo*)
+      echo "You should only need it if you modified a '.texi' file, or"
+      echo "any other file indirectly affecting the aspect of the manual."
+      echo "You might want to install the Texinfo package:"
+      echo "<$gnu_software_URL/texinfo/>"
+      echo "The spurious makeinfo call might also be the consequence of"
+      echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might"
+      echo "want to install GNU make:"
+      echo "<$gnu_software_URL/make/>"
+      ;;
+    *)
+      echo "You might have modified some files without having the proper"
+      echo "tools for further handling them.  Check the 'README' file, it"
+      echo "often tells you about the needed prerequisites for installing"
+      echo "this package.  You may also peek at any GNU archive site, in"
+      echo "case some other package contains this missing '$1' program."
+      ;;
+  esac
+}
+
+give_advice "$1" | sed -e '1s/^/WARNING: /' \
+                       -e '2,$s/^/         /' >&2
+
+# Propagate the correct exit status (expected to be 127 for a program
+# not found, 63 for a program that failed due to version mismatch).
+exit $st
 
 # Local variables:
 # eval: (add-hook 'write-file-hooks 'time-stamp)
diff --git a/config.h.in b/config.h.in
index 8e0137b..2bbae90 100644
--- a/config.h.in
+++ b/config.h.in
@@ -281,5 +281,5 @@
 #define GPG_ERR_ENABLE_ERRNO_MACROS 1
 
 #define CRIGHTBLURB "Copyright (C) 2000 Werner Koch\n" \
-                    "Copyright (C) 2001--2013 g10 Code GmbH\n"
+                    "Copyright (C) 2001--2015 g10 Code GmbH\n"
 
diff --git a/configure b/configure
index 7fae0be..f93da1d 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for gpgme 1.5.3.
+# Generated by GNU Autoconf 2.69 for gpgme 1.5.4.
 #
 # Report bugs to <http://bugs.gnupg.org>.
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='gpgme'
 PACKAGE_TARNAME='gpgme'
-PACKAGE_VERSION='1.5.3'
-PACKAGE_STRING='gpgme 1.5.3'
+PACKAGE_VERSION='1.5.4'
+PACKAGE_STRING='gpgme 1.5.4'
 PACKAGE_BUGREPORT='http://bugs.gnupg.org'
 PACKAGE_URL=''
 
@@ -752,10 +752,6 @@ LDFLAGS
 CFLAGS
 CC
 SYSROOT
-AM_BACKSLASH
-AM_DEFAULT_VERBOSITY
-AM_DEFAULT_V
-AM_V
 host_os
 host_vendor
 host_cpu
@@ -767,6 +763,10 @@ build
 MAINT
 MAINTAINER_MODE_FALSE
 MAINTAINER_MODE_TRUE
+AM_BACKSLASH
+AM_DEFAULT_VERBOSITY
+AM_DEFAULT_V
+AM_V
 am__untar
 am__tar
 AMTAR
@@ -831,8 +831,8 @@ SHELL'
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
-enable_maintainer_mode
 enable_silent_rules
+enable_maintainer_mode
 enable_dependency_tracking
 enable_static
 enable_shared
@@ -1409,7 +1409,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures gpgme 1.5.3 to adapt to many kinds of systems.
+\`configure' configures gpgme 1.5.4 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1479,7 +1479,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of gpgme 1.5.3:";;
+     short | recursive ) echo "Configuration of gpgme 1.5.4:";;
    esac
   cat <<\_ACEOF
 
@@ -1487,12 +1487,15 @@ Optional Features:
   --disable-option-checking  ignore unrecognized --enable/--with options
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --enable-maintainer-mode  enable make rules and dependencies not useful
-			  (and sometimes confusing) to the casual installer
-  --enable-silent-rules          less verbose build output (undo: `make V=1')
-  --disable-silent-rules         verbose build output (undo: `make V=0')
-  --disable-dependency-tracking  speeds up one-time build
-  --enable-dependency-tracking   do not reject slow dependency extractors
+  --enable-silent-rules   less verbose build output (undo: "make V=1")
+  --disable-silent-rules  verbose build output (undo: "make V=0")
+  --enable-maintainer-mode
+                          enable make rules and dependencies not useful (and
+                          sometimes confusing) to the casual installer
+  --enable-dependency-tracking
+                          do not reject slow dependency extractors
+  --disable-dependency-tracking
+                          speeds up one-time build
   --enable-static[=PKGS]  build static libraries [default=no]
   --enable-shared[=PKGS]  build shared libraries [default=yes]
   --enable-fast-install[=PKGS]
@@ -1604,7 +1607,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-gpgme configure 1.5.3
+gpgme configure 1.5.4
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2434,7 +2437,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by gpgme $as_me 1.5.3, which was
+It was created by gpgme $as_me 1.5.4, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2801,7 +2804,7 @@ LIBGPGME_LT_CURRENT=24
 # Subtract 2 from this value if you want to make the LFS transition an
 # ABI break.  [Note to self: Remove this comment with the next regular break.]
 LIBGPGME_LT_AGE=13
-LIBGPGME_LT_REVISION=2
+LIBGPGME_LT_REVISION=3
 
 # If the API is changed in an incompatible way: increment the next counter.
 GPGME_CONFIG_API_VERSION=1
@@ -2848,9 +2851,7 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 ac_config_headers="$ac_config_headers config.h"
 
-# Note: For automake 1.13 add the option
-#          serial-tests
-am__api_version='1.11'
+am__api_version='1.14'
 
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
@@ -2947,9 +2948,6 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
 $as_echo_n "checking whether build environment is sane... " >&6; }
-# Just in case
-sleep 1
-echo timestamp > conftest.file
 # Reject unsafe characters in $srcdir or the absolute working directory
 # name.  Accept space and tab only in the latter.
 am_lf='
@@ -2960,32 +2958,40 @@ case `pwd` in
 esac
 case $srcdir in
   *[\\\"\#\$\&\'\`$am_lf\ \	]*)
-    as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
+    as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;;
 esac
 
-# Do `set' in a subshell so we don't clobber the current shell's
+# Do 'set' in a subshell so we don't clobber the current shell's
 # arguments.  Must try -L first in case configure is actually a
 # symlink; some systems play weird games with the mod time of symlinks
 # (eg FreeBSD returns the mod time of the symlink's containing
 # directory).
 if (
-   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
-   if test "$*" = "X"; then
-      # -L didn't work.
-      set X `ls -t "$srcdir/configure" conftest.file`
-   fi
-   rm -f conftest.file
-   if test "$*" != "X $srcdir/configure conftest.file" \
-      && test "$*" != "X conftest.file $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" "$LINENO" 5
-   fi
-
+   am_has_slept=no
+   for am_try in 1 2; do
+     echo "timestamp, slept: $am_has_slept" > conftest.file
+     set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+     if test "$*" = "X"; then
+	# -L didn't work.
+	set X `ls -t "$srcdir/configure" conftest.file`
+     fi
+     if test "$*" != "X $srcdir/configure conftest.file" \
+	&& test "$*" != "X conftest.file $srcdir/configure"; then
+
+	# If neither matched, then we have a broken ls.  This can happen
+	# if, for instance, CONFIG_SHELL is bash and it inherits a
+	# broken ls alias from the environment.  This has actually
+	# happened.  Such a system could not be considered "sane".
+	as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
+  alias in your environment" "$LINENO" 5
+     fi
+     if test "$2" = conftest.file || test $am_try -eq 2; then
+       break
+     fi
+     # Just in case.
+     sleep 1
+     am_has_slept=yes
+   done
    test "$2" = conftest.file
    )
 then
@@ -2997,6 +3003,16 @@ Check your system clock" "$LINENO" 5
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
+# If we didn't sleep, we still need to ensure time stamps of config.status and
+# generated files are strictly newer.
+am_sleep_pid=
+if grep 'slept: no' conftest.file >/dev/null 2>&1; then
+  ( sleep 1 ) &
+  am_sleep_pid=$!
+fi
+
+rm -f conftest.file
+
 test "$program_prefix" != NONE &&
   program_transform_name="s&^&$program_prefix&;$program_transform_name"
 # Use a double $ so make ignores it.
@@ -3007,8 +3023,8 @@ test "$program_suffix" != NONE &&
 ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
 program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
 
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
+# Expand $ac_aux_dir to an absolute path.
+am_aux_dir=`cd "$ac_aux_dir" && pwd`
 
 if test x"${MISSING+set}" != xset; then
   case $am_aux_dir in
@@ -3019,12 +3035,12 @@ if test x"${MISSING+set}" != xset; then
   esac
 fi
 # Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
+if eval "$MISSING --is-lightweight"; then
+  am_missing_run="$MISSING "
 else
   am_missing_run=
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
-$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
+$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
 fi
 
 if test x"${install_sh}" != xset; then
@@ -3036,10 +3052,10 @@ if test x"${install_sh}" != xset; then
   esac
 fi
 
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'.  However `strip' might not be the right
+# Installed binaries are usually stripped using 'strip' when the user
+# run "make install-strip".  However 'strip' might not be the right
 # tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
+# will honor the 'STRIP' environment variable to overrule this program.
 if test "$cross_compiling" != no; then
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
@@ -3178,12 +3194,6 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
 $as_echo "$MKDIR_P" >&6; }
 
-mkdir_p="$MKDIR_P"
-case $mkdir_p in
-  [\\/$]* | ?:[\\/]*) ;;
-  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-esac
-
 for ac_prog in gawk mawk nawk awk
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
@@ -3266,6 +3276,45 @@ else
 fi
 rmdir .tst 2>/dev/null
 
+# Check whether --enable-silent-rules was given.
+if test "${enable_silent_rules+set}" = set; then :
+  enableval=$enable_silent_rules;
+fi
+
+case $enable_silent_rules in # (((
+  yes) AM_DEFAULT_VERBOSITY=0;;
+   no) AM_DEFAULT_VERBOSITY=1;;
+    *) AM_DEFAULT_VERBOSITY=1;;
+esac
+am_make=${MAKE-make}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
+$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
+if ${am_cv_make_support_nested_variables+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if $as_echo 'TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+	@$(TRUE)
+.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
+  am_cv_make_support_nested_variables=yes
+else
+  am_cv_make_support_nested_variables=no
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
+$as_echo "$am_cv_make_support_nested_variables" >&6; }
+if test $am_cv_make_support_nested_variables = yes; then
+    AM_V='$(V)'
+  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+  AM_V=$AM_DEFAULT_VERBOSITY
+  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
+AM_BACKSLASH='\'
+
 if test "`cd $srcdir && pwd`" != "`pwd`"; then
   # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
   # is not polluted with repeated "-I."
@@ -3288,7 +3337,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='gpgme'
- VERSION='1.5.3'
+ VERSION='1.5.4'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3316,12 +3365,22 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
 
 MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
 
+# For better backward compatibility.  To be removed once Automake 1.9.x
+# dies out for good.  For more background, see:
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
+mkdir_p='$(MKDIR_P)'
+
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
 # Always define AMTAR for backward compatibility.  Yes, it's still used
 # in the wild :-(  We should find a proper way to deprecate it ...
 AMTAR='$${TAR-tar}'
 
+
+# We'll loop over all known methods to create a tar archive until one works.
+_am_tools='gnutar  pax cpio none'
+
 am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
 
 
@@ -3329,6 +3388,49 @@ am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
 
 
 
+# POSIX will say in a future version that running "rm -f" with no argument
+# is OK; and we want to be able to make that assumption in our Makefile
+# recipes.  So use an aggressive probe to check that the usage we want is
+# actually supported "in the wild" to an acceptable degree.
+# See automake bug#10828.
+# To make any issue more visible, cause the running configure to be aborted
+# by default if the 'rm' program in use doesn't match our expectations; the
+# user can still override this though.
+if rm -f && rm -fr && rm -rf; then : OK; else
+  cat >&2 <<'END'
+Oops!
+
+Your 'rm' program seems unable to run without file operands specified
+on the command line, even when the '-f' option is present.  This is contrary
+to the behaviour of most rm programs out there, and not conforming with
+the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
+
+Please tell bug-automake@gnu.org about your system, including the value
+of your $PATH and any error possibly output before this message.  This
+can help us improve future automake versions.
+
+END
+  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
+    echo 'Configuration will proceed anyway, since you have set the' >&2
+    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
+    echo >&2
+  else
+    cat >&2 <<'END'
+Aborting the configuration process, to ensure you take notice of the issue.
+
+You can download and install GNU coreutils to get an 'rm' implementation
+that behaves properly: <http://www.gnu.org/software/coreutils/>.
+
+If you want to complete the configuration process using your problematic
+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
+to "yes", and re-run configure.
+
+END
+    as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
+  fi
+fi
+
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
 $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
     # Check whether --enable-maintainer-mode was given.
@@ -3427,10 +3529,10 @@ if test "${enable_silent_rules+set}" = set; then :
   enableval=$enable_silent_rules;
 fi
 
-case $enable_silent_rules in
-yes) AM_DEFAULT_VERBOSITY=0;;
-no)  AM_DEFAULT_VERBOSITY=1;;
-*)   AM_DEFAULT_VERBOSITY=1;;
+case $enable_silent_rules in # (((
+  yes) AM_DEFAULT_VERBOSITY=0;;
+   no) AM_DEFAULT_VERBOSITY=1;;
+    *) AM_DEFAULT_VERBOSITY=1;;
 esac
 am_make=${MAKE-make}
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
@@ -3483,7 +3585,7 @@ am__quote=
 _am_result=none
 # First try GNU make style include.
 echo "include confinc" > confmf
-# Ignore all kinds of additional output from `make'.
+# Ignore all kinds of additional output from 'make'.
 case `$am_make -s -f confmf 2> /dev/null` in #(
 *the\ am__doit\ target*)
   am__include=include
@@ -4316,6 +4418,65 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
+$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
+if ${am_cv_prog_cc_c_o+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+  # Make sure it works both with $CC and with simple cc.
+  # Following AC_PROG_CC_C_O, we do the test twice because some
+  # compilers refuse to overwrite an existing .o file with -o,
+  # though they will create one.
+  am_cv_prog_cc_c_o=yes
+  for am_i in 1 2; do
+    if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
+   ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } \
+         && test -f conftest2.$ac_objext; then
+      : OK
+    else
+      am_cv_prog_cc_c_o=no
+      break
+    fi
+  done
+  rm -f core conftest*
+  unset am_i
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
+$as_echo "$am_cv_prog_cc_c_o" >&6; }
+if test "$am_cv_prog_cc_c_o" != yes; then
+   # Losing compiler, so override with the script.
+   # FIXME: It is wrong to rewrite CC.
+   # But if we don't then we get into trouble of one sort or another.
+   # A longer-term fix would be to have automake use am__CC in this case,
+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+   CC="$am_aux_dir/compile $CC"
+fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
 depcc="$CC"   am_compiler_list=
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
@@ -4327,8 +4488,8 @@ else
   # We make a subdir and do the tests there.  Otherwise we can end up
   # making bogus files that we don't know about and never remove.  For
   # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
+  # making a dummy file named 'D' -- because '-MD' means "put the output
+  # in D".
   rm -rf conftest.dir
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
@@ -4363,16 +4524,16 @@ else
     : > sub/conftest.c
     for i in 1 2 3 4 5 6; do
       echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
+      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+      # Solaris 10 /bin/sh.
+      echo '/* dummy */' > sub/conftst$i.h
     done
     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # We check with '-c' and '-o' for the sake of the "dashmstdout"
     # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs
+    # handle '-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs.
     am__obj=sub/conftest.${OBJEXT-o}
     am__minus_obj="-o $am__obj"
     case $depmode in
@@ -4381,8 +4542,8 @@ else
       test "$am__universal" = false || continue
       ;;
     nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
+      # After this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested.
       if test "x$enable_dependency_tracking" = xyes; then
 	continue
       else
@@ -4390,7 +4551,7 @@ else
       fi
       ;;
     msvc7 | msvc7msys | msvisualcpp | msvcmsys)
-      # This compiler won't grok `-c -o', but also, the minuso test has
+      # This compiler won't grok '-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
       # so weak that their functioning should not be impacted.
       am__obj=conftest.${OBJEXT-o}
@@ -5446,6 +5607,65 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
+$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
+if ${am_cv_prog_cc_c_o+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+  # Make sure it works both with $CC and with simple cc.
+  # Following AC_PROG_CC_C_O, we do the test twice because some
+  # compilers refuse to overwrite an existing .o file with -o,
+  # though they will create one.
+  am_cv_prog_cc_c_o=yes
+  for am_i in 1 2; do
+    if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
+   ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } \
+         && test -f conftest2.$ac_objext; then
+      : OK
+    else
+      am_cv_prog_cc_c_o=no
+      break
+    fi
+  done
+  rm -f core conftest*
+  unset am_i
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
+$as_echo "$am_cv_prog_cc_c_o" >&6; }
+if test "$am_cv_prog_cc_c_o" != yes; then
+   # Losing compiler, so override with the script.
+   # FIXME: It is wrong to rewrite CC.
+   # But if we don't then we get into trouble of one sort or another.
+   # A longer-term fix would be to have automake use am__CC in this case,
+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+   CC="$am_aux_dir/compile $CC"
+fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
 depcc="$CC"   am_compiler_list=
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
@@ -5457,8 +5677,8 @@ else
   # We make a subdir and do the tests there.  Otherwise we can end up
   # making bogus files that we don't know about and never remove.  For
   # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
+  # making a dummy file named 'D' -- because '-MD' means "put the output
+  # in D".
   rm -rf conftest.dir
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
@@ -5493,16 +5713,16 @@ else
     : > sub/conftest.c
     for i in 1 2 3 4 5 6; do
       echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
+      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+      # Solaris 10 /bin/sh.
+      echo '/* dummy */' > sub/conftst$i.h
     done
     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # We check with '-c' and '-o' for the sake of the "dashmstdout"
     # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs
+    # handle '-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs.
     am__obj=sub/conftest.${OBJEXT-o}
     am__minus_obj="-o $am__obj"
     case $depmode in
@@ -5511,8 +5731,8 @@ else
       test "$am__universal" = false || continue
       ;;
     nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
+      # After this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested.
       if test "x$enable_dependency_tracking" = xyes; then
 	continue
       else
@@ -5520,7 +5740,7 @@ else
       fi
       ;;
     msvc7 | msvc7msys | msvisualcpp | msvcmsys)
-      # This compiler won't grok `-c -o', but also, the minuso test has
+      # This compiler won't grok '-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
       # so weak that their functioning should not be impacted.
       am__obj=conftest.${OBJEXT-o}
@@ -5842,8 +6062,8 @@ else
   # We make a subdir and do the tests there.  Otherwise we can end up
   # making bogus files that we don't know about and never remove.  For
   # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
+  # making a dummy file named 'D' -- because '-MD' means "put the output
+  # in D".
   rm -rf conftest.dir
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
@@ -5878,16 +6098,16 @@ else
     : > sub/conftest.c
     for i in 1 2 3 4 5 6; do
       echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
+      # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
+      # Solaris 10 /bin/sh.
+      echo '/* dummy */' > sub/conftst$i.h
     done
     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
 
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # We check with '-c' and '-o' for the sake of the "dashmstdout"
     # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs
+    # handle '-M -o', and we need to detect this.  Also, some Intel
+    # versions had trouble with output in subdirs.
     am__obj=sub/conftest.${OBJEXT-o}
     am__minus_obj="-o $am__obj"
     case $depmode in
@@ -5896,8 +6116,8 @@ else
       test "$am__universal" = false || continue
       ;;
     nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
+      # After this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested.
       if test "x$enable_dependency_tracking" = xyes; then
 	continue
       else
@@ -5905,7 +6125,7 @@ else
       fi
       ;;
     msvc7 | msvc7msys | msvisualcpp | msvcmsys)
-      # This compiler won't grok `-c -o', but also, the minuso test has
+      # This compiler won't grok '-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
       # so weak that their functioning should not be impacted.
       am__obj=conftest.${OBJEXT-o}
@@ -6021,7 +6241,7 @@ cat >>confdefs.h <<_ACEOF
 #define VERSION "$VERSION"
 _ACEOF
 
-VERSION_NUMBER=0x010503
+VERSION_NUMBER=0x010504
 
 
 # Don't default to build static libs.
@@ -17365,7 +17585,7 @@ fi
 #
 # Provide information about the build.
 #
-BUILD_REVISION="37d927a"
+BUILD_REVISION="d2712d9"
 
 
 cat >>confdefs.h <<_ACEOF
@@ -17374,7 +17594,7 @@ _ACEOF
 
 
 BUILD_FILEVERSION=`echo "$PACKAGE_VERSION"|sed 's/\([0-9.]*\).*/\1./;s/\./,/g'`
-BUILD_FILEVERSION="${BUILD_FILEVERSION}14297"
+BUILD_FILEVERSION="${BUILD_FILEVERSION}53873"
 
 
 BUILD_TIMESTAMP=`date -u +%Y-%m-%dT%H:%M+0000 2>/dev/null || date`
@@ -17587,7 +17807,7 @@ else
     We can't simply define LARGE_OFF_T to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
 		       && LARGE_OFF_T % 2147483647 == 1)
 		      ? 1 : -1];
@@ -17633,7 +17853,7 @@ else
     We can't simply define LARGE_OFF_T to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
 		       && LARGE_OFF_T % 2147483647 == 1)
 		      ? 1 : -1];
@@ -17657,7 +17877,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     We can't simply define LARGE_OFF_T to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
 		       && LARGE_OFF_T % 2147483647 == 1)
 		      ? 1 : -1];
@@ -17702,7 +17922,7 @@ else
     We can't simply define LARGE_OFF_T to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
 		       && LARGE_OFF_T % 2147483647 == 1)
 		      ? 1 : -1];
@@ -17726,7 +17946,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     We can't simply define LARGE_OFF_T to be 9223372036854775807,
     since some C++ compilers masquerading as C compilers
     incorrectly reject 9223372036854775807.  */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
+#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))
   int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
 		       && LARGE_OFF_T % 2147483647 == 1)
 		      ? 1 : -1];
@@ -19130,6 +19350,14 @@ LIBOBJS=$ac_libobjs
 LTLIBOBJS=$ac_ltlibobjs
 
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
+$as_echo_n "checking that generated files are newer than configure... " >&6; }
+   if test -n "$am_sleep_pid"; then
+     # Hide warnings about reused PIDs.
+     wait $am_sleep_pid 2>/dev/null
+   fi
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
+$as_echo "done" >&6; }
  if test -n "$EXEEXT"; then
   am__EXEEXT_TRUE=
   am__EXEEXT_FALSE='#'
@@ -19615,7 +19843,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by gpgme $as_me 1.5.3, which was
+This file was extended by gpgme $as_me 1.5.4, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -19681,7 +19909,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-gpgme config.status 1.5.3
+gpgme config.status 1.5.4
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -20885,7 +21113,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
 
   case $ac_file$ac_mode in
     "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
-  # Autoconf 2.62 quotes --file arguments for eval, but not when files
+  # Older Autoconf quotes --file arguments for eval, but not when files
   # are listed without --file.  Let's play safe and only enable the eval
   # if we detect the quoting.
   case $CONFIG_FILES in
@@ -20898,7 +21126,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
     # Strip MF so we end up with the name of the file.
     mf=`echo "$mf" | sed -e 's/:.*$//'`
     # Check whether this is an Automake generated Makefile or not.
-    # We used to match only the files named `Makefile.in', but
+    # We used to match only the files named 'Makefile.in', but
     # some people rename them; so instead we look at the file content.
     # Grep'ing the first line is not enough: some people post-process
     # each Makefile.in and add a new line on top of each file to say so.
@@ -20932,21 +21160,19 @@ $as_echo X"$mf" |
       continue
     fi
     # Extract the definition of DEPDIR, am__include, and am__quote
-    # from the Makefile without running `make'.
+    # from the Makefile without running 'make'.
     DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
     test -z "$DEPDIR" && continue
     am__include=`sed -n 's/^am__include = //p' < "$mf"`
-    test -z "am__include" && continue
+    test -z "$am__include" && continue
     am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-    # When using ansi2knr, U may be empty or an underscore; expand it
-    U=`sed -n 's/^U = //p' < "$mf"`
     # Find all dependency output files, they are included files with
     # $(DEPDIR) in their names.  We invoke sed twice because it is the
     # simplest approach to changing $(DEPDIR) to its actual value in the
     # expansion.
     for file in `sed -n "
       s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
       # Make sure the directory exists.
       test -f "$dirpart/$file" && continue
       fdir=`$as_dirname -- "$file" ||
@@ -21975,7 +22201,7 @@ fi
 echo "
         GPGME v${VERSION} has been configured as follows:
 
-        Revision:        37d927a  (14297)
+        Revision:        d2712d9  (53873)
         Platform:        $host
 
         UI Server:       $uiserver
diff --git a/configure.ac b/configure.ac
index 70b846f..298a22b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@
 
 # (Process this file with autoconf to produce a configure script.)
 AC_PREREQ(2.59)
-min_automake_version="1.11"
+min_automake_version="1.14"
 
 # To build a release you need to create a tag with the version number
 # (git tag -s gpgme-n.m.k) and run "./autogen.sh --force".  Please
@@ -29,7 +29,7 @@ min_automake_version="1.11"
 # for the LT versions.
 m4_define(mym4_version_major, [1])
 m4_define(mym4_version_minor, [5])
-m4_define(mym4_version_micro, [3])
+m4_define(mym4_version_micro, [4])
 
 # Below is m4 magic to extract and compute the revision number, the
 # decimalized short revision number, a beta version string, and a flag
@@ -59,7 +59,7 @@ LIBGPGME_LT_CURRENT=24
 # Subtract 2 from this value if you want to make the LFS transition an
 # ABI break.  [Note to self: Remove this comment with the next regular break.]
 LIBGPGME_LT_AGE=13
-LIBGPGME_LT_REVISION=2
+LIBGPGME_LT_REVISION=3
 
 # If the API is changed in an incompatible way: increment the next counter.
 GPGME_CONFIG_API_VERSION=1
@@ -77,9 +77,7 @@ AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR(src/gpgme.h.in)
 AC_CONFIG_HEADER(config.h)
-# Note: For automake 1.13 add the option
-#          serial-tests
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([serial-tests dist-bzip2 no-dist-gzip])
 AM_MAINTAINER_MODE
 AC_CANONICAL_HOST
 AM_SILENT_RULES
@@ -548,7 +546,7 @@ AH_BOTTOM([
 #define GPG_ERR_ENABLE_ERRNO_MACROS 1
 
 #define CRIGHTBLURB "Copyright (C) 2000 Werner Koch\n" \
-                    "Copyright (C) 2001--2013 g10 Code GmbH\n"
+                    "Copyright (C) 2001--2015 g10 Code GmbH\n"
 ])
 
 
diff --git a/doc/Makefile.in b/doc/Makefile.in
index d15b0db..fc1301b 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -34,23 +33,51 @@
 # License along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -70,9 +97,11 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = doc
-DIST_COMMON = $(gpgme_TEXINFOS) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in $(srcdir)/stamp-vti \
-	$(srcdir)/version.texi mdate-sh texinfo.tex
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/build-aux/mkinstalldirs $(gpgme_TEXINFOS) \
+	$(top_srcdir)/build-aux/mdate-sh $(srcdir)/version.texi \
+	$(srcdir)/stamp-vti $(top_srcdir)/build-aux/texinfo.tex \
+	mdate-sh texinfo.tex
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/glib-2.0.m4 \
 	$(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/gnupg-ttyname.m4 \
@@ -87,14 +116,48 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
 AM_V_GEN = $(am__v_GEN_@AM_V@)
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
 AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
+AM_V_DVIPS = $(am__v_DVIPS_@AM_V@)
+am__v_DVIPS_ = $(am__v_DVIPS_@AM_DEFAULT_V@)
+am__v_DVIPS_0 = @echo "  DVIPS   " $@;
+am__v_DVIPS_1 = 
+AM_V_MAKEINFO = $(am__v_MAKEINFO_@AM_V@)
+am__v_MAKEINFO_ = $(am__v_MAKEINFO_@AM_DEFAULT_V@)
+am__v_MAKEINFO_0 = @echo "  MAKEINFO" $@;
+am__v_MAKEINFO_1 = 
+AM_V_INFOHTML = $(am__v_INFOHTML_@AM_V@)
+am__v_INFOHTML_ = $(am__v_INFOHTML_@AM_DEFAULT_V@)
+am__v_INFOHTML_0 = @echo "  INFOHTML" $@;
+am__v_INFOHTML_1 = 
+AM_V_TEXI2DVI = $(am__v_TEXI2DVI_@AM_V@)
+am__v_TEXI2DVI_ = $(am__v_TEXI2DVI_@AM_DEFAULT_V@)
+am__v_TEXI2DVI_0 = @echo "  TEXI2DVI" $@;
+am__v_TEXI2DVI_1 = 
+AM_V_TEXI2PDF = $(am__v_TEXI2PDF_@AM_V@)
+am__v_TEXI2PDF_ = $(am__v_TEXI2PDF_@AM_DEFAULT_V@)
+am__v_TEXI2PDF_0 = @echo "  TEXI2PDF" $@;
+am__v_TEXI2PDF_1 = 
+AM_V_texinfo = $(am__v_texinfo_@AM_V@)
+am__v_texinfo_ = $(am__v_texinfo_@AM_DEFAULT_V@)
+am__v_texinfo_0 = -q
+am__v_texinfo_1 = 
+AM_V_texidevnull = $(am__v_texidevnull_@AM_V@)
+am__v_texidevnull_ = $(am__v_texidevnull_@AM_DEFAULT_V@)
+am__v_texidevnull_0 = > /dev/null
+am__v_texidevnull_1 = 
 INFO_DEPS = $(srcdir)/gpgme.info
 TEXINFO_TEX = $(top_srcdir)/build-aux/texinfo.tex
 am__TEXINFO_TEX_DIR = $(top_srcdir)/build-aux
@@ -141,6 +204,7 @@ am__uninstall_files_from_dir = { \
     || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
          $(am__cd) "$$dir" && rm -f $$files; }; \
   }
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -344,7 +408,7 @@ clean-libtool:
 	-rm -rf .libs _libs
 
 .texi.info:
-	restore=: && backupdir="$(am__leading_dot)am$$$$" && \
+	$(AM_V_MAKEINFO)restore=: && backupdir="$(am__leading_dot)am$$$$" && \
 	am__cwd=`pwd` && $(am__cd) $(srcdir) && \
 	rm -rf $$backupdir && mkdir $$backupdir && \
 	if ($(MAKEINFO) --version) >/dev/null 2>&1; then \
@@ -366,27 +430,25 @@ clean-libtool:
 	rm -rf $$backupdir; exit $$rc
 
 .texi.dvi:
-	TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
+	$(AM_V_TEXI2DVI)TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
 	MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
-	$(TEXI2DVI) $<
+	$(TEXI2DVI) $(AM_V_texinfo) --build-dir=$(@:.dvi=.t2d) -o $@ $(AM_V_texidevnull) \
+	$<
 
 .texi.pdf:
-	TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
+	$(AM_V_TEXI2PDF)TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
 	MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \
-	$(TEXI2PDF) $<
+	$(TEXI2PDF) $(AM_V_texinfo) --build-dir=$(@:.pdf=.t2p) -o $@ $(AM_V_texidevnull) \
+	$<
 
 .texi.html:
-	rm -rf $(@:.html=.htp)
-	if $(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
+	$(AM_V_MAKEINFO)rm -rf $(@:.html=.htp)
+	$(AM_V_at)if $(MAKEINFOHTML) $(AM_MAKEINFOHTMLFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) \
 	 -o $(@:.html=.htp) $<; \
 	then \
-	  rm -rf $@; \
-	  if test ! -d $(@:.html=.htp) && test -d $(@:.html=); then \
-	    mv $(@:.html=) $@; else mv $(@:.html=.htp) $@; fi; \
+	  rm -rf $@ && mv $(@:.html=.htp) $@; \
 	else \
-	  if test ! -d $(@:.html=.htp) && test -d $(@:.html=); then \
-	    rm -rf $(@:.html=); else rm -Rf $(@:.html=.htp) $@; fi; \
-	  exit 1; \
+	  rm -rf $(@:.html=.htp); exit 1; \
 	fi
 $(srcdir)/gpgme.info: gpgme.texi $(srcdir)/version.texi $(gpgme_TEXINFOS)
 gpgme.dvi: gpgme.texi $(srcdir)/version.texi $(gpgme_TEXINFOS)
@@ -412,8 +474,8 @@ mostlyclean-vti:
 maintainer-clean-vti:
 @MAINTAINER_MODE_TRUE@	-rm -f $(srcdir)/stamp-vti $(srcdir)/version.texi
 .dvi.ps:
-	TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
-	$(DVIPS) -o $@ $<
+	$(AM_V_DVIPS)TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
+	$(DVIPS) $(AM_V_texinfo) -o $@ $<
 
 uninstall-dvi-am:
 	@$(NORMAL_UNINSTALL)
@@ -492,9 +554,7 @@ dist-info: $(INFO_DEPS)
 	done
 
 mostlyclean-aminfo:
-	-rm -rf gpgme.aux gpgme.cp gpgme.cps gpgme.fn gpgme.fns gpgme.ky gpgme.kys \
-	  gpgme.log gpgme.pg gpgme.tmp gpgme.toc gpgme.tp gpgme.vr \
-	  gpgme.vrs
+	-rm -rf gpgme.t2d gpgme.t2p
 
 clean-aminfo:
 	-test -z "gpgme.dvi gpgme.pdf gpgme.ps gpgme.html" \
@@ -506,11 +566,11 @@ maintainer-clean-aminfo:
 	  echo " rm -f $$i $$i-[0-9] $$i-[0-9][0-9] $$i_i[0-9] $$i_i[0-9][0-9]"; \
 	  rm -f $$i $$i-[0-9] $$i-[0-9][0-9] $$i_i[0-9] $$i_i[0-9][0-9]; \
 	done
-tags: TAGS
-TAGS:
+tags TAGS:
+
+ctags CTAGS:
 
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
 
 
 distdir: $(DISTFILES)
@@ -747,17 +807,18 @@ uninstall-am: uninstall-dvi-am uninstall-html-am uninstall-info-am \
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-aminfo clean-generic \
-	clean-libtool dist-info distclean distclean-generic \
-	distclean-libtool distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-aminfo \
-	maintainer-clean-generic maintainer-clean-vti mostlyclean \
-	mostlyclean-aminfo mostlyclean-generic mostlyclean-libtool \
-	mostlyclean-vti pdf pdf-am ps ps-am uninstall uninstall-am \
+	clean-libtool cscopelist-am ctags-am dist-info distclean \
+	distclean-generic distclean-libtool distdir dvi dvi-am html \
+	html-am info info-am install install-am install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-aminfo maintainer-clean-generic \
+	maintainer-clean-vti mostlyclean mostlyclean-aminfo \
+	mostlyclean-generic mostlyclean-libtool mostlyclean-vti pdf \
+	pdf-am ps ps-am tags-am uninstall uninstall-am \
 	uninstall-dvi-am uninstall-html-am uninstall-info-am \
 	uninstall-pdf-am uninstall-ps-am
 
diff --git a/doc/gpgme.info b/doc/gpgme.info
index 0a7c1c8..1517835 100644
--- a/doc/gpgme.info
+++ b/doc/gpgme.info
@@ -1,160 +1,163 @@
-This is /home/wk/s/gpgme/doc/gpgme.info, produced by makeinfo version
-4.13 from /home/wk/s/gpgme/doc/gpgme.texi.
+This is gpgme.info, produced by makeinfo version 5.2 from gpgme.texi.
 
-INFO-DIR-SECTION GNU Libraries
-START-INFO-DIR-ENTRY
-* GPGME: (gpgme).          Adding support for cryptography to your program.
-END-INFO-DIR-ENTRY
-
-   Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2010, 2012,
-2013, 2014 g10 Code GmbH.
+Copyright © 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2010, 2012, 2013,
+2014 g10 Code GmbH.
 
      Permission is granted to copy, distribute and/or modify this
      document under the terms of the GNU General Public License as
      published by the Free Software Foundation; either version 3 of the
-     License, or (at your option) any later version. The text of the
-     license can be found in the section entitled "Copying".
+     License, or (at your option) any later version.  The text of the
+     license can be found in the section entitled “Copying”.
 
    This document is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+Public License for more details.
+INFO-DIR-SECTION GNU Libraries
+START-INFO-DIR-ENTRY
+* GPGME: (gpgme).          Adding support for cryptography to your program.
+END-INFO-DIR-ENTRY
 
    This file documents the GPGME library.
 
-   This is Edition 1.5.3, last updated 6 November 2014, of `The `GnuPG
-Made Easy' Reference Manual', for Version 1.5.3.
+   This is Edition 1.5.4, last updated 6 November 2014, of ‘The ‘GnuPG
+Made Easy’ Reference Manual’, for Version 1.5.4.
 
-   Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2010, 2012,
+   Copyright © 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2010, 2012,
 2013, 2014 g10 Code GmbH.
 
      Permission is granted to copy, distribute and/or modify this
      document under the terms of the GNU General Public License as
      published by the Free Software Foundation; either version 3 of the
-     License, or (at your option) any later version. The text of the
-     license can be found in the section entitled "Copying".
+     License, or (at your option) any later version.  The text of the
+     license can be found in the section entitled “Copying”.
 
    This document is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+Public License for more details.
 
 
 Indirect:
-gpgme.info-1: 1772
-gpgme.info-2: 290983
+gpgme.info-1: 1739
+gpgme.info-2: 336269
 
 Tag Table:
 (Indirect)
-Node: Top1772
-Node: Introduction8886
-Node: Getting Started9673
-Node: Features10798
-Node: Overview11948
-Node: Preparation13057
-Node: Header14054
-Node: Building the Source14765
-Node: Largefile Support (LFS)16874
-Node: Using Automake22185
-Node: Using Libtool24561
-Node: Library Version Check24911
-Node: Signal Handling29929
-Node: Multi Threading31145
-Ref: Multi Threading-Footnote-133327
-Node: Protocols and Engines33741
-Node: Engine Version Check36176
-Node: Engine Information37743
-Node: Engine Configuration41515
-Node: OpenPGP42777
-Node: Cryptographic Message Syntax43113
-Node: Algorithms43407
-Ref: Algorithms-Footnote-143886
-Node: Public Key Algorithms44014
-Node: Hash Algorithms45935
-Node: Error Handling47056
-Node: Error Values48918
-Node: Error Sources53996
-Node: Error Codes56323
-Node: Error Strings60962
-Node: Exchanging Data62741
-Node: Creating Data Buffers64570
-Node: Memory Based Data Buffers65086
-Node: File Based Data Buffers68440
-Node: Callback Based Data Buffers70611
-Node: Destroying Data Buffers76167
-Node: Manipulating Data Buffers77526
-Node: Data Buffer I/O Operations78018
-Node: Data Buffer Meta-Data80721
-Node: Data Buffer Convenience84103
-Node: Contexts86039
-Node: Creating Contexts87221
-Node: Destroying Contexts88032
-Node: Result Management88367
-Node: Context Attributes89773
-Node: Protocol Selection90553
-Node: Crypto Engine91565
-Node: ASCII Armor93386
-Node: Text Mode93998
-Node: Included Certificates94929
-Node: Key Listing Mode96304
-Node: Passphrase Callback100077
-Node: Progress Meter Callback103215
-Node: Locale105139
-Node: Key Management106678
-Node: Listing Keys117135
-Node: Information About Keys124397
-Node: Key Signatures132395
-Node: Manipulating Keys136407
-Node: Generating Keys137249
-Node: Exporting Keys141856
-Node: Importing Keys147755
-Ref: Importing Keys-Footnote-1154918
-Node: Deleting Keys155046
-Node: Changing Passphrases156443
-Node: Advanced Key Editing157704
-Node: Trust Item Management160808
-Node: Listing Trust Items161878
-Node: Information About Trust Items164176
-Node: Manipulating Trust Items166058
-Node: Crypto Operations167019
-Node: Decrypt168265
-Node: Verify172011
-Node: Decrypt and Verify189950
-Node: Sign191954
-Node: Selecting Signers192518
-Node: Creating a Signature193670
-Node: Signature Notation Data198281
-Node: Encrypt200465
-Node: Encrypting a Plaintext200821
-Node: Miscellaneous207320
-Node: Running other Programs207608
-Node: Run Control209585
-Node: Waiting For Completion210328
-Node: Using External Event Loops212374
-Node: I/O Callback Interface214341
-Node: Registering I/O Callbacks219453
-Node: I/O Callback Example221438
-Node: I/O Callback Example GTK+227655
-Node: I/O Callback Example GDK229444
-Node: I/O Callback Example Qt231086
-Node: Cancellation233374
-Node: UI Server Protocol235627
-Ref: UI Server Protocol-Footnote-1237058
-Node: UI Server Encrypt237177
-Node: UI Server Sign242437
-Node: UI Server Decrypt244749
-Node: UI Server Verify246187
-Node: UI Server Set Input Files249689
-Node: UI Server Sign/Encrypt Files250742
-Node: UI Server Verify/Decrypt Files252511
-Node: UI Server Import/Export Keys254357
-Node: UI Server Checksum Files255390
-Node: Miscellaneous UI Server Commands257556
-Ref: command SENDER259468
-Node: Debugging261144
-Node: Library Copying262866
-Node: Copying290983
-Node: Function and Data Index328614
-Node: Concept Index354778
+Node: Top1739
+Node: Introduction8866
+Node: Getting Started9656
+Node: Features10781
+Node: Overview11937
+Node: Preparation13046
+Node: Header14043
+Node: Building the Source14790
+Node: Largefile Support (LFS)16963
+Node: Using Automake22377
+Node: Using Libtool24823
+Node: Library Version Check25185
+Node: Signal Handling30279
+Node: Multi Threading31549
+Ref: Multi Threading-Footnote-133783
+Node: Protocols and Engines34206
+Node: Engine Version Check36695
+Node: Engine Information38321
+Node: Engine Configuration42181
+Node: OpenPGP43465
+Node: Cryptographic Message Syntax43805
+Node: Algorithms44103
+Ref: Algorithms-Footnote-144582
+Node: Public Key Algorithms44710
+Node: Hash Algorithms46687
+Node: Error Handling47877
+Node: Error Values49751
+Node: Error Sources54954
+Node: Error Codes57394
+Node: Error Strings62185
+Node: Exchanging Data63992
+Node: Creating Data Buffers65858
+Node: Memory Based Data Buffers66374
+Node: File Based Data Buffers69807
+Node: Callback Based Data Buffers72009
+Node: Destroying Data Buffers77696
+Node: Manipulating Data Buffers79087
+Node: Data Buffer I/O Operations79579
+Node: Data Buffer Meta-Data82306
+Node: Data Buffer Convenience85774
+Node: Contexts87751
+Node: Creating Contexts88937
+Node: Destroying Contexts89784
+Node: Result Management90123
+Node: Context Attributes91552
+Node: Protocol Selection92332
+Node: Crypto Engine93364
+Node: ASCII Armor95207
+Node: Text Mode95831
+Node: Included Certificates96774
+Node: Key Listing Mode98192
+Node: Passphrase Callback102066
+Node: Progress Meter Callback105278
+Node: Locale107244
+Node: Key Management108801
+Node: Listing Keys119694
+Node: Information About Keys127120
+Node: Key Signatures135451
+Node: Manipulating Keys139587
+Node: Generating Keys140447
+Node: Exporting Keys145171
+Node: Importing Keys151209
+Ref: Importing Keys-Footnote-1158646
+Node: Deleting Keys158774
+Node: Changing Passphrases160219
+Node: Advanced Key Editing161508
+Node: Trust Item Management164690
+Node: Listing Trust Items165802
+Node: Information About Trust Items168168
+Node: Manipulating Trust Items170097
+Node: Crypto Operations171076
+Node: Decrypt172340
+Node: Verify176210
+Node: Decrypt and Verify194587
+Node: Sign196655
+Node: Selecting Signers197219
+Node: Creating a Signature198391
+Node: Signature Notation Data203161
+Node: Encrypt205389
+Node: Encrypting a Plaintext205745
+Node: Miscellaneous212419
+Node: Running other Programs212707
+Node: Run Control214731
+Node: Waiting For Completion215475
+Node: Using External Event Loops217593
+Node: I/O Callback Interface219565
+Node: Registering I/O Callbacks224803
+Node: I/O Callback Example226841
+Node: I/O Callback Example GTK+233058
+Node: I/O Callback Example GDK234847
+Node: I/O Callback Example Qt236489
+Node: Cancellation238777
+Node: UI Server Protocol241070
+Ref: UI Server Protocol-Footnote-1242505
+Node: UI Server Encrypt242624
+Node: UI Server Sign247769
+Node: UI Server Decrypt250122
+Node: UI Server Verify251588
+Node: UI Server Set Input Files255160
+Node: UI Server Sign/Encrypt Files256230
+Node: UI Server Verify/Decrypt Files258038
+Node: UI Server Import/Export Keys259914
+Node: UI Server Checksum Files260976
+Node: Miscellaneous UI Server Commands263192
+Ref: command SENDER265123
+Node: Debugging266825
+Node: Library Copying268569
+Node: Copying296774
+Node: Function and Data Index336269
+Node: Concept Index362522
 
 End Tag Table
+
+
+Local Variables:
+coding: utf-8
+End:
diff --git a/doc/gpgme.info-1 b/doc/gpgme.info-1
index 5e9afc4..96646d8 100644
--- a/doc/gpgme.info-1
+++ b/doc/gpgme.info-1
@@ -1,43 +1,41 @@
-This is /home/wk/s/gpgme/doc/gpgme.info, produced by makeinfo version
-4.13 from /home/wk/s/gpgme/doc/gpgme.texi.
+This is gpgme.info, produced by makeinfo version 5.2 from gpgme.texi.
 
-INFO-DIR-SECTION GNU Libraries
-START-INFO-DIR-ENTRY
-* GPGME: (gpgme).          Adding support for cryptography to your program.
-END-INFO-DIR-ENTRY
-
-   Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2010, 2012,
-2013, 2014 g10 Code GmbH.
+Copyright © 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2010, 2012, 2013,
+2014 g10 Code GmbH.
 
      Permission is granted to copy, distribute and/or modify this
      document under the terms of the GNU General Public License as
      published by the Free Software Foundation; either version 3 of the
-     License, or (at your option) any later version. The text of the
-     license can be found in the section entitled "Copying".
+     License, or (at your option) any later version.  The text of the
+     license can be found in the section entitled “Copying”.
 
    This document is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+Public License for more details.
+INFO-DIR-SECTION GNU Libraries
+START-INFO-DIR-ENTRY
+* GPGME: (gpgme).          Adding support for cryptography to your program.
+END-INFO-DIR-ENTRY
 
    This file documents the GPGME library.
 
-   This is Edition 1.5.3, last updated 6 November 2014, of `The `GnuPG
-Made Easy' Reference Manual', for Version 1.5.3.
+   This is Edition 1.5.4, last updated 6 November 2014, of ‘The ‘GnuPG
+Made Easy’ Reference Manual’, for Version 1.5.4.
 
-   Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2010, 2012,
+   Copyright © 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2010, 2012,
 2013, 2014 g10 Code GmbH.
 
      Permission is granted to copy, distribute and/or modify this
      document under the terms of the GNU General Public License as
      published by the Free Software Foundation; either version 3 of the
-     License, or (at your option) any later version. The text of the
-     license can be found in the section entitled "Copying".
+     License, or (at your option) any later version.  The text of the
+     license can be found in the section entitled “Copying”.
 
    This document is distributed in the hope that it will be useful, but
 WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+Public License for more details.
 
 
 File: gpgme.info,  Node: Top,  Next: Introduction,  Up: (dir)
@@ -45,8 +43,8 @@ File: gpgme.info,  Node: Top,  Next: Introduction,  Up: (dir)
 Main Menu
 *********
 
-This is Edition 1.5.3, last updated 6 November 2014, of `The `GnuPG
-Made Easy' Reference Manual', for Version 1.5.3 of the GPGME library.
+This is Edition 1.5.4, last updated 6 November 2014, of ‘The ‘GnuPG Made
+Easy’ Reference Manual’, for Version 1.5.4 of the GPGME library.
 
 * Menu:
 
@@ -64,7 +62,7 @@ Appendices
 * Debugging::                     How to solve problems.
 
 * Library Copying::               The GNU Lesser General Public License says
-                                  how you can copy and share `GnuPG Made Easy'.
+                                  how you can copy and share ‘GnuPG Made Easy’.
 * Copying::                       The GNU General Public License says how you
                                   can copy and share this manual.
 
@@ -73,7 +71,7 @@ Indices
 * Concept Index::                 Index of concepts and programs.
 * Function and Data Index::       Index of functions, variables and data types.
 
- --- The Detailed Node Listing ---
+ — The Detailed Node Listing —
 
 Introduction
 
@@ -210,20 +208,21 @@ Using External Event Loops
 * I/O Callback Example GDK::      How to integrate GPGME in GDK.
 * I/O Callback Example Qt::       How to integrate GPGME in Qt.
 
+
 
 File: gpgme.info,  Node: Introduction,  Next: Preparation,  Prev: Top,  Up: Top
 
 1 Introduction
 **************
 
-`GnuPG Made Easy' (GPGME) is a C language library that allows to add
-support for cryptography to a program.  It is designed to make access
-to public key crypto engines like GnuPG or GpgSM easier for
-applications.  GPGME provides a high-level crypto API for encryption,
-decryption, signing, signature verification and key management.
+‘GnuPG Made Easy’ (GPGME) is a C language library that allows to add
+support for cryptography to a program.  It is designed to make access to
+public key crypto engines like GnuPG or GpgSM easier for applications.
+GPGME provides a high-level crypto API for encryption, decryption,
+signing, signature verification and key management.
 
-   GPGME uses GnuPG and GpgSM as its backends to support OpenPGP and
-the Cryptographic Message Syntax (CMS).
+   GPGME uses GnuPG and GpgSM as its backends to support OpenPGP and the
+Cryptographic Message Syntax (CMS).
 
 * Menu:
 
@@ -247,8 +246,8 @@ but where necessary, special features or requirements by an engine are
 mentioned as far as they are relevant to GPGME or its users.
 
    This manual can be used in several ways.  If read from the beginning
-to the end, it gives a good introduction into the library and how it
-can be used in an application.  Forward references are included where
+to the end, it gives a good introduction into the library and how it can
+be used in an application.  Forward references are included where
 necessary.  Later on, the manual can be used as a reference manual to
 get just the information needed about any particular interface of the
 library.  Experienced programmers might want to start looking at the
@@ -265,17 +264,17 @@ GPGME has a couple of advantages over other libraries doing a similar
 job, and over implementing support for GnuPG or other crypto engines
 into your application directly.
 
-it's free software
-     Anybody can use, modify, and redistribute it under the terms of
-     the GNU Lesser General Public License (*note Library Copying::).
+it’s free software
+     Anybody can use, modify, and redistribute it under the terms of the
+     GNU Lesser General Public License (*note Library Copying::).
 
-it's flexible
+it’s flexible
      GPGME provides transparent support for several cryptographic
      protocols by different engines.  Currently, GPGME supports the
      OpenPGP protocol using GnuPG as the backend, and the Cryptographic
      Message Syntax using GpgSM as the backend.
 
-it's easy
+it’s easy
      GPGME hides the differences between the protocols and engines from
      the programmer behind an easy-to-use interface.  This way the
      programmer can focus on the other parts of the program, and still
@@ -290,16 +289,16 @@ File: gpgme.info,  Node: Overview,  Prev: Features,  Up: Introduction
 ============
 
 GPGME provides a data abstraction that is used to pass data to the
-crypto engine, and receive returned data from it.  Data can be read
-from memory or from files, but it can also be provided by a callback
+crypto engine, and receive returned data from it.  Data can be read from
+memory or from files, but it can also be provided by a callback
 function.
 
    The actual cryptographic operations are always set within a context.
-A context provides configuration parameters that define the behaviour
-of all operations performed within it.  Only one operation per context
-is allowed at any time, but when one operation is finished, you can run
-the next operation in the same context.  There can be more than one
-context, and all can run different operations at the same time.
+A context provides configuration parameters that define the behaviour of
+all operations performed within it.  Only one operation per context is
+allowed at any time, but when one operation is finished, you can run the
+next operation in the same context.  There can be more than one context,
+and all can run different operations at the same time.
 
    Furthermore, GPGME has rich key management facilities including
 listing keys, querying their attributes, generating, importing,
@@ -318,8 +317,8 @@ File: gpgme.info,  Node: Preparation,  Next: Protocols and Engines,  Prev: Intro
 
 To use GPGME, you have to perform some changes to your sources and the
 build system.  The necessary changes are small and explained in the
-following sections.  At the end of this chapter, it is described how
-the library is initialized, and how the requirements of the library are
+following sections.  At the end of this chapter, it is described how the
+library is initialized, and how the requirements of the library are
 verified.
 
 * Menu:
@@ -340,19 +339,19 @@ File: gpgme.info,  Node: Header,  Next: Building the Source,  Up: Preparation
 ==========
 
 All interfaces (data types and functions) of the library are defined in
-the header file `gpgme.h'.  You must include this in all programs using
+the header file ‘gpgme.h’.  You must include this in all programs using
 the library, either directly or through some other header file, like
 this:
 
      #include <gpgme.h>
 
-   The name space of GPGME is `gpgme_*' for function names and data
-types and `GPGME_*' for other symbols.  Symbols internal to GPGME take
-the form `_gpgme_*' and `_GPGME_*'.
+   The name space of GPGME is ‘gpgme_*’ for function names and data
+types and ‘GPGME_*’ for other symbols.  Symbols internal to GPGME take
+the form ‘_gpgme_*’ and ‘_GPGME_*’.
 
    Because GPGME makes use of the GPG Error library, using GPGME will
-also use the `GPG_ERR_*' name space directly, and the `gpg_err*',
-`gpg_str*', and `gpgrt_*' name space indirectly.
+also use the ‘GPG_ERR_*’ name space directly, and the ‘gpg_err*’,
+‘gpg_str*’, and ‘gpgrt_*’ name space indirectly.
 
 
 File: gpgme.info,  Node: Building the Source,  Next: Largefile Support (LFS),  Prev: Header,  Up: Preparation
@@ -360,45 +359,45 @@ File: gpgme.info,  Node: Building the Source,  Next: Largefile Support (LFS),  P
 2.2 Building the Source
 =======================
 
-If you want to compile a source file including the `gpgme.h' header
+If you want to compile a source file including the ‘gpgme.h’ header
 file, you must make sure that the compiler can find it in the directory
 hierarchy.  This is accomplished by adding the path to the directory in
 which the header file is located to the compilers include file search
-path (via the `-I' option).
+path (via the ‘-I’ option).
 
    However, the path to the include file is determined at the time the
 source is configured.  To solve this problem, gpgme ships with a small
-helper program `gpgme-config' that knows about the path to the include
-file and other configuration options.  The options that need to be
-added to the compiler invocation at compile time are output by the
-`--cflags' option to `gpgme-config'.  The following example shows how
-it can be used at the command line:
+helper program ‘gpgme-config’ that knows about the path to the include
+file and other configuration options.  The options that need to be added
+to the compiler invocation at compile time are output by the ‘--cflags’
+option to ‘gpgme-config’.  The following example shows how it can be
+used at the command line:
 
      gcc -c foo.c `gpgme-config --cflags`
 
-   Adding the output of `gpgme-config --cflags' to the compiler command
+   Adding the output of ‘gpgme-config --cflags’ to the compiler command
 line will ensure that the compiler can find the GPGME header file.
 
    A similar problem occurs when linking the program with the library.
 Again, the compiler has to find the library files.  For this to work,
-the path to the library files has to be added to the library search
-path (via the `-L' option).  For this, the option `--libs' to
-`gpgme-config' can be used.  For convenience, this option also outputs
-all other options that are required to link the program with GPGME (in
-particular, the `-lgpgme' option).  The example shows how to link
-`foo.o' with the GPGME library to a program `foo'.
+the path to the library files has to be added to the library search path
+(via the ‘-L’ option).  For this, the option ‘--libs’ to ‘gpgme-config’
+can be used.  For convenience, this option also outputs all other
+options that are required to link the program with GPGME (in particular,
+the ‘-lgpgme’ option).  The example shows how to link ‘foo.o’ with the
+GPGME library to a program ‘foo’.
 
      gcc -o foo foo.o `gpgme-config --libs`
 
    Of course you can also combine both examples to a single command by
-specifying both options to `gpgme-config':
+specifying both options to ‘gpgme-config’:
 
      gcc -o foo foo.c `gpgme-config --cflags --libs`
 
    If you want to link to one of the thread-safe versions of GPGME, you
-must specify the `--thread' option before any other option to select
-the thread package you want to link with.  Supported thread packages
-are `--thread=pth' and `--thread=pthread'.
+must specify the ‘--thread’ option before any other option to select the
+thread package you want to link with.  Supported thread packages are
+‘--thread=pth’ and ‘--thread=pthread’.
 
 
 File: gpgme.info,  Node: Largefile Support (LFS),  Next: Using Automake,  Prev: Building the Source,  Up: Preparation
@@ -410,9 +409,9 @@ GPGME is compiled with largefile support by default, if it is available
 on the system.  This means that GPGME supports files larger than two
 gigabyte in size, if the underlying operating system can.  On some
 systems, largefile support is already the default.  On such systems,
-nothing special is required.  However, some systems provide only
-support for files up to two gigabyte in size by default.  Support for
-larger file sizes has to be specifically enabled.
+nothing special is required.  However, some systems provide only support
+for files up to two gigabyte in size by default.  Support for larger
+file sizes has to be specifically enabled.
 
    To make a difficult situation even more complex, such systems provide
 two different types of largefile support.  You can either get all
@@ -421,27 +420,27 @@ capable, or you can get new functions and data types for largefile
 support added.  Those new functions have the same name as their
 smallfile counterparts, but with a suffix of 64.
 
-   An example: The data type `off_t' is 32 bit wide on GNU/Linux PC
+   An example: The data type ‘off_t’ is 32 bit wide on GNU/Linux PC
 systems.  To address offsets in large files, you can either enable
-largefile support add-on.  Then a new data type `off64_t' is provided,
-which is 64 bit wide.  Or you can replace the existing `off_t' data
-type with its 64 bit wide counterpart.  All occurences of `off_t' are
-then automagically replaced.
+largefile support add-on.  Then a new data type ‘off64_t’ is provided,
+which is 64 bit wide.  Or you can replace the existing ‘off_t’ data type
+with its 64 bit wide counterpart.  All occurences of ‘off_t’ are then
+automagically replaced.
 
    As if matters were not complex enough, there are also two different
-types of file descriptors in such systems.  This is important because
-if file descriptors are exchanged between programs that use a different
+types of file descriptors in such systems.  This is important because if
+file descriptors are exchanged between programs that use a different
 maximum file size, certain errors must be produced on some file
 descriptors to prevent subtle overflow bugs from occuring.
 
    As you can see, supporting two different maximum file sizes at the
 same time is not at all an easy task.  However, the maximum file size
-does matter for GPGME, because some data types it uses in its
-interfaces are affected by that.  For example, the `off_t' data type is
-used in the `gpgme_data_seek' function, to match its POSIX counterpart.
-This affects the call-frame of the function, and thus the ABI of the
-library.  Furthermore, file descriptors can be exchanged between GPGME
-and the application.
+does matter for GPGME, because some data types it uses in its interfaces
+are affected by that.  For example, the ‘off_t’ data type is used in the
+‘gpgme_data_seek’ function, to match its POSIX counterpart.  This
+affects the call-frame of the function, and thus the ABI of the library.
+Furthermore, file descriptors can be exchanged between GPGME and the
+application.
 
    For you as the user of the library, this means that your program must
 be compiled in the same file size mode as the library.  Luckily, there
@@ -451,50 +450,50 @@ file sizes or dual mode) can be considered an historic artefact, only
 useful to allow for a transitional period.
 
    On POSIX platforms GPGME is compiled using largefile support by
-default.  This means that your application must do the same, at least
-as far as it is relevant for using the `gpgme.h' header file.  All
-types in this header files refer to their largefile counterparts, if
-they are different from any default types on the system.
+default.  This means that your application must do the same, at least as
+far as it is relevant for using the ‘gpgme.h’ header file.  All types in
+this header files refer to their largefile counterparts, if they are
+different from any default types on the system.
 
-   On 32 and 64 bit Windows platforms `off_t' is declared as 32 bit
+   On 32 and 64 bit Windows platforms ‘off_t’ is declared as 32 bit
 signed integer.  There is no specific support for LFS in the C library.
 The recommendation from Microsoft is to use the native interface
-(`CreateFile' et al.) for large files.  Released binary versions of
-GPGME (libgpgme-11.dll) have always been build with a 32 bit `off_t'.
+(‘CreateFile’ et al.)  for large files.  Released binary versions of
+GPGME (libgpgme-11.dll) have always been build with a 32 bit ‘off_t’.
 To avoid an ABI break we stick to this convention for 32 bit Windows by
-using `long' there.  GPGME versions for 64 bit Windows have never been
-released and thus we are able to use `int64_t' instead of `off_t'
-there.  For easier migration the typedef `gpgme_off_t' has been
-defined.  The reason we cannot use `off_t' directly is that some
-toolchains (e.g. mingw64) introduce a POSIX compatible hack for
-`off_t'.  Some widely used toolkits make use of this hack and in turn
-GPGME would need to use it also.  However, this would introduce an ABI
-break and existing software making use of libgpgme might suffer from a
-severe break.  Thus with version 1.4.2 we redefined all functions using
-`off_t' to use `gpgme_off_t' which is defined as explained above.  This
-way we keep the ABI well defined and independent of any toolchain
-hacks.  The bottom line is that LFS support in GPGME is only available
-on 64 bit versions of Windows.
+using ‘long’ there.  GPGME versions for 64 bit Windows have never been
+released and thus we are able to use ‘int64_t’ instead of ‘off_t’ there.
+For easier migration the typedef ‘gpgme_off_t’ has been defined.  The
+reason we cannot use ‘off_t’ directly is that some toolchains (e.g.
+mingw64) introduce a POSIX compatible hack for ‘off_t’.  Some widely
+used toolkits make use of this hack and in turn GPGME would need to use
+it also.  However, this would introduce an ABI break and existing
+software making use of libgpgme might suffer from a severe break.  Thus
+with version 1.4.2 we redefined all functions using ‘off_t’ to use
+‘gpgme_off_t’ which is defined as explained above.  This way we keep the
+ABI well defined and independent of any toolchain hacks.  The bottom
+line is that LFS support in GPGME is only available on 64 bit versions
+of Windows.
 
    On POSIX platforms you can enable largefile support, if it is
-different from the default on the system the application is compiled
-on, by using the Autoconf macro `AC_SYS_LARGEFILE'.  If you do this,
-then you don't need to worry about anything else: It will just work.
-In this case you might also want to use `AC_FUNC_FSEEKO' to take
-advantage of some new interfaces, and `AC_TYPE_OFF_T' (just in case).
+different from the default on the system the application is compiled on,
+by using the Autoconf macro ‘AC_SYS_LARGEFILE’.  If you do this, then
+you don’t need to worry about anything else: It will just work.  In this
+case you might also want to use ‘AC_FUNC_FSEEKO’ to take advantage of
+some new interfaces, and ‘AC_TYPE_OFF_T’ (just in case).
 
    If you do not use Autoconf, you can define the preprocessor symbol
-`_FILE_OFFSET_BITS' to 64 _before_ including any header files, for
-example by specifying the option `-D_FILE_OFFSET_BITS=64' on the
+‘_FILE_OFFSET_BITS’ to 64 _before_ including any header files, for
+example by specifying the option ‘-D_FILE_OFFSET_BITS=64’ on the
 compiler command line.  You will also want to define the preprocessor
-symbol `LARGEFILE_SOURCE' to 1 in this case, to take advantage of some
+symbol ‘LARGEFILE_SOURCE’ to 1 in this case, to take advantage of some
 new interfaces.
 
    If you do not want to do either of the above, you probably know
 enough about the issue to invent your own solution.  Just keep in mind
-that the GPGME header file expects that largefile support is enabled,
-if it is available.  In particular, we do not support dual mode
-(`_LARGEFILE64_SOURCE').
+that the GPGME header file expects that largefile support is enabled, if
+it is available.  In particular, we do not support dual mode
+(‘_LARGEFILE64_SOURCE’).
 
 
 File: gpgme.info,  Node: Using Automake,  Next: Using Libtool,  Prev: Largefile Support (LFS),  Up: Preparation
@@ -504,7 +503,7 @@ File: gpgme.info,  Node: Using Automake,  Next: Using Libtool,  Prev: Largefile
 
 It is much easier if you use GNU Automake instead of writing your own
 Makefiles.  If you do that you do not have to worry about finding and
-invoking the `gpgme-config' script at all.  GPGME provides an extension
+invoking the ‘gpgme-config’ script at all.  GPGME provides an extension
 to Automake that does all the work for you.
 
  -- Macro: AM_PATH_GPGME ([MINIMUM-VERSION], [ACTION-IF-FOUND],
@@ -517,34 +516,33 @@ to Automake that does all the work for you.
      exists on the host system.  If it is found, execute
      ACTION-IF-FOUND, otherwise do ACTION-IF-NOT-FOUND, if given.
 
-     Additionally, the function defines `GPGME_CFLAGS' to the flags
-     needed for compilation of the program to find the `gpgme.h' header
-     file, and `GPGME_LIBS' to the linker flags needed to link the
+     Additionally, the function defines ‘GPGME_CFLAGS’ to the flags
+     needed for compilation of the program to find the ‘gpgme.h’ header
+     file, and ‘GPGME_LIBS’ to the linker flags needed to link the
      program to the GPGME library.  If the used helper script does not
-     match the target type you are building for a warning is printed
-     and the string `libgcrypt' is appended to the variable
-     `gpg_config_script_warn'.
+     match the target type you are building for a warning is printed and
+     the string ‘libgcrypt’ is appended to the variable
+     ‘gpg_config_script_warn’.
 
-     `AM_PATH_GPGME_PTH' checks for the version of GPGME that can be
-     used with GNU Pth, and defines `GPGME_PTH_CFLAGS' and
-     `GPGME_PTH_LIBS'.
+     ‘AM_PATH_GPGME_PTH’ checks for the version of GPGME that can be
+     used with GNU Pth, and defines ‘GPGME_PTH_CFLAGS’ and
+     ‘GPGME_PTH_LIBS’.
 
-     `AM_PATH_GPGME_PTHREAD' checks for the version of GPGME that can
-     be used with the native pthread implementation, and defines
-     `GPGME_PTHREAD_CFLAGS' and `GPGME_PTHREAD_LIBS'.
+     ‘AM_PATH_GPGME_PTHREAD’ checks for the version of GPGME that can be
+     used with the native pthread implementation, and defines
+     ‘GPGME_PTHREAD_CFLAGS’ and ‘GPGME_PTHREAD_LIBS’.
 
-     This macro searches for `gpgme-config' along the PATH.  If you are
+     This macro searches for ‘gpgme-config’ along the PATH. If you are
      cross-compiling, it is useful to set the environment variable
-     `SYSROOT' to the top directory of your target.  The macro will
-     then first look for the helper program in the `bin' directory
-     below that top directory.  An absolute directory name must be used
-     for `SYSROOT'.  Finally, if the configure command line option
-     `--with-gpgme-prefix' is used, only its value is used for the top
+     ‘SYSROOT’ to the top directory of your target.  The macro will then
+     first look for the helper program in the ‘bin’ directory below that
+     top directory.  An absolute directory name must be used for
+     ‘SYSROOT’.  Finally, if the configure command line option
+     ‘--with-gpgme-prefix’ is used, only its value is used for the top
      directory below which the helper script is expected.
 
-
    You can use the defined Autoconf variables like this in your
-`Makefile.am':
+‘Makefile.am’:
 
      AM_CPPFLAGS = $(GPGME_CFLAGS)
      LDADD = $(GPGME_LIBS)
@@ -556,7 +554,7 @@ File: gpgme.info,  Node: Using Libtool,  Next: Library Version Check,  Prev: Usi
 =================
 
 The easiest way is to just use GNU Libtool.  If you use libtool, and
-link to `libgpgme.la', `libgpgme-pth.la' or `libgpgme-pthread.la'
+link to ‘libgpgme.la’, ‘libgpgme-pth.la’ or ‘libgpgme-pthread.la’
 respectively, everything will be done automatically by Libtool.
 
 
@@ -567,7 +565,7 @@ File: gpgme.info,  Node: Library Version Check,  Next: Signal Handling,  Prev: U
 
  -- Function: const char * gpgme_check_version
           (const char *REQUIRED_VERSION)
-     The function `gpgme_check_version' has four purposes.  It can be
+     The function ‘gpgme_check_version’ has four purposes.  It can be
      used to retrieve the version number of the library.  In addition it
      can verify that the version number is higher than a certain
      required version number.  In either case, the function initializes
@@ -578,17 +576,17 @@ File: gpgme.info,  Node: Library Version Check,  Next: Signal Handling,  Prev: U
      As a side effect for W32 based systems, the socket layer will get
      initialized.
 
-     If REQUIRED_VERSION is `NULL', the function returns a pointer to a
+     If REQUIRED_VERSION is ‘NULL’, the function returns a pointer to a
      statically allocated string containing the version number of the
      library.
 
-     If REQUIRED_VERSION is not `NULL', it should point to a string
+     If REQUIRED_VERSION is not ‘NULL’, it should point to a string
      containing a version number, and the function checks that the
      version of the library is at least as high as the version number
      provided.  In this case, the function returns a pointer to a
      statically allocated string containing the version number of the
      library.  If REQUIRED_VERSION is not a valid version number, or if
-     the version requirement is not met, the function returns `NULL'.
+     the version requirement is not met, the function returns ‘NULL’.
 
      If you use a version of a library that is backwards compatible with
      older releases, but contains additional interfaces which your
@@ -597,51 +595,50 @@ File: gpgme.info,  Node: Library Version Check,  Next: Signal Handling,  Prev: U
      library.
 
      If a selftest fails, the function may still succeed.  Selftest
-     errors are returned later when invoking `gpgme_new', so that a
+     errors are returned later when invoking ‘gpgme_new’, so that a
      detailed error code can be returned (historically,
-     `gpgme_check_version' does not return a detailed error code).
+     ‘gpgme_check_version’ does not return a detailed error code).
 
  -- Function: int gpgme_set_global_flag (const char *NAME,
           const char *VALUE)
+
      On some systems it is not easy to set environment variables and
-     thus hard to use GPGME's internal trace facility for debugging.
+     thus hard to use GPGME’s internal trace facility for debugging.
      This function has been introduced as an alternative way to enable
      debugging and for a couple of other rarely used tweaks.  It is
      important to assure that only one thread accesses GPGME functions
      between a call to this function and after the return from the call
-     to `gpgme_check_version'.
+     to ‘gpgme_check_version’.
 
      All currently supported features require that this function is
-     called as early as possible -- even before `gpgme_check_version'.
+     called as early as possible — even before ‘gpgme_check_version’.
      The features are identified by the following values for NAME:
 
-    `"debug"'
-          To enable debugging use the string "debug" for NAME and VALUE
+     ‘"debug"’
+          To enable debugging use the string “debug” for NAME and VALUE
           identical to the value used with the environment variable
-          `GPGME_DEBUG'.
+          ‘GPGME_DEBUG’.
 
-    `"disable-gpgconf"'
+     ‘"disable-gpgconf"’
           Using this feature with any VALUE disables the detection of
-          the gpgconf program and thus forces GPGME to fallback into
-          the simple OpenPGP only mode.  It may be used to force the
-          use of GnuPG-1 on systems which have both GPG versions
-          installed.  Note that in general the use of
-          `gpgme_set_engine_info' is a better way to select a specific
-          engine version.
-
-    `"gpgconf-name"'
-    `"gpg-name"'
+          the gpgconf program and thus forces GPGME to fallback into the
+          simple OpenPGP only mode.  It may be used to force the use of
+          GnuPG-1 on systems which have both GPG versions installed.
+          Note that in general the use of ‘gpgme_set_engine_info’ is a
+          better way to select a specific engine version.
+
+     ‘"gpgconf-name"’
+     ‘"gpg-name"’
           Set the name of the gpgconf respective gpg binary.  The
-          defaults are `GNU/GnuPG/gpgconf' and `GNU/GnuPG/gpg'.  Under
-          Unix the leading directory part is ignored.  Under Windows
-          the leading directory part is used as the default
-          installation directory; the `.exe' suffix is added by GPGME.
-          Use forward slashed even under Windows.
-
+          defaults are ‘GNU/GnuPG/gpgconf’ and ‘GNU/GnuPG/gpg’.  Under
+          Unix the leading directory part is ignored.  Under Windows the
+          leading directory part is used as the default installation
+          directory; the ‘.exe’ suffix is added by GPGME. Use forward
+          slashed even under Windows.
 
-     This function returns `0' on success.  In contrast to other
+     This function returns ‘0’ on success.  In contrast to other
      functions the non-zero return value on failure does not convey any
-     error code.  For setting "debug" the only possible error cause is
+     error code.  For setting “debug” the only possible error cause is
      an out of memory condition; which would exhibit itself later
      anyway.  Thus the return value may be ignored.
 
@@ -678,22 +675,22 @@ File: gpgme.info,  Node: Signal Handling,  Next: Multi Threading,  Prev: Library
 
 The GPGME library communicates with child processes (the crypto
 engines).  If a child process dies unexpectedly, for example due to a
-bug, or system problem, a `SIGPIPE' signal will be delivered to the
+bug, or system problem, a ‘SIGPIPE’ signal will be delivered to the
 application.  The default action is to abort the program.  To protect
-against this, `gpgme_check_version' sets the `SIGPIPE' signal action to
-`SIG_IGN', which means that the signal will be ignored.
+against this, ‘gpgme_check_version’ sets the ‘SIGPIPE’ signal action to
+‘SIG_IGN’, which means that the signal will be ignored.
 
-   GPGME will only do that if the signal action for `SIGPIPE' is
-`SIG_DEF' at the time `gpgme_check_version' is called.  If it is
-something different, `GPGME' will take no action.
+   GPGME will only do that if the signal action for ‘SIGPIPE’ is
+‘SIG_DEF’ at the time ‘gpgme_check_version’ is called.  If it is
+something different, ‘GPGME’ will take no action.
 
    This means that if your application does not install any signal
-handler for `SIGPIPE', you don't need to take any precautions.  If you
-do install a signal handler for `SIGPIPE', you must be prepared to
-handle any `SIGPIPE' events that occur due to GPGME writing to a
-defunct pipe.  Furthermore, if your application is multi-threaded, and
-you install a signal action for `SIGPIPE', you must make sure you do
-this either before `gpgme_check_version' is called or afterwards.
+handler for ‘SIGPIPE’, you don’t need to take any precautions.  If you
+do install a signal handler for ‘SIGPIPE’, you must be prepared to
+handle any ‘SIGPIPE’ events that occur due to GPGME writing to a defunct
+pipe.  Furthermore, if your application is multi-threaded, and you
+install a signal action for ‘SIGPIPE’, you must make sure you do this
+either before ‘gpgme_check_version’ is called or afterwards.
 
 
 File: gpgme.info,  Node: Multi Threading,  Prev: Signal Handling,  Up: Preparation
@@ -702,52 +699,51 @@ File: gpgme.info,  Node: Multi Threading,  Prev: Signal Handling,  Up: Preparati
 ===================
 
 The GPGME library is not entirely thread-safe, but it can still be used
-in a multi-threaded environment if some care is taken.  If the
-following requirements are met, there should be no race conditions to
-worry about:
+in a multi-threaded environment if some care is taken.  If the following
+requirements are met, there should be no race conditions to worry about:
 
-   * GPGME supports the thread libraries pthread and GNU Pth.  The
+   • GPGME supports the thread libraries pthread and GNU Pth.  The
      support for this has to be enabled at compile time.  GPGME will
-     automatically detect the location in which the thread libraries
-     are installed and activate the support for them at build time.
+     automatically detect the location in which the thread libraries are
+     installed and activate the support for them at build time.
 
      Support for other thread libraries is very easy to add.  Please
      contact us if you have the need.
 
-   * If you want to use GPGME with threads, you must link to the right
+   • If you want to use GPGME with threads, you must link to the right
      version of the library.  The name of the right library is
-     `libgpgme-' followed by the name of the thread package you use.
-     For example, if you use GNU Pth, the right name is `libgpgme-pth'.
-     Use the Automake macros or `gpgme-config' program for simplicity.
+     ‘libgpgme-’ followed by the name of the thread package you use.
+     For example, if you use GNU Pth, the right name is ‘libgpgme-pth’.
+     Use the Automake macros or ‘gpgme-config’ program for simplicity.
 
-   * The function `gpgme_check_version' must be called before any other
+   • The function ‘gpgme_check_version’ must be called before any other
      function in the library, because it initializes the thread support
      subsystem in GPGME.  To achieve this in multi-threaded programs,
      you must synchronize the memory with respect to other threads that
      also want to use GPGME.  For this, it is sufficient to call
-     `gpgme_check_version' before creating the other threads using
+     ‘gpgme_check_version’ before creating the other threads using
      GPGME(1).
 
-   * Any `gpgme_data_t' and `gpgme_ctx_t' object must only be accessed
-     by one thread at a time.  If multiple threads want to deal with
-     the same object, the caller has to make sure that operations on
-     that object are fully synchronized.
+   • Any ‘gpgme_data_t’ and ‘gpgme_ctx_t’ object must only be accessed
+     by one thread at a time.  If multiple threads want to deal with the
+     same object, the caller has to make sure that operations on that
+     object are fully synchronized.
 
-   * Only one thread at any time is allowed to call `gpgme_wait'.  If
+   • Only one thread at any time is allowed to call ‘gpgme_wait’.  If
      multiple threads call this function, the caller must make sure that
      all invocations are fully synchronized.  It is safe to start
      asynchronous operations while a thread is running in gpgme_wait.
 
-   * The function `gpgme_strerror' is not thread safe.  You have to use
-     `gpgme_strerror_r' instead.
+   • The function ‘gpgme_strerror’ is not thread safe.  You have to use
+     ‘gpgme_strerror_r’ instead.
 
    ---------- Footnotes ----------
 
-   (1) At least this is true for POSIX threads, as `pthread_create' is
-a function that synchronizes memory with respects to other threads.
-There are many functions which have this property, a complete list can
-be found in POSIX, IEEE Std 1003.1-2003, Base Definitions, Issue 6, in
-the definition of the term "Memory Synchronization".  For other thread
+   (1) At least this is true for POSIX threads, as ‘pthread_create’ is a
+function that synchronizes memory with respects to other threads.  There
+are many functions which have this property, a complete list can be
+found in POSIX, IEEE Std 1003.1-2003, Base Definitions, Issue 6, in the
+definition of the term “Memory Synchronization”.  For other thread
 packages other, more relaxed or more strict rules may apply.
 
 
@@ -761,48 +757,48 @@ implement them.  Rather it uses backends (also called engines) which
 implement the protocol.  GPGME uses inter-process communication to pass
 data back and forth between the application and the backend, but the
 details of the communication protocol and invocation of the backend is
-completely hidden by the interface.  All complexity is handled by
-GPGME.  Where an exchange of information between the application and
-the backend is necessary, GPGME provides the necessary callback function
-hooks and further interfaces.
+completely hidden by the interface.  All complexity is handled by GPGME.
+Where an exchange of information between the application and the backend
+is necessary, GPGME provides the necessary callback function hooks and
+further interfaces.
 
  -- Data type: enum gpgme_protocol_t
-     The `gpgme_protocol_t' type specifies the set of possible protocol
+     The ‘gpgme_protocol_t’ type specifies the set of possible protocol
      values that are supported by GPGME.  The following protocols are
      supported:
 
-    `GPGME_PROTOCOL_OpenPGP'
+     ‘GPGME_PROTOCOL_OpenPGP’
           This specifies the OpenPGP protocol.
 
-    `GPGME_PROTOCOL_CMS'
+     ‘GPGME_PROTOCOL_CMS’
           This specifies the Cryptographic Message Syntax.
 
-    `GPGME_PROTOCOL_ASSUAN'
+     ‘GPGME_PROTOCOL_ASSUAN’
           Under development.  Please ask on <gnupg-devel@gnupg.org> for
           help.
 
-    `GPGME_PROTOCOL_G13'
+     ‘GPGME_PROTOCOL_G13’
           Under development.  Please ask on <gnupg-devel@gnupg.org> for
           help.
 
-    `GPGME_PROTOCOL_UISERVER'
+     ‘GPGME_PROTOCOL_UISERVER’
           Under development.  Please ask on <gnupg-devel@gnupg.org> for
           help.
 
-    `GPGME_PROTOCOL_SPAWN'
-          Special protocol for use with `gpgme_op_spawn'.
+     ‘GPGME_PROTOCOL_SPAWN’
+          Special protocol for use with ‘gpgme_op_spawn’.
 
-    `GPGME_PROTOCOL_UNKNOWN'
+     ‘GPGME_PROTOCOL_UNKNOWN’
           Reserved for future extension.  You may use this to indicate
           that the used protocol is not known to the application.
           Currently, GPGME does not accept this value in any operation,
-          though, except for `gpgme_get_protocol_name'.
+          though, except for ‘gpgme_get_protocol_name’.
 
  -- Function: const char * gpgme_get_protocol_name
           (gpgme_protocol_t PROTOCOL)
-     The function `gpgme_get_protocol_name' returns a statically
-     allocated string describing the protocol PROTOCOL, or `NULL' if
-     the protocol number is not valid.
+     The function ‘gpgme_get_protocol_name’ returns a statically
+     allocated string describing the protocol PROTOCOL, or ‘NULL’ if the
+     protocol number is not valid.
 
 * Menu:
 
@@ -819,44 +815,42 @@ File: gpgme.info,  Node: Engine Version Check,  Next: Engine Information,  Up: P
 ========================
 
  -- Function: const char * gpgme_get_dirinfo (cons char *WHAT)
-     The function `gpgme_get_dirinfo' returns a statically allocated
+     The function ‘gpgme_get_dirinfo’ returns a statically allocated
      string with the value associated to WHAT.  The returned values are
-     the defaults and won't change even after `gpgme_set_engine_info'
-     has been used to configure a different engine.  `NULL' is returned
+     the defaults and won’t change even after ‘gpgme_set_engine_info’
+     has been used to configure a different engine.  ‘NULL’ is returned
      if no value is available.  Commonly supported values for WHAT are:
 
-    `homedir'
+     ‘homedir’
           Return the default home directory.
 
-    `agent-socket'
+     ‘agent-socket’
           Return the name of the socket to connect to the gpg-agent.
 
-    `uiserver-socket'
-          Return the name of the socket to connect to the user
-          interface server.
+     ‘uiserver-socket’
+          Return the name of the socket to connect to the user interface
+          server.
 
-    `gpgconf-name'
+     ‘gpgconf-name’
           Return the file name of the engine configuration tool.
 
-    `gpg-name'
+     ‘gpg-name’
           Return the file name of the OpenPGP engine.
 
-    `gpgsm-name'
+     ‘gpgsm-name’
           Return the file name of the CMS engine.
 
-    `g13-name'
+     ‘g13-name’
           Return the name of the file container encryption engine.
 
-
-
  -- Function: gpgme_error_t gpgme_engine_check_version
           (gpgme_protocol_t PROTOCOL)
-     The function `gpgme_engine_check_version' verifies that the engine
+     The function ‘gpgme_engine_check_version’ verifies that the engine
      implementing the protocol PROTOCOL is installed in the expected
      path and meets the version requirement of GPGME.
 
-     This function returns the error code `GPG_ERR_NO_ERROR' if the
-     engine is available and `GPG_ERR_INV_ENGINE' if it is not.
+     This function returns the error code ‘GPG_ERR_NO_ERROR’ if the
+     engine is available and ‘GPG_ERR_INV_ENGINE’ if it is not.
 
 
 File: gpgme.info,  Node: Engine Information,  Next: Engine Configuration,  Prev: Engine Version Check,  Up: Protocols and Engines
@@ -865,55 +859,55 @@ File: gpgme.info,  Node: Engine Information,  Next: Engine Configuration,  Prev:
 ======================
 
  -- Data type: gpgme_engine_info_t
-     The `gpgme_engine_info_t' type specifies a pointer to a structure
+     The ‘gpgme_engine_info_t’ type specifies a pointer to a structure
      describing a crypto engine.  The structure contains the following
      elements:
 
-    `gpgme_engine_info_t next'
+     ‘gpgme_engine_info_t next’
           This is a pointer to the next engine info structure in the
-          linked list, or `NULL' if this is the last element.
+          linked list, or ‘NULL’ if this is the last element.
 
-    `gpgme_protocol_t protocol'
-          This is the protocol for which the crypto engine is used.
-          You can convert this to a string with
-          `gpgme_get_protocol_name' for printing.
+     ‘gpgme_protocol_t protocol’
+          This is the protocol for which the crypto engine is used.  You
+          can convert this to a string with ‘gpgme_get_protocol_name’
+          for printing.
 
-    `const char *file_name'
+     ‘const char *file_name’
           This is a string holding the file name of the executable of
-          the crypto engine.  Currently, it is never `NULL', but using
-          `NULL' is reserved for future use, so always check before you
+          the crypto engine.  Currently, it is never ‘NULL’, but using
+          ‘NULL’ is reserved for future use, so always check before you
           use it.
 
-    `const char *home_dir'
+     ‘const char *home_dir’
           This is a string holding the directory name of the crypto
-          engine's configuration directory.  If it is `NULL', then the
-          default directory is used.  See `gpgme_get_dirinfo' on how to
+          engine’s configuration directory.  If it is ‘NULL’, then the
+          default directory is used.  See ‘gpgme_get_dirinfo’ on how to
           get the default directory.
 
-    `const char *version'
+     ‘const char *version’
           This is a string containing the version number of the crypto
-          engine.  It might be `NULL' if the version number can not be
-          determined, for example because the executable doesn't exist
+          engine.  It might be ‘NULL’ if the version number can not be
+          determined, for example because the executable doesn’t exist
           or is invalid.
 
-    `const char *req_version'
+     ‘const char *req_version’
           This is a string containing the minimum required version
-          number of the crypto engine for GPGME to work correctly.
-          This is the version number that `gpgme_engine_check_version'
-          verifies against.  Currently, it is never `NULL', but using
-          `NULL' is reserved for future use, so always check before you
+          number of the crypto engine for GPGME to work correctly.  This
+          is the version number that ‘gpgme_engine_check_version’
+          verifies against.  Currently, it is never ‘NULL’, but using
+          ‘NULL’ is reserved for future use, so always check before you
           use it.
 
  -- Function: gpgme_error_t gpgme_get_engine_info
           (gpgme_engine_info_t *INFO)
-     The function `gpgme_get_engine_info' returns a linked list of
+     The function ‘gpgme_get_engine_info’ returns a linked list of
      engine info structures in INFO.  Each info structure describes the
      defaults of one configured backend.
 
      The memory for the info structures is allocated the first time this
      function is invoked, and must not be freed by the caller.
 
-     This function returns the error code `GPG_ERR_NO_ERROR' if
+     This function returns the error code ‘GPG_ERR_NO_ERROR’ if
      successful, and a system error if the memory could not be
      allocated.
 
@@ -964,21 +958,21 @@ individually.
  -- Function: gpgme_error_t gpgme_set_engine_info
           (gpgme_protocol_t PROTO, const char *FILE_NAME,
           const char *HOME_DIR)
-     The function `gpgme_set_engine_info' changes the default
+     The function ‘gpgme_set_engine_info’ changes the default
      configuration of the crypto engine implementing the protocol PROTO.
 
      FILE_NAME is the file name of the executable program implementing
      this protocol, and HOME_DIR is the directory name of the
      configuration directory for this crypto engine.  If HOME_DIR is
-     `NULL', the engine's default will be used.
+     ‘NULL’, the engine’s default will be used.
 
      The new defaults are not applied to already created GPGME contexts.
 
-     This function returns the error code `GPG_ERR_NO_ERROR' if
+     This function returns the error code ‘GPG_ERR_NO_ERROR’ if
      successful, or an eror code on failure.
 
-   The functions `gpgme_ctx_get_engine_info' and
-`gpgme_ctx_set_engine_info' can be used to change the engine
+   The functions ‘gpgme_ctx_get_engine_info’ and
+‘gpgme_ctx_set_engine_info’ can be used to change the engine
 configuration per context.  *Note Crypto Engine::.
 
 
@@ -990,7 +984,7 @@ File: gpgme.info,  Node: OpenPGP,  Next: Cryptographic Message Syntax,  Prev: En
 OpenPGP is implemented by GnuPG, the GNU Privacy Guard.  This is the
 first protocol that was supported by GPGME.
 
-   The OpenPGP protocol is specified by `GPGME_PROTOCOL_OpenPGP'.
+   The OpenPGP protocol is specified by ‘GPGME_PROTOCOL_OpenPGP’.
 
 
 File: gpgme.info,  Node: Cryptographic Message Syntax,  Prev: OpenPGP,  Up: Protocols and Engines
@@ -1000,7 +994,7 @@ File: gpgme.info,  Node: Cryptographic Message Syntax,  Prev: OpenPGP,  Up: Prot
 
 CMS is implemented by GpgSM, the S/MIME implementation for GnuPG.
 
-   The CMS protocol is specified by `GPGME_PROTOCOL_CMS'.
+   The CMS protocol is specified by ‘GPGME_PROTOCOL_CMS’.
 
 
 File: gpgme.info,  Node: Algorithms,  Next: Error Handling,  Prev: Protocols and Engines,  Up: Top
@@ -1032,52 +1026,51 @@ Public key algorithms are used for encryption, decryption, signing and
 verification of signatures.
 
  -- Data type: enum gpgme_pubkey_algo_t
-     The `gpgme_pubkey_algo_t' type specifies the set of all public key
+     The ‘gpgme_pubkey_algo_t’ type specifies the set of all public key
      algorithms that are supported by GPGME.  Possible values are:
 
-    `GPGME_PK_RSA'
+     ‘GPGME_PK_RSA’
           This value indicates the RSA (Rivest, Shamir, Adleman)
           algorithm.
 
-    `GPGME_PK_RSA_E'
+     ‘GPGME_PK_RSA_E’
           Deprecated.  This value indicates the RSA (Rivest, Shamir,
           Adleman) algorithm for encryption and decryption only.
 
-    `GPGME_PK_RSA_S'
+     ‘GPGME_PK_RSA_S’
           Deprecated.  This value indicates the RSA (Rivest, Shamir,
           Adleman) algorithm for signing and verification only.
 
-    `GPGME_PK_DSA'
+     ‘GPGME_PK_DSA’
           This value indicates DSA, the Digital Signature Algorithm.
 
-    `GPGME_PK_ELG'
+     ‘GPGME_PK_ELG’
           This value indicates ElGamal.
 
-    `GPGME_PK_ELG_E'
+     ‘GPGME_PK_ELG_E’
           This value also indicates ElGamal and is used specifically in
           GnuPG.
 
-    `GPGME_PK_ECC'
+     ‘GPGME_PK_ECC’
           This value is a generic indicator for ellipic curve
           algorithms.
 
-    `GPGME_PK_ECDSA'
+     ‘GPGME_PK_ECDSA’
           This value indicates ECDSA, the Elliptic Curve Digital
           Signature Algorithm as defined by FIPS 186-2 and RFC-6637.
 
-    `GPGME_PK_ECDH'
+     ‘GPGME_PK_ECDH’
           This value indicates ECDH, the Eliptic Curve Diffie-Hellmann
           encryption algorithm as defined by RFC-6637.
 
-
  -- Function: const char * gpgme_pubkey_algo_name
           (gpgme_pubkey_algo_t ALGO)
-     The function `gpgme_pubkey_algo_name' returns a pointer to a
+     The function ‘gpgme_pubkey_algo_name’ returns a pointer to a
      statically allocated string containing a description of the public
      key algorithm ALGO.  This string can be used to output the name of
      the public key algorithm to the user.
 
-     If ALGO is not a valid public key algorithm, `NULL' is returned.
+     If ALGO is not a valid public key algorithm, ‘NULL’ is returned.
 
 
 File: gpgme.info,  Node: Hash Algorithms,  Prev: Public Key Algorithms,  Up: Algorithms
@@ -1089,44 +1082,31 @@ Hash (message digest) algorithms are used to compress a long message to
 make it suitable for public key cryptography.
 
  -- Data type: enum gpgme_hash_algo_t
-     The `gpgme_hash_algo_t' type specifies the set of all hash
+     The ‘gpgme_hash_algo_t’ type specifies the set of all hash
      algorithms that are supported by GPGME.  Possible values are:
 
-    `GPGME_MD_MD5'
-
-    `GPGME_MD_SHA1'
-
-    `GPGME_MD_RMD160'
-
-    `GPGME_MD_MD2'
-
-    `GPGME_MD_TIGER'
-
-    `GPGME_MD_HAVAL'
-
-    `GPGME_MD_SHA256'
-
-    `GPGME_MD_SHA384'
-
-    `GPGME_MD_SHA512'
-
-    `GPGME_MD_SHA224'
-
-    `GPGME_MD_MD4'
-
-    `GPGME_MD_CRC32'
-
-    `GPGME_MD_CRC32_RFC1510'
-
-    `GPGME_MD_CRC24_RFC2440'
+     ‘GPGME_MD_MD5’
+     ‘GPGME_MD_SHA1’
+     ‘GPGME_MD_RMD160’
+     ‘GPGME_MD_MD2’
+     ‘GPGME_MD_TIGER’
+     ‘GPGME_MD_HAVAL’
+     ‘GPGME_MD_SHA256’
+     ‘GPGME_MD_SHA384’
+     ‘GPGME_MD_SHA512’
+     ‘GPGME_MD_SHA224’
+     ‘GPGME_MD_MD4’
+     ‘GPGME_MD_CRC32’
+     ‘GPGME_MD_CRC32_RFC1510’
+     ‘GPGME_MD_CRC24_RFC2440’
 
  -- Function: const char * gpgme_hash_algo_name (gpgme_hash_algo_t ALGO)
-     The function `gpgme_hash_algo_name' returns a pointer to a
+     The function ‘gpgme_hash_algo_name’ returns a pointer to a
      statically allocated string containing a description of the hash
      algorithm ALGO.  This string can be used to output the name of the
      hash algorithm to the user.
 
-     If ALGO is not a valid hash algorithm, `NULL' is returned.
+     If ALGO is not a valid hash algorithm, ‘NULL’ is returned.
 
 
 File: gpgme.info,  Node: Error Handling,  Next: Exchanging Data,  Prev: Algorithms,  Up: Top
@@ -1135,10 +1115,10 @@ File: gpgme.info,  Node: Error Handling,  Next: Exchanging Data,  Prev: Algorith
 ****************
 
 Many functions in GPGME can return an error if they fail.  For this
-reason, the application should always catch the error condition and
-take appropriate measures, for example by releasing the resources and
-passing the error up to the caller, or by displaying a descriptive
-message to the user and cancelling the operation.
+reason, the application should always catch the error condition and take
+appropriate measures, for example by releasing the resources and passing
+the error up to the caller, or by displaying a descriptive message to
+the user and cancelling the operation.
 
    Some error values do not indicate a system error or an error in the
 operation, but the result of an operation that failed properly.  For
@@ -1149,13 +1129,13 @@ error codes what they mean usually.  Some error values have specific
 meanings if returned by a certain functions.  Such cases are described
 in the documentation of those functions.
 
-   GPGME uses the `libgpg-error' library.  This allows to share the
+   GPGME uses the ‘libgpg-error’ library.  This allows to share the
 error codes with other components of the GnuPG system, and thus pass
 error values transparently from the crypto engine, or some helper
 application of the crypto engine, to the user.  This way no information
 is lost.  As a consequence, GPGME does not use its own identifiers for
-error codes, but uses those provided by `libgpg-error'.  They usually
-start with `GPG_ERR_'.
+error codes, but uses those provided by ‘libgpg-error’.  They usually
+start with ‘GPG_ERR_’.
 
    However, GPGME does provide aliases for the functions defined in
 libgpg-error, which might be preferred for name space consistency.
@@ -1174,33 +1154,33 @@ File: gpgme.info,  Node: Error Values,  Next: Error Sources,  Up: Error Handling
 ================
 
  -- Data type: gpgme_err_code_t
-     The `gpgme_err_code_t' type is an alias for the `libgpg-error'
-     type `gpg_err_code_t'.  The error code indicates the type of an
-     error, or the reason why an operation failed.
+     The ‘gpgme_err_code_t’ type is an alias for the ‘libgpg-error’ type
+     ‘gpg_err_code_t’.  The error code indicates the type of an error,
+     or the reason why an operation failed.
 
      A list of important error codes can be found in the next section.
 
  -- Data type: gpgme_err_source_t
-     The `gpgme_err_source_t' type is an alias for the `libgpg-error'
-     type `gpg_err_source_t'.  The error source has not a precisely
+     The ‘gpgme_err_source_t’ type is an alias for the ‘libgpg-error’
+     type ‘gpg_err_source_t’.  The error source has not a precisely
      defined meaning.  Sometimes it is the place where the error
-     happened, sometimes it is the place where an error was encoded
-     into an error value.  Usually the error source will give an
-     indication to where to look for the problem.  This is not always
-     true, but it is attempted to achieve this goal.
+     happened, sometimes it is the place where an error was encoded into
+     an error value.  Usually the error source will give an indication
+     to where to look for the problem.  This is not always true, but it
+     is attempted to achieve this goal.
 
      A list of important error sources can be found in the next section.
 
  -- Data type: gpgme_error_t
-     The `gpgme_error_t' type is an alias for the `libgpg-error' type
-     `gpg_error_t'.  An error value like this has always two
-     components, an error code and an error source.  Both together form
-     the error value.
+     The ‘gpgme_error_t’ type is an alias for the ‘libgpg-error’ type
+     ‘gpg_error_t’.  An error value like this has always two components,
+     an error code and an error source.  Both together form the error
+     value.
 
      Thus, the error value can not be directly compared against an error
      code, but the accessor functions described below must be used.
      However, it is guaranteed that only 0 is used to indicate success
-     (`GPG_ERR_NO_ERROR'), and that in this case all other parts of the
+     (‘GPG_ERR_NO_ERROR’), and that in this case all other parts of the
      error value are set to 0, too.
 
      Note that in GPGME, the error source is used purely for
@@ -1211,72 +1191,69 @@ File: gpgme.info,  Node: Error Values,  Next: Error Sources,  Up: Error Handling
 
  -- Function: static inline gpgme_err_code_t gpgme_err_code
           (gpgme_error_t ERR)
-     The static inline function `gpgme_err_code' returns the
-     `gpgme_err_code_t' component of the error value ERR.  This
-     function must be used to extract the error code from an error
-     value in order to compare it with the `GPG_ERR_*' error code
-     macros.
+     The static inline function ‘gpgme_err_code’ returns the
+     ‘gpgme_err_code_t’ component of the error value ERR.  This function
+     must be used to extract the error code from an error value in order
+     to compare it with the ‘GPG_ERR_*’ error code macros.
 
  -- Function: static inline gpgme_err_source_t gpgme_err_source
           (gpgme_error_t ERR)
-     The static inline function `gpgme_err_source' returns the
-     `gpgme_err_source_t' component of the error value ERR.  This
+     The static inline function ‘gpgme_err_source’ returns the
+     ‘gpgme_err_source_t’ component of the error value ERR.  This
      function must be used to extract the error source from an error
-     value in order to compare it with the `GPG_ERR_SOURCE_*' error
+     value in order to compare it with the ‘GPG_ERR_SOURCE_*’ error
      source macros.
 
  -- Function: static inline gpgme_error_t gpgme_err_make
           (gpgme_err_source_t SOURCE, gpgme_err_code_t CODE)
-     The static inline function `gpgme_err_make' returns the error
-     value consisting of the error source SOURCE and the error code
-     CODE.
+     The static inline function ‘gpgme_err_make’ returns the error value
+     consisting of the error source SOURCE and the error code CODE.
 
      This function can be used in callback functions to construct an
      error value to return it to the library.
 
  -- Function: static inline gpgme_error_t gpgme_error
           (gpgme_err_code_t CODE)
-     The static inline function `gpgme_error' returns the error value
+     The static inline function ‘gpgme_error’ returns the error value
      consisting of the default error source and the error code CODE.
 
      For GPGME applications, the default error source is
-     `GPG_ERR_SOURCE_USER_1'.  You can define
-     `GPGME_ERR_SOURCE_DEFAULT' before including `gpgme.h' to change
-     this default.
+     ‘GPG_ERR_SOURCE_USER_1’.  You can define ‘GPGME_ERR_SOURCE_DEFAULT’
+     before including ‘gpgme.h’ to change this default.
 
      This function can be used in callback functions to construct an
      error value to return it to the library.
 
-   The `libgpg-error' library provides error codes for all system error
+   The ‘libgpg-error’ library provides error codes for all system error
 numbers it knows about.  If ERR is an unknown error number, the error
-code `GPG_ERR_UNKNOWN_ERRNO' is used.  The following functions can be
+code ‘GPG_ERR_UNKNOWN_ERRNO’ is used.  The following functions can be
 used to construct error values from system errnor numbers.
 
  -- Function: gpgme_error_t gpgme_err_make_from_errno
           (gpgme_err_source_t SOURCE, int ERR)
-     The function `gpgme_err_make_from_errno' is like `gpgme_err_make',
-     but it takes a system error like `errno' instead of a
-     `gpgme_err_code_t' error code.
+     The function ‘gpgme_err_make_from_errno’ is like ‘gpgme_err_make’,
+     but it takes a system error like ‘errno’ instead of a
+     ‘gpgme_err_code_t’ error code.
 
  -- Function: gpgme_error_t gpgme_error_from_errno (int ERR)
-     The function `gpgme_error_from_errno' is like `gpgme_error', but
-     it takes a system error like `errno' instead of a
-     `gpgme_err_code_t' error code.
+     The function ‘gpgme_error_from_errno’ is like ‘gpgme_error’, but it
+     takes a system error like ‘errno’ instead of a ‘gpgme_err_code_t’
+     error code.
 
    Sometimes you might want to map system error numbers to error codes
 directly, or map an error code representing a system error back to the
 system error number.  The following functions can be used to do that.
 
  -- Function: gpgme_err_code_t gpgme_err_code_from_errno (int ERR)
-     The function `gpgme_err_code_from_errno' returns the error code
-     for the system error ERR.  If ERR is not a known system error, the
-     function returns `GPG_ERR_UNKNOWN_ERRNO'.
+     The function ‘gpgme_err_code_from_errno’ returns the error code for
+     the system error ERR.  If ERR is not a known system error, the
+     function returns ‘GPG_ERR_UNKNOWN_ERRNO’.
 
  -- Function: int gpgme_err_code_to_errno (gpgme_err_code_t ERR)
-     The function `gpgme_err_code_to_errno' returns the system error
-     for the error code ERR.  If ERR is not an error code representing
-     a system error, or if this system error is not defined on this
-     system, the function returns `0'.
+     The function ‘gpgme_err_code_to_errno’ returns the system error for
+     the error code ERR.  If ERR is not an error code representing a
+     system error, or if this system error is not defined on this
+     system, the function returns ‘0’.
 
 
 File: gpgme.info,  Node: Error Sources,  Next: Error Codes,  Prev: Error Values,  Up: Error Handling
@@ -1284,68 +1261,65 @@ File: gpgme.info,  Node: Error Sources,  Next: Error Codes,  Prev: Error Values,
 5.2 Error Sources
 =================
 
-The library `libgpg-error' defines an error source for every component
+The library ‘libgpg-error’ defines an error source for every component
 of the GnuPG system.  The error source part of an error value is not
 well defined.  As such it is mainly useful to improve the diagnostic
 error message for the user.
 
-   If the error code part of an error value is `0', the whole error
-value will be `0'.  In this case the error source part is of course
-`GPG_ERR_SOURCE_UNKNOWN'.
+   If the error code part of an error value is ‘0’, the whole error
+value will be ‘0’.  In this case the error source part is of course
+‘GPG_ERR_SOURCE_UNKNOWN’.
 
    The list of error sources that might occur in applications using
 GPGME is:
 
-`GPG_ERR_SOURCE_UNKNOWN'
+‘GPG_ERR_SOURCE_UNKNOWN’
      The error source is not known.  The value of this error source is
-     `0'.
+     ‘0’.
 
-`GPG_ERR_SOURCE_GPGME'
+‘GPG_ERR_SOURCE_GPGME’
      The error source is GPGME itself.  This is the default for errors
      that occur in the GPGME library.
 
-`GPG_ERR_SOURCE_GPG'
+‘GPG_ERR_SOURCE_GPG’
      The error source is GnuPG, which is the crypto engine used for the
      OpenPGP protocol.
 
-`GPG_ERR_SOURCE_GPGSM'
+‘GPG_ERR_SOURCE_GPGSM’
      The error source is GPGSM, which is the crypto engine used for the
      CMS protocol.
 
-`GPG_ERR_SOURCE_GCRYPT'
-     The error source is `libgcrypt', which is used by crypto engines
-     to perform cryptographic operations.
+‘GPG_ERR_SOURCE_GCRYPT’
+     The error source is ‘libgcrypt’, which is used by crypto engines to
+     perform cryptographic operations.
 
-`GPG_ERR_SOURCE_GPGAGENT'
-     The error source is `gpg-agent', which is used by crypto engines
-     to perform operations with the secret key.
+‘GPG_ERR_SOURCE_GPGAGENT’
+     The error source is ‘gpg-agent’, which is used by crypto engines to
+     perform operations with the secret key.
 
-`GPG_ERR_SOURCE_PINENTRY'
-     The error source is `pinentry', which is used by `gpg-agent' to
+‘GPG_ERR_SOURCE_PINENTRY’
+     The error source is ‘pinentry’, which is used by ‘gpg-agent’ to
      query the passphrase to unlock a secret key.
 
-`GPG_ERR_SOURCE_SCD'
+‘GPG_ERR_SOURCE_SCD’
      The error source is the SmartCard Daemon, which is used by
-     `gpg-agent' to delegate operations with the secret key to a
+     ‘gpg-agent’ to delegate operations with the secret key to a
      SmartCard.
 
-`GPG_ERR_SOURCE_KEYBOX'
-     The error source is `libkbx', a library used by the crypto engines
+‘GPG_ERR_SOURCE_KEYBOX’
+     The error source is ‘libkbx’, a library used by the crypto engines
      to manage local keyrings.
 
-`GPG_ERR_SOURCE_USER_1'
-
-`GPG_ERR_SOURCE_USER_2'
-
-`GPG_ERR_SOURCE_USER_3'
-
-`GPG_ERR_SOURCE_USER_4'
+‘GPG_ERR_SOURCE_USER_1’
+‘GPG_ERR_SOURCE_USER_2’
+‘GPG_ERR_SOURCE_USER_3’
+‘GPG_ERR_SOURCE_USER_4’
      These error sources are not used by any GnuPG component and can be
      used by other software.  For example, applications using GPGME can
      use them to mark error values coming from callback handlers.  Thus
-     `GPG_ERR_SOURCE_USER_1' is the default for errors created with
-     `gpgme_error' and `gpgme_error_from_errno', unless you define
-     `GPGME_ERR_SOURCE_DEFAULT' before including `gpgme.h'.
+     ‘GPG_ERR_SOURCE_USER_1’ is the default for errors created with
+     ‘gpgme_error’ and ‘gpgme_error_from_errno’, unless you define
+     ‘GPGME_ERR_SOURCE_DEFAULT’ before including ‘gpgme.h’.
 
 
 File: gpgme.info,  Node: Error Codes,  Next: Error Strings,  Prev: Error Sources,  Up: Error Handling
@@ -1353,134 +1327,131 @@ File: gpgme.info,  Node: Error Codes,  Next: Error Strings,  Prev: Error Sources
 5.3 Error Codes
 ===============
 
-The library `libgpg-error' defines many error values.  Most of them are
-not used by `GPGME' directly, but might be returned by GPGME because it
-received them from the crypto engine.  The below list only includes
-such error codes that have a specific meaning in `GPGME', or which are
-so common that you should know about them.
+The library ‘libgpg-error’ defines many error values.  Most of them are
+not used by ‘GPGME’ directly, but might be returned by GPGME because it
+received them from the crypto engine.  The below list only includes such
+error codes that have a specific meaning in ‘GPGME’, or which are so
+common that you should know about them.
 
-`GPG_ERR_EOF'
+‘GPG_ERR_EOF’
      This value indicates the end of a list, buffer or file.
 
-`GPG_ERR_NO_ERROR'
-     This value indicates success.  The value of this error code is
-     `0'.  Also, it is guaranteed that an error value made from the
-     error code `0' will be `0' itself (as a whole).  This means that
-     the error source information is lost for this error code, however,
-     as this error code indicates that no error occured, this is
-     generally not a problem.
+‘GPG_ERR_NO_ERROR’
+     This value indicates success.  The value of this error code is ‘0’.
+     Also, it is guaranteed that an error value made from the error code
+     ‘0’ will be ‘0’ itself (as a whole).  This means that the error
+     source information is lost for this error code, however, as this
+     error code indicates that no error occured, this is generally not a
+     problem.
 
-`GPG_ERR_GENERAL'
+‘GPG_ERR_GENERAL’
      This value means that something went wrong, but either there is not
      enough information about the problem to return a more useful error
      value, or there is no separate error value for this type of
      problem.
 
-`GPG_ERR_ENOMEM'
+‘GPG_ERR_ENOMEM’
      This value means that an out-of-memory condition occurred.
 
-`GPG_ERR_E...'
+‘GPG_ERR_E...’
      System errors are mapped to GPG_ERR_FOO where FOO is the symbol for
      the system error.
 
-`GPG_ERR_INV_VALUE'
+‘GPG_ERR_INV_VALUE’
      This value means that some user provided data was out of range.
      This can also refer to objects.  For example, if an empty
-     `gpgme_data_t' object was expected, but one containing data was
+     ‘gpgme_data_t’ object was expected, but one containing data was
      provided, this error value is returned.
 
-`GPG_ERR_UNUSABLE_PUBKEY'
+‘GPG_ERR_UNUSABLE_PUBKEY’
      This value means that some recipients for a message were invalid.
 
-`GPG_ERR_UNUSABLE_SECKEY'
+‘GPG_ERR_UNUSABLE_SECKEY’
      This value means that some signers were invalid.
 
-`GPG_ERR_NO_DATA'
-     This value means that a `gpgme_data_t' object which was expected
-     to have content was found empty.
+‘GPG_ERR_NO_DATA’
+     This value means that a ‘gpgme_data_t’ object which was expected to
+     have content was found empty.
 
-`GPG_ERR_CONFLICT'
+‘GPG_ERR_CONFLICT’
      This value means that a conflict of some sort occurred.
 
-`GPG_ERR_NOT_IMPLEMENTED'
+‘GPG_ERR_NOT_IMPLEMENTED’
      This value indicates that the specific function (or operation) is
      not implemented.  This error should never happen.  It can only
      occur if you use certain values or configuration options which do
      not work, but for which we think that they should work at some
      later time.
 
-`GPG_ERR_DECRYPT_FAILED'
+‘GPG_ERR_DECRYPT_FAILED’
      This value indicates that a decryption operation was unsuccessful.
 
-`GPG_ERR_BAD_PASSPHRASE'
+‘GPG_ERR_BAD_PASSPHRASE’
      This value means that the user did not provide a correct passphrase
      when requested.
 
-`GPG_ERR_CANCELED'
+‘GPG_ERR_CANCELED’
      This value means that the operation was canceled.
 
-`GPG_ERR_INV_ENGINE'
+‘GPG_ERR_INV_ENGINE’
      This value means that the engine that implements the desired
      protocol is currently not available.  This can either be because
      the sources were configured to exclude support for this engine, or
      because the engine is not installed properly.
 
-`GPG_ERR_AMBIGUOUS_NAME'
+‘GPG_ERR_AMBIGUOUS_NAME’
      This value indicates that a user ID or other specifier did not
      specify a unique key.
 
-`GPG_ERR_WRONG_KEY_USAGE'
+‘GPG_ERR_WRONG_KEY_USAGE’
      This value indicates that a key is not used appropriately.
 
-`GPG_ERR_CERT_REVOKED'
+‘GPG_ERR_CERT_REVOKED’
      This value indicates that a key signature was revoced.
 
-`GPG_ERR_CERT_EXPIRED'
+‘GPG_ERR_CERT_EXPIRED’
      This value indicates that a key signature expired.
 
-`GPG_ERR_NO_CRL_KNOWN'
+‘GPG_ERR_NO_CRL_KNOWN’
      This value indicates that no certificate revocation list is known
      for the certificate.
 
-`GPG_ERR_NO_POLICY_MATCH'
+‘GPG_ERR_NO_POLICY_MATCH’
      This value indicates that a policy issue occured.
 
-`GPG_ERR_NO_SECKEY'
+‘GPG_ERR_NO_SECKEY’
      This value indicates that no secret key for the user ID is
      available.
 
-`GPG_ERR_MISSING_CERT'
+‘GPG_ERR_MISSING_CERT’
      This value indicates that a key could not be imported because the
      issuer certificate is missing.
 
-`GPG_ERR_BAD_CERT_CHAIN'
+‘GPG_ERR_BAD_CERT_CHAIN’
      This value indicates that a key could not be imported because its
      certificate chain is not good, for example it could be too long.
 
-`GPG_ERR_UNSUPPORTED_ALGORITHM'
+‘GPG_ERR_UNSUPPORTED_ALGORITHM’
      This value means a verification failed because the cryptographic
      algorithm is not supported by the crypto backend.
 
-`GPG_ERR_BAD_SIGNATURE'
+‘GPG_ERR_BAD_SIGNATURE’
      This value means a verification failed because the signature is
      bad.
 
-`GPG_ERR_NO_PUBKEY'
+‘GPG_ERR_NO_PUBKEY’
      This value means a verification failed because the public key is
      not available.
 
-`GPG_ERR_USER_1'
-
-`GPG_ERR_USER_2'
-
-`...'
-
-`GPG_ERR_USER_16'
+‘GPG_ERR_USER_1’
+‘GPG_ERR_USER_2’
+‘...’
+‘GPG_ERR_USER_16’
      These error codes are not used by any GnuPG component and can be
      freely used by other software.  Applications using GPGME might use
      them to mark specific errors returned by callback handlers if no
-     suitable error codes (including the system errors) for these
-     errors exist already.
+     suitable error codes (including the system errors) for these errors
+     exist already.
 
 
 File: gpgme.info,  Node: Error Strings,  Prev: Error Codes,  Up: Error Handling
@@ -1489,32 +1460,32 @@ File: gpgme.info,  Node: Error Strings,  Prev: Error Codes,  Up: Error Handling
 =================
 
  -- Function: const char * gpgme_strerror (gpgme_error_t ERR)
-     The function `gpgme_strerror' returns a pointer to a statically
+     The function ‘gpgme_strerror’ returns a pointer to a statically
      allocated string containing a description of the error code
      contained in the error value ERR.  This string can be used to
      output a diagnostic message to the user.
 
-     This function is not thread safe.  Use `gpgme_strerror_r' in
+     This function is not thread safe.  Use ‘gpgme_strerror_r’ in
      multi-threaded programs.
 
  -- Function: int gpgme_strerror_r (gpgme_error_t ERR, char *BUF,
           size_t BUFLEN)
-     The function `gpgme_strerror_r' returns the error string for ERR
-     in the user-supplied buffer BUF of size BUFLEN.  This function is,
-     in contrast to `gpgme_strerror', thread-safe if a thread-safe
-     `strerror_r' function is provided by the system.  If the function
+     The function ‘gpgme_strerror_r’ returns the error string for ERR in
+     the user-supplied buffer BUF of size BUFLEN.  This function is, in
+     contrast to ‘gpgme_strerror’, thread-safe if a thread-safe
+     ‘strerror_r’ function is provided by the system.  If the function
      succeeds, 0 is returned and BUF contains the string describing the
      error.  If the buffer was not large enough, ERANGE is returned and
      BUF contains as much of the beginning of the error string as fits
      into the buffer.
 
  -- Function: const char * gpgme_strsource (gpgme_error_t ERR)
-     The function `gpgme_strerror' returns a pointer to a statically
+     The function ‘gpgme_strerror’ returns a pointer to a statically
      allocated string containing a description of the error source
      contained in the error value ERR.  This string can be used to
      output a diagnostic message to the user.
 
-   The following example illustrates the use of `gpgme_strerror':
+   The following example illustrates the use of ‘gpgme_strerror’:
 
      gpgme_ctx_t ctx;
      gpgme_error_t err = gpgme_new (&ctx);
@@ -1535,30 +1506,30 @@ A lot of data has to be exchanged between the user and the crypto
 engine, like plaintext messages, ciphertext, signatures and information
 about the keys.  The technical details about exchanging the data
 information are completely abstracted by GPGME.  The user provides and
-receives the data via `gpgme_data_t' objects, regardless of the
+receives the data via ‘gpgme_data_t’ objects, regardless of the
 communication protocol between GPGME and the crypto engine in use.
 
  -- Data type: gpgme_data_t
-     The `gpgme_data_t' type is a handle for a container for generic
+     The ‘gpgme_data_t’ type is a handle for a container for generic
      data, which is used by GPGME to exchange data with the user.
 
-   `gpgme_data_t' objects do not provide notifications on events.  It
-is assumed that read and write operations are blocking until data is
-available.  If this is undesirable, the application must ensure that
-all GPGME data operations always have data available, for example by
-using memory buffers or files rather than pipes or sockets.  This might
-be relevant, for example, if the external event loop mechanism is used.
+   ‘gpgme_data_t’ objects do not provide notifications on events.  It is
+assumed that read and write operations are blocking until data is
+available.  If this is undesirable, the application must ensure that all
+GPGME data operations always have data available, for example by using
+memory buffers or files rather than pipes or sockets.  This might be
+relevant, for example, if the external event loop mechanism is used.
 
  -- Data type: gpgme_off_t
-     On POSIX platforms the `gpgme_off_t' type is an alias for `off_t';
-     it may be used interchangeable.  On Windows platforms
-     `gpgme_off_t' is defined as a long (i.e. 32 bit) for 32 bit
-     Windows and as a 64 bit signed integer for 64 bit Windows.
+     On POSIX platforms the ‘gpgme_off_t’ type is an alias for ‘off_t’;
+     it may be used interchangeable.  On Windows platforms ‘gpgme_off_t’
+     is defined as a long (i.e.  32 bit) for 32 bit Windows and as a 64
+     bit signed integer for 64 bit Windows.
 
  -- Data type: gpgme_ssize_t
-     The `gpgme_ssize_t' type is an alias for `ssize_t'.  It has only
+     The ‘gpgme_ssize_t’ type is an alias for ‘ssize_t’.  It has only
      been introduced to overcome portability problems pertaining to the
-     declaration of `ssize_t' by different toolchains.
+     declaration of ‘ssize_t’ by different toolchains.
 
 * Menu:
 
@@ -1594,35 +1565,34 @@ source and to its destination, which can often be avoided by using one
 of the other data object
 
  -- Function: gpgme_error_t gpgme_data_new (gpgme_data_t *DH)
-     The function `gpgme_data_new' creates a new `gpgme_data_t' object
-     and returns a handle for it in DH.  The data object is memory
-     based and initially empty.
+     The function ‘gpgme_data_new’ creates a new ‘gpgme_data_t’ object
+     and returns a handle for it in DH.  The data object is memory based
+     and initially empty.
 
-     The function returns the error code `GPG_ERR_NO_ERROR' if the data
-     object was successfully created, `GPG_ERR_INV_VALUE' if DH is not
-     a valid pointer, and `GPG_ERR_ENOMEM' if not enough memory is
+     The function returns the error code ‘GPG_ERR_NO_ERROR’ if the data
+     object was successfully created, ‘GPG_ERR_INV_VALUE’ if DH is not a
+     valid pointer, and ‘GPG_ERR_ENOMEM’ if not enough memory is
      available.
 
  -- Function: gpgme_error_t gpgme_data_new_from_mem (gpgme_data_t *DH,
           const char *BUFFER, size_t SIZE, int COPY)
-     The function `gpgme_data_new_from_mem' creates a new
-     `gpgme_data_t' object and fills it with SIZE bytes starting from
-     BUFFER.
+     The function ‘gpgme_data_new_from_mem’ creates a new ‘gpgme_data_t’
+     object and fills it with SIZE bytes starting from BUFFER.
 
      If COPY is not zero, a private copy of the data is made.  If COPY
-     is zero, the data is taken from the specified buffer as needed,
-     and the user has to ensure that the buffer remains valid for the
-     whole life span of the data object.
+     is zero, the data is taken from the specified buffer as needed, and
+     the user has to ensure that the buffer remains valid for the whole
+     life span of the data object.
 
-     The function returns the error code `GPG_ERR_NO_ERROR' if the data
-     object was successfully created, `GPG_ERR_INV_VALUE' if DH or
-     BUFFER is not a valid pointer, and `GPG_ERR_ENOMEM' if not enough
+     The function returns the error code ‘GPG_ERR_NO_ERROR’ if the data
+     object was successfully created, ‘GPG_ERR_INV_VALUE’ if DH or
+     BUFFER is not a valid pointer, and ‘GPG_ERR_ENOMEM’ if not enough
      memory is available.
 
  -- Function: gpgme_error_t gpgme_data_new_from_file (gpgme_data_t *DH,
           const char *FILENAME, int COPY)
-     The function `gpgme_data_new_from_file' creates a new
-     `gpgme_data_t' object and fills it with the content of the file
+     The function ‘gpgme_data_new_from_file’ creates a new
+     ‘gpgme_data_t’ object and fills it with the content of the file
      FILENAME.
 
      If COPY is not zero, the whole file is read in at initialization
@@ -1631,26 +1601,26 @@ of the other data object
      cause all reads to be delayed until the data is needed, but this is
      not yet implemented.
 
-     The function returns the error code `GPG_ERR_NO_ERROR' if the data
-     object was successfully created, `GPG_ERR_INV_VALUE' if DH or
-     FILENAME is not a valid pointer, `GPG_ERR_NOT_IMPLEMENTED' if CODE
-     is zero, and `GPG_ERR_ENOMEM' if not enough memory is available.
+     The function returns the error code ‘GPG_ERR_NO_ERROR’ if the data
+     object was successfully created, ‘GPG_ERR_INV_VALUE’ if DH or
+     FILENAME is not a valid pointer, ‘GPG_ERR_NOT_IMPLEMENTED’ if CODE
+     is zero, and ‘GPG_ERR_ENOMEM’ if not enough memory is available.
 
  -- Function: gpgme_error_t gpgme_data_new_from_filepart
           (gpgme_data_t *DH, const char *FILENAME, FILE *FP,
           off_t OFFSET, size_t LENGTH)
-     The function `gpgme_data_new_from_filepart' creates a new
-     `gpgme_data_t' object and fills it with a part of the file
+     The function ‘gpgme_data_new_from_filepart’ creates a new
+     ‘gpgme_data_t’ object and fills it with a part of the file
      specified by FILENAME or FP.
 
      Exactly one of FILENAME and FP must be non-zero, the other must be
      zero.  The argument that is not zero specifies the file from which
      LENGTH bytes are read into the data object, starting from OFFSET.
 
-     The function returns the error code `GPG_ERR_NO_ERROR' if the data
-     object was successfully created, `GPG_ERR_INV_VALUE' if DH and
+     The function returns the error code ‘GPG_ERR_NO_ERROR’ if the data
+     object was successfully created, ‘GPG_ERR_INV_VALUE’ if DH and
      exactly one of FILENAME and FP is not a valid pointer, and
-     `GPG_ERR_ENOMEM' if not enough memory is available.
+     ‘GPG_ERR_ENOMEM’ if not enough memory is available.
 
 
 File: gpgme.info,  Node: File Based Data Buffers,  Next: Callback Based Data Buffers,  Prev: Memory Based Data Buffers,  Up: Creating Data Buffers
@@ -1658,33 +1628,33 @@ File: gpgme.info,  Node: File Based Data Buffers,  Next: Callback Based Data Buf
 6.1.2 File Based Data Buffers
 -----------------------------
 
-File based data objects operate directly on file descriptors or
-streams.  Only a small amount of data is stored in core at any time, so
-the size of the data objects is not limited by GPGME.
+File based data objects operate directly on file descriptors or streams.
+Only a small amount of data is stored in core at any time, so the size
+of the data objects is not limited by GPGME.
 
  -- Function: gpgme_error_t gpgme_data_new_from_fd (gpgme_data_t *DH,
           int FD)
-     The function `gpgme_data_new_from_fd' creates a new `gpgme_data_t'
+     The function ‘gpgme_data_new_from_fd’ creates a new ‘gpgme_data_t’
      object and uses the file descriptor FD to read from (if used as an
      input data object) and write to (if used as an output data object).
 
      When using the data object as an input buffer, the function might
-     read a bit more from the file descriptor than is actually needed
-     by the crypto engine in the desired operation because of internal
+     read a bit more from the file descriptor than is actually needed by
+     the crypto engine in the desired operation because of internal
      buffering.
 
      Note that GPGME assumes that the file descriptor is set to blocking
      mode.  Errors during I/O operations, except for EINTR, are usually
      fatal for crypto operations.
 
-     The function returns the error code `GPG_ERR_NO_ERROR' if the data
-     object was successfully created, and `GPG_ERR_ENOMEM' if not
-     enough memory is available.
+     The function returns the error code ‘GPG_ERR_NO_ERROR’ if the data
+     object was successfully created, and ‘GPG_ERR_ENOMEM’ if not enough
+     memory is available.
 
  -- Function: gpgme_error_t gpgme_data_new_from_stream
           (gpgme_data_t *DH, FILE *STREAM)
-     The function `gpgme_data_new_from_stream' creates a new
-     `gpgme_data_t' object and uses the I/O stream STREAM to read from
+     The function ‘gpgme_data_new_from_stream’ creates a new
+     ‘gpgme_data_t’ object and uses the I/O stream STREAM to read from
      (if used as an input data object) and write to (if used as an
      output data object).
 
@@ -1697,9 +1667,9 @@ the size of the data objects is not limited by GPGME.
      Errors during I/O operations, except for EINTR, are usually fatal
      for crypto operations.
 
-     The function returns the error code `GPG_ERR_NO_ERROR' if the data
-     object was successfully created, and `GPG_ERR_ENOMEM' if not
-     enough memory is available.
+     The function returns the error code ‘GPG_ERR_NO_ERROR’ if the data
+     object was successfully created, and ‘GPG_ERR_ENOMEM’ if not enough
+     memory is available.
 
 
 File: gpgme.info,  Node: Callback Based Data Buffers,  Prev: File Based Data Buffers,  Up: Creating Data Buffers
@@ -1712,12 +1682,12 @@ application, you can implement the functions a data object provides
 yourself and create a data object from these callback functions.
 
  -- Data type: ssize_t (*gpgme_data_read_cb_t) (void *HANDLE,
-void *BUFFER, size_t SIZE)
-     The `gpgme_data_read_cb_t' type is the type of functions which
+          void *BUFFER, size_t SIZE)
+     The ‘gpgme_data_read_cb_t’ type is the type of functions which
      GPGME calls if it wants to read data from a user-implemented data
-     object.  The function should read up to SIZE bytes from the
-     current read position into the space starting at BUFFER.  The
-     HANDLE is provided by the user at data object creation time.
+     object.  The function should read up to SIZE bytes from the current
+     read position into the space starting at BUFFER.  The HANDLE is
+     provided by the user at data object creation time.
 
      Note that GPGME assumes that the read blocks until data is
      available.  Errors during I/O operations, except for EINTR, are
@@ -1728,8 +1698,8 @@ void *BUFFER, size_t SIZE)
      the type of the error.
 
  -- Data type: ssize_t (*gpgme_data_write_cb_t) (void *HANDLE,
-const void *BUFFER, size_t SIZE)
-     The `gpgme_data_write_cb_t' type is the type of functions which
+          const void *BUFFER, size_t SIZE)
+     The ‘gpgme_data_write_cb_t’ type is the type of functions which
      GPGME calls if it wants to write data to a user-implemented data
      object.  The function should write up to SIZE bytes to the current
      write position from the space starting at BUFFER.  The HANDLE is
@@ -1744,17 +1714,17 @@ const void *BUFFER, size_t SIZE)
      type of the error.
 
  -- Data type: off_t (*gpgme_data_seek_cb_t) (void *HANDLE,
-off_t OFFSET, int WHENCE)
-     The `gpgme_data_seek_cb_t' type is the type of functions which
+          off_t OFFSET, int WHENCE)
+     The ‘gpgme_data_seek_cb_t’ type is the type of functions which
      GPGME calls if it wants to change the current read/write position
-     in a user-implemented data object, just like the `lseek' function.
+     in a user-implemented data object, just like the ‘lseek’ function.
 
      The function should return the new read/write position, and -1 on
      error.  If an error occurs, ERRNO should be set to describe the
      type of the error.
 
  -- Data type: void (*gpgme_data_release_cb_t) (void *HANDLE)
-     The `gpgme_data_release_cb_t' type is the type of functions which
+     The ‘gpgme_data_release_cb_t’ type is the type of functions which
      GPGME calls if it wants to destroy a user-implemented data object.
      The HANDLE is provided by the user at data object creation time.
 
@@ -1762,45 +1732,45 @@ off_t OFFSET, int WHENCE)
      This structure is used to store the data callback interface
      functions described above.  It has the following members:
 
-    `gpgme_data_read_cb_t read'
+     ‘gpgme_data_read_cb_t read’
           This is the function called by GPGME to read data from the
           data object.  It is only required for input data object.
 
-    `gpgme_data_write_cb_t write'
-          This is the function called by GPGME to write data to the
-          data object.  It is only required for output data object.
+     ‘gpgme_data_write_cb_t write’
+          This is the function called by GPGME to write data to the data
+          object.  It is only required for output data object.
 
-    `gpgme_data_seek_cb_t seek'
+     ‘gpgme_data_seek_cb_t seek’
           This is the function called by GPGME to change the current
           read/write pointer in the data object (if available).  It is
           optional.
 
-    `gpgme_data_release_cb_t release'
-          This is the function called by GPGME to release a data
-          object.  It is optional.
+     ‘gpgme_data_release_cb_t release’
+          This is the function called by GPGME to release a data object.
+          It is optional.
 
  -- Function: gpgme_error_t gpgme_data_new_from_cbs (gpgme_data_t *DH,
           gpgme_data_cbs_t CBS, void *HANDLE)
-     The function `gpgme_data_new_from_cbs' creates a new
-     `gpgme_data_t' object and uses the user-provided callback functions
-     to operate on the data object.
+     The function ‘gpgme_data_new_from_cbs’ creates a new ‘gpgme_data_t’
+     object and uses the user-provided callback functions to operate on
+     the data object.
 
      The handle HANDLE is passed as first argument to the callback
      functions.  This can be used to identify this data object.
 
-     The function returns the error code `GPG_ERR_NO_ERROR' if the data
-     object was successfully created, and `GPG_ERR_ENOMEM' if not
-     enough memory is available.
+     The function returns the error code ‘GPG_ERR_NO_ERROR’ if the data
+     object was successfully created, and ‘GPG_ERR_ENOMEM’ if not enough
+     memory is available.
 
    The following interface is deprecated and only provided for backward
-compatibility.  Don't use it.  It will be removed in a future version
-of GPGME.
+compatibility.  Don’t use it.  It will be removed in a future version of
+GPGME.
 
  -- Function: gpgme_error_t gpgme_data_new_with_read_cb
           (gpgme_data_t *DH, int (*READFUNC) (void *HOOK, char *BUFFER,
           size_t COUNT, size_t *NREAD), void *HOOK_VALUE)
-     The function `gpgme_data_new_with_read_cb' creates a new
-     `gpgme_data_t' object and uses the callback function READFUNC to
+     The function ‘gpgme_data_new_with_read_cb’ creates a new
+     ‘gpgme_data_t’ object and uses the callback function READFUNC to
      retrieve the data on demand.  As the callback function can supply
      the data in any way it wants, this is the most flexible data type
      GPGME provides.  However, it can not be used to write data.
@@ -1808,16 +1778,16 @@ of GPGME.
      The callback function receives HOOK_VALUE as its first argument
      whenever it is invoked.  It should return up to COUNT bytes in
      BUFFER, and return the number of bytes actually read in NREAD.  It
-     may return `0' in NREAD if no data is currently available.  To
-     indicate `EOF' the function should return with an error code of
-     `-1' and set NREAD to `0'.  The callback function may support to
+     may return ‘0’ in NREAD if no data is currently available.  To
+     indicate ‘EOF’ the function should return with an error code of
+     ‘-1’ and set NREAD to ‘0’.  The callback function may support to
      reset its internal read pointer if it is invoked with BUFFER and
-     NREAD being `NULL' and COUNT being `0'.
+     NREAD being ‘NULL’ and COUNT being ‘0’.
 
-     The function returns the error code `GPG_ERR_NO_ERROR' if the data
-     object was successfully created, `GPG_ERR_INV_VALUE' if DH or
-     READFUNC is not a valid pointer, and `GPG_ERR_ENOMEM' if not
-     enough memory is available.
+     The function returns the error code ‘GPG_ERR_NO_ERROR’ if the data
+     object was successfully created, ‘GPG_ERR_INV_VALUE’ if DH or
+     READFUNC is not a valid pointer, and ‘GPG_ERR_ENOMEM’ if not enough
+     memory is available.
 
 
 File: gpgme.info,  Node: Destroying Data Buffers,  Next: Manipulating Data Buffers,  Prev: Creating Data Buffers,  Up: Exchanging Data
@@ -1826,29 +1796,29 @@ File: gpgme.info,  Node: Destroying Data Buffers,  Next: Manipulating Data Buffe
 ===========================
 
  -- Function: void gpgme_data_release (gpgme_data_t DH)
-     The function `gpgme_data_release' destroys the data object with
-     the handle DH.  It releases all associated resources that were not
+     The function ‘gpgme_data_release’ destroys the data object with the
+     handle DH.  It releases all associated resources that were not
      provided by the user in the first place.
 
  -- Function: char * gpgme_data_release_and_get_mem (gpgme_data_t DH,
           size_t *LENGTH)
-     The function `gpgme_data_release_and_get_mem' is like
-     `gpgme_data_release', except that it returns the data buffer and
+     The function ‘gpgme_data_release_and_get_mem’ is like
+     ‘gpgme_data_release’, except that it returns the data buffer and
      its length that was provided by the object.
 
-     The user has to release the buffer with `gpgme_free'.  In case the
-     user provided the data buffer in non-copy mode, a copy will be
-     made for this purpose.
+     The user has to release the buffer with ‘gpgme_free’.  In case the
+     user provided the data buffer in non-copy mode, a copy will be made
+     for this purpose.
 
      In case an error returns, or there is no suitable data buffer that
-     can be returned to the user, the function will return `NULL'.  In
+     can be returned to the user, the function will return ‘NULL’.  In
      any case, the data object DH is destroyed.
 
  -- Function: void gpgme_free (void *BUFFER)
-     The function `gpgme_free' releases the memory returned by
-     `gpgme_data_release_and_get_mem'.  It should be used instead of
-     the system libraries `free' function in case different allocators
-     are used in a single program.
+     The function ‘gpgme_free’ releases the memory returned by
+     ‘gpgme_data_release_and_get_mem’.  It should be used instead of the
+     system libraries ‘free’ function in case different allocators are
+     used in a single program.
 
 
 File: gpgme.info,  Node: Manipulating Data Buffers,  Prev: Destroying Data Buffers,  Up: Exchanging Data
@@ -1873,52 +1843,51 @@ File: gpgme.info,  Node: Data Buffer I/O Operations,  Next: Data Buffer Meta-Dat
 
  -- Function: ssize_t gpgme_data_read (gpgme_data_t DH, void *BUFFER,
           size_t LENGTH)
-     The function `gpgme_data_read' reads up to LENGTH bytes from the
+     The function ‘gpgme_data_read’ reads up to LENGTH bytes from the
      data object with the handle DH into the space starting at BUFFER.
 
-     If no error occurs, the actual amount read is returned.  If the
-     end of the data object is reached, the function returns 0.
+     If no error occurs, the actual amount read is returned.  If the end
+     of the data object is reached, the function returns 0.
 
      In all other cases, the function returns -1 and sets ERRNO.
 
  -- Function: ssize_t gpgme_data_write (gpgme_data_t DH,
           const void *BUFFER, size_t SIZE)
-     The function `gpgme_data_write' writes up to SIZE bytes starting
+     The function ‘gpgme_data_write’ writes up to SIZE bytes starting
      from BUFFER into the data object with the handle DH at the current
      write position.
 
-     The function returns the number of bytes actually written, or -1
-     if an error occurs.  If an error occurs, ERRNO is set.
+     The function returns the number of bytes actually written, or -1 if
+     an error occurs.  If an error occurs, ERRNO is set.
 
  -- Function: off_t gpgme_data_seek (gpgme_data_t DH, off_t OFFSET,
           int WHENCE)
-     The function `gpgme_data_seek' changes the current read/write
+     The function ‘gpgme_data_seek’ changes the current read/write
      position.
 
-     The WHENCE argument specifies how the OFFSET should be
-     interpreted.  It must be one of the following symbolic constants:
+     The WHENCE argument specifies how the OFFSET should be interpreted.
+     It must be one of the following symbolic constants:
 
-    `SEEK_SET'
+     ‘SEEK_SET’
           Specifies that OFFSET is a count of characters from the
           beginning of the data object.
 
-    `SEEK_CUR'
+     ‘SEEK_CUR’
           Specifies that OFFSET is a count of characters from the
           current file position.  This count may be positive or
           negative.
 
-    `SEEK_END'
+     ‘SEEK_END’
           Specifies that OFFSET is a count of characters from the end of
-          the data object.  A negative count specifies a position
-          within the current extent of the data object; a positive
-          count specifies a position past the current end.  If you set
-          the position past the current end, and actually write data,
-          you will extend the data object with zeros up to that
-          position.
+          the data object.  A negative count specifies a position within
+          the current extent of the data object; a positive count
+          specifies a position past the current end.  If you set the
+          position past the current end, and actually write data, you
+          will extend the data object with zeros up to that position.
 
      If successful, the function returns the resulting file position,
      measured in bytes from the beginning of the data object.  You can
-     use this feature together with `SEEK_CUR' to read the current
+     use this feature together with ‘SEEK_CUR’ to read the current
      read/write position.
 
      If the function fails, -1 is returned and ERRNO is set.
@@ -1927,7 +1896,7 @@ File: gpgme.info,  Node: Data Buffer I/O Operations,  Next: Data Buffer Meta-Dat
 be removed in a future version of GPGME.
 
  -- Function: gpgme_error_t gpgme_data_rewind (gpgme_data_t DH)
-     The function `gpgme_data_rewind' is equivalent to:
+     The function ‘gpgme_data_rewind’ is equivalent to:
 
             return (gpgme_data_seek (dh, 0, SEEK_SET) == -1)
               ? gpgme_error_from_errno (errno) : 0;
@@ -1939,75 +1908,74 @@ File: gpgme.info,  Node: Data Buffer Meta-Data,  Next: Data Buffer Convenience,
 ---------------------------
 
  -- Function: char * gpgme_data_get_file_name (gpgme_data_t DH)
-     The function `gpgme_data_get_file_name' returns a pointer to a
+     The function ‘gpgme_data_get_file_name’ returns a pointer to a
      string containing the file name associated with the data object.
      The file name will be stored in the output when encrypting or
      signing the data and will be returned to the user when decrypting
      or verifying the output data.
 
      If no error occurs, the string containing the file name is
-     returned.  Otherwise, `NULL' will be returned.
+     returned.  Otherwise, ‘NULL’ will be returned.
 
  -- Function: gpgme_error_t gpgme_data_set_file_name (gpgme_data_t DH,
           const char *FILE_NAME)
-     The function `gpgme_data_set_file_name' sets the file name
+     The function ‘gpgme_data_set_file_name’ sets the file name
      associated with the data object.  The file name will be stored in
-     the output when encrypting or signing the data and will be
-     returned to the user when decrypting or verifying the output data.
+     the output when encrypting or signing the data and will be returned
+     to the user when decrypting or verifying the output data.
 
-     The function returns the error code `GPG_ERR_INV_VALUE' if DH is
-     not a valid pointer and `GPG_ERR_ENOMEM' if not enough memory is
+     The function returns the error code ‘GPG_ERR_INV_VALUE’ if DH is
+     not a valid pointer and ‘GPG_ERR_ENOMEM’ if not enough memory is
      available.
 
  -- Data type: enum gpgme_data_encoding_t
-     The `gpgme_data_encoding_t' type specifies the encoding of a
-     `gpgme_data_t' object.  For input data objects, the encoding is
+     The ‘gpgme_data_encoding_t’ type specifies the encoding of a
+     ‘gpgme_data_t’ object.  For input data objects, the encoding is
      useful to give the backend a hint on the type of data.  For output
      data objects, the encoding can specify the output data format on
      certain operations.  Please note that not all backends support all
      encodings on all operations.  The following data types are
      available:
 
-    `GPGME_DATA_ENCODING_NONE'
+     ‘GPGME_DATA_ENCODING_NONE’
           This specifies that the encoding is not known.  This is the
           default for a new data object.  The backend will try its best
           to detect the encoding automatically.
 
-    `GPGME_DATA_ENCODING_BINARY'
+     ‘GPGME_DATA_ENCODING_BINARY’
           This specifies that the data is encoding in binary form; i.e.
           there is no special encoding.
 
-    `GPGME_DATA_ENCODING_BASE64'
+     ‘GPGME_DATA_ENCODING_BASE64’
           This specifies that the data is encoded using the Base-64
           encoding scheme as used by MIME and other protocols.
 
-    `GPGME_DATA_ENCODING_ARMOR'
+     ‘GPGME_DATA_ENCODING_ARMOR’
           This specifies that the data is encoded in an armored form as
           used by OpenPGP and PEM.
 
-    `GPGME_DATA_ENCODING_URL'
+     ‘GPGME_DATA_ENCODING_URL’
           The data is a list of linefeed delimited URLs.  This is only
-          useful with `gpgme_op_import'.
+          useful with ‘gpgme_op_import’.
 
-    `GPGME_DATA_ENCODING_URL0'
+     ‘GPGME_DATA_ENCODING_URL0’
           The data is a list of binary zero delimited URLs.  This is
-          only useful with `gpgme_op_import'.
-
-    `GPGME_DATA_ENCODING_URLESC'
-          The data is a list of linefeed delimited URLs with all
-          control and space characters percent escaped.  This mode is
-          is not yet implemented.
+          only useful with ‘gpgme_op_import’.
 
+     ‘GPGME_DATA_ENCODING_URLESC’
+          The data is a list of linefeed delimited URLs with all control
+          and space characters percent escaped.  This mode is is not yet
+          implemented.
 
  -- Function: gpgme_data_encoding_t gpgme_data_get_encoding
           (gpgme_data_t DH)
-     The function `gpgme_data_get_encoding' returns the encoding of the
-     data object with the handle DH.  If DH is not a valid pointer
-     (e.g. `NULL') `GPGME_DATA_ENCODING_NONE' is returned.
+     The function ‘gpgme_data_get_encoding’ returns the encoding of the
+     data object with the handle DH.  If DH is not a valid pointer (e.g.
+     ‘NULL’) ‘GPGME_DATA_ENCODING_NONE’ is returned.
 
  -- Function: gpgme_error_t gpgme_data_set_encoding
           (gpgme_data_t DH, gpgme_data_encoding_t ENC)
-     The function `gpgme_data_set_encoding' changes the encoding of the
+     The function ‘gpgme_data_set_encoding’ changes the encoding of the
      data object with the handle DH to ENC.
 
 
@@ -2017,53 +1985,43 @@ File: gpgme.info,  Node: Data Buffer Convenience,  Prev: Data Buffer Meta-Data,
 ---------------------------------------
 
  -- Data type: enum gpgme_data_type_t
-     The `gpgme_data_type_t' type is used to return the detected type
-     of the content of a data buffer.
-
-`GPGME_DATA_TYPE_INVALID'
-     This is returned by `gpgme_data_identify' if it was not possible
-     to identify the data.  Reasons for this might be a non-seekable
-     stream or a memory problem.  The value is 0.
-
-`GPGME_DATA_TYPE_UNKNOWN'
+     The ‘gpgme_data_type_t’ type is used to return the detected type of
+     the content of a data buffer.
+
+‘GPGME_DATA_TYPE_INVALID’
+     This is returned by ‘gpgme_data_identify’ if it was not possible to
+     identify the data.  Reasons for this might be a non-seekable stream
+     or a memory problem.  The value is 0.
+‘GPGME_DATA_TYPE_UNKNOWN’
      The type of the data is not known.
-
-`GPGME_DATA_TYPE_PGP_SIGNED'
+‘GPGME_DATA_TYPE_PGP_SIGNED’
      The data is an OpenPGP signed message.  This may be a binary
      signature, a detached one or a cleartext signature.
-
-`GPGME_DATA_TYPE_PGP_OTHER'
+‘GPGME_DATA_TYPE_PGP_OTHER’
      This is a generic OpenPGP message.  In most cases this will be
      encrypted data.
-
-`GPGME_DATA_TYPE_PGP_KEY'
+‘GPGME_DATA_TYPE_PGP_KEY’
      This is an OpenPGP key (private or public).
-
-`GPGME_DATA_TYPE_CMS_SIGNED'
+‘GPGME_DATA_TYPE_CMS_SIGNED’
      This is a CMS signed message.
-
-`GPGME_DATA_TYPE_CMS_ENCRYPTED'
+‘GPGME_DATA_TYPE_CMS_ENCRYPTED’
      This is a CMS encrypted (enveloped data) message.
-
-`GPGME_DATA_TYPE_CMS_OTHER'
+‘GPGME_DATA_TYPE_CMS_OTHER’
      This is used for other CMS message types.
-
-`GPGME_DATA_TYPE_X509_CERT'
+‘GPGME_DATA_TYPE_X509_CERT’
      The data is a X.509 certificate
-
-`GPGME_DATA_TYPE_PKCS12'
+‘GPGME_DATA_TYPE_PKCS12’
      The data is a PKCS#12 message.  This is commonly used to exchange
      private keys for X.509.
 
  -- Function: gpgme_data_type_t gpgme_data_identify (gpgme_data_t DH)
-     The function `gpgme_data_identify' returns the type of the data
+     The function ‘gpgme_data_identify’ returns the type of the data
      with the handle DH.  If it is not possible to perform the
      identification, the function returns zero
-     (`GPGME_DATA_TYPE_INVALID').  Note that depending on how the data
+     (‘GPGME_DATA_TYPE_INVALID’).  Note that depending on how the data
      object has been created the identification may not be possible or
-     the data object may change its internal state (file pointer
-     moved).  For file or memory based data object, the state should
-     not change.
+     the data object may change its internal state (file pointer moved).
+     For file or memory based data object, the state should not change.
 
 
 File: gpgme.info,  Node: Contexts,  Next: UI Server Protocol,  Prev: Exchanging Data,  Up: Top
@@ -2073,12 +2031,11 @@ File: gpgme.info,  Node: Contexts,  Next: UI Server Protocol,  Prev: Exchanging
 
 All cryptographic operations in GPGME are performed within a context,
 which contains the internal state of the operation as well as
-configuration parameters.  By using several contexts you can run
-several cryptographic operations in parallel, with different
-configuration.
+configuration parameters.  By using several contexts you can run several
+cryptographic operations in parallel, with different configuration.
 
  -- Data type: gpgme_ctx_t
-     The `gpgme_ctx_t' type is a handle for a GPGME context, which is
+     The ‘gpgme_ctx_t’ type is a handle for a GPGME context, which is
      used to hold the configuration, status and result of cryptographic
      operations.
 
@@ -2101,17 +2058,17 @@ File: gpgme.info,  Node: Creating Contexts,  Next: Destroying Contexts,  Up: Con
 =====================
 
  -- Function: gpgme_error_t gpgme_new (gpgme_ctx_t *CTX)
-     The function `gpgme_new' creates a new `gpgme_ctx_t' object and
+     The function ‘gpgme_new’ creates a new ‘gpgme_ctx_t’ object and
      returns a handle for it in CTX.
 
-     The function returns the error code `GPG_ERR_NO_ERROR' if the
-     context was successfully created, `GPG_ERR_INV_VALUE' if CTX is
-     not a valid pointer, and `GPG_ERR_ENOMEM' if not enough memory is
-     available.  Also, it returns `GPG_ERR_NOT_OPERATIONAL' if
-     `gpgme_check_version' was not called to initialize GPGME, and
-     `GPG_ERR_SELFTEST_FAILED' if a selftest failed.  Currently, the
+     The function returns the error code ‘GPG_ERR_NO_ERROR’ if the
+     context was successfully created, ‘GPG_ERR_INV_VALUE’ if CTX is not
+     a valid pointer, and ‘GPG_ERR_ENOMEM’ if not enough memory is
+     available.  Also, it returns ‘GPG_ERR_NOT_OPERATIONAL’ if
+     ‘gpgme_check_version’ was not called to initialize GPGME, and
+     ‘GPG_ERR_SELFTEST_FAILED’ if a selftest failed.  Currently, the
      only selftest is for Windows MingW32 targets to see if
-     `-mms-bitfields' was used (as required).
+     ‘-mms-bitfields’ was used (as required).
 
 
 File: gpgme.info,  Node: Destroying Contexts,  Next: Result Management,  Prev: Creating Contexts,  Up: Contexts
@@ -2120,7 +2077,7 @@ File: gpgme.info,  Node: Destroying Contexts,  Next: Result Management,  Prev: C
 =======================
 
  -- Function: void gpgme_release (gpgme_ctx_t CTX)
-     The function `gpgme_release' destroys the context with the handle
+     The function ‘gpgme_release’ destroys the context with the handle
      CTX and releases all associated resources.
 
 
@@ -2130,29 +2087,29 @@ File: gpgme.info,  Node: Result Management,  Next: Context Attributes,  Prev: De
 =====================
 
 The detailed result of an operation is returned in operation-specific
-structures such as `gpgme_decrypt_result_t'.  The corresponding
-retrieval functions such as `gpgme_op_decrypt_result' provide static
+structures such as ‘gpgme_decrypt_result_t’.  The corresponding
+retrieval functions such as ‘gpgme_op_decrypt_result’ provide static
 access to the results after an operation completes.  The following
 interfaces make it possible to detach a result structure from its
 associated context and give it a lifetime beyond that of the current
 operation or context.
 
  -- Function: void gpgme_result_ref (void *RESULT)
-     The function `gpgme_result_ref' acquires an additional reference
-     for the result RESULT, which may be of any type
-     `gpgme_*_result_t'.  As long as the user holds a reference, the
-     result structure is guaranteed to be valid and unmodified.
+     The function ‘gpgme_result_ref’ acquires an additional reference
+     for the result RESULT, which may be of any type ‘gpgme_*_result_t’.
+     As long as the user holds a reference, the result structure is
+     guaranteed to be valid and unmodified.
 
  -- Function: void gpgme_result_unref (void *RESULT)
-     The function `gpgme_result_unref' releases a reference for the
+     The function ‘gpgme_result_unref’ releases a reference for the
      result RESULT.  If this was the last reference, the result
-     structure will be destroyed and all resources associated to it
-     will be released.
+     structure will be destroyed and all resources associated to it will
+     be released.
 
    Note that a context may hold its own references to result structures,
 typically until the context is destroyed or the next operation is
 started.  In fact, these references are accessed through the
-`gpgme_op_*_result' functions.
+‘gpgme_op_*_result’ functions.
 
 
 File: gpgme.info,  Node: Context Attributes,  Next: Key Management,  Prev: Result Management,  Up: Contexts
@@ -2180,21 +2137,21 @@ File: gpgme.info,  Node: Protocol Selection,  Next: Crypto Engine,  Up: Context
 
  -- Function: gpgme_error_t gpgme_set_protocol (gpgme_ctx_t CTX,
           gpgme_protocol_t PROTO)
-     The function `gpgme_set_protocol' sets the protocol used within
-     the context CTX to PROTO.  All crypto operations will be performed
-     by the crypto engine configured for that protocol.  *Note
-     Protocols and Engines::.
+     The function ‘gpgme_set_protocol’ sets the protocol used within the
+     context CTX to PROTO.  All crypto operations will be performed by
+     the crypto engine configured for that protocol.  *Note Protocols
+     and Engines::.
 
-     Setting the protocol with `gpgme_set_protocol' does not check if
+     Setting the protocol with ‘gpgme_set_protocol’ does not check if
      the crypto engine for that protocol is available and installed
      correctly.  *Note Engine Version Check::.
 
-     The function returns the error code `GPG_ERR_NO_ERROR' if the
-     protocol could be set successfully, and `GPG_ERR_INV_VALUE' if
+     The function returns the error code ‘GPG_ERR_NO_ERROR’ if the
+     protocol could be set successfully, and ‘GPG_ERR_INV_VALUE’ if
      PROTOCOL is not a valid protocol.
 
  -- Function: gpgme_protocol_t gpgme_get_protocol (gpgme_ctx_t CTX)
-     The function `gpgme_get_protocol' retrieves the protocol currently
+     The function ‘gpgme_get_protocol’ retrieves the protocol currently
      use with the context CTX.
 
 
@@ -2211,34 +2168,34 @@ Configuration::.
 
  -- Function: gpgme_engine_info_t gpgme_ctx_get_engine_info
           (gpgme_ctx_t CTX)
-     The function `gpgme_ctx_get_engine_info' returns a linked list of
+     The function ‘gpgme_ctx_get_engine_info’ returns a linked list of
      engine info structures.  Each info structure describes the
      configuration of one configured backend, as used by the context
      CTX.
 
      The result is valid until the next invocation of
-     `gpgme_ctx_set_engine_info' for this particular context.
+     ‘gpgme_ctx_set_engine_info’ for this particular context.
 
      This function can not fail.
 
  -- Function: gpgme_error_t gpgme_ctx_set_engine_info (gpgme_ctx_t CTX,
           gpgme_protocol_t PROTO, const char *FILE_NAME,
           const char *HOME_DIR)
-     The function `gpgme_ctx_set_engine_info' changes the configuration
+     The function ‘gpgme_ctx_set_engine_info’ changes the configuration
      of the crypto engine implementing the protocol PROTO for the
      context CTX.
 
      FILE_NAME is the file name of the executable program implementing
      this protocol, and HOME_DIR is the directory name of the
      configuration directory for this crypto engine.  If HOME_DIR is
-     `NULL', the engine's default will be used.
+     ‘NULL’, the engine’s default will be used.
 
      Currently this function must be used before starting the first
      crypto operation.  It is unspecified if and when the changes will
      take effect if the function is called after starting the first
      operation on the context CTX.
 
-     This function returns the error code `GPG_ERR_NO_ERROR' if
+     This function returns the error code ‘GPG_ERR_NO_ERROR’ if
      successful, or an eror code on failure.
 
 
@@ -2248,15 +2205,15 @@ File: gpgme.info,  Node: ASCII Armor,  Next: Text Mode,  Prev: Crypto Engine,  U
 -----------------
 
  -- Function: void gpgme_set_armor (gpgme_ctx_t CTX, int YES)
-     The function `gpgme_set_armor' specifies if the output should be
+     The function ‘gpgme_set_armor’ specifies if the output should be
      ASCII armored.  By default, output is not ASCII armored.
 
      ASCII armored output is disabled if YES is zero, and enabled
      otherwise.
 
  -- Function: int gpgme_get_armor (gpgme_ctx_t CTX)
-     The function `gpgme_get_armor' returns 1 if the output is ASCII
-     armored, and `0' if it is not, or if CTX is not a valid pointer.
+     The function ‘gpgme_get_armor’ returns 1 if the output is ASCII
+     armored, and ‘0’ if it is not, or if CTX is not a valid pointer.
 
 
 File: gpgme.info,  Node: Text Mode,  Next: Included Certificates,  Prev: ASCII Armor,  Up: Context Attributes
@@ -2265,7 +2222,7 @@ File: gpgme.info,  Node: Text Mode,  Next: Included Certificates,  Prev: ASCII A
 ---------------
 
  -- Function: void gpgme_set_textmode (gpgme_ctx_t CTX, int YES)
-     The function `gpgme_set_textmode' specifies if canonical text mode
+     The function ‘gpgme_set_textmode’ specifies if canonical text mode
      should be used.  By default, text mode is not used.
 
      Text mode is for example used for the RFC2015 signatures; note that
@@ -2279,8 +2236,8 @@ File: gpgme.info,  Node: Text Mode,  Next: Included Certificates,  Prev: ASCII A
      otherwise.
 
  -- Function: int gpgme_get_textmode (gpgme_ctx_t CTX)
-     The function `gpgme_get_textmode' returns 1 if canonical text mode
-     is enabled, and `0' if it is not, or if CTX is not a valid pointer.
+     The function ‘gpgme_get_textmode’ returns 1 if canonical text mode
+     is enabled, and ‘0’ if it is not, or if CTX is not a valid pointer.
 
 
 File: gpgme.info,  Node: Included Certificates,  Next: Key Listing Mode,  Prev: Text Mode,  Up: Context Attributes
@@ -2290,30 +2247,25 @@ File: gpgme.info,  Node: Included Certificates,  Next: Key Listing Mode,  Prev:
 
  -- Function: void gpgme_set_include_certs (gpgme_ctx_t CTX,
           int NR_OF_CERTS)
-     The function `gpgme_set_include_certs' specifies how many
+     The function ‘gpgme_set_include_certs’ specifies how many
      certificates should be included in an S/MIME signed message.  By
-     default, only the sender's certificate is included.  The possible
+     default, only the sender’s certificate is included.  The possible
      values of NR_OF_CERTS are:
 
-    `GPGME_INCLUDE_CERTS_DEFAULT'
+     ‘GPGME_INCLUDE_CERTS_DEFAULT’
           Fall back to the default of the crypto backend.  This is the
           default for GPGME.
-
-    `-2'
+     ‘-2’
           Include all certificates except the root certificate.
-
-    `-1'
+     ‘-1’
           Include all certificates.
-
-    `0'
+     ‘0’
           Include no certificates.
-
-    `1'
-          Include the sender's certificate only.
-
-    `n'
+     ‘1’
+          Include the sender’s certificate only.
+     ‘n’
           Include the first n certificates of the certificates path,
-          starting from the sender's certificate.  The number `n' must
+          starting from the sender’s certificate.  The number ‘n’ must
           be positive.
 
      Values of NR_OF_CERTS smaller than -2 are undefined.
@@ -2322,7 +2274,7 @@ File: gpgme.info,  Node: Included Certificates,  Next: Key Listing Mode,  Prev:
      by all other engines.
 
  -- Function: int gpgme_get_include_certs (gpgme_ctx_t CTX)
-     The function `gpgme_get_include_certs' returns the number of
+     The function ‘gpgme_get_include_certs’ returns the number of
      certificates to include into an S/MIME signed message.
 
 
@@ -2333,74 +2285,72 @@ File: gpgme.info,  Node: Key Listing Mode,  Next: Passphrase Callback,  Prev: In
 
  -- Function: gpgme_error_t gpgme_set_keylist_mode (gpgme_ctx_t CTX,
           gpgme_keylist_mode_t MODE)
-     The function `gpgme_set_keylist_mode' changes the default
-     behaviour of the key listing functions.  The value in MODE is a
-     bitwise-or combination of one or multiple of the following bit
-     values:
+     The function ‘gpgme_set_keylist_mode’ changes the default behaviour
+     of the key listing functions.  The value in MODE is a bitwise-or
+     combination of one or multiple of the following bit values:
 
-    `GPGME_KEYLIST_MODE_LOCAL'
-          The `GPGME_KEYLIST_MODE_LOCAL' symbol specifies that the local
+     ‘GPGME_KEYLIST_MODE_LOCAL’
+          The ‘GPGME_KEYLIST_MODE_LOCAL’ symbol specifies that the local
           keyring should be searched for keys in the keylisting
           operation.  This is the default.
 
-    `GPGME_KEYLIST_MODE_EXTERN'
-          The `GPGME_KEYLIST_MODE_EXTERN' symbol specifies that an
+     ‘GPGME_KEYLIST_MODE_EXTERN’
+          The ‘GPGME_KEYLIST_MODE_EXTERN’ symbol specifies that an
           external source should be searched for keys in the keylisting
           operation.  The type of external source is dependant on the
           crypto engine used and whether it is combined with
-          `GPGME_KEYLIST_MODE_LOCAL'.  For example, it can be a remote
+          ‘GPGME_KEYLIST_MODE_LOCAL’.  For example, it can be a remote
           keyserver or LDAP certificate server.
 
-    `GPGME_KEYLIST_MODE_SIGS'
-          The `GPGME_KEYLIST_MODE_SIGS' symbol specifies that the key
+     ‘GPGME_KEYLIST_MODE_SIGS’
+          The ‘GPGME_KEYLIST_MODE_SIGS’ symbol specifies that the key
           signatures should be included in the listed keys.
 
-    `GPGME_KEYLIST_MODE_SIG_NOTATIONS'
-          The `GPGME_KEYLIST_MODE_SIG_NOTATIONS' symbol specifies that
+     ‘GPGME_KEYLIST_MODE_SIG_NOTATIONS’
+          The ‘GPGME_KEYLIST_MODE_SIG_NOTATIONS’ symbol specifies that
           the signature notations on key signatures should be included
           in the listed keys.  This only works if
-          `GPGME_KEYLIST_MODE_SIGS' is also enabled.
+          ‘GPGME_KEYLIST_MODE_SIGS’ is also enabled.
 
-    `GPGME_KEYLIST_MODE_WITH_SECRET'
-          The `GPGME_KEYLIST_MODE_WITH_SECRET' returns information about
+     ‘GPGME_KEYLIST_MODE_WITH_SECRET’
+          The ‘GPGME_KEYLIST_MODE_WITH_SECRET’ returns information about
           the presence of a corresponding secret key in a public key
-          listing.  A public key listing with this mode is slower than
-          a standard listing but can be used instead of a second run to
+          listing.  A public key listing with this mode is slower than a
+          standard listing but can be used instead of a second run to
           list the secret keys.  This is only supported for GnuPG
           versions >= 2.1.
 
-    `GPGME_KEYLIST_MODE_EPHEMERAL'
-          The `GPGME_KEYLIST_MODE_EPHEMERAL' symbol specifies that keys
+     ‘GPGME_KEYLIST_MODE_EPHEMERAL’
+          The ‘GPGME_KEYLIST_MODE_EPHEMERAL’ symbol specifies that keys
           flagged as ephemeral are included in the listing.
 
-    `GPGME_KEYLIST_MODE_VALIDATE'
-          The `GPGME_KEYLIST_MODE_VALIDATE' symbol specifies that the
+     ‘GPGME_KEYLIST_MODE_VALIDATE’
+          The ‘GPGME_KEYLIST_MODE_VALIDATE’ symbol specifies that the
           backend should do key or certificate validation and not just
           get the validity information from an internal cache.  This
           might be an expensive operation and is in general not useful.
           Currently only implemented for the S/MIME backend and ignored
           for other backends.
 
-
-     At least one of `GPGME_KEYLIST_MODE_LOCAL' and
-     `GPGME_KEYLIST_MODE_EXTERN' must be specified.  For future binary
+     At least one of ‘GPGME_KEYLIST_MODE_LOCAL’ and
+     ‘GPGME_KEYLIST_MODE_EXTERN’ must be specified.  For future binary
      compatibility, you should get the current mode with
-     `gpgme_get_keylist_mode' and modify it by setting or clearing the
+     ‘gpgme_get_keylist_mode’ and modify it by setting or clearing the
      appropriate bits, and then using that calculated value in the
-     `gpgme_set_keylisting_mode' operation.  This will leave all other
+     ‘gpgme_set_keylisting_mode’ operation.  This will leave all other
      bits in the mode value intact (in particular those that are not
      used in the current version of the library).
 
-     The function returns the error code `GPG_ERR_NO_ERROR' if the mode
-     could be set correctly, and `GPG_ERR_INV_VALUE' if CTX is not a
+     The function returns the error code ‘GPG_ERR_NO_ERROR’ if the mode
+     could be set correctly, and ‘GPG_ERR_INV_VALUE’ if CTX is not a
      valid pointer or MODE is not a valid mode.
 
  -- Function: gpgme_keylist_mode_t gpgme_get_keylist_mode
           (gpgme_ctx_t CTX)
-     The function `gpgme_get_keylist_mode' returns the current key
+     The function ‘gpgme_get_keylist_mode’ returns the current key
      listing mode of the context CTX.  This value can then be modified
-     and used in a subsequent `gpgme_set_keylist_mode' operation to
-     only affect the desired bits (and leave all others intact).
+     and used in a subsequent ‘gpgme_set_keylist_mode’ operation to only
+     affect the desired bits (and leave all others intact).
 
      The function returns 0 if CTX is not a valid pointer, and the
      current mode otherwise.  Note that 0 is not a valid mode value.
@@ -2412,36 +2362,37 @@ File: gpgme.info,  Node: Passphrase Callback,  Next: Progress Meter Callback,  P
 -------------------------
 
  -- Data type: gpgme_error_t (*gpgme_passphrase_cb_t)(void *HOOK, const
-char *UID_HINT, const char *PASSPHRASE_INFO, int PREV_WAS_BAD, int FD)
-     The `gpgme_passphrase_cb_t' type is the type of functions usable as
+          char *UID_HINT, const char *PASSPHRASE_INFO, int PREV_WAS_BAD,
+          int FD)
+     The ‘gpgme_passphrase_cb_t’ type is the type of functions usable as
      passphrase callback function.
 
      The argument UID_HINT might contain a string that gives an
      indication for which user ID the passphrase is required.  If this
      is not available, or not applicable (in the case of symmetric
-     encryption, for example), UID_HINT will be `NULL'.
+     encryption, for example), UID_HINT will be ‘NULL’.
 
-     The argument PASSPHRASE_INFO, if not `NULL', will give further
+     The argument PASSPHRASE_INFO, if not ‘NULL’, will give further
      information about the context in which the passphrase is required.
      This information is engine and operation specific.
 
      If this is the repeated attempt to get the passphrase, because
-     previous attempts failed, then PREV_WAS_BAD is 1, otherwise it
-     will be 0.
+     previous attempts failed, then PREV_WAS_BAD is 1, otherwise it will
+     be 0.
 
      The user must write the passphrase, followed by a newline
      character, to the file descriptor FD.  The function
-     `gpgme_io_writen' should be used for the write operation.  Note
+     ‘gpgme_io_writen’ should be used for the write operation.  Note
      that if the user returns 0 to indicate success, the user must at
      least write a newline character before returning from the callback.
 
-     If an error occurs, return the corresponding `gpgme_error_t'
-     value.  You can use the error code `GPG_ERR_CANCELED' to abort the
-     operation.  Otherwise, return `0'.
+     If an error occurs, return the corresponding ‘gpgme_error_t’ value.
+     You can use the error code ‘GPG_ERR_CANCELED’ to abort the
+     operation.  Otherwise, return ‘0’.
 
  -- Function: void gpgme_set_passphrase_cb (gpgme_ctx_t CTX,
           gpgme_passphrase_cb_t PASSFUNC, void *HOOK_VALUE)
-     The function `gpgme_set_passphrase_cb' sets the function that is
+     The function ‘gpgme_set_passphrase_cb’ sets the function that is
      used when a passphrase needs to be provided by the user to
      PASSFUNC.  The function PASSFUNC needs to implemented by the user,
      and whenever it is called, it is called with its first argument
@@ -2453,20 +2404,20 @@ char *UID_HINT, const char *PASSPHRASE_INFO, int PREV_WAS_BAD, int FD)
      from a trusted agent (a daemon process), rather than having each
      user to implement their own passphrase query.  Some engines do not
      even support an external passphrase callback at all, in this case
-     the error code `GPG_ERR_NOT_SUPPORTED' is returned.
+     the error code ‘GPG_ERR_NOT_SUPPORTED’ is returned.
 
      The user can disable the use of a passphrase callback function by
-     calling `gpgme_set_passphrase_cb' with PASSFUNC being `NULL'.
+     calling ‘gpgme_set_passphrase_cb’ with PASSFUNC being ‘NULL’.
 
  -- Function: void gpgme_get_passphrase_cb (gpgme_ctx_t CTX,
           gpgme_passphrase_cb_t *PASSFUNC, void **HOOK_VALUE)
-     The function `gpgme_get_passphrase_cb' returns the function that
-     is used when a passphrase needs to be provided by the user in
-     *PASSFUNC, and the first argument for this function in
-     *HOOK_VALUE.  If no passphrase callback is set, or CTX is not a
-     valid pointer, `NULL' is returned in both variables.
+     The function ‘gpgme_get_passphrase_cb’ returns the function that is
+     used when a passphrase needs to be provided by the user in
+     *PASSFUNC, and the first argument for this function in *HOOK_VALUE.
+     If no passphrase callback is set, or CTX is not a valid pointer,
+     ‘NULL’ is returned in both variables.
 
-     PASSFUNC or HOOK_VALUE can be `NULL'.  In this case, the
+     PASSFUNC or HOOK_VALUE can be ‘NULL’.  In this case, the
      corresponding value will not be returned.
 
 
@@ -2475,40 +2426,40 @@ File: gpgme.info,  Node: Progress Meter Callback,  Next: Locale,  Prev: Passphra
 7.4.8 Progress Meter Callback
 -----------------------------
 
- -- Data type: void (*gpgme_progress_cb_t)(void *HOOK, const char
-*WHAT, int TYPE, int CURRENT, int TOTAL)
-     The `gpgme_progress_cb_t' type is the type of functions usable as
+ -- Data type: void (*gpgme_progress_cb_t)(void *HOOK, const char *WHAT,
+          int TYPE, int CURRENT, int TOTAL)
+     The ‘gpgme_progress_cb_t’ type is the type of functions usable as
      progress callback function.
 
      The arguments are specific to the crypto engine.  More information
      about the progress information returned from the GnuPG engine can
-     be found in the GnuPG source code in the file `doc/DETAILS' in the
+     be found in the GnuPG source code in the file ‘doc/DETAILS’ in the
      section PROGRESS.
 
  -- Function: void gpgme_set_progress_cb (gpgme_ctx_t CTX,
           gpgme_progress_cb_t PROGFUNC, void *HOOK_VALUE)
-     The function `gpgme_set_progress_cb' sets the function that is
-     used when progress information about a cryptographic operation is
-     available.  The function PROGFUNC needs to implemented by the
-     user, and whenever it is called, it is called with its first
-     argument being HOOK_VALUE.  By default, no progress callback
-     function is set.
+     The function ‘gpgme_set_progress_cb’ sets the function that is used
+     when progress information about a cryptographic operation is
+     available.  The function PROGFUNC needs to implemented by the user,
+     and whenever it is called, it is called with its first argument
+     being HOOK_VALUE.  By default, no progress callback function is
+     set.
 
      Setting a callback function allows an interactive program to
      display progress information about a long operation to the user.
 
      The user can disable the use of a progress callback function by
-     calling `gpgme_set_progress_cb' with PROGFUNC being `NULL'.
+     calling ‘gpgme_set_progress_cb’ with PROGFUNC being ‘NULL’.
 
  -- Function: void gpgme_get_progress_cb (gpgme_ctx_t CTX,
           gpgme_progress_cb_t *PROGFUNC, void **HOOK_VALUE)
-     The function `gpgme_get_progress_cb' returns the function that is
+     The function ‘gpgme_get_progress_cb’ returns the function that is
      used to inform the user about the progress made in *PROGFUNC, and
      the first argument for this function in *HOOK_VALUE.  If no
-     progress callback is set, or CTX is not a valid pointer, `NULL' is
+     progress callback is set, or CTX is not a valid pointer, ‘NULL’ is
      returned in both variables.
 
-     PROGFUNC or HOOK_VALUE can be `NULL'.  In this case, the
+     PROGFUNC or HOOK_VALUE can be ‘NULL’.  In this case, the
      corresponding value will not be returned.
 
 
@@ -2527,19 +2478,19 @@ contexts created afterwards.
 
  -- Function: gpgme_error_t gpgme_set_locale (gpgme_ctx_t CTX,
           int CATEGORY, const char *VALUE)
-     The function `gpgme_set_locale' sets the locale of the context
-     CTX, or the default locale if CTX is a null pointer.
+     The function ‘gpgme_set_locale’ sets the locale of the context CTX,
+     or the default locale if CTX is a null pointer.
 
      The locale settings that should be changed are specified by
-     CATEGORY.  Supported categories are `LC_CTYPE', `LC_MESSAGES', and
-     `LC_ALL', which is a wildcard you can use if you want to change
-     all the categories at once.
+     CATEGORY.  Supported categories are ‘LC_CTYPE’, ‘LC_MESSAGES’, and
+     ‘LC_ALL’, which is a wildcard you can use if you want to change all
+     the categories at once.
 
-     The value to be used for the locale setting is VALUE, which will
-     be copied to GPGME's internal data structures.  VALUE can be a
-     null pointer, which disables setting the locale, and will make PIN
-     entry and other applications use their default setting, which is
-     usually not what you want.
+     The value to be used for the locale setting is VALUE, which will be
+     copied to GPGME’s internal data structures.  VALUE can be a null
+     pointer, which disables setting the locale, and will make PIN entry
+     and other applications use their default setting, which is usually
+     not what you want.
 
      Note that the settings are only used if the application runs on a
      text terminal, and that the settings should fit the configuration
@@ -2560,270 +2511,269 @@ that should be used for the operation.  The following section describes
 how such keys can be selected and manipulated.
 
  -- Data type: gpgme_subkey_t
-     The `gpgme_subkey_t' type is a pointer to a subkey structure.  Sub
-     keys are one component of a `gpgme_key_t' object.  In fact,
-     subkeys are those parts that contains the real information about
-     the individual cryptographic keys that belong to the same key
-     object.  One `gpgme_key_t' can contain several subkeys.  The first
-     subkey in the linked list is also called the primary key.
+     The ‘gpgme_subkey_t’ type is a pointer to a subkey structure.  Sub
+     keys are one component of a ‘gpgme_key_t’ object.  In fact, subkeys
+     are those parts that contains the real information about the
+     individual cryptographic keys that belong to the same key object.
+     One ‘gpgme_key_t’ can contain several subkeys.  The first subkey in
+     the linked list is also called the primary key.
 
      The subkey structure has the following members:
 
-    `gpgme_subkey_t next'
+     ‘gpgme_subkey_t next’
           This is a pointer to the next subkey structure in the linked
-          list, or `NULL' if this is the last element.
+          list, or ‘NULL’ if this is the last element.
 
-    `unsigned int revoked : 1'
+     ‘unsigned int revoked : 1’
           This is true if the subkey is revoked.
 
-    `unsigned int expired : 1'
+     ‘unsigned int expired : 1’
           This is true if the subkey is expired.
 
-    `unsigned int disabled : 1'
+     ‘unsigned int disabled : 1’
           This is true if the subkey is disabled.
 
-    `unsigned int invalid : 1'
+     ‘unsigned int invalid : 1’
           This is true if the subkey is invalid.
 
-    `unsigned int can_encrypt : 1'
+     ‘unsigned int can_encrypt : 1’
           This is true if the subkey can be used for encryption.
 
-    `unsigned int can_sign : 1'
+     ‘unsigned int can_sign : 1’
           This is true if the subkey can be used to create data
           signatures.
 
-    `unsigned int can_certify : 1'
+     ‘unsigned int can_certify : 1’
           This is true if the subkey can be used to create key
           certificates.
 
-    `unsigned int can_authenticate : 1'
+     ‘unsigned int can_authenticate : 1’
           This is true if the subkey can be used for authentication.
 
-    `unsigned int is_qualified : 1'
+     ‘unsigned int is_qualified : 1’
           This is true if the subkey can be used for qualified
           signatures according to local government regulations.
 
-    `unsigned int secret : 1'
-          This is true if the subkey is a secret key.  Note that it
-          will be false if the key is actually a stub key; i.e. a
-          secret key operation is currently not possible (offline-key).
-          This is only set if a listing of secret keys has been
-          requested or if `GPGME_KEYLIST_MODE_WITH_SECRET' is active.
+     ‘unsigned int secret : 1’
+          This is true if the subkey is a secret key.  Note that it will
+          be false if the key is actually a stub key; i.e.  a secret key
+          operation is currently not possible (offline-key).  This is
+          only set if a listing of secret keys has been requested or if
+          ‘GPGME_KEYLIST_MODE_WITH_SECRET’ is active.
 
-    `gpgme_pubkey_algo_t pubkey_algo'
+     ‘gpgme_pubkey_algo_t pubkey_algo’
           This is the public key algorithm supported by this subkey.
 
-    `unsigned int length'
+     ‘unsigned int length’
           This is the length of the subkey (in bits).
 
-    `char *keyid'
+     ‘char *keyid’
           This is the key ID of the subkey in hexadecimal digits.
 
-    `char *fpr'
+     ‘char *fpr’
           This is the fingerprint of the subkey in hexadecimal digits,
           if available.
 
-    `long int timestamp'
+     ‘long int timestamp’
           This is the creation timestamp of the subkey.  This is -1 if
           the timestamp is invalid, and 0 if it is not available.
 
-    `long int expires'
+     ‘long int expires’
           This is the expiration timestamp of the subkey, or 0 if the
           subkey does not expire.
 
-    `unsigned int is_cardkey : 1'
+     ‘unsigned int is_cardkey : 1’
           True if the secret key is stored on a smart card.
 
-    `char *card_number'
-          The serial number of a smart card holding this key or `NULL'.
+     ‘char *card_number’
+          The serial number of a smart card holding this key or ‘NULL’.
 
-    `char *curve'
+     ‘char *curve’
           For ECC algoritms the name of the curve.
 
-
  -- Data type: gpgme_key_sig_t
-     The `gpgme_key_sig_t' type is a pointer to a key signature
-     structure.  Key signatures are one component of a `gpgme_key_t'
+     The ‘gpgme_key_sig_t’ type is a pointer to a key signature
+     structure.  Key signatures are one component of a ‘gpgme_key_t’
      object, and validate user IDs on the key.
 
      The signatures on a key are only available if the key was retrieved
-     via a listing operation with the `GPGME_KEYLIST_MODE_SIGS' mode
+     via a listing operation with the ‘GPGME_KEYLIST_MODE_SIGS’ mode
      enabled, because it can be expensive to retrieve all signatures of
      a key.
 
      The signature notations on a key signature are only available if
      the key was retrieved via a listing operation with the
-     `GPGME_KEYLIST_MODE_SIG_NOTATIONS' mode enabled, because it can be
+     ‘GPGME_KEYLIST_MODE_SIG_NOTATIONS’ mode enabled, because it can be
      expensive to retrieve all signature notations.
 
      The key signature structure has the following members:
 
-    `gpgme_key_sig_t next'
+     ‘gpgme_key_sig_t next’
           This is a pointer to the next key signature structure in the
-          linked list, or `NULL' if this is the last element.
+          linked list, or ‘NULL’ if this is the last element.
 
-    `unsigned int revoked : 1'
+     ‘unsigned int revoked : 1’
           This is true if the key signature is a revocation signature.
 
-    `unsigned int expired : 1'
+     ‘unsigned int expired : 1’
           This is true if the key signature is expired.
 
-    `unsigned int invalid : 1'
+     ‘unsigned int invalid : 1’
           This is true if the key signature is invalid.
 
-    `unsigned int exportable : 1'
+     ‘unsigned int exportable : 1’
           This is true if the key signature is exportable.
 
-    `gpgme_pubkey_algo_t pubkey_algo'
+     ‘gpgme_pubkey_algo_t pubkey_algo’
           This is the public key algorithm used to create the signature.
 
-    `char *keyid'
+     ‘char *keyid’
           This is the key ID of the key (in hexadecimal digits) used to
           create the signature.
 
-    `long int timestamp'
+     ‘long int timestamp’
           This is the creation timestamp of the key signature.  This is
           -1 if the timestamp is invalid, and 0 if it is not available.
 
-    `long int expires'
-          This is the expiration timestamp of the key signature, or 0
-          if the key signature does not expire.
+     ‘long int expires’
+          This is the expiration timestamp of the key signature, or 0 if
+          the key signature does not expire.
 
-    `gpgme_error_t status'
+     ‘gpgme_error_t status’
           This is the status of the signature and has the same meaning
-          as the member of the same name in a `gpgme_signature_t'
+          as the member of the same name in a ‘gpgme_signature_t’
           object.
 
-    `unsigned int sig_class'
+     ‘unsigned int sig_class’
           This specifies the signature class of the key signature.  The
           meaning is specific to the crypto engine.
 
-    `char *uid'
+     ‘char *uid’
           This is the main user ID of the key used to create the
           signature.
 
-    `char *name'
-          This is the name component of `uid', if available.
+     ‘char *name’
+          This is the name component of ‘uid’, if available.
 
-    `char *comment'
-          This is the comment component of `uid', if available.
+     ‘char *comment’
+          This is the comment component of ‘uid’, if available.
 
-    `char *email'
-          This is the email component of `uid', if available.
+     ‘char *email’
+          This is the email component of ‘uid’, if available.
 
-    `gpgme_sig_notation_t notations'
+     ‘gpgme_sig_notation_t notations’
           This is a linked list with the notation data and policy URLs.
 
  -- Data type: gpgme_user_id_t
-     A user ID is a component of a `gpgme_key_t' object.  One key can
+     A user ID is a component of a ‘gpgme_key_t’ object.  One key can
      have many user IDs.  The first one in the list is the main (or
      primary) user ID.
 
      The user ID structure has the following members.
 
-    `gpgme_user_id_t next'
+     ‘gpgme_user_id_t next’
           This is a pointer to the next user ID structure in the linked
-          list, or `NULL' if this is the last element.
+          list, or ‘NULL’ if this is the last element.
 
-    `unsigned int revoked : 1'
+     ‘unsigned int revoked : 1’
           This is true if the user ID is revoked.
 
-    `unsigned int invalid : 1'
+     ‘unsigned int invalid : 1’
           This is true if the user ID is invalid.
 
-    `gpgme_validity_t validity'
+     ‘gpgme_validity_t validity’
           This specifies the validity of the user ID.
 
-    `char *uid'
+     ‘char *uid’
           This is the user ID string.
 
-    `char *name'
-          This is the name component of `uid', if available.
+     ‘char *name’
+          This is the name component of ‘uid’, if available.
 
-    `char *comment'
-          This is the comment component of `uid', if available.
+     ‘char *comment’
+          This is the comment component of ‘uid’, if available.
 
-    `char *email'
-          This is the email component of `uid', if available.
+     ‘char *email’
+          This is the email component of ‘uid’, if available.
 
-    `gpgme_key_sig_t signatures'
+     ‘gpgme_key_sig_t signatures’
           This is a linked list with the signatures on this user ID.
 
  -- Data type: gpgme_key_t
-     The `gpgme_key_t' type is a pointer to a key object.  It has the
+     The ‘gpgme_key_t’ type is a pointer to a key object.  It has the
      following members:
 
-    `gpgme_keylist_mode_t keylist_mode'
+     ‘gpgme_keylist_mode_t keylist_mode’
           The keylist mode that was active when the key was retrieved.
 
-    `unsigned int revoked : 1'
+     ‘unsigned int revoked : 1’
           This is true if the key is revoked.
 
-    `unsigned int expired : 1'
+     ‘unsigned int expired : 1’
           This is true if the key is expired.
 
-    `unsigned int disabled : 1'
+     ‘unsigned int disabled : 1’
           This is true if the key is disabled.
 
-    `unsigned int invalid : 1'
-          This is true if the key is invalid. This might have several
+     ‘unsigned int invalid : 1’
+          This is true if the key is invalid.  This might have several
           reasons, for a example for the S/MIME backend, it will be set
           in during key listsing if the key could not be validated due
           to a missing certificates or unmatched policies.
 
-    `unsigned int can_encrypt : 1'
+     ‘unsigned int can_encrypt : 1’
           This is true if the key (ie one of its subkeys) can be used
           for encryption.
 
-    `unsigned int can_sign : 1'
-          This is true if the key (ie one of its subkeys) can be used
-          to create data signatures.
+     ‘unsigned int can_sign : 1’
+          This is true if the key (ie one of its subkeys) can be used to
+          create data signatures.
 
-    `unsigned int can_certify : 1'
-          This is true if the key (ie one of its subkeys) can be used
-          to create key certificates.
+     ‘unsigned int can_certify : 1’
+          This is true if the key (ie one of its subkeys) can be used to
+          create key certificates.
 
-    `unsigned int can_authenticate : 1'
+     ‘unsigned int can_authenticate : 1’
           This is true if the key (ie one of its subkeys) can be used
           for authentication.
 
-    `unsigned int is_qualified : 1'
+     ‘unsigned int is_qualified : 1’
           This is true if the key can be used for qualified signatures
           according to local government regulations.
 
-    `unsigned int secret : 1'
-          This is true if the key is a secret key.  Note, that this
-          will always be true even if the corresponding subkey flag may
-          be false (offline/stub keys).  This is only set if a listing
-          of secret keys has been requested or if
-          `GPGME_KEYLIST_MODE_WITH_SECRET' is active.
+     ‘unsigned int secret : 1’
+          This is true if the key is a secret key.  Note, that this will
+          always be true even if the corresponding subkey flag may be
+          false (offline/stub keys).  This is only set if a listing of
+          secret keys has been requested or if
+          ‘GPGME_KEYLIST_MODE_WITH_SECRET’ is active.
 
-    `gpgme_protocol_t protocol'
+     ‘gpgme_protocol_t protocol’
           This is the protocol supported by this key.
 
-    `char *issuer_serial'
-          If `protocol' is `GPGME_PROTOCOL_CMS', then this is the
-          issuer serial.
+     ‘char *issuer_serial’
+          If ‘protocol’ is ‘GPGME_PROTOCOL_CMS’, then this is the issuer
+          serial.
 
-    `char *issuer_name'
-          If `protocol' is `GPGME_PROTOCOL_CMS', then this is the
-          issuer name.
+     ‘char *issuer_name’
+          If ‘protocol’ is ‘GPGME_PROTOCOL_CMS’, then this is the issuer
+          name.
 
-    `char *chain_id'
-          If `protocol' is `GPGME_PROTOCOL_CMS', then this is the chain
+     ‘char *chain_id’
+          If ‘protocol’ is ‘GPGME_PROTOCOL_CMS’, then this is the chain
           ID, which can be used to built the certificate chain.
 
-    `gpgme_validity_t owner_trust'
-          If `protocol' is `GPGME_PROTOCOL_OpenPGP', then this is the
+     ‘gpgme_validity_t owner_trust’
+          If ‘protocol’ is ‘GPGME_PROTOCOL_OpenPGP’, then this is the
           owner trust.
 
-    `gpgme_subkey_t subkeys'
+     ‘gpgme_subkey_t subkeys’
           This is a linked list with the subkeys of the key.  The first
           subkey in the list is the primary key and usually available.
 
-    `gpgme_user_id_t uids'
-          This is a linked list with the user IDs of the key.  The
-          first user ID in the list is the main (or primary) user ID.
+     ‘gpgme_user_id_t uids’
+          This is a linked list with the user IDs of the key.  The first
+          user ID in the list is the main (or primary) user ID.
 
 * Menu:
 
@@ -2846,12 +2796,12 @@ File: gpgme.info,  Node: Listing Keys,  Next: Information About Keys,  Up: Key M
 
  -- Function: gpgme_error_t gpgme_op_keylist_start (gpgme_ctx_t CTX,
           const char *PATTERN, int SECRET_ONLY)
-     The function `gpgme_op_keylist_start' initiates a key listing
+     The function ‘gpgme_op_keylist_start’ initiates a key listing
      operation inside the context CTX.  It sets everything up so that
-     subsequent invocations of `gpgme_op_keylist_next' return the keys
+     subsequent invocations of ‘gpgme_op_keylist_next’ return the keys
      in the list.
 
-     If PATTERN is `NULL', all available keys are returned.  Otherwise,
+     If PATTERN is ‘NULL’, all available keys are returned.  Otherwise,
      PATTERN contains an engine specific expression that is used to
      limit the list to all keys matching the pattern.  Note that the
      total length of the pattern is restricted to an engine-specific
@@ -2860,78 +2810,77 @@ File: gpgme.info,  Node: Listing Keys,  Next: Information About Keys,  Up: Key M
      name or user, not to list many specific keys at once by listing
      their fingerprints or key IDs.
 
-     If SECRET_ONLY is not `0', the list is restricted to secret keys
+     If SECRET_ONLY is not ‘0’, the list is restricted to secret keys
      only.
 
      The context will be busy until either all keys are received (and
-     `gpgme_op_keylist_next' returns `GPG_ERR_EOF'), or
-     `gpgme_op_keylist_end' is called to finish the operation.
+     ‘gpgme_op_keylist_next’ returns ‘GPG_ERR_EOF’), or
+     ‘gpgme_op_keylist_end’ is called to finish the operation.
 
-     The function returns the error code `GPG_ERR_INV_VALUE' if CTX is
+     The function returns the error code ‘GPG_ERR_INV_VALUE’ if CTX is
      not a valid pointer, and passes through any errors that are
      reported by the crypto engine support routines.
 
- -- Function: gpgme_error_t gpgme_op_keylist_ext_start
-          (gpgme_ctx_t CTX, const char *PATTERN[], int SECRET_ONLY,
-          int RESERVED)
-     The function `gpgme_op_keylist_ext_start' initiates an extended
-     key listing operation inside the context CTX.  It sets everything
-     up so that subsequent invocations of `gpgme_op_keylist_next'
-     return the keys in the list.
-
-     If PATTERN or *PATTERN is `NULL', all available keys are returned.
-     Otherwise, PATTERN is a `NULL' terminated array of strings that
-     are used to limit the list to all keys matching at least one of
-     the patterns verbatim.  Note that the total length of all patterns
-     is restricted to an engine-specific maximum (the exact limit also
+ -- Function: gpgme_error_t gpgme_op_keylist_ext_start (gpgme_ctx_t CTX,
+          const char *PATTERN[], int SECRET_ONLY, int RESERVED)
+     The function ‘gpgme_op_keylist_ext_start’ initiates an extended key
+     listing operation inside the context CTX.  It sets everything up so
+     that subsequent invocations of ‘gpgme_op_keylist_next’ return the
+     keys in the list.
+
+     If PATTERN or *PATTERN is ‘NULL’, all available keys are returned.
+     Otherwise, PATTERN is a ‘NULL’ terminated array of strings that are
+     used to limit the list to all keys matching at least one of the
+     patterns verbatim.  Note that the total length of all patterns is
+     restricted to an engine-specific maximum (the exact limit also
      depends on the number of patterns and amount of quoting required,
-     but a couple of hundred characters are usually accepted).
-     Patterns should be used to restrict the search to a certain common
-     name or user, not to list many specific keys at once by listing
-     their fingerprints or key IDs.
+     but a couple of hundred characters are usually accepted).  Patterns
+     should be used to restrict the search to a certain common name or
+     user, not to list many specific keys at once by listing their
+     fingerprints or key IDs.
 
-     If SECRET_ONLY is not `0', the list is restricted to secret keys
+     If SECRET_ONLY is not ‘0’, the list is restricted to secret keys
      only.
 
-     The value of RESERVED must be `0'.
+     The value of RESERVED must be ‘0’.
 
      The context will be busy until either all keys are received (and
-     `gpgme_op_keylist_next' returns `GPG_ERR_EOF'), or
-     `gpgme_op_keylist_end' is called to finish the operation.
+     ‘gpgme_op_keylist_next’ returns ‘GPG_ERR_EOF’), or
+     ‘gpgme_op_keylist_end’ is called to finish the operation.
 
-     The function returns the error code `GPG_ERR_INV_VALUE' if CTX is
+     The function returns the error code ‘GPG_ERR_INV_VALUE’ if CTX is
      not a valid pointer, and passes through any errors that are
      reported by the crypto engine support routines.
 
  -- Function: gpgme_error_t gpgme_op_keylist_next (gpgme_ctx_t CTX,
           gpgme_key_t *R_KEY)
-     The function `gpgme_op_keylist_next' returns the next key in the
-     list created by a previous `gpgme_op_keylist_start' operation in
+     The function ‘gpgme_op_keylist_next’ returns the next key in the
+     list created by a previous ‘gpgme_op_keylist_start’ operation in
      the context CTX.  The key will have one reference for the user.
      *Note Manipulating Keys::.
 
-     This is the only way to get at `gpgme_key_t' objects in GPGME.
+     This is the only way to get at ‘gpgme_key_t’ objects in GPGME.
 
      If the last key in the list has already been returned,
-     `gpgme_op_keylist_next' returns `GPG_ERR_EOF'.
+     ‘gpgme_op_keylist_next’ returns ‘GPG_ERR_EOF’.
 
-     The function returns the error code `GPG_ERR_INV_VALUE' if CTX or
-     R_KEY is not a valid pointer, and `GPG_ERR_ENOMEM' if there is not
+     The function returns the error code ‘GPG_ERR_INV_VALUE’ if CTX or
+     R_KEY is not a valid pointer, and ‘GPG_ERR_ENOMEM’ if there is not
      enough memory for the operation.
 
  -- Function: gpgme_error_t gpgme_op_keylist_end (gpgme_ctx_t CTX)
-     The function `gpgme_op_keylist_end' ends a pending key list
+     The function ‘gpgme_op_keylist_end’ ends a pending key list
      operation in the context CTX.
 
      After the operation completed successfully, the result of the key
-     listing operation can be retrieved with `gpgme_op_keylist_result'.
+     listing operation can be retrieved with ‘gpgme_op_keylist_result’.
 
-     The function returns the error code `GPG_ERR_INV_VALUE' if CTX is
-     not a valid pointer, and `GPG_ERR_ENOMEM' if at some time during
+     The function returns the error code ‘GPG_ERR_INV_VALUE’ if CTX is
+     not a valid pointer, and ‘GPG_ERR_ENOMEM’ if at some time during
      the operation there was not enough memory available.
 
    The following example illustrates how all keys containing a certain
-string (`g10code') can be listed with their key ID and the name and
+string (‘g10code’) can be listed with their key ID and the name and
 e-mail address of the main user ID:
 
      gpgme_ctx_t ctx;
@@ -2964,20 +2913,20 @@ e-mail address of the main user ID:
 
  -- Data type: gpgme_keylist_result_t
      This is a pointer to a structure used to store the result of a
-     `gpgme_op_keylist_*' operation.  After successfully ending a key
+     ‘gpgme_op_keylist_*’ operation.  After successfully ending a key
      listing operation, you can retrieve the pointer to the result with
-     `gpgme_op_keylist_result'.  The structure contains the following
+     ‘gpgme_op_keylist_result’.  The structure contains the following
      member:
 
-    `unsigned int truncated : 1'
-          This is true if the crypto backend had to truncate the
-          result, and less than the desired keys could be listed.
+     ‘unsigned int truncated : 1’
+          This is true if the crypto backend had to truncate the result,
+          and less than the desired keys could be listed.
 
  -- Function: gpgme_keylist_result_t gpgme_op_keylist_result
           (gpgme_ctx_t CTX)
-     The function `gpgme_op_keylist_result' returns a
-     `gpgme_keylist_result_t' pointer to a structure holding the result
-     of a `gpgme_op_keylist_*' operation.  The pointer is only valid if
+     The function ‘gpgme_op_keylist_result’ returns a
+     ‘gpgme_keylist_result_t’ pointer to a structure holding the result
+     of a ‘gpgme_op_keylist_*’ operation.  The pointer is only valid if
      the last operation on the context was a key listing operation, and
      if this operation finished successfully.  The returned pointer is
      only valid until the next operation is started on the context.
@@ -2987,20 +2936,20 @@ the following function can be used to retrieve a single key.
 
  -- Function: gpgme_error_t gpgme_get_key (gpgme_ctx_t CTX,
           const char *FPR, gpgme_key_t *R_KEY, int SECRET)
-     The function `gpgme_get_key' gets the key with the fingerprint (or
+     The function ‘gpgme_get_key’ gets the key with the fingerprint (or
      key ID) FPR from the crypto backend and return it in R_KEY.  If
      SECRET is true, get the secret key.  The currently active keylist
      mode is used to retrieve the key.  The key will have one reference
      for the user.
 
-     If the key is not found in the keyring, `gpgme_get_key' returns
-     the error code `GPG_ERR_EOF' and *R_KEY will be set to `NULL'.
+     If the key is not found in the keyring, ‘gpgme_get_key’ returns the
+     error code ‘GPG_ERR_EOF’ and *R_KEY will be set to ‘NULL’.
 
-     The function returns the error code `GPG_ERR_INV_VALUE' if CTX or
-     R_KEY is not a valid pointer or FPR is not a fingerprint or key
-     ID, `GPG_ERR_AMBIGUOUS_NAME' if the key ID was not a unique
-     specifier for a key, and `GPG_ERR_ENOMEM' if at some time during
-     the operation there was not enough memory available.
+     The function returns the error code ‘GPG_ERR_INV_VALUE’ if CTX or
+     R_KEY is not a valid pointer or FPR is not a fingerprint or key ID,
+     ‘GPG_ERR_AMBIGUOUS_NAME’ if the key ID was not a unique specifier
+     for a key, and ‘GPG_ERR_ENOMEM’ if at some time during the
+     operation there was not enough memory available.
 
 
 File: gpgme.info,  Node: Information About Keys,  Next: Key Signatures,  Prev: Listing Keys,  Up: Key Management
@@ -3009,207 +2958,207 @@ File: gpgme.info,  Node: Information About Keys,  Next: Key Signatures,  Prev: L
 ----------------------------
 
 Please see the beginning of this section for more information about
-`gpgme_key_t' objects.
+‘gpgme_key_t’ objects.
 
  -- Data type: gpgme_validity_t
-     The `gpgme_validity_t' type is used to specify the validity of a
+     The ‘gpgme_validity_t’ type is used to specify the validity of a
      user ID in a key.  The following validities are defined:
 
-    `GPGME_VALIDITY_UNKNOWN'
-          The user ID is of unknown validity.  The string
-          representation of this validity is "?".
+     ‘GPGME_VALIDITY_UNKNOWN’
+          The user ID is of unknown validity.  The string representation
+          of this validity is “?”.
 
-    `GPGME_VALIDITY_UNDEFINED'
+     ‘GPGME_VALIDITY_UNDEFINED’
           The validity of the user ID is undefined.  The string
-          representation of this validity is "q".
+          representation of this validity is “q”.
 
-    `GPGME_VALIDITY_NEVER'
+     ‘GPGME_VALIDITY_NEVER’
           The user ID is never valid.  The string representation of this
-          validity is "n".
+          validity is “n”.
 
-    `GPGME_VALIDITY_MARGINAL'
-          The user ID is marginally valid.  The string representation
-          of this validity is "m".
+     ‘GPGME_VALIDITY_MARGINAL’
+          The user ID is marginally valid.  The string representation of
+          this validity is “m”.
 
-    `GPGME_VALIDITY_FULL'
+     ‘GPGME_VALIDITY_FULL’
           The user ID is fully valid.  The string representation of this
-          validity is "f".
+          validity is “f”.
 
-    `GPGME_VALIDITY_ULTIMATE'
-          The user ID is ultimately valid.  The string representation
-          of this validity is "u".
+     ‘GPGME_VALIDITY_ULTIMATE’
+          The user ID is ultimately valid.  The string representation of
+          this validity is “u”.
 
    The following interfaces are deprecated and only provided for
-backward compatibility.  Don't use them.  They will be removed in a
+backward compatibility.  Don’t use them.  They will be removed in a
 future version of GPGME.
 
  -- Data type: gpgme_attr_t
-     The `gpgme_attr_t' type is used to specify a key or trust item
+     The ‘gpgme_attr_t’ type is used to specify a key or trust item
      attribute.  The following attributes are defined:
 
-    `GPGME_ATTR_KEYID'
+     ‘GPGME_ATTR_KEYID’
           This is the key ID of a sub key.  It is representable as a
           string.
 
           For trust items, the trust item refers to the key with this
           ID.
 
-    `GPGME_ATTR_FPR'
+     ‘GPGME_ATTR_FPR’
           This is the fingerprint of a sub key.  It is representable as
           a string.
 
-    `GPGME_ATTR_ALGO'
+     ‘GPGME_ATTR_ALGO’
           This is the crypto algorithm for which the sub key can be
           used.  It is representable as a string and as a number.  The
-          numbers correspond to the `enum gcry_pk_algos' values in the
+          numbers correspond to the ‘enum gcry_pk_algos’ values in the
           gcrypt library.
 
-    `GPGME_ATTR_LEN'
+     ‘GPGME_ATTR_LEN’
           This is the key length of a sub key.  It is representable as a
           number.
 
-    `GPGME_ATTR_CREATED'
+     ‘GPGME_ATTR_CREATED’
           This is the timestamp at creation time of a sub key.  It is
           representable as a number.
 
-    `GPGME_ATTR_EXPIRE'
-          This is the expiration time of a sub key.  It is
-          representable as a number.
+     ‘GPGME_ATTR_EXPIRE’
+          This is the expiration time of a sub key.  It is representable
+          as a number.
 
-    `GPGME_ATTR_OTRUST'
-          XXX FIXME  (also for trust items)
+     ‘GPGME_ATTR_OTRUST’
+          XXX FIXME (also for trust items)
 
-    `GPGME_ATTR_USERID'
-          This is a user ID.  There can be more than one user IDs in a
+     ‘GPGME_ATTR_USERID’
+          This is a user ID. There can be more than one user IDs in a
           GPGME_KEY_T object.  The first one (with index 0) is the
-          primary user ID.  The user ID is representable as a number.
+          primary user ID. The user ID is representable as a number.
 
           For trust items, this is the user ID associated with this
           trust item.
 
-    `GPGME_ATTR_NAME'
-          This is the name belonging to a user ID.  It is representable
+     ‘GPGME_ATTR_NAME’
+          This is the name belonging to a user ID. It is representable
           as a string.
 
-    `GPGME_ATTR_EMAIL'
-          This is the email address belonging to a user ID.  It is
+     ‘GPGME_ATTR_EMAIL’
+          This is the email address belonging to a user ID. It is
           representable as a string.
 
-    `GPGME_ATTR_COMMENT'
-          This is the comment belonging to a user ID.  It is
+     ‘GPGME_ATTR_COMMENT’
+          This is the comment belonging to a user ID. It is
           representable as a string.
 
-    `GPGME_ATTR_VALIDITY'
-          This is the validity belonging to a user ID.  It is
+     ‘GPGME_ATTR_VALIDITY’
+          This is the validity belonging to a user ID. It is
           representable as a string and as a number.  See below for a
           list of available validities.
 
           For trust items, this is the validity that is associated with
           this trust item.
 
-    `GPGME_ATTR_UID_REVOKED'
+     ‘GPGME_ATTR_UID_REVOKED’
           This specifies if a user ID is revoked.  It is representable
-          as a number, and is `1' if the user ID is revoked, and `0'
+          as a number, and is ‘1’ if the user ID is revoked, and ‘0’
           otherwise.
 
-    `GPGME_ATTR_UID_INVALID'
+     ‘GPGME_ATTR_UID_INVALID’
           This specifies if a user ID is invalid.  It is representable
-          as a number, and is `1' if the user ID is invalid, and `0'
+          as a number, and is ‘1’ if the user ID is invalid, and ‘0’
           otherwise.
 
-    `GPGME_ATTR_LEVEL'
+     ‘GPGME_ATTR_LEVEL’
           This is the trust level of a trust item.
 
-    `GPGME_ATTR_TYPE'
+     ‘GPGME_ATTR_TYPE’
           This returns information about the type of key.  For the
           string function this will eother be "PGP" or "X.509".  The
           integer function returns 0 for PGP and 1 for X.509.  It is
           also used for the type of a trust item.
 
-    `GPGME_ATTR_IS_SECRET'
+     ‘GPGME_ATTR_IS_SECRET’
           This specifies if the key is a secret key.  It is
-          representable as a number, and is `1' if the key is revoked,
-          and `0' otherwise.
+          representable as a number, and is ‘1’ if the key is revoked,
+          and ‘0’ otherwise.
 
-    `GPGME_ATTR_KEY_REVOKED'
+     ‘GPGME_ATTR_KEY_REVOKED’
           This specifies if a sub key is revoked.  It is representable
-          as a number, and is `1' if the key is revoked, and `0'
+          as a number, and is ‘1’ if the key is revoked, and ‘0’
           otherwise.
 
-    `GPGME_ATTR_KEY_INVALID'
+     ‘GPGME_ATTR_KEY_INVALID’
           This specifies if a sub key is invalid.  It is representable
-          as a number, and is `1' if the key is invalid, and `0'
+          as a number, and is ‘1’ if the key is invalid, and ‘0’
           otherwise.
 
-    `GPGME_ATTR_KEY_EXPIRED'
+     ‘GPGME_ATTR_KEY_EXPIRED’
           This specifies if a sub key is expired.  It is representable
-          as a number, and is `1' if the key is expired, and `0'
+          as a number, and is ‘1’ if the key is expired, and ‘0’
           otherwise.
 
-    `GPGME_ATTR_KEY_DISABLED'
+     ‘GPGME_ATTR_KEY_DISABLED’
           This specifies if a sub key is disabled.  It is representable
-          as a number, and is `1' if the key is disabled, and `0'
+          as a number, and is ‘1’ if the key is disabled, and ‘0’
           otherwise.
 
-    `GPGME_ATTR_KEY_CAPS'
+     ‘GPGME_ATTR_KEY_CAPS’
           This is a description of the capabilities of a sub key.  It is
-          representable as a string.  The string contains the letter
-          "e" if the key can be used for encryption, "s" if the key can
-          be used for signatures, and "c" if the key can be used for
+          representable as a string.  The string contains the letter “e”
+          if the key can be used for encryption, “s” if the key can be
+          used for signatures, and “c” if the key can be used for
           certifications.
 
-    `GPGME_ATTR_CAN_ENCRYPT'
+     ‘GPGME_ATTR_CAN_ENCRYPT’
           This specifies if a sub key can be used for encryption.  It is
-          representable as a number, and is `1' if the sub key can be
-          used for encryption, and `0' otherwise.
+          representable as a number, and is ‘1’ if the sub key can be
+          used for encryption, and ‘0’ otherwise.
 
-    `GPGME_ATTR_CAN_SIGN'
+     ‘GPGME_ATTR_CAN_SIGN’
           This specifies if a sub key can be used to create data
-          signatures.  It is representable as a number, and is `1' if
-          the sub key can be used for signatures, and `0' otherwise.
+          signatures.  It is representable as a number, and is ‘1’ if
+          the sub key can be used for signatures, and ‘0’ otherwise.
 
-    `GPGME_ATTR_CAN_CERTIFY'
+     ‘GPGME_ATTR_CAN_CERTIFY’
           This specifies if a sub key can be used to create key
-          certificates.  It is representable as a number, and is `1' if
-          the sub key can be used for certifications, and `0' otherwise.
+          certificates.  It is representable as a number, and is ‘1’ if
+          the sub key can be used for certifications, and ‘0’ otherwise.
 
-    `GPGME_ATTR_SERIAL'
+     ‘GPGME_ATTR_SERIAL’
           The X.509 issuer serial attribute of the key.  It is
           representable as a string.
 
-    `GPGME_ATTR_ISSUE'
+     ‘GPGME_ATTR_ISSUE’
           The X.509 issuer name attribute of the key.  It is
           representable as a string.
 
-    `GPGME_ATTR_CHAINID'
+     ‘GPGME_ATTR_CHAINID’
           The X.509 chain ID can be used to build the certification
           chain.  It is representable as a string.
 
  -- Function: const char * gpgme_key_get_string_attr (gpgme_key_t KEY,
           gpgme_attr_t WHAT, const void *RESERVED, int IDX)
-     The function `gpgme_key_get_string_attr' returns the value of the
+     The function ‘gpgme_key_get_string_attr’ returns the value of the
      string-representable attribute WHAT of key KEY.  If the attribute
      is an attribute of a sub key or an user ID, IDX specifies the sub
      key or user ID of which the attribute value is returned.  The
-     argument RESERVED is reserved for later use and should be `NULL'.
+     argument RESERVED is reserved for later use and should be ‘NULL’.
 
      The string returned is only valid as long as the key is valid.
 
-     The function returns `0' if an attribute can't be returned as a
+     The function returns ‘0’ if an attribute can’t be returned as a
      string, KEY is not a valid pointer, IDX out of range, or RESERVED
-     not `NULL'.
+     not ‘NULL’.
 
  -- Function: unsigned long gpgme_key_get_ulong_attr (gpgme_key_t KEY,
           gpgme_attr_t WHAT, const void *RESERVED, int IDX)
-     The function `gpgme_key_get_ulong_attr' returns the value of the
+     The function ‘gpgme_key_get_ulong_attr’ returns the value of the
      number-representable attribute WHAT of key KEY.  If the attribute
      is an attribute of a sub key or an user ID, IDX specifies the sub
      key or user ID of which the attribute value is returned.  The
-     argument RESERVED is reserved for later use and should be `NULL'.
+     argument RESERVED is reserved for later use and should be ‘NULL’.
 
-     The function returns `0' if the attribute can't be returned as a
+     The function returns ‘0’ if the attribute can’t be returned as a
      number, KEY is not a valid pointer, IDX out of range, or RESERVED
-     not `NULL'.
+     not ‘NULL’.
 
 
 File: gpgme.info,  Node: Key Signatures,  Next: Manipulating Keys,  Prev: Information About Keys,  Up: Key Management
@@ -3218,99 +3167,99 @@ File: gpgme.info,  Node: Key Signatures,  Next: Manipulating Keys,  Prev: Inform
 --------------------
 
 The following interfaces are deprecated and only provided for backward
-compatibility.  Don't use them.  They will be removed in a future
+compatibility.  Don’t use them.  They will be removed in a future
 version of GPGME.
 
    The signatures on a key are only available if the key was retrieved
-via a listing operation with the `GPGME_KEYLIST_MODE_SIGS' mode
-enabled, because it is expensive to retrieve all signatures of a key.
+via a listing operation with the ‘GPGME_KEYLIST_MODE_SIGS’ mode enabled,
+because it is expensive to retrieve all signatures of a key.
 
    So, before using the below interfaces to retrieve the signatures on a
 key, you have to make sure that the key was listed with signatures
 enabled.  One convenient, but blocking, way to do this is to use the
-function `gpgme_get_key'.
+function ‘gpgme_get_key’.
 
  -- Data type: gpgme_attr_t
-     The `gpgme_attr_t' type is used to specify a key signature
+     The ‘gpgme_attr_t’ type is used to specify a key signature
      attribute.  The following attributes are defined:
 
-    `GPGME_ATTR_KEYID'
+     ‘GPGME_ATTR_KEYID’
           This is the key ID of the key which was used for the
           signature.  It is representable as a string.
 
-    `GPGME_ATTR_ALGO'
-          This is the crypto algorithm used to create the signature.
-          It is representable as a string and as a number.  The numbers
-          correspond to the `enum gcry_pk_algos' values in the gcrypt
+     ‘GPGME_ATTR_ALGO’
+          This is the crypto algorithm used to create the signature.  It
+          is representable as a string and as a number.  The numbers
+          correspond to the ‘enum gcry_pk_algos’ values in the gcrypt
           library.
 
-    `GPGME_ATTR_CREATED'
+     ‘GPGME_ATTR_CREATED’
           This is the timestamp at creation time of the signature.  It
           is representable as a number.
 
-    `GPGME_ATTR_EXPIRE'
+     ‘GPGME_ATTR_EXPIRE’
           This is the expiration time of the signature.  It is
           representable as a number.
 
-    `GPGME_ATTR_USERID'
-          This is the user ID associated with the signing key.  The
-          user ID is representable as a number.
+     ‘GPGME_ATTR_USERID’
+          This is the user ID associated with the signing key.  The user
+          ID is representable as a number.
 
-    `GPGME_ATTR_NAME'
-          This is the name belonging to a user ID.  It is representable
+     ‘GPGME_ATTR_NAME’
+          This is the name belonging to a user ID. It is representable
           as a string.
 
-    `GPGME_ATTR_EMAIL'
-          This is the email address belonging to a user ID.  It is
+     ‘GPGME_ATTR_EMAIL’
+          This is the email address belonging to a user ID. It is
           representable as a string.
 
-    `GPGME_ATTR_COMMENT'
-          This is the comment belonging to a user ID.  It is
+     ‘GPGME_ATTR_COMMENT’
+          This is the comment belonging to a user ID. It is
           representable as a string.
 
-    `GPGME_ATTR_KEY_REVOKED'
+     ‘GPGME_ATTR_KEY_REVOKED’
           This specifies if a key signature is a revocation signature.
-          It is representable as a number, and is `1' if the key is
-          revoked, and `0' otherwise.
+          It is representable as a number, and is ‘1’ if the key is
+          revoked, and ‘0’ otherwise.
 
-    `GPGME_ATTR_SIG_CLASS'
+     ‘GPGME_ATTR_SIG_CLASS’
           This specifies the signature class of a key signature.  It is
           representable as a number.  The meaning is specific to the
           crypto engine.
 
-    `GPGME_ATTR_SIG_CLASS'
+     ‘GPGME_ATTR_SIG_CLASS’
           This specifies the signature class of a key signature.  It is
           representable as a number.  The meaning is specific to the
           crypto engine.
 
-    `GPGME_ATTR_SIG_STATUS'
-          This is the same value as returned by `gpgme_get_sig_status'.
+     ‘GPGME_ATTR_SIG_STATUS’
+          This is the same value as returned by ‘gpgme_get_sig_status’.
 
  -- Function: const char * gpgme_key_sig_get_string_attr
           (gpgme_key_t KEY, int UID_IDX, gpgme_attr_t WHAT,
           const void *RESERVED, int IDX)
-     The function `gpgme_key_sig_get_string_attr' returns the value of
-     the string-representable attribute WHAT of the signature IDX on
-     the user ID UID_IDX in the key KEY.  The argument RESERVED is
-     reserved for later use and should be `NULL'.
+     The function ‘gpgme_key_sig_get_string_attr’ returns the value of
+     the string-representable attribute WHAT of the signature IDX on the
+     user ID UID_IDX in the key KEY.  The argument RESERVED is reserved
+     for later use and should be ‘NULL’.
 
      The string returned is only valid as long as the key is valid.
 
-     The function returns `0' if an attribute can't be returned as a
-     string, KEY is not a valid pointer, UID_IDX or IDX out of range,
-     or RESERVED not `NULL'.
+     The function returns ‘0’ if an attribute can’t be returned as a
+     string, KEY is not a valid pointer, UID_IDX or IDX out of range, or
+     RESERVED not ‘NULL’.
 
  -- Function: unsigned long gpgme_key_sig_get_ulong_attr
           (gpgme_key_t KEY, int UID_IDX, gpgme_attr_t WHAT,
           const void *RESERVED, int IDX)
-     The function `gpgme_key_sig_get_ulong_attr' returns the value of
-     the number-representable attribute WHAT of the signature IDX on
-     the user ID UID_IDX in the key KEY.  The argument RESERVED is
-     reserved for later use and should be `NULL'.
+     The function ‘gpgme_key_sig_get_ulong_attr’ returns the value of
+     the number-representable attribute WHAT of the signature IDX on the
+     user ID UID_IDX in the key KEY.  The argument RESERVED is reserved
+     for later use and should be ‘NULL’.
 
-     The function returns `0' if an attribute can't be returned as a
-     string, KEY is not a valid pointer, UID_IDX or IDX out of range,
-     or RESERVED not `NULL'.
+     The function returns ‘0’ if an attribute can’t be returned as a
+     string, KEY is not a valid pointer, UID_IDX or IDX out of range, or
+     RESERVED not ‘NULL’.
 
 
 File: gpgme.info,  Node: Manipulating Keys,  Next: Generating Keys,  Prev: Key Signatures,  Up: Key Management
@@ -3319,21 +3268,21 @@ File: gpgme.info,  Node: Manipulating Keys,  Next: Generating Keys,  Prev: Key S
 -----------------------
 
  -- Function: void gpgme_key_ref (gpgme_key_t KEY)
-     The function `gpgme_key_ref' acquires an additional reference for
+     The function ‘gpgme_key_ref’ acquires an additional reference for
      the key KEY.
 
  -- Function: void gpgme_key_unref (gpgme_key_t KEY)
-     The function `gpgme_key_unref' releases a reference for the key
-     KEY.  If this was the last reference, the key will be destroyed
-     and all resources associated to it will be released.
+     The function ‘gpgme_key_unref’ releases a reference for the key
+     KEY.  If this was the last reference, the key will be destroyed and
+     all resources associated to it will be released.
 
    The following interface is deprecated and only provided for backward
-compatibility.  Don't use it.  It will be removed in a future version
-of GPGME.
+compatibility.  Don’t use it.  It will be removed in a future version of
+GPGME.
 
  -- Function: void gpgme_key_release (gpgme_key_t KEY)
-     The function `gpgme_key_release' is equivalent to
-     `gpgme_key_unref'.
+     The function ‘gpgme_key_release’ is equivalent to
+     ‘gpgme_key_unref’.
 
 
 File: gpgme.info,  Node: Generating Keys,  Next: Exporting Keys,  Prev: Manipulating Keys,  Up: Key Management
@@ -3343,17 +3292,17 @@ File: gpgme.info,  Node: Generating Keys,  Next: Exporting Keys,  Prev: Manipula
 
  -- Function: gpgme_error_t gpgme_op_genkey (gpgme_ctx_t CTX,
           const char *PARMS, gpgme_data_t PUBLIC, gpgme_data_t SECRET)
-     The function `gpgme_op_genkey' generates a new key pair in the
+     The function ‘gpgme_op_genkey’ generates a new key pair in the
      context CTX.  The meaning of PUBLIC and SECRET depends on the
      crypto backend.
 
-     GnuPG does not support PUBLIC and SECRET, they should be `NULL'.
-     GnuPG will generate a key pair and add it to the standard key
-     ring.  The fingerprint of the generated key is available with
-     `gpgme_op_genkey_result'.
+     GnuPG does not support PUBLIC and SECRET, they should be ‘NULL’.
+     GnuPG will generate a key pair and add it to the standard key ring.
+     The fingerprint of the generated key is available with
+     ‘gpgme_op_genkey_result’.
 
      GpgSM requires PUBLIC to be a writable data object.  GpgSM will
-     generate a secret key (which will be stored by `gpg-agent', and
+     generate a secret key (which will be stored by ‘gpg-agent’, and
      return a certificate request in PUBLIC, which then needs to be
      signed by the certification authority and imported before it can be
      used.  GpgSM does not make the fingerprint available.
@@ -3385,58 +3334,58 @@ File: gpgme.info,  Node: Generating Keys,  Next: Exporting Keys,  Prev: Manipula
           </GnupgKeyParms>
 
      Strings should be given in UTF-8 encoding.  The only format
-     supported for now is "internal".  The content of the
-     `GnupgKeyParms' container is passed verbatim to the crypto
-     backend.  Control statements are not allowed.
+     supported for now is “internal”.  The content of the
+     ‘GnupgKeyParms’ container is passed verbatim to the crypto backend.
+     Control statements are not allowed.
 
      After the operation completed successfully, the result can be
-     retrieved with `gpgme_op_genkey_result'.
+     retrieved with ‘gpgme_op_genkey_result’.
 
-     The function returns the error code `GPG_ERR_NO_ERROR' if the
-     operation could be started successfully, `GPG_ERR_INV_VALUE' if
-     PARMS is not a valid XML string, `GPG_ERR_NOT_SUPPORTED' if PUBLIC
-     or SECRET is not valid, and `GPG_ERR_GENERAL' if no key was
-     created by the backend.
+     The function returns the error code ‘GPG_ERR_NO_ERROR’ if the
+     operation could be started successfully, ‘GPG_ERR_INV_VALUE’ if
+     PARMS is not a valid XML string, ‘GPG_ERR_NOT_SUPPORTED’ if PUBLIC
+     or SECRET is not valid, and ‘GPG_ERR_GENERAL’ if no key was created
+     by the backend.
 
  -- Function: gpgme_error_t gpgme_op_genkey_start (gpgme_ctx_t CTX,
           const char *PARMS, gpgme_data_t PUBLIC, gpgme_data_t SECRET)
-     The function `gpgme_op_genkey_start' initiates a `gpgme_op_genkey'
-     operation.  It can be completed by calling `gpgme_wait' on the
+     The function ‘gpgme_op_genkey_start’ initiates a ‘gpgme_op_genkey’
+     operation.  It can be completed by calling ‘gpgme_wait’ on the
      context.  *Note Waiting For Completion::.
 
-     The function returns the error code `GPG_ERR_NO_ERROR' if the
-     operation could be started successfully, `GPG_ERR_INV_VALUE' if
-     PARMS is not a valid XML string, and `GPG_ERR_NOT_SUPPORTED' if
-     PUBLIC or SECRET is not `NULL'.
+     The function returns the error code ‘GPG_ERR_NO_ERROR’ if the
+     operation could be started successfully, ‘GPG_ERR_INV_VALUE’ if
+     PARMS is not a valid XML string, and ‘GPG_ERR_NOT_SUPPORTED’ if
+     PUBLIC or SECRET is not ‘NULL’.
 
  -- Data type: gpgme_genkey_result_t
      This is a pointer to a structure used to store the result of a
-     `gpgme_op_genkey' operation.  After successfully generating a key,
+     ‘gpgme_op_genkey’ operation.  After successfully generating a key,
      you can retrieve the pointer to the result with
-     `gpgme_op_genkey_result'.  The structure contains the following
+     ‘gpgme_op_genkey_result’.  The structure contains the following
      members:
 
-    `unsigned int primary : 1'
+     ‘unsigned int primary : 1’
           This is a flag that is set to 1 if a primary key was created
           and to 0 if not.
 
-    `unsigned int sub : 1'
-          This is a flag that is set to 1 if a subkey was created and
-          to 0 if not.
+     ‘unsigned int sub : 1’
+          This is a flag that is set to 1 if a subkey was created and to
+          0 if not.
 
-    `char *fpr'
+     ‘char *fpr’
           This is the fingerprint of the key that was created.  If both
-          a primary and a sub key were generated, the fingerprint of
-          the primary key will be returned.  If the crypto engine does
-          not provide the fingerprint, `fpr' will be a null pointer.
+          a primary and a sub key were generated, the fingerprint of the
+          primary key will be returned.  If the crypto engine does not
+          provide the fingerprint, ‘fpr’ will be a null pointer.
 
  -- Function: gpgme_genkey_result_t gpgme_op_genkey_result
           (gpgme_ctx_t CTX)
-     The function `gpgme_op_genkey_result' returns a
-     `gpgme_genkey_result_t' pointer to a structure holding the result
-     of a `gpgme_op_genkey' operation.  The pointer is only valid if the
-     last operation on the context was a `gpgme_op_genkey' or
-     `gpgme_op_genkey_start' operation, and if this operation finished
+     The function ‘gpgme_op_genkey_result’ returns a
+     ‘gpgme_genkey_result_t’ pointer to a structure holding the result
+     of a ‘gpgme_op_genkey’ operation.  The pointer is only valid if the
+     last operation on the context was a ‘gpgme_op_genkey’ or
+     ‘gpgme_op_genkey_start’ operation, and if this operation finished
      successfully.  The returned pointer is only valid until the next
      operation is started on the context.
 
@@ -3446,121 +3395,120 @@ File: gpgme.info,  Node: Exporting Keys,  Next: Importing Keys,  Prev: Generatin
 7.5.6 Exporting Keys
 --------------------
 
-Exporting keys means the same as running `gpg' with the command
-`--export'.  However, a mode flag can be used to change the way the
-export works.  The available mode flags are described below, they may
-be or-ed together.
+Exporting keys means the same as running ‘gpg’ with the command
+‘--export’.  However, a mode flag can be used to change the way the
+export works.  The available mode flags are described below, they may be
+or-ed together.
 
-`GPGME_EXPORT_MODE_EXTERN'
+‘GPGME_EXPORT_MODE_EXTERN’
      If this bit is set, the output is send directly to the default
-     keyserver. This is currently only allowed for OpenPGP keys.  It is
-     good practise to not send more than a few dozens key to a
-     keyserver at one time.  Using this flag requires that the KEYDATA
-     argument of the export function is set to `NULL'.
+     keyserver.  This is currently only allowed for OpenPGP keys.  It is
+     good practise to not send more than a few dozens key to a keyserver
+     at one time.  Using this flag requires that the KEYDATA argument of
+     the export function is set to ‘NULL’.
 
-`GPGME_EXPORT_MODE_MINIMAL'
+‘GPGME_EXPORT_MODE_MINIMAL’
      If this bit is set, the smallest possible key is exported.  For
      OpenPGP keys it removes all signatures except for the latest
      self-signatures.  For X.509 keys it has no effect.
 
-
  -- Function: gpgme_error_t gpgme_op_export (gpgme_ctx_t CTX,
           const char *PATTERN, gpgme_export_mode_t MODE,
           gpgme_data_t KEYDATA)
-     The function `gpgme_op_export' extracts public keys and returns
-     them in the data buffer KEYDATA.  The output format of the key
-     data returned is determined by the ASCII armor attribute set for
-     the context CTX, or, if that is not set, by the encoding specified
-     for KEYDATA.
+     The function ‘gpgme_op_export’ extracts public keys and returns
+     them in the data buffer KEYDATA.  The output format of the key data
+     returned is determined by the ASCII armor attribute set for the
+     context CTX, or, if that is not set, by the encoding specified for
+     KEYDATA.
 
-     If PATTERN is `NULL', all available keys are returned.  Otherwise,
+     If PATTERN is ‘NULL’, all available keys are returned.  Otherwise,
      PATTERN contains an engine specific expression that is used to
      limit the list to all keys matching the pattern.
 
      MODE is usually 0; other values are described above.
 
-     The function returns the error code `GPG_ERR_NO_ERROR' if the
-     operation completed successfully, `GPG_ERR_INV_VALUE' if KEYDATA
-     is not a valid empty data buffer, and passes through any errors
-     that are reported by the crypto engine support routines.
+     The function returns the error code ‘GPG_ERR_NO_ERROR’ if the
+     operation completed successfully, ‘GPG_ERR_INV_VALUE’ if KEYDATA is
+     not a valid empty data buffer, and passes through any errors that
+     are reported by the crypto engine support routines.
 
  -- Function: gpgme_error_t gpgme_op_export_start (gpgme_ctx_t CTX,
           const char *PATTERN, gpgme_export_mode_t MODE,
           gpgme_data_t KEYDATA)
-     The function `gpgme_op_export_start' initiates a `gpgme_op_export'
-     operation.  It can be completed by calling `gpgme_wait' on the
+     The function ‘gpgme_op_export_start’ initiates a ‘gpgme_op_export’
+     operation.  It can be completed by calling ‘gpgme_wait’ on the
      context.  *Note Waiting For Completion::.
 
-     The function returns the error code `GPG_ERR_NO_ERROR' if the
-     operation could be started successfully, and `GPG_ERR_INV_VALUE'
-     if KEYDATA is not a valid empty data buffer.
+     The function returns the error code ‘GPG_ERR_NO_ERROR’ if the
+     operation could be started successfully, and ‘GPG_ERR_INV_VALUE’ if
+     KEYDATA is not a valid empty data buffer.
 
  -- Function: gpgme_error_t gpgme_op_export_ext (gpgme_ctx_t CTX,
           const char *PATTERN[], gpgme_export_mode_t MODE,
           gpgme_data_t KEYDATA)
-     The function `gpgme_op_export' extracts public keys and returns
-     them in the data buffer KEYDATA.  The output format of the key
-     data returned is determined by the ASCII armor attribute set for
-     the context CTX, or, if that is not set, by the encoding specified
-     for KEYDATA.
+     The function ‘gpgme_op_export’ extracts public keys and returns
+     them in the data buffer KEYDATA.  The output format of the key data
+     returned is determined by the ASCII armor attribute set for the
+     context CTX, or, if that is not set, by the encoding specified for
+     KEYDATA.
 
-     If PATTERN or *PATTERN is `NULL', all available keys are returned.
-     Otherwise, PATTERN is a `NULL' terminated array of strings that
-     are used to limit the list to all keys matching at least one of
-     the patterns verbatim.
+     If PATTERN or *PATTERN is ‘NULL’, all available keys are returned.
+     Otherwise, PATTERN is a ‘NULL’ terminated array of strings that are
+     used to limit the list to all keys matching at least one of the
+     patterns verbatim.
 
      MODE is usually 0; other values are described above.
 
-     The function returns the error code `GPG_ERR_NO_ERROR' if the
-     operation completed successfully, `GPG_ERR_INV_VALUE' if KEYDATA
-     is not a valid empty data buffer, and passes through any errors
-     that are reported by the crypto engine support routines.
+     The function returns the error code ‘GPG_ERR_NO_ERROR’ if the
+     operation completed successfully, ‘GPG_ERR_INV_VALUE’ if KEYDATA is
+     not a valid empty data buffer, and passes through any errors that
+     are reported by the crypto engine support routines.
 
  -- Function: gpgme_error_t gpgme_op_export_ext_start (gpgme_ctx_t CTX,
           const char *PATTERN[], gpgme_export_mode_t MODE,
           gpgme_data_t KEYDATA)
-     The function `gpgme_op_export_ext_start' initiates a
-     `gpgme_op_export_ext' operation.  It can be completed by calling
-     `gpgme_wait' on the context.  *Note Waiting For Completion::.
+     The function ‘gpgme_op_export_ext_start’ initiates a
+     ‘gpgme_op_export_ext’ operation.  It can be completed by calling
+     ‘gpgme_wait’ on the context.  *Note Waiting For Completion::.
 
-     The function returns the error code `GPG_ERR_NO_ERROR' if the
-     operation could be started successfully, and `GPG_ERR_INV_VALUE'
-     if KEYDATA is not a valid empty data buffer.
+     The function returns the error code ‘GPG_ERR_NO_ERROR’ if the
+     operation could be started successfully, and ‘GPG_ERR_INV_VALUE’ if
+     KEYDATA is not a valid empty data buffer.
 
  -- Function: gpgme_error_t gpgme_op_export_keys (gpgme_ctx_t CTX,
           gpgme_key_t keys[], gpgme_export_mode_t MODE,
           gpgme_data_t KEYDATA)
-     The function `gpgme_op_export_keys' extracts public keys and
+     The function ‘gpgme_op_export_keys’ extracts public keys and
      returns them in the data buffer KEYDATA.  The output format of the
      key data returned is determined by the ASCII armor attribute set
      for the context CTX, or, if that is not set, by the encoding
      specified for KEYDATA.
 
-     The keys to export are taken form the `NULL' terminated array
-     KEYS.  Only keys of the the currently selected protocol of CTX
-     which do have a fingerprint set are considered for export.  Other
-     keys specified by the KEYS are ignored.  In particular OpenPGP
-     keys retrieved via an external key listing are not included.
+     The keys to export are taken form the ‘NULL’ terminated array KEYS.
+     Only keys of the the currently selected protocol of CTX which do
+     have a fingerprint set are considered for export.  Other keys
+     specified by the KEYS are ignored.  In particular OpenPGP keys
+     retrieved via an external key listing are not included.
 
      MODE is usually 0; other values are described above.
 
-     The function returns the error code `GPG_ERR_NO_ERROR' if the
-     operation completed successfully, `GPG_ERR_INV_VALUE' if KEYDATA
-     is not a valid empty data buffer, `GPG_ERR_NO_DATA' if no useful
-     keys are in KEYS and passes through any errors that are reported
-     by the crypto engine support routines.
+     The function returns the error code ‘GPG_ERR_NO_ERROR’ if the
+     operation completed successfully, ‘GPG_ERR_INV_VALUE’ if KEYDATA is
+     not a valid empty data buffer, ‘GPG_ERR_NO_DATA’ if no useful keys
+     are in KEYS and passes through any errors that are reported by the
+     crypto engine support routines.
 
- -- Function: gpgme_error_t gpgme_op_export_keys_start
-          (gpgme_ctx_t CTX, gpgme_key_t KEYS[],
-          gpgme_export_mode_t MODE, gpgme_data_t KEYDATA)
-     The function `gpgme_op_export_keys_start' initiates a
-     `gpgme_op_export_ext' operation.  It can be completed by calling
-     `gpgme_wait' on the context.  *Note Waiting For Completion::.
-
-     The function returns the error code `GPG_ERR_NO_ERROR' if the
-     operation could be started successfully, and `GPG_ERR_INV_VALUE'
-     if KEYDATA is not a valid empty data buffer, `GPG_ERR_NO_DATA' if
-     no useful keys are in KEYS and passes through any errors that are
+ -- Function: gpgme_error_t gpgme_op_export_keys_start (gpgme_ctx_t CTX,
+          gpgme_key_t KEYS[], gpgme_export_mode_t MODE,
+          gpgme_data_t KEYDATA)
+     The function ‘gpgme_op_export_keys_start’ initiates a
+     ‘gpgme_op_export_ext’ operation.  It can be completed by calling
+     ‘gpgme_wait’ on the context.  *Note Waiting For Completion::.
+
+     The function returns the error code ‘GPG_ERR_NO_ERROR’ if the
+     operation could be started successfully, and ‘GPG_ERR_INV_VALUE’ if
+     KEYDATA is not a valid empty data buffer, ‘GPG_ERR_NO_DATA’ if no
+     useful keys are in KEYS and passes through any errors that are
      reported by the crypto engine support routines.
 
 
@@ -3569,44 +3517,44 @@ File: gpgme.info,  Node: Importing Keys,  Next: Deleting Keys,  Prev: Exporting
 7.5.7 Importing Keys
 --------------------
 
-Importing keys means the same as running `gpg' with the command
-`--import'.
+Importing keys means the same as running ‘gpg’ with the command
+‘--import’.
 
  -- Function: gpgme_error_t gpgme_op_import (gpgme_ctx_t CTX,
           gpgme_data_t KEYDATA)
-     The function `gpgme_op_import' adds the keys in the data buffer
+     The function ‘gpgme_op_import’ adds the keys in the data buffer
      KEYDATA to the key ring of the crypto engine used by CTX.  The
      format of KEYDATA can be ASCII armored, for example, but the
      details are specific to the crypto engine.
 
      After the operation completed successfully, the result can be
-     retrieved with `gpgme_op_import_result'.
+     retrieved with ‘gpgme_op_import_result’.
 
-     The function returns the error code `GPG_ERR_NO_ERROR' if the
-     import was completed successfully, `GPG_ERR_INV_VALUE' if KEYDATA
-     if CTX or KEYDATA is not a valid pointer, and `GPG_ERR_NO_DATA' if
+     The function returns the error code ‘GPG_ERR_NO_ERROR’ if the
+     import was completed successfully, ‘GPG_ERR_INV_VALUE’ if KEYDATA
+     if CTX or KEYDATA is not a valid pointer, and ‘GPG_ERR_NO_DATA’ if
      KEYDATA is an empty data buffer.
 
  -- Function: gpgme_error_t gpgme_op_import_start (gpgme_ctx_t CTX,
           gpgme_data_t KEYDATA)
-     The function `gpgme_op_import_start' initiates a `gpgme_op_import'
-     operation.  It can be completed by calling `gpgme_wait' on the
+     The function ‘gpgme_op_import_start’ initiates a ‘gpgme_op_import’
+     operation.  It can be completed by calling ‘gpgme_wait’ on the
      context.  *Note Waiting For Completion::.
 
-     The function returns the error code `GPG_ERR_NO_ERROR' if the
-     import could be started successfully, `GPG_ERR_INV_VALUE' if
+     The function returns the error code ‘GPG_ERR_NO_ERROR’ if the
+     import could be started successfully, ‘GPG_ERR_INV_VALUE’ if
      KEYDATA if CTX or KEYDATA is not a valid pointer, and
-     `GPG_ERR_NO_DATA' if KEYDATA is an empty data buffer.
+     ‘GPG_ERR_NO_DATA’ if KEYDATA is an empty data buffer.
 
  -- Function: gpgme_error_t gpgme_op_import_keys (gpgme_ctx_t CTX,
           gpgme_key_t *KEYS)
-     The function `gpgme_op_import_keys' adds the keys described by the
-     `NULL' terminated array KEYS to the key ring of the crypto engine
+     The function ‘gpgme_op_import_keys’ adds the keys described by the
+     ‘NULL’ terminated array KEYS to the key ring of the crypto engine
      used by CTX.  This function is the general interface to move a key
      from one crypto engine to another as long as they are compatible.
-     In particular it is used to actually import and make keys
-     permanent which have been retrieved from an external source (i.e.
-     using `GPGME_KEYLIST_MODE_EXTERN').  (1)
+     In particular it is used to actually import and make keys permanent
+     which have been retrieved from an external source (i.e.  using
+     ‘GPGME_KEYLIST_MODE_EXTERN’).  (1)
 
      Only keys of the the currently selected protocol of CTX are
      considered for import.  Other keys specified by the KEYS are
@@ -3615,131 +3563,131 @@ Importing keys means the same as running `gpg' with the command
      identical.
 
      After the operation completed successfully, the result can be
-     retrieved with `gpgme_op_import_result'.
-
-     The function returns the error code `GPG_ERR_NO_ERROR' if the
-     import was completed successfully, `GPG_ERR_INV_VALUE' if KEYDATA
-     if CTX or KEYDATA is not a valid pointer, `GPG_ERR_CONFLICT' if
-     the key listing mode does not match, and `GPG_ERR_NO_DATA' if no
-     keys are considered for export.
-
- -- Function: gpgme_error_t gpgme_op_import_keys_start
-          (gpgme_ctx_t CTX, gpgme_key_t *KEYS)
-     The function `gpgme_op_import_keys_start' initiates a
-     `gpgme_op_import_keys' operation.  It can be completed by calling
-     `gpgme_wait' on the context.  *Note Waiting For Completion::.
-
-     The function returns the error code `GPG_ERR_NO_ERROR' if the
-     import was completed successfully, `GPG_ERR_INV_VALUE' if KEYDATA
-     if CTX or KEYDATA is not a valid pointer, `GPG_ERR_CONFLICT' if
-     the key listing mode does not match, and `GPG_ERR_NO_DATA' if no
-     keys are considered for export.
+     retrieved with ‘gpgme_op_import_result’.
+
+     The function returns the error code ‘GPG_ERR_NO_ERROR’ if the
+     import was completed successfully, ‘GPG_ERR_INV_VALUE’ if KEYDATA
+     if CTX or KEYDATA is not a valid pointer, ‘GPG_ERR_CONFLICT’ if the
+     key listing mode does not match, and ‘GPG_ERR_NO_DATA’ if no keys
+     are considered for export.
+
+ -- Function: gpgme_error_t gpgme_op_import_keys_start (gpgme_ctx_t CTX,
+          gpgme_key_t *KEYS)
+     The function ‘gpgme_op_import_keys_start’ initiates a
+     ‘gpgme_op_import_keys’ operation.  It can be completed by calling
+     ‘gpgme_wait’ on the context.  *Note Waiting For Completion::.
+
+     The function returns the error code ‘GPG_ERR_NO_ERROR’ if the
+     import was completed successfully, ‘GPG_ERR_INV_VALUE’ if KEYDATA
+     if CTX or KEYDATA is not a valid pointer, ‘GPG_ERR_CONFLICT’ if the
+     key listing mode does not match, and ‘GPG_ERR_NO_DATA’ if no keys
+     are considered for export.
 
  -- Data type: gpgme_import_status_t
-     This is a pointer to a structure used to store a part of the
-     result of a `gpgme_op_import' operation.  For each considered key
-     one status is added that contains information about the result of
-     the import.  The structure contains the following members:
+     This is a pointer to a structure used to store a part of the result
+     of a ‘gpgme_op_import’ operation.  For each considered key one
+     status is added that contains information about the result of the
+     import.  The structure contains the following members:
 
-    `gpgme_import_status_t next'
+     ‘gpgme_import_status_t next’
           This is a pointer to the next status structure in the linked
-          list, or `NULL' if this is the last element.
+          list, or ‘NULL’ if this is the last element.
 
-    `char *fpr'
+     ‘char *fpr’
           This is the fingerprint of the key that was considered.
 
-    `gpgme_error_t result'
-          If the import was not successful, this is the error value
-          that caused the import to fail.  Otherwise the error code is
-          `GPG_ERR_NO_ERROR'.
+     ‘gpgme_error_t result’
+          If the import was not successful, this is the error value that
+          caused the import to fail.  Otherwise the error code is
+          ‘GPG_ERR_NO_ERROR’.
 
-    `unsigned int status'
+     ‘unsigned int status’
           This is a bit-wise OR of the following flags that give more
           information about what part of the key was imported.  If the
           key was already known, this might be 0.
 
-         `GPGME_IMPORT_NEW'
+          ‘GPGME_IMPORT_NEW’
                The key was new.
 
-         `GPGME_IMPORT_UID'
+          ‘GPGME_IMPORT_UID’
                The key contained new user IDs.
 
-         `GPGME_IMPORT_SIG'
+          ‘GPGME_IMPORT_SIG’
                The key contained new signatures.
 
-         `GPGME_IMPORT_SUBKEY'
+          ‘GPGME_IMPORT_SUBKEY’
                The key contained new sub keys.
 
-         `GPGME_IMPORT_SECRET'
+          ‘GPGME_IMPORT_SECRET’
                The key contained a secret key.
 
  -- Data type: gpgme_import_result_t
      This is a pointer to a structure used to store the result of a
-     `gpgme_op_import' operation.  After a successful import operation,
+     ‘gpgme_op_import’ operation.  After a successful import operation,
      you can retrieve the pointer to the result with
-     `gpgme_op_import_result'.  The structure contains the following
+     ‘gpgme_op_import_result’.  The structure contains the following
      members:
 
-    `int considered'
+     ‘int considered’
           The total number of considered keys.
 
-    `int no_user_id'
+     ‘int no_user_id’
           The number of keys without user ID.
 
-    `int imported'
+     ‘int imported’
           The total number of imported keys.
 
-    `imported_rsa'
+     ‘imported_rsa’
           The number of imported RSA keys.
 
-    `unchanged'
+     ‘unchanged’
           The number of unchanged keys.
 
-    `new_user_ids'
+     ‘new_user_ids’
           The number of new user IDs.
 
-    `new_sub_keys'
+     ‘new_sub_keys’
           The number of new sub keys.
 
-    `new_signatures'
+     ‘new_signatures’
           The number of new signatures.
 
-    `new_revocations'
+     ‘new_revocations’
           The number of new revocations.
 
-    `secret_read'
+     ‘secret_read’
           The total number of secret keys read.
 
-    `secret_imported'
+     ‘secret_imported’
           The number of imported secret keys.
 
-    `secret_unchanged'
+     ‘secret_unchanged’
           The number of unchanged secret keys.
 
-    `not_imported'
+     ‘not_imported’
           The number of keys not imported.
 
-    `gpgme_import_status_t imports'
+     ‘gpgme_import_status_t imports’
           A list of gpgme_import_status_t objects which contain more
           information about the keys for which an import was attempted.
 
  -- Function: gpgme_import_result_t gpgme_op_import_result
           (gpgme_ctx_t CTX)
-     The function `gpgme_op_import_result' returns a
-     `gpgme_import_result_t' pointer to a structure holding the result
-     of a `gpgme_op_import' operation.  The pointer is only valid if
-     the last operation on the context was a `gpgme_op_import' or
-     `gpgme_op_import_start' operation, and if this operation finished
+     The function ‘gpgme_op_import_result’ returns a
+     ‘gpgme_import_result_t’ pointer to a structure holding the result
+     of a ‘gpgme_op_import’ operation.  The pointer is only valid if the
+     last operation on the context was a ‘gpgme_op_import’ or
+     ‘gpgme_op_import_start’ operation, and if this operation finished
      successfully.  The returned pointer is only valid until the next
      operation is started on the context.
 
    The following interface is deprecated and only provided for backward
-compatibility.  Don't use it.  It will be removed in a future version
-of GPGME.
+compatibility.  Don’t use it.  It will be removed in a future version of
+GPGME.
 
  -- Function: gpgme_error_t gpgme_op_import_ext (gpgme_ctx_t CTX,
           gpgme_data_t KEYDATA, int *NR)
-     The function `gpgme_op_import_ext' is equivalent to:
+     The function ‘gpgme_op_import_ext’ is equivalent to:
 
             gpgme_error_t err = gpgme_op_import (ctx, keydata);
             if (!err)
@@ -3761,26 +3709,26 @@ File: gpgme.info,  Node: Deleting Keys,  Next: Changing Passphrases,  Prev: Impo
 
  -- Function: gpgme_error_t gpgme_op_delete (gpgme_ctx_t CTX,
           const gpgme_key_t KEY, int ALLOW_SECRET)
-     The function `gpgme_op_delete' deletes the key KEY from the key
-     ring of the crypto engine used by CTX.  If ALLOW_SECRET is `0',
+     The function ‘gpgme_op_delete’ deletes the key KEY from the key
+     ring of the crypto engine used by CTX.  If ALLOW_SECRET is ‘0’,
      only public keys are deleted, otherwise secret keys are deleted as
      well, if that is supported.
 
-     The function returns the error code `GPG_ERR_NO_ERROR' if the key
-     was deleted successfully, `GPG_ERR_INV_VALUE' if CTX or KEY is not
-     a valid pointer, `GPG_ERR_NO_PUBKEY' if KEY could not be found in
-     the keyring, `GPG_ERR_AMBIGUOUS_NAME' if the key was not specified
-     unambiguously, and `GPG_ERR_CONFLICT' if the secret key for KEY is
+     The function returns the error code ‘GPG_ERR_NO_ERROR’ if the key
+     was deleted successfully, ‘GPG_ERR_INV_VALUE’ if CTX or KEY is not
+     a valid pointer, ‘GPG_ERR_NO_PUBKEY’ if KEY could not be found in
+     the keyring, ‘GPG_ERR_AMBIGUOUS_NAME’ if the key was not specified
+     unambiguously, and ‘GPG_ERR_CONFLICT’ if the secret key for KEY is
      available, but ALLOW_SECRET is zero.
 
  -- Function: gpgme_error_t gpgme_op_delete_start (gpgme_ctx_t CTX,
           const gpgme_key_t KEY, int ALLOW_SECRET)
-     The function `gpgme_op_delete_start' initiates a `gpgme_op_delete'
-     operation.  It can be completed by calling `gpgme_wait' on the
+     The function ‘gpgme_op_delete_start’ initiates a ‘gpgme_op_delete’
+     operation.  It can be completed by calling ‘gpgme_wait’ on the
      context.  *Note Waiting For Completion::.
 
-     The function returns the error code `GPG_ERR_NO_ERROR' if the
-     operation was started successfully, and `GPG_ERR_INV_VALUE' if CTX
+     The function returns the error code ‘GPG_ERR_NO_ERROR’ if the
+     operation was started successfully, and ‘GPG_ERR_INV_VALUE’ if CTX
      or KEY is not a valid pointer.
 
 
@@ -3791,23 +3739,25 @@ File: gpgme.info,  Node: Changing Passphrases,  Next: Advanced Key Editing,  Pre
 
  -- Function: gpgme_error_t gpgme_op_passwd (gpgme_ctx_t CTX,
           const gpgme_key_t KEY, unsigned int FLAGS)
-     The function `gpgme_op_passwd' changes the passphrase of the
+
+     The function ‘gpgme_op_passwd’ changes the passphrase of the
      private key associated with KEY.  The only allowed value for FLAGS
-     is `0'.  The backend engine will usually popup a window to ask for
+     is ‘0’.  The backend engine will usually popup a window to ask for
      the old and the new passphrase.  Thus this function is not useful
      in a server application (where passphrases are not required
      anyway).
 
-     Note that old `gpg' engines (before version 2.0.15) do not support
+     Note that old ‘gpg’ engines (before version 2.0.15) do not support
      this command and will silently ignore it.
 
  -- Function: gpgme_error_t gpgme_op_passwd_start (gpgme_ctx_t CTX,
           const gpgme_key_t KEY, unsigned int FLAGS)
-     The function `gpgme_op_passwd_start' initiates a `gpgme_op_passwd'
-     operation.    It can be completed by calling `gpgme_wait' on the
+
+     The function ‘gpgme_op_passwd_start’ initiates a ‘gpgme_op_passwd’
+     operation.  It can be completed by calling ‘gpgme_wait’ on the
      context.  *Note Waiting For Completion::.
 
-     The function returns `0' if the operation was started successfully,
+     The function returns ‘0’ if the operation was started successfully,
      and an error code if one of the arguments is not valid or the
      oepration could not be started.
 
@@ -3818,8 +3768,8 @@ File: gpgme.info,  Node: Advanced Key Editing,  Prev: Changing Passphrases,  Up:
 ---------------------------
 
  -- Data type: gpgme_error_t (*gpgme_edit_cb_t) (void *HANDLE,
-gpgme_status_code_t STATUS, const char *ARGS, int FD)
-     The `gpgme_edit_cb_t' type is the type of functions which GPGME
+          gpgme_status_code_t STATUS, const char *ARGS, int FD)
+     The ‘gpgme_edit_cb_t’ type is the type of functions which GPGME
      calls if it a key edit operation is on-going.  The status code
      STATUS and the argument line ARGS are passed through by GPGME from
      the crypto engine.  The file descriptor FD is -1 for normal status
@@ -3827,12 +3777,12 @@ gpgme_status_code_t STATUS, const char *ARGS, int FD)
      message, the response to the command should be written to FD.  The
      HANDLE is provided by the user at start of operation.
 
-     The function should return `GPG_ERR_NO_ERROR' or an error value.
+     The function should return ‘GPG_ERR_NO_ERROR’ or an error value.
 
  -- Function: gpgme_error_t gpgme_op_edit (gpgme_ctx_t CTX,
           gpgme_key_t KEY, gpgme_edit_cb_t FNC, void *HANDLE,
           gpgme_data_t OUT)
-     The function `gpgme_op_edit' processes the key KEY interactively,
+     The function ‘gpgme_op_edit’ processes the key KEY interactively,
      using the edit callback function FNC with the handle HANDLE.  The
      callback is invoked for every status and command request from the
      crypto engine.  The output of the crypto engine is written to the
@@ -3842,38 +3792,38 @@ gpgme_status_code_t STATUS, const char *ARGS, int FD)
      engine is specific to the crypto engine and no further support in
      implementing this protocol correctly is provided by GPGME.
 
-     The function returns the error code `GPG_ERR_NO_ERROR' if the edit
-     operation completes successfully, `GPG_ERR_INV_VALUE' if CTX or
-     KEY is not a valid pointer, and any error returned by the crypto
-     engine or the edit callback handler.
+     The function returns the error code ‘GPG_ERR_NO_ERROR’ if the edit
+     operation completes successfully, ‘GPG_ERR_INV_VALUE’ if CTX or KEY
+     is not a valid pointer, and any error returned by the crypto engine
+     or the edit callback handler.
 
  -- Function: gpgme_error_t gpgme_op_edit_start (gpgme_ctx_t CTX,
           gpgme_key_t KEY, gpgme_edit_cb_t FNC, void *HANDLE,
           gpgme_data_t OUT)
-     The function `gpgme_op_edit_start' initiates a `gpgme_op_edit'
-     operation.  It can be completed by calling `gpgme_wait' on the
+     The function ‘gpgme_op_edit_start’ initiates a ‘gpgme_op_edit’
+     operation.  It can be completed by calling ‘gpgme_wait’ on the
      context.  *Note Waiting For Completion::.
 
-     The function returns the error code `GPG_ERR_NO_ERROR' if the
-     operation was started successfully, and `GPG_ERR_INV_VALUE' if CTX
+     The function returns the error code ‘GPG_ERR_NO_ERROR’ if the
+     operation was started successfully, and ‘GPG_ERR_INV_VALUE’ if CTX
      or KEY is not a valid pointer.
 
  -- Function: gpgme_error_t gpgme_op_card_edit (gpgme_ctx_t CTX,
           gpgme_key_t KEY, gpgme_edit_cb_t FNC, void *HANDLE,
           gpgme_data_t OUT)
-     The function `gpgme_op_card_edit' is analogous to `gpgme_op_edit',
+     The function ‘gpgme_op_card_edit’ is analogous to ‘gpgme_op_edit’,
      but should be used to process the smart card corresponding to the
      key KEY.
 
  -- Function: gpgme_error_t gpgme_op_card_edit_start (gpgme_ctx_t CTX,
           gpgme_key_t KEY, gpgme_edit_cb_t FNC, void *HANDLE,
           gpgme_data_t OUT)
-     The function `gpgme_op_card_edit_start' initiates a
-     `gpgme_op_card_edit' operation.  It can be completed by calling
-     `gpgme_wait' on the context.  *Note Waiting For Completion::.
+     The function ‘gpgme_op_card_edit_start’ initiates a
+     ‘gpgme_op_card_edit’ operation.  It can be completed by calling
+     ‘gpgme_wait’ on the context.  *Note Waiting For Completion::.
 
-     The function returns the error code `GPG_ERR_NO_ERROR' if the
-     operation was started successfully, and `GPG_ERR_INV_VALUE' if CTX
+     The function returns the error code ‘GPG_ERR_NO_ERROR’ if the
+     operation was started successfully, and ‘GPG_ERR_INV_VALUE’ if CTX
      or KEY is not a valid pointer.
 
 
@@ -3885,28 +3835,28 @@ File: gpgme.info,  Node: Trust Item Management,  Next: Crypto Operations,  Prev:
 *Caution:* The trust items interface is experimental.
 
  -- Data type: gpgme_trust_item_t
-     The `gpgme_trust_item_t' type is a pointer to a trust item object.
+     The ‘gpgme_trust_item_t’ type is a pointer to a trust item object.
      It has the following members:
 
-    `char *keyid'
+     ‘char *keyid’
           This is a string describing the key to which this trust items
           belongs.
 
-    `int type'
+     ‘int type’
           This is the type of the trust item.  A value of 1 refers to a
           key, a value of 2 refers to a user ID.
 
-    `int level'
+     ‘int level’
           This is the trust level.
 
-    `char *owner_trust'
-          The owner trust if `type' is 1.
+     ‘char *owner_trust’
+          The owner trust if ‘type’ is 1.
 
-    `char *validity'
+     ‘char *validity’
           The calculated validity.
 
-    `char *name'
-          The user name if `type' is 2.
+     ‘char *name’
+          The user name if ‘type’ is 2.
 
 * Menu:
 
@@ -3922,10 +3872,10 @@ File: gpgme.info,  Node: Listing Trust Items,  Next: Information About Trust Ite
 
  -- Function: gpgme_error_t gpgme_op_trustlist_start (gpgme_ctx_t CTX,
           const char *PATTERN, int MAX_LEVEL)
-     The function `gpgme_op_trustlist_start' initiates a trust item
-     listing operation inside the context CTX.  It sets everything up
-     so that subsequent invocations of `gpgme_op_trustlist_next' return
-     the trust items in the list.
+     The function ‘gpgme_op_trustlist_start’ initiates a trust item
+     listing operation inside the context CTX.  It sets everything up so
+     that subsequent invocations of ‘gpgme_op_trustlist_next’ return the
+     trust items in the list.
 
      The string PATTERN contains an engine specific expression that is
      used to limit the list to all trust items matching the pattern.  It
@@ -3934,36 +3884,36 @@ File: gpgme.info,  Node: Listing Trust Items,  Next: Information About Trust Ite
      The argument MAX_LEVEL is currently ignored.
 
      The context will be busy until either all trust items are received
-     (and `gpgme_op_trustlist_next' returns `GPG_ERR_EOF'), or
-     `gpgme_op_trustlist_end' is called to finish the operation.
+     (and ‘gpgme_op_trustlist_next’ returns ‘GPG_ERR_EOF’), or
+     ‘gpgme_op_trustlist_end’ is called to finish the operation.
 
-     The function returns the error code `GPG_ERR_INV_VALUE' if CTX is
+     The function returns the error code ‘GPG_ERR_INV_VALUE’ if CTX is
      not a valid pointer, and passes through any errors that are
      reported by the crypto engine support routines.
 
  -- Function: gpgme_error_t gpgme_op_trustlist_next (gpgme_ctx_t CTX,
           gpgme_trust_item_t *R_ITEM)
-     The function `gpgme_op_trustlist_next' returns the next trust item
-     in the list created by a previous `gpgme_op_trustlist_start'
-     operation in the context CTX.  The trust item can be destroyed
-     with `gpgme_trust_item_release'.  *Note Manipulating Trust Items::.
+     The function ‘gpgme_op_trustlist_next’ returns the next trust item
+     in the list created by a previous ‘gpgme_op_trustlist_start’
+     operation in the context CTX.  The trust item can be destroyed with
+     ‘gpgme_trust_item_release’.  *Note Manipulating Trust Items::.
 
-     This is the only way to get at `gpgme_trust_item_t' objects in
+     This is the only way to get at ‘gpgme_trust_item_t’ objects in
      GPGME.
 
      If the last trust item in the list has already been returned,
-     `gpgme_op_trustlist_next' returns `GPG_ERR_EOF'.
+     ‘gpgme_op_trustlist_next’ returns ‘GPG_ERR_EOF’.
 
-     The function returns the error code `GPG_ERR_INV_VALUE' if CTX or
-     R_ITEM is not a valid pointer, and `GPG_ERR_ENOMEM' if there is
-     not enough memory for the operation.
+     The function returns the error code ‘GPG_ERR_INV_VALUE’ if CTX or
+     R_ITEM is not a valid pointer, and ‘GPG_ERR_ENOMEM’ if there is not
+     enough memory for the operation.
 
  -- Function: gpgme_error_t gpgme_op_trustlist_end (gpgme_ctx_t CTX)
-     The function `gpgme_op_trustlist_end' ends a pending trust list
+     The function ‘gpgme_op_trustlist_end’ ends a pending trust list
      operation in the context CTX.
 
-     The function returns the error code `GPG_ERR_INV_VALUE' if CTX is
-     not a valid pointer, and `GPG_ERR_ENOMEM' if at some time during
+     The function returns the error code ‘GPG_ERR_INV_VALUE’ if CTX is
+     not a valid pointer, and ‘GPG_ERR_ENOMEM’ if at some time during
      the operation there was not enough memory available.
 
 
@@ -3973,7 +3923,7 @@ File: gpgme.info,  Node: Information About Trust Items,  Next: Manipulating Trus
 -----------------------------------
 
 The following interfaces are deprecated and only provided for backward
-compatibility.  Don't use them.  They will be removed in a future
+compatibility.  Don’t use them.  They will be removed in a future
 version of GPGME.
 
    Trust items have attributes which can be queried using the interfaces
@@ -3983,30 +3933,30 @@ attributes.  *Note Information About Keys::.
  -- Function: const char * gpgme_trust_item_get_string_attr
           (gpgme_trust_item_t ITEM, gpgme_attr_t WHAT,
           const void *RESERVED, int IDX)
-     The function `gpgme_trust_item_get_string_attr' returns the value
-     of the string-representable attribute WHAT of trust item ITEM.
-     The arguments IDX and RESERVED are reserved for later use and
-     should be `0' and `NULL' respectively.
+     The function ‘gpgme_trust_item_get_string_attr’ returns the value
+     of the string-representable attribute WHAT of trust item ITEM.  The
+     arguments IDX and RESERVED are reserved for later use and should be
+     ‘0’ and ‘NULL’ respectively.
 
      The string returned is only valid as long as the key is valid.
 
-     The function returns `0' if an attribute can't be returned as a
+     The function returns ‘0’ if an attribute can’t be returned as a
      string, KEY is not a valid pointer, IDX out of range, or RESERVED
-     not `NULL'.
+     not ‘NULL’.
 
  -- Function: int gpgme_trust_item_get_int_attr
           (gpgme_trust_item_t ITEM, gpgme_attr_t WHAT,
           const void *RESERVED, int IDX)
-     The function `gpgme_trust_item_get_int_attr' returns the value of
-     the number-representable attribute WHAT of trust item ITEM.  If
-     the attribute occurs more than once in the trust item, the index
-     is specified by IDX.  However, currently no such attribute exists,
-     so IDX should be `0'.  The argument RESERVED is reserved for later
-     use and should be `NULL'.
-
-     The function returns `0' if the attribute can't be returned as a
+     The function ‘gpgme_trust_item_get_int_attr’ returns the value of
+     the number-representable attribute WHAT of trust item ITEM.  If the
+     attribute occurs more than once in the trust item, the index is
+     specified by IDX.  However, currently no such attribute exists, so
+     IDX should be ‘0’.  The argument RESERVED is reserved for later use
+     and should be ‘NULL’.
+
+     The function returns ‘0’ if the attribute can’t be returned as a
      number, KEY is not a valid pointer, IDX out of range, or RESERVED
-     not `NULL'.
+     not ‘NULL’.
 
 
 File: gpgme.info,  Node: Manipulating Trust Items,  Prev: Information About Trust Items,  Up: Trust Item Management
@@ -4015,22 +3965,22 @@ File: gpgme.info,  Node: Manipulating Trust Items,  Prev: Information About Trus
 ------------------------------
 
  -- Function: void gpgme_trust_item_ref (gpgme_trust_item_t ITEM)
-     The function `gpgme_trust_item_ref' acquires an additional
+     The function ‘gpgme_trust_item_ref’ acquires an additional
      reference for the trust item ITEM.
 
  -- Function: void gpgme_trust_item_unref (gpgme_trust_item_t ITEM)
-     The function `gpgme_trust_item_unref' releases a reference for the
+     The function ‘gpgme_trust_item_unref’ releases a reference for the
      trust item ITEM.  If this was the last reference, the trust item
      will be destroyed and all resources associated to it will be
      released.
 
    The following interface is deprecated and only provided for backward
-compatibility.  Don't use it.  It will be removed in a future version
-of GPGME.
+compatibility.  Don’t use it.  It will be removed in a future version of
+GPGME.
 
  -- Function: void gpgme_trust_item_release (gpgme_trust_item_t ITEM)
-     The function `gpgme_trust_item_release' is an alias for
-     `gpgme_trust_item_unref'.
+     The function ‘gpgme_trust_item_release’ is an alias for
+     ‘gpgme_trust_item_unref’.
 
 
 File: gpgme.info,  Node: Crypto Operations,  Next: Miscellaneous,  Prev: Trust Item Management,  Up: Contexts
@@ -4043,18 +3993,18 @@ keys encountered in processing the request.  The following structure is
 used to hold information about such a key.
 
  -- Data type: gpgme_invalid_key_t
-     This is a pointer to a structure used to store a part of the
-     result of a crypto operation which takes user IDs as one input
-     parameter.  The structure contains the following members:
+     This is a pointer to a structure used to store a part of the result
+     of a crypto operation which takes user IDs as one input parameter.
+     The structure contains the following members:
 
-    `gpgme_invalid_key_t next'
+     ‘gpgme_invalid_key_t next’
           This is a pointer to the next invalid key structure in the
-          linked list, or `NULL' if this is the last element.
+          linked list, or ‘NULL’ if this is the last element.
 
-    `char *fpr'
+     ‘char *fpr’
           The fingerprint or key ID of the invalid key encountered.
 
-    `gpgme_error_t reason'
+     ‘gpgme_error_t reason’
           An error code describing the reason why the key was found
           invalid.
 
@@ -4074,82 +4024,82 @@ File: gpgme.info,  Node: Decrypt,  Next: Verify,  Up: Crypto Operations
 
  -- Function: gpgme_error_t gpgme_op_decrypt (gpgme_ctx_t CTX,
           gpgme_data_t CIPHER, gpgme_data_t PLAIN)
-     The function `gpgme_op_decrypt' decrypts the ciphertext in the
-     data object CIPHER and stores it into the data object PLAIN.
+     The function ‘gpgme_op_decrypt’ decrypts the ciphertext in the data
+     object CIPHER and stores it into the data object PLAIN.
 
-     The function returns the error code `GPG_ERR_NO_ERROR' if the
-     ciphertext could be decrypted successfully, `GPG_ERR_INV_VALUE' if
-     CTX, CIPHER or PLAIN is not a valid pointer, `GPG_ERR_NO_DATA' if
+     The function returns the error code ‘GPG_ERR_NO_ERROR’ if the
+     ciphertext could be decrypted successfully, ‘GPG_ERR_INV_VALUE’ if
+     CTX, CIPHER or PLAIN is not a valid pointer, ‘GPG_ERR_NO_DATA’ if
      CIPHER does not contain any data to decrypt,
-     `GPG_ERR_DECRYPT_FAILED' if CIPHER is not a valid cipher text,
-     `GPG_ERR_BAD_PASSPHRASE' if the passphrase for the secret key
-     could not be retrieved, and passes through any errors that are
-     reported by the crypto engine support routines.
+     ‘GPG_ERR_DECRYPT_FAILED’ if CIPHER is not a valid cipher text,
+     ‘GPG_ERR_BAD_PASSPHRASE’ if the passphrase for the secret key could
+     not be retrieved, and passes through any errors that are reported
+     by the crypto engine support routines.
 
  -- Function: gpgme_error_t gpgme_op_decrypt_start (gpgme_ctx_t CTX,
           gpgme_data_t CIPHER, gpgme_data_t PLAIN)
-     The function `gpgme_op_decrypt_start' initiates a
-     `gpgme_op_decrypt' operation.  It can be completed by calling
-     `gpgme_wait' on the context.  *Note Waiting For Completion::.
+     The function ‘gpgme_op_decrypt_start’ initiates a
+     ‘gpgme_op_decrypt’ operation.  It can be completed by calling
+     ‘gpgme_wait’ on the context.  *Note Waiting For Completion::.
 
-     The function returns the error code `GPG_ERR_NO_ERROR' if the
-     operation could be started successfully, and `GPG_ERR_INV_VALUE'
-     if CIPHER or PLAIN is not a valid pointer.
+     The function returns the error code ‘GPG_ERR_NO_ERROR’ if the
+     operation could be started successfully, and ‘GPG_ERR_INV_VALUE’ if
+     CIPHER or PLAIN is not a valid pointer.
 
  -- Data type: gpgme_recipient_t
      This is a pointer to a structure used to store information about
      the recipient of an encrypted text which is decrypted in a
-     `gpgme_op_decrypt' operation.  This information (except for the
+     ‘gpgme_op_decrypt’ operation.  This information (except for the
      status field) is even available before the operation finished
      successfully, for example in a passphrase callback.  The structure
      contains the following members:
 
-    `gpgme_recipient_t next'
+     ‘gpgme_recipient_t next’
           This is a pointer to the next recipient structure in the
-          linked list, or `NULL' if this is the last element.
+          linked list, or ‘NULL’ if this is the last element.
 
-    `gpgme_pubkey_algo_t'
+     ‘gpgme_pubkey_algo_t’
           The public key algorithm used in the encryption.
 
-    `char *keyid'
+     ‘char *keyid’
           This is the key ID of the key (in hexadecimal digits) used as
           recipient.
 
-    `gpgme_error_t status'
+     ‘gpgme_error_t status’
           This is an error number with the error code GPG_ERR_NO_SECKEY
           if the secret key for this recipient is not available, and 0
           otherwise.
 
  -- Data type: gpgme_decrypt_result_t
      This is a pointer to a structure used to store the result of a
-     `gpgme_op_decrypt' operation.  After successfully decrypting data,
+     ‘gpgme_op_decrypt’ operation.  After successfully decrypting data,
      you can retrieve the pointer to the result with
-     `gpgme_op_decrypt_result'.  The structure contains the following
+     ‘gpgme_op_decrypt_result’.  The structure contains the following
      members:
 
-    `char *unsupported_algorithm'
+     ‘char *unsupported_algorithm’
           If an unsupported algorithm was encountered, this string
           describes the algorithm that is not supported.
 
-    `unsigned int wrong_key_usage : 1'
+     ‘unsigned int wrong_key_usage : 1’
           This is true if the key was not used according to its policy.
 
-    `gpgme_recipient_t recipients'
+     ‘gpgme_recipient_t recipients’
           This is a linked list of recipients to which this message was
           encrypted.
 
-    `char *file_name'
-          This is the filename of the original plaintext message file
-          if it is known, otherwise this is a null pointer.
+     ‘char *file_name’
+          This is the filename of the original plaintext message file if
+          it is known, otherwise this is a null pointer.
 
  -- Function: gpgme_decrypt_result_t gpgme_op_decrypt_result
           (gpgme_ctx_t CTX)
-     The function `gpgme_op_decrypt_result' returns a
-     `gpgme_decrypt_result_t' pointer to a structure holding the result
-     of a `gpgme_op_decrypt' operation.  The pointer is only valid if
-     the last operation on the context was a `gpgme_op_decrypt' or
-     `gpgme_op_decrypt_start' operation.  If the operation failed this
-     might be a `NULL' pointer.  The returned pointer is only valid
+     The function ‘gpgme_op_decrypt_result’ returns a
+     ‘gpgme_decrypt_result_t’ pointer to a structure holding the result
+     of a ‘gpgme_op_decrypt’ operation.  The pointer is only valid if
+     the last operation on the context was a ‘gpgme_op_decrypt’ or
+     ‘gpgme_op_decrypt_start’ operation.  If the operation failed this
+     might be a ‘NULL’ pointer.  The returned pointer is only valid
      until the next operation is started on the context.
 
 
@@ -4161,7 +4111,7 @@ File: gpgme.info,  Node: Verify,  Next: Decrypt and Verify,  Prev: Decrypt,  Up:
  -- Function: gpgme_error_t gpgme_op_verify (gpgme_ctx_t CTX,
           gpgme_data_t SIG, gpgme_data_t SIGNED_TEXT,
           gpgme_data_t PLAIN)
-     The function `gpgme_op_verify' verifies that the signature in the
+     The function ‘gpgme_op_verify’ verifies that the signature in the
      data object SIG is a valid signature.  If SIG is a detached
      signature, then the signed text should be provided in SIGNED_TEXT
      and PLAIN should be a null pointer.  Otherwise, if SIG is a normal
@@ -4170,318 +4120,312 @@ File: gpgme.info,  Node: Verify,  Next: Decrypt and Verify,  Prev: Decrypt,  Up:
      plaintext after successful verification.
 
      The results of the individual signature verifications can be
-     retrieved with `gpgme_op_verify_result'.
+     retrieved with ‘gpgme_op_verify_result’.
 
-     The function returns the error code `GPG_ERR_NO_ERROR' if the
-     operation could be completed successfully, `GPG_ERR_INV_VALUE' if
-     CTX, SIG or PLAIN is not a valid pointer, `GPG_ERR_NO_DATA' if SIG
+     The function returns the error code ‘GPG_ERR_NO_ERROR’ if the
+     operation could be completed successfully, ‘GPG_ERR_INV_VALUE’ if
+     CTX, SIG or PLAIN is not a valid pointer, ‘GPG_ERR_NO_DATA’ if SIG
      does not contain any data to verify, and passes through any errors
      that are reported by the crypto engine support routines.
 
  -- Function: gpgme_error_t gpgme_op_verify_start (gpgme_ctx_t CTX,
           gpgme_data_t SIG, gpgme_data_t SIGNED_TEXT,
           gpgme_data_t PLAIN)
-     The function `gpgme_op_verify_start' initiates a `gpgme_op_verify'
-     operation.  It can be completed by calling `gpgme_wait' on the
+     The function ‘gpgme_op_verify_start’ initiates a ‘gpgme_op_verify’
+     operation.  It can be completed by calling ‘gpgme_wait’ on the
      context.  *Note Waiting For Completion::.
 
-     The function returns the error code `GPG_ERR_NO_ERROR' if the
-     operation could be started successfully, `GPG_ERR_INV_VALUE' if
-     CTX, SIG or PLAIN is not a valid pointer, and `GPG_ERR_NO_DATA' if
+     The function returns the error code ‘GPG_ERR_NO_ERROR’ if the
+     operation could be started successfully, ‘GPG_ERR_INV_VALUE’ if
+     CTX, SIG or PLAIN is not a valid pointer, and ‘GPG_ERR_NO_DATA’ if
      SIG or PLAIN does not contain any data to verify.
 
  -- Data type: gpgme_sig_notation_t
-     This is a pointer to a structure used to store a part of the
-     result of a `gpgme_op_verify' operation.  The structure contains
-     the following members:
+     This is a pointer to a structure used to store a part of the result
+     of a ‘gpgme_op_verify’ operation.  The structure contains the
+     following members:
 
-    `gpgme_sig_notation_t next'
-          This is a pointer to the next new signature notation
-          structure in the linked list, or `NULL' if this is the last
-          element.
+     ‘gpgme_sig_notation_t next’
+          This is a pointer to the next new signature notation structure
+          in the linked list, or ‘NULL’ if this is the last element.
 
-    `char *name'
-          The name of the notation field.  If this is `NULL', then the
-          member `value' will contain a policy URL.
+     ‘char *name’
+          The name of the notation field.  If this is ‘NULL’, then the
+          member ‘value’ will contain a policy URL.
 
-    `int name_len'
-          The length of the `name' field.  For strings the length is
+     ‘int name_len’
+          The length of the ‘name’ field.  For strings the length is
           counted without the trailing binary zero.
 
-    `char *value'
-          The value of the notation field.  If `name' is `NULL', then
+     ‘char *value’
+          The value of the notation field.  If ‘name’ is ‘NULL’, then
           this is a policy URL.
 
-    `int value_len'
-          The length of the `value' field.  For strings the length is
+     ‘int value_len’
+          The length of the ‘value’ field.  For strings the length is
           counted without the trailing binary zero.
 
-    `gpgme_sig_notation_flags_t flags'
+     ‘gpgme_sig_notation_flags_t flags’
           The accumulated flags field.  This field contains the flags
-          associated with the notation data in an accumulated form
-          which can be used as an argument to the function
-          `gpgme_sig_notation_add'.  The value `flags' is a bitwise-or
+          associated with the notation data in an accumulated form which
+          can be used as an argument to the function
+          ‘gpgme_sig_notation_add’.  The value ‘flags’ is a bitwise-or
           combination of one or multiple of the following bit values:
 
-         `GPGME_SIG_NOTATION_HUMAN_READABLE'
-               The `GPGME_SIG_NOTATION_HUMAN_READABLE' symbol specifies
+          ‘GPGME_SIG_NOTATION_HUMAN_READABLE’
+               The ‘GPGME_SIG_NOTATION_HUMAN_READABLE’ symbol specifies
                that the notation data is in human readable form
 
-         `GPGME_SIG_NOTATION_CRITICAL'
-               The `GPGME_SIG_NOTATION_CRITICAL' symbol specifies that
+          ‘GPGME_SIG_NOTATION_CRITICAL’
+               The ‘GPGME_SIG_NOTATION_CRITICAL’ symbol specifies that
                the notation data is critical.
 
-
-    `unsigned int human_readable : 1'
-          This is true if the `GPGME_SIG_NOTATION_HUMAN_READABLE' flag
+     ‘unsigned int human_readable : 1’
+          This is true if the ‘GPGME_SIG_NOTATION_HUMAN_READABLE’ flag
           is set and false otherwise.  This flag is only valid for
           notation data, not for policy URLs.
 
-    `unsigned int critical : 1'
-          This is true if the `GPGME_SIG_NOTATION_CRITICAL' flag is set
-          and false otherwise.  This flag is valid for notation data
-          and policy URLs.
-
+     ‘unsigned int critical : 1’
+          This is true if the ‘GPGME_SIG_NOTATION_CRITICAL’ flag is set
+          and false otherwise.  This flag is valid for notation data and
+          policy URLs.
 
  -- Data type: gpgme_signature_t
-     This is a pointer to a structure used to store a part of the
-     result of a `gpgme_op_verify' operation.  The structure contains
-     the following members:
+     This is a pointer to a structure used to store a part of the result
+     of a ‘gpgme_op_verify’ operation.  The structure contains the
+     following members:
 
-    `gpgme_signature_t next'
+     ‘gpgme_signature_t next’
           This is a pointer to the next new signature structure in the
-          linked list, or `NULL' if this is the last element.
+          linked list, or ‘NULL’ if this is the last element.
 
-    `gpgme_sigsum_t summary'
-          This is a bit vector giving a summary of the signature
-          status.  It provides an easy interface to a defined semantic
-          of the signature status.  Checking just one bit is sufficient
-          to see whether a signature is valid without any restrictions.
+     ‘gpgme_sigsum_t summary’
+          This is a bit vector giving a summary of the signature status.
+          It provides an easy interface to a defined semantic of the
+          signature status.  Checking just one bit is sufficient to see
+          whether a signature is valid without any restrictions.
 
           The defined bits are:
-         `GPGME_SIGSUM_VALID'
+          ‘GPGME_SIGSUM_VALID’
                The signature is fully valid.
 
-         `GPGME_SIGSUM_GREEN'
+          ‘GPGME_SIGSUM_GREEN’
                The signature is good but one might want to display some
-               extra   information.  Check the other bits.
+               extra information.  Check the other bits.
 
-         `GPGME_SIGSUM_RED'
-               The signature is bad. It might be useful to check other
-               bits and   display more information, i.e. a revoked
-               certificate might not render a   signature invalid when
-               the message was received prior to the cause for   the
+          ‘GPGME_SIGSUM_RED’
+               The signature is bad.  It might be useful to check other
+               bits and display more information, i.e.  a revoked
+               certificate might not render a signature invalid when the
+               message was received prior to the cause for the
                revocation.
 
-         `GPGME_SIGSUM_KEY_REVOKED'
+          ‘GPGME_SIGSUM_KEY_REVOKED’
                The key or at least one certificate has been revoked.
 
-         `GPGME_SIGSUM_KEY_EXPIRED'
-               The key or one of the certificates has expired. It is
-               probably a good   idea to display the date of the
+          ‘GPGME_SIGSUM_KEY_EXPIRED’
+               The key or one of the certificates has expired.  It is
+               probably a good idea to display the date of the
                expiration.
 
-         `GPGME_SIGSUM_SIG_EXPIRED'
+          ‘GPGME_SIGSUM_SIG_EXPIRED’
                The signature has expired.
 
-         `GPGME_SIGSUM_KEY_MISSING'
-               Can't verify due to a missing key or certificate.
+          ‘GPGME_SIGSUM_KEY_MISSING’
+               Can’t verify due to a missing key or certificate.
 
-         `GPGME_SIGSUM_CRL_MISSING'
+          ‘GPGME_SIGSUM_CRL_MISSING’
                The CRL (or an equivalent mechanism) is not available.
 
-         `GPGME_SIGSUM_CRL_TOO_OLD'
+          ‘GPGME_SIGSUM_CRL_TOO_OLD’
                Available CRL is too old.
 
-         `GPGME_SIGSUM_BAD_POLICY'
+          ‘GPGME_SIGSUM_BAD_POLICY’
                A policy requirement was not met.
 
-         `GPGME_SIGSUM_SYS_ERROR'
+          ‘GPGME_SIGSUM_SYS_ERROR’
                A system error occured.
 
-    `char *fpr'
+     ‘char *fpr’
           This is the fingerprint or key ID of the signature.
 
-    `gpgme_error_t status'
+     ‘gpgme_error_t status’
           This is the status of the signature.  In particular, the
           following status codes are of interest:
 
-         `GPG_ERR_NO_ERROR'
+          ‘GPG_ERR_NO_ERROR’
                This status indicates that the signature is valid.  For
-               the combined   result this status means that all
-               signatures are valid.
+               the combined result this status means that all signatures
+               are valid.
 
-         `GPG_ERR_SIG_EXPIRED'
+          ‘GPG_ERR_SIG_EXPIRED’
                This status indicates that the signature is valid but
-               expired.  For   the combined result this status means
-               that all signatures are valid   and expired.
-
-         `GPG_ERR_KEY_EXPIRED'
-               This status indicates that the signature is valid but
-               the key used to   verify the signature has expired.  For
-               the combined result this status   means that all
-               signatures are valid and all keys are expired.
-
-         `GPG_ERR_CERT_REVOKED'
-               This status indicates that the signature is valid but
-               the key used   to verify the signature has been revoked.
-               For the combined result   this status means that all
-               signatures are valid and all keys are   revoked.
-
-         `GPG_ERR_BAD_SIGNATURE'
-               This status indicates that the signature is invalid.
-               For the combined   result this status means that all
-               signatures are invalid.
-
-         `GPG_ERR_NO_PUBKEY'
+               expired.  For the combined result this status means that
+               all signatures are valid and expired.
+
+          ‘GPG_ERR_KEY_EXPIRED’
+               This status indicates that the signature is valid but the
+               key used to verify the signature has expired.  For the
+               combined result this status means that all signatures are
+               valid and all keys are expired.
+
+          ‘GPG_ERR_CERT_REVOKED’
+               This status indicates that the signature is valid but the
+               key used to verify the signature has been revoked.  For
+               the combined result this status means that all signatures
+               are valid and all keys are revoked.
+
+          ‘GPG_ERR_BAD_SIGNATURE’
+               This status indicates that the signature is invalid.  For
+               the combined result this status means that all signatures
+               are invalid.
+
+          ‘GPG_ERR_NO_PUBKEY’
                This status indicates that the signature could not be
-               verified due to   a missing key.  For the combined
-               result this status means that all   signatures could not
-               be checked due to missing keys.
+               verified due to a missing key.  For the combined result
+               this status means that all signatures could not be
+               checked due to missing keys.
 
-         `GPG_ERR_GENERAL'
+          ‘GPG_ERR_GENERAL’
                This status indicates that there was some other error
-               which prevented   the signature verification.
+               which prevented the signature verification.
 
-    `gpgme_sig_notation_t notations'
+     ‘gpgme_sig_notation_t notations’
           This is a linked list with the notation data and policy URLs.
 
-    `unsigned long timestamp'
+     ‘unsigned long timestamp’
           The creation timestamp of this signature.
 
-    `unsigned long exp_timestamp'
+     ‘unsigned long exp_timestamp’
           The expiration timestamp of this signature, or 0 if the
           signature does not expire.
 
-    `unsigned int wrong_key_usage : 1'
+     ‘unsigned int wrong_key_usage : 1’
           This is true if the key was not used according to its policy.
 
-    `unsigned int pka_trust : 2'
+     ‘unsigned int pka_trust : 2’
           This is set to the trust information gained by means of the
           PKA system.  Values are:
-         `0'
+          ‘0’
                No PKA information available or verification not
                possible.
-
-         `1'
+          ‘1’
                PKA verification failed.
-
-         `2'
+          ‘2’
                PKA verification succeeded.
-
-         `3'
+          ‘3’
                Reserved for future use.
           Depending on the configuration of the engine, this metric may
           also be reflected by the validity of the signature.
 
-    `unsigned int chain_model : 1'
-          This is true if the validity of the signature has been
-          checked using the chain model.  In the chain model the time
-          the signature has been created must be within the validity
-          period of the certificate and the time the certificate itself
-          has been created must be within the validity period of the
-          issuing certificate.  In contrast the default validation model
-          checks the validity of signature as well at the entire
-          certificate chain at the current time.
-
-    `gpgme_validity_t validity'
+     ‘unsigned int chain_model : 1’
+          This is true if the validity of the signature has been checked
+          using the chain model.  In the chain model the time the
+          signature has been created must be within the validity period
+          of the certificate and the time the certificate itself has
+          been created must be within the validity period of the issuing
+          certificate.  In contrast the default validation model checks
+          the validity of signature as well at the entire certificate
+          chain at the current time.
+
+     ‘gpgme_validity_t validity’
           The validity of the signature.
 
-    `gpgme_error_t validity_reason'
+     ‘gpgme_error_t validity_reason’
           If a signature is not valid, this provides a reason why.
 
-    `gpgme_pubkey_algo_t'
+     ‘gpgme_pubkey_algo_t’
           The public key algorithm used to create this signature.
 
-    `gpgme_hash_algo_t'
+     ‘gpgme_hash_algo_t’
           The hash algorithm used to create this signature.
 
-    `char *pka_address'
-          The mailbox from the PKA information or `NULL'.
+     ‘char *pka_address’
+          The mailbox from the PKA information or ‘NULL’.
 
  -- Data type: gpgme_verify_result_t
      This is a pointer to a structure used to store the result of a
-     `gpgme_op_verify' operation.  After verifying a signature, you can
-     retrieve the pointer to the result with `gpgme_op_verify_result'.
-     If the operation failed this might be a `NULL' pointer.  The
+     ‘gpgme_op_verify’ operation.  After verifying a signature, you can
+     retrieve the pointer to the result with ‘gpgme_op_verify_result’.
+     If the operation failed this might be a ‘NULL’ pointer.  The
      structure contains the following member:
 
-    `gpgme_signature_t signatures'
+     ‘gpgme_signature_t signatures’
           A linked list with information about all signatures for which
           a verification was attempted.
 
-    `char *file_name'
-          This is the filename of the original plaintext message file
-          if it is known, otherwise this is a null pointer.
+     ‘char *file_name’
+          This is the filename of the original plaintext message file if
+          it is known, otherwise this is a null pointer.
 
  -- Function: gpgme_verify_result_t gpgme_op_verify_result
           (gpgme_ctx_t CTX)
-     The function `gpgme_op_verify_result' returns a
-     `gpgme_verify_result_t' pointer to a structure holding the result
-     of a `gpgme_op_verify' operation.  The pointer is only valid if
-     the last operation on the context was a `gpgme_op_verify',
-     `gpgme_op_verify_start', `gpgme_op_decrypt_verify' or
-     `gpgme_op_decrypt_verify_start' operation, and if this operation
-     finished successfully (for `gpgme_op_decrypt_verify' and
-     `gpgme_op_decrypt_verify_start', the error code `GPG_ERR_NO_DATA'
+     The function ‘gpgme_op_verify_result’ returns a
+     ‘gpgme_verify_result_t’ pointer to a structure holding the result
+     of a ‘gpgme_op_verify’ operation.  The pointer is only valid if the
+     last operation on the context was a ‘gpgme_op_verify’,
+     ‘gpgme_op_verify_start’, ‘gpgme_op_decrypt_verify’ or
+     ‘gpgme_op_decrypt_verify_start’ operation, and if this operation
+     finished successfully (for ‘gpgme_op_decrypt_verify’ and
+     ‘gpgme_op_decrypt_verify_start’, the error code ‘GPG_ERR_NO_DATA’
      counts as successful in this context).  The returned pointer is
      only valid until the next operation is started on the context.
 
    The following interfaces are deprecated and only provided for
-backward compatibility.  Don't use them.  They will be removed in a
+backward compatibility.  Don’t use them.  They will be removed in a
 future version of GPGME.
 
  -- Data type: enum gpgme_sig_stat_t
-     The `gpgme_sig_stat_t' type holds the result of a signature check,
+     The ‘gpgme_sig_stat_t’ type holds the result of a signature check,
      or the combined result of all signatures.  The following results
      are possible:
 
-    `GPGME_SIG_STAT_NONE'
+     ‘GPGME_SIG_STAT_NONE’
           This status should not occur in normal operation.
 
-    `GPGME_SIG_STAT_GOOD'
+     ‘GPGME_SIG_STAT_GOOD’
           This status indicates that the signature is valid.  For the
           combined result this status means that all signatures are
           valid.
 
-    `GPGME_SIG_STAT_GOOD_EXP'
-          This status indicates that the signature is valid but
-          expired.  For the combined result this status means that all
-          signatures are valid and expired.
+     ‘GPGME_SIG_STAT_GOOD_EXP’
+          This status indicates that the signature is valid but expired.
+          For the combined result this status means that all signatures
+          are valid and expired.
 
-    `GPGME_SIG_STAT_GOOD_EXPKEY'
+     ‘GPGME_SIG_STAT_GOOD_EXPKEY’
           This status indicates that the signature is valid but the key
           used to verify the signature has expired.  For the combined
-          result this status means that all signatures are valid and
-          all keys are expired.
+          result this status means that all signatures are valid and all
+          keys are expired.
 
-    `GPGME_SIG_STAT_BAD'
+     ‘GPGME_SIG_STAT_BAD’
           This status indicates that the signature is invalid.  For the
           combined result this status means that all signatures are
           invalid.
 
-    `GPGME_SIG_STAT_NOKEY'
-          This status indicates that the signature could not be
-          verified due to a missing key.  For the combined result this
-          status means that all signatures could not be checked due to
-          missing keys.
+     ‘GPGME_SIG_STAT_NOKEY’
+          This status indicates that the signature could not be verified
+          due to a missing key.  For the combined result this status
+          means that all signatures could not be checked due to missing
+          keys.
 
-    `GPGME_SIG_STAT_NOSIG'
-          This status indicates that the signature data provided was
-          not a real signature.
+     ‘GPGME_SIG_STAT_NOSIG’
+          This status indicates that the signature data provided was not
+          a real signature.
 
-    `GPGME_SIG_STAT_ERROR'
+     ‘GPGME_SIG_STAT_ERROR’
           This status indicates that there was some other error which
           prevented the signature verification.
 
-    `GPGME_SIG_STAT_DIFF'
+     ‘GPGME_SIG_STAT_DIFF’
           For the combined result this status means that at least two
-          signatures have a different status.  You can get each key's
-          status with `gpgme_get_sig_status'.
+          signatures have a different status.  You can get each key’s
+          status with ‘gpgme_get_sig_status’.
 
  -- Function: const char * gpgme_get_sig_status (gpgme_ctx_t CTX,
           int IDX, gpgme_sig_stat_t *R_STAT, time_t *R_CREATED)
-     The function `gpgme_get_sig_status' is equivalent to:
+     The function ‘gpgme_get_sig_status’ is equivalent to:
 
             gpgme_verify_result_t result;
             gpgme_signature_t sig;
@@ -4500,7 +4444,7 @@ future version of GPGME.
             if (r_stat)
               {
                 switch (gpg_err_code (sig->status))
-          	{
+	          {
           	case GPG_ERR_NO_ERROR:
           	  *r_stat = GPGME_SIG_STAT_GOOD;
           	  break;
@@ -4528,7 +4472,7 @@ future version of GPGME.
           	default:
           	  *r_stat = GPGME_SIG_STAT_ERROR;
           	  break;
-          	}
+	          }
               }
             if (r_created)
               *r_created = sig->timestamp;
@@ -4536,7 +4480,7 @@ future version of GPGME.
 
  -- Function: const char * gpgme_get_sig_string_attr (gpgme_ctx_t CTX,
           int IDX, gpgme_attr_t WHAT, int WHATIDX)
-     The function `gpgme_get_sig_string_attr' is equivalent to:
+     The function ‘gpgme_get_sig_string_attr’ is equivalent to:
 
             gpgme_verify_result_t result;
             gpgme_signature_t sig;
@@ -4570,7 +4514,7 @@ future version of GPGME.
 
  -- Function: const char * gpgme_get_sig_ulong_attr (gpgme_ctx_t CTX,
           int IDX, gpgme_attr_t WAHT, int WHATIDX)
-     The function `gpgme_get_sig_ulong_attr' is equivalent to:
+     The function ‘gpgme_get_sig_ulong_attr’ is equivalent to:
 
             gpgme_verify_result_t result;
             gpgme_signature_t sig;
@@ -4599,7 +4543,7 @@ future version of GPGME.
 
               case GPGME_ATTR_SIG_STATUS:
                 switch (sig->status)
-          	{
+	          {
           	case GPG_ERR_NO_ERROR:
           	  return GPGME_SIG_STAT_GOOD;
 
@@ -4620,7 +4564,7 @@ future version of GPGME.
 
           	default:
           	  return GPGME_SIG_STAT_ERROR;
-          	}
+	          }
 
               case GPGME_ATTR_SIG_SUMMARY:
                 return sig->summary;
@@ -4632,7 +4576,7 @@ future version of GPGME.
 
  -- Function: const char * gpgme_get_sig_key (gpgme_ctx_t CTX, int IDX,
           gpgme_key_t *R_KEY)
-     The function `gpgme_get_sig_key' is equivalent to:
+     The function ‘gpgme_get_sig_key’ is equivalent to:
 
             gpgme_verify_result_t result;
             gpgme_signature_t sig;
@@ -4658,39 +4602,39 @@ File: gpgme.info,  Node: Decrypt and Verify,  Next: Sign,  Prev: Verify,  Up: Cr
 
  -- Function: gpgme_error_t gpgme_op_decrypt_verify (gpgme_ctx_t CTX,
           gpgme_data_t CIPHER, gpgme_data_t PLAIN)
-     The function `gpgme_op_decrypt_verify' decrypts the ciphertext in
+     The function ‘gpgme_op_decrypt_verify’ decrypts the ciphertext in
      the data object CIPHER and stores it into the data object PLAIN.
      If CIPHER contains signatures, they will be verified.
 
-     After the operation completed, `gpgme_op_decrypt_result' and
-     `gpgme_op_verify_result' can be used to retrieve more information
+     After the operation completed, ‘gpgme_op_decrypt_result’ and
+     ‘gpgme_op_verify_result’ can be used to retrieve more information
      about the signatures.
 
-     If the error code `GPG_ERR_NO_DATA' is returned, CIPHER does not
+     If the error code ‘GPG_ERR_NO_DATA’ is returned, CIPHER does not
      contain any data to decrypt.  However, it might still be signed.
      The information about detected signatures is available with
-     `gpgme_op_verify_result' in this case.
+     ‘gpgme_op_verify_result’ in this case.
 
-     The function returns the error code `GPG_ERR_NO_ERROR' if the
-     ciphertext could be decrypted successfully, `GPG_ERR_INV_VALUE' if
-     CTX, CIPHER or PLAIN is not a valid pointer, `GPG_ERR_NO_DATA' if
+     The function returns the error code ‘GPG_ERR_NO_ERROR’ if the
+     ciphertext could be decrypted successfully, ‘GPG_ERR_INV_VALUE’ if
+     CTX, CIPHER or PLAIN is not a valid pointer, ‘GPG_ERR_NO_DATA’ if
      CIPHER does not contain any data to decrypt,
-     `GPG_ERR_DECRYPT_FAILED' if CIPHER is not a valid cipher text,
-     `GPG_ERR_BAD_PASSPHRASE' if the passphrase for the secret key
-     could not be retrieved, and passes through any errors that are
-     reported by the crypto engine support routines.
+     ‘GPG_ERR_DECRYPT_FAILED’ if CIPHER is not a valid cipher text,
+     ‘GPG_ERR_BAD_PASSPHRASE’ if the passphrase for the secret key could
+     not be retrieved, and passes through any errors that are reported
+     by the crypto engine support routines.
 
  -- Function: gpgme_error_t gpgme_op_decrypt_verify (gpgme_ctx_t CTX,
           gpgme_data_t CIPHER, gpgme_data_t PLAIN)
-     The function `gpgme_op_decrypt_verify_start' initiates a
-     `gpgme_op_decrypt_verify' operation.  It can be completed by
-     calling `gpgme_wait' on the context.  *Note Waiting For
+     The function ‘gpgme_op_decrypt_verify_start’ initiates a
+     ‘gpgme_op_decrypt_verify’ operation.  It can be completed by
+     calling ‘gpgme_wait’ on the context.  *Note Waiting For
      Completion::.
 
-     The function returns the error code `GPG_ERR_NO_ERROR' if the
-     operation could be started successfully, `GPG_ERR_INV_VALUE' if
+     The function returns the error code ‘GPG_ERR_NO_ERROR’ if the
+     operation could be started successfully, ‘GPG_ERR_INV_VALUE’ if
      CTX, CIPHER, PLAIN or R_STAT is not a valid pointer, and
-     `GPG_ERR_NO_DATA' if CIPHER does not contain any data to decrypt.
+     ‘GPG_ERR_NO_DATA’ if CIPHER does not contain any data to decrypt.
 
 
 File: gpgme.info,  Node: Sign,  Next: Encrypt,  Prev: Decrypt and Verify,  Up: Crypto Operations
@@ -4698,10 +4642,10 @@ File: gpgme.info,  Node: Sign,  Next: Encrypt,  Prev: Decrypt and Verify,  Up: C
 7.7.4 Sign
 ----------
 
-A signature can contain signatures by one or more keys.  The set of
-keys used to create a signatures is contained in a context, and is
-applied to all following signing operations in this context (until the
-set is changed).
+A signature can contain signatures by one or more keys.  The set of keys
+used to create a signatures is contained in a context, and is applied to
+all following signing operations in this context (until the set is
+changed).
 
 * Menu:
 
@@ -4716,7 +4660,7 @@ File: gpgme.info,  Node: Selecting Signers,  Next: Creating a Signature,  Up: Si
 .........................
 
  -- Function: void gpgme_signers_clear (gpgme_ctx_t CTX)
-     The function `gpgme_signers_clear' releases a reference for each
+     The function ‘gpgme_signers_clear’ releases a reference for each
      key on the signers list and removes the list of signers from the
      context CTX.
 
@@ -4724,22 +4668,22 @@ File: gpgme.info,  Node: Selecting Signers,  Next: Creating a Signature,  Up: Si
 
  -- Function: gpgme_error_t gpgme_signers_add (gpgme_ctx_t CTX,
           const gpgme_key_t KEY)
-     The function `gpgme_signers_add' adds the key KEY to the list of
+     The function ‘gpgme_signers_add’ adds the key KEY to the list of
      signers in the context CTX.
 
      Calling this function acquires an additional reference for the key.
 
  -- Function: unsigned int gpgme_signers_count (const gpgme_ctx_t CTX)
-     The function `gpgme_signers_count' returns the number of signer
+     The function ‘gpgme_signers_count’ returns the number of signer
      keys in the context CTX.
 
  -- Function: gpgme_key_t gpgme_signers_enum (const gpgme_ctx_t CTX,
           int SEQ)
-     The function `gpgme_signers_enum' returns the SEQth key in the
-     list of signers in the context CTX.  An additional reference is
-     acquired for the user.
+     The function ‘gpgme_signers_enum’ returns the SEQth key in the list
+     of signers in the context CTX.  An additional reference is acquired
+     for the user.
 
-     If SEQ is out of range, `NULL' is returned.
+     If SEQ is out of range, ‘NULL’ is returned.
 
 
 File: gpgme.info,  Node: Creating a Signature,  Next: Signature Notation Data,  Prev: Selecting Signers,  Up: Sign
@@ -4748,108 +4692,107 @@ File: gpgme.info,  Node: Creating a Signature,  Next: Signature Notation Data,
 ............................
 
  -- Data type: enum gpgme_sig_mode_t
-     The `gpgme_sig_mode_t' type is used to specify the desired type of
+     The ‘gpgme_sig_mode_t’ type is used to specify the desired type of
      a signature.  The following modes are available:
 
-    `GPGME_SIG_MODE_NORMAL'
+     ‘GPGME_SIG_MODE_NORMAL’
           A normal signature is made, the output includes the plaintext
           and the signature.
 
-    `GPGME_SIG_MODE_DETACH'
+     ‘GPGME_SIG_MODE_DETACH’
           A detached signature is made.
 
-    `GPGME_SIG_MODE_CLEAR'
-          A clear text signature is made.  The ASCII armor and text
-          mode settings of the context are ignored.
+     ‘GPGME_SIG_MODE_CLEAR’
+          A clear text signature is made.  The ASCII armor and text mode
+          settings of the context are ignored.
 
  -- Function: gpgme_error_t gpgme_op_sign (gpgme_ctx_t CTX,
           gpgme_data_t PLAIN, gpgme_data_t SIG, gpgme_sig_mode_t MODE)
-     The function `gpgme_op_sign' creates a signature for the text in
+     The function ‘gpgme_op_sign’ creates a signature for the text in
      the data object PLAIN and returns it in the data object SIG.  The
-     type of the signature created is determined by the ASCII armor
-     (or, if that is not set, by the encoding specified for SIG), the
-     text mode attributes set for the context CTX and the requested
-     signature mode MODE.
+     type of the signature created is determined by the ASCII armor (or,
+     if that is not set, by the encoding specified for SIG), the text
+     mode attributes set for the context CTX and the requested signature
+     mode MODE.
 
      After the operation completed successfully, the result can be
-     retrieved with `gpgme_op_sign_result'.
+     retrieved with ‘gpgme_op_sign_result’.
 
      If an S/MIME signed message is created using the CMS crypto engine,
      the number of certificates to include in the message can be
-     specified with `gpgme_set_include_certs'.  *Note Included
+     specified with ‘gpgme_set_include_certs’.  *Note Included
      Certificates::.
 
-     The function returns the error code `GPG_ERR_NO_ERROR' if the
-     signature could be created successfully, `GPG_ERR_INV_VALUE' if
-     CTX, PLAIN or SIG is not a valid pointer, `GPG_ERR_NO_DATA' if the
-     signature could not be created, `GPG_ERR_BAD_PASSPHRASE' if the
+     The function returns the error code ‘GPG_ERR_NO_ERROR’ if the
+     signature could be created successfully, ‘GPG_ERR_INV_VALUE’ if
+     CTX, PLAIN or SIG is not a valid pointer, ‘GPG_ERR_NO_DATA’ if the
+     signature could not be created, ‘GPG_ERR_BAD_PASSPHRASE’ if the
      passphrase for the secret key could not be retrieved,
-     `GPG_ERR_UNUSABLE_SECKEY' if there are invalid signers, and passes
+     ‘GPG_ERR_UNUSABLE_SECKEY’ if there are invalid signers, and passes
      through any errors that are reported by the crypto engine support
      routines.
 
  -- Function: gpgme_error_t gpgme_op_sign_start (gpgme_ctx_t CTX,
           gpgme_data_t PLAIN, gpgme_data_t SIG, gpgme_sig_mode_t MODE)
-     The function `gpgme_op_sign_start' initiates a `gpgme_op_sign'
-     operation.  It can be completed by calling `gpgme_wait' on the
+     The function ‘gpgme_op_sign_start’ initiates a ‘gpgme_op_sign’
+     operation.  It can be completed by calling ‘gpgme_wait’ on the
      context.  *Note Waiting For Completion::.
 
-     The function returns the error code `GPG_ERR_NO_ERROR' if the
-     operation could be started successfully, and `GPG_ERR_INV_VALUE'
-     if CTX, PLAIN or SIG is not a valid pointer.
+     The function returns the error code ‘GPG_ERR_NO_ERROR’ if the
+     operation could be started successfully, and ‘GPG_ERR_INV_VALUE’ if
+     CTX, PLAIN or SIG is not a valid pointer.
 
  -- Data type: gpgme_new_signature_t
-     This is a pointer to a structure used to store a part of the
-     result of a `gpgme_op_sign' operation.  The structure contains the
+     This is a pointer to a structure used to store a part of the result
+     of a ‘gpgme_op_sign’ operation.  The structure contains the
      following members:
 
-    `gpgme_new_signature_t next'
+     ‘gpgme_new_signature_t next’
           This is a pointer to the next new signature structure in the
-          linked list, or `NULL' if this is the last element.
+          linked list, or ‘NULL’ if this is the last element.
 
-    `gpgme_sig_mode_t type'
+     ‘gpgme_sig_mode_t type’
           The type of this signature.
 
-    `gpgme_pubkey_algo_t pubkey_algo'
+     ‘gpgme_pubkey_algo_t pubkey_algo’
           The public key algorithm used to create this signature.
 
-    `gpgme_hash_algo_t hash_algo'
+     ‘gpgme_hash_algo_t hash_algo’
           The hash algorithm used to create this signature.
 
-    `unsigned int sig_class'
+     ‘unsigned int sig_class’
           The signature class of this signature.
 
-    `long int timestamp'
+     ‘long int timestamp’
           The creation timestamp of this signature.
 
-    `char *fpr'
+     ‘char *fpr’
           The fingerprint of the key which was used to create this
           signature.
 
  -- Data type: gpgme_sign_result_t
      This is a pointer to a structure used to store the result of a
-     `gpgme_op_sign' operation.  After successfully generating a
+     ‘gpgme_op_sign’ operation.  After successfully generating a
      signature, you can retrieve the pointer to the result with
-     `gpgme_op_sign_result'.  The structure contains the following
+     ‘gpgme_op_sign_result’.  The structure contains the following
      members:
 
-    `gpgme_invalid_key_t invalid_signers'
+     ‘gpgme_invalid_key_t invalid_signers’
           A linked list with information about all invalid keys for
           which a signature could not be created.
 
-    `gpgme_new_signature_t signatures'
+     ‘gpgme_new_signature_t signatures’
           A linked list with information about all signatures created.
 
  -- Function: gpgme_sign_result_t gpgme_op_sign_result (gpgme_ctx_t CTX)
-     The function `gpgme_op_sign_result' returns a
-     `gpgme_sign_result_t' pointer to a structure holding the result of
-     a `gpgme_op_sign' operation.  The pointer is only valid if the
-     last operation on the context was a `gpgme_op_sign',
-     `gpgme_op_sign_start', `gpgme_op_encrypt_sign' or
-     `gpgme_op_encrypt_sign_start' operation.  If that operation
-     failed, the function might return a `NULL' pointer. The returned
-     pointer is only valid until the next operation is started on the
-     context.
+     The function ‘gpgme_op_sign_result’ returns a ‘gpgme_sign_result_t’
+     pointer to a structure holding the result of a ‘gpgme_op_sign’
+     operation.  The pointer is only valid if the last operation on the
+     context was a ‘gpgme_op_sign’, ‘gpgme_op_sign_start’,
+     ‘gpgme_op_encrypt_sign’ or ‘gpgme_op_encrypt_sign_start’ operation.
+     If that operation failed, the function might return a ‘NULL’
+     pointer.  The returned pointer is only valid until the next
+     operation is started on the context.
 
 
 File: gpgme.info,  Node: Signature Notation Data,  Prev: Creating a Signature,  Up: Sign
@@ -4857,12 +4800,12 @@ File: gpgme.info,  Node: Signature Notation Data,  Prev: Creating a Signature,
 7.7.4.3 Signature Notation Data
 ...............................
 
-Using the following functions, you can attach arbitrary notation data
-to a signature.  This information is then available to the user when
-the signature is verified.
+Using the following functions, you can attach arbitrary notation data to
+a signature.  This information is then available to the user when the
+signature is verified.
 
  -- Function: void gpgme_sig_notation_clear (gpgme_ctx_t CTX)
-     The function `gpgme_sig_notation_clear' removes the notation data
+     The function ‘gpgme_sig_notation_clear’ removes the notation data
      from the context CTX.  Subsequent signing operations from this
      context will not include any notation data.
 
@@ -4871,34 +4814,34 @@ the signature is verified.
  -- Function: gpgme_error_t gpgme_sig_notation_add (gpgme_ctx_t CTX,
           const char *NAME, const char *VALUE,
           gpgme_sig_notation_flags_t FLAGS)
-     The function `gpgme_sig_notation_add' adds the notation data with
+     The function ‘gpgme_sig_notation_add’ adds the notation data with
      the name NAME and the value VALUE to the context CTX.
 
      Subsequent signing operations will include this notation data, as
      well as any other notation data that was added since the creation
-     of the context or the last `gpgme_sig_notation_clear' operation.
+     of the context or the last ‘gpgme_sig_notation_clear’ operation.
 
-     The arguments NAME and VALUE must be `NUL'-terminated strings in
-     human-readable form.  The flag `GPGME_SIG_NOTATION_HUMAN_READABLE'
+     The arguments NAME and VALUE must be ‘NUL’-terminated strings in
+     human-readable form.  The flag ‘GPGME_SIG_NOTATION_HUMAN_READABLE’
      is implied (non-human-readable notation data is currently not
      supported).  The strings must be in UTF-8 encoding.
 
-     If NAME is `NULL', then VALUE should be a policy URL.
+     If NAME is ‘NULL’, then VALUE should be a policy URL.
 
-     The function `gpgme_sig_notation_add' returns the error code
-     `GPG_ERR_NO_ERROR' if the notation data could be added
-     successfully, `GPG_ERR_INV_VALUE' if CTX is not a valid pointer,
-     or if NAME, VALUE and FLAGS are an invalid combination.  The
-     function also passes through any errors that are reported by the
-     crypto engine support routines.
+     The function ‘gpgme_sig_notation_add’ returns the error code
+     ‘GPG_ERR_NO_ERROR’ if the notation data could be added
+     successfully, ‘GPG_ERR_INV_VALUE’ if CTX is not a valid pointer, or
+     if NAME, VALUE and FLAGS are an invalid combination.  The function
+     also passes through any errors that are reported by the crypto
+     engine support routines.
 
  -- Function: gpgme_sig_notation_t gpgme_sig_notation_get
           (const gpgme_ctx_t CTX)
-     The function `gpgme_sig_notation_get' returns the linked list of
+     The function ‘gpgme_sig_notation_get’ returns the linked list of
      notation data structures that are contained in the context CTX.
 
      If CTX is not a valid pointer, or there is no notation data added
-     for this context, `NULL' is returned.
+     for this context, ‘NULL’ is returned.
 
 
 File: gpgme.info,  Node: Encrypt,  Prev: Sign,  Up: Crypto Operations
@@ -4907,8 +4850,8 @@ File: gpgme.info,  Node: Encrypt,  Prev: Sign,  Up: Crypto Operations
 -------------
 
 One plaintext can be encrypted for several recipients at the same time.
-The list of recipients is created independently of any context, and
-then passed to the encryption operation.
+The list of recipients is created independently of any context, and then
+passed to the encryption operation.
 
 * Menu:
 
@@ -4923,114 +4866,111 @@ File: gpgme.info,  Node: Encrypting a Plaintext,  Up: Encrypt
  -- Function: gpgme_error_t gpgme_op_encrypt (gpgme_ctx_t CTX,
           gpgme_key_t RECP[], gpgme_encrypt_flags_t FLAGS,
           gpgme_data_t PLAIN, gpgme_data_t CIPHER)
-     The function `gpgme_op_encrypt' encrypts the plaintext in the data
+     The function ‘gpgme_op_encrypt’ encrypts the plaintext in the data
      object PLAIN for the recipients RECP and stores the ciphertext in
      the data object CIPHER.  The type of the ciphertext created is
      determined by the ASCII armor (or, if that is not set, by the
-     encoding specified for CIPHER) and the text mode attributes set
-     for the context CTX.
+     encoding specified for CIPHER) and the text mode attributes set for
+     the context CTX.
 
-     RECP must be a `NULL'-terminated array of keys.  The user must
-     keep references for all keys during the whole duration of the call
-     (but see `gpgme_op_encrypt_start' for the requirements with the
+     RECP must be a ‘NULL’-terminated array of keys.  The user must keep
+     references for all keys during the whole duration of the call (but
+     see ‘gpgme_op_encrypt_start’ for the requirements with the
      asynchronous variant).
 
      The value in FLAGS is a bitwise-or combination of one or multiple
      of the following bit values:
 
-    `GPGME_ENCRYPT_ALWAYS_TRUST'
-          The `GPGME_ENCRYPT_ALWAYS_TRUST' symbol specifies that all the
+     ‘GPGME_ENCRYPT_ALWAYS_TRUST’
+          The ‘GPGME_ENCRYPT_ALWAYS_TRUST’ symbol specifies that all the
           recipients in RECP should be trusted, even if the keys do not
           have a high enough validity in the keyring.  This flag should
-          be used with care; in general it is not a good idea to use
-          any untrusted keys.
+          be used with care; in general it is not a good idea to use any
+          untrusted keys.
 
-    `GPGME_ENCRYPT_NO_ENCRYPT_TO'
-          The `GPGME_ENCRYPT_NO_ENCRYPT_TO' symbol specifies that no
+     ‘GPGME_ENCRYPT_NO_ENCRYPT_TO’
+          The ‘GPGME_ENCRYPT_NO_ENCRYPT_TO’ symbol specifies that no
           default or hidden default recipients as configured in the
           crypto backend should be included.  This can be useful for
           managing different user profiles.
 
-    `GPGME_ENCRYPT_NO_COMPRESS'
-          The `GPGME_ENCRYPT_NO_COMPRESS' symbol specifies that the
+     ‘GPGME_ENCRYPT_NO_COMPRESS’
+          The ‘GPGME_ENCRYPT_NO_COMPRESS’ symbol specifies that the
           plaintext shall not be compressed before it is encrypted.
           This is in some cases useful if the length of the encrypted
           message may reveal information about the plaintext.
 
-    `GPGME_ENCRYPT_PREPARE'
-    `GPGME_ENCRYPT_EXPECT_SIGN'
-          The `GPGME_ENCRYPT_PREPARE' symbol is used with the UI Server
-          protocol to prepare an encryption (i.e. sending the
-          `PREP_ENCRYPT' command).  With the
-          `GPGME_ENCRYPT_EXPECT_SIGN' symbol the UI Server is advised to
-          also expect a sign command.
-
+     ‘GPGME_ENCRYPT_PREPARE’
+     ‘GPGME_ENCRYPT_EXPECT_SIGN’
+          The ‘GPGME_ENCRYPT_PREPARE’ symbol is used with the UI Server
+          protocol to prepare an encryption (i.e.  sending the
+          ‘PREP_ENCRYPT’ command).  With the ‘GPGME_ENCRYPT_EXPECT_SIGN’
+          symbol the UI Server is advised to also expect a sign command.
 
-     If `GPG_ERR_UNUSABLE_PUBKEY' is returned, some recipients in RECP
+     If ‘GPG_ERR_UNUSABLE_PUBKEY’ is returned, some recipients in RECP
      are invalid, but not all.  In this case the plaintext might be
      encrypted for all valid recipients and returned in CIPHER (if this
      happens depends on the crypto engine).  More information about the
-     invalid recipients is available with `gpgme_op_encrypt_result'.
+     invalid recipients is available with ‘gpgme_op_encrypt_result’.
 
-     If RECP is `NULL', symmetric rather than public key encryption is
+     If RECP is ‘NULL’, symmetric rather than public key encryption is
      performed.  Symmetrically encrypted cipher text can be deciphered
-     with `gpgme_op_decrypt'.  Note that in this case the crypto
-     backend needs to retrieve a passphrase from the user.  Symmetric
-     encryption is currently only supported for the OpenPGP crypto
-     backend.
+     with ‘gpgme_op_decrypt’.  Note that in this case the crypto backend
+     needs to retrieve a passphrase from the user.  Symmetric encryption
+     is currently only supported for the OpenPGP crypto backend.
 
-     The function returns the error code `GPG_ERR_NO_ERROR' if the
-     ciphertext could be created successfully, `GPG_ERR_INV_VALUE' if
+     The function returns the error code ‘GPG_ERR_NO_ERROR’ if the
+     ciphertext could be created successfully, ‘GPG_ERR_INV_VALUE’ if
      CTX, RECP, PLAIN or CIPHER is not a valid pointer,
-     `GPG_ERR_UNUSABLE_PUBKEY' if RECP contains some invalid
-     recipients, `GPG_ERR_BAD_PASSPHRASE' if the passphrase for the
-     symmetric key could not be retrieved, and passes through any
-     errors that are reported by the crypto engine support routines.
+     ‘GPG_ERR_UNUSABLE_PUBKEY’ if RECP contains some invalid recipients,
+     ‘GPG_ERR_BAD_PASSPHRASE’ if the passphrase for the symmetric key
+     could not be retrieved, and passes through any errors that are
+     reported by the crypto engine support routines.
 
  -- Function: gpgme_error_t gpgme_op_encrypt_start (gpgme_ctx_t CTX,
           gpgme_key_t RECP[], gpgme_encrypt_flags_t FLAGS,
           gpgme_data_t PLAIN, gpgme_data_t CIPHER)
-     The function `gpgme_op_encrypt_start' initiates a
-     `gpgme_op_encrypt' operation.  It can be completed by calling
-     `gpgme_wait' on the context.  *Note Waiting For Completion::.
+     The function ‘gpgme_op_encrypt_start’ initiates a
+     ‘gpgme_op_encrypt’ operation.  It can be completed by calling
+     ‘gpgme_wait’ on the context.  *Note Waiting For Completion::.
 
      References to the keys only need to be held for the duration of
      this call.  The user can release its references to the keys after
      this function returns, even if the operation is not yet finished.
 
-     The function returns the error code `GPG_ERR_NO_ERROR' if the
-     operation could be started successfully, `GPG_ERR_INV_VALUE' if
+     The function returns the error code ‘GPG_ERR_NO_ERROR’ if the
+     operation could be started successfully, ‘GPG_ERR_INV_VALUE’ if
      CTX, RSET, PLAIN or CIPHER is not a valid pointer, and
-     `GPG_ERR_UNUSABLE_PUBKEY' if RSET does not contain any valid
+     ‘GPG_ERR_UNUSABLE_PUBKEY’ if RSET does not contain any valid
      recipients.
 
  -- Data type: gpgme_encrypt_result_t
      This is a pointer to a structure used to store the result of a
-     `gpgme_op_encrypt' operation.  After successfully encrypting data,
+     ‘gpgme_op_encrypt’ operation.  After successfully encrypting data,
      you can retrieve the pointer to the result with
-     `gpgme_op_encrypt_result'.  The structure contains the following
+     ‘gpgme_op_encrypt_result’.  The structure contains the following
      members:
 
-    `gpgme_invalid_key_t invalid_recipients'
+     ‘gpgme_invalid_key_t invalid_recipients’
           A linked list with information about all invalid keys for
           which the data could not be encrypted.
 
  -- Function: gpgme_encrypt_result_t gpgme_op_encrypt_result
           (gpgme_ctx_t CTX)
-     The function `gpgme_op_encrypt_result' returns a
-     `gpgme_encrypt_result_t' pointer to a structure holding the result
-     of a `gpgme_op_encrypt' operation.  The pointer is only valid if
-     the last operation on the context was a `gpgme_op_encrypt',
-     `gpgme_op_encrypt_start', `gpgme_op_sign' or `gpgme_op_sign_start'
-     operation.  If this operation failed, this might be a `NULL'
+     The function ‘gpgme_op_encrypt_result’ returns a
+     ‘gpgme_encrypt_result_t’ pointer to a structure holding the result
+     of a ‘gpgme_op_encrypt’ operation.  The pointer is only valid if
+     the last operation on the context was a ‘gpgme_op_encrypt’,
+     ‘gpgme_op_encrypt_start’, ‘gpgme_op_sign’ or ‘gpgme_op_sign_start’
+     operation.  If this operation failed, this might be a ‘NULL’
      pointer.  The returned pointer is only valid until the next
      operation is started on the context.
 
  -- Function: gpgme_error_t gpgme_op_encrypt_sign (gpgme_ctx_t CTX,
           gpgme_key_t RECP[], gpgme_encrypt_flags_t FLAGS,
           gpgme_data_t PLAIN, gpgme_data_t CIPHER)
-     The function `gpgme_op_encrypt_sign' does a combined encrypt and
-     sign operation.  It is used like `gpgme_op_encrypt', but the
+     The function ‘gpgme_op_encrypt_sign’ does a combined encrypt and
+     sign operation.  It is used like ‘gpgme_op_encrypt’, but the
      ciphertext also contains signatures for the signers listed in CTX.
 
      The combined encrypt and sign operation is currently only available
@@ -5040,13 +4980,13 @@ File: gpgme.info,  Node: Encrypting a Plaintext,  Up: Encrypt
           (gpgme_ctx_t CTX, gpgme_key_t RECP,
           gpgme_encrypt_flags_t FLAGS, gpgme_data_t PLAIN,
           gpgme_data_t CIPHER)
-     The function `gpgme_op_encrypt_sign_start' initiates a
-     `gpgme_op_encrypt_sign' operation.  It can be completed by calling
-     `gpgme_wait' on the context.  *Note Waiting For Completion::.
+     The function ‘gpgme_op_encrypt_sign_start’ initiates a
+     ‘gpgme_op_encrypt_sign’ operation.  It can be completed by calling
+     ‘gpgme_wait’ on the context.  *Note Waiting For Completion::.
 
-     The function returns the error code `GPG_ERR_NO_ERROR' if the
-     operation could be started successfully, and `GPG_ERR_INV_VALUE'
-     if CTX, RSET, PLAIN or CIPHER is not a valid pointer.
+     The function returns the error code ‘GPG_ERR_NO_ERROR’ if the
+     operation could be started successfully, and ‘GPG_ERR_INV_VALUE’ if
+     CTX, RSET, PLAIN or CIPHER is not a valid pointer.
 
 
 File: gpgme.info,  Node: Miscellaneous,  Next: Run Control,  Prev: Crypto Operations,  Up: Contexts
@@ -5074,39 +5014,36 @@ are part of the GnuPG system but are not directly accessible with the
 GPGME API.
 
  -- Function: gpgme_error_t gpgme_op_spawn
-     (gpgme_ctx_t CTX, const char *FILE,
-     const char *ARGV[], gpgme_data_t DATAIN,
-     gpgme_data_t DATAOUT, gpgme_data_t DATAERR,
-     unsigned int FLAGS)
+     (gpgme_ctx_t CTX, const char *FILE,   const char *ARGV[],
+     gpgme_data_t DATAIN,   gpgme_data_t DATAOUT, gpgme_data_t DATAERR,
+       unsigned int FLAGS)
 
-     The function `gpgme_op_spawn' runs the program FILE with the
+     The function ‘gpgme_op_spawn’ runs the program FILE with the
      arguments taken from the NULL terminated array ARGV.  If no
-     arguments are required ARGV may be given as `NULL'.  In the latter
-     case or if `argv[0]' is the empty string, GPGME uses the basename
-     of FILE for `argv[0]'.  The file descriptors `stdin', `stdout',
-     and `stderr' are connected to the data objects DATAIN, DATAOUT,
-     and DATAERR.  If NULL is passed for one of these data objects the
-     corresponding file descriptor is connected to `/dev/null'.
+     arguments are required ARGV may be given as ‘NULL’.  In the latter
+     case or if ‘argv[0]’ is the empty string, GPGME uses the basename
+     of FILE for ‘argv[0]’.  The file descriptors ‘stdin’, ‘stdout’, and
+     ‘stderr’ are connected to the data objects DATAIN, DATAOUT, and
+     DATAERR.  If NULL is passed for one of these data objects the
+     corresponding file descriptor is connected to ‘/dev/null’.
 
      The value in FLAGS is a bitwise-or combination of one or multiple
      of the following bit values:
 
-    `GPGME_SPAWN_DETACHED'
+     ‘GPGME_SPAWN_DETACHED’
           Under Windows this flag inhibits the allocation of a new
-          console for the program.  This is useful for a GUI
-          application which needs to call a command line helper tool.
-
-    `GPGME_SPAWN_ALLOW_SET_FG'
+          console for the program.  This is useful for a GUI application
+          which needs to call a command line helper tool.
+     ‘GPGME_SPAWN_ALLOW_SET_FG’
           Under Windows this flag allows the called program to put
           itself into the foreground.
 
  -- Function: gpgme_error_t gpgme_op_spawn_start
-     (gpgme_ctx_t CTX, const char *FILE,
-     const char *ARGV[], gpgme_data_t DATAIN,
-     gpgme_data_t DATAOUT, gpgme_data_t DATAERR,
-     unsigned int FLAGS)
+     (gpgme_ctx_t CTX, const char *FILE,   const char *ARGV[],
+     gpgme_data_t DATAIN,   gpgme_data_t DATAOUT, gpgme_data_t DATAERR,
+       unsigned int FLAGS)
 
-     This is the asynchronous variant of `gpgme_op_spawn'.
+     This is the asynchronous variant of ‘gpgme_op_spawn’.
 
 
 File: gpgme.info,  Node: Run Control,  Prev: Miscellaneous,  Up: Contexts
@@ -5114,9 +5051,9 @@ File: gpgme.info,  Node: Run Control,  Prev: Miscellaneous,  Up: Contexts
 7.9 Run Control
 ===============
 
-GPGME supports running operations synchronously and asynchronously.
-You can use asynchronous operation to set up a context up to initiating
-the desired operation, but delay performing it to a later point.
+GPGME supports running operations synchronously and asynchronously.  You
+can use asynchronous operation to set up a context up to initiating the
+desired operation, but delay performing it to a later point.
 
    Furthermore, you can use an external event loop to control exactly
 when GPGME runs.  This ensures that GPGME only runs when necessary and
@@ -5136,7 +5073,7 @@ File: gpgme.info,  Node: Waiting For Completion,  Next: Using External Event Loo
 
  -- Function: gpgme_ctx_t gpgme_wait (gpgme_ctx_t CTX,
           gpgme_error_t *STATUS, int HANG)
-     The function `gpgme_wait' continues the pending operation within
+     The function ‘gpgme_wait’ continues the pending operation within
      the context CTX.  In particular, it ensures the data exchange
      between GPGME and the crypto backend and watches over the run time
      status of the backend process.
@@ -5145,31 +5082,31 @@ File: gpgme.info,  Node: Waiting For Completion,  Next: Using External Event Loo
      is completed or cancelled.  Otherwise the function will not block
      for a long time.
 
-     The error status of the finished operation is returned in STATUS
-     if `gpgme_wait' does not return `NULL'.
+     The error status of the finished operation is returned in STATUS if
+     ‘gpgme_wait’ does not return ‘NULL’.
 
-     The CTX argument can be `NULL'.  In that case, `gpgme_wait' waits
+     The CTX argument can be ‘NULL’.  In that case, ‘gpgme_wait’ waits
      for any context to complete its operation.
 
-     `gpgme_wait' can be used only in conjunction with any context that
+     ‘gpgme_wait’ can be used only in conjunction with any context that
      has a pending operation initiated with one of the
-     `gpgme_op_*_start' functions except `gpgme_op_keylist_start' and
-     `gpgme_op_trustlist_start' (for which you should use the
-     corresponding `gpgme_op_*_next' functions).  If CTX is `NULL', all
+     ‘gpgme_op_*_start’ functions except ‘gpgme_op_keylist_start’ and
+     ‘gpgme_op_trustlist_start’ (for which you should use the
+     corresponding ‘gpgme_op_*_next’ functions).  If CTX is ‘NULL’, all
      of such contexts are waited upon and possibly returned.
      Synchronous operations running in parallel, as well as key and
-     trust item list operations, do not affect `gpgme_wait'.
+     trust item list operations, do not affect ‘gpgme_wait’.
 
      In a multi-threaded environment, only one thread should ever call
-     `gpgme_wait' at any time, irregardless if CTX is specified or not.
+     ‘gpgme_wait’ at any time, irregardless if CTX is specified or not.
      This means that all calls to this function should be fully
      synchronized by locking primitives.  It is safe to start
-     asynchronous operations while a thread is running in `gpgme_wait'.
+     asynchronous operations while a thread is running in ‘gpgme_wait’.
 
      The function returns the CTX of the context which has finished the
-     operation.  If HANG is false, and the timeout expires, `NULL' is
-     returned and `*status' will be set to 0.  If an error occurs,
-     `NULL' is returned and the error is returned in `*status'.
+     operation.  If HANG is false, and the timeout expires, ‘NULL’ is
+     returned and ‘*status’ will be set to 0.  If an error occurs,
+     ‘NULL’ is returned and the error is returned in ‘*status’.
 
 
 File: gpgme.info,  Node: Using External Event Loops,  Next: Cancellation,  Prev: Waiting For Completion,  Up: Run Control
@@ -5181,7 +5118,7 @@ GPGME hides the complexity of the communication between the library and
 the crypto engine.  The price of this convenience is that the calling
 thread can block arbitrary long waiting for the data returned by the
 crypto engine.  In single-threaded programs, in particular if they are
-interactive, this is an unwanted side-effect.  OTOH, if `gpgme_wait' is
+interactive, this is an unwanted side-effect.  OTOH, if ‘gpgme_wait’ is
 used without the HANG option being enabled, it might be called
 unnecessarily often, wasting CPU time that could be used otherwise.
 
@@ -5189,13 +5126,13 @@ unnecessarily often, wasting CPU time that could be used otherwise.
 take control over what happens when.  GPGME will provide the user with
 the file descriptors that should be monitored, and the callback
 functions that should be invoked when a file descriptor is ready for
-reading or writing.  It is then the user's responsibility to decide
-when to check the file descriptors and when to invoke the callback
-functions.  Usually this is done in an event loop, that also checks for
-events in other parts of the program.  If the callback functions are
-only called when the file descriptors are ready, GPGME will never
-block.  This gives the user more control over the program flow, and
-allows to perform other tasks when GPGME would block otherwise.
+reading or writing.  It is then the user’s responsibility to decide when
+to check the file descriptors and when to invoke the callback functions.
+Usually this is done in an event loop, that also checks for events in
+other parts of the program.  If the callback functions are only called
+when the file descriptors are ready, GPGME will never block.  This gives
+the user more control over the program flow, and allows to perform other
+tasks when GPGME would block otherwise.
 
    By using this advanced mechanism, GPGME can be integrated smoothly
 into GUI toolkits like GTK+ even for single-threaded programs.
@@ -5216,101 +5153,102 @@ File: gpgme.info,  Node: I/O Callback Interface,  Next: Registering I/O Callback
 ..............................
 
  -- Data type: gpgme_error_t (*gpgme_io_cb_t) (void *DATA, int FD)
-     The `gpgme_io_cb_t' type is the type of functions which GPGME
-     wants to register as I/O callback handlers using the
-     `gpgme_register_io_cb_t' functions provided by the user.
+     The ‘gpgme_io_cb_t’ type is the type of functions which GPGME wants
+     to register as I/O callback handlers using the
+     ‘gpgme_register_io_cb_t’ functions provided by the user.
 
      DATA and FD are provided by GPGME when the I/O callback handler is
      registered, and should be passed through to the handler when it is
      invoked by the user because it noticed activity on the file
      descriptor FD.
 
-     The callback handler always returns `0', but you should consider
+     The callback handler always returns ‘0’, but you should consider
      the return value to be reserved for later use.
 
  -- Data type: gpgme_error_t (*gpgme_register_io_cb_t) (void *DATA,
-int FD, int DIR, gpgme_io_cb_t FNC, void *FNC_DATA, void **TAG)
-     The `gpgme_register_io_cb_t' type is the type of functions which
-     can be called by GPGME to register an I/O callback function FNC
-     for the file descriptor FD with the user.  FNC_DATA should be
-     passed as the first argument to FNC when the handler is invoked
-     (the second argument should be FD).  If DIR is 0, FNC should be
-     called by the user when FD is ready for writing.  If DIR is 1, FNC
-     should be called when FD is ready for reading.
+          int FD, int DIR, gpgme_io_cb_t FNC, void *FNC_DATA,
+          void **TAG)
+     The ‘gpgme_register_io_cb_t’ type is the type of functions which
+     can be called by GPGME to register an I/O callback function FNC for
+     the file descriptor FD with the user.  FNC_DATA should be passed as
+     the first argument to FNC when the handler is invoked (the second
+     argument should be FD).  If DIR is 0, FNC should be called by the
+     user when FD is ready for writing.  If DIR is 1, FNC should be
+     called when FD is ready for reading.
 
      DATA was provided by the user when registering the
-     `gpgme_register_io_cb_t' function with GPGME and will always be
+     ‘gpgme_register_io_cb_t’ function with GPGME and will always be
      passed as the first argument when registering a callback function.
      For example, the user can use this to determine the event loop to
      which the file descriptor should be added.
 
      GPGME will call this function when a crypto operation is initiated
-     in a context for which the user has registered I/O callback
-     handler functions with `gpgme_set_io_cbs'.  It can also call this
-     function when it is in an I/O callback handler for a file
-     descriptor associated to this context.
+     in a context for which the user has registered I/O callback handler
+     functions with ‘gpgme_set_io_cbs’.  It can also call this function
+     when it is in an I/O callback handler for a file descriptor
+     associated to this context.
 
      The user should return a unique handle in TAG identifying this I/O
      callback registration, which will be passed to the
-     `gpgme_register_io_cb_t' function without interpretation when the
+     ‘gpgme_register_io_cb_t’ function without interpretation when the
      file descriptor should not be monitored anymore.
 
  -- Data type: void (*gpgme_remove_io_cb_t) (void *TAG)
-     The `gpgme_remove_io_cb_t' type is the type of functions which can
+     The ‘gpgme_remove_io_cb_t’ type is the type of functions which can
      be called by GPGME to remove an I/O callback handler that was
      registered before.  TAG is the handle that was returned by the
-     `gpgme_register_io_cb_t' for this I/O callback.
+     ‘gpgme_register_io_cb_t’ for this I/O callback.
 
      GPGME can call this function when a crypto operation is in an I/O
      callback.  It will also call this function when the context is
      destroyed while an operation is pending.
 
  -- Data type: enum gpgme_event_io_t
-     The `gpgme_event_io_t' type specifies the type of an event that is
-     reported to the user by GPGME as a consequence of an I/O
-     operation.  The following events are defined:
+     The ‘gpgme_event_io_t’ type specifies the type of an event that is
+     reported to the user by GPGME as a consequence of an I/O operation.
+     The following events are defined:
 
-    `GPGME_EVENT_START'
+     ‘GPGME_EVENT_START’
           The operation is fully initialized now, and you can start to
           run the registered I/O callback handlers now.  Note that
           registered I/O callback handlers must not be run before this
-          event is signalled.  TYPE_DATA is `NULL' and reserved for
+          event is signalled.  TYPE_DATA is ‘NULL’ and reserved for
           later use.
 
-    `GPGME_EVENT_DONE'
+     ‘GPGME_EVENT_DONE’
           The operation is finished, the last I/O callback for this
           operation was removed.  The accompanying TYPE_DATA points to a
-          `struct gpgme_io_event_done_data' variable that contains the
+          ‘struct gpgme_io_event_done_data’ variable that contains the
           status of the operation that finished.  This event is
           signalled after the last I/O callback has been removed.
 
-    `GPGME_EVENT_NEXT_KEY'
-          In a `gpgme_op_keylist_start' operation, the next key was
+     ‘GPGME_EVENT_NEXT_KEY’
+          In a ‘gpgme_op_keylist_start’ operation, the next key was
           received from the crypto engine.  The accompanying TYPE_DATA
-          is a `gpgme_key_t' variable that contains the key with one
+          is a ‘gpgme_key_t’ variable that contains the key with one
           reference for the user.
 
-    `GPGME_EVENT_NEXT_TRUSTITEM'
-          In a `gpgme_op_trustlist_start' operation, the next trust item
+     ‘GPGME_EVENT_NEXT_TRUSTITEM’
+          In a ‘gpgme_op_trustlist_start’ operation, the next trust item
           was received from the crypto engine.  The accompanying
-          TYPE_DATA is a `gpgme_trust_item_t' variable that contains
-          the trust item with one reference for the user.
+          TYPE_DATA is a ‘gpgme_trust_item_t’ variable that contains the
+          trust item with one reference for the user.
 
  -- Data type: void (*gpgme_event_io_cb_t) (void *DATA,
-gpgme_event_io_t TYPE, void *TYPE_DATA)
-     The `gpgme_event_io_cb_t' type is the type of functions which can
-     be called by GPGME to signal an event for an operation running in
-     a context which has I/O callback functions registered by the user.
+          gpgme_event_io_t TYPE, void *TYPE_DATA)
+     The ‘gpgme_event_io_cb_t’ type is the type of functions which can
+     be called by GPGME to signal an event for an operation running in a
+     context which has I/O callback functions registered by the user.
 
      DATA was provided by the user when registering the
-     `gpgme_event_io_cb_t' function with GPGME and will always be
-     passed as the first argument when registering a callback function.
-     For example, the user can use this to determine the context in
-     which this event has occured.
+     ‘gpgme_event_io_cb_t’ function with GPGME and will always be passed
+     as the first argument when registering a callback function.  For
+     example, the user can use this to determine the context in which
+     this event has occured.
 
      TYPE will specify the type of event that has occured.  TYPE_DATA
      specifies the event further, as described in the above list of
-     possible `gpgme_event_io_t' types.
+     possible ‘gpgme_event_io_t’ types.
 
      GPGME can call this function in an I/O callback handler.
 
@@ -5325,43 +5263,43 @@ File: gpgme.info,  Node: Registering I/O Callbacks,  Next: I/O Callback Example,
      functions described in the previous section.  It has the following
      members:
 
-    `gpgme_register_io_cb_t add'
+     ‘gpgme_register_io_cb_t add’
           This is the function called by GPGME to register an I/O
           callback handler.  It must be specified.
 
-    `void *add_priv'
-          This is passed as the first argument to the `add' function
+     ‘void *add_priv’
+          This is passed as the first argument to the ‘add’ function
           when it is called by GPGME.  For example, it can be used to
           determine the event loop to which the file descriptor should
           be added.
 
-    `gpgme_remove_io_cb_t remove'
-          This is the function called by GPGME to remove an I/O
-          callback handler.  It must be specified.
+     ‘gpgme_remove_io_cb_t remove’
+          This is the function called by GPGME to remove an I/O callback
+          handler.  It must be specified.
 
-    `gpgme_event_io_cb_t event'
-          This is the function called by GPGME to signal an event for
-          an operation.  It must be specified, because at least the
-          start event must be processed.
+     ‘gpgme_event_io_cb_t event’
+          This is the function called by GPGME to signal an event for an
+          operation.  It must be specified, because at least the start
+          event must be processed.
 
-    `void *event_priv'
-          This is passed as the first argument to the `event' function
+     ‘void *event_priv’
+          This is passed as the first argument to the ‘event’ function
           when it is called by GPGME.  For example, it can be used to
           determine the context in which the event has occured.
 
  -- Function: void gpgme_set_io_cbs (gpgme_ctx_t CTX,
           struct gpgme_io_cbs *IO_CBS)
-     The function `gpgme_set_io_cbs' enables the I/O callback interface
+     The function ‘gpgme_set_io_cbs’ enables the I/O callback interface
      for the context CTX.  The I/O callback functions are specified by
      IO_CBS.
 
-     If IO_CBS->`add' is `NULL', the I/O callback interface is disabled
+     If IO_CBS->‘add’ is ‘NULL’, the I/O callback interface is disabled
      for the context, and normal operation is restored.
 
  -- Function: void gpgme_get_io_cbs (gpgme_ctx_t CTX,
           struct gpgme_io_cbs *IO_CBS)
-     The function `gpgme_get_io_cbs' returns the I/O callback functions
-     set with `gpgme_set_io_cbs' in IO_CBS.
+     The function ‘gpgme_get_io_cbs’ returns the I/O callback functions
+     set with ‘gpgme_set_io_cbs’ in IO_CBS.
 
 
 File: gpgme.info,  Node: I/O Callback Example,  Next: I/O Callback Example GTK+,  Prev: Registering I/O Callbacks,  Up: Using External Event Loops
@@ -5428,14 +5366,14 @@ GPGME is not predictable.
        for (i = 0; i < MAX_FDS; i++)
          {
            if (fds[i].fd == -1)
-     	{
+	     {
      	  fds[i].fd = fd;
      	  fds[i].dir = dir;
      	  fds[i].fnc = fnc;
      	  fds[i].fnc_data = fnc_data;
      	  fds[i].loop = loop;
      	  break;
-     	}
+	     }
          }
        pthread_mutex_unlock (&loop->lock);
        if (i == MAX_FDS)
@@ -5501,9 +5439,9 @@ next.  We only support waiting for the success of a single operation.
        for (i = 0; i < MAX_FDS && n; i++)
          {
            if (fdlist[i].fd != -1)
-     	{
+	     {
      	  if (FD_ISSET (fdlist[i].fd, fdlist[i].dir ? &rfds : &wfds))
-     	    {
+	         {
      	      assert (n);
      	      n--;
      	      any = 1;
@@ -5512,8 +5450,8 @@ next.  We only support waiting for the success of a single operation.
                    pthread_mutex_unlock (&loop->lock);
      	      (*fdlist[i].fnc) (fdlist[i].fnc_data, fdlist[i].fd);
                    pthread_mutex_lock (&loop->lock);
-     	    }
-     	}
+	         }
+	     }
          }
        pthread_mutex_unlock (&loop->lock);
        return any;
@@ -5591,7 +5529,7 @@ next.  We only support waiting for the success of a single operation.
            exit (1);
          }
        /* Evaluate verify result.  */
-       ...
+       …
        return 0;
      }
 
@@ -5773,37 +5711,37 @@ File: gpgme.info,  Node: Cancellation,  Prev: Using External Event Loops,  Up: R
 
 Sometimes you do not want to wait for an operation to finish.  GPGME
 provides two different functions to achieve that.  The function
-`gpgme_cancel' takes effect immediately.  When it returns, the
-operation is effectively canceled.  However, it has some limitations
-and can not be used with synchronous operations.  In contrast, the
-function `gpgme_cancel_async' can be used with any context and from any
-thread, but it is not guaranteed to take effect immediately.  Instead,
+‘gpgme_cancel’ takes effect immediately.  When it returns, the operation
+is effectively canceled.  However, it has some limitations and can not
+be used with synchronous operations.  In contrast, the function
+‘gpgme_cancel_async’ can be used with any context and from any thread,
+but it is not guaranteed to take effect immediately.  Instead,
 cancellation occurs at the next possible time (typically the next time
 I/O occurs in the target context).
 
  -- Function: gpgme_ctx_t gpgme_cancel (gpgme_ctx_t CTX)
-     The function `gpgme_cancel' attempts to cancel a pending operation
+     The function ‘gpgme_cancel’ attempts to cancel a pending operation
      in the context CTX.  This only works if you use the global event
      loop or your own event loop.
 
-     If you use the global event loop, you must not call `gpgme_wait'
-     or `gpgme_wait' during cancellation.  After successful
-     cancellation, you can call `gpgme_wait' (optionally waiting on
-     CTX), and the context CTX will appear as if it had finished with
-     the error code `GPG_ERR_CANCEL'.
+     If you use the global event loop, you must not call ‘gpgme_wait’ or
+     ‘gpgme_wait’ during cancellation.  After successful cancellation,
+     you can call ‘gpgme_wait’ (optionally waiting on CTX), and the
+     context CTX will appear as if it had finished with the error code
+     ‘GPG_ERR_CANCEL’.
 
      If you use your an external event loop, you must ensure that no I/O
      callbacks are invoked for this context (for example by halting the
      event loop).  On successful cancellation, all registered I/O
      callbacks for this context will be unregistered, and a
-     `GPGME_EVENT_DONE' event with the error code `GPG_ERR_CANCEL' will
+     ‘GPGME_EVENT_DONE’ event with the error code ‘GPG_ERR_CANCEL’ will
      be signaled.
 
      The function returns an error code if the cancellation failed (in
      this case the state of CTX is not modified).
 
  -- Function: gpgme_ctx_t gpgme_cancel_async (gpgme_ctx_t CTX)
-     The function `gpgme_cancel' attempts to cancel a pending operation
+     The function ‘gpgme_cancel’ attempts to cancel a pending operation
      in the context CTX.  This can be called by any thread at any time
      after starting an operation on the context, but will not take
      effect immediately.  The actual cancellation happens at the next
@@ -5824,8 +5762,8 @@ where all cryptographic operations are done by a server and the server
 is responsible for all dialogs.  Although GPGME has no direct support
 for this protocol it is believed that servers will utilize the GPGME
 library; thus having the specification included in this manual is an
-appropriate choice.  This protocol should be referenced as `The GnuPG
-UI Server Protocol'.
+appropriate choice.  This protocol should be referenced as ‘The GnuPG UI
+Server Protocol’.
 
 A server needs to implement these commands:(1)
 
@@ -5857,14 +5795,15 @@ Before encryption can be done the recipients must be set using the
 command:
 
  -- Command: RECIPIENT STRING
+
      Set the recipient for the encryption.  STRING is an RFC-2822
-     recipient name ("mailbox" as per section 3.4).  This command may
-     or may not check the recipient for validity right away; if it does
-     not all recipients are expected to be checked at the time of the
-     `ENCRYPT' command.  All `RECIPIENT' commands are cumulative until a
-     successful `ENCRYPT' command or until a `RESET' command.
-     Linefeeds are obviously not allowed in STRING and should be folded
-     into spaces (which are equivalent).
+     recipient name ("mailbox" as per section 3.4).  This command may or
+     may not check the recipient for validity right away; if it does not
+     all recipients are expected to be checked at the time of the
+     ‘ENCRYPT’ command.  All ‘RECIPIENT’ commands are cumulative until a
+     successful ‘ENCRYPT’ command or until a ‘RESET’ command.  Linefeeds
+     are obviously not allowed in STRING and should be folded into
+     spaces (which are equivalent).
 
 To tell the server the source and destination of the data, the next two
 commands are to be used:
@@ -5877,26 +5816,27 @@ commands are to be used:
      descriptor but a regular system handle.  Given that the Assuan
      connection works over a socket, it is not possible to use regular
      inheritance to make the file descriptor available to the server.
-     Thus `DuplicateHandle' needs to be used to duplicate a handle to
+     Thus ‘DuplicateHandle’ needs to be used to duplicate a handle to
      the server process.  This is the reason that the server needs to
-     implement the `GETINFO pid' command.  Sending this command a second
+     implement the ‘GETINFO pid’ command.  Sending this command a second
      time replaces the file descriptor set by the last one.
 
- -- Command: OUTPUT FD=N [-binary]
-     Set the file descriptor to be used for the output (i.e. the
-     encrypted message) to N.  If the option `--binary' is given the
+ -- Command: OUTPUT FD=N [--binary]
+     Set the file descriptor to be used for the output (i.e.  the
+     encrypted message) to N.  If the option ‘--binary’ is given the
      output shall be in binary format; if not given, the output for
-     OpenPGP needs to be ASCII armored and for CMS Base-64 encoded.
-     For details on the file descriptor, see the `INPUT' command.
+     OpenPGP needs to be ASCII armored and for CMS Base-64 encoded.  For
+     details on the file descriptor, see the ‘INPUT’ command.
 
 The setting of the recipients, the data source and destination may
 happen in any order, even intermixed.  If this has been done the actual
 encryption operation is called using:
 
  -- Command: ENCRYPT --protocol=NAME
+
      This command reads the plaintext from the file descriptor set by
-     the `INPUT' command, encrypts it and writes the ciphertext to the
-     file descriptor set by the `OUTPUT' command.  The server may (and
+     the ‘INPUT’ command, encrypts it and writes the ciphertext to the
+     file descriptor set by the ‘OUTPUT’ command.  The server may (and
      should) overlap reading and writing.  The recipients used for the
      encryption are all the recipients set so far.  If any recipient is
      not usable the server should take appropriate measures to notify
@@ -5909,35 +5849,34 @@ encryption operation is called using:
      allowed to auto select the protocol and must obey to the mandatory
      PROTOCOL parameter:
 
-    `OpenPGP'
+     ‘OpenPGP’
           Use the OpenPGP protocol (RFC-2440).
-
-    `CMS'
+     ‘CMS’
           Use the CMS (PKCS#7) protocol (RFC-3852).
 
-
    To support automagically selection of the protocol depending on the
 selected keys, the server MAY implement the command:
 
  -- Command: PREP_ENCRYPT [--protocol=NAME] [--expect-sign]
+
      This commands considers all recipients set so far and decides
      whether it is able to take input and start the actual encryption.
-     This is kind of a dry-run `ENCRYPT' without requiring or using the
+     This is kind of a dry-run ‘ENCRYPT’ without requiring or using the
      input and output file descriptors.  The server shall cache the
      result of any user selection to avoid asking this again when the
-     actual `ENCRYPT' command is send.  The `--protocol' option is
+     actual ‘ENCRYPT’ command is send.  The ‘--protocol’ option is
      optional; if it is not given, the server should allow the user to
      select the protocol to be used based on the recipients given or by
      any other means.
 
-     If `--expect-sign' is given the server should expect that the
+     If ‘--expect-sign’ is given the server should expect that the
      message will also be signed and use this hint to present a unified
      recipient and signer selection dialog if possible and desired.  A
      selected signer should then be cached for the expected SIGN command
      (which is expected in the same session but possible on another
      connection).
 
-     If this command is given again before a successful `ENCRYPT'
+     If this command is given again before a successful ‘ENCRYPT’
      command, the second one takes effect.
 
      Before sending the OK response the server shall tell the client the
@@ -5945,29 +5884,15 @@ selected keys, the server MAY implement the command:
      one selected by the user) by means of a status line:
 
  -- Status line: PROTOCOL NAME
-     Advise the client to use the protocol NAME for the `ENCRYPT'
-     command.  The valid protocol names are listed under the
-     description of the `ENCRYPT' command.  The server shall emit
-     exactly one PROTOCOL status line.
+     Advise the client to use the protocol NAME for the ‘ENCRYPT’
+     command.  The valid protocol names are listed under the description
+     of the ‘ENCRYPT’ command.  The server shall emit exactly one
+     PROTOCOL status line.
 
 Here is an example of a complete encryption sequence; client lines are
 indicated by a C:, server responses by C::
 
-       C:  RESET
-       S:  OK
-       C:  RECIPIENT foo@example.net
-       S:  OK
-       C:  RECIPIENT bar@example.com
-       S:  OK
-       C:  PREP_ENCRYPT
-       S:  S PROTOCOL OpenPGP
-       S:  OK
-       C:  INPUT FD=17
-       S:  OK
-       C:  OUTPUT FD=18
-       S:  OK
-       C:  ENCRYPT
-       S:  OK
+         C:     S:     C:     S:     C:     S:     C:     S:     S:     C:     S:     C:     S:     C:     S: 
 
 
 File: gpgme.info,  Node: UI Server Sign,  Next: UI Server Decrypt,  Prev: UI Server Encrypt,  Up: UI Server Protocol
@@ -5984,29 +5909,29 @@ output file descriptors:
  -- Command: INPUT FD=N
      Set the file descriptor for the message to be signed to N.  The
      message send to the server is binary encoded.  For details on the
-     file descriptor, see the description of `INPUT' in the `ENCRYPT'
+     file descriptor, see the description of ‘INPUT’ in the ‘ENCRYPT’
      section.
 
- -- Command: OUTPUT FD=N [-binary]
+ -- Command: OUTPUT FD=N [--binary]
      Set the file descriptor to be used for the output.  The output is
      either the complete signed message or in case of a detached
-     signature just that detached signature.  If the option `--binary'
+     signature just that detached signature.  If the option ‘--binary’
      is given the output shall be in binary format; if not given, the
      output for OpenPGP needs to be ASCII armored and for CMS Base-64
-     encoded.  For details on the file descriptor, see the `INPUT'
+     encoded.  For details on the file descriptor, see the ‘INPUT’
      command.
 
 To allow the server the selection of a non-default signing key the
-client may optionally use the `SENDER' command, see *note command
+client may optionally use the ‘SENDER’ command, see *note command
 SENDER::.
 
 The signing operation is then initiated by:
 
  -- Command: SIGN --protocol=NAME [--detached]
-     Sign the data set with the `INPUT' command and write it to the sink
-     set by OUTPUT.  NAME is the signing protocol used for the message.
-     For a description of the allowed protocols see the `ENCRYPT'
-     command.  With option `--detached' given, a detached signature is
+     Sign the data set with the ‘INPUT’ command and write it to the sink
+     set by OUTPUT. NAME is the signing protocol used for the message.
+     For a description of the allowed protocols see the ‘ENCRYPT’
+     command.  With option ‘--detached’ given, a detached signature is
      created; this is actually the usual way the command is used.
 
 The client expects the server to send at least this status information
@@ -6014,11 +5939,11 @@ before the final OK response:
 
  -- Status line: MICALG STRING
      The STRING represents the hash algorithm used to create the
-     signature. It is used with RFC-1847 style signature messages and
+     signature.  It is used with RFC-1847 style signature messages and
      defined by PGP/MIME (RFC-3156) and S/MIME (RFC-3851).  The GPGME
-     library has a supporting function `gpgme_hash_algo_name' to return
-     the algorithm name as a string.  This string needs to be
-     lowercased and for OpenPGP prefixed with "`pgp-'".
+     library has a supporting function ‘gpgme_hash_algo_name’ to return
+     the algorithm name as a string.  This string needs to be lowercased
+     and for OpenPGP prefixed with "‘pgp-’".
 
 
 File: gpgme.info,  Node: UI Server Decrypt,  Next: UI Server Verify,  Prev: UI Server Sign,  Up: UI Server Protocol
@@ -6027,29 +5952,29 @@ A.3 UI Server: Decrypt a Message
 ================================
 
 Decryption may include the verification of OpenPGP messages.  This is
-due to the often used combined signing/encryption modus of OpenPGP.  The
+due to the often used combined signing/encryption modus of OpenPGP. The
 client may pass an option to the server to inhibit the signature
 verification.  The following two commands are required to set the input
 and output file descriptors:
 
  -- Command: INPUT FD=N
      Set the file descriptor for the message to be decrypted to N.  The
-     message send to the server is either binary encoded or -- in the
-     case of OpenPGP -- ASCII armored.  For details on the file
-     descriptor, see the description of `INPUT' in the `ENCRYPT'
+     message send to the server is either binary encoded or — in the
+     case of OpenPGP — ASCII armored.  For details on the file
+     descriptor, see the description of ‘INPUT’ in the ‘ENCRYPT’
      section.
 
  -- Command: OUTPUT FD=N
-     Set the file descriptor to be used for the output. The output is
-     binary encoded. For details on the file descriptor, see the
-     description of `INPUT' in the `ENCRYPT' section.
+     Set the file descriptor to be used for the output.  The output is
+     binary encoded.  For details on the file descriptor, see the
+     description of ‘INPUT’ in the ‘ENCRYPT’ section.
 
 The decryption is started with the command:
 
  -- Command: DECRYPT --protocol=NAME [--no-verify]
-     NAME is the encryption protocol used for the message. For a
-     description of the allowed protocols see the `ENCRYPT' command.
-     This argument is mandatory.  If the option `--no-verify' is given,
+     NAME is the encryption protocol used for the message.  For a
+     description of the allowed protocols see the ‘ENCRYPT’ command.
+     This argument is mandatory.  If the option ‘--no-verify’ is given,
      the server should not try to verify a signature, in case the input
      data is an OpenPGP combined message.
 
@@ -6065,68 +5990,63 @@ kind message is to be verified.
 
  -- Command: MESSAGE FD=N
      This command is used with detached signatures to set the file
-     descriptor for the signed data to N. The data is binary encoded
+     descriptor for the signed data to N.  The data is binary encoded
      (used verbatim).  For details on the file descriptor, see the
-     description of `INPUT' in the `ENCRYPT' section.
+     description of ‘INPUT’ in the ‘ENCRYPT’ section.
 
  -- Command: INPUT FD=N
      Set the file descriptor for the opaque message or the signature
      part of a detached signature to N.  The message send to the server
-     is either binary encoded or - in the case of OpenPGP - ASCII
+     is either binary encoded or – in the case of OpenPGP – ASCII
      armored.  For details on the file descriptor, see the description
-     of `INPUT' in the `ENCRYPT' section.
+     of ‘INPUT’ in the ‘ENCRYPT’ section.
 
  -- Command: OUTPUT FD=N
-     Set the file descriptor to be used for the output. The output is
-     binary encoded and only used for opaque signatures.  For details
-     on the file descriptor, see the description of `INPUT' in the
-     `ENCRYPT' section.
+     Set the file descriptor to be used for the output.  The output is
+     binary encoded and only used for opaque signatures.  For details on
+     the file descriptor, see the description of ‘INPUT’ in the
+     ‘ENCRYPT’ section.
 
 The verification is then started using:
 
  -- Command: VERIFY --protocol=NAME [--silent]
-     NAME is the signing protocol used for the message. For a
-     description of the allowed protocols see the `ENCRYPT' command.
+     NAME is the signing protocol used for the message.  For a
+     description of the allowed protocols see the ‘ENCRYPT’ command.
      This argument is mandatory.  Depending on the combination of
-     `MESSAGE' `INPUT' and `OUTPUT' commands, the server needs to
-     select the appropriate verification mode:
+     ‘MESSAGE’ ‘INPUT’ and ‘OUTPUT’ commands, the server needs to select
+     the appropriate verification mode:
 
-    MESSAGE and INPUT
+     MESSAGE and INPUT
           This indicates a detached signature.  Output data is not
           applicable.
-
-    INPUT
+     INPUT
           This indicates an opaque signature.  As no output command has
           been given, the server is only required to check the
           signature.
-
-    INPUT and OUTPUT
+     INPUT and OUTPUT
           This indicates an opaque signature.  The server shall write
           the signed data to the file descriptor set by the output
           command.  This data shall even be written if the signatures
-          can't be verified.
+          can’t be verified.
 
-   With `--silent' the server shall not display any dialog; this is for
-example used by the client to get the content of opaque signed
-messages. The client expects the server to send at least this status
-information before the final OK response:
+   With ‘--silent’ the server shall not display any dialog; this is for
+example used by the client to get the content of opaque signed messages.
+The client expects the server to send at least this status information
+before the final OK response:
 
  -- Status line: SIGSTATUS FLAG DISPLAYSTRING
      Returns the status for the signature and a short string explaining
      the status.  Valid values for FLAG are:
 
-    `none'
+     ‘none’
           The message has a signature but it could not not be verified
           due to a missing key.
-
-    `green'
+     ‘green’
           The signature is fully valid.
-
-    `yellow'
+     ‘yellow’
           The signature is valid but additional information was shown
           regarding the validity of the key.
-
-    `red'
+     ‘red’
           The signature is not valid.
 
      DISPLAYSTRING is a percent-and-plus-encoded string with a short
@@ -6142,7 +6062,6 @@ information before the final OK response:
      The server shall send one status line for every signature found on
      the message.
 
-
 
 File: gpgme.info,  Node: UI Server Set Input Files,  Next: UI Server Sign/Encrypt Files,  Prev: UI Server Verify,  Up: UI Server Protocol
 
@@ -6150,20 +6069,20 @@ A.5 UI Server: Specifying the input files to operate on.
 ========================================================
 
 All file related UI server commands operate on a number of input files
-or directories, specified by one or more `FILE' commands:
+or directories, specified by one or more ‘FILE’ commands:
 
- -- Command: FILE [-clear] NAME
+ -- Command: FILE [--clear] NAME
      Add the file or directory NAME to the list of pathnames to be
      processed by the server.  The parameter NAME must be an absolute
      path name (including the drive letter) and is percent espaced (in
      particular, the characters %, = and white space characters are
-     always escaped).  If the option `--clear' is given, the list of
+     always escaped).  If the option ‘--clear’ is given, the list of
      files is cleared before adding NAME.
 
-     Historical note: The original spec did not define `--clear' but
-     the keyword `--continued' after the file name to indicate that
-     more files are to be expected.  However, this has never been used
-     and thus removed from the specs.
+     Historical note: The original spec did not define ‘--clear’ but the
+     keyword ‘--continued’ after the file name to indicate that more
+     files are to be expected.  However, this has never been used and
+     thus removed from the specs.
 
 
 File: gpgme.info,  Node: UI Server Sign/Encrypt Files,  Next: UI Server Verify/Decrypt Files,  Prev: UI Server Set Input Files,  Up: UI Server Protocol
@@ -6171,13 +6090,13 @@ File: gpgme.info,  Node: UI Server Sign/Encrypt Files,  Next: UI Server Verify/D
 A.6 UI Server: Encrypting and signing files.
 ============================================
 
-First, the input files need to be specified by one or more `FILE'
+First, the input files need to be specified by one or more ‘FILE’
 commands.  Afterwards, the actual operation is requested:
 
- -- Command: ENCRYPT_FILES -nohup
- -- Command: SIGN_FILES -nohup
- -- Command: ENCRYPT_SIGN_FILES -nohup
-     Request that the files specified by `FILE' are encrypted and/or
+ -- Command: ENCRYPT_FILES --nohup
+ -- Command: SIGN_FILES --nohup
+ -- Command: ENCRYPT_SIGN_FILES --nohup
+     Request that the files specified by ‘FILE’ are encrypted and/or
      signed.  The command selects the default action.  The UI server may
      allow the user to change this default afterwards interactively, and
      even abort the operation or complete it only on some of the
@@ -6187,18 +6106,18 @@ commands.  Afterwards, the actual operation is requested:
      the preferences of the user, the functionality the UI server
      provides, and the selected protocol.  Typically, for each input
      file a new file is created under the original filename plus a
-     protocol specific extension (like `.gpg' or `.sig'), which contain
+     protocol specific extension (like ‘.gpg’ or ‘.sig’), which contain
      the encrypted/signed file or a detached signature.  For
-     directories, the server may offer multiple options to the user
-     (for example ignore or process recursively).
+     directories, the server may offer multiple options to the user (for
+     example ignore or process recursively).
 
-     The `ENCRYPT_SIGN_FILES' command requests a combined sign and
+     The ‘ENCRYPT_SIGN_FILES’ command requests a combined sign and
      encrypt operation.  It may not be available for all protocols (for
      example, it is available for OpenPGP but not for CMS).
 
-     The option `--nohup' is mandatory.  It is currently unspecified
-     what should happen if `--nohup' is not present.  Because `--nohup'
-     is present, the server always returns `OK' promptly, and completes
+     The option ‘--nohup’ is mandatory.  It is currently unspecified
+     what should happen if ‘--nohup’ is not present.  Because ‘--nohup’
+     is present, the server always returns ‘OK’ promptly, and completes
      the operation asynchronously.
 
 
@@ -6207,34 +6126,33 @@ File: gpgme.info,  Node: UI Server Verify/Decrypt Files,  Next: UI Server Import
 A.7 UI Server: Decrypting and verifying files.
 ==============================================
 
-First, the input files need to be specified by one or more `FILE'
+First, the input files need to be specified by one or more ‘FILE’
 commands.  Afterwards, the actual operation is requested:
 
- -- Command: DECRYPT_FILES -nohup
- -- Command: VERIFY_FILES -nohup
- -- Command: DECRYPT_VERIFY_FILES -nohup
-     Request that the files specified by `FILE' are decrypted and/or
+ -- Command: DECRYPT_FILES --nohup
+ -- Command: VERIFY_FILES --nohup
+ -- Command: DECRYPT_VERIFY_FILES --nohup
+     Request that the files specified by ‘FILE’ are decrypted and/or
      verified.  The command selects the default action.  The UI server
-     may allow the user to change this default afterwards
-     interactively, and even abort the operation or complete it only on
-     some of the selected files and directories.
+     may allow the user to change this default afterwards interactively,
+     and even abort the operation or complete it only on some of the
+     selected files and directories.
 
      What it means to decrypt or verify a file or directory is specific
      to the preferences of the user, the functionality the UI server
      provides, and the selected protocol.  Typically, for decryption, a
-     new file is created for each input file under the original
-     filename minus a protocol specific extension (like `.gpg') which
-     contains the original plaintext.  For verification a status is
-     displayed for each signed input file, indicating if it is signed,
-     and if yes, if the signature is valid.  For files that are signed
-     and encrypted, the `VERIFY' command transiently decrypts the file
-     to verify the enclosed signature.  For directories, the server may
-     offer multiple options to the user (for example ignore or process
-     recursively).
-
-     The option `--nohup' is mandatory.  It is currently unspecified
-     what should happen if `--nohup' is not present.  Because `--nohup'
-     is present, the server always returns `OK' promptly, and completes
+     new file is created for each input file under the original filename
+     minus a protocol specific extension (like ‘.gpg’) which contains
+     the original plaintext.  For verification a status is displayed for
+     each signed input file, indicating if it is signed, and if yes, if
+     the signature is valid.  For files that are signed and encrypted,
+     the ‘VERIFY’ command transiently decrypts the file to verify the
+     enclosed signature.  For directories, the server may offer multiple
+     options to the user (for example ignore or process recursively).
+
+     The option ‘--nohup’ is mandatory.  It is currently unspecified
+     what should happen if ‘--nohup’ is not present.  Because ‘--nohup’
+     is present, the server always returns ‘OK’ promptly, and completes
      the operation asynchronously.
 
 
@@ -6243,22 +6161,22 @@ File: gpgme.info,  Node: UI Server Import/Export Keys,  Next: UI Server Checksum
 A.8 UI Server: Managing certificates.
 =====================================
 
-First, the input files need to be specified by one or more `FILE'
+First, the input files need to be specified by one or more ‘FILE’
 commands.  Afterwards, the actual operation is requested:
 
- -- Command: IMPORT_FILES -nohup
+ -- Command: IMPORT_FILES --nohup
      Request that the certificates contained in the files specified by
-     `FILE' are imported into the local certificate databases.
+     ‘FILE’ are imported into the local certificate databases.
 
      For directories, the server may offer multiple options to the user
      (for example ignore or process recursively).
 
-     The option `--nohup' is mandatory.  It is currently unspecified
-     what should happen if `--nohup' is not present.  Because `--nohup'
-     is present, the server always returns `OK' promptly, and completes
+     The option ‘--nohup’ is mandatory.  It is currently unspecified
+     what should happen if ‘--nohup’ is not present.  Because ‘--nohup’
+     is present, the server always returns ‘OK’ promptly, and completes
      the operation asynchronously.
 
-   FIXME: It may be nice to support an `EXPORT' command as well, which
+   FIXME: It may be nice to support an ‘EXPORT’ command as well, which
 is enabled by the context menu of the background of a directory.
 
 
@@ -6267,40 +6185,40 @@ File: gpgme.info,  Node: UI Server Checksum Files,  Next: Miscellaneous UI Serve
 A.9 UI Server: Create and verify checksums for files.
 =====================================================
 
-First, the input files need to be specified by one or more `FILE'
+First, the input files need to be specified by one or more ‘FILE’
 commands.  Afterwards, the actual operation is requested:
 
- -- Command: CHECKSUM_CREATE_FILES -nohup
+ -- Command: CHECKSUM_CREATE_FILES --nohup
      Request that checksums are created for the files specifed by
-     `FILE'.  The choice of checksum algorithm and the destination
+     ‘FILE’.  The choice of checksum algorithm and the destination
      storage and format for the created checksums depend on the
      preferences of the user and the functionality provided by the UI
      server.  For directories, the server may offer multiple options to
      the user (for example ignore or process recursively).
 
-     The option `--nohup' is mandatory.  It is currently unspecified
-     what should happen if `--nohup' is not present.  Because `--nohup'
-     is present, the server always returns `OK' promptly, and completes
+     The option ‘--nohup’ is mandatory.  It is currently unspecified
+     what should happen if ‘--nohup’ is not present.  Because ‘--nohup’
+     is present, the server always returns ‘OK’ promptly, and completes
      the operation asynchronously.
 
- -- Command: CHECKSUM_VERIFY_FILES -nohup
-     Request that checksums are created for the files specifed by
-     `FILE' and verified against previously created and stored
-     checksums.  The choice of checksum algorithm and the source storage
-     and format for previously created checksums depend on the
-     preferences of the user and the functionality provided by the UI
-     server.  For directories, the server may offer multiple options to
-     the user (for example ignore or process recursively).
+ -- Command: CHECKSUM_VERIFY_FILES --nohup
+     Request that checksums are created for the files specifed by ‘FILE’
+     and verified against previously created and stored checksums.  The
+     choice of checksum algorithm and the source storage and format for
+     previously created checksums depend on the preferences of the user
+     and the functionality provided by the UI server.  For directories,
+     the server may offer multiple options to the user (for example
+     ignore or process recursively).
 
      If the source storage of previously created checksums is available
-     to the user through the Windows shell, this command may also
-     accept such checksum files as `FILE' arguments.  In this case, the
-     UI server should instead verify the checksum of the referenced
-     files as if they were given as INPUT files.
-
-     The option `--nohup' is mandatory.  It is currently unspecified
-     what should happen if `--nohup' is not present.  Because `--nohup'
-     is present, the server always returns `OK' promptly, and completes
+     to the user through the Windows shell, this command may also accept
+     such checksum files as ‘FILE’ arguments.  In this case, the UI
+     server should instead verify the checksum of the referenced files
+     as if they were given as INPUT files.
+
+     The option ‘--nohup’ is mandatory.  It is currently unspecified
+     what should happen if ‘--nohup’ is not present.  Because ‘--nohup’
+     is present, the server always returns ‘OK’ promptly, and completes
      the operation asynchronously.
 
 
@@ -6317,7 +6235,7 @@ related to a specific command:
      of information.  The required subcommands as described by the WHAT
      parameter are:
 
-    `pid'
+     ‘pid’
           Return the process id of the server in decimal notation using
           an Assuan data line.
 
@@ -6326,10 +6244,10 @@ client, the client is advised to tell the server by sending the option:
 
  -- Command option: window-id NUMBER
      The NUMBER represents the native window ID of the clients current
-     window.  On Windows systems this is a windows handle (`HWND') and
-     on X11 systems it is the `X Window ID'.  The number needs to be
+     window.  On Windows systems this is a windows handle (‘HWND’) and
+     on X11 systems it is the ‘X Window ID’.  The number needs to be
      given as a hexadecimal value so that it is easier to convey pointer
-     values (e.g. `HWND').
+     values (e.g.  ‘HWND’).
 
 A client may want to fire up the certificate manager of the server.  To
 do this it uses the Assuan command:
@@ -6338,8 +6256,8 @@ do this it uses the Assuan command:
      The server shall pop up the main window of the key manager (aka
      certificate manager).  The client expects that the key manager is
      brought into the foregound and that this command immediatley
-     returns (does not wait until the key manager has been fully
-     brought up).
+     returns (does not wait until the key manager has been fully brought
+     up).
 
 A client may want to fire up the configuration dialog of the server.  To
 do this it uses the Assuan command:
@@ -6347,7 +6265,7 @@ do this it uses the Assuan command:
  -- Command: START_CONFDIALOG
      The server shall pop up its configuration dialog.  The client
      expects that this dialog is brought into the foregound and that
-     this command immediatley returns (i.e. it does not wait until the
+     this command immediatley returns (i.e.  it does not wait until the
      dialog has been fully brought up).
 
 When doing an operation on a mail, it is useful to let the server know
@@ -6357,16 +6275,16 @@ the address of the sender:
      EMAIL is the plain ASCII encoded address ("addr-spec" as per
      RFC-2822) enclosed in angle brackets.  The address set with this
      command is valid until a successful completion of the operation or
-     until a `RESET' command.  A second command overrides the effect of
-     the first one; if EMAIL is not given and `--info' is not used, the
+     until a ‘RESET’ command.  A second command overrides the effect of
+     the first one; if EMAIL is not given and ‘--info’ is not used, the
      server shall use the default signing key.
 
-     If option `--info' is not given, the server shall also suggest a
+     If option ‘--info’ is not given, the server shall also suggest a
      protocol to use for signing.  The client may use this suggested
      protocol on its own discretion.  The same status line as with
      PREP_ENCRYPT is used for this.
 
-     The option `--protocol' may be used to give the server a hint on
+     The option ‘--protocol’ may be used to give the server a hint on
      which signing protocol should be preferred.
 
 To allow the UI-server to visually identify a running operation or to
@@ -6375,17 +6293,16 @@ associate operations the server MAY support the command:
  -- Command: SESSION NUMBER [STRING]
      The NUMBER is an arbitrary value, a server may use to associate
      simultaneous running sessions.  It is a 32 bit unsigned integer
-     with `0' as a special value indicating that no session association
+     with ‘0’ as a special value indicating that no session association
      shall be done.
 
      If STRING is given, the server may use this as the title of a
      window or, in the case of an email operation, to extract the
-     sender's address. The string may contain spaces; thus no
+     sender’s address.  The string may contain spaces; thus no
      plus-escaping is used.
 
      This command may be used at any time and overrides the effect of
-     the last command.  A `RESET' undoes the effect of this command.
-
+     the last command.  A ‘RESET’ undoes the effect of this command.
 
 
 File: gpgme.info,  Node: Debugging,  Next: Library Copying,  Prev: UI Server Protocol,  Up: Top
@@ -6400,26 +6317,26 @@ for the library itself.  Here we give a few hints on how to solve such
 problems.
 
    First of all you should make sure that the keys you want to use are
-installed in the GnuPG engine and are usable.  Thus the first test is
-to run the desired operation using `gpg' or `gpgsm' on the command
-line.  If you can't figure out why things don't work, you may use
-GPGME's built in trace feature.  This feature is either enabled using
-the environment variable `GPGME_DEBUG' or, if this is not possible, by
-calling the function `gpgme_set_global_flag'.  The value is the trace
-level and an optional file name.  If no file name is given the trace
-output is printed to `stderr'.
+installed in the GnuPG engine and are usable.  Thus the first test is to
+run the desired operation using ‘gpg’ or ‘gpgsm’ on the command line.
+If you can’t figure out why things don’t work, you may use GPGME’s built
+in trace feature.  This feature is either enabled using the environment
+variable ‘GPGME_DEBUG’ or, if this is not possible, by calling the
+function ‘gpgme_set_global_flag’.  The value is the trace level and an
+optional file name.  If no file name is given the trace output is
+printed to ‘stderr’.
 
 For example
      GPGME_DEBUG=9:/home/user/mygpgme.log
-   (Note that under Windows you use a semicolon in place of the colon to
+(Note that under Windows you use a semicolon in place of the colon to
 separate the fields.)
 
    A trace level of 9 is pretty verbose and thus you may want to start
 off with a lower level.  The exact definition of the trace levels and
 the output format may change with any release; you need to check the
-source code for details.  In any case the trace log should be helpful
-to understand what is going going on.  Warning: The trace log may
-reveal sensitive details like passphrases or other data you use in your
+source code for details.  In any case the trace log should be helpful to
+understand what is going going on.  Warning: The trace log may reveal
+sensitive details like passphrases or other data you use in your
 application.  If you are asked to send a log file, make sure that you
 run your tests only with play data.
 
@@ -6431,8 +6348,8 @@ GNU Lesser General Public License
 
                       Version 2.1, February 1999
 
-     Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-     59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+     Copyright © 1991, 1999 Free Software Foundation, Inc.
+     59 Temple Place – Suite 330, Boston, MA 02111-1307, USA
 
      Everyone is permitted to copy and distribute verbatim copies
      of this license document, but changing it is not allowed.
@@ -6444,17 +6361,17 @@ GNU Lesser General Public License
 Preamble
 ========
 
-The licenses for most software are designed to take away your freedom
-to share and change it.  By contrast, the GNU General Public Licenses
-are intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.
+The licenses for most software are designed to take away your freedom to
+share and change it.  By contrast, the GNU General Public Licenses are
+intended to guarantee your freedom to share and change free software—to
+make sure the software is free for all its users.
 
    This license, the Lesser General Public License, applies to some
-specially designated software--typically libraries--of the Free
-Software Foundation and other authors who decide to use it.  You can use
-it too, but we suggest you first think carefully about whether this
-license or the ordinary General Public License is the better strategy to
-use in any particular case, based on the explanations below.
+specially designated software—typically libraries—of the Free Software
+Foundation and other authors who decide to use it.  You can use it too,
+but we suggest you first think carefully about whether this license or
+the ordinary General Public License is the better strategy to use in any
+particular case, based on the explanations below.
 
    When we speak of free software, we are referring to freedom of use,
 not price.  Our General Public Licenses are designed to make sure that
@@ -6474,97 +6391,98 @@ or for a fee, you must give the recipients all the rights that we gave
 you.  You must make sure that they, too, receive or can get the source
 code.  If you link other code with the library, you must provide
 complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
+with the library after making changes to the library and recompiling it.
+And you must show them these terms so they know their rights.
 
    We protect your rights with a two-step method: (1) we copyright the
 library, and (2) we offer you this license, which gives you legal
 permission to copy, distribute and/or modify the library.
 
-   To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know that
-what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
+   To protect each distributor, we want to make it very clear that there
+is no warranty for the free library.  Also, if the library is modified
+by someone else and passed on, the recipients should know that what they
+have is not the original version, so that the original author’s
+reputation will not be affected by problems that might be introduced by
+others.
 
    Finally, software patents pose a constant threat to the existence of
 any free program.  We wish to make sure that a company cannot
 effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
+restrictive license from a patent holder.  Therefore, we insist that any
+patent license obtained for a version of the library must be consistent
+with the full freedom of use specified in this license.
 
    Most GNU software, including some libraries, is covered by the
 ordinary GNU General Public License.  This license, the GNU Lesser
 General Public License, applies to certain designated libraries, and is
 quite different from the ordinary General Public License.  We use this
-license for certain libraries in order to permit linking those
-libraries into non-free programs.
+license for certain libraries in order to permit linking those libraries
+into non-free programs.
 
    When a program is linked with a library, whether statically or using
 a shared library, the combination of the two is legally speaking a
 combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
+General Public License therefore permits such linking only if the entire
+combination fits its criteria of freedom.  The Lesser General Public
+License permits more lax criteria for linking other code with the
+library.
 
    We call this license the "Lesser" General Public License because it
-does _Less_ to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
+does _Less_ to protect the user’s freedom than the ordinary General
+Public License.  It also provides other free software developers Less of
+an advantage over competing non-free programs.  These disadvantages are
+the reason we use the ordinary General Public License for many
 libraries.  However, the Lesser license provides advantages in certain
 special circumstances.
 
    For example, on rare occasions, there may be a special need to
 encourage the widest possible use of a certain library, so that it
 becomes a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
+allowed to use the library.  A more frequent case is that a free library
+does the same job as widely used non-free libraries.  In this case,
+there is little to gain by limiting the free library to free software
+only, so we use the Lesser General Public License.
 
    In other cases, permission to use a particular library in non-free
 programs enables a greater number of people to use a large body of free
 software.  For example, permission to use the GNU C Library in non-free
-programs enables many more people to use the whole GNU operating
-system, as well as its variant, the GNU/Linux operating system.
+programs enables many more people to use the whole GNU operating system,
+as well as its variant, the GNU/Linux operating system.
 
    Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run that
-program using a modified version of the Library.
+users’ freedom, it does ensure that the user of a program that is linked
+with the Library has the freedom and the wherewithal to run that program
+using a modified version of the Library.
 
    The precise terms and conditions for copying, distribution and
 modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
+“work based on the library” and a “work that uses the library”.  The
 former contains code derived from the library, whereas the latter must
 be combined with the library in order to run.
 
                    GNU LESSER GENERAL PUBLIC LICENSE
     TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
   0. This License Agreement applies to any software library or other
      program which contains a notice placed by the copyright holder or
-     other authorized party saying it may be distributed under the
-     terms of this Lesser General Public License (also called "this
-     License").  Each licensee is addressed as "you".
+     other authorized party saying it may be distributed under the terms
+     of this Lesser General Public License (also called “this License”).
+     Each licensee is addressed as “you”.
 
-     A "library" means a collection of software functions and/or data
+     A “library” means a collection of software functions and/or data
      prepared so as to be conveniently linked with application programs
      (which use some of those functions and data) to form executables.
 
-     The "Library", below, refers to any such software library or work
-     which has been distributed under these terms.  A "work based on the
-     Library" means either the Library or any derivative work under
+     The “Library”, below, refers to any such software library or work
+     which has been distributed under these terms.  A “work based on the
+     Library” means either the Library or any derivative work under
      copyright law: that is to say, a work containing the Library or a
      portion of it, either verbatim or with modifications and/or
      translated straightforwardly into another language.  (Hereinafter,
      translation is included without limitation in the term
-     "modification".)
+     “modification”.)
 
-     "Source code" for a work means the preferred form of the work for
+     “Source code” for a work means the preferred form of the work for
      making modifications to it.  For a library, complete source code
      means all the source code for all modules it contains, plus any
      associated interface definition files, plus the scripts used to
@@ -6576,10 +6494,10 @@ be combined with the library in order to run.
      output from such a program is covered only if its contents
      constitute a work based on the Library (independent of the use of
      the Library in a tool for writing it).  Whether that is true
-     depends on what the Library does and what the program that uses
-     the Library does.
+     depends on what the Library does and what the program that uses the
+     Library does.
 
-  1. You may copy and distribute verbatim copies of the Library's
+  1. You may copy and distribute verbatim copies of the Library’s
      complete source code as you receive it, in any medium, provided
      that you conspicuously and appropriately publish on each copy an
      appropriate copyright notice and disclaimer of warranty; keep
@@ -6591,8 +6509,8 @@ be combined with the library in order to run.
      and you may at your option offer warranty protection in exchange
      for a fee.
 
-  2. You may modify your copy or copies of the Library or any portion
-     of it, thus forming a work based on the Library, and copy and
+  2. You may modify your copy or copies of the Library or any portion of
+     it, thus forming a work based on the Library, and copy and
      distribute such modifications or work under the terms of Section 1
      above, provided that you also meet all of these conditions:
 
@@ -6607,10 +6525,10 @@ be combined with the library in order to run.
        d. If a facility in the modified Library refers to a function or
           a table of data to be supplied by an application program that
           uses the facility, other than as an argument passed when the
-          facility is invoked, then you must make a good faith effort
-          to ensure that, in the event an application does not supply
-          such function or table, the facility still operates, and
-          performs whatever part of its purpose remains meaningful.
+          facility is invoked, then you must make a good faith effort to
+          ensure that, in the event an application does not supply such
+          function or table, the facility still operates, and performs
+          whatever part of its purpose remains meaningful.
 
           (For example, a function in a library to compute square roots
           has a purpose that is entirely well-defined independent of the
@@ -6622,13 +6540,13 @@ be combined with the library in order to run.
      These requirements apply to the modified work as a whole.  If
      identifiable sections of that work are not derived from the
      Library, and can be reasonably considered independent and separate
-     works in themselves, then this License, and its terms, do not
-     apply to those sections when you distribute them as separate
-     works.  But when you distribute the same sections as part of a
-     whole which is a work based on the Library, the distribution of
-     the whole must be on the terms of this License, whose permissions
-     for other licensees extend to the entire whole, and thus to each
-     and every part regardless of who wrote it.
+     works in themselves, then this License, and its terms, do not apply
+     to those sections when you distribute them as separate works.  But
+     when you distribute the same sections as part of a whole which is a
+     work based on the Library, the distribution of the whole must be on
+     the terms of this License, whose permissions for other licensees
+     extend to the entire whole, and thus to each and every part
+     regardless of who wrote it.
 
      Thus, it is not the intent of this section to claim rights or
      contest your rights to work written entirely by you; rather, the
@@ -6636,33 +6554,32 @@ be combined with the library in order to run.
      derivative or collective works based on the Library.
 
      In addition, mere aggregation of another work not based on the
-     Library with the Library (or with a work based on the Library) on
-     a volume of a storage or distribution medium does not bring the
-     other work under the scope of this License.
+     Library with the Library (or with a work based on the Library) on a
+     volume of a storage or distribution medium does not bring the other
+     work under the scope of this License.
 
   3. You may opt to apply the terms of the ordinary GNU General Public
-     License instead of this License to a given copy of the Library.
-     To do this, you must alter all the notices that refer to this
-     License, so that they refer to the ordinary GNU General Public
-     License, version 2, instead of to this License.  (If a newer
-     version than version 2 of the ordinary GNU General Public License
-     has appeared, then you can specify that version instead if you
-     wish.)  Do not make any other change in these notices.
+     License instead of this License to a given copy of the Library.  To
+     do this, you must alter all the notices that refer to this License,
+     so that they refer to the ordinary GNU General Public License,
+     version 2, instead of to this License.  (If a newer version than
+     version 2 of the ordinary GNU General Public License has appeared,
+     then you can specify that version instead if you wish.)  Do not
+     make any other change in these notices.
 
      Once this change is made in a given copy, it is irreversible for
      that copy, so the ordinary GNU General Public License applies to
      all subsequent copies and derivative works made from that copy.
 
-     This option is useful when you wish to copy part of the code of
-     the Library into a program that is not a library.
+     This option is useful when you wish to copy part of the code of the
+     Library into a program that is not a library.
 
-  4. You may copy and distribute the Library (or a portion or
-     derivative of it, under Section 2) in object code or executable
-     form under the terms of Sections 1 and 2 above provided that you
-     accompany it with the complete corresponding machine-readable
-     source code, which must be distributed under the terms of Sections
-     1 and 2 above on a medium customarily used for software
-     interchange.
+  4. You may copy and distribute the Library (or a portion or derivative
+     of it, under Section 2) in object code or executable form under the
+     terms of Sections 1 and 2 above provided that you accompany it with
+     the complete corresponding machine-readable source code, which must
+     be distributed under the terms of Sections 1 and 2 above on a
+     medium customarily used for software interchange.
 
      If distribution of object code is made by offering access to copy
      from a designated place, then offering equivalent access to copy
@@ -6671,19 +6588,18 @@ be combined with the library in order to run.
      compelled to copy the source along with the object code.
 
   5. A program that contains no derivative of any portion of the
-     Library, but is designed to work with the Library by being
-     compiled or linked with it, is called a "work that uses the
-     Library".  Such a work, in isolation, is not a derivative work of
-     the Library, and therefore falls outside the scope of this License.
+     Library, but is designed to work with the Library by being compiled
+     or linked with it, is called a “work that uses the Library”.  Such
+     a work, in isolation, is not a derivative work of the Library, and
+     therefore falls outside the scope of this License.
 
-     However, linking a "work that uses the Library" with the Library
+     However, linking a “work that uses the Library” with the Library
      creates an executable that is a derivative of the Library (because
-     it contains portions of the Library), rather than a "work that
-     uses the library".  The executable is therefore covered by this
-     License.  Section 6 states terms for distribution of such
-     executables.
+     it contains portions of the Library), rather than a “work that uses
+     the library”.  The executable is therefore covered by this License.
+     Section 6 states terms for distribution of such executables.
 
-     When a "work that uses the Library" uses material from a header
+     When a “work that uses the Library” uses material from a header
      file that is part of the Library, the object code for the work may
      be a derivative work of the Library even though the source code is
      not.  Whether this is true is especially significant if the work
@@ -6703,12 +6619,12 @@ be combined with the library in order to run.
      6.  Any executables containing that work also fall under Section 6,
      whether or not they are linked directly with the Library itself.
 
-  6. As an exception to the Sections above, you may also combine or
-     link a "work that uses the Library" with the Library to produce a
-     work containing portions of the Library, and distribute that work
-     under terms of your choice, provided that the terms permit
-     modification of the work for the customer's own use and reverse
-     engineering for debugging such modifications.
+  6. As an exception to the Sections above, you may also combine or link
+     a “work that uses the Library” with the Library to produce a work
+     containing portions of the Library, and distribute that work under
+     terms of your choice, provided that the terms permit modification
+     of the work for the customer’s own use and reverse engineering for
+     debugging such modifications.
 
      You must give prominent notice with each copy of the work that the
      Library is used in it and that the Library and its use are covered
@@ -6721,9 +6637,9 @@ be combined with the library in order to run.
        a. Accompany the work with the complete corresponding
           machine-readable source code for the Library including
           whatever changes were used in the work (which must be
-          distributed under Sections 1 and 2 above); and, if the work
-          is an executable linked with the Library, with the complete
-          machine-readable "work that uses the Library", as object code
+          distributed under Sections 1 and 2 above); and, if the work is
+          an executable linked with the Library, with the complete
+          machine-readable “work that uses the Library”, as object code
           and/or source code, so that the user can modify the Library
           and then relink to produce a modified executable containing
           the modified Library.  (It is understood that the user who
@@ -6733,7 +6649,7 @@ be combined with the library in order to run.
 
        b. Use a suitable shared library mechanism for linking with the
           Library.  A suitable mechanism is one that (1) uses at run
-          time a copy of the library already present on the user's
+          time a copy of the library already present on the user’s
           computer system, rather than copying library functions into
           the executable, and (2) will operate properly with a modified
           version of the library, if the user installs one, as long as
@@ -6752,8 +6668,8 @@ be combined with the library in order to run.
        e. Verify that the user has already received a copy of these
           materials or that you have already sent this user a copy.
 
-     For an executable, the required form of the "work that uses the
-     Library" must include any data and utility programs needed for
+     For an executable, the required form of the “work that uses the
+     Library” must include any data and utility programs needed for
      reproducing the executable from it.  However, as a special
      exception, the materials to be distributed need not include
      anything that is normally distributed (in either source or binary
@@ -6764,16 +6680,15 @@ be combined with the library in order to run.
      It may happen that this requirement contradicts the license
      restrictions of other proprietary libraries that do not normally
      accompany the operating system.  Such a contradiction means you
-     cannot use both them and the Library together in an executable
-     that you distribute.
+     cannot use both them and the Library together in an executable that
+     you distribute.
 
   7. You may place library facilities that are a work based on the
      Library side-by-side in a single library together with other
-     library facilities not covered by this License, and distribute
-     such a combined library, provided that the separate distribution
-     of the work based on the Library and of the other library
-     facilities is otherwise permitted, and provided that you do these
-     two things:
+     library facilities not covered by this License, and distribute such
+     a combined library, provided that the separate distribution of the
+     work based on the Library and of the other library facilities is
+     otherwise permitted, and provided that you do these two things:
 
        a. Accompany the combined library with a copy of the same work
           based on the Library, uncombined with any other library
@@ -6789,29 +6704,29 @@ be combined with the library in order to run.
      Library except as expressly provided under this License.  Any
      attempt otherwise to copy, modify, sublicense, link with, or
      distribute the Library is void, and will automatically terminate
-     your rights under this License.  However, parties who have
-     received copies, or rights, from you under this License will not
-     have their licenses terminated so long as such parties remain in
-     full compliance.
+     your rights under this License.  However, parties who have received
+     copies, or rights, from you under this License will not have their
+     licenses terminated so long as such parties remain in full
+     compliance.
 
   9. You are not required to accept this License, since you have not
      signed it.  However, nothing else grants you permission to modify
      or distribute the Library or its derivative works.  These actions
      are prohibited by law if you do not accept this License.
      Therefore, by modifying or distributing the Library (or any work
-     based on the Library), you indicate your acceptance of this
-     License to do so, and all its terms and conditions for copying,
+     based on the Library), you indicate your acceptance of this License
+     to do so, and all its terms and conditions for copying,
      distributing or modifying the Library or works based on it.
 
- 10. Each time you redistribute the Library (or any work based on the
+  10. Each time you redistribute the Library (or any work based on the
      Library), the recipient automatically receives a license from the
      original licensor to copy, distribute, link with or modify the
      Library subject to these terms and conditions.  You may not impose
-     any further restrictions on the recipients' exercise of the rights
+     any further restrictions on the recipients’ exercise of the rights
      granted herein.  You are not responsible for enforcing compliance
      by third parties with this License.
 
- 11. If, as a consequence of a court judgment or allegation of patent
+  11. If, as a consequence of a court judgment or allegation of patent
      infringement or for any other reason (not limited to patent
      issues), conditions are imposed on you (whether by court order,
      agreement or otherwise) that contradict the conditions of this
@@ -6820,10 +6735,10 @@ be combined with the library in order to run.
      your obligations under this License and any other pertinent
      obligations, then as a consequence you may not distribute the
      Library at all.  For example, if a patent license would not permit
-     royalty-free redistribution of the Library by all those who
-     receive copies directly or indirectly through you, then the only
-     way you could satisfy both it and this License would be to refrain
-     entirely from distribution of the Library.
+     royalty-free redistribution of the Library by all those who receive
+     copies directly or indirectly through you, then the only way you
+     could satisfy both it and this License would be to refrain entirely
+     from distribution of the Library.
 
      If any portion of this section is held invalid or unenforceable
      under any particular circumstance, the balance of the section is
@@ -6844,7 +6759,7 @@ be combined with the library in order to run.
      This section is intended to make thoroughly clear what is believed
      to be a consequence of the rest of this License.
 
- 12. If the distribution and/or use of the Library is restricted in
+  12. If the distribution and/or use of the Library is restricted in
      certain countries either by patents or by copyrighted interfaces,
      the original copyright holder who places the Library under this
      License may add an explicit geographical distribution limitation
@@ -6853,41 +6768,42 @@ be combined with the library in order to run.
      License incorporates the limitation as if written in the body of
      this License.
 
- 13. The Free Software Foundation may publish revised and/or new
+  13. The Free Software Foundation may publish revised and/or new
      versions of the Lesser General Public License from time to time.
      Such new versions will be similar in spirit to the present version,
      but may differ in detail to address new problems or concerns.
 
      Each version is given a distinguishing version number.  If the
-     Library specifies a version number of this License which applies
-     to it and "any later version", you have the option of following
-     the terms and conditions either of that version or of any later
-     version published by the Free Software Foundation.  If the Library
-     does not specify a license version number, you may choose any
-     version ever published by the Free Software Foundation.
-
- 14. If you wish to incorporate parts of the Library into other free
+     Library specifies a version number of this License which applies to
+     it and “any later version”, you have the option of following the
+     terms and conditions either of that version or of any later version
+     published by the Free Software Foundation.  If the Library does not
+     specify a license version number, you may choose any version ever
+     published by the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
      programs whose distribution conditions are incompatible with these,
      write to the author to ask for permission.  For software which is
      copyrighted by the Free Software Foundation, write to the Free
      Software Foundation; we sometimes make exceptions for this.  Our
      decision will be guided by the two goals of preserving the free
-     status of all derivatives of our free software and of promoting
-     the sharing and reuse of software generally.
+     status of all derivatives of our free software and of promoting the
+     sharing and reuse of software generally.
+
+                              NO WARRANTY
 
-                                NO WARRANTY
- 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
      WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE
-     LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-     HOLDERS AND/OR OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT
-     WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT
-     NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-     FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS TO THE
-     QUALITY AND PERFORMANCE OF THE LIBRARY IS WITH YOU.  SHOULD THE
-     LIBRARY PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY
-     SERVICING, REPAIR OR CORRECTION.
-
- 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+     LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS
+     AND/OR OTHER PARTIES PROVIDE THE LIBRARY “AS IS” WITHOUT WARRANTY
+     OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT
+     LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+     FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND
+     PERFORMANCE OF THE LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE
+     DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR
+     OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
      WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY
      MODIFY AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE
      LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL,
@@ -6899,6 +6815,7 @@ be combined with the library in order to run.
      ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
 
                       END OF TERMS AND CONDITIONS
+
 How to Apply These Terms to Your New Libraries
 ==============================================
 
@@ -6911,7 +6828,7 @@ the ordinary General Public License).
    To apply these terms, attach the following notices to the library.
 It is safest to attach them to the start of each source file to most
 effectively convey the exclusion of warranty; and each file should have
-at least the "copyright" line and a pointer to where the full notice is
+at least the “copyright” line and a pointer to where the full notice is
 found.
 
      ONE LINE TO GIVE THE LIBRARY'S NAME AND AN IDEA OF WHAT IT DOES.
@@ -6936,7 +6853,7 @@ found.
 mail.
 
    You should also get your employer (if you work as a programmer) or
-your school, if any, to sign a "copyright disclaimer" for the library,
+your school, if any, to sign a “copyright disclaimer” for the library,
 if necessary.  Here is a sample; alter the names:
 
      Yoyodyne, Inc., hereby disclaims all copyright interest in the library
@@ -6945,5 +6862,719 @@ if necessary.  Here is a sample; alter the names:
      SIGNATURE OF TY COON, 1 April 1990
      Ty Coon, President of Vice
 
-   That's all there is to it!
+   That’s all there is to it!
+
+
+File: gpgme.info,  Node: Copying,  Next: Function and Data Index,  Prev: Library Copying,  Up: Top
+
+GNU General Public License
+**************************
+
+                        Version 3, 29 June 2007
+
+     Copyright © 2007 Free Software Foundation, Inc. <http://fsf.org/>
+
+     Everyone is permitted to copy and distribute verbatim copies of this
+     license document, but changing it is not allowed.
+
+Preamble
+========
+
+The GNU General Public License is a free, copyleft license for software
+and other kinds of works.
+
+   The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program–to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+   When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+   To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+   For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+   Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+   For the developers’ and authors’ protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users’ and
+authors’ sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+   Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users’ freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+   Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+   The precise terms and conditions for copying, distribution and
+modification follow.
+
+                         TERMS AND CONDITIONS
+
+  0. Definitions.
+
+     “This License” refers to version 3 of the GNU General Public
+     License.
+
+     “Copyright” also means copyright-like laws that apply to other
+     kinds of works, such as semiconductor masks.
+
+     “The Program” refers to any copyrightable work licensed under this
+     License.  Each licensee is addressed as “you”.  “Licensees” and
+     “recipients” may be individuals or organizations.
+
+     To “modify” a work means to copy from or adapt all or part of the
+     work in a fashion requiring copyright permission, other than the
+     making of an exact copy.  The resulting work is called a “modified
+     version” of the earlier work or a work “based on” the earlier work.
+
+     A “covered work” means either the unmodified Program or a work
+     based on the Program.
+
+     To “propagate” a work means to do anything with it that, without
+     permission, would make you directly or secondarily liable for
+     infringement under applicable copyright law, except executing it on
+     a computer or modifying a private copy.  Propagation includes
+     copying, distribution (with or without modification), making
+     available to the public, and in some countries other activities as
+     well.
+
+     To “convey” a work means any kind of propagation that enables other
+     parties to make or receive copies.  Mere interaction with a user
+     through a computer network, with no transfer of a copy, is not
+     conveying.
+
+     An interactive user interface displays “Appropriate Legal Notices”
+     to the extent that it includes a convenient and prominently visible
+     feature that (1) displays an appropriate copyright notice, and (2)
+     tells the user that there is no warranty for the work (except to
+     the extent that warranties are provided), that licensees may convey
+     the work under this License, and how to view a copy of this
+     License.  If the interface presents a list of user commands or
+     options, such as a menu, a prominent item in the list meets this
+     criterion.
+
+  1. Source Code.
+
+     The “source code” for a work means the preferred form of the work
+     for making modifications to it.  “Object code” means any non-source
+     form of a work.
+
+     A “Standard Interface” means an interface that either is an
+     official standard defined by a recognized standards body, or, in
+     the case of interfaces specified for a particular programming
+     language, one that is widely used among developers working in that
+     language.
+
+     The “System Libraries” of an executable work include anything,
+     other than the work as a whole, that (a) is included in the normal
+     form of packaging a Major Component, but which is not part of that
+     Major Component, and (b) serves only to enable use of the work with
+     that Major Component, or to implement a Standard Interface for
+     which an implementation is available to the public in source code
+     form.  A “Major Component”, in this context, means a major
+     essential component (kernel, window system, and so on) of the
+     specific operating system (if any) on which the executable work
+     runs, or a compiler used to produce the work, or an object code
+     interpreter used to run it.
+
+     The “Corresponding Source” for a work in object code form means all
+     the source code needed to generate, install, and (for an executable
+     work) run the object code and to modify the work, including scripts
+     to control those activities.  However, it does not include the
+     work’s System Libraries, or general-purpose tools or generally
+     available free programs which are used unmodified in performing
+     those activities but which are not part of the work.  For example,
+     Corresponding Source includes interface definition files associated
+     with source files for the work, and the source code for shared
+     libraries and dynamically linked subprograms that the work is
+     specifically designed to require, such as by intimate data
+     communication or control flow between those subprograms and other
+     parts of the work.
+
+     The Corresponding Source need not include anything that users can
+     regenerate automatically from other parts of the Corresponding
+     Source.
+
+     The Corresponding Source for a work in source code form is that
+     same work.
+
+  2. Basic Permissions.
+
+     All rights granted under this License are granted for the term of
+     copyright on the Program, and are irrevocable provided the stated
+     conditions are met.  This License explicitly affirms your unlimited
+     permission to run the unmodified Program.  The output from running
+     a covered work is covered by this License only if the output, given
+     its content, constitutes a covered work.  This License acknowledges
+     your rights of fair use or other equivalent, as provided by
+     copyright law.
+
+     You may make, run and propagate covered works that you do not
+     convey, without conditions so long as your license otherwise
+     remains in force.  You may convey covered works to others for the
+     sole purpose of having them make modifications exclusively for you,
+     or provide you with facilities for running those works, provided
+     that you comply with the terms of this License in conveying all
+     material for which you do not control copyright.  Those thus making
+     or running the covered works for you must do so exclusively on your
+     behalf, under your direction and control, on terms that prohibit
+     them from making any copies of your copyrighted material outside
+     their relationship with you.
+
+     Conveying under any other circumstances is permitted solely under
+     the conditions stated below.  Sublicensing is not allowed; section
+     10 makes it unnecessary.
+
+  3. Protecting Users’ Legal Rights From Anti-Circumvention Law.
+
+     No covered work shall be deemed part of an effective technological
+     measure under any applicable law fulfilling obligations under
+     article 11 of the WIPO copyright treaty adopted on 20 December
+     1996, or similar laws prohibiting or restricting circumvention of
+     such measures.
+
+     When you convey a covered work, you waive any legal power to forbid
+     circumvention of technological measures to the extent such
+     circumvention is effected by exercising rights under this License
+     with respect to the covered work, and you disclaim any intention to
+     limit operation or modification of the work as a means of
+     enforcing, against the work’s users, your or third parties’ legal
+     rights to forbid circumvention of technological measures.
+
+  4. Conveying Verbatim Copies.
+
+     You may convey verbatim copies of the Program’s source code as you
+     receive it, in any medium, provided that you conspicuously and
+     appropriately publish on each copy an appropriate copyright notice;
+     keep intact all notices stating that this License and any
+     non-permissive terms added in accord with section 7 apply to the
+     code; keep intact all notices of the absence of any warranty; and
+     give all recipients a copy of this License along with the Program.
+
+     You may charge any price or no price for each copy that you convey,
+     and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+     You may convey a work based on the Program, or the modifications to
+     produce it from the Program, in the form of source code under the
+     terms of section 4, provided that you also meet all of these
+     conditions:
+
+       a. The work must carry prominent notices stating that you
+          modified it, and giving a relevant date.
+
+       b. The work must carry prominent notices stating that it is
+          released under this License and any conditions added under
+          section 7.  This requirement modifies the requirement in
+          section 4 to “keep intact all notices”.
+
+       c. You must license the entire work, as a whole, under this
+          License to anyone who comes into possession of a copy.  This
+          License will therefore apply, along with any applicable
+          section 7 additional terms, to the whole of the work, and all
+          its parts, regardless of how they are packaged.  This License
+          gives no permission to license the work in any other way, but
+          it does not invalidate such permission if you have separately
+          received it.
+
+       d. If the work has interactive user interfaces, each must display
+          Appropriate Legal Notices; however, if the Program has
+          interactive interfaces that do not display Appropriate Legal
+          Notices, your work need not make them do so.
+
+     A compilation of a covered work with other separate and independent
+     works, which are not by their nature extensions of the covered
+     work, and which are not combined with it such as to form a larger
+     program, in or on a volume of a storage or distribution medium, is
+     called an “aggregate” if the compilation and its resulting
+     copyright are not used to limit the access or legal rights of the
+     compilation’s users beyond what the individual works permit.
+     Inclusion of a covered work in an aggregate does not cause this
+     License to apply to the other parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+     You may convey a covered work in object code form under the terms
+     of sections 4 and 5, provided that you also convey the
+     machine-readable Corresponding Source under the terms of this
+     License, in one of these ways:
+
+       a. Convey the object code in, or embodied in, a physical product
+          (including a physical distribution medium), accompanied by the
+          Corresponding Source fixed on a durable physical medium
+          customarily used for software interchange.
+
+       b. Convey the object code in, or embodied in, a physical product
+          (including a physical distribution medium), accompanied by a
+          written offer, valid for at least three years and valid for as
+          long as you offer spare parts or customer support for that
+          product model, to give anyone who possesses the object code
+          either (1) a copy of the Corresponding Source for all the
+          software in the product that is covered by this License, on a
+          durable physical medium customarily used for software
+          interchange, for a price no more than your reasonable cost of
+          physically performing this conveying of source, or (2) access
+          to copy the Corresponding Source from a network server at no
+          charge.
+
+       c. Convey individual copies of the object code with a copy of the
+          written offer to provide the Corresponding Source.  This
+          alternative is allowed only occasionally and noncommercially,
+          and only if you received the object code with such an offer,
+          in accord with subsection 6b.
+
+       d. Convey the object code by offering access from a designated
+          place (gratis or for a charge), and offer equivalent access to
+          the Corresponding Source in the same way through the same
+          place at no further charge.  You need not require recipients
+          to copy the Corresponding Source along with the object code.
+          If the place to copy the object code is a network server, the
+          Corresponding Source may be on a different server (operated by
+          you or a third party) that supports equivalent copying
+          facilities, provided you maintain clear directions next to the
+          object code saying where to find the Corresponding Source.
+          Regardless of what server hosts the Corresponding Source, you
+          remain obligated to ensure that it is available for as long as
+          needed to satisfy these requirements.
+
+       e. Convey the object code using peer-to-peer transmission,
+          provided you inform other peers where the object code and
+          Corresponding Source of the work are being offered to the
+          general public at no charge under subsection 6d.
+
+     A separable portion of the object code, whose source code is
+     excluded from the Corresponding Source as a System Library, need
+     not be included in conveying the object code work.
+
+     A “User Product” is either (1) a “consumer product”, which means
+     any tangible personal property which is normally used for personal,
+     family, or household purposes, or (2) anything designed or sold for
+     incorporation into a dwelling.  In determining whether a product is
+     a consumer product, doubtful cases shall be resolved in favor of
+     coverage.  For a particular product received by a particular user,
+     “normally used” refers to a typical or common use of that class of
+     product, regardless of the status of the particular user or of the
+     way in which the particular user actually uses, or expects or is
+     expected to use, the product.  A product is a consumer product
+     regardless of whether the product has substantial commercial,
+     industrial or non-consumer uses, unless such uses represent the
+     only significant mode of use of the product.
+
+     “Installation Information” for a User Product means any methods,
+     procedures, authorization keys, or other information required to
+     install and execute modified versions of a covered work in that
+     User Product from a modified version of its Corresponding Source.
+     The information must suffice to ensure that the continued
+     functioning of the modified object code is in no case prevented or
+     interfered with solely because modification has been made.
+
+     If you convey an object code work under this section in, or with,
+     or specifically for use in, a User Product, and the conveying
+     occurs as part of a transaction in which the right of possession
+     and use of the User Product is transferred to the recipient in
+     perpetuity or for a fixed term (regardless of how the transaction
+     is characterized), the Corresponding Source conveyed under this
+     section must be accompanied by the Installation Information.  But
+     this requirement does not apply if neither you nor any third party
+     retains the ability to install modified object code on the User
+     Product (for example, the work has been installed in ROM).
+
+     The requirement to provide Installation Information does not
+     include a requirement to continue to provide support service,
+     warranty, or updates for a work that has been modified or installed
+     by the recipient, or for the User Product in which it has been
+     modified or installed.  Access to a network may be denied when the
+     modification itself materially and adversely affects the operation
+     of the network or violates the rules and protocols for
+     communication across the network.
+
+     Corresponding Source conveyed, and Installation Information
+     provided, in accord with this section must be in a format that is
+     publicly documented (and with an implementation available to the
+     public in source code form), and must require no special password
+     or key for unpacking, reading or copying.
+
+  7. Additional Terms.
+
+     “Additional permissions” are terms that supplement the terms of
+     this License by making exceptions from one or more of its
+     conditions.  Additional permissions that are applicable to the
+     entire Program shall be treated as though they were included in
+     this License, to the extent that they are valid under applicable
+     law.  If additional permissions apply only to part of the Program,
+     that part may be used separately under those permissions, but the
+     entire Program remains governed by this License without regard to
+     the additional permissions.
+
+     When you convey a copy of a covered work, you may at your option
+     remove any additional permissions from that copy, or from any part
+     of it.  (Additional permissions may be written to require their own
+     removal in certain cases when you modify the work.)  You may place
+     additional permissions on material, added by you to a covered work,
+     for which you have or can give appropriate copyright permission.
+
+     Notwithstanding any other provision of this License, for material
+     you add to a covered work, you may (if authorized by the copyright
+     holders of that material) supplement the terms of this License with
+     terms:
+
+       a. Disclaiming warranty or limiting liability differently from
+          the terms of sections 15 and 16 of this License; or
+
+       b. Requiring preservation of specified reasonable legal notices
+          or author attributions in that material or in the Appropriate
+          Legal Notices displayed by works containing it; or
+
+       c. Prohibiting misrepresentation of the origin of that material,
+          or requiring that modified versions of such material be marked
+          in reasonable ways as different from the original version; or
+
+       d. Limiting the use for publicity purposes of names of licensors
+          or authors of the material; or
+
+       e. Declining to grant rights under trademark law for use of some
+          trade names, trademarks, or service marks; or
+
+       f. Requiring indemnification of licensors and authors of that
+          material by anyone who conveys the material (or modified
+          versions of it) with contractual assumptions of liability to
+          the recipient, for any liability that these contractual
+          assumptions directly impose on those licensors and authors.
+
+     All other non-permissive additional terms are considered “further
+     restrictions” within the meaning of section 10.  If the Program as
+     you received it, or any part of it, contains a notice stating that
+     it is governed by this License along with a term that is a further
+     restriction, you may remove that term.  If a license document
+     contains a further restriction but permits relicensing or conveying
+     under this License, you may add to a covered work material governed
+     by the terms of that license document, provided that the further
+     restriction does not survive such relicensing or conveying.
+
+     If you add terms to a covered work in accord with this section, you
+     must place, in the relevant source files, a statement of the
+     additional terms that apply to those files, or a notice indicating
+     where to find the applicable terms.
+
+     Additional terms, permissive or non-permissive, may be stated in
+     the form of a separately written license, or stated as exceptions;
+     the above requirements apply either way.
+
+  8. Termination.
+
+     You may not propagate or modify a covered work except as expressly
+     provided under this License.  Any attempt otherwise to propagate or
+     modify it is void, and will automatically terminate your rights
+     under this License (including any patent licenses granted under the
+     third paragraph of section 11).
+
+     However, if you cease all violation of this License, then your
+     license from a particular copyright holder is reinstated (a)
+     provisionally, unless and until the copyright holder explicitly and
+     finally terminates your license, and (b) permanently, if the
+     copyright holder fails to notify you of the violation by some
+     reasonable means prior to 60 days after the cessation.
+
+     Moreover, your license from a particular copyright holder is
+     reinstated permanently if the copyright holder notifies you of the
+     violation by some reasonable means, this is the first time you have
+     received notice of violation of this License (for any work) from
+     that copyright holder, and you cure the violation prior to 30 days
+     after your receipt of the notice.
+
+     Termination of your rights under this section does not terminate
+     the licenses of parties who have received copies or rights from you
+     under this License.  If your rights have been terminated and not
+     permanently reinstated, you do not qualify to receive new licenses
+     for the same material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+     You are not required to accept this License in order to receive or
+     run a copy of the Program.  Ancillary propagation of a covered work
+     occurring solely as a consequence of using peer-to-peer
+     transmission to receive a copy likewise does not require
+     acceptance.  However, nothing other than this License grants you
+     permission to propagate or modify any covered work.  These actions
+     infringe copyright if you do not accept this License.  Therefore,
+     by modifying or propagating a covered work, you indicate your
+     acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+     Each time you convey a covered work, the recipient automatically
+     receives a license from the original licensors, to run, modify and
+     propagate that work, subject to this License.  You are not
+     responsible for enforcing compliance by third parties with this
+     License.
+
+     An “entity transaction” is a transaction transferring control of an
+     organization, or substantially all assets of one, or subdividing an
+     organization, or merging organizations.  If propagation of a
+     covered work results from an entity transaction, each party to that
+     transaction who receives a copy of the work also receives whatever
+     licenses to the work the party’s predecessor in interest had or
+     could give under the previous paragraph, plus a right to possession
+     of the Corresponding Source of the work from the predecessor in
+     interest, if the predecessor has it or can get it with reasonable
+     efforts.
+
+     You may not impose any further restrictions on the exercise of the
+     rights granted or affirmed under this License.  For example, you
+     may not impose a license fee, royalty, or other charge for exercise
+     of rights granted under this License, and you may not initiate
+     litigation (including a cross-claim or counterclaim in a lawsuit)
+     alleging that any patent claim is infringed by making, using,
+     selling, offering for sale, or importing the Program or any portion
+     of it.
+
+  11. Patents.
+
+     A “contributor” is a copyright holder who authorizes use under this
+     License of the Program or a work on which the Program is based.
+     The work thus licensed is called the contributor’s “contributor
+     version”.
+
+     A contributor’s “essential patent claims” are all patent claims
+     owned or controlled by the contributor, whether already acquired or
+     hereafter acquired, that would be infringed by some manner,
+     permitted by this License, of making, using, or selling its
+     contributor version, but do not include claims that would be
+     infringed only as a consequence of further modification of the
+     contributor version.  For purposes of this definition, “control”
+     includes the right to grant patent sublicenses in a manner
+     consistent with the requirements of this License.
+
+     Each contributor grants you a non-exclusive, worldwide,
+     royalty-free patent license under the contributor’s essential
+     patent claims, to make, use, sell, offer for sale, import and
+     otherwise run, modify and propagate the contents of its contributor
+     version.
+
+     In the following three paragraphs, a “patent license” is any
+     express agreement or commitment, however denominated, not to
+     enforce a patent (such as an express permission to practice a
+     patent or covenant not to sue for patent infringement).  To “grant”
+     such a patent license to a party means to make such an agreement or
+     commitment not to enforce a patent against the party.
+
+     If you convey a covered work, knowingly relying on a patent
+     license, and the Corresponding Source of the work is not available
+     for anyone to copy, free of charge and under the terms of this
+     License, through a publicly available network server or other
+     readily accessible means, then you must either (1) cause the
+     Corresponding Source to be so available, or (2) arrange to deprive
+     yourself of the benefit of the patent license for this particular
+     work, or (3) arrange, in a manner consistent with the requirements
+     of this License, to extend the patent license to downstream
+     recipients.  “Knowingly relying” means you have actual knowledge
+     that, but for the patent license, your conveying the covered work
+     in a country, or your recipient’s use of the covered work in a
+     country, would infringe one or more identifiable patents in that
+     country that you have reason to believe are valid.
+
+     If, pursuant to or in connection with a single transaction or
+     arrangement, you convey, or propagate by procuring conveyance of, a
+     covered work, and grant a patent license to some of the parties
+     receiving the covered work authorizing them to use, propagate,
+     modify or convey a specific copy of the covered work, then the
+     patent license you grant is automatically extended to all
+     recipients of the covered work and works based on it.
+
+     A patent license is “discriminatory” if it does not include within
+     the scope of its coverage, prohibits the exercise of, or is
+     conditioned on the non-exercise of one or more of the rights that
+     are specifically granted under this License.  You may not convey a
+     covered work if you are a party to an arrangement with a third
+     party that is in the business of distributing software, under which
+     you make payment to the third party based on the extent of your
+     activity of conveying the work, and under which the third party
+     grants, to any of the parties who would receive the covered work
+     from you, a discriminatory patent license (a) in connection with
+     copies of the covered work conveyed by you (or copies made from
+     those copies), or (b) primarily for and in connection with specific
+     products or compilations that contain the covered work, unless you
+     entered into that arrangement, or that patent license was granted,
+     prior to 28 March 2007.
+
+     Nothing in this License shall be construed as excluding or limiting
+     any implied license or other defenses to infringement that may
+     otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others’ Freedom.
+
+     If conditions are imposed on you (whether by court order, agreement
+     or otherwise) that contradict the conditions of this License, they
+     do not excuse you from the conditions of this License.  If you
+     cannot convey a covered work so as to satisfy simultaneously your
+     obligations under this License and any other pertinent obligations,
+     then as a consequence you may not convey it at all.  For example,
+     if you agree to terms that obligate you to collect a royalty for
+     further conveying from those to whom you convey the Program, the
+     only way you could satisfy both those terms and this License would
+     be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+     Notwithstanding any other provision of this License, you have
+     permission to link or combine any covered work with a work licensed
+     under version 3 of the GNU Affero General Public License into a
+     single combined work, and to convey the resulting work.  The terms
+     of this License will continue to apply to the part which is the
+     covered work, but the special requirements of the GNU Affero
+     General Public License, section 13, concerning interaction through
+     a network will apply to the combination as such.
+
+  14. Revised Versions of this License.
+
+     The Free Software Foundation may publish revised and/or new
+     versions of the GNU General Public License from time to time.  Such
+     new versions will be similar in spirit to the present version, but
+     may differ in detail to address new problems or concerns.
+
+     Each version is given a distinguishing version number.  If the
+     Program specifies that a certain numbered version of the GNU
+     General Public License “or any later version” applies to it, you
+     have the option of following the terms and conditions either of
+     that numbered version or of any later version published by the Free
+     Software Foundation.  If the Program does not specify a version
+     number of the GNU General Public License, you may choose any
+     version ever published by the Free Software Foundation.
+
+     If the Program specifies that a proxy can decide which future
+     versions of the GNU General Public License can be used, that
+     proxy’s public statement of acceptance of a version permanently
+     authorizes you to choose that version for the Program.
+
+     Later license versions may give you additional or different
+     permissions.  However, no additional obligations are imposed on any
+     author or copyright holder as a result of your choosing to follow a
+     later version.
+
+  15. Disclaimer of Warranty.
+
+     THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+     APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE
+     COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM “AS IS”
+     WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED,
+     INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+     MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE
+     RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.
+     SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL
+     NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+     IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+     WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES
+     AND/OR CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR
+     DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+     CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE
+     THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA
+     BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+     PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+     PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF
+     THE POSSIBILITY OF SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+     If the disclaimer of warranty and limitation of liability provided
+     above cannot be given local legal effect according to their terms,
+     reviewing courts shall apply local law that most closely
+     approximates an absolute waiver of all civil liability in
+     connection with the Program, unless a warranty or assumption of
+     liability accompanies a copy of the Program in return for a fee.
+
+                      END OF TERMS AND CONDITIONS
+
+How to Apply These Terms to Your New Programs
+=============================================
+
+If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these
+terms.
+
+   To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least the
+“copyright” line and a pointer to where the full notice is found.
+
+     ONE LINE TO GIVE THE PROGRAM'S NAME AND A BRIEF IDEA OF WHAT IT DOES.
+     Copyright (C) YEAR NAME OF AUTHOR
+
+     This program is free software: you can redistribute it and/or modify
+     it under the terms of the GNU General Public License as published by
+     the Free Software Foundation, either version 3 of the License, or (at
+     your option) any later version.
+
+     This program is distributed in the hope that it will be useful, but
+     WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     General Public License for more details.
+
+     You should have received a copy of the GNU General Public License
+     along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program does terminal interaction, make it output a short notice
+like this when it starts in an interactive mode:
+
+     PROGRAM Copyright (C) YEAR NAME OF AUTHOR
+     This program comes with ABSOLUTELY NO WARRANTY; for details
+     type ‘show w’.  This is free software, and you are
+     welcome to redistribute it under certain conditions;
+     type ‘show c’ for details.
+
+   The hypothetical commands ‘show w’ and ‘show c’ should show the
+appropriate parts of the General Public License.  Of course, your
+program’s commands might be different; for a GUI interface, you would
+use an “about box”.
+
+   You should also get your employer (if you work as a programmer) or
+school, if any, to sign a “copyright disclaimer” for the program, if
+necessary.  For more information on this, and how to apply and follow
+the GNU GPL, see <http://www.gnu.org/licenses/>.
+
+   The GNU General Public License does not permit incorporating your
+program into proprietary programs.  If your program is a subroutine
+library, you may consider it more useful to permit linking proprietary
+applications with the library.  If this is what you want to do, use the
+GNU Lesser General Public License instead of this License.  But first,
+please read <http://www.gnu.org/philosophy/why-not-lgpl.html>.
 
diff --git a/doc/gpgme.info-2 b/doc/gpgme.info-2
index d5c7874..c407ef6 100644
--- a/doc/gpgme.info-2
+++ b/doc/gpgme.info-2
diff --git a/doc/gpl.texi b/doc/gpl.texi
index 1b29a81..d13e9e4 100644
--- a/doc/gpl.texi
+++ b/doc/gpl.texi
@@ -1,4 +1,5 @@
 @node Copying
+
 @unnumbered GNU General Public License
 @center Version 3, 29 June 2007
 
@@ -11,7 +12,7 @@ Everyone is permitted to copy and distribute verbatim copies of this
 license document, but changing it is not allowed.
 @end display
 
-@section Preamble
+@unnumberedsec Preamble
 
 The GNU General Public License is a free, copyleft license for
 software and other kinds of works.
@@ -77,7 +78,7 @@ The precise terms and conditions for copying, distribution and
 modification follow.
 
 @iftex
-@section TERMS AND CONDITIONS
+@unnumberedsec TERMS AND CONDITIONS
 @end iftex
 @ifinfo
 @center TERMS AND CONDITIONS
@@ -227,7 +228,7 @@ terms of section 4, provided that you also meet all of these
 conditions:
 
 @enumerate a
-@item 
+@item
 The work must carry prominent notices stating that you modified it,
 and giving a relevant date.
 
@@ -658,13 +659,16 @@ an absolute waiver of all civil liability in connection with the
 Program, unless a warranty or assumption of liability accompanies a
 copy of the Program in return for a fee.
 
+@end enumerate
+
 @iftex
 @heading END OF TERMS AND CONDITIONS
 @end iftex
 @ifinfo
 @center END OF TERMS AND CONDITIONS
 @end ifinfo
-@section How to Apply These Terms to Your New Programs
+
+@unnumberedsec How to Apply These Terms to Your New Programs
 
 If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
@@ -674,9 +678,11 @@ terms.
 To do so, attach the following notices to the program.  It is safest
 to attach them to the start of each source file to most effectively
 state the exclusion of warranty; and each file should have at least
-the ``copyright'' line and a pointer to where the full notice is found.
-@smallexample
-@var{one line to give the program's name and a brief idea of what it does.}  
+the ``copyright'' line and a pointer to where the full notice is
+found.
+
+@example
+@var{one line to give the program's name and a brief idea of what it does.}
 Copyright (C) @var{year} @var{name of author}
 
 This program is free software: you can redistribute it and/or modify
@@ -691,17 +697,21 @@ General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see @url{http://www.gnu.org/licenses/}.
-@end smallexample
+@end example
 
+@noindent
 Also add information on how to contact you by electronic and paper mail.
 
+@noindent
 If the program does terminal interaction, make it output a short
 notice like this when it starts in an interactive mode:
 
 @smallexample
-@var{program} Copyright (C) @var{year} @var{name of author} 
-This program comes with ABSOLUTELY NO WARRANTY; for details type @samp{show w}.
-This is free software, and you are welcome to redistribute it under certain conditions; type @samp{show c} for details.
+@var{program} Copyright (C) @var{year} @var{name of author}
+This program comes with ABSOLUTELY NO WARRANTY; for details
+type @samp{show w}.  This is free software, and you are
+welcome to redistribute it under certain conditions;
+type @samp{show c} for details.
 @end smallexample
 
 The hypothetical commands @samp{show w} and @samp{show c} should show
@@ -720,5 +730,3 @@ library, you may consider it more useful to permit linking proprietary
 applications with the library.  If this is what you want to do, use
 the GNU Lesser General Public License instead of this License.  But
 first, please read @url{http://www.gnu.org/philosophy/why-not-lgpl.html}.
-
-@end enumerate
diff --git a/doc/stamp-vti b/doc/stamp-vti
index 0ae695f..bca6c50 100644
--- a/doc/stamp-vti
+++ b/doc/stamp-vti
@@ -1,4 +1,4 @@
 @set UPDATED 6 November 2014
 @set UPDATED-MONTH November 2014
-@set EDITION 1.5.3
-@set VERSION 1.5.3
+@set EDITION 1.5.4
+@set VERSION 1.5.4
diff --git a/doc/version.texi b/doc/version.texi
index 0ae695f..bca6c50 100644
--- a/doc/version.texi
+++ b/doc/version.texi
@@ -1,4 +1,4 @@
 @set UPDATED 6 November 2014
 @set UPDATED-MONTH November 2014
-@set EDITION 1.5.3
-@set VERSION 1.5.3
+@set EDITION 1.5.4
+@set VERSION 1.5.4
diff --git a/gpgme.spec b/gpgme.spec
index a63a514..e131d64 100644
--- a/gpgme.spec
+++ b/gpgme.spec
@@ -1,7 +1,7 @@
 # This is a template.  The dist target uses it to create the real file.
 Summary: GPGME - GnuPG Made Easy
 Name: gpgme
-Version: 1.5.3
+Version: 1.5.4
 Release: 1
 URL: http://www.gnupg.org/gpgme.html
 Source: ftp://ftp.gnupg.org/gcrypt/alpha/gpgme/%{name}-%{version}.tar.gz
diff --git a/lang/Makefile.in b/lang/Makefile.in
index fbf2712..3dc49d0 100644
--- a/lang/Makefile.in
+++ b/lang/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -34,23 +33,51 @@
 # License along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -70,7 +97,8 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = lang
-DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/build-aux/mkinstalldirs README
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/glib-2.0.m4 \
 	$(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/gnupg-ttyname.m4 \
@@ -85,21 +113,28 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
 AM_V_GEN = $(am__v_GEN_@AM_V@)
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
 AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -107,9 +142,29 @@ am__can_run_installinfo = \
   esac
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
 	distdir
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
@@ -338,22 +393,25 @@ clean-libtool:
 	-rm -rf .libs _libs
 
 # This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
 	  echo "Making $$target in $$subdir"; \
 	  if test "$$subdir" = "."; then \
 	    dot_seen=yes; \
@@ -368,57 +426,12 @@ $(RECURSIVE_TARGETS):
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-$(RECURSIVE_CLEAN_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
@@ -434,12 +447,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -451,15 +459,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -468,6 +472,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -628,22 +647,20 @@ ps-am:
 
 uninstall-am:
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
-	install-am install-strip tags-recursive
-
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am check check-am clean clean-generic clean-libtool \
-	ctags ctags-recursive distclean distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
-	uninstall uninstall-am
+.MAKE: $(am__recursive_targets) install-am install-strip
+
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
+	check-am clean clean-generic clean-libtool cscopelist-am ctags \
+	ctags-am distclean distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	installdirs-am maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+	ps ps-am tags tags-am uninstall uninstall-am
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/lang/cl/Makefile.in b/lang/cl/Makefile.in
index 91c51f1..954fc18 100644
--- a/lang/cl/Makefile.in
+++ b/lang/cl/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -36,23 +35,51 @@
 # 02111-1307, USA
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -72,8 +99,9 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 subdir = lang/cl
-DIST_COMMON = README $(dist_clfiles_DATA) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in $(srcdir)/gpgme.asd.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/build-aux/mkinstalldirs $(srcdir)/gpgme.asd.in \
+	$(dist_clfiles_DATA) README
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/glib-2.0.m4 \
 	$(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/gnupg-ttyname.m4 \
@@ -88,12 +116,18 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES = gpgme.asd
 CONFIG_CLEAN_VPATH_FILES =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
 AM_V_GEN = $(am__v_GEN_@AM_V@)
 am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
 AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
+am__v_at_1 = 
 SOURCES =
 DIST_SOURCES =
 am__can_run_installinfo = \
@@ -130,6 +164,7 @@ am__uninstall_files_from_dir = { \
   }
 am__installdirs = "$(DESTDIR)$(clfilesdir)"
 DATA = $(dist_clfiles_DATA)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -355,11 +390,11 @@ uninstall-dist_clfilesDATA:
 	@list='$(dist_clfiles_DATA)'; test -n "$(clfilesdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 	dir='$(DESTDIR)$(clfilesdir)'; $(am__uninstall_files_from_dir)
-tags: TAGS
-TAGS:
+tags TAGS:
+
+ctags CTAGS:
 
-ctags: CTAGS
-CTAGS:
+cscope cscopelist:
 
 
 distdir: $(DISTFILES)
@@ -498,16 +533,17 @@ uninstall-am: uninstall-dist_clfilesDATA
 .MAKE: install-am install-strip
 
 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dist_clfilesDATA \
-	install-dvi install-dvi-am install-exec install-exec-am \
-	install-html install-html-am install-info install-info-am \
-	install-man install-pdf install-pdf-am install-ps \
-	install-ps-am install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
-	ps ps-am uninstall uninstall-am uninstall-dist_clfilesDATA
+	cscopelist-am ctags-am distclean distclean-generic \
+	distclean-libtool distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am \
+	install-dist_clfilesDATA install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
+	uninstall-am uninstall-dist_clfilesDATA
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/lang/cl/gpgme.asd b/lang/cl/gpgme.asd
index 62b017d..6910ec1 100644
--- a/lang/cl/gpgme.asd
+++ b/lang/cl/gpgme.asd
@@ -27,7 +27,7 @@
 (defsystem gpgme
     :description "GnuPG Made Easy."
     :author "g10 Code GmbH"
-    :version "1.5.3"
+    :version "1.5.4"
     :licence "GPL"
     :depends-on ("cffi" "gpg-error")
     :components ((:file "gpgme-package")
diff --git a/src/Makefile.am b/src/Makefile.am
index b7ddbc1..58922f9 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -153,6 +153,7 @@ SUFFIXES = .rc .lo
 gpgme_res = versioninfo.lo
 no_undefined = -no-undefined
 export_symbols = -export-symbols $(srcdir)/gpgme.def
+extra_ltoptions = -XCClinker -static-libgcc
 
 install-def-file:
 	-$(INSTALL) -d $(DESTDIR)$(libdir)
@@ -167,20 +168,22 @@ else
 gpgme_res =
 no_undefined =
 export_symbols =
+extra_ltoptions =
 install-def-file:
 uninstall-def-file:
 
 gpgme_deps =
 endif
 
-libgpgme_la_LDFLAGS = $(no_undefined) $(export_symbols) \
+libgpgme_la_LDFLAGS = $(no_undefined) $(export_symbols) $(extra_ltoptions) \
 	$(libgpgme_version_script_cmd) -version-info \
 	@LIBGPGME_LT_CURRENT@:@LIBGPGME_LT_REVISION@:@LIBGPGME_LT_AGE@
 libgpgme_la_DEPENDENCIES = @LTLIBOBJS@ $(srcdir)/libgpgme.vers $(gpgme_deps)
 libgpgme_la_LIBADD = $(gpgme_res) @LIBASSUAN_LIBS@ @LTLIBOBJS@ \
 	             @GPG_ERROR_LIBS@
 
-libgpgme_pthread_la_LDFLAGS = $(no_undefined) $(export_symbols) \
+libgpgme_pthread_la_LDFLAGS = \
+        $(no_undefined) $(export_symbols) $(extra_ltoptions) \
 	$(libgpgme_version_script_cmd) -version-info \
 	@LIBGPGME_LT_CURRENT@:@LIBGPGME_LT_REVISION@:@LIBGPGME_LT_AGE@
 libgpgme_pthread_la_DEPENDENCIES = @LTLIBOBJS@ $(srcdir)/libgpgme.vers
@@ -188,8 +191,9 @@ libgpgme_pthread_la_LIBADD = $(gpgme_res) @LIBASSUAN_LIBS@ @LTLIBOBJS@ \
 	-lpthread @GPG_ERROR_LIBS@
 
 if BUILD_W32_GLIB
-libgpgme_glib_la_LDFLAGS = $(no_undefined) \
-	$(export_symbols) $(libgpgme_version_script_cmd) -version-info \
+libgpgme_glib_la_LDFLAGS = \
+        $(no_undefined) $(export_symbols) $(extra_ltoptions) \
+        $(libgpgme_version_script_cmd) -version-info \
 	@LIBGPGME_LT_CURRENT@:@LIBGPGME_LT_REVISION@:@LIBGPGME_LT_AGE@
 libgpgme_glib_la_DEPENDENCIES =	@LTLIBOBJS@ \
 	$(srcdir)/libgpgme.vers $(gpgme_deps)
diff --git a/src/Makefile.in b/src/Makefile.in
index bd5f999..0e97fa2 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -38,23 +37,51 @@
 
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -77,10 +104,11 @@ bin_PROGRAMS = gpgme-tool$(EXEEXT)
 @HAVE_W32CE_SYSTEM_TRUE@am__append_1 = w32-ce.h w32-ce.c
 @HAVE_W32CE_SYSTEM_FALSE@@HAVE_W32_SYSTEM_TRUE@libexec_PROGRAMS = gpgme-w32spawn$(EXEEXT)
 subdir = src
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(srcdir)/gpgme-config.in $(srcdir)/gpgme.h.in \
-	$(srcdir)/versioninfo.rc.in funopen.c setenv.c stpcpy.c \
-	ttyname_r.c vasprintf.c
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/build-aux/mkinstalldirs \
+	$(srcdir)/versioninfo.rc.in $(srcdir)/gpgme.h.in \
+	$(srcdir)/gpgme-config.in ttyname_r.c vasprintf.c funopen.c \
+	setenv.c stpcpy.c $(top_srcdir)/build-aux/depcomp
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/glib-2.0.m4 \
 	$(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/gnupg-ttyname.m4 \
@@ -168,6 +196,7 @@ libgpgme_glib_la_OBJECTS = $(am_libgpgme_glib_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
+am__v_lt_1 = 
 libgpgme_glib_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(AM_CFLAGS) $(CFLAGS) $(libgpgme_glib_la_LDFLAGS) $(LDFLAGS) \
@@ -252,6 +281,18 @@ gpgme_w32spawn_SOURCES = gpgme-w32spawn.c
 gpgme_w32spawn_OBJECTS = gpgme-w32spawn.$(OBJEXT)
 gpgme_w32spawn_LDADD = $(LDADD)
 SCRIPTS = $(bin_SCRIPTS)
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
 am__depfiles_maybe = depfiles
@@ -264,17 +305,16 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
 AM_V_CC = $(am__v_CC_@AM_V@)
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo "  CCLD  " $@;
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
@@ -283,17 +323,16 @@ LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
 	$(AM_CXXFLAGS) $(CXXFLAGS)
 AM_V_CXX = $(am__v_CXX_@AM_V@)
 am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
-am__v_CXX_0 = @echo "  CXX   " $@;
+am__v_CXX_0 = @echo "  CXX     " $@;
+am__v_CXX_1 = 
 CXXLD = $(CXX)
 CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
 am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
-am__v_CXXLD_0 = @echo "  CXXLD " $@;
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
+am__v_CXXLD_0 = @echo "  CXXLD   " $@;
+am__v_CXXLD_1 = 
 SOURCES = $(libgpgme_glib_la_SOURCES) $(libgpgme_pthread_la_SOURCES) \
 	$(libgpgme_qt_la_SOURCES) $(libgpgme_la_SOURCES) gpgme-tool.c \
 	gpgme-w32spawn.c
@@ -308,6 +347,23 @@ am__can_run_installinfo = \
   esac
 DATA = $(m4data_DATA)
 HEADERS = $(nodist_include_HEADERS)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -557,9 +613,11 @@ gpgme_tool_LDADD = libgpgme.la @LIBASSUAN_LIBS@
 @HAVE_W32_SYSTEM_TRUE@no_undefined = -no-undefined
 @HAVE_W32_SYSTEM_FALSE@export_symbols = 
 @HAVE_W32_SYSTEM_TRUE@export_symbols = -export-symbols $(srcdir)/gpgme.def
+@HAVE_W32_SYSTEM_FALSE@extra_ltoptions = 
+@HAVE_W32_SYSTEM_TRUE@extra_ltoptions = -XCClinker -static-libgcc
 @HAVE_W32_SYSTEM_FALSE@gpgme_deps = 
 @HAVE_W32_SYSTEM_TRUE@gpgme_deps = $(gpgme_res) gpgme.def
-libgpgme_la_LDFLAGS = $(no_undefined) $(export_symbols) \
+libgpgme_la_LDFLAGS = $(no_undefined) $(export_symbols) $(extra_ltoptions) \
 	$(libgpgme_version_script_cmd) -version-info \
 	@LIBGPGME_LT_CURRENT@:@LIBGPGME_LT_REVISION@:@LIBGPGME_LT_AGE@
 
@@ -567,7 +625,8 @@ libgpgme_la_DEPENDENCIES = @LTLIBOBJS@ $(srcdir)/libgpgme.vers $(gpgme_deps)
 libgpgme_la_LIBADD = $(gpgme_res) @LIBASSUAN_LIBS@ @LTLIBOBJS@ \
 	             @GPG_ERROR_LIBS@
 
-libgpgme_pthread_la_LDFLAGS = $(no_undefined) $(export_symbols) \
+libgpgme_pthread_la_LDFLAGS = \
+        $(no_undefined) $(export_symbols) $(extra_ltoptions) \
 	$(libgpgme_version_script_cmd) -version-info \
 	@LIBGPGME_LT_CURRENT@:@LIBGPGME_LT_REVISION@:@LIBGPGME_LT_AGE@
 
@@ -575,8 +634,9 @@ libgpgme_pthread_la_DEPENDENCIES = @LTLIBOBJS@ $(srcdir)/libgpgme.vers
 libgpgme_pthread_la_LIBADD = $(gpgme_res) @LIBASSUAN_LIBS@ @LTLIBOBJS@ \
 	-lpthread @GPG_ERROR_LIBS@
 
-@BUILD_W32_GLIB_TRUE@libgpgme_glib_la_LDFLAGS = $(no_undefined) \
-@BUILD_W32_GLIB_TRUE@	$(export_symbols) $(libgpgme_version_script_cmd) -version-info \
+@BUILD_W32_GLIB_TRUE@libgpgme_glib_la_LDFLAGS = \
+@BUILD_W32_GLIB_TRUE@        $(no_undefined) $(export_symbols) $(extra_ltoptions) \
+@BUILD_W32_GLIB_TRUE@        $(libgpgme_version_script_cmd) -version-info \
 @BUILD_W32_GLIB_TRUE@	@LIBGPGME_LT_CURRENT@:@LIBGPGME_LT_REVISION@:@LIBGPGME_LT_AGE@
 
 @BUILD_W32_GLIB_TRUE@libgpgme_glib_la_DEPENDENCIES = @LTLIBOBJS@ \
@@ -633,6 +693,7 @@ gpgme.h: $(top_builddir)/config.status $(srcdir)/gpgme.h.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 gpgme-config: $(top_builddir)/config.status $(srcdir)/gpgme-config.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
 	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
@@ -659,18 +720,24 @@ uninstall-libLTLIBRARIES:
 
 clean-libLTLIBRARIES:
 	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
+	@list='$(lib_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
 libgpgme-glib.la: $(libgpgme_glib_la_OBJECTS) $(libgpgme_glib_la_DEPENDENCIES) $(EXTRA_libgpgme_glib_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(libgpgme_glib_la_LINK) $(am_libgpgme_glib_la_rpath) $(libgpgme_glib_la_OBJECTS) $(libgpgme_glib_la_LIBADD) $(LIBS)
+
 libgpgme-pthread.la: $(libgpgme_pthread_la_OBJECTS) $(libgpgme_pthread_la_DEPENDENCIES) $(EXTRA_libgpgme_pthread_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(libgpgme_pthread_la_LINK) $(am_libgpgme_pthread_la_rpath) $(libgpgme_pthread_la_OBJECTS) $(libgpgme_pthread_la_LIBADD) $(LIBS)
+
 libgpgme-qt.la: $(libgpgme_qt_la_OBJECTS) $(libgpgme_qt_la_DEPENDENCIES) $(EXTRA_libgpgme_qt_la_DEPENDENCIES) 
 	$(AM_V_CXXLD)$(libgpgme_qt_la_LINK) $(am_libgpgme_qt_la_rpath) $(libgpgme_qt_la_OBJECTS) $(libgpgme_qt_la_LIBADD) $(LIBS)
+
 libgpgme.la: $(libgpgme_la_OBJECTS) $(libgpgme_la_DEPENDENCIES) $(EXTRA_libgpgme_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(libgpgme_la_LINK) -rpath $(libdir) $(libgpgme_la_OBJECTS) $(libgpgme_la_LIBADD) $(LIBS)
 install-binPROGRAMS: $(bin_PROGRAMS)
@@ -682,10 +749,12 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 	fi; \
 	for p in $$list; do echo "$$p $$p"; done | \
 	sed 's/$(EXEEXT)$$//' | \
-	while read p p1; do if test -f $$p || test -f $$p1; \
-	  then echo "$$p"; echo "$$p"; else :; fi; \
+	while read p p1; do if test -f $$p \
+	 || test -f $$p1 \
+	  ; then echo "$$p"; echo "$$p"; else :; fi; \
 	done | \
-	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	sed -e 'p;s,.*/,,;n;h' \
+	    -e 's|.*|.|' \
 	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
 	sed 'N;N;N;s,\n, ,g' | \
 	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
@@ -706,7 +775,8 @@ uninstall-binPROGRAMS:
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-	      -e 's/$$/$(EXEEXT)/' `; \
+	      -e 's/$$/$(EXEEXT)/' \
+	`; \
 	test -n "$$list" || exit 0; \
 	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
 	cd "$(DESTDIR)$(bindir)" && rm -f $$files
@@ -728,10 +798,12 @@ install-libexecPROGRAMS: $(libexec_PROGRAMS)
 	fi; \
 	for p in $$list; do echo "$$p $$p"; done | \
 	sed 's/$(EXEEXT)$$//' | \
-	while read p p1; do if test -f $$p || test -f $$p1; \
-	  then echo "$$p"; echo "$$p"; else :; fi; \
+	while read p p1; do if test -f $$p \
+	 || test -f $$p1 \
+	  ; then echo "$$p"; echo "$$p"; else :; fi; \
 	done | \
-	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	sed -e 'p;s,.*/,,;n;h' \
+	    -e 's|.*|.|' \
 	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
 	sed 'N;N;N;s,\n, ,g' | \
 	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
@@ -752,7 +824,8 @@ uninstall-libexecPROGRAMS:
 	@list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-	      -e 's/$$/$(EXEEXT)/' `; \
+	      -e 's/$$/$(EXEEXT)/' \
+	`; \
 	test -n "$$list" || exit 0; \
 	echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \
 	cd "$(DESTDIR)$(libexecdir)" && rm -f $$files
@@ -765,9 +838,11 @@ clean-libexecPROGRAMS:
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 	echo " rm -f" $$list; \
 	rm -f $$list
+
 gpgme-tool$(EXEEXT): $(gpgme_tool_OBJECTS) $(gpgme_tool_DEPENDENCIES) $(EXTRA_gpgme_tool_DEPENDENCIES) 
 	@rm -f gpgme-tool$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(gpgme_tool_OBJECTS) $(gpgme_tool_LDADD) $(LIBS)
+
 gpgme-w32spawn$(EXEEXT): $(gpgme_w32spawn_OBJECTS) $(gpgme_w32spawn_DEPENDENCIES) $(EXTRA_gpgme_w32spawn_DEPENDENCIES) 
 	@rm -f gpgme-w32spawn$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(gpgme_w32spawn_OBJECTS) $(gpgme_w32spawn_LDADD) $(LIBS)
@@ -894,14 +969,14 @@ distclean-compile:
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -979,26 +1054,15 @@ uninstall-nodist_includeHEADERS:
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 	dir='$(DESTDIR)$(includedir)'; $(am__uninstall_files_from_dir)
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -1010,15 +1074,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -1027,6 +1087,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -1179,24 +1254,25 @@ uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \
 
 .MAKE: install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
-	clean-generic clean-libLTLIBRARIES clean-libexecPROGRAMS \
-	clean-libtool ctags distclean distclean-compile \
-	distclean-generic distclean-libtool distclean-tags distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-binPROGRAMS install-binSCRIPTS install-data \
-	install-data-am install-data-local install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-libLTLIBRARIES \
-	install-libexecPROGRAMS install-m4dataDATA install-man \
-	install-nodist_includeHEADERS install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-binPROGRAMS \
-	uninstall-binSCRIPTS uninstall-libLTLIBRARIES \
-	uninstall-libexecPROGRAMS uninstall-local uninstall-m4dataDATA \
+.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
+	clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
+	clean-libexecPROGRAMS clean-libtool cscopelist-am ctags \
+	ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
+	html-am info info-am install install-am install-binPROGRAMS \
+	install-binSCRIPTS install-data install-data-am \
+	install-data-local install-dvi install-dvi-am install-exec \
+	install-exec-am install-html install-html-am install-info \
+	install-info-am install-libLTLIBRARIES install-libexecPROGRAMS \
+	install-m4dataDATA install-man install-nodist_includeHEADERS \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+	uninstall-binPROGRAMS uninstall-binSCRIPTS \
+	uninstall-libLTLIBRARIES uninstall-libexecPROGRAMS \
+	uninstall-local uninstall-m4dataDATA \
 	uninstall-nodist_includeHEADERS
 
 
diff --git a/src/engine-gpg.c b/src/engine-gpg.c
index 30c3bfb..57aea8b 100644
--- a/src/engine-gpg.c
+++ b/src/engine-gpg.c
@@ -396,8 +396,7 @@ gpg_release (void *engine)
     {
       struct arg_and_data_s *next = gpg->arglist->next;
 
-      if (gpg->arglist)
-	free (gpg->arglist);
+      free (gpg->arglist);
       gpg->arglist = next;
     }
 
diff --git a/src/engine-spawn.c b/src/engine-spawn.c
index 8ffc628..eb4e038 100644
--- a/src/engine-spawn.c
+++ b/src/engine-spawn.c
@@ -120,7 +120,7 @@ add_data (engine_spawn_t esp, gpgme_data_t data, int dup_to, int inbound)
   assert (esp);
   assert (data);
 
-  a = malloc (sizeof *a - 1);
+  a = malloc (sizeof *a);
   if (!a)
     return gpg_error_from_syserror ();
   a->next = NULL;
@@ -355,8 +355,7 @@ engspawn_release (void *engine)
     {
       struct datalist_s *next = esp->arglist->next;
 
-      if (esp->arglist)
-	free (esp->arglist);
+      free (esp->arglist);
       esp->arglist = next;
     }
 
diff --git a/src/signers.c b/src/signers.c
index f43fafc..f540d70 100644
--- a/src/signers.c
+++ b/src/signers.c
@@ -66,7 +66,7 @@ gpgme_error_t
 gpgme_signers_add (gpgme_ctx_t ctx, const gpgme_key_t key)
 {
   TRACE_BEG2 (DEBUG_CTX, "gpgme_signers_add", ctx,
-	      "key=%p (%s)", key, (key->subkeys && key->subkeys->fpr) ?
+	      "key=%p (%s)", key, (key && key->subkeys && key->subkeys->fpr) ?
 	      key->subkeys->fpr : "invalid");
 
   if (!ctx || !key)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 0ecdab2..4b465d8 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -25,9 +25,7 @@ TESTS = t-version t-data t-engine-info
 
 EXTRA_DIST = t-data-1.txt t-data-2.txt ChangeLog-2011
 
-INCLUDES = -I$(top_builddir)/src
-
-AM_CPPFLAGS = @GPG_ERROR_CFLAGS@
+AM_CPPFLAGS = -I$(top_builddir)/src @GPG_ERROR_CFLAGS@
 LDADD = ../src/libgpgme.la @GPG_ERROR_LIBS@
 
 noinst_HEADERS = run-support.h
diff --git a/tests/Makefile.in b/tests/Makefile.in
index e849c26..87e58ca 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -36,23 +35,51 @@
 
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -76,8 +103,9 @@ noinst_PROGRAMS = $(am__EXEEXT_1) run-keylist$(EXEEXT) \
 	run-export$(EXEEXT) run-import$(EXEEXT) run-sign$(EXEEXT) \
 	run-verify$(EXEEXT)
 subdir = tests
-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/build-aux/mkinstalldirs \
+	$(top_srcdir)/build-aux/depcomp $(noinst_HEADERS)
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/glib-2.0.m4 \
 	$(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/gnupg-ttyname.m4 \
@@ -102,6 +130,7 @@ run_export_DEPENDENCIES = ../src/libgpgme.la
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
+am__v_lt_1 = 
 run_import_SOURCES = run-import.c
 run_import_OBJECTS = run-import.$(OBJEXT)
 run_import_LDADD = $(LDADD)
@@ -130,6 +159,18 @@ t_version_SOURCES = t-version.c
 t_version_OBJECTS = t-version.$(OBJEXT)
 t_version_LDADD = $(LDADD)
 t_version_DEPENDENCIES = ../src/libgpgme.la
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
 am__depfiles_maybe = depfiles
@@ -142,31 +183,28 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
 AM_V_CC = $(am__v_CC_@AM_V@)
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = run-export.c run-import.c run-keylist.c run-sign.c \
 	run-verify.c t-data.c t-engine-info.c t-version.c
 DIST_SOURCES = run-export.c run-import.c run-keylist.c run-sign.c \
 	run-verify.c t-data.c t-engine-info.c t-version.c
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-dvi-recursive install-exec-recursive \
-	install-html-recursive install-info-recursive \
-	install-pdf-recursive install-ps-recursive install-recursive \
-	installcheck-recursive installdirs-recursive pdf-recursive \
-	ps-recursive uninstall-recursive
+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
+	ctags-recursive dvi-recursive html-recursive info-recursive \
+	install-data-recursive install-dvi-recursive \
+	install-exec-recursive install-html-recursive \
+	install-info-recursive install-pdf-recursive \
+	install-ps-recursive install-recursive installcheck-recursive \
+	installdirs-recursive pdf-recursive ps-recursive \
+	tags-recursive uninstall-recursive
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -175,13 +213,53 @@ am__can_run_installinfo = \
 HEADERS = $(noinst_HEADERS)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+am__recursive_targets = \
+  $(RECURSIVE_TARGETS) \
+  $(RECURSIVE_CLEAN_TARGETS) \
+  $(am__extra_recursive_targets)
+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
 	distdir
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
-am__tty_colors = \
-red=; grn=; lgn=; blu=; std=
+am__tty_colors_dummy = \
+  mgn= red= grn= lgn= blu= brg= std=; \
+  am__color_tests=no
+am__tty_colors = { \
+  $(am__tty_colors_dummy); \
+  if test "X$(AM_COLOR_TESTS)" = Xno; then \
+    am__color_tests=no; \
+  elif test "X$(AM_COLOR_TESTS)" = Xalways; then \
+    am__color_tests=yes; \
+  elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \
+    am__color_tests=yes; \
+  fi; \
+  if test $$am__color_tests = yes; then \
+    red=''; \
+    grn=''; \
+    lgn=''; \
+    blu=''; \
+    mgn=''; \
+    brg=''; \
+    std=''; \
+  fi; \
+}
 DIST_SUBDIRS = gpg gpgsm opassuan
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 am__relativize = \
@@ -367,8 +445,7 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 TESTS_ENVIRONMENT = GNUPGHOME=$(abs_builddir)
 EXTRA_DIST = t-data-1.txt t-data-2.txt ChangeLog-2011
-INCLUDES = -I$(top_builddir)/src
-AM_CPPFLAGS = @GPG_ERROR_CFLAGS@
+AM_CPPFLAGS = -I$(top_builddir)/src @GPG_ERROR_CFLAGS@
 LDADD = ../src/libgpgme.la @GPG_ERROR_LIBS@
 noinst_HEADERS = run-support.h
 @RUN_GPG_TESTS_FALSE@gpgtests = 
@@ -419,27 +496,35 @@ clean-noinstPROGRAMS:
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 	echo " rm -f" $$list; \
 	rm -f $$list
+
 run-export$(EXEEXT): $(run_export_OBJECTS) $(run_export_DEPENDENCIES) $(EXTRA_run_export_DEPENDENCIES) 
 	@rm -f run-export$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(run_export_OBJECTS) $(run_export_LDADD) $(LIBS)
+
 run-import$(EXEEXT): $(run_import_OBJECTS) $(run_import_DEPENDENCIES) $(EXTRA_run_import_DEPENDENCIES) 
 	@rm -f run-import$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(run_import_OBJECTS) $(run_import_LDADD) $(LIBS)
+
 run-keylist$(EXEEXT): $(run_keylist_OBJECTS) $(run_keylist_DEPENDENCIES) $(EXTRA_run_keylist_DEPENDENCIES) 
 	@rm -f run-keylist$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(run_keylist_OBJECTS) $(run_keylist_LDADD) $(LIBS)
+
 run-sign$(EXEEXT): $(run_sign_OBJECTS) $(run_sign_DEPENDENCIES) $(EXTRA_run_sign_DEPENDENCIES) 
 	@rm -f run-sign$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(run_sign_OBJECTS) $(run_sign_LDADD) $(LIBS)
+
 run-verify$(EXEEXT): $(run_verify_OBJECTS) $(run_verify_DEPENDENCIES) $(EXTRA_run_verify_DEPENDENCIES) 
 	@rm -f run-verify$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(run_verify_OBJECTS) $(run_verify_LDADD) $(LIBS)
+
 t-data$(EXEEXT): $(t_data_OBJECTS) $(t_data_DEPENDENCIES) $(EXTRA_t_data_DEPENDENCIES) 
 	@rm -f t-data$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(t_data_OBJECTS) $(t_data_LDADD) $(LIBS)
+
 t-engine-info$(EXEEXT): $(t_engine_info_OBJECTS) $(t_engine_info_DEPENDENCIES) $(EXTRA_t_engine_info_DEPENDENCIES) 
 	@rm -f t-engine-info$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(t_engine_info_OBJECTS) $(t_engine_info_LDADD) $(LIBS)
+
 t-version$(EXEEXT): $(t_version_OBJECTS) $(t_version_DEPENDENCIES) $(EXTRA_t_version_DEPENDENCIES) 
 	@rm -f t-version$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(t_version_OBJECTS) $(t_version_LDADD) $(LIBS)
@@ -464,14 +549,14 @@ distclean-compile:
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -487,22 +572,25 @@ clean-libtool:
 	-rm -rf .libs _libs
 
 # This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
+# into them and run 'make' without going through this Makefile.
+# To change the values of 'make' variables: instead of editing Makefiles,
+# (1) if the variable is set in 'config.status', edit 'config.status'
+#     (which will cause the Makefiles to be regenerated when you run 'make');
+# (2) otherwise, pass the desired values on the 'make' command line.
+$(am__recursive_targets):
+	@fail=; \
+	if $(am__make_keepgoing); then \
+	  failcom='fail=yes'; \
+	else \
+	  failcom='exit 1'; \
+	fi; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	for subdir in $$list; do \
 	  echo "Making $$target in $$subdir"; \
 	  if test "$$subdir" = "."; then \
 	    dot_seen=yes; \
@@ -517,57 +605,12 @@ $(RECURSIVE_TARGETS):
 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
 	fi; test -z "$$fail"
 
-$(RECURSIVE_CLEAN_TARGETS):
-	@fail= failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-recursive
+TAGS: tags
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
@@ -583,12 +626,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -600,15 +638,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-recursive
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -617,6 +651,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-recursive
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -631,7 +680,7 @@ check-TESTS: $(TESTS)
 	    if test -f ./$$tst; then dir=./; \
 	    elif test -f $$tst; then dir=; \
 	    else dir="$(srcdir)/"; fi; \
-	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+	    if $(TESTS_ENVIRONMENT) $${dir}$$tst $(AM_TESTS_FD_REDIRECT); then \
 	      all=`expr $$all + 1`; \
 	      case " $(XFAIL_TESTS) " in \
 	      *[\ \	]$$tst[\ \	]*) \
@@ -876,23 +925,22 @@ ps-am:
 
 uninstall-am:
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) check-am \
-	ctags-recursive install-am install-strip tags-recursive
-
-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am check check-TESTS check-am clean clean-generic \
-	clean-libtool clean-noinstPROGRAMS ctags ctags-recursive \
-	distclean distclean-compile distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags tags-recursive uninstall uninstall-am
+.MAKE: $(am__recursive_targets) check-am install-am install-strip
+
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
+	check-TESTS check-am clean clean-generic clean-libtool \
+	clean-noinstPROGRAMS cscopelist-am ctags ctags-am distclean \
+	distclean-compile distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	installdirs-am maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
+	uninstall-am
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/tests/gpg/Makefile.am b/tests/gpg/Makefile.am
index 5c1266e..5f40dfe 100644
--- a/tests/gpg/Makefile.am
+++ b/tests/gpg/Makefile.am
@@ -57,9 +57,7 @@ EXTRA_DIST = start-stop-agent initial.test final.test \
         pubdemo.asc secdemo.asc cipher-1.asc cipher-2.asc \
 	geheim.txt pubkey-1.asc seckey-1.asc pinentry $(private_keys)
 
-INCLUDES = -I$(top_builddir)/src
-
-AM_CPPFLAGS = @GPG_ERROR_CFLAGS@
+AM_CPPFLAGS = -I$(top_builddir)/src @GPG_ERROR_CFLAGS@
 LDADD = ../../src/libgpgme.la
 t_thread1_LDADD = ../../src/libgpgme-pthread.la -lpthread
 
diff --git a/tests/gpg/Makefile.in b/tests/gpg/Makefile.in
index 4105268..c475e2c 100644
--- a/tests/gpg/Makefile.in
+++ b/tests/gpg/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -36,23 +35,51 @@
 
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -74,8 +101,9 @@ host_triplet = @host@
 TESTS = initial.test $(am__EXEEXT_2) final.test
 noinst_PROGRAMS = $(am__EXEEXT_2) t-genkey$(EXEEXT)
 subdir = tests/gpg
-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/build-aux/mkinstalldirs \
+	$(top_srcdir)/build-aux/depcomp $(noinst_HEADERS)
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/glib-2.0.m4 \
 	$(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/gnupg-ttyname.m4 \
@@ -108,6 +136,7 @@ t_decrypt_DEPENDENCIES = ../../src/libgpgme.la
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
+am__v_lt_1 = 
 t_decrypt_verify_SOURCES = t-decrypt-verify.c
 t_decrypt_verify_OBJECTS = t-decrypt-verify.$(OBJEXT)
 t_decrypt_verify_LDADD = $(LDADD)
@@ -191,6 +220,18 @@ t_wait_SOURCES = t-wait.c
 t_wait_OBJECTS = t-wait.$(OBJEXT)
 t_wait_LDADD = $(LDADD)
 t_wait_DEPENDENCIES = ../../src/libgpgme.la
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
 am__depfiles_maybe = depfiles
@@ -203,20 +244,16 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
 AM_V_CC = $(am__v_CC_@AM_V@)
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = t-decrypt.c t-decrypt-verify.c t-edit.c t-encrypt.c \
 	t-encrypt-large.c t-encrypt-sign.c t-encrypt-sym.c \
 	t-eventloop.c t-export.c t-file-name.c t-genkey.c t-gpgconf.c \
@@ -235,10 +272,47 @@ am__can_run_installinfo = \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
 HEADERS = $(noinst_HEADERS)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
-am__tty_colors = \
-red=; grn=; lgn=; blu=; std=
+am__tty_colors_dummy = \
+  mgn= red= grn= lgn= blu= brg= std=; \
+  am__color_tests=no
+am__tty_colors = { \
+  $(am__tty_colors_dummy); \
+  if test "X$(AM_COLOR_TESTS)" = Xno; then \
+    am__color_tests=no; \
+  elif test "X$(AM_COLOR_TESTS)" = Xalways; then \
+    am__color_tests=yes; \
+  elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \
+    am__color_tests=yes; \
+  fi; \
+  if test $$am__color_tests = yes; then \
+    red=''; \
+    grn=''; \
+    lgn=''; \
+    blu=''; \
+    mgn=''; \
+    brg=''; \
+    std=''; \
+  fi; \
+}
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -425,8 +499,7 @@ EXTRA_DIST = start-stop-agent initial.test final.test \
         pubdemo.asc secdemo.asc cipher-1.asc cipher-2.asc \
 	geheim.txt pubkey-1.asc seckey-1.asc pinentry $(private_keys)
 
-INCLUDES = -I$(top_builddir)/src
-AM_CPPFLAGS = @GPG_ERROR_CFLAGS@
+AM_CPPFLAGS = -I$(top_builddir)/src @GPG_ERROR_CFLAGS@
 LDADD = ../../src/libgpgme.la
 t_thread1_LDADD = ../../src/libgpgme-pthread.la -lpthread
 all: all-am
@@ -472,69 +545,91 @@ clean-noinstPROGRAMS:
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 	echo " rm -f" $$list; \
 	rm -f $$list
+
 t-decrypt$(EXEEXT): $(t_decrypt_OBJECTS) $(t_decrypt_DEPENDENCIES) $(EXTRA_t_decrypt_DEPENDENCIES) 
 	@rm -f t-decrypt$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(t_decrypt_OBJECTS) $(t_decrypt_LDADD) $(LIBS)
+
 t-decrypt-verify$(EXEEXT): $(t_decrypt_verify_OBJECTS) $(t_decrypt_verify_DEPENDENCIES) $(EXTRA_t_decrypt_verify_DEPENDENCIES) 
 	@rm -f t-decrypt-verify$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(t_decrypt_verify_OBJECTS) $(t_decrypt_verify_LDADD) $(LIBS)
+
 t-edit$(EXEEXT): $(t_edit_OBJECTS) $(t_edit_DEPENDENCIES) $(EXTRA_t_edit_DEPENDENCIES) 
 	@rm -f t-edit$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(t_edit_OBJECTS) $(t_edit_LDADD) $(LIBS)
+
 t-encrypt$(EXEEXT): $(t_encrypt_OBJECTS) $(t_encrypt_DEPENDENCIES) $(EXTRA_t_encrypt_DEPENDENCIES) 
 	@rm -f t-encrypt$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(t_encrypt_OBJECTS) $(t_encrypt_LDADD) $(LIBS)
+
 t-encrypt-large$(EXEEXT): $(t_encrypt_large_OBJECTS) $(t_encrypt_large_DEPENDENCIES) $(EXTRA_t_encrypt_large_DEPENDENCIES) 
 	@rm -f t-encrypt-large$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(t_encrypt_large_OBJECTS) $(t_encrypt_large_LDADD) $(LIBS)
+
 t-encrypt-sign$(EXEEXT): $(t_encrypt_sign_OBJECTS) $(t_encrypt_sign_DEPENDENCIES) $(EXTRA_t_encrypt_sign_DEPENDENCIES) 
 	@rm -f t-encrypt-sign$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(t_encrypt_sign_OBJECTS) $(t_encrypt_sign_LDADD) $(LIBS)
+
 t-encrypt-sym$(EXEEXT): $(t_encrypt_sym_OBJECTS) $(t_encrypt_sym_DEPENDENCIES) $(EXTRA_t_encrypt_sym_DEPENDENCIES) 
 	@rm -f t-encrypt-sym$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(t_encrypt_sym_OBJECTS) $(t_encrypt_sym_LDADD) $(LIBS)
+
 t-eventloop$(EXEEXT): $(t_eventloop_OBJECTS) $(t_eventloop_DEPENDENCIES) $(EXTRA_t_eventloop_DEPENDENCIES) 
 	@rm -f t-eventloop$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(t_eventloop_OBJECTS) $(t_eventloop_LDADD) $(LIBS)
+
 t-export$(EXEEXT): $(t_export_OBJECTS) $(t_export_DEPENDENCIES) $(EXTRA_t_export_DEPENDENCIES) 
 	@rm -f t-export$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(t_export_OBJECTS) $(t_export_LDADD) $(LIBS)
+
 t-file-name$(EXEEXT): $(t_file_name_OBJECTS) $(t_file_name_DEPENDENCIES) $(EXTRA_t_file_name_DEPENDENCIES) 
 	@rm -f t-file-name$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(t_file_name_OBJECTS) $(t_file_name_LDADD) $(LIBS)
+
 t-genkey$(EXEEXT): $(t_genkey_OBJECTS) $(t_genkey_DEPENDENCIES) $(EXTRA_t_genkey_DEPENDENCIES) 
 	@rm -f t-genkey$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(t_genkey_OBJECTS) $(t_genkey_LDADD) $(LIBS)
+
 t-gpgconf$(EXEEXT): $(t_gpgconf_OBJECTS) $(t_gpgconf_DEPENDENCIES) $(EXTRA_t_gpgconf_DEPENDENCIES) 
 	@rm -f t-gpgconf$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(t_gpgconf_OBJECTS) $(t_gpgconf_LDADD) $(LIBS)
+
 t-import$(EXEEXT): $(t_import_OBJECTS) $(t_import_DEPENDENCIES) $(EXTRA_t_import_DEPENDENCIES) 
 	@rm -f t-import$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(t_import_OBJECTS) $(t_import_LDADD) $(LIBS)
+
 t-keylist$(EXEEXT): $(t_keylist_OBJECTS) $(t_keylist_DEPENDENCIES) $(EXTRA_t_keylist_DEPENDENCIES) 
 	@rm -f t-keylist$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(t_keylist_OBJECTS) $(t_keylist_LDADD) $(LIBS)
+
 t-keylist-sig$(EXEEXT): $(t_keylist_sig_OBJECTS) $(t_keylist_sig_DEPENDENCIES) $(EXTRA_t_keylist_sig_DEPENDENCIES) 
 	@rm -f t-keylist-sig$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(t_keylist_sig_OBJECTS) $(t_keylist_sig_LDADD) $(LIBS)
+
 t-sig-notation$(EXEEXT): $(t_sig_notation_OBJECTS) $(t_sig_notation_DEPENDENCIES) $(EXTRA_t_sig_notation_DEPENDENCIES) 
 	@rm -f t-sig-notation$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(t_sig_notation_OBJECTS) $(t_sig_notation_LDADD) $(LIBS)
+
 t-sign$(EXEEXT): $(t_sign_OBJECTS) $(t_sign_DEPENDENCIES) $(EXTRA_t_sign_DEPENDENCIES) 
 	@rm -f t-sign$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(t_sign_OBJECTS) $(t_sign_LDADD) $(LIBS)
+
 t-signers$(EXEEXT): $(t_signers_OBJECTS) $(t_signers_DEPENDENCIES) $(EXTRA_t_signers_DEPENDENCIES) 
 	@rm -f t-signers$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(t_signers_OBJECTS) $(t_signers_LDADD) $(LIBS)
+
 t-thread1$(EXEEXT): $(t_thread1_OBJECTS) $(t_thread1_DEPENDENCIES) $(EXTRA_t_thread1_DEPENDENCIES) 
 	@rm -f t-thread1$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(t_thread1_OBJECTS) $(t_thread1_LDADD) $(LIBS)
+
 t-trustlist$(EXEEXT): $(t_trustlist_OBJECTS) $(t_trustlist_DEPENDENCIES) $(EXTRA_t_trustlist_DEPENDENCIES) 
 	@rm -f t-trustlist$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(t_trustlist_OBJECTS) $(t_trustlist_LDADD) $(LIBS)
+
 t-verify$(EXEEXT): $(t_verify_OBJECTS) $(t_verify_DEPENDENCIES) $(EXTRA_t_verify_DEPENDENCIES) 
 	@rm -f t-verify$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(t_verify_OBJECTS) $(t_verify_LDADD) $(LIBS)
+
 t-wait$(EXEEXT): $(t_wait_OBJECTS) $(t_wait_DEPENDENCIES) $(EXTRA_t_wait_DEPENDENCIES) 
 	@rm -f t-wait$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(t_wait_OBJECTS) $(t_wait_LDADD) $(LIBS)
@@ -573,14 +668,14 @@ distclean-compile:
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -595,26 +690,15 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -626,15 +710,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -643,6 +723,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -657,7 +752,7 @@ check-TESTS: $(TESTS)
 	    if test -f ./$$tst; then dir=./; \
 	    elif test -f $$tst; then dir=; \
 	    else dir="$(srcdir)/"; fi; \
-	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+	    if $(TESTS_ENVIRONMENT) $${dir}$$tst $(AM_TESTS_FD_REDIRECT); then \
 	      all=`expr $$all + 1`; \
 	      case " $(XFAIL_TESTS) " in \
 	      *[\ \	]$$tst[\ \	]*) \
@@ -879,19 +974,19 @@ uninstall-am:
 
 .MAKE: check-am install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am check-local \
-	clean clean-generic clean-libtool clean-local \
-	clean-noinstPROGRAMS ctags distclean distclean-compile \
-	distclean-generic distclean-libtool distclean-tags distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am
+.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am \
+	check-local clean clean-generic clean-libtool clean-local \
+	clean-noinstPROGRAMS cscopelist-am ctags ctags-am distclean \
+	distclean-compile distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am
 
 
 clean-local:
diff --git a/tests/gpgsm/Makefile.am b/tests/gpgsm/Makefile.am
index ecc53a6..bf616d3 100644
--- a/tests/gpgsm/Makefile.am
+++ b/tests/gpgsm/Makefile.am
@@ -29,9 +29,7 @@ TESTS = t-import t-keylist t-encrypt t-verify t-decrypt t-sign t-export
 EXTRA_DIST = cert_dfn_pca01.der cert_dfn_pca15.der cert_g10code_test1.der \
 	$(key_id)
 
-INCLUDES = -I$(top_builddir)/src
-
-AM_CPPFLAGS = @GPG_ERROR_CFLAGS@
+AM_CPPFLAGS = -I$(top_builddir)/src @GPG_ERROR_CFLAGS@
 LDADD = ../../src/libgpgme.la
 
 # We don't run t-genkey in the test suite, because it takes too long
diff --git a/tests/gpgsm/Makefile.in b/tests/gpgsm/Makefile.in
index 5626612..c86800e 100644
--- a/tests/gpgsm/Makefile.in
+++ b/tests/gpgsm/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -36,23 +35,51 @@
 
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -77,8 +104,9 @@ TESTS = t-import$(EXEEXT) t-keylist$(EXEEXT) t-encrypt$(EXEEXT) \
 noinst_PROGRAMS = $(am__EXEEXT_1) t-genkey$(EXEEXT) \
 	cms-keylist$(EXEEXT) cms-decrypt$(EXEEXT)
 subdir = tests/gpgsm
-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/build-aux/mkinstalldirs \
+	$(top_srcdir)/build-aux/depcomp $(noinst_HEADERS)
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/glib-2.0.m4 \
 	$(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/gnupg-ttyname.m4 \
@@ -104,6 +132,7 @@ cms_decrypt_DEPENDENCIES = ../../src/libgpgme.la
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
+am__v_lt_1 = 
 cms_keylist_SOURCES = cms-keylist.c
 cms_keylist_OBJECTS = cms-keylist.$(OBJEXT)
 cms_keylist_LDADD = $(LDADD)
@@ -140,6 +169,18 @@ t_verify_SOURCES = t-verify.c
 t_verify_OBJECTS = t-verify.$(OBJEXT)
 t_verify_LDADD = $(LDADD)
 t_verify_DEPENDENCIES = ../../src/libgpgme.la
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
 am__depfiles_maybe = depfiles
@@ -152,20 +193,16 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
 AM_V_CC = $(am__v_CC_@AM_V@)
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = cms-decrypt.c cms-keylist.c t-decrypt.c t-encrypt.c \
 	t-export.c t-genkey.c t-import.c t-keylist.c t-sign.c \
 	t-verify.c
@@ -178,10 +215,47 @@ am__can_run_installinfo = \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
 HEADERS = $(noinst_HEADERS)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
-am__tty_colors = \
-red=; grn=; lgn=; blu=; std=
+am__tty_colors_dummy = \
+  mgn= red= grn= lgn= blu= brg= std=; \
+  am__color_tests=no
+am__tty_colors = { \
+  $(am__tty_colors_dummy); \
+  if test "X$(AM_COLOR_TESTS)" = Xno; then \
+    am__color_tests=no; \
+  elif test "X$(AM_COLOR_TESTS)" = Xalways; then \
+    am__color_tests=yes; \
+  elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \
+    am__color_tests=yes; \
+  fi; \
+  if test $$am__color_tests = yes; then \
+    red=''; \
+    grn=''; \
+    lgn=''; \
+    blu=''; \
+    mgn=''; \
+    brg=''; \
+    std=''; \
+  fi; \
+}
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -345,8 +419,7 @@ noinst_HEADERS = t-support.h
 EXTRA_DIST = cert_dfn_pca01.der cert_dfn_pca15.der cert_g10code_test1.der \
 	$(key_id)
 
-INCLUDES = -I$(top_builddir)/src
-AM_CPPFLAGS = @GPG_ERROR_CFLAGS@
+AM_CPPFLAGS = -I$(top_builddir)/src @GPG_ERROR_CFLAGS@
 LDADD = ../../src/libgpgme.la
 key_id = 32100C27173EF6E9C4E9A25D3D69F86D37A4F939
 CLEANFILES = pubring.kbx pubring.kbx~ gpgsm.conf trustlist.txt \
@@ -395,33 +468,43 @@ clean-noinstPROGRAMS:
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 	echo " rm -f" $$list; \
 	rm -f $$list
+
 cms-decrypt$(EXEEXT): $(cms_decrypt_OBJECTS) $(cms_decrypt_DEPENDENCIES) $(EXTRA_cms_decrypt_DEPENDENCIES) 
 	@rm -f cms-decrypt$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(cms_decrypt_OBJECTS) $(cms_decrypt_LDADD) $(LIBS)
+
 cms-keylist$(EXEEXT): $(cms_keylist_OBJECTS) $(cms_keylist_DEPENDENCIES) $(EXTRA_cms_keylist_DEPENDENCIES) 
 	@rm -f cms-keylist$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(cms_keylist_OBJECTS) $(cms_keylist_LDADD) $(LIBS)
+
 t-decrypt$(EXEEXT): $(t_decrypt_OBJECTS) $(t_decrypt_DEPENDENCIES) $(EXTRA_t_decrypt_DEPENDENCIES) 
 	@rm -f t-decrypt$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(t_decrypt_OBJECTS) $(t_decrypt_LDADD) $(LIBS)
+
 t-encrypt$(EXEEXT): $(t_encrypt_OBJECTS) $(t_encrypt_DEPENDENCIES) $(EXTRA_t_encrypt_DEPENDENCIES) 
 	@rm -f t-encrypt$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(t_encrypt_OBJECTS) $(t_encrypt_LDADD) $(LIBS)
+
 t-export$(EXEEXT): $(t_export_OBJECTS) $(t_export_DEPENDENCIES) $(EXTRA_t_export_DEPENDENCIES) 
 	@rm -f t-export$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(t_export_OBJECTS) $(t_export_LDADD) $(LIBS)
+
 t-genkey$(EXEEXT): $(t_genkey_OBJECTS) $(t_genkey_DEPENDENCIES) $(EXTRA_t_genkey_DEPENDENCIES) 
 	@rm -f t-genkey$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(t_genkey_OBJECTS) $(t_genkey_LDADD) $(LIBS)
+
 t-import$(EXEEXT): $(t_import_OBJECTS) $(t_import_DEPENDENCIES) $(EXTRA_t_import_DEPENDENCIES) 
 	@rm -f t-import$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(t_import_OBJECTS) $(t_import_LDADD) $(LIBS)
+
 t-keylist$(EXEEXT): $(t_keylist_OBJECTS) $(t_keylist_DEPENDENCIES) $(EXTRA_t_keylist_DEPENDENCIES) 
 	@rm -f t-keylist$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(t_keylist_OBJECTS) $(t_keylist_LDADD) $(LIBS)
+
 t-sign$(EXEEXT): $(t_sign_OBJECTS) $(t_sign_DEPENDENCIES) $(EXTRA_t_sign_DEPENDENCIES) 
 	@rm -f t-sign$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(t_sign_OBJECTS) $(t_sign_LDADD) $(LIBS)
+
 t-verify$(EXEEXT): $(t_verify_OBJECTS) $(t_verify_DEPENDENCIES) $(EXTRA_t_verify_DEPENDENCIES) 
 	@rm -f t-verify$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(t_verify_OBJECTS) $(t_verify_LDADD) $(LIBS)
@@ -448,14 +531,14 @@ distclean-compile:
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -470,26 +553,15 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -501,15 +573,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -518,6 +586,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -532,7 +615,7 @@ check-TESTS: $(TESTS)
 	    if test -f ./$$tst; then dir=./; \
 	    elif test -f $$tst; then dir=; \
 	    else dir="$(srcdir)/"; fi; \
-	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+	    if $(TESTS_ENVIRONMENT) $${dir}$$tst $(AM_TESTS_FD_REDIRECT); then \
 	      all=`expr $$all + 1`; \
 	      case " $(XFAIL_TESTS) " in \
 	      *[\ \	]$$tst[\ \	]*) \
@@ -754,19 +837,19 @@ uninstall-am:
 
 .MAKE: check-am install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am check-local \
-	clean clean-generic clean-libtool clean-local \
-	clean-noinstPROGRAMS ctags distclean distclean-compile \
-	distclean-generic distclean-libtool distclean-tags distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am
+.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am \
+	check-local clean clean-generic clean-libtool clean-local \
+	clean-noinstPROGRAMS cscopelist-am ctags ctags-am distclean \
+	distclean-compile distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am
 
 
 clean-local:
diff --git a/tests/opassuan/Makefile.am b/tests/opassuan/Makefile.am
index 2446007..31d26ed 100644
--- a/tests/opassuan/Makefile.am
+++ b/tests/opassuan/Makefile.am
@@ -1,35 +1,33 @@
 # Copyright (C) 2009 g10 Code GmbH
-# 
+#
 # This file is part of GPGME.
-# 
+#
 # GPGME is free software; you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as
 # published by the Free Software Foundation; either version 2.1 of the
 # License, or (at your option) any later version.
-# 
+#
 # GPGME is distributed in the hope that it will be useful, but WITHOUT
 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 # or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General
 # Public License for more details.
-# 
+#
 # You should have received a copy of the GNU Lesser General Public
 # License along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 ## Process this file with automake to produce Makefile.in
 
-TESTS_ENVIRONMENT = GNUPGHOME=$(abs_builddir) GPG_AGENT_INFO= 
+TESTS_ENVIRONMENT = GNUPGHOME=$(abs_builddir) GPG_AGENT_INFO=
 
 noinst_HEADERS =
-TESTS = 
+TESTS =
 
-EXTRA_DIST = 
+EXTRA_DIST =
 
-INCLUDES = -I$(top_builddir)/src
-
-AM_CPPFLAGS = @GPG_ERROR_CFLAGS@
+AM_CPPFLAGS = -I$(top_builddir)/src @GPG_ERROR_CFLAGS@
 LDADD = ../../src/libgpgme.la
 
 noinst_PROGRAMS = $(TESTS) t-command
 
-DISTCLEANFILES = 
+DISTCLEANFILES =
 
diff --git a/tests/opassuan/Makefile.in b/tests/opassuan/Makefile.in
index fcb92bc..018cbbe 100644
--- a/tests/opassuan/Makefile.in
+++ b/tests/opassuan/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
+
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,41 +15,69 @@
 @SET_MAKE@
 
 # Copyright (C) 2009 g10 Code GmbH
-# 
+#
 # This file is part of GPGME.
-# 
+#
 # GPGME is free software; you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as
 # published by the Free Software Foundation; either version 2.1 of the
 # License, or (at your option) any later version.
-# 
+#
 # GPGME is distributed in the hope that it will be useful, but WITHOUT
 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
 # or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General
 # Public License for more details.
-# 
+#
 # You should have received a copy of the GNU Lesser General Public
 # License along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 
 VPATH = @srcdir@
-am__make_dryrun = \
-  { \
-    am__dry=no; \
+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
     case $$MAKEFLAGS in \
       *\\[\ \	]*) \
-        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
-          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
-      *) \
-        for am__flg in $$MAKEFLAGS; do \
-          case $$am__flg in \
-            *=*|--*) ;; \
-            *n*) am__dry=yes; break;; \
-          esac; \
-        done;; \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
     esac; \
-    test $$am__dry = yes; \
-  }
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -72,8 +99,9 @@ host_triplet = @host@
 TESTS =
 noinst_PROGRAMS = $(am__EXEEXT_1) t-command$(EXEEXT)
 subdir = tests/opassuan
-DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+	$(top_srcdir)/build-aux/mkinstalldirs \
+	$(top_srcdir)/build-aux/depcomp $(noinst_HEADERS)
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/glib-2.0.m4 \
 	$(top_srcdir)/m4/glibc21.m4 $(top_srcdir)/m4/gnupg-ttyname.m4 \
@@ -97,6 +125,19 @@ t_command_DEPENDENCIES = ../../src/libgpgme.la
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
+am__v_lt_1 = 
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
 am__depfiles_maybe = depfiles
@@ -109,20 +150,16 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(AM_CFLAGS) $(CFLAGS)
 AM_V_CC = $(am__v_CC_@AM_V@)
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo "  CC    " $@;
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo "  CCLD  " $@;
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN   " $@;
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
 SOURCES = t-command.c
 DIST_SOURCES = t-command.c
 am__can_run_installinfo = \
@@ -131,10 +168,47 @@ am__can_run_installinfo = \
     *) (install-info --version) >/dev/null 2>&1;; \
   esac
 HEADERS = $(noinst_HEADERS)
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
-am__tty_colors = \
-red=; grn=; lgn=; blu=; std=
+am__tty_colors_dummy = \
+  mgn= red= grn= lgn= blu= brg= std=; \
+  am__color_tests=no
+am__tty_colors = { \
+  $(am__tty_colors_dummy); \
+  if test "X$(AM_COLOR_TESTS)" = Xno; then \
+    am__color_tests=no; \
+  elif test "X$(AM_COLOR_TESTS)" = Xalways; then \
+    am__color_tests=yes; \
+  elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \
+    am__color_tests=yes; \
+  fi; \
+  if test $$am__color_tests = yes; then \
+    red=''; \
+    grn=''; \
+    lgn=''; \
+    blu=''; \
+    mgn=''; \
+    brg=''; \
+    std=''; \
+  fi; \
+}
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -292,11 +366,10 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-TESTS_ENVIRONMENT = GNUPGHOME=$(abs_builddir) GPG_AGENT_INFO= 
+TESTS_ENVIRONMENT = GNUPGHOME=$(abs_builddir) GPG_AGENT_INFO=
 noinst_HEADERS = 
 EXTRA_DIST = 
-INCLUDES = -I$(top_builddir)/src
-AM_CPPFLAGS = @GPG_ERROR_CFLAGS@
+AM_CPPFLAGS = -I$(top_builddir)/src @GPG_ERROR_CFLAGS@
 LDADD = ../../src/libgpgme.la
 DISTCLEANFILES = 
 all: all-am
@@ -342,6 +415,7 @@ clean-noinstPROGRAMS:
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 	echo " rm -f" $$list; \
 	rm -f $$list
+
 t-command$(EXEEXT): $(t_command_OBJECTS) $(t_command_DEPENDENCIES) $(EXTRA_t_command_DEPENDENCIES) 
 	@rm -f t-command$(EXEEXT)
 	$(AM_V_CCLD)$(LINK) $(t_command_OBJECTS) $(t_command_LDADD) $(LIBS)
@@ -359,14 +433,14 @@ distclean-compile:
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -381,26 +455,15 @@ mostlyclean-libtool:
 clean-libtool:
 	-rm -rf .libs _libs
 
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
 	set x; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+	$(am__define_uniq_tagged_files); \
 	shift; \
 	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
@@ -412,15 +475,11 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	      $$unique; \
 	  fi; \
 	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-	      END { if (nonempty) { for (i in files) print i; }; }'`; \
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
 	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$unique
@@ -429,6 +488,21 @@ GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -443,7 +517,7 @@ check-TESTS: $(TESTS)
 	    if test -f ./$$tst; then dir=./; \
 	    elif test -f $$tst; then dir=; \
 	    else dir="$(srcdir)/"; fi; \
-	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+	    if $(TESTS_ENVIRONMENT) $${dir}$$tst $(AM_TESTS_FD_REDIRECT); then \
 	      all=`expr $$all + 1`; \
 	      case " $(XFAIL_TESTS) " in \
 	      *[\ \	]$$tst[\ \	]*) \
@@ -665,9 +739,9 @@ uninstall-am:
 
 .MAKE: check-am install-am install-strip
 
-.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
-	clean-generic clean-libtool clean-noinstPROGRAMS ctags \
-	distclean distclean-compile distclean-generic \
+.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \
+	clean-generic clean-libtool clean-noinstPROGRAMS cscopelist-am \
+	ctags ctags-am distclean distclean-compile distclean-generic \
 	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
 	install-data-am install-dvi install-dvi-am install-exec \
@@ -677,7 +751,7 @@ uninstall-am:
 	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am
+	tags tags-am uninstall uninstall-am
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.