Fix wxFD_FILE_MUST_EXIST

[wxWidgets.git] / configure

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=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
 
   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=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
 
   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"
                           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
                           else
                             no_cache=1

-                            wx_cv_use_universal_binary="wxUSE_UNIVERSAL_BINARY=no"

                           fi
 
                           fi
 

+                          wx_cv_use_universal_binary='wxUSE_UNIVERSAL_BINARY='$DEFAULT_wxUSE_UNIVERSAL_BINARY
+

 fi;
 
           eval "$wx_cv_use_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 "${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
 
 
 else
 


@@ -6051,22 +6047,17 @@ else
                             no_cache=1
                           fi
 
                             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;
 
 
 fi;
 

-          eval "$ac_cv_use_utf8"
+          eval "$wx_cv_use_utf8"

           if test "$no_cache" != 1; then
           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
 
           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=
 
 
           enablestring=


@@ -30900,6 +30891,18 @@ else
 fi
 
 
 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
 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}"
 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}"
 
 echo "  What level of wxWidgets compatibility should be enabled?"
 echo "                                       wxWidgets 2.6      ${WXWIN_COMPATIBILITY_2_6:-no}"