5 files changed, 18 insertions, 3 deletions
diff --git a/Build/source/texk/dvisvgm/ChangeLog b/Build/source/texk/dvisvgm/ChangeLog
index 1f16f7893ec..98cfe5c1377 100644
--- a/Build/source/texk/dvisvgm/ChangeLog
+++ b/Build/source/texk/dvisvgm/ChangeLog
@@ -1,3 +1,9 @@
+2017-02-04  Karl Berry  <karl@tug.org>
+
+	* configure.ac,
+	* dvisvgm-src/libs/ff-woff/fontforge/splinefont.h: testing xlocale
+	fixes from Martin.
+
 2017-02-01  Karl Berry  <karl@tug.org>
 
 	* ac/libgs.ac: remove (unused).
diff --git a/Build/source/texk/dvisvgm/config.h.in b/Build/source/texk/dvisvgm/config.h.in
index 0f64d9b73a8..b6992e12fa0 100644
--- a/Build/source/texk/dvisvgm/config.h.in
+++ b/Build/source/texk/dvisvgm/config.h.in
@@ -168,6 +168,9 @@
 /* Define to 1 if you have the `vprintf' function. */
 #undef HAVE_VPRINTF
 
+/* Define to 1 if you have the <xlocale.h> header file. */
+#undef HAVE_XLOCALE_H
+
 /* Define to 1 if the system has the type `_Bool'. */
 #undef HAVE__BOOL
 
diff --git a/Build/source/texk/dvisvgm/configure b/Build/source/texk/dvisvgm/configure
index 88ca3801db3..694701eb8bf 100755
--- a/Build/source/texk/dvisvgm/configure
+++ b/Build/source/texk/dvisvgm/configure
@@ -19293,7 +19293,7 @@ _ACEOF
 fi
 done
 
-for ac_header in sys/time.h sys/timeb.h
+for ac_header in sys/time.h sys/timeb.h xlocale.h
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
diff --git a/Build/source/texk/dvisvgm/configure.ac b/Build/source/texk/dvisvgm/configure.ac
index d5f996ece06..59363069792 100644
--- a/Build/source/texk/dvisvgm/configure.ac
+++ b/Build/source/texk/dvisvgm/configure.ac
@@ -39,7 +39,7 @@ AC_PROG_RANLIB
 AC_LANG(C)
 
 AC_CHECK_FUNCS([ftime gettimeofday])
-AC_CHECK_HEADERS([sys/time.h sys/timeb.h])
+AC_CHECK_HEADERS([sys/time.h sys/timeb.h xlocale.h])
 AC_HEADER_TIOCGWINSZ
 
 KPSE_COND_WIN32
diff --git a/Build/source/texk/dvisvgm/dvisvgm-src/libs/ff-woff/fontforge/splinefont.h b/Build/source/texk/dvisvgm/dvisvgm-src/libs/ff-woff/fontforge/splinefont.h
index 77e0d4f5459..6ecf7996506 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-src/libs/ff-woff/fontforge/splinefont.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-src/libs/ff-woff/fontforge/splinefont.h
@@ -27,6 +27,9 @@
 #ifndef _SPLINEFONT_H
 #define _SPLINEFONT_H
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <basics.h>
 #include <dlist.h>
 #include "configure-fontforge.h"
@@ -35,7 +38,10 @@
 #else
 # include <gwwiconv.h>
 #endif
-#include "locale.h"
+#include <locale.h>
+#ifdef HAVE_XLOCALE_H
+#include <xlocale.h>
+#endif
 #include <gnetwork.h>
 
 #ifdef FONTFORGE_CONFIG_USE_DOUBLE