gnupg vs libiconv on Android

[Hans-Christoph Steiner]

In the continuing saga of the Android port, I'm now running into
libiconv.  First I tried without libiconv using --disable-nls, and it
still died with iconv errors in common/utf8conv.c.  Now I have
libiconv-1.14 built and installed for Android, and now it dies looking
for ICONV_CONST, which I couldn't find defined anywhere:

/usr/local/android-ndk/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin/arm-linux-androideabi-gcc
--sysroot=/usr/local/android-ndk/platforms/android-9/arch-arm
-DHAVE_CONFIG_H -I. -I..  -I../gl -I../intl
-DLOCALEDIR=\"/data/local/share/locale\"
-DGNUPG_BINDIR="\"/data/local/bin\""
-DGNUPG_LIBEXECDIR="\"/data/local/libexec\""
-DGNUPG_LIBDIR="\"/data/local/lib/gnupg\""
-DGNUPG_DATADIR="\"/data/local/share/gnupg\""
-DGNUPG_SYSCONFDIR="\"/data/local/etc/gnupg\""
-DGNUPG_LOCALSTATEDIR="\"/data/local/var\""
-I/media/share/code/guardianproject/gnupg-for-android/external/data/local/include
-I/data/local/include -I/usr/local/include -I/data/local/include
-I/usr/local/include
-I/media/share/code/guardianproject/gnupg-for-android/external/data/local/include
-I/usr/local/include -I/data/local/include -I/usr/local/include
-DWITHOUT_GNU_PTH=1 -DANDROID
-I/media/share/code/guardianproject/gnupg-for-android/external/data/local/include
-O3 -Wall -Wcast-align -Wshadow -Wstrict-prototypes -Wformat
-Wno-format-y2k -Wformat-security -W -Wno-sign-compare
-Wno-missing-field-initializers -Wdeclaration-after-statement
-Wno-pointer-sign -Wpointer-arith -MT libcommon_a-utf8conv.o -MD -MP -MF
.deps/libcommon_a-utf8conv.Tpo -c -o libcommon_a-utf8conv.o `test -f
'utf8conv.c' || echo './'`utf8conv.c
utf8conv.c: In function 'native_to_utf8':
utf8conv.c:400: error: 'ICONV_CONST' undeclared (first use in this function)
utf8conv.c:400: error: (Each undeclared identifier is reported only once
utf8conv.c:400: error: for each function it appears in.)
utf8conv.c:400: error: expected ')' before 'char'
utf8conv.c: In function 'do_utf8_to_native':
utf8conv.c:666: error: 'ICONV_CONST' undeclared (first use in this function)
utf8conv.c:666: error: expected ')' before 'char'
make[4]: *** [libcommon_a-utf8conv.o] Error 1
make[4]: Leaving directory
`/media/share/code/guardianproject/gnupg-for-android/external/gnupg/common'