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 c2100f7356d3a6fc535620e816976c936b2a18f8..ee32a25ecb53eecaf74648c1ad2683e7a6bfa665 100644 (file)
--- 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 0cc639f2c62616793057395c3bce6a1fe3816033..33ab456a0a0bee948dffd2fc9e81844b42cdfa60 100644 (file)
--- 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