merge with master

1 files changed, 18 insertions, 8 deletions

diff --git a/configure b/configure
index 0113ee294f..d23d539099 100755
--- a/configure
+++ b/configure
@@ -29,16 +29,18 @@ case ${MASON_PLATFORM} in
         LIBUV_VERSION=0.11.29
         ZLIB_VERSION=system
         BOOST_VERSION=system
+        NUNICODE_VERSION=1.4
         ;;
     *)
-        GLFW_VERSION=a21f2377
-        SQLITE_VERSION=system
-        LIBPNG_VERSION=1.6.13
-        LIBCURL_VERSION=system
-        LIBUV_VERSION=0.10.28
-        ZLIB_VERSION=system
-        BOOST_VERSION=system
-        ;;
+	GLFW_VERSION=a21f2377
+	SQLITE_VERSION=system
+	LIBPNG_VERSION=1.6.13
+	LIBCURL_VERSION=system
+	LIBUV_VERSION=0.10.28
+	ZLIB_VERSION=system
+	BOOST_VERSION=system
+	NUNICODE_VERSION=1.4
+	;;
 esac
 
 function abort { >&2 echo -e "\033[1m\033[31m$1\033[0m"; exit 1; }
@@ -117,6 +119,14 @@ if [ ! -z ${ZLIB_VERSION} ]; then
     CONFIG+="    'zlib_ldflags': $(quote_flags $(mason ldflags zlib ${ZLIB_VERSION})),"$LN
 fi
 
+if [ ! -z ${NUNICODE_VERSION} ]; then
+    mason install nunicode ${NUNICODE_VERSION}
+    CONFIG+="    'nu_static_libs': $(quote_flags $(mason static_libs nunicode ${NUNICODE_VERSION})),"$LN
+    CONFIG+="    'nu_cflags': $(quote_flags $(mason cflags nunicode ${NUNICODE_VERSION})),"$LN
+    CONFIG+="    'nu_ldflags': $(quote_flags $(mason ldflags nunicode ${NUNICODE_VERSION})),"$LN
+fi
+
+
 CONFIG+="  }
 }
 "