enable UTF8 build for wxGTK2 and wxDFB by default

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45810 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/acinclude.m4 b/acinclude.m4
index 4c86f58ec728b9eb936478ebb1f11c1056423ad8..4a84836a8622217036f1888ec349165e84eaa673 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -492,7 +492,8 @@ dnl
 dnl  --enable-foo       wxUSE_FOO=yes
 dnl  --disable-foo      wxUSE_FOO=no
 dnl  --enable-foo=bar   wxUSE_FOO=bar
-dnl  <not given>        value from configarg.cache or wxUSE_FOO=no
+dnl  <not given>        value from configarg.cache or
+dnl                     wxUSE_FOO=$DEFAULT_wxUSE_FOO
 dnl
 AC_DEFUN([WX_ARG_ENABLE_PARAM],
         [
@@ -507,11 +508,11 @@ AC_DEFUN([WX_ARG_ENABLE_PARAM],
                           LINE=`grep "$3" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                            wx_cv_use_$1='$3='$DEFAULT_$3
                           else
                             no_cache=1
-                            wx_cv_use_$1="$3=no"
                           fi
+                            
+                          wx_cv_use_$1='$3='$DEFAULT_$3
                         ])
 
           eval "$wx_cv_use_$1"

diff --git a/configure b/configure
index ca04b7a9f929eb4b4129e3bc1beb592e03e1f1f8..db4d17e2d048716c371b2f4dd8d624e60ac8e892 100755 (executable)
--- a/configure
+++ b/configure
@@ -2389,7 +2389,7 @@ if test $DEBUG_CONFIGURE = 1; then
 
   DEFAULT_wxUSE_UNICODE=no
   DEFAULT_wxUSE_UNICODE_MSLU=no
-  DEFAULT_wxUSE_UNICODE_UTF8=no
+  DEFAULT_wxUSE_UNICODE_UTF8=auto
   DEFAULT_wxUSE_UNICODE_UTF8_LOCALE=no
   DEFAULT_wxUSE_WCSRTOMBS=no
 
@@ -2617,7 +2617,7 @@ else
 
   DEFAULT_wxUSE_UNICODE=no
   DEFAULT_wxUSE_UNICODE_MSLU=yes
-  DEFAULT_wxUSE_UNICODE_UTF8=no
+  DEFAULT_wxUSE_UNICODE_UTF8=auto
   DEFAULT_wxUSE_UNICODE_UTF8_LOCALE=no
   DEFAULT_wxUSE_WCSRTOMBS=no
 
@@ -4527,12 +4527,12 @@ else
                           LINE=`grep "wxUSE_UNIVERSAL_BINARY" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
-                            wx_cv_use_universal_binary='wxUSE_UNIVERSAL_BINARY='$DEFAULT_wxUSE_UNIVERSAL_BINARY
                           else
                             no_cache=1
-                            wx_cv_use_universal_binary="wxUSE_UNIVERSAL_BINARY=no"
                           fi
 
+                          wx_cv_use_universal_binary='wxUSE_UNIVERSAL_BINARY='$DEFAULT_wxUSE_UNIVERSAL_BINARY
+
 fi;
 
           eval "$wx_cv_use_universal_binary"
@@ -6036,11 +6036,7 @@ echo $ECHO_N "checking for --${enablestring:-enable}-utf8... $ECHO_C" >&6
 if test "${enable_utf8+set}" = set; then
   enableval="$enable_utf8"
 
-                          if test "$enableval" = yes; then
-                            ac_cv_use_utf8='wxUSE_UNICODE_UTF8=yes'
-                          else
-                            ac_cv_use_utf8='wxUSE_UNICODE_UTF8=no'
-                          fi
+                          wx_cv_use_utf8="wxUSE_UNICODE_UTF8='$enableval'"
 
 else
 
@@ -6051,22 +6047,17 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_utf8='wxUSE_UNICODE_UTF8='$DEFAULT_wxUSE_UNICODE_UTF8
+                          wx_cv_use_utf8='wxUSE_UNICODE_UTF8='$DEFAULT_wxUSE_UNICODE_UTF8
 
 fi;
 
-          eval "$ac_cv_use_utf8"
+          eval "$wx_cv_use_utf8"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_utf8 >> ${wx_arg_cache_file}.tmp
+            echo $wx_cv_use_utf8 >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_UNICODE_UTF8" = yes; then
-            echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-          else
-            echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-          fi
+          echo "$as_me:$LINENO: result: $wxUSE_UNICODE_UTF8" >&5
+echo "${ECHO_T}$wxUSE_UNICODE_UTF8" >&6
 
 
           enablestring=
@@ -30900,6 +30891,18 @@ else
 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
+        wxUSE_UNICODE_UTF8=yes
+    else
+        wxUSE_UNICODE_UTF8=no
+    fi
+fi
+
+
 if test "$wxUSE_GUI" = "yes"; then
     if test "$wxUSE_UNIX" = "yes" -a "$wxUSE_PM" != 1; then
                 echo "$as_me:$LINENO: checking for X11/Xlib.h" >&5
@@ -50844,6 +50847,9 @@ echo "  Should wxWidgets be compiled into single library?       ${wxUSE_MONOLITH
 echo "  Should wxWidgets be compiled in debug mode?             ${wxUSE_DEBUG:-no}"
 echo "  Should wxWidgets be linked as a shared library?         ${wxUSE_SHARED:-no}"
 echo "  Should wxWidgets be compiled in Unicode mode?           ${wxUSE_UNICODE:-no}"
+if test "$wxUSE_UNICODE" = "yes"; then
+echo "  Should wxWidgets use UTF-8 internally?                  ${wxUSE_UNICODE_UTF8:-no}"
+fi
 
 echo "  What level of wxWidgets compatibility should be enabled?"
 echo "                                       wxWidgets 2.6      ${WXWIN_COMPATIBILITY_2_6:-no}"

diff --git a/configure.in b/configure.in
index ce7e311a4fd6995fcf0a636b0e722d4131288bea..effbcc1f55b7341407e52115b717f10212e89c70 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -577,7 +577,7 @@ if test $DEBUG_CONFIGURE = 1; then
 
   DEFAULT_wxUSE_UNICODE=no
   DEFAULT_wxUSE_UNICODE_MSLU=no
-  DEFAULT_wxUSE_UNICODE_UTF8=no
+  DEFAULT_wxUSE_UNICODE_UTF8=auto
   DEFAULT_wxUSE_UNICODE_UTF8_LOCALE=no
   DEFAULT_wxUSE_WCSRTOMBS=no
 
@@ -805,7 +805,7 @@ else
 
   DEFAULT_wxUSE_UNICODE=no
   DEFAULT_wxUSE_UNICODE_MSLU=yes
-  DEFAULT_wxUSE_UNICODE_UTF8=no
+  DEFAULT_wxUSE_UNICODE_UTF8=auto
   DEFAULT_wxUSE_UNICODE_UTF8_LOCALE=no
   DEFAULT_wxUSE_WCSRTOMBS=no
 
@@ -993,8 +993,7 @@ WX_ARG_ENABLE(log,           [  --enable-log            use logging system], wxU
 WX_ARG_ENABLE(longlong,      [  --enable-longlong       use wxLongLong class], wxUSE_LONGLONG)
 WX_ARG_ENABLE(mimetype,      [  --enable-mimetype       use wxMimeTypesManager], wxUSE_MIMETYPE)
 WX_ARG_ENABLE(mslu,          [  --enable-mslu           use MS Layer for Unicode on Windows 9x (Win32 only)], wxUSE_UNICODE_MSLU)
-dnl FIXME-UTF8: make UTF8 automatic
-WX_ARG_ENABLE(utf8,          [  --enable-utf8           use UTF-8 representation for strings (Unix only)], wxUSE_UNICODE_UTF8)
+WX_ARG_ENABLE_PARAM(utf8,          [  --enable-utf8           use UTF-8 representation for strings (Unix only)], wxUSE_UNICODE_UTF8)
 WX_ARG_ENABLE(utf8only,      [  --enable-utf8only      only support UTF-8 locales in UTF-8 build (Unix only)], wxUSE_UNICODE_UTF8_LOCALE)
 WX_ARG_ENABLE(snglinst,      [  --enable-snglinst       use wxSingleInstanceChecker class], wxUSE_SNGLINST_CHECKER)
 WX_ARG_ENABLE(std_iostreams, [  --enable-std_iostreams  use standard C++ stream classes], wxUSE_STD_IOSTREAM)
@@ -3832,6 +3831,23 @@ else
     DISTDIR="wxBase"
 fi
 
+
+dnl ---------------------------------------------------------------------------
+dnl UTF-8 support
+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
+        wxUSE_UNICODE_UTF8=yes
+    else
+        wxUSE_UNICODE_UTF8=no
+    fi
+fi
+
 dnl ---------------------------------------------------------------------------
 dnl Optional libraries included when system library is not used
 dnl ---------------------------------------------------------------------------
@@ -8160,6 +8176,9 @@ echo "  Should wxWidgets be compiled into single library?       ${wxUSE_MONOLITH
 echo "  Should wxWidgets be compiled in debug mode?             ${wxUSE_DEBUG:-no}"
 echo "  Should wxWidgets be linked as a shared library?         ${wxUSE_SHARED:-no}"
 echo "  Should wxWidgets be compiled in Unicode mode?           ${wxUSE_UNICODE:-no}"
+if test "$wxUSE_UNICODE" = "yes"; then
+echo "  Should wxWidgets use UTF-8 internally?                  ${wxUSE_UNICODE_UTF8:-no}"
+fi
 
 echo "  What level of wxWidgets compatibility should be enabled?"
 echo "                                       wxWidgets 2.6      ${WXWIN_COMPATIBILITY_2_6:-no}"