security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-02 22:46:30 +02:00
Code Activity

w32: Replace libiconv DLL by iconv feature of libgpg-error.

Browse source 
* 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>
This commit is contained in:
Werner Koch 2016-04-21 09:17:11 +02:00
parent f8adf1a323
commit bd4d65615b
No known key found for this signature in database
GPG key ID: E3FDFF218E45B72B
4 changed files with 26 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

4
configure.ac
View file

@ -47,8 +47,9 @@ m4_define([mym4_version], m4_argn(4, mym4_verslist))
m4_define([mym4_revision], m4_argn(7, mym4_verslist))
m4_define([mym4_revision_dec], m4_argn(8, mym4_verslist))
m4_esyscmd([echo ]mym4_version[>VERSION])
AC_INIT([mym4_package],[mym4_version], [http://bugs.gnupg.org])
AC_INIT([mym4_package],[mym4_version], [https://bugs.gnupg.org])
# Note that for Windows we require version 1.22
NEED_GPG_ERROR_VERSION=1.21
NEED_LIBGCRYPT_API=1
@ -639,6 +640,7 @@ case "${host}" in
we use a simplified version of gettext])
have_dosish_system=yes
have_w32_system=yes
require_iconv=no
run_tests=no
use_ldapwrapper=no # Fixme: Do this only for CE.
case "${host}" in