Bug 565089 - Allow cairo to build on Android. r=jmuizelaar,ted

configure.in

@@ -4565,6 +4565,8 @@ if test "$ac_cv_i18n_lc_messages" = yes; then
    AC_DEFINE(HAVE_I18N_LC_MESSAGES)
 fi
 
+AC_HAVE_FUNCS(localeconv)
+
 fi # SKIP_COMPILER_CHECKS
 
 TARGET_XPCOM_ABI=
@@ -4610,6 +4612,7 @@ if test -n "$SKIP_COMPILER_CHECKS"; then
    dnl Windows has malloc.h
    AC_DEFINE(MALLOC_H, [<malloc.h>])
    AC_DEFINE(HAVE_FORCEINLINE)
+   AC_DEFINE(HAVE_LOCALECONV)
 fi # SKIP_COMPILER_CHECKS
 
 dnl ========================================================

gfx/cairo/cairo/src/cairo-output-stream.c

@@ -311,9 +311,14 @@ _cairo_dtostr (char *buffer, size_t size, double d, cairo_bool_t limited_precisi
     if (d == 0.0)
 	d = 0.0;
 
+#ifdef HAVE_LOCALECONV
     locale_data = localeconv ();
     decimal_point = locale_data->decimal_point;
     decimal_point_len = strlen (decimal_point);
+#else
+    decimal_point = ".";
+    decimal_point_len = 1;
+#endif
 
     assert (decimal_point_len != 0);