Index: src/gpgme-config.in
===================================================================
--- src/gpgme-config.in.orig	2012-05-02 09:42:23.000000000 +0100
+++ src/gpgme-config.in	2012-11-16 22:43:53.000000000 +0000
@@ -23,7 +23,7 @@ libs="-L@libdir@"
 
 # Network libraries.
 assuan_cflags="@LIBASSUAN_CFLAGS@"
-assuan_libs="@LIBASSUAN_LIBS@"
+#assuan_libs="@LIBASSUAN_LIBS@"
 
 # Configure libgpg-error.
 gpg_error_cflags="@GPG_ERROR_CFLAGS@"
Index: src/Makefile.am
===================================================================
--- src/Makefile.am.orig	2012-04-13 09:01:09.000000000 +0100
+++ src/Makefile.am	2012-11-16 22:43:53.000000000 +0000
@@ -196,12 +196,13 @@ libgpgme_la_DEPENDENCIES = @LTLIBOBJS@ $
 libgpgme_la_LIBADD = $(gpgme_res) @LIBASSUAN_LIBS@ @LTLIBOBJS@ \
 	             @GPG_ERROR_LIBS@
 
+libgpgme_pthread_la_CFLAGS = -pthread
 libgpgme_pthread_la_LDFLAGS = $(no_undefined) $(export_symbols) \
 	$(libgpgme_version_script_cmd) -version-info \
 	@LIBGPGME_LT_CURRENT@:@LIBGPGME_LT_REVISION@:@LIBGPGME_LT_AGE@
 libgpgme_pthread_la_DEPENDENCIES = @LTLIBOBJS@ $(srcdir)/libgpgme.vers
 libgpgme_pthread_la_LIBADD = $(gpgme_res) @LIBASSUAN_LIBS@ @LTLIBOBJS@ \
-	-lpthread @GPG_ERROR_LIBS@
+	@GPG_ERROR_LIBS@
 
 if BUILD_W32_GLIB
 libgpgme_glib_la_LDFLAGS = $(no_undefined) \
Index: configure.ac
===================================================================
--- configure.ac.orig	2012-05-02 10:06:21.000000000 +0100
+++ configure.ac	2012-11-16 22:43:53.000000000 +0000
@@ -78,7 +78,7 @@ AM_MAINTAINER_MODE
 AC_CANONICAL_HOST
 
 # Enable GNU extensions on systems that have them.
-AC_GNU_SOURCE
+AC_USE_SYSTEM_EXTENSIONS
 
 AH_VERBATIM([_REENTRANT],
 [/* To allow the use of GPGME in multithreaded programs we have to use
@@ -89,7 +89,7 @@ AH_VERBATIM([_REENTRANT],
 # define _REENTRANT 1
 #endif])
 
-AC_PROG_CC
+AC_PROG_CC_STDC
 AC_PROG_CXX
 AC_CHECK_PROGS(GITLOG_TO_CHANGELOG, gitlog-to-changelog,
                [build-aux/gitlog-to-changelog])