Increase wxStaticText height in wxMSW to align its text with wxTextCtrl.

[wxWidgets.git] / configure

diff --git a/configure b/configure
index 5ef7cfea918c612ae9831d34e24393eb23f4e4fd..30b551597247f05ba9994aebb142a7ea458e6481 100755 (executable)
--- a/configure
+++ b/configure
@@ -1705,7 +1705,8 @@ Optional Features:
   --enable-permissive     compile code disregarding strict ANSI
   --enable-no_deps        create code without dependency information
   --disable-vararg_macros don't use vararg macros, even if they are supported
   --enable-permissive     compile code disregarding strict ANSI
   --enable-no_deps        create code without dependency information
   --disable-vararg_macros don't use vararg macros, even if they are supported

-  --enable-universal_binary  create Mac PowerPC and Intel Universal binary
+  --enable-universal_binary  create universal binary with Mac PPC and i386 (and x86_64 if using Cocoa) architectures
+  --enable-macosx_arch=ARCH  build for just the specified architecture

   --enable-compat26       enable wxWidgets 2.6 compatibility
   --disable-compat28      disable wxWidgets 2.8 compatibility
   --disable-rpath         disable use of rpath for uninstalled builds
   --enable-compat26       enable wxWidgets 2.6 compatibility
   --disable-compat28      disable wxWidgets 2.8 compatibility
   --disable-rpath         disable use of rpath for uninstalled builds


@@ -1818,6 +1819,7 @@ Optional Features:
   --enable-colourpicker   use wxColourPickerCtrl class
   --enable-combobox       use wxComboBox class
   --enable-comboctrl      use wxComboCtrl class
   --enable-colourpicker   use wxColourPickerCtrl class
   --enable-combobox       use wxComboBox class
   --enable-comboctrl      use wxComboCtrl class

+  --enable-commandlinkbutton      use wxCommmandLinkButton class

   --enable-dataviewctrl   use wxDataViewCtrl class
   --enable-datepick       use wxDatePickerCtrl class
   --enable-detect_sm      use code to detect X11 session manager
   --enable-dataviewctrl   use wxDataViewCtrl class
   --enable-datepick       use wxDatePickerCtrl class
   --enable-detect_sm      use code to detect X11 session manager


@@ -1842,6 +1844,7 @@ Optional Features:
   --enable-popupwin       use wxPopUpWindow class
   --enable-radiobox       use wxRadioBox class
   --enable-radiobtn       use wxRadioButton class
   --enable-popupwin       use wxPopUpWindow class
   --enable-radiobox       use wxRadioBox class
   --enable-radiobtn       use wxRadioButton class

+  --enable-richmsgdlg     use wxRichMessageDialog class

   --enable-rearrangectrl  use wxRearrangeList/Ctrl/Dialog
   --enable-sash           use wxSashWindow class
   --enable-scrollbar      use wxScrollBar class and scrollable windows
   --enable-rearrangectrl  use wxRearrangeList/Ctrl/Dialog
   --enable-sash           use wxSashWindow class
   --enable-scrollbar      use wxScrollBar class and scrollable windows


@@ -2978,7 +2981,6 @@ DEFAULT_wxUSE_LIBSDL=no
 DEFAULT_wxUSE_ACCESSIBILITY=no
 DEFAULT_wxUSE_IPV6=no
 DEFAULT_wxUSE_GSTREAMER8=no
 DEFAULT_wxUSE_ACCESSIBILITY=no
 DEFAULT_wxUSE_IPV6=no
 DEFAULT_wxUSE_GSTREAMER8=no

-DEFAULT_wxUSE_UIACTIONSIMULATOR=no

 
 DEFAULT_wxUSE_UNICODE_UTF8=auto
 DEFAULT_wxUSE_OPENGL=auto
 
 DEFAULT_wxUSE_UNICODE_UTF8=auto
 DEFAULT_wxUSE_OPENGL=auto


@@ -2988,6 +2990,7 @@ DEFAULT_wxUSE_COMPILER_TLS=auto
 DEFAULT_wxUSE_UNICODE_UTF8_LOCALE=no
 
 DEFAULT_wxUSE_UNIVERSAL_BINARY=no
 DEFAULT_wxUSE_UNICODE_UTF8_LOCALE=no
 
 DEFAULT_wxUSE_UNIVERSAL_BINARY=no

+DEFAULT_wxUSE_MAC_ARCH=no

 
 DEFAULT_wxUSE_OFFICIAL_BUILD=no
 
 
 DEFAULT_wxUSE_OFFICIAL_BUILD=no
 


@@ -5409,6 +5412,7 @@ fi
 echo "${ECHO_T}$result" >&6; }
 
 
 echo "${ECHO_T}$result" >&6; }
 
 

+

           enablestring=
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-universal_binary" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-universal_binary... $ECHO_C" >&6; }
           enablestring=
           { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-universal_binary" >&5
 echo $ECHO_N "checking for --${enablestring:-enable}-universal_binary... $ECHO_C" >&6; }


@@ -5430,6 +5434,27 @@ fi
 echo "${ECHO_T}$wxUSE_UNIVERSAL_BINARY" >&6; }
 
 
 echo "${ECHO_T}$wxUSE_UNIVERSAL_BINARY" >&6; }
 
 

+          enablestring=
+          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-macosx_arch" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-macosx_arch... $ECHO_C" >&6; }
+          # Check whether --enable-macosx_arch was given.
+if test "${enable_macosx_arch+set}" = set; then
+  enableval=$enable_macosx_arch;
+                          wx_cv_use_macosx_arch="wxUSE_MAC_ARCH='$enableval'"
+
+else
+
+                          wx_cv_use_macosx_arch='wxUSE_MAC_ARCH='$DEFAULT_wxUSE_MAC_ARCH
+
+fi
+
+
+          eval "$wx_cv_use_macosx_arch"
+
+          { echo "$as_me:$LINENO: result: $wxUSE_MAC_ARCH" >&5
+echo "${ECHO_T}$wxUSE_MAC_ARCH" >&6; }
+
+

 
           enablestring=
           defaultval=
 
           enablestring=
           defaultval=


@@ -9738,6 +9763,7 @@ if test "$wxUSE_CONTROLS" = "no"; then
     DEFAULT_wxUSE_COLOURPICKERCTRL=no
     DEFAULT_wxUSE_COMBOBOX=no
     DEFAULT_wxUSE_COMBOBOX=no
     DEFAULT_wxUSE_COLOURPICKERCTRL=no
     DEFAULT_wxUSE_COMBOBOX=no
     DEFAULT_wxUSE_COMBOBOX=no

+    DEFAULT_wxUSE_COMMANDLINKBUTTON=no

     DEFAULT_wxUSE_DATAVIEWCTRL=no
     DEFAULT_wxUSE_DATEPICKCTRL=no
     DEFAULT_wxUSE_DETECT_SM=no
     DEFAULT_wxUSE_DATAVIEWCTRL=no
     DEFAULT_wxUSE_DATEPICKCTRL=no
     DEFAULT_wxUSE_DETECT_SM=no


@@ -9758,6 +9784,7 @@ if test "$wxUSE_CONTROLS" = "no"; then
     DEFAULT_wxUSE_POPUPWIN=no
     DEFAULT_wxUSE_RADIOBOX=no
     DEFAULT_wxUSE_RADIOBTN=no
     DEFAULT_wxUSE_POPUPWIN=no
     DEFAULT_wxUSE_RADIOBOX=no
     DEFAULT_wxUSE_RADIOBTN=no

+    DEFAULT_wxUSE_RICHMSGDLG=no

     DEFAULT_wxUSE_REARRANGECTRL=no
     DEFAULT_wxUSE_SASH=no
     DEFAULT_wxUSE_SCROLLBAR=no
     DEFAULT_wxUSE_REARRANGECTRL=no
     DEFAULT_wxUSE_SASH=no
     DEFAULT_wxUSE_SCROLLBAR=no


@@ -10441,6 +10468,50 @@ fi
 echo "${ECHO_T}$result" >&6; }
 
 
 echo "${ECHO_T}$result" >&6; }
 
 

+          enablestring=
+          defaultval=$wxUSE_ALL_FEATURES
+          if test -z "$defaultval"; then
+              if test x"$enablestring" = xdisable; then
+                  defaultval=yes
+              else
+                  defaultval=no
+              fi
+          fi
+
+          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-commandlinkbutton" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-commandlinkbutton... $ECHO_C" >&6; }
+          # Check whether --enable-commandlinkbutton was given.
+if test "${enable_commandlinkbutton+set}" = set; then
+  enableval=$enable_commandlinkbutton;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_commandlinkbutton='wxUSE_COMMANDLINKBUTTON=yes'
+                          else
+                            wx_cv_use_commandlinkbutton='wxUSE_COMMANDLINKBUTTON=no'
+                          fi
+
+else
+
+                          wx_cv_use_commandlinkbutton='wxUSE_COMMANDLINKBUTTON=${'DEFAULT_wxUSE_COMMANDLINKBUTTON":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_commandlinkbutton"
+
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_COMMANDLINKBUTTON = no; then
+              result=yes
+            else
+              result=no
+            fi
+          else
+            result=$wxUSE_COMMANDLINKBUTTON
+          fi
+
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
+

           enablestring=
           defaultval=$wxUSE_ALL_FEATURES
           if test -z "$defaultval"; then
           enablestring=
           defaultval=$wxUSE_ALL_FEATURES
           if test -z "$defaultval"; then


@@ -11497,6 +11568,50 @@ fi
 echo "${ECHO_T}$result" >&6; }
 
 
 echo "${ECHO_T}$result" >&6; }
 
 

+          enablestring=
+          defaultval=$wxUSE_ALL_FEATURES
+          if test -z "$defaultval"; then
+              if test x"$enablestring" = xdisable; then
+                  defaultval=yes
+              else
+                  defaultval=no
+              fi
+          fi
+
+          { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-richmsgdlg" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-richmsgdlg... $ECHO_C" >&6; }
+          # Check whether --enable-richmsgdlg was given.
+if test "${enable_richmsgdlg+set}" = set; then
+  enableval=$enable_richmsgdlg;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_richmsgdlg='wxUSE_RICHMSGDLG=yes'
+                          else
+                            wx_cv_use_richmsgdlg='wxUSE_RICHMSGDLG=no'
+                          fi
+
+else
+
+                          wx_cv_use_richmsgdlg='wxUSE_RICHMSGDLG=${'DEFAULT_wxUSE_RICHMSGDLG":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_richmsgdlg"
+
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_RICHMSGDLG = no; then
+              result=yes
+            else
+              result=no
+            fi
+          else
+            result=$wxUSE_RICHMSGDLG
+          fi
+
+          { echo "$as_me:$LINENO: result: $result" >&5
+echo "${ECHO_T}$result" >&6; }
+
+

           enablestring=
           defaultval=$wxUSE_ALL_FEATURES
           if test -z "$defaultval"; then
           enablestring=
           defaultval=$wxUSE_ALL_FEATURES
           if test -z "$defaultval"; then


@@ -18457,6 +18572,11 @@ if test "$wxUSE_MAC" = 1; then
 
 retest_macosx_linking=no
 
 
 retest_macosx_linking=no
 

+OSX_ARCH_OPTS=""
+if test "x$wxUSE_MAC_ARCH" != xno; then
+    OSX_ARCH_OPTS="-arch $wxUSE_MAC_ARCH"
+fi
+

     if test "x$wxUSE_UNIVERSAL_BINARY" != xno ; then
                         if test "x$wxUSE_UNIVERSAL_BINARY" == xyes; then
             # Implicitly turn on the new --with-macosx-sdk using the default
     if test "x$wxUSE_UNIVERSAL_BINARY" != xno ; then
                         if test "x$wxUSE_UNIVERSAL_BINARY" == xyes; then
             # Implicitly turn on the new --with-macosx-sdk using the default


@@ -18488,12 +18608,15 @@ See \`config.log' for more details." >&2;}
 echo "$as_me: WARNING: Please use --with-macosx-sdk=PATH and --enable-universal_binary without an argument" >&2;}
             fi
         fi
 echo "$as_me: WARNING: Please use --with-macosx-sdk=PATH and --enable-universal_binary without an argument" >&2;}
             fi
         fi

-                OSX_UNIV_OPTS="-arch ppc -arch i386"
-        CXXFLAGS="$OSX_UNIV_OPTS $CXXFLAGS"
-        CFLAGS="$OSX_UNIV_OPTS $CFLAGS"
-        OBJCXXFLAGS="$OSX_UNIV_OPTS $OBJCXXFLAGS"
-        OBJCFLAGS="$OSX_UNIV_OPTS $OBJCFLAGS"
-        LDFLAGS="$OSX_UNIV_OPTS $LDFLAGS"
+                OSX_ARCH_OPTS="-arch ppc -arch i386"
+       if test "$wxUSE_OSX_COCOA" = 1; then
+            OSX_ARCH_OPTS="$OSX_ARCH_OPTS -arch x86_64"
+        fi
+        { echo "$as_me:$LINENO: checking for universal binary architectures" >&5
+echo $ECHO_N "checking for universal binary architectures... $ECHO_C" >&6; }
+       { echo "$as_me:$LINENO: result: $OSX_ARCH_OPTS" >&5
+echo "${ECHO_T}$OSX_ARCH_OPTS" >&6; }
+

                                                                                                                 retest_macosx_linking=yes
 
                                         { echo "$as_me:$LINENO: WARNING: Disabling precompiled headers due to universal binary build." >&5
                                                                                                                 retest_macosx_linking=yes
 
                                         { echo "$as_me:$LINENO: WARNING: Disabling precompiled headers due to universal binary build." >&5


@@ -18501,6 +18624,12 @@ echo "$as_me: WARNING: Disabling precompiled headers due to universal binary bui
         bk_use_pch=no
     fi
 
         bk_use_pch=no
     fi
 

+CXXFLAGS="$OSX_ARCH_OPTS $CXXFLAGS"
+CFLAGS="$OSX_ARCH_OPTS $CFLAGS"
+OBJCXXFLAGS="$OSX_ARCH_OPTS $OBJCXXFLAGS"
+OBJCFLAGS="$OSX_ARCH_OPTS $OBJCFLAGS"
+LDFLAGS="$OSX_ARCH_OPTS $LDFLAGS"
+

 if test "x$wxUSE_MACOSX_SDK" = "xno"; then
     wxUSE_MACOSX_SDK=
 elif test "x$wxUSE_MACOSX_SDK" = "xyes"; then
 if test "x$wxUSE_MACOSX_SDK" = "xno"; then
     wxUSE_MACOSX_SDK=
 elif test "x$wxUSE_MACOSX_SDK" = "xyes"; then


@@ -23790,11 +23919,15 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
 _ACEOF
 
 

-if test "$ac_cv_sizeof_wchar_t" != 0; then
-    wxUSE_WCHAR_T=yes
-else
-    wxUSE_WCHAR_T=no
+if test "$ac_cv_sizeof_wchar_t" = 0; then
+    { { echo "$as_me:$LINENO: error: wxWidgets requires wchar_t support." >&5
+echo "$as_me: error: wxWidgets requires wchar_t support." >&2;}
+   { (exit 1); exit 1; }; }

 fi
 fi

+cat >>confdefs.h <<\_ACEOF
+#define wxUSE_WCHAR_T 1
+_ACEOF
+

 
 { echo "$as_me:$LINENO: checking for va_copy" >&5
 echo $ECHO_N "checking for va_copy... $ECHO_C" >&6; }
 
 { echo "$as_me:$LINENO: checking for va_copy" >&5
 echo $ECHO_N "checking for va_copy... $ECHO_C" >&6; }


@@ -28659,19 +28792,6 @@ echo "$as_me: WARNING: system tiff library not found, will use built-in instead"
 fi
 
 
 fi
 
 

-if test "$wxUSE_WCHAR_T" != "yes"; then
-    if test "$wxUSE_EXPAT" != "no"; then
-        { echo "$as_me:$LINENO: WARNING: wxWidgets requires wchar_t to use expat, disabling" >&5
-echo "$as_me: WARNING: wxWidgets requires wchar_t to use expat, disabling" >&2;}
-        wxUSE_EXPAT=no
-    fi
-    if test "$wxUSE_XML" != "no"; then
-        { echo "$as_me:$LINENO: WARNING: wxWidgets requires wchar_t to use xml, disabling" >&5
-echo "$as_me: WARNING: wxWidgets requires wchar_t to use xml, disabling" >&2;}
-        wxUSE_XML=no
-    fi
-fi
-

 if test "$wxUSE_EXPAT" != "no"; then
     wxUSE_XML=yes
     cat >>confdefs.h <<\_ACEOF
 if test "$wxUSE_EXPAT" != "no"; then
     wxUSE_XML=yes
     cat >>confdefs.h <<\_ACEOF


@@ -29142,15 +29262,11 @@ fi
 
 
 
 
 
 

-            case "${host}" in
+    LIBS="$LIBS -lwinspool -lwinmm -lshell32 -lcomctl32 -lcomdlg32 -ladvapi32 -lwsock32 -lgdi32"
+    case "${host}" in

         x86_64-*-mingw32* )
         x86_64-*-mingw32* )

-                        LIBS="$LIBS -lwinspool -lwinmm -lshell32 -lcomctl32 -lcomdlg32 -lwctl3d32 -ladvapi32 -lwsock32 -lgdi32"
-

                                                 WINDRES_CPU_DEFINE="--define WX_CPU_AMD64"
         ;;
                                                 WINDRES_CPU_DEFINE="--define WX_CPU_AMD64"
         ;;

-        * )
-            LIBS="$LIBS -lwinspool -lwinmm -lshell32 -lcomctl32 -lcomdlg32 -lctl3d32 -ladvapi32 -lwsock32 -lgdi32"
-        ;;

     esac
     if test "$wxUSE_ACCESSIBILITY" = "yes" ; then
         LIBS="$LIBS -loleacc"
     esac
     if test "$wxUSE_ACCESSIBILITY" = "yes" ; then
         LIBS="$LIBS -loleacc"


@@ -29161,10 +29277,10 @@ fi
                         LIBS="$LIBS -lkernel32 -luser32"
     esac
 
                         LIBS="$LIBS -lkernel32 -luser32"
     esac
 

-        RESFLAGS="--include-dir \$(top_srcdir)/include --include-dir \$(top_srcdir)/\$(program_dir) --define __WIN32__ --define __WIN95__ --define __GNUWIN32__"
+        RESFLAGS="--include-dir \$(top_srcdir)/include --include-dir \$(top_srcdir)/\$(program_dir) --define __WIN32__ --define __WIN95__ --define __GNUWIN32__ $WINDRES_CPU_DEFINE"

     RESPROGRAMOBJ="\$(PROGRAM)_resources.o"
 
     RESPROGRAMOBJ="\$(PROGRAM)_resources.o"
 

-                WXCONFIG_RESFLAGS="--define __WIN32__ --define __WIN95__ --define __GNUWIN32__"
+                WXCONFIG_RESFLAGS="--define __WIN32__ --define __WIN95__ --define __GNUWIN32__ $WINDRES_CPU_DEFINE"

 
         WIN32INSTALL=win32install
 
 
         WIN32INSTALL=win32install
 


@@ -30269,7 +30385,7 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
                                         wx_cv_lib_gtk=none
                 else
                                                             wx_cv_cflags_gtk=$GTK_CFLAGS
                                         wx_cv_lib_gtk=none
                 else
                                                             wx_cv_cflags_gtk=$GTK_CFLAGS

-                    wx_cv_libs_gtk=`echo $GTK_LIBS | sed -e 's/ -l[^ ]*cairo[^ ]*//g'`
+                    wx_cv_libs_gtk=$GTK_LIBS

                 fi
 
 
                 fi
 
 


@@ -35780,14 +35896,8 @@ _ACEOF
 fi
 
 
 fi
 
 

-if test "$wxUSE_WCHAR_T" = "yes"; then
-    cat >>confdefs.h <<\_ACEOF
-#define wxUSE_WCHAR_T 1
-_ACEOF
-
-
-        WCSLEN_FOUND=0
-    WCHAR_LINK=
+WCSLEN_FOUND=0
+WCHAR_LINK=

 
 for ac_func in wcslen
 do
 
 for ac_func in wcslen
 do


@@ -35883,9 +35993,9 @@ fi
 done
 
 
 done
 
 

-    if test "$WCSLEN_FOUND" = 0; then
-        if test "$TOOLKIT" = "MSW"; then
-            { echo "$as_me:$LINENO: checking for wcslen in -lmsvcrt" >&5
+if test "$WCSLEN_FOUND" = 0; then
+    if test "$TOOLKIT" = "MSW"; then
+        { echo "$as_me:$LINENO: checking for wcslen in -lmsvcrt" >&5

 echo $ECHO_N "checking for wcslen in -lmsvcrt... $ECHO_C" >&6; }
 if test "${ac_cv_lib_msvcrt_wcslen+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for wcslen in -lmsvcrt... $ECHO_C" >&6; }
 if test "${ac_cv_lib_msvcrt_wcslen+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -35950,8 +36060,8 @@ if test $ac_cv_lib_msvcrt_wcslen = yes; then
   WCHAR_OK=1
 fi
 
   WCHAR_OK=1
 fi
 

-        else
-            { echo "$as_me:$LINENO: checking for wcslen in -lw" >&5
+    else
+        { echo "$as_me:$LINENO: checking for wcslen in -lw" >&5

 echo $ECHO_N "checking for wcslen in -lw... $ECHO_C" >&6; }
 if test "${ac_cv_lib_w_wcslen+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for wcslen in -lw... $ECHO_C" >&6; }
 if test "${ac_cv_lib_w_wcslen+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -36014,27 +36124,28 @@ fi
 echo "${ECHO_T}$ac_cv_lib_w_wcslen" >&6; }
 if test $ac_cv_lib_w_wcslen = yes; then
 
 echo "${ECHO_T}$ac_cv_lib_w_wcslen" >&6; }
 if test $ac_cv_lib_w_wcslen = yes; then
 

-                            WCHAR_LINK=" -lw"
-                            WCSLEN_FOUND=1
+                        WCHAR_LINK=" -lw"
+                        WCSLEN_FOUND=1

 
 fi
 
 
 fi
 

-        fi

     fi
     fi

+fi

 
 

-    if test "$WCSLEN_FOUND" = 1; then
-        cat >>confdefs.h <<\_ACEOF
+if test "$WCSLEN_FOUND" = 1; then
+    cat >>confdefs.h <<\_ACEOF

 #define HAVE_WCSLEN 1
 _ACEOF
 
 #define HAVE_WCSLEN 1
 _ACEOF
 

-    fi
+fi

 
 
 
 
 
 
 
 
 
 
 
 

-for ac_func in wcsdup strnlen wcsnlen wcscasecmp wcsncasecmp
+
+for ac_func in wcsdup wcsftime strnlen wcsnlen wcscasecmp wcsncasecmp

 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 { echo "$as_me:$LINENO: checking for $ac_func" >&5
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 { echo "$as_me:$LINENO: checking for $ac_func" >&5


@@ -36128,11 +36239,11 @@ fi
 done
 
 
 done
 
 

-                    if test "$USE_HPUX" = 1 -a "$GCC" != "yes"; then
-        CPPFLAGS="-D_INCLUDE__STDC_A1_SOURCE $CPPFLAGS"
-    fi
+if test "$USE_HPUX" = 1 -a "$GCC" != "yes"; then
+    CPPFLAGS="-D_INCLUDE__STDC_A1_SOURCE $CPPFLAGS"
+fi

 
 

-                { echo "$as_me:$LINENO: checking for mbstate_t" >&5
+{ echo "$as_me:$LINENO: checking for mbstate_t" >&5

 echo $ECHO_N "checking for mbstate_t... $ECHO_C" >&6; }
 if test "${ac_cv_type_mbstate_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 echo $ECHO_N "checking for mbstate_t... $ECHO_C" >&6; }
 if test "${ac_cv_type_mbstate_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6


@@ -36288,10 +36399,6 @@ done
 
 fi
 
 
 fi
 

-else
-    { echo "$as_me:$LINENO: WARNING: Wide character support is unavailable" >&5
-echo "$as_me: WARNING: Wide character support is unavailable" >&2;}
-fi

 
 
 
 
 
 


@@ -42527,6 +42634,8 @@ if test "$wxUSE_DEBUG_GDB" = "yes" ; then
 fi
 
 if test "$wxUSE_DEBUG_FLAG" = "no" ; then
 fi
 
 if test "$wxUSE_DEBUG_FLAG" = "no" ; then

+    WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS -DwxDEBUG_LEVEL=0"
+

     if test "$wxUSE_GTK" = 1 ; then
         if test "x$wxGTK_VERSION" = "x1" ; then
             CPPFLAGS="-DGTK_NO_CHECK_CASTS $CPPFLAGS"
     if test "$wxUSE_GTK" = 1 ; then
         if test "x$wxGTK_VERSION" = "x1" ; then
             CPPFLAGS="-DGTK_NO_CHECK_CASTS $CPPFLAGS"


@@ -46888,6 +46997,14 @@ _ACEOF
   USES_CONTROLS=1
 fi
 
   USES_CONTROLS=1
 fi
 

+if test "$wxUSE_COMMANDLINKBUTTON" = "yes"; then
+  cat >>confdefs.h <<\_ACEOF
+#define wxUSE_COMMANDLINKBUTTON 1
+_ACEOF
+
+  USES_CONTROLS=1
+fi
+

 if test "$wxUSE_CHOICE" = "yes"; then
   cat >>confdefs.h <<\_ACEOF
 #define wxUSE_CHOICE 1
 if test "$wxUSE_CHOICE" = "yes"; then
   cat >>confdefs.h <<\_ACEOF
 #define wxUSE_CHOICE 1


@@ -47139,6 +47256,13 @@ _ACEOF
 
 fi
 
 
 fi
 

+if test "$wxUSE_RICHMSGDLG" = "yes"; then
+    cat >>confdefs.h <<\_ACEOF
+#define wxUSE_RICHMSGDLG 1
+_ACEOF
+
+fi
+

 if test "$wxUSE_SASH" = "yes"; then
     cat >>confdefs.h <<\_ACEOF
 #define wxUSE_SASH 1
 if test "$wxUSE_SASH" = "yes"; then
     cat >>confdefs.h <<\_ACEOF
 #define wxUSE_SASH 1


@@ -48005,7 +48129,7 @@ echo "${ECHO_T}$wx_cv_lib_gdiplus" >&6; }
         if test "$wx_cv_lib_gdiplus" = "yes"; then
             wx_has_graphics=1
         fi
         if test "$wx_cv_lib_gdiplus" = "yes"; then
             wx_has_graphics=1
         fi

-    elif test "$wxUSE_GTK" = 1; then
+    elif test "$wxUSE_GTK" = 1 -o "$wxUSE_X11" = 1; then

 
 pkg_failed=no
 { echo "$as_me:$LINENO: checking for CAIRO" >&5
 
 pkg_failed=no
 { echo "$as_me:$LINENO: checking for CAIRO" >&5


@@ -48079,6 +48203,17 @@ else
 echo "${ECHO_T}yes" >&6; }
        wx_has_graphics=1
 fi
 echo "${ECHO_T}yes" >&6; }
        wx_has_graphics=1
 fi

+        if test "$wx_has_graphics" = 1; then
+            cat >>confdefs.h <<\_ACEOF
+#define wxUSE_CAIRO 1
+_ACEOF
+
+
+                                    if test "$wxUSE_GTK" != 1; then
+                CPPFLAGS="$CAIRO_CFLAGS $CPPFLAGS"
+                GUI_TK_LIBRARY="$GUI_TK_LIBRARY $CAIRO_LIBS"
+            fi
+        fi

     else
                 wx_has_graphics=1
     fi
     else
                 wx_has_graphics=1
     fi


@@ -52012,7 +52147,7 @@ echo "$as_me: error: Required windres program not found" >&2;}
    { (exit 1); exit 1; }; }
     fi
 
    { (exit 1); exit 1; }; }
     fi
 

-    RESCOMP="$WINDRES $WINDRES_CPU_DEFINE"
+    RESCOMP="$WINDRES"

 fi
 
 if test "$wxUSE_MAC" = 1 -o "$wxUSE_OLD_COCOA" = 1; then
 fi
 
 if test "$wxUSE_MAC" = 1 -o "$wxUSE_OLD_COCOA" = 1; then