security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-04-17 15:44:34 +02:00
Code Activity

Do not require libiconv for Android.

Browse Source 
* configure.ac (require_iconv): New.  Set to false for android.
(AM_ICONV): Run only if required.
This commit is contained in:
Werner Koch 2014-03-07 09:46:44 +01:00
parent feda379595
commit b278043a8f
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
configure.ac
View File

@ -639,6 +639,7 @@ AC_ARG_VAR(CC_FOR_BUILD,[build system C compiler])
try_gettext=yes try_gettext=yes
require_iconv=yes
have_dosish_system=no have_dosish_system=no
have_w32_system=no have_w32_system=no
have_w32ce_system=no have_w32ce_system=no
@ -716,6 +717,9 @@ case "${host}" in
;; ;;
*-linux-androideabi) *-linux-androideabi)
have_android_system=yes have_android_system=yes
# Android is fully utf-8 and we do not want to use iconv to
# keeps things simple
require_iconv=no
run_tests=no run_tests=no
;; ;;
*) *)
@ -1165,8 +1169,14 @@ AC_DEFINE_UNQUOTED(PRINTABLE_OS_NAME, "$PRINTABLE_OS_NAME",
# #
# Checking for iconv # Checking for iconv
# #
AM_ICONV if test "$require_iconv" = yes; then
AM_ICONV
else
LIBICONV=
LTLIBICONV=
AC_SUBST(LIBICONV)
AC_SUBST(LTLIBICONV)
fi
# #
@ -1786,7 +1796,8 @@ if test "$have_npth" = "no"; then
***]]) ***]])
fi fi
if test "$am_func_iconv" != yes; then if test "$require_iconv" = yes; then
if test "$am_func_iconv" != yes; then
die=yes die=yes
AC_MSG_NOTICE([[ AC_MSG_NOTICE([[
*** ***
@ -1795,6 +1806,7 @@ if test "$am_func_iconv" != yes; then
*** available at: *** available at:
*** http://ftp.gnu.org/gnu/libiconv/ *** http://ftp.gnu.org/gnu/libiconv/
***]]) ***]])
fi
fi fi
if test "$die" = "yes"; then if test "$die" = "yes"; then