diff options
| author | Werner Koch <[email protected]> | 2016-04-21 07:17:11 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2016-04-21 07:17:11 +0000 |
| commit | bd4d65615b3a5360d455b99e77bd113ad90f1539 (patch) | |
| tree | 414059246b2e412b5470d446844c85d7ee09b533 /build-aux | |
| parent | agent: Sanitize permissions of the private key directory. (diff) | |
| download | gnupg-bd4d65615b3a5360d455b99e77bd113ad90f1539.tar.gz gnupg-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 <[email protected]>
Diffstat (limited to 'build-aux')
| -rw-r--r-- | build-aux/speedo.mk | 4 | ||||
| -rw-r--r-- | build-aux/speedo/w32/inst.nsi | 18 |
2 files changed, 11 insertions, 11 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 diff --git a/build-aux/speedo/w32/inst.nsi b/build-aux/speedo/w32/inst.nsi index a695d990a..3a2d5820b 100644 --- a/build-aux/speedo/w32/inst.nsi +++ b/build-aux/speedo/w32/inst.nsi @@ -633,11 +633,6 @@ Section "-libgpg-error" SEC_libgpg_error File include/gpg-error.h SectionEnd -Section "-libiconv" SEC_libiconv - SetOutPath "$INSTDIR\bin" - File bin/libiconv-2.dll -SectionEnd - Section "-zlib" SEC_zlib SetOutPath "$INSTDIR\bin" File bin/zlib1.dll @@ -701,6 +696,11 @@ Section "-gpgme" SEC_gpgme SectionEnd !ifdef WITH_GUI +Section "-libiconv" SEC_libiconv + SetOutPath "$INSTDIR\bin" + File bin/libiconv-2.dll +SectionEnd + Section "-gettext" SEC_gettext SetOutPath "$INSTDIR\bin" File bin/libintl-8.dll @@ -1054,6 +1054,10 @@ Section "-un.gettext" Delete "$INSTDIR\bin\libintl-8.dll" SectionEnd +Section "-un.libiconv" + Delete "$INSTDIR\bin\libiconv-2.dll" +SectionEnd + Section "-un.gpgme" Delete "$INSTDIR\bin\libgpgme-11.dll" Delete "$INSTDIR\bin\libgpgme-glib-11.dll" @@ -1097,10 +1101,6 @@ Section "-un.zlib" Delete "$INSTDIR\bin\zlib1.dll" SectionEnd -Section "-un.libiconv" - Delete "$INSTDIR\bin\libiconv-2.dll" -SectionEnd - Section "-un.libgpg-error" Delete "$INSTDIR\bin\libgpg-error-0.dll" Delete "$INSTDIR\lib\libgpg-error.imp" |