Merge pull request #4 from str1ngs/master

gettext: do not hardcode system shell.

Author: djdeath

modulesets/clutter-android.modules

@@ -27,8 +27,9 @@
   </autotools>
 
   <autotools id="gettext" autogenargs="--without-included-regex --disable-java --disable-openmp  --without-libiconv-prefix --without-libintl-prefix --without-libglib-2.0-prefix --without-libcroco-0.6-prefix --with-included-libxml --without-libncurses-prefix --without-libtermcap-prefix --without-libcurses-prefix --without-libexpat-prefix --without-emacs" autogen-sh="autoreconf">
-    <branch module="gettext/gettext-0.18.1.1.tar.gz" repo="gnu.org" source-subdir="gettext-tools" version="0.18.1.1" subdir="intl">
+    <branch module="gettext/gettext-0.18.2.tar.gz" repo="gnu.org" source-subdir="gettext-tools" version="0.18.2" subdir="intl">
       <patch file="gettext/disable-everything-except-intl.patch" strip="1" />
+      <patch file="gettext/0001-intl-dont-hard-code-shell.patch" strip="1" />
     </branch>
   </autotools>
 

modulesets/patches/gettext/0001-intl-dont-hard-code-shell.patch

@@ -0,0 +1,25 @@
+From 8e65fa677764a7489f3fae21d7234f98db962761 Mon Sep 17 00:00:00 2001
+From: mike rosset <[email protected]>
+Date: Sat, 12 Jan 2013 22:02:18 -0800
+Subject: [PATCH] intl: dont hard code shell
+
+---
+ gettext-runtime/intl/Makefile.in |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gettext-runtime/intl/Makefile.in b/gettext-runtime/intl/Makefile.in
+index 006d3b0..a605dda 100644
+--- a/gettext-runtime/intl/Makefile.in
++++ b/gettext-runtime/intl/Makefile.in
+@@ -17,7 +17,7 @@
+ PACKAGE = @PACKAGE@
+ VERSION = @VERSION@
+ 
+-SHELL = /bin/sh
++SHELL = @SHELL@
+ 
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+-- 
+1.7.10.4
+