2009-10-20 Marcus Brinkmann <marcus@g10code.de>
* gpgme-config.in (netlibs): Remove. (assuan_cflags, assuan_libs): Add.
This commit is contained in:
parent
e782b1ab06
commit
06d5e93367
@ -1,5 +1,8 @@
|
|||||||
2009-10-20 Marcus Brinkmann <marcus@g10code.de>
|
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.
|
* Makefile.am (assuan_cppflags, assuan_libobjs): Removed.
|
||||||
(gpgsm_components): Move engine-assuan.c to ...
|
(gpgsm_components): Move engine-assuan.c to ...
|
||||||
(assuan_components): ... this new variable.
|
(assuan_components): ... this new variable.
|
||||||
|
@ -20,7 +20,8 @@ LC_ALL=C
|
|||||||
LANG=C
|
LANG=C
|
||||||
|
|
||||||
# Network libraries.
|
# Network libraries.
|
||||||
netlibs="@NETLIBS@"
|
assuan_cflags="@LIBASSUAN_CFLAGS@"
|
||||||
|
assuan_libs="@LIBASSUAN_LIBS@"
|
||||||
|
|
||||||
# Configure libgpg-error.
|
# Configure libgpg-error.
|
||||||
gpg_error_cflags="@GPG_ERROR_CFLAGS@"
|
gpg_error_cflags="@GPG_ERROR_CFLAGS@"
|
||||||
@ -112,7 +113,7 @@ while test $# -gt 0; do
|
|||||||
output="$output $cflags_pth"
|
output="$output $cflags_pth"
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
output="$output $gpg_error_cflags"
|
output="$output $assuan_cflags $gpg_error_cflags"
|
||||||
if test "x$with_glib" = "xyes"; then
|
if test "x$with_glib" = "xyes"; then
|
||||||
output="$output $glib_cflags"
|
output="$output $glib_cflags"
|
||||||
fi
|
fi
|
||||||
@ -136,7 +137,7 @@ while test $# -gt 0; do
|
|||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
output="$output $gpg_error_libs $netlibs"
|
output="$output $assuan_libs $gpg_error_libs"
|
||||||
if test "x$with_glib" = "xyes"; then
|
if test "x$with_glib" = "xyes"; then
|
||||||
output="$output $glib_cflags"
|
output="$output $glib_cflags"
|
||||||
fi
|
fi
|
||||||
|
Loading…
Reference in New Issue
Block a user