diff options
| author | Werner Koch <[email protected]> | 2014-03-07 08:46:44 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2014-03-10 10:16:52 +0000 |
| commit | b278043a8f38e2706ccf617d2ac5661b33791d6b (patch) | |
| tree | 0a82afb71410a7610a712c98884561a6a1d991bc | |
| parent | dirmmgr: Use a portability wrapper for struct timeval. (diff) | |
| download | gnupg-b278043a8f38e2706ccf617d2ac5661b33791d6b.tar.gz gnupg-b278043a8f38e2706ccf617d2ac5661b33791d6b.zip | |
Do not require libiconv for Android.
* configure.ac (require_iconv): New. Set to false for android.
(AM_ICONV): Run only if required.
| -rw-r--r-- | configure.ac | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index dc4d1ae36..6cb7e111e 100644 --- a/configure.ac +++ b/configure.ac @@ -639,6 +639,7 @@ AC_ARG_VAR(CC_FOR_BUILD,[build system C compiler]) try_gettext=yes +require_iconv=yes have_dosish_system=no have_w32_system=no have_w32ce_system=no @@ -716,6 +717,9 @@ case "${host}" in ;; *-linux-androideabi) 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 ;; *) @@ -1165,8 +1169,14 @@ AC_DEFINE_UNQUOTED(PRINTABLE_OS_NAME, "$PRINTABLE_OS_NAME", # # 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 -if test "$am_func_iconv" != yes; then +if test "$require_iconv" = yes; then + if test "$am_func_iconv" != yes; then die=yes AC_MSG_NOTICE([[ *** @@ -1795,6 +1806,7 @@ if test "$am_func_iconv" != yes; then *** available at: *** http://ftp.gnu.org/gnu/libiconv/ ***]]) + fi fi if test "$die" = "yes"; then |