[git] GnuPG - branch, master, updated. gnupg-2.1.0beta3-342-gb278043

[by Werner Koch]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".

The branch, master has been updated
       via  b278043a8f38e2706ccf617d2ac5661b33791d6b (commit)
      from  feda379595e06583bc5b3610dec74890de29cb8e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit b278043a8f38e2706ccf617d2ac5661b33791d6b
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Mar 7 09:46:44 2014 +0100

    Do not require libiconv for Android.
    
    * configure.ac (require_iconv): New.  Set to false for android.
    (AM_ICONV): Run only if required.

diff --git a/configure.ac b/configure.ac
index dc4d1ae..6cb7e11 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

-----------------------------------------------------------------------

Summary of changes:
 configure.ac |   18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org