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 /configure.ac | |
| 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 'configure.ac')
| -rw-r--r-- | configure.ac | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index d959fc524..6bbb41f50 100644 --- a/configure.ac +++ b/configure.ac @@ -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 |