[svn] gpgme - r1399 - trunk/src

[svn author marcus]

Author: marcus
Date: 2009-10-20 17:54:01 +0200 (Tue, 20 Oct 2009)
New Revision: 1399

Modified:
   trunk/src/ChangeLog
   trunk/src/gpgme-config.in
Log:
2009-10-20  Marcus Brinkmann  <marcus at g10code.de>

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


Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog	2009-10-20 15:39:15 UTC (rev 1398)
+++ trunk/src/ChangeLog	2009-10-20 15:54:01 UTC (rev 1399)
@@ -1,5 +1,8 @@
 2009-10-20  Marcus Brinkmann  <marcus at 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.

Modified: trunk/src/gpgme-config.in
===================================================================
--- trunk/src/gpgme-config.in	2009-10-20 15:39:15 UTC (rev 1398)
+++ trunk/src/gpgme-config.in	2009-10-20 15:54:01 UTC (rev 1399)
@@ -20,7 +20,8 @@
 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 @@
 		    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 @@
 		    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