From: Marcus Brinkmann <mb@g10code.com>
Date: Tue, 20 Oct 2009 15:54:01 +0000 (+0000)
Subject: 2009-10-20  Marcus Brinkmann  <marcus@g10code.de>
X-Git-Tag: gpgme-1.3.0~49
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=06d5e93367a1b3fef080b33e597a85021803b4d8;p=gpgme.git

2009-10-20  Marcus Brinkmann  <marcus@g10code.de>

	* gpgme-config.in (netlibs): Remove.
	(assuan_cflags, assuan_libs): Add.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index c2100f7..ee32a25 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2009-10-20  Marcus Brinkmann  <marcus@g10code.de>
 
+	* gpgme-config.in (netlibs): Remove.
+	(assuan_cflags, assuan_libs): Add.
+
 	* Makefile.am (assuan_cppflags, assuan_libobjs): Removed.
 	(gpgsm_components): Move engine-assuan.c to ...
 	(assuan_components): ... this new variable.
diff --git a/src/gpgme-config.in b/src/gpgme-config.in
index 0cc639f..33ab456 100644
--- a/src/gpgme-config.in
+++ b/src/gpgme-config.in
@@ -20,7 +20,8 @@ LC_ALL=C
 LANG=C
 
 # Network libraries.
-netlibs="@NETLIBS@"
+assuan_cflags="@LIBASSUAN_CFLAGS@"
+assuan_libs="@LIBASSUAN_LIBS@"
 
 # Configure libgpg-error.
 gpg_error_cflags="@GPG_ERROR_CFLAGS@"
@@ -112,7 +113,7 @@ while test $# -gt 0; do
 		    output="$output $cflags_pth"
 		    ;;
 	    esac
-	    output="$output $gpg_error_cflags"
+	    output="$output $assuan_cflags $gpg_error_cflags"
 	    if test "x$with_glib" = "xyes"; then
 		output="$output $glib_cflags"
 	    fi
@@ -136,7 +137,7 @@ while test $# -gt 0; do
 		    fi
 		    ;;
 	    esac
-	    output="$output $gpg_error_libs $netlibs"
+	    output="$output $assuan_libs $gpg_error_libs"
 	    if test "x$with_glib" = "xyes"; then
 		output="$output $glib_cflags"
 	    fi