Imported Upstream version 1.4.0upstream/1.4.0

13 files changed, 343 insertions, 182 deletions

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 5ce550a..ff022db 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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,6 +36,23 @@
 
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    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;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -71,7 +88,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/glib-2.0.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
@@ -111,7 +128,7 @@ t_version_OBJECTS = t-version.$(OBJEXT)
 t_version_LDADD = $(LDADD)
 t_version_DEPENDENCIES = ../src/libgpgme.la
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
+depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -134,6 +151,11 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	install-pdf-recursive install-ps-recursive install-recursive \
 	installcheck-recursive installdirs-recursive pdf-recursive \
 	ps-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 HEADERS = $(noinst_HEADERS)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
@@ -180,7 +202,7 @@ AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 BUILD_FILEVERSION = @BUILD_FILEVERSION@
-BUILD_NUMBER = @BUILD_NUMBER@
+BUILD_REVISION = @BUILD_REVISION@
 BUILD_TIMESTAMP = @BUILD_TIMESTAMP@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -271,6 +293,7 @@ SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
+VERSION_NUMBER = @VERSION_NUMBER@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -381,28 +404,28 @@ 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) 
+run-export$(EXEEXT): $(run_export_OBJECTS) $(run_export_DEPENDENCIES) $(EXTRA_run_export_DEPENDENCIES) 
 	@rm -f run-export$(EXEEXT)
 	$(LINK) $(run_export_OBJECTS) $(run_export_LDADD) $(LIBS)
-run-import$(EXEEXT): $(run_import_OBJECTS) $(run_import_DEPENDENCIES) 
+run-import$(EXEEXT): $(run_import_OBJECTS) $(run_import_DEPENDENCIES) $(EXTRA_run_import_DEPENDENCIES) 
 	@rm -f run-import$(EXEEXT)
 	$(LINK) $(run_import_OBJECTS) $(run_import_LDADD) $(LIBS)
-run-keylist$(EXEEXT): $(run_keylist_OBJECTS) $(run_keylist_DEPENDENCIES) 
+run-keylist$(EXEEXT): $(run_keylist_OBJECTS) $(run_keylist_DEPENDENCIES) $(EXTRA_run_keylist_DEPENDENCIES) 
 	@rm -f run-keylist$(EXEEXT)
 	$(LINK) $(run_keylist_OBJECTS) $(run_keylist_LDADD) $(LIBS)
-run-sign$(EXEEXT): $(run_sign_OBJECTS) $(run_sign_DEPENDENCIES) 
+run-sign$(EXEEXT): $(run_sign_OBJECTS) $(run_sign_DEPENDENCIES) $(EXTRA_run_sign_DEPENDENCIES) 
 	@rm -f run-sign$(EXEEXT)
 	$(LINK) $(run_sign_OBJECTS) $(run_sign_LDADD) $(LIBS)
-run-verify$(EXEEXT): $(run_verify_OBJECTS) $(run_verify_DEPENDENCIES) 
+run-verify$(EXEEXT): $(run_verify_OBJECTS) $(run_verify_DEPENDENCIES) $(EXTRA_run_verify_DEPENDENCIES) 
 	@rm -f run-verify$(EXEEXT)
 	$(LINK) $(run_verify_OBJECTS) $(run_verify_LDADD) $(LIBS)
-t-data$(EXEEXT): $(t_data_OBJECTS) $(t_data_DEPENDENCIES) 
+t-data$(EXEEXT): $(t_data_OBJECTS) $(t_data_DEPENDENCIES) $(EXTRA_t_data_DEPENDENCIES) 
 	@rm -f t-data$(EXEEXT)
 	$(LINK) $(t_data_OBJECTS) $(t_data_LDADD) $(LIBS)
-t-engine-info$(EXEEXT): $(t_engine_info_OBJECTS) $(t_engine_info_DEPENDENCIES) 
+t-engine-info$(EXEEXT): $(t_engine_info_OBJECTS) $(t_engine_info_DEPENDENCIES) $(EXTRA_t_engine_info_DEPENDENCIES) 
 	@rm -f t-engine-info$(EXEEXT)
 	$(LINK) $(t_engine_info_OBJECTS) $(t_engine_info_LDADD) $(LIBS)
-t-version$(EXEEXT): $(t_version_OBJECTS) $(t_version_DEPENDENCIES) 
+t-version$(EXEEXT): $(t_version_OBJECTS) $(t_version_DEPENDENCIES) $(EXTRA_t_version_DEPENDENCIES) 
 	@rm -f t-version$(EXEEXT)
 	$(LINK) $(t_version_OBJECTS) $(t_version_LDADD) $(LIBS)
 
@@ -664,14 +687,15 @@ check-TESTS: $(TESTS)
 	  fi; \
 	  dashes=`echo "$$dashes" | sed s/./=/g`; \
 	  if test "$$failed" -eq 0; then \
-	    echo "$$grn$$dashes"; \
+	    col="$$grn"; \
 	  else \
-	    echo "$$red$$dashes"; \
+	    col="$$red"; \
 	  fi; \
-	  echo "$$banner"; \
-	  test -z "$$skipped" || echo "$$skipped"; \
-	  test -z "$$report" || echo "$$report"; \
-	  echo "$$dashes$$std"; \
+	  echo "$${col}$$dashes$${std}"; \
+	  echo "$${col}$$banner$${std}"; \
+	  test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \
+	  test -z "$$report" || echo "$${col}$$report$${std}"; \
+	  echo "$${col}$$dashes$${std}"; \
 	  test "$$failed" -eq 0; \
 	else :; fi
 
@@ -707,13 +731,10 @@ distdir: $(DISTFILES)
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	    $(am__relativize); \
 	    new_distdir=$$reldir; \
@@ -749,10 +770,15 @@ install-am: all-am
 
 installcheck: installcheck-recursive
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
diff --git a/tests/gpg/Makefile.in b/tests/gpg/Makefile.in
index 8118139..676ef12 100644
--- a/tests/gpg/Makefile.in
+++ b/tests/gpg/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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,6 +36,23 @@
 
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    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;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -76,7 +93,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/glib-2.0.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
@@ -179,7 +196,7 @@ t_wait_OBJECTS = t-wait.$(OBJEXT)
 t_wait_LDADD = $(LDADD)
 t_wait_DEPENDENCIES = ../../src/libgpgme.la
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
+depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -203,6 +220,11 @@ DIST_SOURCES = t-decrypt.c t-decrypt-verify.c t-edit.c t-encrypt.c \
 	t-import.c t-keylist.c t-keylist-sig.c t-sig-notation.c \
 	t-sign.c t-signers.c t-thread1.c t-trustlist.c t-verify.c \
 	t-wait.c
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 HEADERS = $(noinst_HEADERS)
 ETAGS = etags
 CTAGS = ctags
@@ -218,7 +240,7 @@ AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 BUILD_FILEVERSION = @BUILD_FILEVERSION@
-BUILD_NUMBER = @BUILD_NUMBER@
+BUILD_REVISION = @BUILD_REVISION@
 BUILD_TIMESTAMP = @BUILD_TIMESTAMP@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -309,6 +331,7 @@ SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
+VERSION_NUMBER = @VERSION_NUMBER@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -425,70 +448,70 @@ 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) 
+t-decrypt$(EXEEXT): $(t_decrypt_OBJECTS) $(t_decrypt_DEPENDENCIES) $(EXTRA_t_decrypt_DEPENDENCIES) 
 	@rm -f t-decrypt$(EXEEXT)
 	$(LINK) $(t_decrypt_OBJECTS) $(t_decrypt_LDADD) $(LIBS)
-t-decrypt-verify$(EXEEXT): $(t_decrypt_verify_OBJECTS) $(t_decrypt_verify_DEPENDENCIES) 
+t-decrypt-verify$(EXEEXT): $(t_decrypt_verify_OBJECTS) $(t_decrypt_verify_DEPENDENCIES) $(EXTRA_t_decrypt_verify_DEPENDENCIES) 
 	@rm -f t-decrypt-verify$(EXEEXT)
 	$(LINK) $(t_decrypt_verify_OBJECTS) $(t_decrypt_verify_LDADD) $(LIBS)
-t-edit$(EXEEXT): $(t_edit_OBJECTS) $(t_edit_DEPENDENCIES) 
+t-edit$(EXEEXT): $(t_edit_OBJECTS) $(t_edit_DEPENDENCIES) $(EXTRA_t_edit_DEPENDENCIES) 
 	@rm -f t-edit$(EXEEXT)
 	$(LINK) $(t_edit_OBJECTS) $(t_edit_LDADD) $(LIBS)
-t-encrypt$(EXEEXT): $(t_encrypt_OBJECTS) $(t_encrypt_DEPENDENCIES) 
+t-encrypt$(EXEEXT): $(t_encrypt_OBJECTS) $(t_encrypt_DEPENDENCIES) $(EXTRA_t_encrypt_DEPENDENCIES) 
 	@rm -f t-encrypt$(EXEEXT)
 	$(LINK) $(t_encrypt_OBJECTS) $(t_encrypt_LDADD) $(LIBS)
-t-encrypt-large$(EXEEXT): $(t_encrypt_large_OBJECTS) $(t_encrypt_large_DEPENDENCIES) 
+t-encrypt-large$(EXEEXT): $(t_encrypt_large_OBJECTS) $(t_encrypt_large_DEPENDENCIES) $(EXTRA_t_encrypt_large_DEPENDENCIES) 
 	@rm -f t-encrypt-large$(EXEEXT)
 	$(LINK) $(t_encrypt_large_OBJECTS) $(t_encrypt_large_LDADD) $(LIBS)
-t-encrypt-sign$(EXEEXT): $(t_encrypt_sign_OBJECTS) $(t_encrypt_sign_DEPENDENCIES) 
+t-encrypt-sign$(EXEEXT): $(t_encrypt_sign_OBJECTS) $(t_encrypt_sign_DEPENDENCIES) $(EXTRA_t_encrypt_sign_DEPENDENCIES) 
 	@rm -f t-encrypt-sign$(EXEEXT)
 	$(LINK) $(t_encrypt_sign_OBJECTS) $(t_encrypt_sign_LDADD) $(LIBS)
-t-encrypt-sym$(EXEEXT): $(t_encrypt_sym_OBJECTS) $(t_encrypt_sym_DEPENDENCIES) 
+t-encrypt-sym$(EXEEXT): $(t_encrypt_sym_OBJECTS) $(t_encrypt_sym_DEPENDENCIES) $(EXTRA_t_encrypt_sym_DEPENDENCIES) 
 	@rm -f t-encrypt-sym$(EXEEXT)
 	$(LINK) $(t_encrypt_sym_OBJECTS) $(t_encrypt_sym_LDADD) $(LIBS)
-t-eventloop$(EXEEXT): $(t_eventloop_OBJECTS) $(t_eventloop_DEPENDENCIES) 
+t-eventloop$(EXEEXT): $(t_eventloop_OBJECTS) $(t_eventloop_DEPENDENCIES) $(EXTRA_t_eventloop_DEPENDENCIES) 
 	@rm -f t-eventloop$(EXEEXT)
 	$(LINK) $(t_eventloop_OBJECTS) $(t_eventloop_LDADD) $(LIBS)
-t-export$(EXEEXT): $(t_export_OBJECTS) $(t_export_DEPENDENCIES) 
+t-export$(EXEEXT): $(t_export_OBJECTS) $(t_export_DEPENDENCIES) $(EXTRA_t_export_DEPENDENCIES) 
 	@rm -f t-export$(EXEEXT)
 	$(LINK) $(t_export_OBJECTS) $(t_export_LDADD) $(LIBS)
-t-file-name$(EXEEXT): $(t_file_name_OBJECTS) $(t_file_name_DEPENDENCIES) 
+t-file-name$(EXEEXT): $(t_file_name_OBJECTS) $(t_file_name_DEPENDENCIES) $(EXTRA_t_file_name_DEPENDENCIES) 
 	@rm -f t-file-name$(EXEEXT)
 	$(LINK) $(t_file_name_OBJECTS) $(t_file_name_LDADD) $(LIBS)
-t-genkey$(EXEEXT): $(t_genkey_OBJECTS) $(t_genkey_DEPENDENCIES) 
+t-genkey$(EXEEXT): $(t_genkey_OBJECTS) $(t_genkey_DEPENDENCIES) $(EXTRA_t_genkey_DEPENDENCIES) 
 	@rm -f t-genkey$(EXEEXT)
 	$(LINK) $(t_genkey_OBJECTS) $(t_genkey_LDADD) $(LIBS)
-t-gpgconf$(EXEEXT): $(t_gpgconf_OBJECTS) $(t_gpgconf_DEPENDENCIES) 
+t-gpgconf$(EXEEXT): $(t_gpgconf_OBJECTS) $(t_gpgconf_DEPENDENCIES) $(EXTRA_t_gpgconf_DEPENDENCIES) 
 	@rm -f t-gpgconf$(EXEEXT)
 	$(LINK) $(t_gpgconf_OBJECTS) $(t_gpgconf_LDADD) $(LIBS)
-t-import$(EXEEXT): $(t_import_OBJECTS) $(t_import_DEPENDENCIES) 
+t-import$(EXEEXT): $(t_import_OBJECTS) $(t_import_DEPENDENCIES) $(EXTRA_t_import_DEPENDENCIES) 
 	@rm -f t-import$(EXEEXT)
 	$(LINK) $(t_import_OBJECTS) $(t_import_LDADD) $(LIBS)
-t-keylist$(EXEEXT): $(t_keylist_OBJECTS) $(t_keylist_DEPENDENCIES) 
+t-keylist$(EXEEXT): $(t_keylist_OBJECTS) $(t_keylist_DEPENDENCIES) $(EXTRA_t_keylist_DEPENDENCIES) 
 	@rm -f t-keylist$(EXEEXT)
 	$(LINK) $(t_keylist_OBJECTS) $(t_keylist_LDADD) $(LIBS)
-t-keylist-sig$(EXEEXT): $(t_keylist_sig_OBJECTS) $(t_keylist_sig_DEPENDENCIES) 
+t-keylist-sig$(EXEEXT): $(t_keylist_sig_OBJECTS) $(t_keylist_sig_DEPENDENCIES) $(EXTRA_t_keylist_sig_DEPENDENCIES) 
 	@rm -f t-keylist-sig$(EXEEXT)
 	$(LINK) $(t_keylist_sig_OBJECTS) $(t_keylist_sig_LDADD) $(LIBS)
-t-sig-notation$(EXEEXT): $(t_sig_notation_OBJECTS) $(t_sig_notation_DEPENDENCIES) 
+t-sig-notation$(EXEEXT): $(t_sig_notation_OBJECTS) $(t_sig_notation_DEPENDENCIES) $(EXTRA_t_sig_notation_DEPENDENCIES) 
 	@rm -f t-sig-notation$(EXEEXT)
 	$(LINK) $(t_sig_notation_OBJECTS) $(t_sig_notation_LDADD) $(LIBS)
-t-sign$(EXEEXT): $(t_sign_OBJECTS) $(t_sign_DEPENDENCIES) 
+t-sign$(EXEEXT): $(t_sign_OBJECTS) $(t_sign_DEPENDENCIES) $(EXTRA_t_sign_DEPENDENCIES) 
 	@rm -f t-sign$(EXEEXT)
 	$(LINK) $(t_sign_OBJECTS) $(t_sign_LDADD) $(LIBS)
-t-signers$(EXEEXT): $(t_signers_OBJECTS) $(t_signers_DEPENDENCIES) 
+t-signers$(EXEEXT): $(t_signers_OBJECTS) $(t_signers_DEPENDENCIES) $(EXTRA_t_signers_DEPENDENCIES) 
 	@rm -f t-signers$(EXEEXT)
 	$(LINK) $(t_signers_OBJECTS) $(t_signers_LDADD) $(LIBS)
-t-thread1$(EXEEXT): $(t_thread1_OBJECTS) $(t_thread1_DEPENDENCIES) 
+t-thread1$(EXEEXT): $(t_thread1_OBJECTS) $(t_thread1_DEPENDENCIES) $(EXTRA_t_thread1_DEPENDENCIES) 
 	@rm -f t-thread1$(EXEEXT)
 	$(LINK) $(t_thread1_OBJECTS) $(t_thread1_LDADD) $(LIBS)
-t-trustlist$(EXEEXT): $(t_trustlist_OBJECTS) $(t_trustlist_DEPENDENCIES) 
+t-trustlist$(EXEEXT): $(t_trustlist_OBJECTS) $(t_trustlist_DEPENDENCIES) $(EXTRA_t_trustlist_DEPENDENCIES) 
 	@rm -f t-trustlist$(EXEEXT)
 	$(LINK) $(t_trustlist_OBJECTS) $(t_trustlist_LDADD) $(LIBS)
-t-verify$(EXEEXT): $(t_verify_OBJECTS) $(t_verify_DEPENDENCIES) 
+t-verify$(EXEEXT): $(t_verify_OBJECTS) $(t_verify_DEPENDENCIES) $(EXTRA_t_verify_DEPENDENCIES) 
 	@rm -f t-verify$(EXEEXT)
 	$(LINK) $(t_verify_OBJECTS) $(t_verify_LDADD) $(LIBS)
-t-wait$(EXEEXT): $(t_wait_OBJECTS) $(t_wait_DEPENDENCIES) 
+t-wait$(EXEEXT): $(t_wait_OBJECTS) $(t_wait_DEPENDENCIES) $(EXTRA_t_wait_DEPENDENCIES) 
 	@rm -f t-wait$(EXEEXT)
 	$(LINK) $(t_wait_OBJECTS) $(t_wait_LDADD) $(LIBS)
 
@@ -681,14 +704,15 @@ check-TESTS: $(TESTS)
 	  fi; \
 	  dashes=`echo "$$dashes" | sed s/./=/g`; \
 	  if test "$$failed" -eq 0; then \
-	    echo "$$grn$$dashes"; \
+	    col="$$grn"; \
 	  else \
-	    echo "$$red$$dashes"; \
+	    col="$$red"; \
 	  fi; \
-	  echo "$$banner"; \
-	  test -z "$$skipped" || echo "$$skipped"; \
-	  test -z "$$report" || echo "$$report"; \
-	  echo "$$dashes$$std"; \
+	  echo "$${col}$$dashes$${std}"; \
+	  echo "$${col}$$banner$${std}"; \
+	  test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \
+	  test -z "$$report" || echo "$${col}$$report$${std}"; \
+	  echo "$${col}$$dashes$${std}"; \
 	  test "$$failed" -eq 0; \
 	else :; fi
 
@@ -737,10 +761,15 @@ install-am: all-am
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
diff --git a/tests/gpgsm/Makefile.in b/tests/gpgsm/Makefile.in
index 8c9ba31..c5522f0 100644
--- a/tests/gpgsm/Makefile.in
+++ b/tests/gpgsm/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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,6 +36,23 @@
 
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    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;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -72,7 +89,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/glib-2.0.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
@@ -121,7 +138,7 @@ t_verify_OBJECTS = t-verify.$(OBJEXT)
 t_verify_LDADD = $(LDADD)
 t_verify_DEPENDENCIES = ../../src/libgpgme.la
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
+depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -139,6 +156,11 @@ SOURCES = cms-decrypt.c cms-keylist.c t-decrypt.c t-encrypt.c \
 DIST_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
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 HEADERS = $(noinst_HEADERS)
 ETAGS = etags
 CTAGS = ctags
@@ -154,7 +176,7 @@ AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 BUILD_FILEVERSION = @BUILD_FILEVERSION@
-BUILD_NUMBER = @BUILD_NUMBER@
+BUILD_REVISION = @BUILD_REVISION@
 BUILD_TIMESTAMP = @BUILD_TIMESTAMP@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -245,6 +267,7 @@ SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
+VERSION_NUMBER = @VERSION_NUMBER@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -356,34 +379,34 @@ 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) 
+cms-decrypt$(EXEEXT): $(cms_decrypt_OBJECTS) $(cms_decrypt_DEPENDENCIES) $(EXTRA_cms_decrypt_DEPENDENCIES) 
 	@rm -f cms-decrypt$(EXEEXT)
 	$(LINK) $(cms_decrypt_OBJECTS) $(cms_decrypt_LDADD) $(LIBS)
-cms-keylist$(EXEEXT): $(cms_keylist_OBJECTS) $(cms_keylist_DEPENDENCIES) 
+cms-keylist$(EXEEXT): $(cms_keylist_OBJECTS) $(cms_keylist_DEPENDENCIES) $(EXTRA_cms_keylist_DEPENDENCIES) 
 	@rm -f cms-keylist$(EXEEXT)
 	$(LINK) $(cms_keylist_OBJECTS) $(cms_keylist_LDADD) $(LIBS)
-t-decrypt$(EXEEXT): $(t_decrypt_OBJECTS) $(t_decrypt_DEPENDENCIES) 
+t-decrypt$(EXEEXT): $(t_decrypt_OBJECTS) $(t_decrypt_DEPENDENCIES) $(EXTRA_t_decrypt_DEPENDENCIES) 
 	@rm -f t-decrypt$(EXEEXT)
 	$(LINK) $(t_decrypt_OBJECTS) $(t_decrypt_LDADD) $(LIBS)
-t-encrypt$(EXEEXT): $(t_encrypt_OBJECTS) $(t_encrypt_DEPENDENCIES) 
+t-encrypt$(EXEEXT): $(t_encrypt_OBJECTS) $(t_encrypt_DEPENDENCIES) $(EXTRA_t_encrypt_DEPENDENCIES) 
 	@rm -f t-encrypt$(EXEEXT)
 	$(LINK) $(t_encrypt_OBJECTS) $(t_encrypt_LDADD) $(LIBS)
-t-export$(EXEEXT): $(t_export_OBJECTS) $(t_export_DEPENDENCIES) 
+t-export$(EXEEXT): $(t_export_OBJECTS) $(t_export_DEPENDENCIES) $(EXTRA_t_export_DEPENDENCIES) 
 	@rm -f t-export$(EXEEXT)
 	$(LINK) $(t_export_OBJECTS) $(t_export_LDADD) $(LIBS)
-t-genkey$(EXEEXT): $(t_genkey_OBJECTS) $(t_genkey_DEPENDENCIES) 
+t-genkey$(EXEEXT): $(t_genkey_OBJECTS) $(t_genkey_DEPENDENCIES) $(EXTRA_t_genkey_DEPENDENCIES) 
 	@rm -f t-genkey$(EXEEXT)
 	$(LINK) $(t_genkey_OBJECTS) $(t_genkey_LDADD) $(LIBS)
-t-import$(EXEEXT): $(t_import_OBJECTS) $(t_import_DEPENDENCIES) 
+t-import$(EXEEXT): $(t_import_OBJECTS) $(t_import_DEPENDENCIES) $(EXTRA_t_import_DEPENDENCIES) 
 	@rm -f t-import$(EXEEXT)
 	$(LINK) $(t_import_OBJECTS) $(t_import_LDADD) $(LIBS)
-t-keylist$(EXEEXT): $(t_keylist_OBJECTS) $(t_keylist_DEPENDENCIES) 
+t-keylist$(EXEEXT): $(t_keylist_OBJECTS) $(t_keylist_DEPENDENCIES) $(EXTRA_t_keylist_DEPENDENCIES) 
 	@rm -f t-keylist$(EXEEXT)
 	$(LINK) $(t_keylist_OBJECTS) $(t_keylist_LDADD) $(LIBS)
-t-sign$(EXEEXT): $(t_sign_OBJECTS) $(t_sign_DEPENDENCIES) 
+t-sign$(EXEEXT): $(t_sign_OBJECTS) $(t_sign_DEPENDENCIES) $(EXTRA_t_sign_DEPENDENCIES) 
 	@rm -f t-sign$(EXEEXT)
 	$(LINK) $(t_sign_OBJECTS) $(t_sign_LDADD) $(LIBS)
-t-verify$(EXEEXT): $(t_verify_OBJECTS) $(t_verify_DEPENDENCIES) 
+t-verify$(EXEEXT): $(t_verify_OBJECTS) $(t_verify_DEPENDENCIES) $(EXTRA_t_verify_DEPENDENCIES) 
 	@rm -f t-verify$(EXEEXT)
 	$(LINK) $(t_verify_OBJECTS) $(t_verify_LDADD) $(LIBS)
 
@@ -564,14 +587,15 @@ check-TESTS: $(TESTS)
 	  fi; \
 	  dashes=`echo "$$dashes" | sed s/./=/g`; \
 	  if test "$$failed" -eq 0; then \
-	    echo "$$grn$$dashes"; \
+	    col="$$grn"; \
 	  else \
-	    echo "$$red$$dashes"; \
+	    col="$$red"; \
 	  fi; \
-	  echo "$$banner"; \
-	  test -z "$$skipped" || echo "$$skipped"; \
-	  test -z "$$report" || echo "$$report"; \
-	  echo "$$dashes$$std"; \
+	  echo "$${col}$$dashes$${std}"; \
+	  echo "$${col}$$banner$${std}"; \
+	  test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \
+	  test -z "$$report" || echo "$${col}$$report$${std}"; \
+	  echo "$${col}$$dashes$${std}"; \
 	  test "$$failed" -eq 0; \
 	else :; fi
 
@@ -620,10 +644,15 @@ install-am: all-am
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
diff --git a/tests/opassuan/Makefile.in b/tests/opassuan/Makefile.in
index 2698737..8f9f2fb 100644
--- a/tests/opassuan/Makefile.in
+++ b/tests/opassuan/Makefile.in
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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,6 +34,23 @@
 
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    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;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -67,7 +84,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/glib-2.0.m4 \
 	$(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+mkinstalldirs = $(SHELL) $(top_srcdir)/build-aux/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
@@ -78,7 +95,7 @@ t_command_OBJECTS = t-command.$(OBJEXT)
 t_command_LDADD = $(LDADD)
 t_command_DEPENDENCIES = ../../src/libgpgme.la
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
+depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -92,6 +109,11 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	$(LDFLAGS) -o $@
 SOURCES = t-command.c
 DIST_SOURCES = t-command.c
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 HEADERS = $(noinst_HEADERS)
 ETAGS = etags
 CTAGS = ctags
@@ -107,7 +129,7 @@ AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
 BUILD_FILEVERSION = @BUILD_FILEVERSION@
-BUILD_NUMBER = @BUILD_NUMBER@
+BUILD_REVISION = @BUILD_REVISION@
 BUILD_TIMESTAMP = @BUILD_TIMESTAMP@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
@@ -198,6 +220,7 @@ SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
+VERSION_NUMBER = @VERSION_NUMBER@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
@@ -304,7 +327,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) 
+t-command$(EXEEXT): $(t_command_OBJECTS) $(t_command_DEPENDENCIES) $(EXTRA_t_command_DEPENDENCIES) 
 	@rm -f t-command$(EXEEXT)
 	$(LINK) $(t_command_OBJECTS) $(t_command_LDADD) $(LIBS)
 
@@ -476,14 +499,15 @@ check-TESTS: $(TESTS)
 	  fi; \
 	  dashes=`echo "$$dashes" | sed s/./=/g`; \
 	  if test "$$failed" -eq 0; then \
-	    echo "$$grn$$dashes"; \
+	    col="$$grn"; \
 	  else \
-	    echo "$$red$$dashes"; \
+	    col="$$red"; \
 	  fi; \
-	  echo "$$banner"; \
-	  test -z "$$skipped" || echo "$$skipped"; \
-	  test -z "$$report" || echo "$$report"; \
-	  echo "$$dashes$$std"; \
+	  echo "$${col}$$dashes$${std}"; \
+	  echo "$${col}$$banner$${std}"; \
+	  test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \
+	  test -z "$$report" || echo "$${col}$$report$${std}"; \
+	  echo "$${col}$$dashes$${std}"; \
 	  test "$$failed" -eq 0; \
 	else :; fi
 
@@ -532,10 +556,15 @@ install-am: all-am
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
diff --git a/tests/run-export.c b/tests/run-export.c
index b70ed91..4333208 100644
--- a/tests/run-export.c
+++ b/tests/run-export.c
@@ -2,17 +2,17 @@
    Copyright (C) 2008, 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/>.
 */
@@ -48,7 +48,7 @@ show_usage (int ex)
   exit (ex);
 }
 
-int 
+int
 main (int argc, char **argv)
 {
   int last_argc = -1;
@@ -86,9 +86,9 @@ main (int argc, char **argv)
         }
       else if (!strncmp (*argv, "--", 2))
         show_usage (1);
-      
-    }          
- 
+
+    }
+
   if (!argc)
     show_usage (1);
 
@@ -101,7 +101,7 @@ main (int argc, char **argv)
   /* Lookup the keys.  */
   err = gpgme_op_keylist_ext_start (ctx, (const char**)argv, 0, 0);
   fail_if_err (err);
-    
+
   while (!(err = gpgme_op_keylist_next (ctx, &key)))
     {
       printf ("keyid: %s  (fpr: %s)\n",
@@ -138,7 +138,7 @@ main (int argc, char **argv)
   fail_if_err (err);
 
   gpgme_set_armor (ctx, 1);
-  err = gpgme_op_export_keys (ctx, keyarray, mode, 
+  err = gpgme_op_export_keys (ctx, keyarray, mode,
                               (mode & GPGME_KEYLIST_MODE_EXTERN)? NULL:out);
   fail_if_err (err);
 
diff --git a/tests/run-import.c b/tests/run-import.c
index cd101b0..9225f61 100644
--- a/tests/run-import.c
+++ b/tests/run-import.c
@@ -2,17 +2,17 @@
    Copyright (C) 2008, 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/>.
 */
@@ -49,7 +49,7 @@ show_usage (int ex)
   exit (ex);
 }
 
-int 
+int
 main (int argc, char **argv)
 {
   int last_argc = -1;
@@ -89,9 +89,9 @@ main (int argc, char **argv)
         }
       else if (!strncmp (*argv, "--", 2))
         show_usage (1);
-      
-    }          
- 
+
+    }
+
   if (!argc)
     show_usage (1);
 
@@ -110,7 +110,7 @@ main (int argc, char **argv)
       if (url_mode)
         gpgme_data_set_encoding (data, (nul_mode? GPGME_DATA_ENCODING_URL0
                                         : GPGME_DATA_ENCODING_URL));
-      
+
       err = gpgme_op_import (ctx, data);
       fail_if_err (err);
       impres = gpgme_op_import_result (ctx);
@@ -120,7 +120,7 @@ main (int argc, char **argv)
           exit (1);
         }
       print_import_result (impres);
-      
+
       gpgme_data_release (data);
     }
 
diff --git a/tests/run-keylist.c b/tests/run-keylist.c
index 0f2154a..c0c7202 100644
--- a/tests/run-keylist.c
+++ b/tests/run-keylist.c
@@ -2,17 +2,17 @@
    Copyright (C) 2008, 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/>.
 */
@@ -57,7 +57,7 @@ show_usage (int ex)
 }
 
 
-int 
+int
 main (int argc, char **argv)
 {
   int last_argc = -1;
@@ -136,9 +136,9 @@ main (int argc, char **argv)
         }
       else if (!strncmp (*argv, "--", 2))
         show_usage (1);
-      
-    }          
- 
+
+    }
+
   if (argc > 1)
     show_usage (1);
 
@@ -152,12 +152,12 @@ main (int argc, char **argv)
 
   err = gpgme_op_keylist_start (ctx, argc? argv[0]:NULL, 0);
   fail_if_err (err);
-    
+
   while (!(err = gpgme_op_keylist_next (ctx, &key)))
     {
       gpgme_user_id_t uid;
       int nuids;
-      
+
 
       printf ("keyid   : %s\n", key->subkeys?nonnull (key->subkeys->keyid):"?");
       printf ("fpr     : %s\n", key->subkeys?nonnull (key->subkeys->fpr):"?");
@@ -176,7 +176,7 @@ main (int argc, char **argv)
       for (nuids=0, uid=key->uids; uid; uid = uid->next, nuids++)
         {
           printf ("userid %d: %s\n", nuids, nonnull(uid->uid));
-          printf ("valid  %d: %s\n", nuids, 
+          printf ("valid  %d: %s\n", nuids,
                   uid->validity == GPGME_VALIDITY_UNKNOWN? "unknown":
                   uid->validity == GPGME_VALIDITY_UNDEFINED? "undefined":
                   uid->validity == GPGME_VALIDITY_NEVER? "never":
diff --git a/tests/run-sign.c b/tests/run-sign.c
index b16b9ef..e1498ea 100644
--- a/tests/run-sign.c
+++ b/tests/run-sign.c
@@ -2,17 +2,17 @@
    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/>.
 */
@@ -44,10 +44,10 @@ print_result (gpgme_sign_result_t result, gpgme_sig_mode_t type)
   gpgme_new_signature_t sig;
 
   for (invkey = result->invalid_signers; invkey; invkey = invkey->next)
-    printf ("Signing key `%s' not used: %s <%s>\n", 
-            nonnull (invkey->fpr), 
+    printf ("Signing key `%s' not used: %s <%s>\n",
+            nonnull (invkey->fpr),
             gpg_strerror (invkey->reason), gpg_strsource (invkey->reason));
-  
+
   for (sig = result->signatures; sig; sig = sig->next)
     {
       printf ("Key fingerprint: %s\n", nonnull (sig->fpr));
@@ -76,7 +76,7 @@ show_usage (int ex)
 }
 
 
-int 
+int
 main (int argc, char **argv)
 {
   int last_argc = -1;
@@ -131,9 +131,9 @@ main (int argc, char **argv)
         }
       else if (!strncmp (*argv, "--", 2))
         show_usage (1);
-      
-    }          
- 
+
+    }
+
   if (argc != 1)
     show_usage (1);
 
@@ -153,7 +153,7 @@ main (int argc, char **argv)
   if (key_string)
     {
       gpgme_key_t akey;
-      
+
       err = gpgme_get_key (ctx, key_string, &akey, 1);
       if (err)
         {
diff --git a/tests/run-support.h b/tests/run-support.h
index db7b7d5..b1aea4b 100644
--- a/tests/run-support.h
+++ b/tests/run-support.h
@@ -3,17 +3,17 @@
    Copyright (C) 2001, 2002, 2003, 2004, 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/>.
 */
@@ -60,7 +60,7 @@ print_data (gpgme_data_t dh)
 #define BUF_SIZE 512
   char buf[BUF_SIZE + 1];
   int ret;
-  
+
   ret = gpgme_data_seek (dh, 0, SEEK_SET);
   if (ret)
     fail_if_err (gpgme_err_code_from_errno (errno));
@@ -108,7 +108,7 @@ make_filename (const char *fname)
   if (!srcdir)
     srcdir = ".";
   buf = malloc (strlen(srcdir) + strlen(fname) + 2);
-  if (!buf) 
+  if (!buf)
     exit (8);
   strcpy (buf, srcdir);
   strcat (buf, "/");
diff --git a/tests/run-verify.c b/tests/run-verify.c
index 4837d9c..b49ea2a 100644
--- a/tests/run-verify.c
+++ b/tests/run-verify.c
@@ -2,17 +2,17 @@
    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/>.
 */
@@ -63,7 +63,7 @@ print_summary (gpgme_sigsum_t summary)
     fputs (" sys-error", stdout);
 }
 
-static void 
+static void
 print_validity (gpgme_validity_t val)
 {
   const char *s = NULL;
@@ -133,7 +133,7 @@ show_usage (int ex)
 }
 
 
-int 
+int
 main (int argc, char **argv)
 {
   int last_argc = -1;
@@ -176,17 +176,17 @@ main (int argc, char **argv)
         }
       else if (!strncmp (*argv, "--", 2))
         show_usage (1);
-      
-    }          
- 
+
+    }
+
   if (argc < 1 || argc > 2)
     show_usage (1);
-  
+
   fp_sig = fopen (argv[0], "rb");
   if (!fp_sig)
     {
       err = gpgme_error_from_syserror ();
-      fprintf (stderr, PGM ": can't open `%s': %s\n", 
+      fprintf (stderr, PGM ": can't open `%s': %s\n",
                argv[0], gpgme_strerror (err));
       exit (1);
     }
@@ -196,7 +196,7 @@ main (int argc, char **argv)
       if (!fp_msg)
         {
           err = gpgme_error_from_syserror ();
-          fprintf (stderr, PGM ": can't open `%s': %s\n", 
+          fprintf (stderr, PGM ": can't open `%s': %s\n",
                    argv[1], gpgme_strerror (err));
           exit (1);
         }
diff --git a/tests/t-data.c b/tests/t-data.c
index a319484..888475f 100644
--- a/tests/t-data.c
+++ b/tests/t-data.c
@@ -7,12 +7,12 @@
    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, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
@@ -190,7 +190,7 @@ write_test (round_t round, gpgme_data_t data)
     }
 }
 
-int 
+int
 main (int argc, char **argv)
 {
   round_t round = TEST_INITIALIZER;
diff --git a/tests/t-engine-info.c b/tests/t-engine-info.c
index 3864fe5..ec2e1e8 100644
--- a/tests/t-engine-info.c
+++ b/tests/t-engine-info.c
@@ -2,17 +2,17 @@
    Copyright (C) 2003, 2004, 2007 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, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
@@ -67,12 +67,13 @@ check_engine_info (gpgme_engine_info_t info, gpgme_protocol_t protocol,
 }
 
 
-int 
+int
 main (int argc, char **argv )
 {
   gpgme_engine_info_t info;
   gpgme_error_t err;
 
+  gpgme_check_version (NULL);
   err = gpgme_get_engine_info (&info);
   fail_if_err (err);
 
diff --git a/tests/t-version.c b/tests/t-version.c
index 06bff60..2782ca3 100644
--- a/tests/t-version.c
+++ b/tests/t-version.c
@@ -7,12 +7,12 @@
    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, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
@@ -22,24 +22,71 @@
 #include <config.h>
 #endif
 
+#include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 
 #include <gpgme.h>
 
-int 
+static int verbose;
+static int debug;
+
+
+int
 main (int argc, char **argv)
 {
+  int ret;
   const char *null_result;
   const char *current_result;
   const char *future_result;
 
+  int last_argc = -1;
+
+  if (argc)
+    {
+      argc--; argv++;
+    }
+  while (argc && last_argc != argc )
+    {
+      last_argc = argc;
+      if (!strcmp (*argv, "--help"))
+        {
+          puts ("usage: ./t-version [options]\n"
+                "\n"
+                "Options:\n"
+                "  --verbose      Show what is going on\n"
+                );
+          exit (0);
+        }
+      if (!strcmp (*argv, "--verbose"))
+        {
+          verbose = 1;
+          argc--; argv++;
+        }
+      else if (!strcmp (*argv, "--debug"))
+        {
+          verbose = debug = 1;
+          argc--; argv++;
+        }
+    }
+
   null_result = gpgme_check_version (NULL);
   current_result = gpgme_check_version (VERSION);
   future_result = gpgme_check_version (VERSION ".1");
 
-  return !(null_result
-	   && ! strcmp (null_result, VERSION)
-	   && current_result
-	   && ! strcmp (current_result, VERSION)
-	   && ! future_result);
+  ret = !(null_result
+          && ! strcmp (null_result, VERSION)
+          && current_result
+          && ! strcmp (current_result, VERSION)
+          && ! future_result);
+
+  if (verbose || ret)
+    {
+      printf ("Version from header: %s (0x%06x)\n",
+               GPGME_VERSION, GPGME_VERSION_NUMBER);
+      printf ("Version from binary: %s\n", gpgme_check_version (NULL));
+      printf ("Copyright blurb ...:%s\n", gpgme_check_version ("\x01\x01"));
+    }
+
+  return ret;
 }