From: Marcus Comstedt <redacted>
Date: Thu, 15 Aug 2013 14:41:58 +0000 (+0200)
Subject: sigrok-cross-android: Fix gettext build
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=87ea3974677d08ade8791e04ee8c9d0d1f12d22f;p=sigrok-util.git

sigrok-cross-android: Fix gettext build
---

diff --git a/cross-compile/android/sigrok-cross-android b/cross-compile/android/sigrok-cross-android
index 9c67c61..0dc8aa0 100755
--- a/cross-compile/android/sigrok-cross-android
+++ b/cross-compile/android/sigrok-cross-android
@@ -86,15 +86,15 @@ test -d $PREFIX/include || mkdir $PREFIX/include
 cp include/iconv.h.inst $PREFIX/include/iconv.h
 cd ..
 
-## # TODO: Needs libiconv
-## # gettext (needed for glib)
-## wget http://ftp.gnu.org/pub/gnu/gettext/gettext-$VER_GETTEXT.tar.gz
-## tar xfz gettext-$VER_GETTEXT.tar.gz
-## cd gettext-$VER_GETTEXT
-## ./configure $C
-## make
-## make install
-## cd ..
+# gettext (needed for glib)
+wget http://ftp.gnu.org/pub/gnu/gettext/gettext-$VER_GETTEXT.tar.gz
+tar xfz gettext-$VER_GETTEXT.tar.gz
+cd gettext-$VER_GETTEXT
+./configure $C --enable-shared --disable-libasprintf
+cd gettext-runtime
+make
+make install
+cd ../..
 
 # zlib (needed for glib and libzip)
 wget http://zlib.net/zlib-$VER_ZLIB.tar.gz