diff -up gpgme-1.3.0/src/Makefile.am.ImplicitDSOLinking gpgme-1.3.0/src/Makefile.am
--- gpgme-1.3.0/src/Makefile.am.ImplicitDSOLinking	2010-01-06 04:02:19.000000000 +0100
+++ gpgme-1.3.0/src/Makefile.am	2011-02-11 18:14:54.000000000 +0100
@@ -232,7 +232,7 @@ libgpgme_qt_la_LIBADD = $(gpgme_res) @LI
 endif
 
 noinst_PROGRAMS = gpgme-tool
-gpgme_tool_LDADD = libgpgme.la
+gpgme_tool_LDADD = libgpgme.la @LIBASSUAN_LIBS@ @GPG_ERROR_LIBS@
 
 status-table.h : gpgme.h
 	$(srcdir)/mkstatus < $(builddir)/gpgme.h > status-table.h
diff -up gpgme-1.3.0/src/Makefile.in.ImplicitDSOLinking gpgme-1.3.0/src/Makefile.in
--- gpgme-1.3.0/src/Makefile.in.ImplicitDSOLinking	2010-01-11 12:06:54.000000000 +0100
+++ gpgme-1.3.0/src/Makefile.in	2011-02-11 18:17:10.000000000 +0100
@@ -572,7 +572,7 @@ libgpgme_pth_la_LIBADD = $(gpgme_res) @L
 @BUILD_W32_QT_TRUE@libgpgme_qt_la_LIBADD = $(gpgme_res) @LIBASSUAN_LIBS@ @LTLIBOBJS@ \
 @BUILD_W32_QT_TRUE@	@GPG_ERROR_LIBS@ @QT4_CORE_LIBS@
 
-gpgme_tool_LDADD = libgpgme.la
+gpgme_tool_LDADD = libgpgme.la @LIBASSUAN_LIBS@ @GPG_ERROR_LIBS@
 all: $(BUILT_SOURCES)
 	$(MAKE) $(AM_MAKEFLAGS) all-am
 
diff -up gpgme-1.3.0/tests/gpgsm/Makefile.am.ImplicitDSOLinking gpgme-1.3.0/tests/gpgsm/Makefile.am
--- gpgme-1.3.0/tests/gpgsm/Makefile.am.ImplicitDSOLinking	2008-12-03 14:39:48.000000000 +0100
+++ gpgme-1.3.0/tests/gpgsm/Makefile.am	2011-02-11 17:36:32.000000000 +0100
@@ -32,7 +32,7 @@ EXTRA_DIST = cert_dfn_pca01.der cert_dfn
 INCLUDES = -I$(top_builddir)/src
 
 AM_CPPFLAGS = @GPG_ERROR_CFLAGS@
-LDADD = ../../src/libgpgme.la
+LDADD = ../../src/libgpgme.la @GPG_ERROR_LIBS@
 
 # We don't run t-genkey in the test suite, because it takes too long
 # and needs a working pinentry.
diff -up gpgme-1.3.0/tests/gpgsm/Makefile.in.ImplicitDSOLinking gpgme-1.3.0/tests/gpgsm/Makefile.in
--- gpgme-1.3.0/tests/gpgsm/Makefile.in.ImplicitDSOLinking	2010-01-11 12:06:54.000000000 +0100
+++ gpgme-1.3.0/tests/gpgsm/Makefile.in	2011-02-11 17:36:32.000000000 +0100
@@ -307,7 +307,7 @@ EXTRA_DIST = cert_dfn_pca01.der cert_dfn
 
 INCLUDES = -I$(top_builddir)/src
 AM_CPPFLAGS = @GPG_ERROR_CFLAGS@
-LDADD = ../../src/libgpgme.la
+LDADD = ../../src/libgpgme.la @GPG_ERROR_LIBS@
 key_id = 32100C27173EF6E9C4E9A25D3D69F86D37A4F939
 DISTCLEANFILES = pubring.kbx pubring.kbx~ gpgsm.conf trustlist.txt \
 	private-keys-v1.d/$(key_id).key random_seed
diff -up gpgme-1.3.0/tests/opassuan/Makefile.am.ImplicitDSOLinking gpgme-1.3.0/tests/opassuan/Makefile.am
--- gpgme-1.3.0/tests/opassuan/Makefile.am.ImplicitDSOLinking	2009-01-26 15:15:26.000000000 +0100
+++ gpgme-1.3.0/tests/opassuan/Makefile.am	2011-02-11 17:36:32.000000000 +0100
@@ -27,7 +27,7 @@ EXTRA_DIST = 
 INCLUDES = -I$(top_builddir)/src
 
 AM_CPPFLAGS = @GPG_ERROR_CFLAGS@
-LDADD = ../../src/libgpgme.la
+LDADD = ../../src/libgpgme.la @GPG_ERROR_LIBS@
 
 noinst_PROGRAMS = $(TESTS) t-command
 
diff -up gpgme-1.3.0/tests/opassuan/Makefile.in.ImplicitDSOLinking gpgme-1.3.0/tests/opassuan/Makefile.in
--- gpgme-1.3.0/tests/opassuan/Makefile.in.ImplicitDSOLinking	2010-01-11 12:06:54.000000000 +0100
+++ gpgme-1.3.0/tests/opassuan/Makefile.in	2011-02-11 17:36:32.000000000 +0100
@@ -258,7 +258,7 @@ noinst_HEADERS = 
 EXTRA_DIST = 
 INCLUDES = -I$(top_builddir)/src
 AM_CPPFLAGS = @GPG_ERROR_CFLAGS@
-LDADD = ../../src/libgpgme.la
+LDADD = ../../src/libgpgme.la @GPG_ERROR_LIBS@
 DISTCLEANFILES = 
 all: all-am