From 24a1b306aa45ad2f0f1d4011e9bfed43c2eb9f59 Mon Sep 17 00:00:00 2001
From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net>
Date: Sun, 18 Jul 2010 12:14:09 +0300
Subject: [PATCH] Assume UTF-8 operating system by default

---
 NEWS               |  5 +++++
 configure.ac       | 13 +++++++++++++
 src/text/unicode.c |  5 -----
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/NEWS b/NEWS
index 22dc568849..fbc45cf3fc 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,11 @@
 Changes between 1.1.0 and 1.2.0-git:
 ------------------------------------
 
+Important changes for packagers:
+ * The default builds now assume that the operating system uses UTF-8 for
+   its file systems and files content (except the Windows port). If this is
+   not acceptable, pass --enable-non-utf8 to the configure script.
+
 Access
  * Multiple files are supported from RAR files
 
diff --git a/configure.ac b/configure.ac
index 3aad1b0a16..d375cf38d3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -910,6 +910,19 @@ fi
 AM_CONDITIONAL(HAVE_MINIZIP, [ test "${have_minizip}" = "yes" ])
 
 
+dnl Manual switch for UTF-8
+AC_ARG_ENABLE(non-utf8,
+  [  --enable-non-utf8       Legacy non-UTF-8 systems support (default disabled)], [
+  AS_IF([test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"], [
+    enable_non_utf8="no"
+  ])
+])
+AS_IF([test "${enable_non_utf8}" != "no"], [
+  AC_DEFINE([ASSUME_UTF8], [1],
+            [Define to 1 if the operating system uses UTF-8 internally])
+])
+
+
 dnl Check for dbus
 AC_ARG_ENABLE(dbus,
   [  --enable-dbus           Linux D-BUS message bus system (default enabled)])
diff --git a/src/text/unicode.c b/src/text/unicode.c
index 12d0ae9a48..bb1ec6bf52 100644
--- a/src/text/unicode.c
+++ b/src/text/unicode.c
@@ -42,11 +42,6 @@
 #endif
 #include <errno.h>
 
-#if defined (__APPLE__) || defined (HAVE_MAEMO)
-/* Define this if the OS always use UTF-8 internally */
-# define ASSUME_UTF8 1
-#endif
-
 #if defined (ASSUME_UTF8)
 /* Cool */
 
-- 
2.39.2