From 10d1a996171bf74666d6c9ac12a6b2cf7dfbefd2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Sun, 19 Aug 2007 10:16:30 +0000 Subject: [PATCH] use UTF8 build by default on Unix (except Darwin) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48174 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- configure | 4 +--- configure.in | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/configure b/configure index d76b42fa5a..9e846a75e6 100755 --- a/configure +++ b/configure @@ -35055,9 +35055,7 @@ fi if test "$wxUSE_UNICODE" = "yes" -a "$wxUSE_UNICODE_UTF8" = "auto" ; then - if test "$TOOLKIT" = "DFB" ; then - wxUSE_UNICODE_UTF8=yes - elif test "$TOOLKIT" = "GTK" -a "$WXGTK20" = "1" ; then + if test "$USE_UNIX" = "1" -a "$wxUSE_DARWIN" != "1" ; then wxUSE_UNICODE_UTF8=yes elif test "$USE_OS2" = "1" ; then wxUSE_UNICODE_UTF8=yes diff --git a/configure.in b/configure.in index 03f9ebbaa1..adb3ae246c 100644 --- a/configure.in +++ b/configure.in @@ -3490,9 +3490,7 @@ dnl --------------------------------------------------------------------------- dnl If UTF-8 support wasn't explicitly enabled or disabled, enable it only dnl for ports where it makes sense by default (GTK+, DirectFB): if test "$wxUSE_UNICODE" = "yes" -a "$wxUSE_UNICODE_UTF8" = "auto" ; then - if test "$TOOLKIT" = "DFB" ; then - wxUSE_UNICODE_UTF8=yes - elif test "$TOOLKIT" = "GTK" -a "$WXGTK20" = "1" ; then + if test "$USE_UNIX" = "1" -a "$wxUSE_DARWIN" != "1" ; then wxUSE_UNICODE_UTF8=yes elif test "$USE_OS2" = "1" ; then dnl wide char support is quite incomplete in libc; -- 2.45.2