diff options
| author | Werner Koch <wk@gnupg.org> | 2016-04-21 09:17:11 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2016-04-21 09:17:11 +0200 |
| commit | bd4d65615b3a5360d455b99e77bd113ad90f1539 (patch) | |
| tree | 414059246b2e412b5470d446844c85d7ee09b533 /build-aux/speedo.mk | |
| parent | agent: Sanitize permissions of the private key directory. (diff) | |
| download | gnupg2-bd4d65615b3a5360d455b99e77bd113ad90f1539.tar.xz gnupg2-bd4d65615b3a5360d455b99e77bd113ad90f1539.zip | |
w32: Replace libiconv DLL by iconv feature of libgpg-error.
* configure.ac: Do nor require libiconv for W32.
* common/utf8conv.c [W32]: Do not incluce iconv.h. Request
libgpg-error iconv macros.
(jnlib_iconv): Use ICONV_CONST macro.
* build-aux/speedo/w32/inst.nsi [!WITH_GUI]: Do not install libiconv.
* build-aux/speedo.mk (speedo_spkgs) [!WITH_GUI]: Likewise.
Signed-off-by: Werner Koch <wk@gnupg.org>
Diffstat (limited to 'build-aux/speedo.mk')
| -rw-r--r-- | build-aux/speedo.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/build-aux/speedo.mk b/build-aux/speedo.mk index 7b29025a6..2812773c4 100644 --- a/build-aux/speedo.mk +++ b/build-aux/speedo.mk @@ -172,9 +172,9 @@ speedo_spkgs = \ ifeq ($(TARGETOS),w32) speedo_spkgs += \ - zlib bzip2 adns sqlite libiconv + zlib bzip2 adns sqlite ifeq ($(WITH_GUI),1) -speedo_spkgs += gettext +speedo_spkgs += gettext libiconv endif endif |