vlc/vlc-1.1 | branch: master | Rémi Denis-Courmont <r...@remlab.net> | Sun Jul 18 12:21:04 2010 +0300| [2555b9ee41fbed6ebfa1e9e0a8725f515beacb0b] | committer: Rémi Denis-Courmont
Provide --enable-non-utf8 as in 1.2.0 but keep it on by default > http://git.videolan.org/gitweb.cgi/vlc/vlc-1.1.git/?a=commit;h=2555b9ee41fbed6ebfa1e9e0a8725f515beacb0b --- configure.ac | 13 +++++++++++++ src/text/unicode.c | 5 ----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index 2c87c2c..0ff0837 100644 --- a/configure.ac +++ b/configure.ac @@ -268,6 +268,8 @@ case "${host_os}" in enable_asademux="yes" echo " Assuming --enable-asademux" + enable_non_utf8="no" + echo " Assuming --disable-non-utf8" enable_skins2="no" echo " Assuming --disable-skins2" enable_xcb="no" @@ -926,6 +928,17 @@ 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 enabled)], [ + enable_non_utf8="yes" +]) +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 41734ed..43a3da4 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 */ #elif defined (WIN32) || defined (UNDER_CE) _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org http://mailman.videolan.org/listinfo/vlc-commits
