diff options
| author | Marcus Brinkmann <[email protected]> | 2009-10-20 15:54:01 +0000 |
|---|---|---|
| committer | Marcus Brinkmann <[email protected]> | 2009-10-20 15:54:01 +0000 |
| commit | 06d5e93367a1b3fef080b33e597a85021803b4d8 (patch) | |
| tree | 1e74d7cf7dca2afaa50877baec75a18efd85442b | |
| parent | 2009-10-20 Marcus Brinkmann <[email protected]> (diff) | |
| download | gpgme-06d5e93367a1b3fef080b33e597a85021803b4d8.tar.gz gpgme-06d5e93367a1b3fef080b33e597a85021803b4d8.zip | |
2009-10-20 Marcus Brinkmann <[email protected]>
* gpgme-config.in (netlibs): Remove.
(assuan_cflags, assuan_libs): Add.
| -rw-r--r-- | src/ChangeLog | 3 | ||||
| -rw-r--r-- | src/gpgme-config.in | 7 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index c2100f73..ee32a25e 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,8 @@ 2009-10-20 Marcus Brinkmann <[email protected]> + * 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 0cc639f2..33ab456a 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 |