Assume UTF-8 operating system by default

diff --git a/NEWS b/NEWS
index 22dc568849034dfb4d090f2a8b985937e4f085d9..fbc45cf3fc53db73fb1f4386d2887571f78c6b53 100644 (file)
--- 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 3aad1b0a164e60d11e83cd651bf2b8c79010771d..d375cf38d328d90002aa0dc7eb319dae078d3288 100644 (file)
--- 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 12d0ae9a48c0f0ec5d21980dc042d4e3e51febce..bb1ec6bf5295a2e0ff7cd0c7bc46ef547a0014f4 100644 (file)
--- 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 */