X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ab252f7b29379d786302b563f97cb8d0ee2a1246..485cf710d735497ee9960c981426531da2a185df:/configure?ds=sidebyside

diff --git a/configure b/configure
index 1e507cec38..34e46821ad 100755
--- a/configure
+++ b/configure
@@ -68,13 +68,11 @@ ac_help="$ac_help
 ac_help="$ac_help
   --with-wine             use WINE"
 ac_help="$ac_help
-  --with-cygwin           use Cygwin for MS-Windows"
-ac_help="$ac_help
-  --with-mingw            use GCC Minimal MS-Windows"
+  --with-msw              use MS-Windows"
 ac_help="$ac_help
   --with-pm               use OS/2 Presentation Manager"
 ac_help="$ac_help
-  --with-mgl              use MGL"
+  --with-mgl              use SciTech MGL"
 ac_help="$ac_help
   --enable-gtk2           use GTK+ 2.0 if available (EXPERIMENTAL)"
 ac_help="$ac_help
@@ -98,11 +96,13 @@ ac_help="$ac_help
 ac_help="$ac_help
   --enable-shared         create shared library code"
 ac_help="$ac_help
-  --enable-burnt_name     create set name in shared library "
+  --enable-soname         set the DT_SONAME field in ELF shared libraries"
 ac_help="$ac_help
   --enable-optimise       create optimised code"
 ac_help="$ac_help
   --enable-debug          same as debug_flag and debug_info"
+ac_help="$ac_help
+  --enable-precomp        enable use of precompiled headers (Mac OS X)"
 ac_help="$ac_help
   --enable-debug_flag     set __WXDEBUG__ flag (recommended for developers!)"
 ac_help="$ac_help
@@ -118,15 +118,15 @@ ac_help="$ac_help
 ac_help="$ac_help
   --enable-no_rtti        create code without RTTI information"
 ac_help="$ac_help
-  --enable-no_exceptions  create code without exceptions information"
+  --enable-no_exceptions  create code without C++ exceptions handling"
 ac_help="$ac_help
   --enable-permissive     compile code disregarding strict ANSI"
 ac_help="$ac_help
   --enable-no_deps        create code without dependency information"
 ac_help="$ac_help
-  --enable-compat20       enable wxWin 2.0 compatibility"
+  --enable-compat20       enable wxWindows 2.0 compatibility"
 ac_help="$ac_help
-  --enable-compat22       enable wxWin 2.2 compatibility"
+  --enable-compat22       enable wxWindows 2.2 compatibility"
 ac_help="$ac_help
   --enable-intl           use internationalization system"
 ac_help="$ac_help
@@ -168,13 +168,13 @@ ac_help="$ac_help
 ac_help="$ac_help
   --enable-ffile          use wxFFile classes"
 ac_help="$ac_help
-  --enable-textfile       use wxTextFile classes"
+  --enable-textbuf        use wxTextBuffer class"
+ac_help="$ac_help
+  --enable-textfile       use wxTextFile class"
 ac_help="$ac_help
   --enable-fontmap        use font encodings conversion classes"
 ac_help="$ac_help
   --enable-unicode        compile wxString with Unicode support"
-ac_help="$ac_help
-  --enable-wcsrtombs      use wcsrtombs instead of buggy (GNU libc1/Linux libc5) wcstombs"
 ac_help="$ac_help
   --enable-wxprintfv      use wxWindows implementation of vprintf()"
 ac_help="$ac_help
@@ -192,9 +192,9 @@ ac_help="$ac_help
 ac_help="$ac_help
   --enable-snglinst       use wxSingleInstanceChecker class"
 ac_help="$ac_help
-  --enable-mimetypes      use wxMimeTypesManager"
+  --enable-mimetype       use wxMimeTypesManager"
 ac_help="$ac_help
-  --enable-sysoptions      use wxSystemOptions"
+  --enable-sysoptions     use wxSystemOptions"
 ac_help="$ac_help
   --enable-threads        use threads"
 ac_help="$ac_help
@@ -219,6 +219,8 @@ ac_help="$ac_help
   --enable-loggui         use standard GUI logger"
 ac_help="$ac_help
   --enable-logwin         use wxLogWindow"
+ac_help="$ac_help
+  --enable-logdialog      use wxLogDialog"
 ac_help="$ac_help
   --enable-postscript     use wxPostscriptDC device context (default for gtk+)"
 ac_help="$ac_help
@@ -311,10 +313,12 @@ ac_help="$ac_help
   --enable-tbarsmpl       use wxToolBarSimple class"
 ac_help="$ac_help
   --enable-treectrl       use wxTreeCtrl class"
+ac_help="$ac_help
+  --enable-tipwindow      use wxTipWindow class"
 ac_help="$ac_help
   --enable-popupwin       use wxPopUpWindow class"
 ac_help="$ac_help
-  --enable-commondlg      use common dialogs (wxDirDialog, wxProgressDialog, wxTextDialog, ...)"
+  --enable-commondlg      use all common dialogs"
 ac_help="$ac_help
   --enable-choicedlg      use wxChoiceDialog"
 ac_help="$ac_help
@@ -354,11 +358,13 @@ ac_help="$ac_help
 ac_help="$ac_help
   --enable-busyinfo       use wxBusyInfo"
 ac_help="$ac_help
-  --enable-joystick       compile in joystick support (Linux only)"
+  --enable-joystick       use wxJoystick (Linux only)"
 ac_help="$ac_help
   --enable-metafiles      use wxMetaFile (Windows only)"
 ac_help="$ac_help
   --enable-dragimage      use wxDragImage"
+ac_help="$ac_help
+  --enable-palette        use wxPalette class"
 ac_help="$ac_help
   --enable-image          use wxImage class"
 ac_help="$ac_help
@@ -935,7 +941,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:939: checking host system type" >&5
+echo "configure:945: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -956,7 +962,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$host" 1>&6
 
 echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:960: checking target system type" >&5
+echo "configure:966: checking target system type" >&5
 
 target_alias=$target
 case "$target_alias" in
@@ -974,7 +980,7 @@ target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$target" 1>&6
 
 echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:978: checking build system type" >&5
+echo "configure:984: checking build system type" >&5
 
 build_alias=$build
 case "$build_alias" in
@@ -1005,6 +1011,8 @@ WX_RELEASE_NUMBER=2
 WX_VERSION=$WX_MAJOR_VERSION_NUMBER.$WX_MINOR_VERSION_NUMBER.$WX_RELEASE_NUMBER
 WX_RELEASE=$WX_MAJOR_VERSION_NUMBER.$WX_MINOR_VERSION_NUMBER
 
+WX_MSW_VERSION=$WX_MAJOR_VERSION_NUMBER$WX_MINOR_VERSION_NUMBER$WX_RELEASE_NUMBER
+
 WX_CURRENT=1
 WX_REVISION=0
 WX_AGE=0
@@ -1034,13 +1042,11 @@ USE_OPENBSD=
 USE_NETBSD=
 USE_VMS=
 USE_ULTRIX=
-USE_CYGWIN=
-USE_MINGW=
 USE_DATA_GENERAL=
 
 NEEDS_D_REENTRANT_FOR_R_FUNCS=0
 
-ALL_TOOLKITS="CYGWIN GTK MAC MGL MINGW MOTIF PM WINE"
+ALL_TOOLKITS="GTK MAC MGL MOTIF MSW PM WINE"
 
 DEFAULT_wxUSE_GTK=0
 DEFAULT_wxUSE_MAC=0
@@ -1059,12 +1065,14 @@ DEFAULT_DEFAULT_wxUSE_PM=0
 DEFAULT_DEFAULT_wxUSE_WINE=0
 
 PROGRAM_EXT=
+SO_SUFFIX=so
 
 case "${host}" in
   *-hp-hpux* )
     USE_HPUX=1
     DEFAULT_DEFAULT_wxUSE_MOTIF=1
     NEEDS_D_REENTRANT_FOR_R_FUNCS=1
+    SO_SUFFIX=sl
     cat >> confdefs.h <<\EOF
 #define __HPUX__ 1
 EOF
@@ -1237,6 +1245,7 @@ EOF
   *-*-cygwin* | *-*-mingw32* )
     USE_UNIX=0
     USE_WIN32=1
+    SO_SUFFIX=dll
     cat >> confdefs.h <<\EOF
 #define __WIN32__ 1
 EOF
@@ -1262,10 +1271,11 @@ EOF
 EOF
 
     PROGRAM_EXT=".exe"
+    RESCOMP=windres
     DEFAULT_DEFAULT_wxUSE_MSW=1
   ;;
 
-  *-pc-os2_emx )
+  *-pc-os2_emx | *-pc-os2-emx )
     cat >> confdefs.h <<\EOF
 #define __EMX__ 1
 EOF
@@ -1274,9 +1284,10 @@ EOF
     DEFAULT_DEFAULT_wxUSE_PM=1
   ;;
 
-  *-*-darwin* )
-    USE_BSD=1
+  powerpc-*-darwin* )
+        USE_BSD=1
     USE_DARWIN=1
+    SO_SUFFIX=dylib
     cat >> confdefs.h <<\EOF
 #define __BSD__ 1
 EOF
@@ -1286,7 +1297,7 @@ EOF
 EOF
 
     cat >> confdefs.h <<\EOF
-#define __UNIX__ 1
+#define __POWERPC__ 1
 EOF
 
     DEFAULT_DEFAULT_wxUSE_MAC=1
@@ -1310,24 +1321,16 @@ if test "$USE_UNIX" = 1 ; then
 #define __UNIX__ 1
 EOF
 
-
-    SRC_SUBDIRS="$SRC_SUBDIRS unix"
-    INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS unix"
-fi
-
-if test "$USE_BEOS" = 1; then
-    SRC_SUBDIRS="$SRC_SUBDIRS be"
-    INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS be"
 fi
 
 if test "$USE_LINUX" = 1; then
-    echo $ac_n "checking for glibc version""... $ac_c" 1>&6
-echo "configure:1326: checking for glibc version" >&5
+    echo $ac_n "checking for glibc 2.1 or later""... $ac_c" 1>&6
+echo "configure:1329: checking for glibc 2.1 or later" >&5
 if eval "test \"`echo '$''{'wx_lib_glibc21'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1331 "configure"
+#line 1334 "configure"
 #include "confdefs.h"
 #include <features.h>
 int main() {
@@ -1338,19 +1341,30 @@ int main() {
             
 ; return 0; }
 EOF
-if { (eval echo configure:1342: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1345: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  
+                wx_lib_glibc21=yes
+            
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
   rm -rf conftest*
   
-                echo "$ac_t""2.1 or later" 1>&6
+                wx_lib_glibc21=no
+            
+        
+fi
+rm -f conftest*
+    
 fi
 
 echo "$ac_t""$wx_lib_glibc21" 1>&6
-
     if test "$wx_lib_glibc21" = "yes"; then
         cat >> confdefs.h <<\EOF
 #define wxHAVE_GLIBC2 1
 EOF
-)
+
     fi
 fi
 
@@ -1371,12 +1385,12 @@ if test $DEBUG_CONFIGURE = 1; then
   DEFAULT_wxUSE_THREADS=yes
 
   DEFAULT_wxUSE_SHARED=yes
-  DEFAULT_wxUSE_BURNT_NAME=no
+  DEFAULT_wxUSE_SONAME=no
   DEFAULT_wxUSE_OPTIMISE=no
   DEFAULT_wxUSE_PROFILE=no
   DEFAULT_wxUSE_NO_DEPS=no
-  DEFAULT_wxUSE_NO_RTTI=no
-  DEFAULT_wxUSE_NO_EXCEPTIONS=no
+  DEFAULT_wxUSE_NO_RTTI=yes
+  DEFAULT_wxUSE_NO_EXCEPTIONS=yes
   DEFAULT_wxUSE_PERMISSIVE=no
   DEFAULT_wxUSE_DEBUG_FLAG=yes
   DEFAULT_wxUSE_DEBUG_INFO=yes
@@ -1384,11 +1398,13 @@ if test $DEBUG_CONFIGURE = 1; then
   DEFAULT_wxUSE_MEM_TRACING=no
   DEFAULT_wxUSE_DEBUG_CONTEXT=no
   DEFAULT_wxUSE_DMALLOC=no
+  DEFAULT_wxUSE_PRECOMP=yes
   DEFAULT_wxUSE_APPLE_IEEE=no
 
   DEFAULT_wxUSE_LOG=yes
   DEFAULT_wxUSE_LOGWINDOW=no
   DEFAULT_wxUSE_LOGGUI=no
+  DEFAULT_wxUSE_LOGDIALOG=no
 
   DEFAULT_wxUSE_GUI=yes
   DEFAULT_wxUSE_CONTROLS=no
@@ -1412,6 +1428,7 @@ if test $DEBUG_CONFIGURE = 1; then
   DEFAULT_wxUSE_STOPWATCH=no
   DEFAULT_wxUSE_FILE=no
   DEFAULT_wxUSE_FFILE=no
+  DEFAULT_wxUSE_TEXTBUFFER=no
   DEFAULT_wxUSE_TEXTFILE=no
   DEFAULT_wxUSE_WAVE=no
   DEFAULT_wxUSE_INTL=no
@@ -1516,10 +1533,12 @@ if test $DEBUG_CONFIGURE = 1; then
   DEFAULT_wxUSE_TOOLBAR_SIMPLE=no
   DEFAULT_wxUSE_TREECTRL=no
   DEFAULT_wxUSE_POPUPWIN=no
+  DEFAULT_wxUSE_TIPWINDOW=no
 
   DEFAULT_wxUSE_UNICODE=no
   DEFAULT_wxUSE_WCSRTOMBS=no
 
+  DEFAULT_wxUSE_PALETTE=no
   DEFAULT_wxUSE_IMAGE=no
   DEFAULT_wxUSE_GIF=no
   DEFAULT_wxUSE_PCX=no
@@ -1531,12 +1550,12 @@ else
   DEFAULT_wxUSE_THREADS=yes
 
   DEFAULT_wxUSE_SHARED=yes
-  DEFAULT_wxUSE_BURNT_NAME=no
+  DEFAULT_wxUSE_SONAME=no
   DEFAULT_wxUSE_OPTIMISE=yes
   DEFAULT_wxUSE_PROFILE=no
   DEFAULT_wxUSE_NO_DEPS=no
-  DEFAULT_wxUSE_NO_RTTI=no
-  DEFAULT_wxUSE_NO_EXCEPTIONS=no
+  DEFAULT_wxUSE_NO_RTTI=yes
+  DEFAULT_wxUSE_NO_EXCEPTIONS=yes
   DEFAULT_wxUSE_PERMISSIVE=no
   DEFAULT_wxUSE_DEBUG_FLAG=no
   DEFAULT_wxUSE_DEBUG_INFO=no
@@ -1544,11 +1563,13 @@ else
   DEFAULT_wxUSE_MEM_TRACING=no
   DEFAULT_wxUSE_DEBUG_CONTEXT=no
   DEFAULT_wxUSE_DMALLOC=no
+  DEFAULT_wxUSE_PRECOMP=yes
   DEFAULT_wxUSE_APPLE_IEEE=yes
 
   DEFAULT_wxUSE_LOG=yes
   DEFAULT_wxUSE_LOGWINDOW=yes
   DEFAULT_wxUSE_LOGGUI=yes
+  DEFAULT_wxUSE_LOGDIALOG=yes
 
   DEFAULT_wxUSE_GUI=yes
 
@@ -1571,6 +1592,7 @@ else
   DEFAULT_wxUSE_STOPWATCH=yes
   DEFAULT_wxUSE_FILE=yes
   DEFAULT_wxUSE_FFILE=yes
+  DEFAULT_wxUSE_TEXTBUFFER=yes
   DEFAULT_wxUSE_TEXTFILE=yes
   DEFAULT_wxUSE_WAVE=no
   DEFAULT_wxUSE_INTL=yes
@@ -1675,10 +1697,12 @@ else
   DEFAULT_wxUSE_TOOLBAR_SIMPLE=yes
   DEFAULT_wxUSE_TREECTRL=yes
   DEFAULT_wxUSE_POPUPWIN=yes
+  DEFAULT_wxUSE_TIPWINDOW=yes
 
   DEFAULT_wxUSE_UNICODE=no
   DEFAULT_wxUSE_WCSRTOMBS=no
 
+  DEFAULT_wxUSE_PALETTE=yes
   DEFAULT_wxUSE_IMAGE=yes
   DEFAULT_wxUSE_GIF=yes
   DEFAULT_wxUSE_PCX=yes
@@ -1700,7 +1724,7 @@ done
 
 
           echo $ac_n "checking for --enable-gui""... $ac_c" 1>&6
-echo "configure:1704: checking for --enable-gui" >&5
+echo "configure:1728: checking for --enable-gui" >&5
           no_cache=0
           # Check whether --enable-gui or --disable-gui was given.
 if test "${enable_gui+set}" = set; then
@@ -1742,7 +1766,7 @@ if test "$wxUSE_GUI" = "yes"; then
 
 
           echo $ac_n "checking for --enable-universal""... $ac_c" 1>&6
-echo "configure:1746: checking for --enable-universal" >&5
+echo "configure:1770: checking for --enable-universal" >&5
           no_cache=0
           # Check whether --enable-universal or --disable-universal was given.
 if test "${enable_universal+set}" = set; then
@@ -1803,16 +1827,10 @@ if test "${with_wine+set}" = set; then
   wxUSE_WINE="$withval" CACHE_WINE=1 TOOLKIT_GIVEN=1
 fi
 
-# Check whether --with-cygwin or --without-cygwin was given.
-if test "${with_cygwin+set}" = set; then
-  withval="$with_cygwin"
-  wxUSE_CYGWIN="$withval" CACHE_CYGWIN=1 TOOLKIT_GIVEN=1
-fi
-
-# Check whether --with-mingw or --without-mingw was given.
-if test "${with_mingw+set}" = set; then
-  withval="$with_mingw"
-  wxUSE_MINGW="$withval" CACHE_MINGW=1 TOOLKIT_GIVEN=1
+# Check whether --with-msw or --without-msw was given.
+if test "${with_msw+set}" = set; then
+  withval="$with_msw"
+  wxUSE_MSW="$withval" CACHE_MSW TOOLKIT_GIVEN=1
 fi
 
 # Check whether --with-pm or --without-pm was given.
@@ -1839,7 +1857,7 @@ fi
 
 
           echo $ac_n "checking for --with-libpng""... $ac_c" 1>&6
-echo "configure:1843: checking for --with-libpng" >&5
+echo "configure:1861: checking for --with-libpng" >&5
           no_cache=0
           # Check whether --with-libpng or --without-libpng was given.
 if test "${with_libpng+set}" = set; then
@@ -1851,8 +1869,10 @@ if test "${with_libpng+set}" = set; then
                           ac_cv_use_libpng='wxUSE_LIBPNG=no'
                         elif test "$withval" = sys; then
                           ac_cv_use_libpng='wxUSE_LIBPNG=sys'
+                        elif test "$withval" = builtin; then
+                          ac_cv_use_libpng='wxUSE_LIBPNG=builtin'
                         else
-                          { echo "configure: error: Invalid value for --with-libpng: should be yes, no or sys" 1>&2; exit 1; }
+                          { echo "configure: error: Invalid value for --with-libpng: should be yes, no, sys, or builtin" 1>&2; exit 1; }
                         fi
                       
 else
@@ -1880,13 +1900,15 @@ fi
             echo "$ac_t""no" 1>&6
           elif test "$wxUSE_LIBPNG" = sys; then
             echo "$ac_t""system version" 1>&6
+          elif test "$wxUSE_LIBPNG" = builtin; then
+            echo "$ac_t""builtin version" 1>&6
           else
-            { echo "configure: error: Invalid value for --with-libpng: should be yes, no or sys" 1>&2; exit 1; }
+            { echo "configure: error: Invalid value for --with-libpng: should be yes, no, sys, or builtin" 1>&2; exit 1; }
           fi
         
 
           echo $ac_n "checking for --with-libjpeg""... $ac_c" 1>&6
-echo "configure:1890: checking for --with-libjpeg" >&5
+echo "configure:1912: checking for --with-libjpeg" >&5
           no_cache=0
           # Check whether --with-libjpeg or --without-libjpeg was given.
 if test "${with_libjpeg+set}" = set; then
@@ -1898,8 +1920,10 @@ if test "${with_libjpeg+set}" = set; then
                           ac_cv_use_libjpeg='wxUSE_LIBJPEG=no'
                         elif test "$withval" = sys; then
                           ac_cv_use_libjpeg='wxUSE_LIBJPEG=sys'
+                        elif test "$withval" = builtin; then
+                          ac_cv_use_libjpeg='wxUSE_LIBJPEG=builtin'
                         else
-                          { echo "configure: error: Invalid value for --with-libjpeg: should be yes, no or sys" 1>&2; exit 1; }
+                          { echo "configure: error: Invalid value for --with-libjpeg: should be yes, no, sys, or builtin" 1>&2; exit 1; }
                         fi
                       
 else
@@ -1927,13 +1951,15 @@ fi
             echo "$ac_t""no" 1>&6
           elif test "$wxUSE_LIBJPEG" = sys; then
             echo "$ac_t""system version" 1>&6
+          elif test "$wxUSE_LIBJPEG" = builtin; then
+            echo "$ac_t""builtin version" 1>&6
           else
-            { echo "configure: error: Invalid value for --with-libjpeg: should be yes, no or sys" 1>&2; exit 1; }
+            { echo "configure: error: Invalid value for --with-libjpeg: should be yes, no, sys, or builtin" 1>&2; exit 1; }
           fi
         
 
           echo $ac_n "checking for --with-libtiff""... $ac_c" 1>&6
-echo "configure:1937: checking for --with-libtiff" >&5
+echo "configure:1963: checking for --with-libtiff" >&5
           no_cache=0
           # Check whether --with-libtiff or --without-libtiff was given.
 if test "${with_libtiff+set}" = set; then
@@ -1945,8 +1971,10 @@ if test "${with_libtiff+set}" = set; then
                           ac_cv_use_libtiff='wxUSE_LIBTIFF=no'
                         elif test "$withval" = sys; then
                           ac_cv_use_libtiff='wxUSE_LIBTIFF=sys'
+                        elif test "$withval" = builtin; then
+                          ac_cv_use_libtiff='wxUSE_LIBTIFF=builtin'
                         else
-                          { echo "configure: error: Invalid value for --with-libtiff: should be yes, no or sys" 1>&2; exit 1; }
+                          { echo "configure: error: Invalid value for --with-libtiff: should be yes, no, sys, or builtin" 1>&2; exit 1; }
                         fi
                       
 else
@@ -1974,13 +2002,15 @@ fi
             echo "$ac_t""no" 1>&6
           elif test "$wxUSE_LIBTIFF" = sys; then
             echo "$ac_t""system version" 1>&6
+          elif test "$wxUSE_LIBTIFF" = builtin; then
+            echo "$ac_t""builtin version" 1>&6
           else
-            { echo "configure: error: Invalid value for --with-libtiff: should be yes, no or sys" 1>&2; exit 1; }
+            { echo "configure: error: Invalid value for --with-libtiff: should be yes, no, sys, or builtin" 1>&2; exit 1; }
           fi
         
 
           echo $ac_n "checking for --with-freetype""... $ac_c" 1>&6
-echo "configure:1984: checking for --with-freetype" >&5
+echo "configure:2014: checking for --with-freetype" >&5
           no_cache=0
           # Check whether --with-freetype or --without-freetype was given.
 if test "${with_freetype+set}" = set; then
@@ -1992,8 +2022,10 @@ if test "${with_freetype+set}" = set; then
                           ac_cv_use_freetype='wxUSE_FREETYPE=no'
                         elif test "$withval" = sys; then
                           ac_cv_use_freetype='wxUSE_FREETYPE=sys'
+                        elif test "$withval" = builtin; then
+                          ac_cv_use_freetype='wxUSE_FREETYPE=builtin'
                         else
-                          { echo "configure: error: Invalid value for --with-freetype: should be yes, no or sys" 1>&2; exit 1; }
+                          { echo "configure: error: Invalid value for --with-freetype: should be yes, no, sys, or builtin" 1>&2; exit 1; }
                         fi
                       
 else
@@ -2021,13 +2053,15 @@ fi
             echo "$ac_t""no" 1>&6
           elif test "$wxUSE_FREETYPE" = sys; then
             echo "$ac_t""system version" 1>&6
+          elif test "$wxUSE_FREETYPE" = builtin; then
+            echo "$ac_t""builtin version" 1>&6
           else
-            { echo "configure: error: Invalid value for --with-freetype: should be yes, no or sys" 1>&2; exit 1; }
+            { echo "configure: error: Invalid value for --with-freetype: should be yes, no, sys, or builtin" 1>&2; exit 1; }
           fi
         
 
           echo $ac_n "checking for --with-opengl""... $ac_c" 1>&6
-echo "configure:2031: checking for --with-opengl" >&5
+echo "configure:2065: checking for --with-opengl" >&5
           no_cache=0
           # Check whether --with-opengl or --without-opengl was given.
 if test "${with_opengl+set}" = set; then
@@ -2069,7 +2103,7 @@ fi
 
 
           echo $ac_n "checking for --with-dmalloc""... $ac_c" 1>&6
-echo "configure:2073: checking for --with-dmalloc" >&5
+echo "configure:2107: checking for --with-dmalloc" >&5
           no_cache=0
           # Check whether --with-dmalloc or --without-dmalloc was given.
 if test "${with_dmalloc+set}" = set; then
@@ -2108,7 +2142,7 @@ fi
         
 
           echo $ac_n "checking for --with-regex""... $ac_c" 1>&6
-echo "configure:2112: checking for --with-regex" >&5
+echo "configure:2146: checking for --with-regex" >&5
           no_cache=0
           # Check whether --with-regex or --without-regex was given.
 if test "${with_regex+set}" = set; then
@@ -2120,8 +2154,10 @@ if test "${with_regex+set}" = set; then
                           ac_cv_use_regex='wxUSE_REGEX=no'
                         elif test "$withval" = sys; then
                           ac_cv_use_regex='wxUSE_REGEX=sys'
+                        elif test "$withval" = builtin; then
+                          ac_cv_use_regex='wxUSE_REGEX=builtin'
                         else
-                          { echo "configure: error: Invalid value for --with-regex: should be yes, no or sys" 1>&2; exit 1; }
+                          { echo "configure: error: Invalid value for --with-regex: should be yes, no, sys, or builtin" 1>&2; exit 1; }
                         fi
                       
 else
@@ -2149,13 +2185,15 @@ fi
             echo "$ac_t""no" 1>&6
           elif test "$wxUSE_REGEX" = sys; then
             echo "$ac_t""system version" 1>&6
+          elif test "$wxUSE_REGEX" = builtin; then
+            echo "$ac_t""builtin version" 1>&6
           else
-            { echo "configure: error: Invalid value for --with-regex: should be yes, no or sys" 1>&2; exit 1; }
+            { echo "configure: error: Invalid value for --with-regex: should be yes, no, sys, or builtin" 1>&2; exit 1; }
           fi
         
 
           echo $ac_n "checking for --with-zlib""... $ac_c" 1>&6
-echo "configure:2159: checking for --with-zlib" >&5
+echo "configure:2197: checking for --with-zlib" >&5
           no_cache=0
           # Check whether --with-zlib or --without-zlib was given.
 if test "${with_zlib+set}" = set; then
@@ -2167,8 +2205,10 @@ if test "${with_zlib+set}" = set; then
                           ac_cv_use_zlib='wxUSE_ZLIB=no'
                         elif test "$withval" = sys; then
                           ac_cv_use_zlib='wxUSE_ZLIB=sys'
+                        elif test "$withval" = builtin; then
+                          ac_cv_use_zlib='wxUSE_ZLIB=builtin'
                         else
-                          { echo "configure: error: Invalid value for --with-zlib: should be yes, no or sys" 1>&2; exit 1; }
+                          { echo "configure: error: Invalid value for --with-zlib: should be yes, no, sys, or builtin" 1>&2; exit 1; }
                         fi
                       
 else
@@ -2196,13 +2236,15 @@ fi
             echo "$ac_t""no" 1>&6
           elif test "$wxUSE_ZLIB" = sys; then
             echo "$ac_t""system version" 1>&6
+          elif test "$wxUSE_ZLIB" = builtin; then
+            echo "$ac_t""builtin version" 1>&6
           else
-            { echo "configure: error: Invalid value for --with-zlib: should be yes, no or sys" 1>&2; exit 1; }
+            { echo "configure: error: Invalid value for --with-zlib: should be yes, no, sys, or builtin" 1>&2; exit 1; }
           fi
         
 
           echo $ac_n "checking for --with-odbc""... $ac_c" 1>&6
-echo "configure:2206: checking for --with-odbc" >&5
+echo "configure:2248: checking for --with-odbc" >&5
           no_cache=0
           # Check whether --with-odbc or --without-odbc was given.
 if test "${with_odbc+set}" = set; then
@@ -2242,9 +2284,8 @@ fi
 
 
 
-
           echo $ac_n "checking for --enable-shared""... $ac_c" 1>&6
-echo "configure:2248: checking for --enable-shared" >&5
+echo "configure:2289: checking for --enable-shared" >&5
           no_cache=0
           # Check whether --enable-shared or --disable-shared was given.
 if test "${enable_shared+set}" = set; then
@@ -2282,39 +2323,39 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-burnt_name""... $ac_c" 1>&6
-echo "configure:2287: checking for --enable-burnt_name" >&5
+          echo $ac_n "checking for --enable-soname""... $ac_c" 1>&6
+echo "configure:2328: checking for --enable-soname" >&5
           no_cache=0
-          # Check whether --enable-burnt_name or --disable-burnt_name was given.
-if test "${enable_burnt_name+set}" = set; then
-  enableval="$enable_burnt_name"
+          # Check whether --enable-soname or --disable-soname was given.
+if test "${enable_soname+set}" = set; then
+  enableval="$enable_soname"
   
                           if test "$enableval" = yes; then
-                            ac_cv_use_burnt_name='wxUSE_BURNT_NAME=yes'
+                            ac_cv_use_soname='wxUSE_SONAME=yes'
                           else
-                            ac_cv_use_burnt_name='wxUSE_BURNT_NAME=no'
+                            ac_cv_use_soname='wxUSE_SONAME=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_BURNT_NAME" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_SONAME" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_burnt_name='wxUSE_BURNT_NAME='$DEFAULT_wxUSE_BURNT_NAME
+                          ac_cv_use_soname='wxUSE_SONAME='$DEFAULT_wxUSE_SONAME
                         
 fi
 
 
-          eval "$ac_cv_use_burnt_name"
+          eval "$ac_cv_use_soname"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_burnt_name >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_soname >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_BURNT_NAME" = yes; then
+          if test "$wxUSE_SONAME" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
@@ -2322,7 +2363,7 @@ fi
         
 
           echo $ac_n "checking for --enable-optimise""... $ac_c" 1>&6
-echo "configure:2326: checking for --enable-optimise" >&5
+echo "configure:2367: checking for --enable-optimise" >&5
           no_cache=0
           # Check whether --enable-optimise or --disable-optimise was given.
 if test "${enable_optimise+set}" = set; then
@@ -2361,7 +2402,7 @@ fi
         
 
           echo $ac_n "checking for --enable-debug""... $ac_c" 1>&6
-echo "configure:2365: checking for --enable-debug" >&5
+echo "configure:2406: checking for --enable-debug" >&5
           no_cache=0
           # Check whether --enable-debug or --disable-debug was given.
 if test "${enable_debug+set}" = set; then
@@ -2399,6 +2440,46 @@ fi
           fi
         
 
+
+          echo $ac_n "checking for --enable-precomp""... $ac_c" 1>&6
+echo "configure:2446: checking for --enable-precomp" >&5
+          no_cache=0
+          # Check whether --enable-precomp or --disable-precomp was given.
+if test "${enable_precomp+set}" = set; then
+  enableval="$enable_precomp"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_precomp='wxUSE_PRECOMP=yes'
+                          else
+                            ac_cv_use_precomp='wxUSE_PRECOMP=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_PRECOMP" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_precomp='wxUSE_PRECOMP='$DEFAULT_wxUSE_PRECOMP
+                        
+fi
+
+
+          eval "$ac_cv_use_precomp"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_precomp >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_PRECOMP" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
 if test "$wxUSE_DEBUG" = "yes"; then
   DEFAULT_wxUSE_DEBUG_FLAG=yes
   DEFAULT_wxUSE_DEBUG_INFO=yes
@@ -2409,7 +2490,7 @@ fi
 
 
           echo $ac_n "checking for --enable-debug_flag""... $ac_c" 1>&6
-echo "configure:2413: checking for --enable-debug_flag" >&5
+echo "configure:2494: checking for --enable-debug_flag" >&5
           no_cache=0
           # Check whether --enable-debug_flag or --disable-debug_flag was given.
 if test "${enable_debug_flag+set}" = set; then
@@ -2448,7 +2529,7 @@ fi
         
 
           echo $ac_n "checking for --enable-debug_info""... $ac_c" 1>&6
-echo "configure:2452: checking for --enable-debug_info" >&5
+echo "configure:2533: checking for --enable-debug_info" >&5
           no_cache=0
           # Check whether --enable-debug_info or --disable-debug_info was given.
 if test "${enable_debug_info+set}" = set; then
@@ -2487,7 +2568,7 @@ fi
         
 
           echo $ac_n "checking for --enable-debug_gdb""... $ac_c" 1>&6
-echo "configure:2491: checking for --enable-debug_gdb" >&5
+echo "configure:2572: checking for --enable-debug_gdb" >&5
           no_cache=0
           # Check whether --enable-debug_gdb or --disable-debug_gdb was given.
 if test "${enable_debug_gdb+set}" = set; then
@@ -2526,7 +2607,7 @@ fi
         
 
           echo $ac_n "checking for --enable-debug_cntxt""... $ac_c" 1>&6
-echo "configure:2530: checking for --enable-debug_cntxt" >&5
+echo "configure:2611: checking for --enable-debug_cntxt" >&5
           no_cache=0
           # Check whether --enable-debug_cntxt or --disable-debug_cntxt was given.
 if test "${enable_debug_cntxt+set}" = set; then
@@ -2565,7 +2646,7 @@ fi
         
 
           echo $ac_n "checking for --enable-mem_tracing""... $ac_c" 1>&6
-echo "configure:2569: checking for --enable-mem_tracing" >&5
+echo "configure:2650: checking for --enable-mem_tracing" >&5
           no_cache=0
           # Check whether --enable-mem_tracing or --disable-mem_tracing was given.
 if test "${enable_mem_tracing+set}" = set; then
@@ -2604,7 +2685,7 @@ fi
         
 
           echo $ac_n "checking for --enable-profile""... $ac_c" 1>&6
-echo "configure:2608: checking for --enable-profile" >&5
+echo "configure:2689: checking for --enable-profile" >&5
           no_cache=0
           # Check whether --enable-profile or --disable-profile was given.
 if test "${enable_profile+set}" = set; then
@@ -2643,7 +2724,7 @@ fi
         
 
           echo $ac_n "checking for --enable-no_rtti""... $ac_c" 1>&6
-echo "configure:2647: checking for --enable-no_rtti" >&5
+echo "configure:2728: checking for --enable-no_rtti" >&5
           no_cache=0
           # Check whether --enable-no_rtti or --disable-no_rtti was given.
 if test "${enable_no_rtti+set}" = set; then
@@ -2682,7 +2763,7 @@ fi
         
 
           echo $ac_n "checking for --enable-no_exceptions""... $ac_c" 1>&6
-echo "configure:2686: checking for --enable-no_exceptions" >&5
+echo "configure:2767: checking for --enable-no_exceptions" >&5
           no_cache=0
           # Check whether --enable-no_exceptions or --disable-no_exceptions was given.
 if test "${enable_no_exceptions+set}" = set; then
@@ -2721,7 +2802,7 @@ fi
         
 
           echo $ac_n "checking for --enable-permissive""... $ac_c" 1>&6
-echo "configure:2725: checking for --enable-permissive" >&5
+echo "configure:2806: checking for --enable-permissive" >&5
           no_cache=0
           # Check whether --enable-permissive or --disable-permissive was given.
 if test "${enable_permissive+set}" = set; then
@@ -2760,7 +2841,7 @@ fi
         
 
           echo $ac_n "checking for --enable-no_deps""... $ac_c" 1>&6
-echo "configure:2764: checking for --enable-no_deps" >&5
+echo "configure:2845: checking for --enable-no_deps" >&5
           no_cache=0
           # Check whether --enable-no_deps or --disable-no_deps was given.
 if test "${enable_no_deps+set}" = set; then
@@ -2800,7 +2881,7 @@ fi
 
 
           echo $ac_n "checking for --enable-compat20""... $ac_c" 1>&6
-echo "configure:2804: checking for --enable-compat20" >&5
+echo "configure:2885: checking for --enable-compat20" >&5
           no_cache=0
           # Check whether --enable-compat20 or --disable-compat20 was given.
 if test "${enable_compat20+set}" = set; then
@@ -2839,7 +2920,7 @@ fi
         
 
           echo $ac_n "checking for --enable-compat22""... $ac_c" 1>&6
-echo "configure:2843: checking for --enable-compat22" >&5
+echo "configure:2924: checking for --enable-compat22" >&5
           no_cache=0
           # Check whether --enable-compat22 or --disable-compat22 was given.
 if test "${enable_compat22+set}" = set; then
@@ -2880,7 +2961,7 @@ fi
 
 
           echo $ac_n "checking for --enable-intl""... $ac_c" 1>&6
-echo "configure:2884: checking for --enable-intl" >&5
+echo "configure:2965: checking for --enable-intl" >&5
           no_cache=0
           # Check whether --enable-intl or --disable-intl was given.
 if test "${enable_intl+set}" = set; then
@@ -2919,7 +3000,7 @@ fi
         
 
           echo $ac_n "checking for --enable-config""... $ac_c" 1>&6
-echo "configure:2923: checking for --enable-config" >&5
+echo "configure:3004: checking for --enable-config" >&5
           no_cache=0
           # Check whether --enable-config or --disable-config was given.
 if test "${enable_config+set}" = set; then
@@ -2959,7 +3040,7 @@ fi
 
 
           echo $ac_n "checking for --enable-sockets""... $ac_c" 1>&6
-echo "configure:2963: checking for --enable-sockets" >&5
+echo "configure:3044: checking for --enable-sockets" >&5
           no_cache=0
           # Check whether --enable-sockets or --disable-sockets was given.
 if test "${enable_sockets+set}" = set; then
@@ -2999,7 +3080,7 @@ fi
 
 
           echo $ac_n "checking for --enable-ipc""... $ac_c" 1>&6
-echo "configure:3003: checking for --enable-ipc" >&5
+echo "configure:3084: checking for --enable-ipc" >&5
           no_cache=0
           # Check whether --enable-ipc or --disable-ipc was given.
 if test "${enable_ipc+set}" = set; then
@@ -3039,7 +3120,7 @@ fi
 
 
           echo $ac_n "checking for --enable-cmdline""... $ac_c" 1>&6
-echo "configure:3043: checking for --enable-cmdline" >&5
+echo "configure:3124: checking for --enable-cmdline" >&5
           no_cache=0
           # Check whether --enable-cmdline or --disable-cmdline was given.
 if test "${enable_cmdline+set}" = set; then
@@ -3078,7 +3159,7 @@ fi
         
 
           echo $ac_n "checking for --enable-datetime""... $ac_c" 1>&6
-echo "configure:3082: checking for --enable-datetime" >&5
+echo "configure:3163: checking for --enable-datetime" >&5
           no_cache=0
           # Check whether --enable-datetime or --disable-datetime was given.
 if test "${enable_datetime+set}" = set; then
@@ -3117,7 +3198,7 @@ fi
         
 
           echo $ac_n "checking for --enable-timedate""... $ac_c" 1>&6
-echo "configure:3121: checking for --enable-timedate" >&5
+echo "configure:3202: checking for --enable-timedate" >&5
           no_cache=0
           # Check whether --enable-timedate or --disable-timedate was given.
 if test "${enable_timedate+set}" = set; then
@@ -3156,7 +3237,7 @@ fi
         
 
           echo $ac_n "checking for --enable-stopwatch""... $ac_c" 1>&6
-echo "configure:3160: checking for --enable-stopwatch" >&5
+echo "configure:3241: checking for --enable-stopwatch" >&5
           no_cache=0
           # Check whether --enable-stopwatch or --disable-stopwatch was given.
 if test "${enable_stopwatch+set}" = set; then
@@ -3195,7 +3276,7 @@ fi
         
 
           echo $ac_n "checking for --enable-dialupman""... $ac_c" 1>&6
-echo "configure:3199: checking for --enable-dialupman" >&5
+echo "configure:3280: checking for --enable-dialupman" >&5
           no_cache=0
           # Check whether --enable-dialupman or --disable-dialupman was given.
 if test "${enable_dialupman+set}" = set; then
@@ -3234,7 +3315,7 @@ fi
         
 
           echo $ac_n "checking for --enable-apple_ieee""... $ac_c" 1>&6
-echo "configure:3238: checking for --enable-apple_ieee" >&5
+echo "configure:3319: checking for --enable-apple_ieee" >&5
           no_cache=0
           # Check whether --enable-apple_ieee or --disable-apple_ieee was given.
 if test "${enable_apple_ieee+set}" = set; then
@@ -3273,7 +3354,7 @@ fi
         
 
           echo $ac_n "checking for --enable-timer""... $ac_c" 1>&6
-echo "configure:3277: checking for --enable-timer" >&5
+echo "configure:3358: checking for --enable-timer" >&5
           no_cache=0
           # Check whether --enable-timer or --disable-timer was given.
 if test "${enable_timer+set}" = set; then
@@ -3312,7 +3393,7 @@ fi
         
 
           echo $ac_n "checking for --enable-wave""... $ac_c" 1>&6
-echo "configure:3316: checking for --enable-wave" >&5
+echo "configure:3397: checking for --enable-wave" >&5
           no_cache=0
           # Check whether --enable-wave or --disable-wave was given.
 if test "${enable_wave+set}" = set; then
@@ -3351,7 +3432,7 @@ fi
         
 
           echo $ac_n "checking for --enable-fraction""... $ac_c" 1>&6
-echo "configure:3355: checking for --enable-fraction" >&5
+echo "configure:3436: checking for --enable-fraction" >&5
           no_cache=0
           # Check whether --enable-fraction or --disable-fraction was given.
 if test "${enable_fraction+set}" = set; then
@@ -3390,7 +3471,7 @@ fi
         
 
           echo $ac_n "checking for --enable-dynlib""... $ac_c" 1>&6
-echo "configure:3394: checking for --enable-dynlib" >&5
+echo "configure:3475: checking for --enable-dynlib" >&5
           no_cache=0
           # Check whether --enable-dynlib or --disable-dynlib was given.
 if test "${enable_dynlib+set}" = set; then
@@ -3429,7 +3510,7 @@ fi
         
 
           echo $ac_n "checking for --enable-longlong""... $ac_c" 1>&6
-echo "configure:3433: checking for --enable-longlong" >&5
+echo "configure:3514: checking for --enable-longlong" >&5
           no_cache=0
           # Check whether --enable-longlong or --disable-longlong was given.
 if test "${enable_longlong+set}" = set; then
@@ -3468,7 +3549,7 @@ fi
         
 
           echo $ac_n "checking for --enable-geometry""... $ac_c" 1>&6
-echo "configure:3472: checking for --enable-geometry" >&5
+echo "configure:3553: checking for --enable-geometry" >&5
           no_cache=0
           # Check whether --enable-geometry or --disable-geometry was given.
 if test "${enable_geometry+set}" = set; then
@@ -3507,7 +3588,7 @@ fi
         
 
           echo $ac_n "checking for --enable-log""... $ac_c" 1>&6
-echo "configure:3511: checking for --enable-log" >&5
+echo "configure:3592: checking for --enable-log" >&5
           no_cache=0
           # Check whether --enable-log or --disable-log was given.
 if test "${enable_log+set}" = set; then
@@ -3546,7 +3627,7 @@ fi
         
 
           echo $ac_n "checking for --enable-streams""... $ac_c" 1>&6
-echo "configure:3550: checking for --enable-streams" >&5
+echo "configure:3631: checking for --enable-streams" >&5
           no_cache=0
           # Check whether --enable-streams or --disable-streams was given.
 if test "${enable_streams+set}" = set; then
@@ -3585,7 +3666,7 @@ fi
         
 
           echo $ac_n "checking for --enable-file""... $ac_c" 1>&6
-echo "configure:3589: checking for --enable-file" >&5
+echo "configure:3670: checking for --enable-file" >&5
           no_cache=0
           # Check whether --enable-file or --disable-file was given.
 if test "${enable_file+set}" = set; then
@@ -3624,7 +3705,7 @@ fi
         
 
           echo $ac_n "checking for --enable-ffile""... $ac_c" 1>&6
-echo "configure:3628: checking for --enable-ffile" >&5
+echo "configure:3709: checking for --enable-ffile" >&5
           no_cache=0
           # Check whether --enable-ffile or --disable-ffile was given.
 if test "${enable_ffile+set}" = set; then
@@ -3662,8 +3743,47 @@ fi
           fi
         
 
+          echo $ac_n "checking for --enable-textbuf""... $ac_c" 1>&6
+echo "configure:3748: checking for --enable-textbuf" >&5
+          no_cache=0
+          # Check whether --enable-textbuf or --disable-textbuf was given.
+if test "${enable_textbuf+set}" = set; then
+  enableval="$enable_textbuf"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_textbuf='wxUSE_TEXTBUFFER=yes'
+                          else
+                            ac_cv_use_textbuf='wxUSE_TEXTBUFFER=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_TEXTBUFFER" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_textbuf='wxUSE_TEXTBUFFER='$DEFAULT_wxUSE_TEXTBUFFER
+                        
+fi
+
+
+          eval "$ac_cv_use_textbuf"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_textbuf >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_TEXTBUFFER" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
           echo $ac_n "checking for --enable-textfile""... $ac_c" 1>&6
-echo "configure:3667: checking for --enable-textfile" >&5
+echo "configure:3787: checking for --enable-textfile" >&5
           no_cache=0
           # Check whether --enable-textfile or --disable-textfile was given.
 if test "${enable_textfile+set}" = set; then
@@ -3702,7 +3822,7 @@ fi
         
 
           echo $ac_n "checking for --enable-fontmap""... $ac_c" 1>&6
-echo "configure:3706: checking for --enable-fontmap" >&5
+echo "configure:3826: checking for --enable-fontmap" >&5
           no_cache=0
           # Check whether --enable-fontmap or --disable-fontmap was given.
 if test "${enable_fontmap+set}" = set; then
@@ -3741,7 +3861,7 @@ fi
         
 
           echo $ac_n "checking for --enable-unicode""... $ac_c" 1>&6
-echo "configure:3745: checking for --enable-unicode" >&5
+echo "configure:3865: checking for --enable-unicode" >&5
           no_cache=0
           # Check whether --enable-unicode or --disable-unicode was given.
 if test "${enable_unicode+set}" = set; then
@@ -3779,47 +3899,8 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-wcsrtombs""... $ac_c" 1>&6
-echo "configure:3784: checking for --enable-wcsrtombs" >&5
-          no_cache=0
-          # Check whether --enable-wcsrtombs or --disable-wcsrtombs was given.
-if test "${enable_wcsrtombs+set}" = set; then
-  enableval="$enable_wcsrtombs"
-  
-                          if test "$enableval" = yes; then
-                            ac_cv_use_wcsrtombs='wxUSE_WCSRTOMBS=yes'
-                          else
-                            ac_cv_use_wcsrtombs='wxUSE_WCSRTOMBS=no'
-                          fi
-                        
-else
-  
-                          LINE=`grep "wxUSE_WCSRTOMBS" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
-                          ac_cv_use_wcsrtombs='wxUSE_WCSRTOMBS='$DEFAULT_wxUSE_WCSRTOMBS
-                        
-fi
-
-
-          eval "$ac_cv_use_wcsrtombs"
-          if test "$no_cache" != 1; then
-            echo $ac_cv_use_wcsrtombs >> ${wx_arg_cache_file}.tmp
-          fi
-
-          if test "$wxUSE_WCSRTOMBS" = yes; then
-            echo "$ac_t""yes" 1>&6
-          else
-            echo "$ac_t""no" 1>&6
-          fi
-        
-
           echo $ac_n "checking for --enable-wxprintfv""... $ac_c" 1>&6
-echo "configure:3823: checking for --enable-wxprintfv" >&5
+echo "configure:3904: checking for --enable-wxprintfv" >&5
           no_cache=0
           # Check whether --enable-wxprintfv or --disable-wxprintfv was given.
 if test "${enable_wxprintfv+set}" = set; then
@@ -3858,7 +3939,7 @@ fi
         
 
           echo $ac_n "checking for --enable-std_iostreams""... $ac_c" 1>&6
-echo "configure:3862: checking for --enable-std_iostreams" >&5
+echo "configure:3943: checking for --enable-std_iostreams" >&5
           no_cache=0
           # Check whether --enable-std_iostreams or --disable-std_iostreams was given.
 if test "${enable_std_iostreams+set}" = set; then
@@ -3897,7 +3978,7 @@ fi
         
 
           echo $ac_n "checking for --enable-filesystem""... $ac_c" 1>&6
-echo "configure:3901: checking for --enable-filesystem" >&5
+echo "configure:3982: checking for --enable-filesystem" >&5
           no_cache=0
           # Check whether --enable-filesystem or --disable-filesystem was given.
 if test "${enable_filesystem+set}" = set; then
@@ -3936,7 +4017,7 @@ fi
         
 
           echo $ac_n "checking for --enable-fs_inet""... $ac_c" 1>&6
-echo "configure:3940: checking for --enable-fs_inet" >&5
+echo "configure:4021: checking for --enable-fs_inet" >&5
           no_cache=0
           # Check whether --enable-fs_inet or --disable-fs_inet was given.
 if test "${enable_fs_inet+set}" = set; then
@@ -3975,7 +4056,7 @@ fi
         
 
           echo $ac_n "checking for --enable-fs_zip""... $ac_c" 1>&6
-echo "configure:3979: checking for --enable-fs_zip" >&5
+echo "configure:4060: checking for --enable-fs_zip" >&5
           no_cache=0
           # Check whether --enable-fs_zip or --disable-fs_zip was given.
 if test "${enable_fs_zip+set}" = set; then
@@ -4014,7 +4095,7 @@ fi
         
 
           echo $ac_n "checking for --enable-zipstream""... $ac_c" 1>&6
-echo "configure:4018: checking for --enable-zipstream" >&5
+echo "configure:4099: checking for --enable-zipstream" >&5
           no_cache=0
           # Check whether --enable-zipstream or --disable-zipstream was given.
 if test "${enable_zipstream+set}" = set; then
@@ -4054,7 +4135,7 @@ fi
 
 
           echo $ac_n "checking for --enable-catch_segvs""... $ac_c" 1>&6
-echo "configure:4058: checking for --enable-catch_segvs" >&5
+echo "configure:4139: checking for --enable-catch_segvs" >&5
           no_cache=0
           # Check whether --enable-catch_segvs or --disable-catch_segvs was given.
 if test "${enable_catch_segvs+set}" = set; then
@@ -4093,7 +4174,7 @@ fi
         
 
           echo $ac_n "checking for --enable-snglinst""... $ac_c" 1>&6
-echo "configure:4097: checking for --enable-snglinst" >&5
+echo "configure:4178: checking for --enable-snglinst" >&5
           no_cache=0
           # Check whether --enable-snglinst or --disable-snglinst was given.
 if test "${enable_snglinst+set}" = set; then
@@ -4133,7 +4214,7 @@ fi
 
 
           echo $ac_n "checking for --enable-mimetype""... $ac_c" 1>&6
-echo "configure:4137: checking for --enable-mimetype" >&5
+echo "configure:4218: checking for --enable-mimetype" >&5
           no_cache=0
           # Check whether --enable-mimetype or --disable-mimetype was given.
 if test "${enable_mimetype+set}" = set; then
@@ -4172,7 +4253,7 @@ fi
         
 
           echo $ac_n "checking for --enable-system_options""... $ac_c" 1>&6
-echo "configure:4176: checking for --enable-system_options" >&5
+echo "configure:4257: checking for --enable-system_options" >&5
           no_cache=0
           # Check whether --enable-system_options or --disable-system_options was given.
 if test "${enable_system_options+set}" = set; then
@@ -4213,7 +4294,7 @@ fi
 
 
           echo $ac_n "checking for --enable-threads""... $ac_c" 1>&6
-echo "configure:4217: checking for --enable-threads" >&5
+echo "configure:4298: checking for --enable-threads" >&5
           no_cache=0
           # Check whether --enable-threads or --disable-threads was given.
 if test "${enable_threads+set}" = set; then
@@ -4252,7 +4333,7 @@ fi
         
 
           echo $ac_n "checking for --enable-serial""... $ac_c" 1>&6
-echo "configure:4256: checking for --enable-serial" >&5
+echo "configure:4337: checking for --enable-serial" >&5
           no_cache=0
           # Check whether --enable-serial or --disable-serial was given.
 if test "${enable_serial+set}" = set; then
@@ -4295,7 +4376,7 @@ if test "$wxUSE_GUI" = "yes"; then
 
 
           echo $ac_n "checking for --enable-docview""... $ac_c" 1>&6
-echo "configure:4299: checking for --enable-docview" >&5
+echo "configure:4380: checking for --enable-docview" >&5
           no_cache=0
           # Check whether --enable-docview or --disable-docview was given.
 if test "${enable_docview+set}" = set; then
@@ -4334,7 +4415,7 @@ fi
         
 
           echo $ac_n "checking for --enable-help""... $ac_c" 1>&6
-echo "configure:4338: checking for --enable-help" >&5
+echo "configure:4419: checking for --enable-help" >&5
           no_cache=0
           # Check whether --enable-help or --disable-help was given.
 if test "${enable_help+set}" = set; then
@@ -4373,7 +4454,7 @@ fi
         
 
           echo $ac_n "checking for --enable-mshtmlhelp""... $ac_c" 1>&6
-echo "configure:4377: checking for --enable-mshtmlhelp" >&5
+echo "configure:4458: checking for --enable-mshtmlhelp" >&5
           no_cache=0
           # Check whether --enable-mshtmlhelp or --disable-mshtmlhelp was given.
 if test "${enable_mshtmlhelp+set}" = set; then
@@ -4412,7 +4493,7 @@ fi
         
 
           echo $ac_n "checking for --enable-html""... $ac_c" 1>&6
-echo "configure:4416: checking for --enable-html" >&5
+echo "configure:4497: checking for --enable-html" >&5
           no_cache=0
           # Check whether --enable-html or --disable-html was given.
 if test "${enable_html+set}" = set; then
@@ -4451,7 +4532,7 @@ fi
         
 
           echo $ac_n "checking for --enable-htmlhelp""... $ac_c" 1>&6
-echo "configure:4455: checking for --enable-htmlhelp" >&5
+echo "configure:4536: checking for --enable-htmlhelp" >&5
           no_cache=0
           # Check whether --enable-htmlhelp or --disable-htmlhelp was given.
 if test "${enable_htmlhelp+set}" = set; then
@@ -4490,7 +4571,7 @@ fi
         
 
           echo $ac_n "checking for --enable-constraints""... $ac_c" 1>&6
-echo "configure:4494: checking for --enable-constraints" >&5
+echo "configure:4575: checking for --enable-constraints" >&5
           no_cache=0
           # Check whether --enable-constraints or --disable-constraints was given.
 if test "${enable_constraints+set}" = set; then
@@ -4529,7 +4610,7 @@ fi
         
 
           echo $ac_n "checking for --enable-printarch""... $ac_c" 1>&6
-echo "configure:4533: checking for --enable-printarch" >&5
+echo "configure:4614: checking for --enable-printarch" >&5
           no_cache=0
           # Check whether --enable-printarch or --disable-printarch was given.
 if test "${enable_printarch+set}" = set; then
@@ -4568,7 +4649,7 @@ fi
         
 
           echo $ac_n "checking for --enable-mdi""... $ac_c" 1>&6
-echo "configure:4572: checking for --enable-mdi" >&5
+echo "configure:4653: checking for --enable-mdi" >&5
           no_cache=0
           # Check whether --enable-mdi or --disable-mdi was given.
 if test "${enable_mdi+set}" = set; then
@@ -4607,7 +4688,7 @@ fi
         
 
           echo $ac_n "checking for --enable-loggui""... $ac_c" 1>&6
-echo "configure:4611: checking for --enable-loggui" >&5
+echo "configure:4692: checking for --enable-loggui" >&5
           no_cache=0
           # Check whether --enable-loggui or --disable-loggui was given.
 if test "${enable_loggui+set}" = set; then
@@ -4646,7 +4727,7 @@ fi
         
 
           echo $ac_n "checking for --enable-logwin""... $ac_c" 1>&6
-echo "configure:4650: checking for --enable-logwin" >&5
+echo "configure:4731: checking for --enable-logwin" >&5
           no_cache=0
           # Check whether --enable-logwin or --disable-logwin was given.
 if test "${enable_logwin+set}" = set; then
@@ -4684,9 +4765,48 @@ fi
           fi
         
 
+          echo $ac_n "checking for --enable-logdialog""... $ac_c" 1>&6
+echo "configure:4770: checking for --enable-logdialog" >&5
+          no_cache=0
+          # Check whether --enable-logdialog or --disable-logdialog was given.
+if test "${enable_logdialog+set}" = set; then
+  enableval="$enable_logdialog"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_logdialog='wxUSE_LOGDIALOG=yes'
+                          else
+                            ac_cv_use_logdialog='wxUSE_LOGDIALOG=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_LOGDIALOG" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_logdialog='wxUSE_LOGDIALOG='$DEFAULT_wxUSE_LOGDIALOG
+                        
+fi
+
+
+          eval "$ac_cv_use_logdialog"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_logdialog >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_LOGDIALOG" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
 
           echo $ac_n "checking for --enable-postscript""... $ac_c" 1>&6
-echo "configure:4690: checking for --enable-postscript" >&5
+echo "configure:4810: checking for --enable-postscript" >&5
           no_cache=0
           # Check whether --enable-postscript or --disable-postscript was given.
 if test "${enable_postscript+set}" = set; then
@@ -4728,7 +4848,7 @@ fi
 
 
           echo $ac_n "checking for --enable-prologio""... $ac_c" 1>&6
-echo "configure:4732: checking for --enable-prologio" >&5
+echo "configure:4852: checking for --enable-prologio" >&5
           no_cache=0
           # Check whether --enable-prologio or --disable-prologio was given.
 if test "${enable_prologio+set}" = set; then
@@ -4767,7 +4887,7 @@ fi
         
 
           echo $ac_n "checking for --enable-resources""... $ac_c" 1>&6
-echo "configure:4771: checking for --enable-resources" >&5
+echo "configure:4891: checking for --enable-resources" >&5
           no_cache=0
           # Check whether --enable-resources or --disable-resources was given.
 if test "${enable_resources+set}" = set; then
@@ -4807,7 +4927,7 @@ fi
 
 
           echo $ac_n "checking for --enable-xresources""... $ac_c" 1>&6
-echo "configure:4811: checking for --enable-xresources" >&5
+echo "configure:4931: checking for --enable-xresources" >&5
           no_cache=0
           # Check whether --enable-xresources or --disable-xresources was given.
 if test "${enable_xresources+set}" = set; then
@@ -4848,7 +4968,7 @@ fi
 
 
           echo $ac_n "checking for --enable-clipboard""... $ac_c" 1>&6
-echo "configure:4852: checking for --enable-clipboard" >&5
+echo "configure:4972: checking for --enable-clipboard" >&5
           no_cache=0
           # Check whether --enable-clipboard or --disable-clipboard was given.
 if test "${enable_clipboard+set}" = set; then
@@ -4887,7 +5007,7 @@ fi
         
 
           echo $ac_n "checking for --enable-dnd""... $ac_c" 1>&6
-echo "configure:4891: checking for --enable-dnd" >&5
+echo "configure:5011: checking for --enable-dnd" >&5
           no_cache=0
           # Check whether --enable-dnd or --disable-dnd was given.
 if test "${enable_dnd+set}" = set; then
@@ -4926,7 +5046,7 @@ fi
         
 
           echo $ac_n "checking for --enable-metafile""... $ac_c" 1>&6
-echo "configure:4930: checking for --enable-metafile" >&5
+echo "configure:5050: checking for --enable-metafile" >&5
           no_cache=0
           # Check whether --enable-metafile or --disable-metafile was given.
 if test "${enable_metafile+set}" = set; then
@@ -4966,7 +5086,7 @@ fi
 
 
           echo $ac_n "checking for --enable-treelayout""... $ac_c" 1>&6
-echo "configure:4970: checking for --enable-treelayout" >&5
+echo "configure:5090: checking for --enable-treelayout" >&5
           no_cache=0
           # Check whether --enable-treelayout or --disable-treelayout was given.
 if test "${enable_treelayout+set}" = set; then
@@ -5007,7 +5127,7 @@ fi
 
 
           echo $ac_n "checking for --enable-controls""... $ac_c" 1>&6
-echo "configure:5011: checking for --enable-controls" >&5
+echo "configure:5131: checking for --enable-controls" >&5
           no_cache=0
           # Check whether --enable-controls or --disable-controls was given.
 if test "${enable_controls+set}" = set; then
@@ -5083,6 +5203,7 @@ if test "$wxUSE_CONTROLS" = "yes"; then
   DEFAULT_wxUSE_TOOLTIPS=yes
   DEFAULT_wxUSE_TREECTRL=yes
   DEFAULT_wxUSE_POPUPWIN=yes
+  DEFAULT_wxUSE_TIPWINDOW=yes
 elif test "$wxUSE_CONTROLS" = "no"; then
   DEFAULT_wxUSE_ACCEL=no
   DEFAULT_wxUSE_BMPBUTTON=no
@@ -5121,11 +5242,12 @@ elif test "$wxUSE_CONTROLS" = "no"; then
   DEFAULT_wxUSE_TOOLTIPS=no
   DEFAULT_wxUSE_TREECTRL=no
   DEFAULT_wxUSE_POPUPWIN=no
+  DEFAULT_wxUSE_TIPWINDOW=no
 fi
 
 
           echo $ac_n "checking for --enable-accel""... $ac_c" 1>&6
-echo "configure:5129: checking for --enable-accel" >&5
+echo "configure:5251: checking for --enable-accel" >&5
           no_cache=0
           # Check whether --enable-accel or --disable-accel was given.
 if test "${enable_accel+set}" = set; then
@@ -5164,7 +5286,7 @@ fi
         
 
           echo $ac_n "checking for --enable-button""... $ac_c" 1>&6
-echo "configure:5168: checking for --enable-button" >&5
+echo "configure:5290: checking for --enable-button" >&5
           no_cache=0
           # Check whether --enable-button or --disable-button was given.
 if test "${enable_button+set}" = set; then
@@ -5203,7 +5325,7 @@ fi
         
 
           echo $ac_n "checking for --enable-bmpbutton""... $ac_c" 1>&6
-echo "configure:5207: checking for --enable-bmpbutton" >&5
+echo "configure:5329: checking for --enable-bmpbutton" >&5
           no_cache=0
           # Check whether --enable-bmpbutton or --disable-bmpbutton was given.
 if test "${enable_bmpbutton+set}" = set; then
@@ -5242,7 +5364,7 @@ fi
         
 
           echo $ac_n "checking for --enable-calendar""... $ac_c" 1>&6
-echo "configure:5246: checking for --enable-calendar" >&5
+echo "configure:5368: checking for --enable-calendar" >&5
           no_cache=0
           # Check whether --enable-calendar or --disable-calendar was given.
 if test "${enable_calendar+set}" = set; then
@@ -5281,7 +5403,7 @@ fi
         
 
           echo $ac_n "checking for --enable-caret""... $ac_c" 1>&6
-echo "configure:5285: checking for --enable-caret" >&5
+echo "configure:5407: checking for --enable-caret" >&5
           no_cache=0
           # Check whether --enable-caret or --disable-caret was given.
 if test "${enable_caret+set}" = set; then
@@ -5320,7 +5442,7 @@ fi
         
 
           echo $ac_n "checking for --enable-checkbox""... $ac_c" 1>&6
-echo "configure:5324: checking for --enable-checkbox" >&5
+echo "configure:5446: checking for --enable-checkbox" >&5
           no_cache=0
           # Check whether --enable-checkbox or --disable-checkbox was given.
 if test "${enable_checkbox+set}" = set; then
@@ -5359,7 +5481,7 @@ fi
         
 
           echo $ac_n "checking for --enable-checklst""... $ac_c" 1>&6
-echo "configure:5363: checking for --enable-checklst" >&5
+echo "configure:5485: checking for --enable-checklst" >&5
           no_cache=0
           # Check whether --enable-checklst or --disable-checklst was given.
 if test "${enable_checklst+set}" = set; then
@@ -5398,7 +5520,7 @@ fi
         
 
           echo $ac_n "checking for --enable-choice""... $ac_c" 1>&6
-echo "configure:5402: checking for --enable-choice" >&5
+echo "configure:5524: checking for --enable-choice" >&5
           no_cache=0
           # Check whether --enable-choice or --disable-choice was given.
 if test "${enable_choice+set}" = set; then
@@ -5437,7 +5559,7 @@ fi
         
 
           echo $ac_n "checking for --enable-combobox""... $ac_c" 1>&6
-echo "configure:5441: checking for --enable-combobox" >&5
+echo "configure:5563: checking for --enable-combobox" >&5
           no_cache=0
           # Check whether --enable-combobox or --disable-combobox was given.
 if test "${enable_combobox+set}" = set; then
@@ -5476,7 +5598,7 @@ fi
         
 
           echo $ac_n "checking for --enable-gauge""... $ac_c" 1>&6
-echo "configure:5480: checking for --enable-gauge" >&5
+echo "configure:5602: checking for --enable-gauge" >&5
           no_cache=0
           # Check whether --enable-gauge or --disable-gauge was given.
 if test "${enable_gauge+set}" = set; then
@@ -5515,7 +5637,7 @@ fi
         
 
           echo $ac_n "checking for --enable-grid""... $ac_c" 1>&6
-echo "configure:5519: checking for --enable-grid" >&5
+echo "configure:5641: checking for --enable-grid" >&5
           no_cache=0
           # Check whether --enable-grid or --disable-grid was given.
 if test "${enable_grid+set}" = set; then
@@ -5554,7 +5676,7 @@ fi
         
 
           echo $ac_n "checking for --enable-newgrid""... $ac_c" 1>&6
-echo "configure:5558: checking for --enable-newgrid" >&5
+echo "configure:5680: checking for --enable-newgrid" >&5
           no_cache=0
           # Check whether --enable-newgrid or --disable-newgrid was given.
 if test "${enable_newgrid+set}" = set; then
@@ -5593,7 +5715,7 @@ fi
         
 
           echo $ac_n "checking for --enable-imaglist""... $ac_c" 1>&6
-echo "configure:5597: checking for --enable-imaglist" >&5
+echo "configure:5719: checking for --enable-imaglist" >&5
           no_cache=0
           # Check whether --enable-imaglist or --disable-imaglist was given.
 if test "${enable_imaglist+set}" = set; then
@@ -5632,7 +5754,7 @@ fi
         
 
           echo $ac_n "checking for --enable-listbox""... $ac_c" 1>&6
-echo "configure:5636: checking for --enable-listbox" >&5
+echo "configure:5758: checking for --enable-listbox" >&5
           no_cache=0
           # Check whether --enable-listbox or --disable-listbox was given.
 if test "${enable_listbox+set}" = set; then
@@ -5671,7 +5793,7 @@ fi
         
 
           echo $ac_n "checking for --enable-listctrl""... $ac_c" 1>&6
-echo "configure:5675: checking for --enable-listctrl" >&5
+echo "configure:5797: checking for --enable-listctrl" >&5
           no_cache=0
           # Check whether --enable-listctrl or --disable-listctrl was given.
 if test "${enable_listctrl+set}" = set; then
@@ -5710,7 +5832,7 @@ fi
         
 
           echo $ac_n "checking for --enable-notebook""... $ac_c" 1>&6
-echo "configure:5714: checking for --enable-notebook" >&5
+echo "configure:5836: checking for --enable-notebook" >&5
           no_cache=0
           # Check whether --enable-notebook or --disable-notebook was given.
 if test "${enable_notebook+set}" = set; then
@@ -5749,7 +5871,7 @@ fi
         
 
           echo $ac_n "checking for --enable-propsheet""... $ac_c" 1>&6
-echo "configure:5753: checking for --enable-propsheet" >&5
+echo "configure:5875: checking for --enable-propsheet" >&5
           no_cache=0
           # Check whether --enable-propsheet or --disable-propsheet was given.
 if test "${enable_propsheet+set}" = set; then
@@ -5788,7 +5910,7 @@ fi
         
 
           echo $ac_n "checking for --enable-radiobox""... $ac_c" 1>&6
-echo "configure:5792: checking for --enable-radiobox" >&5
+echo "configure:5914: checking for --enable-radiobox" >&5
           no_cache=0
           # Check whether --enable-radiobox or --disable-radiobox was given.
 if test "${enable_radiobox+set}" = set; then
@@ -5827,7 +5949,7 @@ fi
         
 
           echo $ac_n "checking for --enable-radiobtn""... $ac_c" 1>&6
-echo "configure:5831: checking for --enable-radiobtn" >&5
+echo "configure:5953: checking for --enable-radiobtn" >&5
           no_cache=0
           # Check whether --enable-radiobtn or --disable-radiobtn was given.
 if test "${enable_radiobtn+set}" = set; then
@@ -5866,7 +5988,7 @@ fi
         
 
           echo $ac_n "checking for --enable-sash""... $ac_c" 1>&6
-echo "configure:5870: checking for --enable-sash" >&5
+echo "configure:5992: checking for --enable-sash" >&5
           no_cache=0
           # Check whether --enable-sash or --disable-sash was given.
 if test "${enable_sash+set}" = set; then
@@ -5905,7 +6027,7 @@ fi
         
 
           echo $ac_n "checking for --enable-scrollbar""... $ac_c" 1>&6
-echo "configure:5909: checking for --enable-scrollbar" >&5
+echo "configure:6031: checking for --enable-scrollbar" >&5
           no_cache=0
           # Check whether --enable-scrollbar or --disable-scrollbar was given.
 if test "${enable_scrollbar+set}" = set; then
@@ -5944,7 +6066,7 @@ fi
         
 
           echo $ac_n "checking for --enable-slider""... $ac_c" 1>&6
-echo "configure:5948: checking for --enable-slider" >&5
+echo "configure:6070: checking for --enable-slider" >&5
           no_cache=0
           # Check whether --enable-slider or --disable-slider was given.
 if test "${enable_slider+set}" = set; then
@@ -5983,7 +6105,7 @@ fi
         
 
           echo $ac_n "checking for --enable-spinbtn""... $ac_c" 1>&6
-echo "configure:5987: checking for --enable-spinbtn" >&5
+echo "configure:6109: checking for --enable-spinbtn" >&5
           no_cache=0
           # Check whether --enable-spinbtn or --disable-spinbtn was given.
 if test "${enable_spinbtn+set}" = set; then
@@ -6022,7 +6144,7 @@ fi
         
 
           echo $ac_n "checking for --enable-spinctrl""... $ac_c" 1>&6
-echo "configure:6026: checking for --enable-spinctrl" >&5
+echo "configure:6148: checking for --enable-spinctrl" >&5
           no_cache=0
           # Check whether --enable-spinctrl or --disable-spinctrl was given.
 if test "${enable_spinctrl+set}" = set; then
@@ -6061,7 +6183,7 @@ fi
         
 
           echo $ac_n "checking for --enable-splitter""... $ac_c" 1>&6
-echo "configure:6065: checking for --enable-splitter" >&5
+echo "configure:6187: checking for --enable-splitter" >&5
           no_cache=0
           # Check whether --enable-splitter or --disable-splitter was given.
 if test "${enable_splitter+set}" = set; then
@@ -6100,7 +6222,7 @@ fi
         
 
           echo $ac_n "checking for --enable-statbmp""... $ac_c" 1>&6
-echo "configure:6104: checking for --enable-statbmp" >&5
+echo "configure:6226: checking for --enable-statbmp" >&5
           no_cache=0
           # Check whether --enable-statbmp or --disable-statbmp was given.
 if test "${enable_statbmp+set}" = set; then
@@ -6139,7 +6261,7 @@ fi
         
 
           echo $ac_n "checking for --enable-statbox""... $ac_c" 1>&6
-echo "configure:6143: checking for --enable-statbox" >&5
+echo "configure:6265: checking for --enable-statbox" >&5
           no_cache=0
           # Check whether --enable-statbox or --disable-statbox was given.
 if test "${enable_statbox+set}" = set; then
@@ -6178,7 +6300,7 @@ fi
         
 
           echo $ac_n "checking for --enable-statline""... $ac_c" 1>&6
-echo "configure:6182: checking for --enable-statline" >&5
+echo "configure:6304: checking for --enable-statline" >&5
           no_cache=0
           # Check whether --enable-statline or --disable-statline was given.
 if test "${enable_statline+set}" = set; then
@@ -6217,7 +6339,7 @@ fi
         
 
           echo $ac_n "checking for --enable-stattext""... $ac_c" 1>&6
-echo "configure:6221: checking for --enable-stattext" >&5
+echo "configure:6343: checking for --enable-stattext" >&5
           no_cache=0
           # Check whether --enable-stattext or --disable-stattext was given.
 if test "${enable_stattext+set}" = set; then
@@ -6256,7 +6378,7 @@ fi
         
 
           echo $ac_n "checking for --enable-statusbar""... $ac_c" 1>&6
-echo "configure:6260: checking for --enable-statusbar" >&5
+echo "configure:6382: checking for --enable-statusbar" >&5
           no_cache=0
           # Check whether --enable-statusbar or --disable-statusbar was given.
 if test "${enable_statusbar+set}" = set; then
@@ -6295,7 +6417,7 @@ fi
         
 
           echo $ac_n "checking for --enable-tabdialog""... $ac_c" 1>&6
-echo "configure:6299: checking for --enable-tabdialog" >&5
+echo "configure:6421: checking for --enable-tabdialog" >&5
           no_cache=0
           # Check whether --enable-tabdialog or --disable-tabdialog was given.
 if test "${enable_tabdialog+set}" = set; then
@@ -6334,7 +6456,7 @@ fi
         
 
           echo $ac_n "checking for --enable-textctrl""... $ac_c" 1>&6
-echo "configure:6338: checking for --enable-textctrl" >&5
+echo "configure:6460: checking for --enable-textctrl" >&5
           no_cache=0
           # Check whether --enable-textctrl or --disable-textctrl was given.
 if test "${enable_textctrl+set}" = set; then
@@ -6373,7 +6495,7 @@ fi
         
 
           echo $ac_n "checking for --enable-togglebtn""... $ac_c" 1>&6
-echo "configure:6377: checking for --enable-togglebtn" >&5
+echo "configure:6499: checking for --enable-togglebtn" >&5
           no_cache=0
           # Check whether --enable-togglebtn or --disable-togglebtn was given.
 if test "${enable_togglebtn+set}" = set; then
@@ -6412,7 +6534,7 @@ fi
         
 
           echo $ac_n "checking for --enable-toolbar""... $ac_c" 1>&6
-echo "configure:6416: checking for --enable-toolbar" >&5
+echo "configure:6538: checking for --enable-toolbar" >&5
           no_cache=0
           # Check whether --enable-toolbar or --disable-toolbar was given.
 if test "${enable_toolbar+set}" = set; then
@@ -6451,7 +6573,7 @@ fi
         
 
           echo $ac_n "checking for --enable-tbarnative""... $ac_c" 1>&6
-echo "configure:6455: checking for --enable-tbarnative" >&5
+echo "configure:6577: checking for --enable-tbarnative" >&5
           no_cache=0
           # Check whether --enable-tbarnative or --disable-tbarnative was given.
 if test "${enable_tbarnative+set}" = set; then
@@ -6490,7 +6612,7 @@ fi
         
 
           echo $ac_n "checking for --enable-tbarsmpl""... $ac_c" 1>&6
-echo "configure:6494: checking for --enable-tbarsmpl" >&5
+echo "configure:6616: checking for --enable-tbarsmpl" >&5
           no_cache=0
           # Check whether --enable-tbarsmpl or --disable-tbarsmpl was given.
 if test "${enable_tbarsmpl+set}" = set; then
@@ -6529,7 +6651,7 @@ fi
         
 
           echo $ac_n "checking for --enable-treectrl""... $ac_c" 1>&6
-echo "configure:6533: checking for --enable-treectrl" >&5
+echo "configure:6655: checking for --enable-treectrl" >&5
           no_cache=0
           # Check whether --enable-treectrl or --disable-treectrl was given.
 if test "${enable_treectrl+set}" = set; then
@@ -6567,8 +6689,47 @@ fi
           fi
         
 
+          echo $ac_n "checking for --enable-tipwindow""... $ac_c" 1>&6
+echo "configure:6694: checking for --enable-tipwindow" >&5
+          no_cache=0
+          # Check whether --enable-tipwindow or --disable-tipwindow was given.
+if test "${enable_tipwindow+set}" = set; then
+  enableval="$enable_tipwindow"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_tipwindow='wxUSE_TIPWINDOW=yes'
+                          else
+                            ac_cv_use_tipwindow='wxUSE_TIPWINDOW=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_TIPWINDOW" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_tipwindow='wxUSE_TIPWINDOW='$DEFAULT_wxUSE_TIPWINDOW
+                        
+fi
+
+
+          eval "$ac_cv_use_tipwindow"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_tipwindow >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_TIPWINDOW" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
           echo $ac_n "checking for --enable-popupwin""... $ac_c" 1>&6
-echo "configure:6572: checking for --enable-popupwin" >&5
+echo "configure:6733: checking for --enable-popupwin" >&5
           no_cache=0
           # Check whether --enable-popupwin or --disable-popupwin was given.
 if test "${enable_popupwin+set}" = set; then
@@ -6609,7 +6770,7 @@ fi
 
 
           echo $ac_n "checking for --enable-commondlg""... $ac_c" 1>&6
-echo "configure:6613: checking for --enable-commondlg" >&5
+echo "configure:6774: checking for --enable-commondlg" >&5
           no_cache=0
           # Check whether --enable-commondlg or --disable-commondlg was given.
 if test "${enable_commondlg+set}" = set; then
@@ -6648,7 +6809,7 @@ fi
         
 
           echo $ac_n "checking for --enable-choicedlg""... $ac_c" 1>&6
-echo "configure:6652: checking for --enable-choicedlg" >&5
+echo "configure:6813: checking for --enable-choicedlg" >&5
           no_cache=0
           # Check whether --enable-choicedlg or --disable-choicedlg was given.
 if test "${enable_choicedlg+set}" = set; then
@@ -6687,7 +6848,7 @@ fi
         
 
           echo $ac_n "checking for --enable-coldlg""... $ac_c" 1>&6
-echo "configure:6691: checking for --enable-coldlg" >&5
+echo "configure:6852: checking for --enable-coldlg" >&5
           no_cache=0
           # Check whether --enable-coldlg or --disable-coldlg was given.
 if test "${enable_coldlg+set}" = set; then
@@ -6726,7 +6887,7 @@ fi
         
 
           echo $ac_n "checking for --enable-filedlg""... $ac_c" 1>&6
-echo "configure:6730: checking for --enable-filedlg" >&5
+echo "configure:6891: checking for --enable-filedlg" >&5
           no_cache=0
           # Check whether --enable-filedlg or --disable-filedlg was given.
 if test "${enable_filedlg+set}" = set; then
@@ -6764,17 +6925,17 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-filedlg""... $ac_c" 1>&6
-echo "configure:6769: checking for --enable-filedlg" >&5
+          echo $ac_n "checking for --enable-finddlg""... $ac_c" 1>&6
+echo "configure:6930: checking for --enable-finddlg" >&5
           no_cache=0
-          # Check whether --enable-filedlg or --disable-filedlg was given.
-if test "${enable_filedlg+set}" = set; then
-  enableval="$enable_filedlg"
+          # Check whether --enable-finddlg or --disable-finddlg was given.
+if test "${enable_finddlg+set}" = set; then
+  enableval="$enable_finddlg"
   
                           if test "$enableval" = yes; then
-                            ac_cv_use_filedlg='wxUSE_FINDREPLDLG=yes'
+                            ac_cv_use_finddlg='wxUSE_FINDREPLDLG=yes'
                           else
-                            ac_cv_use_filedlg='wxUSE_FINDREPLDLG=no'
+                            ac_cv_use_finddlg='wxUSE_FINDREPLDLG=no'
                           fi
                         
 else
@@ -6786,14 +6947,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_filedlg='wxUSE_FINDREPLDLG='$DEFAULT_wxUSE_FINDREPLDLG
+                          ac_cv_use_finddlg='wxUSE_FINDREPLDLG='$DEFAULT_wxUSE_FINDREPLDLG
                         
 fi
 
 
-          eval "$ac_cv_use_filedlg"
+          eval "$ac_cv_use_finddlg"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_filedlg >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_finddlg >> ${wx_arg_cache_file}.tmp
           fi
 
           if test "$wxUSE_FINDREPLDLG" = yes; then
@@ -6804,7 +6965,7 @@ fi
         
 
           echo $ac_n "checking for --enable-fontdlg""... $ac_c" 1>&6
-echo "configure:6808: checking for --enable-fontdlg" >&5
+echo "configure:6969: checking for --enable-fontdlg" >&5
           no_cache=0
           # Check whether --enable-fontdlg or --disable-fontdlg was given.
 if test "${enable_fontdlg+set}" = set; then
@@ -6843,7 +7004,7 @@ fi
         
 
           echo $ac_n "checking for --enable-dirdlg""... $ac_c" 1>&6
-echo "configure:6847: checking for --enable-dirdlg" >&5
+echo "configure:7008: checking for --enable-dirdlg" >&5
           no_cache=0
           # Check whether --enable-dirdlg or --disable-dirdlg was given.
 if test "${enable_dirdlg+set}" = set; then
@@ -6882,7 +7043,7 @@ fi
         
 
           echo $ac_n "checking for --enable-msgdlg""... $ac_c" 1>&6
-echo "configure:6886: checking for --enable-msgdlg" >&5
+echo "configure:7047: checking for --enable-msgdlg" >&5
           no_cache=0
           # Check whether --enable-msgdlg or --disable-msgdlg was given.
 if test "${enable_msgdlg+set}" = set; then
@@ -6921,7 +7082,7 @@ fi
         
 
           echo $ac_n "checking for --enable-numberdlg""... $ac_c" 1>&6
-echo "configure:6925: checking for --enable-numberdlg" >&5
+echo "configure:7086: checking for --enable-numberdlg" >&5
           no_cache=0
           # Check whether --enable-numberdlg or --disable-numberdlg was given.
 if test "${enable_numberdlg+set}" = set; then
@@ -6960,7 +7121,7 @@ fi
         
 
           echo $ac_n "checking for --enable-splash""... $ac_c" 1>&6
-echo "configure:6964: checking for --enable-splash" >&5
+echo "configure:7125: checking for --enable-splash" >&5
           no_cache=0
           # Check whether --enable-splash or --disable-splash was given.
 if test "${enable_splash+set}" = set; then
@@ -6999,7 +7160,7 @@ fi
         
 
           echo $ac_n "checking for --enable-textdlg""... $ac_c" 1>&6
-echo "configure:7003: checking for --enable-textdlg" >&5
+echo "configure:7164: checking for --enable-textdlg" >&5
           no_cache=0
           # Check whether --enable-textdlg or --disable-textdlg was given.
 if test "${enable_textdlg+set}" = set; then
@@ -7038,7 +7199,7 @@ fi
         
 
           echo $ac_n "checking for --enable-tipdlg""... $ac_c" 1>&6
-echo "configure:7042: checking for --enable-tipdlg" >&5
+echo "configure:7203: checking for --enable-tipdlg" >&5
           no_cache=0
           # Check whether --enable-tipdlg or --disable-tipdlg was given.
 if test "${enable_tipdlg+set}" = set; then
@@ -7077,7 +7238,7 @@ fi
         
 
           echo $ac_n "checking for --enable-progressdlg""... $ac_c" 1>&6
-echo "configure:7081: checking for --enable-progressdlg" >&5
+echo "configure:7242: checking for --enable-progressdlg" >&5
           no_cache=0
           # Check whether --enable-progressdlg or --disable-progressdlg was given.
 if test "${enable_progressdlg+set}" = set; then
@@ -7116,7 +7277,7 @@ fi
         
 
           echo $ac_n "checking for --enable-wizarddlg""... $ac_c" 1>&6
-echo "configure:7120: checking for --enable-wizarddlg" >&5
+echo "configure:7281: checking for --enable-wizarddlg" >&5
           no_cache=0
           # Check whether --enable-wizarddlg or --disable-wizarddlg was given.
 if test "${enable_wizarddlg+set}" = set; then
@@ -7157,7 +7318,7 @@ fi
 
 
           echo $ac_n "checking for --enable-menus""... $ac_c" 1>&6
-echo "configure:7161: checking for --enable-menus" >&5
+echo "configure:7322: checking for --enable-menus" >&5
           no_cache=0
           # Check whether --enable-menus or --disable-menus was given.
 if test "${enable_menus+set}" = set; then
@@ -7196,7 +7357,7 @@ fi
         
 
           echo $ac_n "checking for --enable-miniframe""... $ac_c" 1>&6
-echo "configure:7200: checking for --enable-miniframe" >&5
+echo "configure:7361: checking for --enable-miniframe" >&5
           no_cache=0
           # Check whether --enable-miniframe or --disable-miniframe was given.
 if test "${enable_miniframe+set}" = set; then
@@ -7235,7 +7396,7 @@ fi
         
 
           echo $ac_n "checking for --enable-tooltips""... $ac_c" 1>&6
-echo "configure:7239: checking for --enable-tooltips" >&5
+echo "configure:7400: checking for --enable-tooltips" >&5
           no_cache=0
           # Check whether --enable-tooltips or --disable-tooltips was given.
 if test "${enable_tooltips+set}" = set; then
@@ -7274,7 +7435,7 @@ fi
         
 
           echo $ac_n "checking for --enable-splines""... $ac_c" 1>&6
-echo "configure:7278: checking for --enable-splines" >&5
+echo "configure:7439: checking for --enable-splines" >&5
           no_cache=0
           # Check whether --enable-splines or --disable-splines was given.
 if test "${enable_splines+set}" = set; then
@@ -7313,7 +7474,7 @@ fi
         
 
           echo $ac_n "checking for --enable-validators""... $ac_c" 1>&6
-echo "configure:7317: checking for --enable-validators" >&5
+echo "configure:7478: checking for --enable-validators" >&5
           no_cache=0
           # Check whether --enable-validators or --disable-validators was given.
 if test "${enable_validators+set}" = set; then
@@ -7352,7 +7513,7 @@ fi
         
 
           echo $ac_n "checking for --enable-busyinfo""... $ac_c" 1>&6
-echo "configure:7356: checking for --enable-busyinfo" >&5
+echo "configure:7517: checking for --enable-busyinfo" >&5
           no_cache=0
           # Check whether --enable-busyinfo or --disable-busyinfo was given.
 if test "${enable_busyinfo+set}" = set; then
@@ -7391,7 +7552,7 @@ fi
         
 
           echo $ac_n "checking for --enable-joystick""... $ac_c" 1>&6
-echo "configure:7395: checking for --enable-joystick" >&5
+echo "configure:7556: checking for --enable-joystick" >&5
           no_cache=0
           # Check whether --enable-joystick or --disable-joystick was given.
 if test "${enable_joystick+set}" = set; then
@@ -7430,7 +7591,7 @@ fi
         
 
           echo $ac_n "checking for --enable-metafile""... $ac_c" 1>&6
-echo "configure:7434: checking for --enable-metafile" >&5
+echo "configure:7595: checking for --enable-metafile" >&5
           no_cache=0
           # Check whether --enable-metafile or --disable-metafile was given.
 if test "${enable_metafile+set}" = set; then
@@ -7469,7 +7630,7 @@ fi
         
 
           echo $ac_n "checking for --enable-dragimage""... $ac_c" 1>&6
-echo "configure:7473: checking for --enable-dragimage" >&5
+echo "configure:7634: checking for --enable-dragimage" >&5
           no_cache=0
           # Check whether --enable-dragimage or --disable-dragimage was given.
 if test "${enable_dragimage+set}" = set; then
@@ -7509,8 +7670,47 @@ fi
 
 
 
+          echo $ac_n "checking for --enable-palette""... $ac_c" 1>&6
+echo "configure:7675: checking for --enable-palette" >&5
+          no_cache=0
+          # Check whether --enable-palette or --disable-palette was given.
+if test "${enable_palette+set}" = set; then
+  enableval="$enable_palette"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_palette='wxUSE_PALETTE=yes'
+                          else
+                            ac_cv_use_palette='wxUSE_PALETTE=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_PALETTE" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_palette='wxUSE_PALETTE='$DEFAULT_wxUSE_PALETTE
+                        
+fi
+
+
+          eval "$ac_cv_use_palette"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_palette >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_PALETTE" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
           echo $ac_n "checking for --enable-image""... $ac_c" 1>&6
-echo "configure:7514: checking for --enable-image" >&5
+echo "configure:7714: checking for --enable-image" >&5
           no_cache=0
           # Check whether --enable-image or --disable-image was given.
 if test "${enable_image+set}" = set; then
@@ -7549,7 +7749,7 @@ fi
         
 
           echo $ac_n "checking for --enable-gif""... $ac_c" 1>&6
-echo "configure:7553: checking for --enable-gif" >&5
+echo "configure:7753: checking for --enable-gif" >&5
           no_cache=0
           # Check whether --enable-gif or --disable-gif was given.
 if test "${enable_gif+set}" = set; then
@@ -7588,7 +7788,7 @@ fi
         
 
           echo $ac_n "checking for --enable-pcx""... $ac_c" 1>&6
-echo "configure:7592: checking for --enable-pcx" >&5
+echo "configure:7792: checking for --enable-pcx" >&5
           no_cache=0
           # Check whether --enable-pcx or --disable-pcx was given.
 if test "${enable_pcx+set}" = set; then
@@ -7627,7 +7827,7 @@ fi
         
 
           echo $ac_n "checking for --enable-pnm""... $ac_c" 1>&6
-echo "configure:7631: checking for --enable-pnm" >&5
+echo "configure:7831: checking for --enable-pnm" >&5
           no_cache=0
           # Check whether --enable-pnm or --disable-pnm was given.
 if test "${enable_pnm+set}" = set; then
@@ -7665,17 +7865,17 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-pnm""... $ac_c" 1>&6
-echo "configure:7670: checking for --enable-pnm" >&5
+          echo $ac_n "checking for --enable-xpm""... $ac_c" 1>&6
+echo "configure:7870: checking for --enable-xpm" >&5
           no_cache=0
-          # Check whether --enable-pnm or --disable-pnm was given.
-if test "${enable_pnm+set}" = set; then
-  enableval="$enable_pnm"
+          # Check whether --enable-xpm or --disable-xpm was given.
+if test "${enable_xpm+set}" = set; then
+  enableval="$enable_xpm"
   
                           if test "$enableval" = yes; then
-                            ac_cv_use_pnm='wxUSE_XPM=yes'
+                            ac_cv_use_xpm='wxUSE_XPM=yes'
                           else
-                            ac_cv_use_pnm='wxUSE_XPM=no'
+                            ac_cv_use_xpm='wxUSE_XPM=no'
                           fi
                         
 else
@@ -7687,14 +7887,14 @@ else
                             no_cache=1
                           fi
 
-                          ac_cv_use_pnm='wxUSE_XPM='$DEFAULT_wxUSE_XPM
+                          ac_cv_use_xpm='wxUSE_XPM='$DEFAULT_wxUSE_XPM
                         
 fi
 
 
-          eval "$ac_cv_use_pnm"
+          eval "$ac_cv_use_xpm"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_pnm >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_xpm >> ${wx_arg_cache_file}.tmp
           fi
 
           if test "$wxUSE_XPM" = yes; then
@@ -7713,74 +7913,74 @@ fi
 
 
 echo $ac_n "checking for toolkit""... $ac_c" 1>&6
-echo "configure:7717: checking for toolkit" >&5
+echo "configure:7917: checking for toolkit" >&5
 
 if test "$wxUSE_GUI" = "yes"; then
 
-if test "$USE_BEOS" = 1; then
-    { echo "configure: error: BeOS GUI is not supported yet, use --disable-gui" 1>&2; exit 1; }
-fi
+    if test "$USE_BEOS" = 1; then
+        { echo "configure: error: BeOS GUI is not supported yet, use --disable-gui" 1>&2; exit 1; }
+    fi
 
-if test "$TOOLKIT_GIVEN" = 1; then
-    for toolkit in `echo $ALL_TOOLKITS`; do
-    var=wxUSE_$toolkit
-    eval "value=\$${var}"
-    eval "$var=`echo \$value | sed -e "s/yes/1/" -e "s/no/0/"`"
-  done
-else
-    for toolkit in `echo $ALL_TOOLKITS`; do
-    if test "$has_toolkit_in_cache" != 1; then
-      var=DEFAULT_DEFAULT_wxUSE_$toolkit
+    if test "$TOOLKIT_GIVEN" = 1; then
+            for toolkit in `echo $ALL_TOOLKITS`; do
+        var=wxUSE_$toolkit
+        eval "value=\$${var}"
+        eval "$var=`echo \$value | sed -e "s/yes/1/" -e "s/no/0/"`"
+      done
     else
-      var=DEFAULT_wxUSE_$toolkit
+            for toolkit in `echo $ALL_TOOLKITS`; do
+        if test "$has_toolkit_in_cache" != 1; then
+          var=DEFAULT_DEFAULT_wxUSE_$toolkit
+        else
+          var=DEFAULT_wxUSE_$toolkit
+        fi
+        eval "wxUSE_$toolkit=\$${var}"
+      done
     fi
-    eval "wxUSE_$toolkit=\$${var}"
-  done
-fi
 
-NUM_TOOLKITS=`expr ${wxUSE_GTK:-0} + ${wxUSE_MOTIF:-0} + ${wxUSE_MAC:-0} + ${wxUSE_WINE:-0} + ${wxUSE_MINGW:-0} + ${wxUSE_CYGWIN:-0} + ${wxUSE_MGL:-0}`
+            NUM_TOOLKITS=`expr ${wxUSE_GTK:-0} + ${wxUSE_MOTIF:-0} + ${wxUSE_MAC:-0}  \
+                  + ${wxUSE_WINE:-0} + ${wxUSE_MSW:-0} + ${wxUSE_MGL:-0}`
 
-case "${host}" in
-  *-pc-os2_emx )
-    NUM_TOOLKITS=`expr ${NUM_TOOLKITS} + ${wxUSE_PM:-0}`
-    # PATH_IFS is autodetected by OS/2's configure (usually ';')
-    LEX_STEM="lexyy"
-  ;;
-  *)
-    PATH_IFS=':'
-    LEX_STEM="lex.yy"
-  ;;
-esac
-
-case "$NUM_TOOLKITS" in
-  1)
-  ;;
-  0)
-    { echo "configure: error: Please specify a toolkit - cannot determine the default for ${host}" 1>&2; exit 1; }
-  ;;
-  *)
-    { echo "configure: error: Please specify at most one toolkit (may be some are cached?)" 1>&2; exit 1; }
-esac
+                case "${host}" in
+      *-pc-os2_emx | *-pc-os2-emx )
+        # PATH_IFS is autodetected by OS/2's configure (usually ';')
+        NUM_TOOLKITS=`expr ${NUM_TOOLKITS} + ${wxUSE_PM:-0}`
+        LEX_STEM="lexyy"
+      ;;
+      *)
+        PATH_IFS=':'
+        LEX_STEM="lex.yy"
+      ;;
+    esac
 
-for toolkit in `echo $ALL_TOOLKITS`; do
-  var=wxUSE_$toolkit
-  eval "value=\$${var}"
-  if test "x$value" != x; then
-    cache_var=CACHE_$toolkit
-    eval "cache=\$${cache_var}"
-    if test "$cache" = 1; then
-      echo "$var=$value" >> ${wx_arg_cache_file}
-    fi
-    if test "$value" = 1; then
-      toolkit_echo=`echo $toolkit | tr [A-Z] [a-z]`
-      echo "$ac_t""$toolkit_echo" 1>&6
-    fi
-  fi
-done
+    case "$NUM_TOOLKITS" in
+      1)
+      ;;
+      0)
+        { echo "configure: error: Please specify a toolkit - cannot determine the default for ${host}" 1>&2; exit 1; }
+      ;;
+      *)
+        { echo "configure: error: Please specify at most one toolkit (may be some are cached?)" 1>&2; exit 1; }
+    esac
 
+        for toolkit in `echo $ALL_TOOLKITS`; do
+      var=wxUSE_$toolkit
+      eval "value=\$${var}"
+      if test "x$value" != x; then
+        cache_var=CACHE_$toolkit
+        eval "cache=\$${cache_var}"
+        if test "$cache" = 1; then
+          echo "$var=$value" >> ${wx_arg_cache_file}
+        fi
+        if test "$value" = 1; then
+          toolkit_echo=`echo $toolkit | tr [A-Z] [a-z]`
+          echo "$ac_t""$toolkit_echo" 1>&6
+        fi
+      fi
+    done
 else
     PATH_IFS=':'
-    echo "$ac_t""base only" 1>&6
+    echo "$ac_t""base ($host_alias hosted) only" 1>&6
 fi
 
 
@@ -7833,21 +8033,25 @@ rm -f confcache
 
 
 if test "$build" != "$host" ; then
-    CC=$host_alias-gcc
-    CXX=$host_alias-c++
-    AR=$host_alias-ar
-    RANLIB=$host_alias-ranlib
-    DLLTOOL=$host_alias-dlltool
-    RESCOMP=$host_alias-windres
-    LD=$host_alias-ld
-    NM=$host_alias-nm
-    STRIP=$host_alias-strip
+    if test "$USE_WIN32" = 1 ; then
+        CC=$host_alias-gcc
+        CXX=$host_alias-c++
+        AR=$host_alias-ar
+        RANLIB=$host_alias-ranlib
+        DLLTOOL=$host_alias-dlltool
+        RESCOMP=$host_alias-windres
+        LD=$host_alias-ld
+        NM=$host_alias-nm
+        STRIP=$host_alias-strip
+    else
+        { echo "configure: error: $build_alias -> $host_alias cross compilation not supported yet." 1>&2; exit 1; }
+    fi
 fi
 
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:7851: checking for $ac_word" >&5
+echo "configure:8055: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -7877,7 +8081,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:7881: checking for $ac_word" >&5
+echo "configure:8085: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -7928,7 +8132,7 @@ fi
       # Extract the first word of "cl", so it can be a program name with args.
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:7932: checking for $ac_word" >&5
+echo "configure:8136: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -7960,7 +8164,7 @@ fi
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:7964: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:8168: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -7971,12 +8175,12 @@ cross_compiling=$ac_cv_prog_cc_cross
 
 cat > conftest.$ac_ext << EOF
 
-#line 7975 "configure"
+#line 8179 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:7980: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8184: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -8002,12 +8206,12 @@ if test $ac_cv_prog_cc_works = no; then
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:8006: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:8210: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:8011: checking whether we are using GNU C" >&5
+echo "configure:8215: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -8016,7 +8220,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:8020: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:8224: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -8035,7 +8239,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:8039: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:8243: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -8070,7 +8274,7 @@ fi
 CFLAGS=`echo "$CFLAGS" | sed 's/-g//g'`
 
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:8074: checking how to run the C preprocessor" >&5
+echo "configure:8278: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
@@ -8085,13 +8289,13 @@ else
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 8089 "configure"
+#line 8293 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8095: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8299: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -8102,13 +8306,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 8106 "configure"
+#line 8310 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8112: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8316: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -8119,13 +8323,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -nologo -E"
   cat > conftest.$ac_ext <<EOF
-#line 8123 "configure"
+#line 8327 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8129: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8333: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -8149,16 +8353,15 @@ else
 fi
 echo "$ac_t""$CPP" 1>&6
 
-
 if test $ac_cv_prog_gcc = yes; then
     echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6
-echo "configure:8156: checking whether ${CC-cc} needs -traditional" >&5
+echo "configure:8359: checking whether ${CC-cc} needs -traditional" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
     ac_pattern="Autoconf.*'x'"
   cat > conftest.$ac_ext <<EOF
-#line 8162 "configure"
+#line 8365 "configure"
 #include "confdefs.h"
 #include <sgtty.h>
 Autoconf TIOCGETP
@@ -8176,7 +8379,7 @@ rm -f conftest*
 
   if test $ac_cv_prog_gcc_traditional = no; then
     cat > conftest.$ac_ext <<EOF
-#line 8180 "configure"
+#line 8383 "configure"
 #include "confdefs.h"
 #include <termio.h>
 Autoconf TCGETA
@@ -8212,7 +8415,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:8216: checking for $ac_word" >&5
+echo "configure:8419: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -8244,7 +8447,7 @@ test -n "$CXX" || CXX="gcc"
 
 
 echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:8248: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
+echo "configure:8451: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
 
 ac_ext=C
 # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -8255,12 +8458,12 @@ cross_compiling=$ac_cv_prog_cxx_cross
 
 cat > conftest.$ac_ext << EOF
 
-#line 8259 "configure"
+#line 8462 "configure"
 #include "confdefs.h"
 
 int main(){return(0);}
 EOF
-if { (eval echo configure:8264: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8467: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cxx_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -8286,12 +8489,12 @@ if test $ac_cv_prog_cxx_works = no; then
   { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:8290: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:8493: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
 cross_compiling=$ac_cv_prog_cxx_cross
 
 echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
-echo "configure:8295: checking whether we are using GNU C++" >&5
+echo "configure:8498: checking whether we are using GNU C++" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -8300,7 +8503,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:8304: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:8507: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gxx=yes
 else
   ac_cv_prog_gxx=no
@@ -8319,7 +8522,7 @@ ac_test_CXXFLAGS="${CXXFLAGS+set}"
 ac_save_CXXFLAGS="$CXXFLAGS"
 CXXFLAGS=
 echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
-echo "configure:8323: checking whether ${CXX-g++} accepts -g" >&5
+echo "configure:8526: checking whether ${CXX-g++} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -8351,50 +8554,6 @@ else
 fi
 
 
-echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6
-echo "configure:8356: checking how to run the C++ preprocessor" >&5
-if test -z "$CXXCPP"; then
-if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_ext=C
-# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cxx_cross
-  CXXCPP="${CXX-g++} -E"
-  cat > conftest.$ac_ext <<EOF
-#line 8369 "configure"
-#include "confdefs.h"
-#include <stdlib.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8374: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  :
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  CXXCPP=/lib/cpp
-fi
-rm -f conftest*
-  ac_cv_prog_CXXCPP="$CXXCPP"
-ac_ext=C
-# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cxx_cross
-fi
-fi
-CXXCPP="$ac_cv_prog_CXXCPP"
-echo "$ac_t""$CXXCPP" 1>&6
-
-
 CXXFLAGS=`echo "$CXXFLAGS" | sed 's/-g//g'`
 
 ac_ext=c
@@ -8408,7 +8567,7 @@ cross_compiling=$ac_cv_prog_cc_cross
 # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:8412: checking for $ac_word" >&5
+echo "configure:8571: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -8439,7 +8598,7 @@ fi
 # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:8443: checking for $ac_word" >&5
+echo "configure:8602: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -8479,7 +8638,7 @@ fi
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:8483: checking for a BSD compatible install" >&5
+echo "configure:8642: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -8531,11 +8690,20 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
+case "${host}" in
+
+                powerpc-*-darwin* )
+        INSTALL_PROGRAM="cp -fp"
+        INSTALL_DATA="cp -fp"
+        ;;
+    *)
+        ;;
+esac
 
 # Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:8539: checking for $ac_word" >&5
+echo "configure:8707: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -8564,7 +8732,7 @@ fi
 
 
 echo $ac_n "checking make for VPATH support""... $ac_c" 1>&6
-echo "configure:8568: checking make for VPATH support" >&5
+echo "configure:8736: checking make for VPATH support" >&5
 cat - << EOF > confMake
 check : file
 	cp \$? \$@
@@ -8601,7 +8769,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:8605: checking for $ac_word" >&5
+echo "configure:8773: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -8635,7 +8803,7 @@ test -n "$YACC" || YACC="yacc"
 # Extract the first word of "flex", so it can be a program name with args.
 set dummy flex; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:8639: checking for $ac_word" >&5
+echo "configure:8807: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -8669,7 +8837,7 @@ then
   *) ac_lib=l ;;
   esac
   echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6
-echo "configure:8673: checking for yywrap in -l$ac_lib" >&5
+echo "configure:8841: checking for yywrap in -l$ac_lib" >&5
 ac_lib_var=`echo $ac_lib'_'yywrap | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -8677,7 +8845,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-l$ac_lib  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 8681 "configure"
+#line 8849 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -8688,7 +8856,7 @@ int main() {
 yywrap()
 ; return 0; }
 EOF
-if { (eval echo configure:8692: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8860: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8712,7 +8880,7 @@ fi
 
 
 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:8716: checking whether ln -s works" >&5
+echo "configure:8884: checking whether ln -s works" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -8853,21 +9021,28 @@ rm -f confcache
 
 
 
+
 REGEX_INCLUDE=
 if test "$wxUSE_REGEX" != "no"; then
-            ac_safe=`echo "regex.h" | sed 'y%./+-%__p_%'`
+    cat >> confdefs.h <<\EOF
+#define wxUSE_REGEX 1
+EOF
+
+
+    if test "$wxUSE_REGEX" = "sys" -o "$wxUSE_REGEX" = "yes" ; then
+                        ac_safe=`echo "regex.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for regex.h""... $ac_c" 1>&6
-echo "configure:8861: checking for regex.h" >&5
+echo "configure:9036: checking for regex.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 8866 "configure"
+#line 9041 "configure"
 #include "confdefs.h"
 #include <regex.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8871: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9046: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -8886,12 +9061,12 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   for ac_func in regcomp
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:8890: checking for $ac_func" >&5
+echo "configure:9065: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 8895 "configure"
+#line 9070 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -8914,7 +9089,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:8918: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9093: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -8943,52 +9118,151 @@ else
 fi
 
 
-    if test "x$ac_cv_func_regcomp" != "xyes"; then
-                        if test "$wxUSE_REGEX" = "sys"; then
-            { echo "configure: error: system regex library not found! Use --with-regex to use the built-in regex library." 1>&2; exit 1; }
+        if test "x$ac_cv_func_regcomp" != "xyes"; then
+            if test "$wxUSE_REGEX" = "sys" ; then
+                { echo "configure: error: system regex library not found! Use --with-regex to use built-in version" 1>&2; exit 1; }
+            else
+                echo "configure: warning: system regex library not found, will use built-in instead" 1>&2
+                wxUSE_REGEX=builtin
+            fi
+        else
+                        wxUSE_REGEX=sys
         fi
+    fi
 
-                REGEX_INCLUDE="-I\${top_srcdir}/src/regex"
+    if test "$wxUSE_REGEX" = "builtin" ; then
+        REGEX_INCLUDE="-I\${top_srcdir}/src/regex"
     fi
+fi
+
 
+ZLIB_INCLUDE=
+ZLIB_LINK=
+if test "$wxUSE_ZLIB" != "no" ; then
     cat >> confdefs.h <<\EOF
-#define wxUSE_REGEX 1
+#define wxUSE_ZLIB 1
 EOF
 
+
+    if test "$wxUSE_ZLIB" = "sys" -o "$wxUSE_ZLIB" = "yes" ; then
+        ac_safe=`echo "zlib.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for zlib.h""... $ac_c" 1>&6
+echo "configure:9151: checking for zlib.h" >&5
+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 9156 "configure"
+#include "confdefs.h"
+#include <zlib.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:9161: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=yes"
+else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"
+fi
+rm -f conftest*
 fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  echo $ac_n "checking for deflate in -lz""... $ac_c" 1>&6
+echo "configure:9178: checking for deflate in -lz" >&5
+ac_lib_var=`echo z'_'deflate | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-lz  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 9186 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char deflate();
 
+int main() {
+deflate()
+; return 0; }
+EOF
+if { (eval echo configure:9197: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
 
-AFMINSTALL=
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  ZLIB_LINK=" -lz"
+else
+  echo "$ac_t""no" 1>&6
+fi
 
-if test "$wxUSE_GUI" = "yes"; then
-    USE_GUI=1
+else
+  echo "$ac_t""no" 1>&6
+fi
 
-    TOOLKIT=
-    TOOLKIT_INCLUDE=
 
-    GUI_TK_LIBRARY=
-    GUI_TK_LINK=
+        if test "x$ZLIB_LINK" = "x" ; then
+            if test "$wxUSE_ZLIB" = "sys" ; then
+                { echo "configure: error: system zlib compression library not found! Use --with-zlib=builtin to use built-in version" 1>&2; exit 1; }
+            else
+                echo "configure: warning: system zlib compression library not found, will use built-in instead" 1>&2
+                wxUSE_ZLIB=builtin
+            fi
+        else
+                        wxUSE_ZLIB=sys
+        fi
+    fi
 
-    WXGTK12=
-    WXGTK127=
-    WXGTK20=
+    if test "$wxUSE_ZLIB" = "builtin" ; then
+        ZLIB_INCLUDE="-I\${top_srcdir}/src/zlib"
+    fi
+fi
 
-    WXWINE=
 
-    if test "$wxUSE_CYGWIN" = 1 || test "$wxUSE_MINGW" = 1 ; then
-        ac_safe=`echo "windows.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for windows.h""... $ac_c" 1>&6
-echo "configure:8982: checking for windows.h" >&5
+PNG_INCLUDE=
+PNG_LINK=
+if test "$wxUSE_LIBPNG" != "no" ; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_LIBPNG 1
+EOF
+
+
+            if test "$wxUSE_LIBPNG" = "sys" -a "$wxUSE_ZLIB" != "sys" ; then
+        echo "configure: warning: system png library doesn't work without system zlib, will use built-in instead" 1>&2
+        wxUSE_LIBPNG=builtin
+    fi
+
+    if test "$wxUSE_LIBPNG" = "sys" -o "$wxUSE_LIBPNG" = "yes" ; then
+        ac_safe=`echo "png.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for png.h""... $ac_c" 1>&6
+echo "configure:9256: checking for png.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 8987 "configure"
+#line 9261 "configure"
 #include "confdefs.h"
-#include <windows.h>
+#include <png.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8992: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9266: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -9004,87 +9278,589 @@ rm -f conftest*
 fi
 if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-  :
+  echo $ac_n "checking for png_check_sig in -lpng""... $ac_c" 1>&6
+echo "configure:9283: checking for png_check_sig in -lpng" >&5
+ac_lib_var=`echo png'_'png_check_sig | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
 else
-  echo "$ac_t""no" 1>&6
+  ac_save_LIBS="$LIBS"
+LIBS="-lpng -lz -lm $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 9291 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char png_check_sig();
 
-            { echo "configure: error: please set CFLAGS to contain the location of windows.h" 1>&2; exit 1; }
-        
+int main() {
+png_check_sig()
+; return 0; }
+EOF
+if { (eval echo configure:9302: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
 fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
 
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  PNG_LINK=" -lpng"
+else
+  echo "$ac_t""no" 1>&6
+fi
 
-        INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS msw"
+                       
+else
+  echo "$ac_t""no" 1>&6
+fi
 
-                        LIBS="$LIBS -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lctl3d32 -ladvapi32 -lwsock32"
 
-                if test "$wxUSE_ODBC" = "yes" ; then
-            LIBS="$LIBS -lodbc32 -lole32 -loleaut32"
+        if test "x$PNG_LINK" = "x" ; then
+            if test "$wxUSE_LIBPNG" = "sys" ; then
+                { echo "configure: error: system png library not found! Use --with-libpng=builtin to use built-in version" 1>&2; exit 1; }
+            else
+                echo "configure: warning: system png library not found, will use built-in instead" 1>&2
+                wxUSE_LIBPNG=builtin
+            fi
+        else
+                        wxUSE_LIBPNG=yes
         fi
+    fi
 
-                if test "$wxUSE_MINGW" = 1; then
-            LDFLAGS="$LDFLAGS -mwindows"
-        fi
+    if test "$wxUSE_LIBPNG" = "builtin" ; then
+        PNG_INCLUDE="-I\${top_srcdir}/src/png"
+    fi
 
-        TOOLKIT=MSW
-        GUIDIST=MSW_DIST
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS png"
+fi
 
-                RCINCSWITCH="--include-dir"
-        RCDEFSWITCH="--define"
-        RCPREPROCESSOR="--preprocessor \"\$(CC) -c -E -xc-header -DRC_INVOKED\""
-        RCINPUTSWITCH="-i"
-        RCOUTPUTSWITCH="-o"
-        RESFLAGS="$RCPREPROCESSOR $RCINCSWITCH \$(top_srcdir)/include $RCINCSWITCH \$(top_srcdir)/\$(program_dir) $RCDEFSWITCH __WIN32__ $RCDEFSWITCH __WIN95__ $RCDEFSWITCH __GNUWIN32__"
 
-                RESPROGRAM="\$(RES_PROGRAM)"
-    fi
+JPEG_INCLUDE=
+JPEG_LINK=
+if test "$wxUSE_LIBJPEG" != "no" ; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_LIBJPEG 1
+EOF
 
-    if test "$wxUSE_GTK" = 1; then
-        echo $ac_n "checking for GTK+ version""... $ac_c" 1>&6
-echo "configure:9044: checking for GTK+ version" >&5
 
-        gtk_version_cached=1
-        if eval "test \"`echo '$''{'wx_cv_lib_gtk'+set}'`\" = set"; then
+    if test "$wxUSE_LIBJPEG" = "sys" -o "$wxUSE_LIBJPEG" = "yes" ; then
+                                echo $ac_n "checking for jpeglib.h""... $ac_c" 1>&6
+echo "configure:9358: checking for jpeglib.h" >&5
+        if eval "test \"`echo '$''{'ac_cv_header_jpeglib_h'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  
-                                                gtk_version_cached=0
-                echo "$ac_t""""" 1>&6
+  cat > conftest.$ac_ext <<EOF
+#line 9363 "configure"
+#include "confdefs.h"
 
-                wx_cv_lib_gtk=
-                if test "x$wxUSE_GTK2" = "xyes"; then
-                    # Check whether --with-gtk-prefix or --without-gtk-prefix was given.
-if test "${with_gtk_prefix+set}" = set; then
-  withval="$with_gtk_prefix"
-  gtk_config_prefix="$withval"
-else
-  gtk_config_prefix=""
-fi
+                    #undef HAVE_STDLIB_H
+                    #include <stdio.h>
+                    #include <jpeglib.h>
+                
+int main() {
 
-# Check whether --with-gtk-exec-prefix or --without-gtk-exec-prefix was given.
-if test "${with_gtk_exec_prefix+set}" = set; then
-  withval="$with_gtk_exec_prefix"
-  gtk_config_exec_prefix="$withval"
+                
+; return 0; }
+EOF
+if { (eval echo configure:9375: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  ac_cv_header_jpeglib_h=yes
 else
-  gtk_config_exec_prefix=""
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_header_jpeglib_h=no
+            
 fi
-
-# Check whether --enable-gtktest or --disable-gtktest was given.
-if test "${enable_gtktest+set}" = set; then
-  enableval="$enable_gtktest"
-  :
-else
-  enable_gtktest=yes
+rm -f conftest*
+        
 fi
 
+        echo "$ac_t""$ac_cv_header_jpeglib_h" 1>&6
 
-  for module in . 
-  do
-      case "$module" in
-         gthread)
-             gtk_config_args="$gtk_config_args gthread"
-         ;;
-      esac
-  done
+        if test "$ac_cv_header_jpeglib_h" = "yes"; then
+            echo $ac_n "checking for jpeg_read_header in -ljpeg""... $ac_c" 1>&6
+echo "configure:9393: checking for jpeg_read_header in -ljpeg" >&5
+ac_lib_var=`echo jpeg'_'jpeg_read_header | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-ljpeg  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 9401 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char jpeg_read_header();
+
+int main() {
+jpeg_read_header()
+; return 0; }
+EOF
+if { (eval echo configure:9412: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  JPEG_LINK=" -ljpeg"
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+        fi
+
+        if test "x$JPEG_LINK" = "x" ; then
+            if test "$wxUSE_LIBJPEG" = "sys" ; then
+                { echo "configure: error: system jpeg library not found! Use --with-libjpeg=builtin to use built-in version" 1>&2; exit 1; }
+            else
+                echo "configure: warning: system jpeg library not found, will use built-in instead" 1>&2
+                wxUSE_LIBJPEG=builtin
+            fi
+        else
+                        wxUSE_LIBJPEG=sys
+        fi
+    fi
+
+    if test "$wxUSE_LIBJPEG" = "builtin" ; then
+        JPEG_INCLUDE="-I\${top_srcdir}/src/jpeg"
+    fi
+fi
+
+
+TIFF_INCLUDE=
+TIFF_LINK=
+if test "$wxUSE_LIBTIFF" != "no" ; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_LIBTIFF 1
+EOF
+
+
+    if test "$wxUSE_LIBTIFF" = "sys" -o "$wxUSE_LIBTIFF" = "yes" ; then
+        ac_safe=`echo "tiffio.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for tiffio.h""... $ac_c" 1>&6
+echo "configure:9463: checking for tiffio.h" >&5
+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 9468 "configure"
+#include "confdefs.h"
+#include <tiffio.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:9473: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=yes"
+else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"
+fi
+rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  echo $ac_n "checking for TIFFError in -ltiff""... $ac_c" 1>&6
+echo "configure:9490: checking for TIFFError in -ltiff" >&5
+ac_lib_var=`echo tiff'_'TIFFError | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-ltiff -lm $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 9498 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char TIFFError();
+
+int main() {
+TIFFError()
+; return 0; }
+EOF
+if { (eval echo configure:9509: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  TIFF_LINK=" -ltiff"
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+                       
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+
+        if test "x$TIFF_LINK" = "x" ; then
+            if test "$wxUSE_LIBTIFF" = "sys" ; then
+                { echo "configure: error: system tiff library not found! Use --with-libtiff=builtin to use built-in version" 1>&2; exit 1; }
+            else
+                echo "configure: warning: system tiff library not found, will use built-in instead" 1>&2
+                wxUSE_LIBTIFF=builtin
+            fi
+        else
+                        wxUSE_LIBTIFF=sys
+        fi
+    fi
+
+    if test "$wxUSE_LIBTIFF" = "builtin" ; then
+        TIFF_INCLUDE="-I\${top_srcdir}/src/tiff"
+    fi
+fi
+
+
+FREETYPE_INCLUDE=
+FREETYPE_LINK=
+if test "$wxUSE_FREETYPE" != "no" ; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_FREETYPE 1
+EOF
+
+
+    if test "$wxUSE_FREETYPE" = "sys" -o "$wxUSE_FREETYPE" = "yes" ; then
+        ac_safe=`echo "freetype.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for freetype.h""... $ac_c" 1>&6
+echo "configure:9564: checking for freetype.h" >&5
+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 9569 "configure"
+#include "confdefs.h"
+#include <freetype.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:9574: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=yes"
+else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"
+fi
+rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  echo $ac_n "checking for FT_Render_Glyph in -lfreetype""... $ac_c" 1>&6
+echo "configure:9591: checking for FT_Render_Glyph in -lfreetype" >&5
+ac_lib_var=`echo freetype'_'FT_Render_Glyph | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-lfreetype -lm $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 9599 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char FT_Render_Glyph();
+
+int main() {
+FT_Render_Glyph()
+; return 0; }
+EOF
+if { (eval echo configure:9610: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  FREETYPE_LINK=" -lfreetype"
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+                       
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+
+        if test "x$FREETYPE_LINK" = "x" ; then
+            if test "$wxUSE_FREETYPE" = "sys" ; then
+                { echo "configure: error: system freetype library not found! Use --with-freetype=builtin to use built-in version" 1>&2; exit 1; }
+            else
+                echo "configure: warning: system freetype library not found, will use built-in instead" 1>&2
+                wxUSE_FREETYPE=builtin
+            fi
+        else
+                        wxUSE_FREETYPE=sys
+        fi
+    fi
+
+    if test "$wxUSE_FREETYPE" = "builtin" ; then
+        FREETYPE_INCLUDE="-I\${top_srcdir}/src/freetype"
+    fi
+fi
+
+
+AFMINSTALL=
+
+TOOLKIT=
+TOOLKIT_INCLUDE=
+WIDGET_SET=
+
+if test "$USE_WIN32" = 1 ; then
+    for ac_hdr in w32api.h
+do
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:9665: checking for $ac_hdr" >&5
+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 9670 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:9675: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=yes"
+else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"
+fi
+rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_hdr 1
+EOF
+ 
+else
+  echo "$ac_t""no" 1>&6
+fi
+done
+
+    ac_safe=`echo "windows.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for windows.h""... $ac_c" 1>&6
+echo "configure:9703: checking for windows.h" >&5
+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 9708 "configure"
+#include "confdefs.h"
+#include <windows.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:9713: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=yes"
+else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"
+fi
+rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  :
+else
+  echo "$ac_t""no" 1>&6
+
+        { echo "configure: error: please set CFLAGS to contain the location of windows.h" 1>&2; exit 1; }
+    
+fi
+
+
+        echo $ac_n "checking if w32api has good enough MSIE support""... $ac_c" 1>&6
+echo "configure:9739: checking if w32api has good enough MSIE support" >&5
+if eval "test \"`echo '$''{'wx_cv_w32api_win32_ie'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  
+      cat > conftest.$ac_ext <<EOF
+#line 9745 "configure"
+#include "confdefs.h"
+#include <w32api.h>
+int main() {
+
+                       #define wxCHECK_W32API_VERSION( major, minor ) \
+                       ( defined( __W32API_MAJOR_VERSION ) && defined( __W32API_MINOR_VERSION ) \
+                       && ( ( __W32API_MAJOR_VERSION > (major) ) \
+                       || ( __W32API_MAJOR_VERSION == (major) && __W32API_MINOR_VERSION >= (minor))))
+
+                       #if !wxCHECK_W32API_VERSION(1,1)
+                       #error You need w32api 1.1 or newer
+                       #endif
+                     
+; return 0; }
+EOF
+if { (eval echo configure:9761: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  
+                        wx_cv_w32api_win32_ie=yes
+                     
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  
+                        wx_cv_w32api_win32_ie=no
+                     
+fi
+rm -f conftest*
+    
+fi
+
+echo "$ac_t""$wx_cv_w32api_win32_ie" 1>&6
+    if test "$wx_cv_w32api_win32_ie" = "yes" ; then
+        CPPFLAGS="$CPPFLAGS -D_WIN32_IE=0x400"
+    fi
+
+            LIBS="$LIBS -lwinspool -lwinmm -lshell32 -lcomctl32 -lctl3d32 -ladvapi32 -lwsock32"
+
+    case "${host}" in
+        *-*-cygwin* )
+                        LIBS="$LIBS -lkernel32 -luser32 -lgdi32 -lcomdlg32"
+            TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WIN95__"
+    esac
+
+        if test "$wxUSE_ODBC" = "yes" ; then
+        LIBS=" -lodbc32 -lole32 -loleaut32$LIBS"
+    fi
+
+    RESFLAGS="--include-dir \$(top_srcdir)/include --include-dir \$(top_srcdir)/\$(program_dir) --define __WIN32__ --define __WIN95__ --define __GNUWIN32__"
+    RESPROGRAMOBJ="\$(PROGRAM)_resources.o"
+fi
+
+if test "$wxUSE_GUI" = "yes"; then
+    USE_GUI=1
+
+    GUI_TK_LIBRARY=
+
+    WXGTK12=
+    WXGTK127=
+    WXGTK20=
+
+    if test "$wxUSE_MSW" = 1 ; then
+        TOOLKIT=MSW
+        GUIDIST=MSW_DIST
+
+                                case "${host}" in
+            *-*-mingw32* )
+                LDFLAGS="$LDFLAGS -Wl,--subsystem,windows -mwindows"
+        esac
+    fi
+
+    if test "$wxUSE_GTK" = 1; then
+        echo $ac_n "checking for GTK+ version""... $ac_c" 1>&6
+echo "configure:9820: checking for GTK+ version" >&5
+
+        gtk_version_cached=1
+        if eval "test \"`echo '$''{'wx_cv_lib_gtk'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  
+                                                gtk_version_cached=0
+                echo "$ac_t""" 1>&6
+
+                wx_cv_lib_gtk=
+                if test "x$wxUSE_GTK2" = "xyes"; then
+                    # Check whether --with-gtk-prefix or --without-gtk-prefix was given.
+if test "${with_gtk_prefix+set}" = set; then
+  withval="$with_gtk_prefix"
+  gtk_config_prefix="$withval"
+else
+  gtk_config_prefix=""
+fi
+
+# Check whether --with-gtk-exec-prefix or --without-gtk-exec-prefix was given.
+if test "${with_gtk_exec_prefix+set}" = set; then
+  withval="$with_gtk_exec_prefix"
+  gtk_config_exec_prefix="$withval"
+else
+  gtk_config_exec_prefix=""
+fi
+
+# Check whether --enable-gtktest or --disable-gtktest was given.
+if test "${enable_gtktest+set}" = set; then
+  enableval="$enable_gtktest"
+  :
+else
+  enable_gtktest=yes
+fi
+
+
+  for module in . 
+  do
+      case "$module" in
+         gthread)
+             gtk_config_args="$gtk_config_args gthread"
+         ;;
+      esac
+  done
 
   if test x$gtk_config_exec_prefix != x ; then
      gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix"
@@ -9102,7 +9878,7 @@ fi
   # Extract the first word of "gtk-config-2.0", so it can be a program name with args.
 set dummy gtk-config-2.0; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:9106: checking for $ac_word" >&5
+echo "configure:9882: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG_2_0'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -9137,7 +9913,7 @@ fi
 
   min_gtk_version=1.3.1
   echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6
-echo "configure:9141: checking for GTK - version >= $min_gtk_version" >&5
+echo "configure:9917: checking for GTK - version >= $min_gtk_version" >&5
   no_gtk=""
   if test "$GTK_CONFIG_2_0" = "no" ; then
     no_gtk=yes
@@ -9160,7 +9936,7 @@ echo "configure:9141: checking for GTK - version >= $min_gtk_version" >&5
   echo $ac_n "cross compiling; assumed OK... $ac_c"
 else
   cat > conftest.$ac_ext <<EOF
-#line 9164 "configure"
+#line 9940 "configure"
 #include "confdefs.h"
 
 #include <gtk/gtk.h>
@@ -9238,7 +10014,7 @@ main ()
 }
 
 EOF
-if { (eval echo configure:9242: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:10018: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -9272,7 +10048,7 @@ fi
           CFLAGS="$CFLAGS $GTK_CFLAGS"
           LIBS="$LIBS $GTK_LIBS"
           cat > conftest.$ac_ext <<EOF
-#line 9276 "configure"
+#line 10052 "configure"
 #include "confdefs.h"
 
 #include <gtk/gtk.h>
@@ -9282,7 +10058,7 @@ int main() {
  return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); 
 ; return 0; }
 EOF
-if { (eval echo configure:9286: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10062: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
    echo "*** The test program compiled, but did not run. This usually means"
           echo "*** that the run-time linker is not finding GTK or finding the wrong"
@@ -9340,7 +10116,7 @@ rm -f conftest*
   # Extract the first word of "gtk-config", so it can be a program name with args.
 set dummy gtk-config; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:9344: checking for $ac_word" >&5
+echo "configure:10120: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -9375,7 +10151,7 @@ fi
 
   min_gtk_version=1.2.7
   echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6
-echo "configure:9379: checking for GTK - version >= $min_gtk_version" >&5
+echo "configure:10155: checking for GTK - version >= $min_gtk_version" >&5
   no_gtk=""
   if test "$GTK_CONFIG" != "no" ; then
     GTK_CFLAGS=`$GTK_CONFIG --cflags`
@@ -9388,7 +10164,7 @@ echo "configure:9379: checking for GTK - version >= $min_gtk_version" >&5
   echo $ac_n "cross compiling; assumed OK... $ac_c"
 else
   cat > conftest.$ac_ext <<EOF
-#line 9392 "configure"
+#line 10168 "configure"
 #include "confdefs.h"
 
 #include <gtk/gtk.h>
@@ -9421,7 +10197,7 @@ main ()
 }
 
 EOF
-if { (eval echo configure:9425: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:10201: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -9470,7 +10246,7 @@ fi
   # Extract the first word of "gtk-config", so it can be a program name with args.
 set dummy gtk-config; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:9474: checking for $ac_word" >&5
+echo "configure:10250: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -9505,7 +10281,7 @@ fi
 
   min_gtk_version=1.2.3
   echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6
-echo "configure:9509: checking for GTK - version >= $min_gtk_version" >&5
+echo "configure:10285: checking for GTK - version >= $min_gtk_version" >&5
   no_gtk=""
   if test "$GTK_CONFIG" != "no" ; then
     GTK_CFLAGS=`$GTK_CONFIG --cflags`
@@ -9518,7 +10294,7 @@ echo "configure:9509: checking for GTK - version >= $min_gtk_version" >&5
   echo $ac_n "cross compiling; assumed OK... $ac_c"
 else
   cat > conftest.$ac_ext <<EOF
-#line 9522 "configure"
+#line 10298 "configure"
 #include "confdefs.h"
 
 #include <gtk/gtk.h>
@@ -9551,7 +10327,7 @@ main ()
 }
 
 EOF
-if { (eval echo configure:9555: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:10331: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -9622,7 +10398,7 @@ equivalent variable and GTK+ is version 1.2.3 or above.
         GUIDIST=GTK_DIST
 
                 echo $ac_n "checking for gdk_im_open in -lgdk""... $ac_c" 1>&6
-echo "configure:9626: checking for gdk_im_open in -lgdk" >&5
+echo "configure:10402: checking for gdk_im_open in -lgdk" >&5
 ac_lib_var=`echo gdk'_'gdk_im_open | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -9630,7 +10406,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lgdk  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 9634 "configure"
+#line 10410 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -9641,7 +10417,7 @@ int main() {
 gdk_im_open()
 ; return 0; }
 EOF
-if { (eval echo configure:9645: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10421: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -9669,7 +10445,7 @@ fi
     if test "$wxUSE_MGL" = 1; then
         
         echo $ac_n "checking for SciTech MGL library""... $ac_c" 1>&6
-echo "configure:9673: checking for SciTech MGL library" >&5
+echo "configure:10449: checking for SciTech MGL library" >&5
         if test "x$MGL_ROOT" = x ; then
             echo "$ac_t""not found" 1>&6
             { echo "configure: error: Cannot find MGL library. Make sure MGL_ROOT is set." 1>&2; exit 1; }
@@ -9677,24 +10453,26 @@ echo "configure:9673: checking for SciTech MGL library" >&5
             echo "$ac_t""$MGL_ROOT" 1>&6
         fi
 
-        MGL_OS=linux/gcc/glibc
-        MGL_LIB_TYPE=""
+        mgl_os=linux/gcc/glibc
+        mgl_lib_type=""
 
         if test "$wxUSE_DEBUG_FLAG" = yes ; then
-            if test -f $MGL_ROOT/lib/debug/$MGL_OS/libmgl.a ; then
-                MGL_LIB_TYPE=debug
+            if test -f $MGL_ROOT/lib/debug/$mgl_os/libmgl.a -o \
+                    -f $MGL_ROOT/lib/debug/$mgl_os/libmgl.so; then
+                mgl_lib_type=debug
             fi
         fi
-        if test "x$MGL_LIB_TYPE" = x ; then
-            if test -f $MGL_ROOT/lib/release/$MGL_OS/libmgl.a ; then
-                MGL_LIB_TYPE=release
+        if test "x$mgl_lib_type" = x ; then
+            if test -f $MGL_ROOT/lib/release/$mgl_os/libmgl.a -o \
+                    -f $MGL_ROOT/lib/release/$mgl_os/libmgl.so; then
+                mgl_lib_type=release
             else
                 { echo "configure: error: Cannot find MGL libraries, make sure they are compiled." 1>&2; exit 1; }
             fi
         fi
 
         TOOLKIT_INCLUDE="-I$MGL_ROOT/include"
-        GUI_TK_LIBRARY="-L$MGL_ROOT/lib/$MGL_LIB_TYPE/$MGL_OS -lmgl -lmglcpp -lpm"
+        GUI_TK_LIBRARY="-L$MGL_ROOT/lib/$mgl_lib_type/$mgl_os -lmgl -lmglcpp -lpm"
 
         AFMINSTALL=afminstall
         TOOLKIT=MGL
@@ -9702,29 +10480,46 @@ echo "configure:9673: checking for SciTech MGL library" >&5
     fi
 
     if test "$wxUSE_WINE" = 1; then
-        echo $ac_n "checking for WINE includes""... $ac_c" 1>&6
-echo "configure:9707: checking for WINE includes" >&5
-        
-ac_find_includes=
-for ac_dir in $SEARCH_INCLUDE;
-  do
-    if test -f "$ac_dir/windows.h"; then
-      ac_find_includes=$ac_dir
-      break
-    fi
-  done
+        ac_safe=`echo "windows.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for windows.h""... $ac_c" 1>&6
+echo "configure:10486: checking for windows.h" >&5
+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 10491 "configure"
+#include "confdefs.h"
+#include <windows.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:10496: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=yes"
+else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"
+fi
+rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  :
+else
+  echo "$ac_t""no" 1>&6
 
-        if test "$ac_find_includes" != "" ; then
-            echo "$ac_t""found $ac_find_includes" 1>&6
-            TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE -I$ac_find_includes"
-        else
-            echo "$ac_t""no" 1>&6
             { echo "configure: error: please set CFLAGS to contain the location of windows.h" 1>&2; exit 1; }
-        fi
+        
+fi
+
 
-        XPM_LINK=""
+        xpm_link=
         echo $ac_n "checking for Xpm library""... $ac_c" 1>&6
-echo "configure:9728: checking for Xpm library" >&5
+echo "configure:10523: checking for Xpm library" >&5
         
 ac_find_libraries=
 for ac_dir in $SEARCH_LIB;
@@ -9739,7 +10534,7 @@ for ac_dir in $SEARCH_LIB;
 
         if test "$ac_find_libraries" != "" ; then
             GUI_TK_LIBRARY="-L$ac_find_libraries"
-            XPM_LINK="-lXpm"
+            xpm_link=" -lXpm"
             cat >> confdefs.h <<\EOF
 #define wxHAVE_LIB_XPM 1
 EOF
@@ -9750,9 +10545,9 @@ EOF
             echo "configure: warning: library will be compiled without support for images in XPM format" 1>&2
         fi
 
-        MESA_LINK=""
+        mesa_link=
         echo $ac_n "checking for Mesa library""... $ac_c" 1>&6
-echo "configure:9756: checking for Mesa library" >&5
+echo "configure:10551: checking for Mesa library" >&5
         
 ac_find_libraries=
 for ac_dir in $SEARCH_LIB;
@@ -9767,26 +10562,25 @@ for ac_dir in $SEARCH_LIB;
 
         if test "$ac_find_libraries" != "" ; then
             GUI_TK_LIBRARY="$GUI_TK_LIBRARY -L$ac_find_libraries"
-            MESA_LINK="-lMesaGL"
+            mesa_link=" -lMesaGL"
             echo "$ac_t""found at $ac_find_libraries" 1>&6
         else
             { echo "configure: error: no" 1>&2; exit 1; }
         fi
 
-        GUI_TK_LINK="-lwine $MESA_LINK $XPM_LINK -lXxf86dga -lXxf86vm -lSM -lICE -lXext -lXmu -lX11 -lncurses"
-        GUI_TK_LIBRARY="$GUI_TK_LIBRARY $GUI_TK_LINK"
-        WXWINE=1
+        GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lwine$mesa_link$xpm_link -lXxf86dga -lXxf86vm -lSM -lICE -lXext -lXmu -lX11 -lncurses"
         TOOLKIT=MSW
         GUIDIST=MSW_DIST
+        TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WXWINE__"
     fi
 
-                
-    # If we find X, set shell vars x_includes and x_libraries to the
+    if test "$wxUSE_MOTIF" = 1; then
+                        # If we find X, set shell vars x_includes and x_libraries to the
 # paths, otherwise set no_x=yes.
 # Uses ac_ vars as temps to allow command line to override cache and checks.
 # --without-x overrides everything else, but does not touch the cache.
 echo $ac_n "checking for X""... $ac_c" 1>&6
-echo "configure:9790: checking for X" >&5
+echo "configure:10584: checking for X" >&5
 
 # Check whether --with-x or --without-x was given.
 if test "${with_x+set}" = set; then
@@ -9848,12 +10642,12 @@ if test "$ac_x_includes" = NO; then
 
   # First, try using that file with no special directory specified.
 cat > conftest.$ac_ext <<EOF
-#line 9852 "configure"
+#line 10646 "configure"
 #include "confdefs.h"
 #include <$x_direct_test_include>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9857: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10651: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -9922,14 +10716,14 @@ if test "$ac_x_libraries" = NO; then
   ac_save_LIBS="$LIBS"
   LIBS="-l$x_direct_test_library $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 9926 "configure"
+#line 10720 "configure"
 #include "confdefs.h"
 
 int main() {
 ${x_direct_test_function}()
 ; return 0; }
 EOF
-if { (eval echo configure:9933: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10727: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   LIBS="$ac_save_LIBS"
 # We can link X programs with no special library path.
@@ -10035,17 +10829,17 @@ else
     case "`(uname -sr) 2>/dev/null`" in
     "SunOS 5"*)
       echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6
-echo "configure:10039: checking whether -R must be followed by a space" >&5
+echo "configure:10833: checking whether -R must be followed by a space" >&5
       ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries"
       cat > conftest.$ac_ext <<EOF
-#line 10042 "configure"
+#line 10836 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:10049: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10843: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_R_nospace=yes
 else
@@ -10061,14 +10855,14 @@ rm -f conftest*
       else
 	LIBS="$ac_xsave_LIBS -R $x_libraries"
 	cat > conftest.$ac_ext <<EOF
-#line 10065 "configure"
+#line 10859 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:10072: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10866: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_R_space=yes
 else
@@ -10100,7 +10894,7 @@ rm -f conftest*
     # libraries were built with DECnet support.  And karl@cs.umb.edu says
     # the Alpha needs dnet_stub (dnet does not exist).
     echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
-echo "configure:10104: checking for dnet_ntoa in -ldnet" >&5
+echo "configure:10898: checking for dnet_ntoa in -ldnet" >&5
 ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -10108,7 +10902,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ldnet  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 10112 "configure"
+#line 10906 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -10119,7 +10913,7 @@ int main() {
 dnet_ntoa()
 ; return 0; }
 EOF
-if { (eval echo configure:10123: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10917: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -10141,7 +10935,7 @@ fi
 
     if test $ac_cv_lib_dnet_dnet_ntoa = no; then
       echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6
-echo "configure:10145: checking for dnet_ntoa in -ldnet_stub" >&5
+echo "configure:10939: checking for dnet_ntoa in -ldnet_stub" >&5
 ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -10149,7 +10943,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ldnet_stub  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 10153 "configure"
+#line 10947 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -10160,7 +10954,7 @@ int main() {
 dnet_ntoa()
 ; return 0; }
 EOF
-if { (eval echo configure:10164: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10958: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -10189,12 +10983,12 @@ fi
     # The nsl library prevents programs from opening the X display
     # on Irix 5.2, according to dickey@clark.net.
     echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
-echo "configure:10193: checking for gethostbyname" >&5
+echo "configure:10987: checking for gethostbyname" >&5
 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 10198 "configure"
+#line 10992 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname(); below.  */
@@ -10217,7 +11011,7 @@ gethostbyname();
 
 ; return 0; }
 EOF
-if { (eval echo configure:10221: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11015: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_gethostbyname=yes"
 else
@@ -10238,7 +11032,7 @@ fi
 
     if test $ac_cv_func_gethostbyname = no; then
       echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:10242: checking for gethostbyname in -lnsl" >&5
+echo "configure:11036: checking for gethostbyname in -lnsl" >&5
 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -10246,7 +11040,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 10250 "configure"
+#line 11044 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -10257,7 +11051,7 @@ int main() {
 gethostbyname()
 ; return 0; }
 EOF
-if { (eval echo configure:10261: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11055: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -10287,12 +11081,12 @@ fi
     # -lsocket must be given before -lnsl if both are needed.
     # We assume that if connect needs -lnsl, so does gethostbyname.
     echo $ac_n "checking for connect""... $ac_c" 1>&6
-echo "configure:10291: checking for connect" >&5
+echo "configure:11085: checking for connect" >&5
 if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 10296 "configure"
+#line 11090 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char connect(); below.  */
@@ -10315,7 +11109,7 @@ connect();
 
 ; return 0; }
 EOF
-if { (eval echo configure:10319: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11113: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_connect=yes"
 else
@@ -10336,7 +11130,7 @@ fi
 
     if test $ac_cv_func_connect = no; then
       echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
-echo "configure:10340: checking for connect in -lsocket" >&5
+echo "configure:11134: checking for connect in -lsocket" >&5
 ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -10344,7 +11138,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 10348 "configure"
+#line 11142 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -10355,7 +11149,7 @@ int main() {
 connect()
 ; return 0; }
 EOF
-if { (eval echo configure:10359: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11153: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -10379,12 +11173,12 @@ fi
 
     # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX.
     echo $ac_n "checking for remove""... $ac_c" 1>&6
-echo "configure:10383: checking for remove" >&5
+echo "configure:11177: checking for remove" >&5
 if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 10388 "configure"
+#line 11182 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char remove(); below.  */
@@ -10407,7 +11201,7 @@ remove();
 
 ; return 0; }
 EOF
-if { (eval echo configure:10411: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11205: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_remove=yes"
 else
@@ -10428,7 +11222,7 @@ fi
 
     if test $ac_cv_func_remove = no; then
       echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
-echo "configure:10432: checking for remove in -lposix" >&5
+echo "configure:11226: checking for remove in -lposix" >&5
 ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -10436,7 +11230,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lposix  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 10440 "configure"
+#line 11234 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -10447,7 +11241,7 @@ int main() {
 remove()
 ; return 0; }
 EOF
-if { (eval echo configure:10451: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11245: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -10471,12 +11265,12 @@ fi
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
     echo $ac_n "checking for shmat""... $ac_c" 1>&6
-echo "configure:10475: checking for shmat" >&5
+echo "configure:11269: checking for shmat" >&5
 if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 10480 "configure"
+#line 11274 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char shmat(); below.  */
@@ -10499,7 +11293,7 @@ shmat();
 
 ; return 0; }
 EOF
-if { (eval echo configure:10503: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11297: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_shmat=yes"
 else
@@ -10520,7 +11314,7 @@ fi
 
     if test $ac_cv_func_shmat = no; then
       echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
-echo "configure:10524: checking for shmat in -lipc" >&5
+echo "configure:11318: checking for shmat in -lipc" >&5
 ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -10528,7 +11322,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lipc  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 10532 "configure"
+#line 11326 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -10539,7 +11333,7 @@ int main() {
 shmat()
 ; return 0; }
 EOF
-if { (eval echo configure:10543: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11337: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -10572,7 +11366,7 @@ fi
   # libraries we check for below, so use a different variable.
   #  --interran@uluru.Stanford.EDU, kb@cs.umb.edu.
   echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6
-echo "configure:10576: checking for IceConnectionNumber in -lICE" >&5
+echo "configure:11370: checking for IceConnectionNumber in -lICE" >&5
 ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -10580,7 +11374,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 10584 "configure"
+#line 11378 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -10591,7 +11385,7 @@ int main() {
 IceConnectionNumber()
 ; return 0; }
 EOF
-if { (eval echo configure:10595: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11389: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -10615,24 +11409,18 @@ fi
 
 fi
 
-    CPPFLAGS="$CPPFLAGS $X_CFLAGS"
-    LDFLAGS="$LDFLAGS $X_LIBS"
 
-    if test "$wxUSE_MOTIF" = 1; then
         if test "$no_x" = "yes"; then
           { echo "configure: error: X11 not found" 1>&2; exit 1; }
         fi
 
         GUI_TK_LIBRARY="$X_LIBS"
         TOOLKIT_INCLUDE="$X_CFLAGS"
-
         AFMINSTALL=afminstall
-
-                                                                                                                                                                                                
         COMPILED_X_PROGRAM=0
 
         echo $ac_n "checking for Motif/Lesstif headers""... $ac_c" 1>&6
-echo "configure:10636: checking for Motif/Lesstif headers" >&5
+echo "configure:11424: checking for Motif/Lesstif headers" >&5
         
 ac_find_includes=
 for ac_dir in $SEARCH_INCLUDE;
@@ -10647,7 +11435,7 @@ for ac_dir in $SEARCH_INCLUDE;
             echo "$ac_t""found $ac_find_includes" 1>&6
         else
             cat > conftest.$ac_ext <<EOF
-#line 10651 "configure"
+#line 11439 "configure"
 #include "confdefs.h"
 
                     #include <Xm/Xm.h>
@@ -10655,12 +11443,11 @@ for ac_dir in $SEARCH_INCLUDE;
 int main() {
 
                     int version;
-
                     version = xmUseVersion;
                 
 ; return 0; }
 EOF
-if { (eval echo configure:10664: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11451: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
                     echo "$ac_t""found in default search path" 1>&6
@@ -10681,7 +11468,7 @@ rm -f conftest*
 
         if test "$COMPILED_X_PROGRAM" = 0; then
             echo $ac_n "checking for Motif/Lesstif library""... $ac_c" 1>&6
-echo "configure:10685: checking for Motif/Lesstif library" >&5
+echo "configure:11472: checking for Motif/Lesstif library" >&5
             
 ac_find_libraries=
 for ac_dir in $SEARCH_LIB;
@@ -10702,7 +11489,7 @@ for ac_dir in $SEARCH_LIB;
   if test $result = 0; then
     ac_path_to_include=""
   else
-    ac_path_to_include="-I$ac_find_includes"
+    ac_path_to_include=" -I$ac_find_includes"
   fi
 
                 
@@ -10711,16 +11498,16 @@ for ac_dir in $SEARCH_LIB;
   if test $result = 0; then
     ac_path_to_link=""
   else
-    ac_path_to_link="-L$ac_find_libraries"
+    ac_path_to_link=" -L$ac_find_libraries"
   fi
 
 
-                GUI_TK_LIBRARY="$GUI_TK_LIBRARY $ac_path_to_link"
-                TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE $ac_path_to_include"
+                GUI_TK_LIBRARY="$GUI_TK_LIBRARY$ac_path_to_link"
+                TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE$ac_path_to_include"
                 echo "$ac_t""found at $ac_find_libraries" 1>&6
             else
                                                                 cat > conftest.$ac_ext <<EOF
-#line 10724 "configure"
+#line 11511 "configure"
 #include "confdefs.h"
 
                         #include <Xm/Xm.h>
@@ -10728,12 +11515,11 @@ for ac_dir in $SEARCH_LIB;
 int main() {
 
                         int version;
-
                         version = xmUseVersion;
                     
 ; return 0; }
 EOF
-if { (eval echo configure:10737: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11523: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
                         echo "$ac_t""found in default search path" 1>&6
@@ -10753,10 +11539,9 @@ rm -f conftest*
             fi
         fi
 
-                                                                                                                                                                                                                                                        
-        XPM_LINK=""
+        xpm_link=
         echo $ac_n "checking for Xpm library""... $ac_c" 1>&6
-echo "configure:10760: checking for Xpm library" >&5
+echo "configure:11545: checking for Xpm library" >&5
         
 ac_find_libraries=
 for ac_dir in $SEARCH_LIB;
@@ -10776,11 +11561,11 @@ for ac_dir in $SEARCH_LIB;
   if test $result = 0; then
     ac_path_to_link=""
   else
-    ac_path_to_link="-L$ac_find_libraries"
+    ac_path_to_link=" -L$ac_find_libraries"
   fi
 
-            GUI_TK_LIBRARY="$GUI_TK_LIBRARY $ac_path_to_link"
-            XPM_LINK="-lXpm "
+            GUI_TK_LIBRARY="$GUI_TK_LIBRARY$ac_path_to_link"
+            xpm_link=" -lXpm"
             cat >> confdefs.h <<\EOF
 #define wxHAVE_LIB_XPM 1
 EOF
@@ -10788,7 +11573,7 @@ EOF
             echo "$ac_t""found at $ac_find_libraries" 1>&6
         else
             cat > conftest.$ac_ext <<EOF
-#line 10792 "configure"
+#line 11577 "configure"
 #include "confdefs.h"
 
                     #include <X11/xpm.h>
@@ -10796,16 +11581,15 @@ EOF
 int main() {
 
                     int version;
-
                     version = XpmLibraryVersion();
                 
 ; return 0; }
 EOF
-if { (eval echo configure:10805: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11589: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
-                XPM_LINK="-lXpm "
-                cat >> confdefs.h <<\EOF
+                    xpm_link=" -lXpm"
+                    cat >> confdefs.h <<\EOF
 #define wxHAVE_LIB_XPM 1
 EOF
 
@@ -10825,13 +11609,22 @@ fi
 rm -f conftest*
         fi
 
-        GUI_TK_LINK="-lXm $XPM_LINK -lXmu -lXext -lXt -lX11"
-        GUI_TK_LIBRARY="$GUI_TK_LIBRARY $GUI_TK_LINK"
+        GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXm$xpm_link -lXmu -lXext -lXt -lX11"
+        TOOLKIT_VPATH="\${top_srcdir}/src/motif${PATH_IFS}\${top_srcdir}/src/motif/xmcombo"
         TOOLKIT=MOTIF
         GUIDIST=MOTIF_DIST
     fi
 
     if test "$wxUSE_MAC" = 1; then
+        if test "$wxUSE_PRECOMP" = "yes"; then
+            CPPFLAGS="$CPPFLAGS -cpp-precomp"
+        fi
+        CPPFLAGS="$CPPFLAGS -I/Developer/Headers/FlatCarbon -I\${top_srcdir}/src/mac/morefile"
+        CFLAGS="$CFLAGS -fpascal-strings"
+        CXXFLAGS="$CXXFLAGS -fpascal-strings"
+        TOOLCHAIN_DEFS="$TOOLCHAIN_DEFS -DTARGET_CARBON"
+
+        TOOLKIT_VPATH="\${top_srcdir}/src/mac${PATH_IFS}\${top_srcdir}/src/mac/morefile"
         TOOLKIT=MAC
                 GUIDIST=MACX_DIST
     fi
@@ -10841,42 +11634,20 @@ rm -f conftest*
         GUIDIST=GTK_DIST
     fi
 
-        if test "$TOOLKIT" != "PM" ; then
-        TOOLKIT_DIR=`echo ${TOOLKIT} | tr "[A-Z]" "[a-z]"`
-    else
+        if test "$TOOLKIT" = "PM" ; then
         TOOLKIT_DIR="os2"
-    fi
-
-        TOOLKIT_NAME="${TOOLKIT_DIR}"
-
-        TOOLKIT_VPATH="\${top_srcdir}/src/${TOOLKIT_DIR}"
-
-        if test "$TOOLKIT_NAME" = "motif"; then
-        TOOLKIT_VPATH="${TOOLKIT_VPATH}${PATH_IFS}\${top_srcdir}/src/motif/xmcombo"
-    fi
-
-        if test "$wxUSE_UNIVERSAL" = "yes"; then
-        TOOLKIT_NAME="${TOOLKIT_NAME}univ"
-        UNIV_VPATH="\${top_srcdir}/src/univ${PATH_IFS}\${top_srcdir}/src/univ/themes"
-        TOOLKIT_VPATH="${UNIV_VPATH}${PATH_IFS}${TOOLKIT_VPATH}"
-        SETUPH_DIR="univ"
     else
-        SETUPH_DIR="${TOOLKIT_DIR}"
+        TOOLKIT_DIR=`echo ${TOOLKIT} | tr "[A-Z]" "[a-z]"`
     fi
 
-        if test "$wxUSE_DEBUG_FLAG" = "yes"; then
-        TOOLKIT_NAME="${TOOLKIT_NAME}d"
-    fi
+        PORT_FILES="\${top_srcdir}/src/\$(TOOLKITDIR)/files.lst"
 
-        TOOLKIT_DEF="-D__WX${TOOLKIT}__"
     if test "$wxUSE_UNIVERSAL" = "yes"; then
-        TOOLKIT_DEF="${TOOLKIT_DEF} -D__WXUNIVERSAL__"
-    fi
-
-        WX_LIBRARY="wx_${TOOLKIT_NAME}"
-
-        if test "$wxUSE_UNIVERSAL" = "yes"; then
         ALL_OBJECTS="\$(GUI_LOWLEVEL_OBJS) \${UNIVOBJS}"
+        PORT_FILES="${PORT_FILES} \${top_srcdir}/src/univ/files.lst"
+        TOOLKIT_VPATH="\${top_srcdir}/src/univ${PATH_IFS}\${top_srcdir}/src/univ/themes${PATH_IFS}\${top_srcdir}/src/${TOOLKIT_DIR}"
+        TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WXUNIVERSAL__"
+        WIDGET_SET=univ
     else
         ALL_OBJECTS="\$(GUIOBJS)"
     fi
@@ -10891,536 +11662,515 @@ rm -f conftest*
         ALL_OBJECTS="${ALL_OBJECTS} \$(HTMLOBJS)"
     fi
 
-        if test "$TOOLKIT" != "MSW"; then
-        if test "$wxUSE_ODBC" = "yes" ; then
-            ALL_OBJECTS="${ALL_OBJECTS} \$(IODBCOBJS)"
-        fi
-    fi
-
-            if test "x$REGEX_INCLUDE" != "x" ; then
-        ALL_OBJECTS="${ALL_OBJECTS} \$(REGEXOBJS)"
+        if test "$TOOLKIT" != "MSW" -a "$wxUSE_ODBC" = "yes" ; then
+        ALL_OBJECTS="${ALL_OBJECTS} \$(IODBCOBJS)"
     fi
-
-    if test "$wxUSE_LIBJPEG" = "yes" ; then
+    if test "$wxUSE_LIBJPEG" = "builtin" ; then
         ALL_OBJECTS="${ALL_OBJECTS} \$(JPEGOBJS)"
     fi
-    if test "$wxUSE_LIBTIFF" = "yes" ; then
+    if test "$wxUSE_LIBTIFF" = "builtin" ; then
         ALL_OBJECTS="${ALL_OBJECTS} \$(TIFFOBJS)"
     fi
-    if test "$wxUSE_LIBPNG" = "yes" ; then
+    if test "$wxUSE_LIBPNG" = "builtin" ; then
         ALL_OBJECTS="${ALL_OBJECTS} \$(PNGOBJS)"
     fi
-    if test "$wxUSE_ZLIB" = "yes" ; then
-        ALL_OBJECTS="${ALL_OBJECTS} \$(ZLIBOBJS)"
-    fi
-    if test "$wxUSE_FREETYPE" = "yes" ; then
+    if test "$wxUSE_FREETYPE" = "builtin" ; then
         ALL_OBJECTS="${ALL_OBJECTS} \$(FREETYPEOBJS)"
     fi
 
-        if test "$wxUSE_UNIVERSAL" = "yes"; then
-        ALL_DEPFILES="\$(GUI_LOWLEVEL_DEPS) \$(UNIVDEPS)"
+        GUIDIST="${GUIDIST} SAMPLES_DIST DEMOS_DIST UTILS_DIST MISC_DIST"
+    DISTDIR="wx\$(TOOLKIT)"
+else
+    USE_GUI=0
+
+            TOOLKIT_DIR="base"
+
+        if test "$USE_WIN32" = 1 ; then
+        ALL_OBJECTS="\${BASE_OBJS} \${BASE_MSW_OBJS}"
+        TOOLKIT_VPATH="\${top_srcdir}/src/msw"
+
+                        TOOLKIT="MSW"
     else
-        ALL_DEPFILES="\$(GUIDEPS)"
+        ALL_OBJECTS="\${BASE_OBJS} \${BASE_UNIX_OBJS}"
+        TOOLKIT_VPATH="\${top_srcdir}/src/unix"
     fi
 
-    ALL_DEPFILES="${ALL_DEPFILES} \$(COMMONDEPS) \$(GENERICDEPS)"
+    PORT_FILES="\${top_srcdir}/src/files.lst"
 
-    if test "$TOOLKIT" != "MSW"; then
-        ALL_DEPFILES="${ALL_DEPFILES} \$(UNIXDEPS)"
-    fi
+        GUIDIST="BASE_DIST"
+    DISTDIR="wxBase"
+fi
 
-    if test "$wxUSE_HTML" = "yes"; then
-        ALL_DEPFILES="${ALL_DEPFILES} \$(HTMLDEPS)"
+if test "$wxUSE_REGEX" = "builtin" ; then
+    ALL_OBJECTS="${ALL_OBJECTS} \$(REGEXOBJS)"
+fi
+if test "$wxUSE_ZLIB" = "builtin" ; then
+    ALL_OBJECTS="${ALL_OBJECTS} \$(ZLIBOBJS)"
+fi
+
+if test "$wxUSE_OPENGL" = "yes"; then
+    if test "$wxUSE_MAC" = 1; then
+        OPENGL_LIBS="-framework OpenGL -framework AGL"
+    else
+
+        ac_safe=`echo "GL/gl.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for GL/gl.h""... $ac_c" 1>&6
+echo "configure:11719: checking for GL/gl.h" >&5
+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 11724 "configure"
+#include "confdefs.h"
+#include <GL/gl.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:11729: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=yes"
+else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"
+fi
+rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  
+                echo $ac_n "checking for -lGL""... $ac_c" 1>&6
+echo "configure:11747: checking for -lGL" >&5
+                
+ac_find_libraries=
+for ac_dir in $SEARCH_LIB;
+  do
+    for ac_extension in a so sl dylib; do
+      if test -f "$ac_dir/libGL.$ac_extension"; then
+        ac_find_libraries=$ac_dir
+        break 2
+      fi
+    done
+  done
+
+                if test "$ac_find_libraries" != "" ; then
+                    
+  echo "$LDFLAGS" | grep "\-L$ac_find_libraries" > /dev/null
+  result=$?
+  if test $result = 0; then
+    ac_path_to_link=""
+  else
+    ac_path_to_link=" -L$ac_find_libraries"
+  fi
+
+                    LDFLAGS_GL="$LDFLAGS$ac_path_to_link"
+                    OPENGL_LIBS="-lGL -lGLU"
+                    echo "$ac_t""yes" 1>&6
+                else
+                    echo "$ac_t""no" 1>&6
+                    echo $ac_n "checking for -lMesaGL""... $ac_c" 1>&6
+echo "configure:11776: checking for -lMesaGL" >&5
+                    
+ac_find_libraries=
+for ac_dir in $SEARCH_LIB;
+  do
+    for ac_extension in a so sl dylib; do
+      if test -f "$ac_dir/libMesaGL.$ac_extension"; then
+        ac_find_libraries=$ac_dir
+        break 2
+      fi
+    done
+  done
+
+                    if test "$ac_find_libraries" != "" ; then
+                        
+  echo "$LDFLAGS" | grep "\-L$ac_find_libraries" > /dev/null
+  result=$?
+  if test $result = 0; then
+    ac_path_to_link=""
+  else
+    ac_path_to_link=" -L$ac_find_libraries"
+  fi
+
+                        LDFLAGS_GL="$LDFLAGS$ac_path_to_link"
+                        OPENGL_LIBS="-lMesaGL -lMesaGLU"
+                        echo "$ac_t""yes" 1>&6
+                    else
+                        echo "$ac_t""no" 1>&6
+                    fi
+                fi
+            
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+
+        
+#    AC_CHECK_HEADER(GL/gl.h,
+#        [
+#            AC_CHECK_LIB(GL, glFlush,
+#                [
+#                    OPENGL_LIBS="-lGL -lGLU"
+#                ],
+#                [
+#                    AC_CHECK_LIB(MesaGL, glFlush,
+#                        [
+#                            OPENGL_LIBS="-lMesaGL -lMesaGLU"
+#                        ],
+#                        [],
+#                        [-lm])
+#                ],
+#                [-lm])
+#        ])
+
+        if test "x$OPENGL_LIBS" = "x"; then
+                                                { echo "configure: error: OpenGL libraries not available" 1>&2; exit 1; }
+        fi
     fi
 
-        PORT_FILES="\${top_srcdir}/src/\$(TOOLKITDIR)/files.lst"
-    if test "$wxUSE_UNIVERSAL" = "yes"; then
-        PORT_FILES="${PORT_FILES} \${top_srcdir}/src/univ/files.lst"
+    if test "$wxUSE_OPENGL" = "yes"; then
+        cat >> confdefs.h <<\EOF
+#define wxUSE_OPENGL 1
+EOF
+
+        cat >> confdefs.h <<\EOF
+#define wxUSE_GLCANVAS 1
+EOF
+
+        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS opengl"
     fi
-    RPM_FILES="src/\$(TOOLKITDIR)/rpmfiles.lst"
-    RPM_SPEC="wx\$(TOOLKIT).spec"
+fi
 
-        GUIDIST="${GUIDIST} SAMPLES_DIST DEMOS_DIST UTILS_DIST MISC_DIST"
-    DISTDIR="wx\$(TOOLKIT)"
-else
-    USE_GUI=0
+if test -z "$TOOLKIT_VPATH" ; then
+    TOOLKIT_VPATH="\${top_srcdir}/src/${TOOLKIT_DIR}"
+fi
+
+if test -n "$TOOLKIT" ; then
+    TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WX${TOOLKIT}__"
+fi
+
+lib_unicode_suffix=
+if test "$wxUSE_UNICODE" = "yes"; then
+    lib_unicode_suffix=u
+fi
+
+lib_debug_suffix=
+if test "$wxUSE_DEBUG_FLAG" = "yes"; then
+    lib_debug_suffix=d
+fi
+
+TOOLCHAIN_NAME="${TOOLKIT_DIR}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}-${WX_RELEASE}"
+TOOLCHAIN_NAME_GL="${TOOLKIT_DIR}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}_gl-${WX_RELEASE}"
+
+if test "$cross_compiling" = "yes"; then
+    TOOLCHAIN_NAME="${TOOLCHAIN_NAME}-${host_alias}"
+    TOOLCHAIN_NAME_GL="${TOOLCHAIN_NAME_GL}-${host_alias}"
+fi
 
-        TOOLKIT_DIR="base"
+WX_LIBRARY="wx_${TOOLCHAIN_NAME}"
+WX_LIBRARY_GL="wx_${TOOLCHAIN_NAME_GL}"
 
-        TOOLKIT_VPATH="."
+WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}.${SO_SUFFIX}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}"
+WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}"
 
-        if test "$wxUSE_DEBUG_FLAG" = "yes"; then
-        TOOLKIT_NAME="${TOOLKIT_DIR}d"
-    else
-        TOOLKIT_NAME="${TOOLKIT_DIR}"
-    fi
+WX_LIBRARY_LINK1="lib${WX_LIBRARY}.${SO_SUFFIX}.${WX_CURRENT}"
+WX_LIBRARY_LINK2="lib${WX_LIBRARY}.${SO_SUFFIX}"
+WX_LIBRARY_LINK1_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}.${WX_CURRENT}"
+WX_LIBRARY_LINK2_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}"
 
-    TOOLKIT_DEF="-D__WXBASE__"
+WX_RESOURCES_MACOSX="lib${WX_LIBRARY}.rsrc"
+WX_RESOURCES_MACOSX_COMPILED="lib${WX_LIBRARY}.r"
 
-        ALL_OBJECTS="\$(BASE_OBJS) \$(BASE_UNIX_OBJS)"
-    ALL_DEPFILES="\$(BASE_DEPS) \$(BASE_UNIX_DEPS)"
+case "${host}" in
+    *-*-cygwin* | *-*-mingw32* )
 
-            if test "x$REGEX_INCLUDE" != "x" ; then
-        ALL_OBJECTS="${ALL_OBJECTS} \$(REGEXOBJS)"
-    fi
+                        
+        
+        if test "$cross_compiling" != "yes"; then
+            WX_LIBRARY="wxmsw${WX_MSW_VERSION}${lib_unicode_suffix}${lib_debug_suffix}"
+            WX_LIBRARY_GL="wxmsw_gl${WX_MSW_VERSION}${lib_unicode_suffix}${lib_debug_suffix}"
+            WX_LIBRARY_NAME_SHARED="${WX_LIBRARY}.${SO_SUFFIX}"
+            WX_LIBRARY_NAME_SHARED_GL="${WX_LIBRARY_GL}.${SO_SUFFIX}"
+        else
+            WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}.${SO_SUFFIX}"
+            WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}"
+        fi
 
-    if test "$wxUSE_ZLIB" = "yes" ; then
-        ALL_OBJECTS="${ALL_OBJECTS} \$(ZLIBOBJS)"
-    fi
+esac
 
-        WX_LIBRARY="wx_${TOOLKIT_NAME}"
+WX_LIBRARY_NAME_STATIC="lib${WX_LIBRARY}.a"
+WX_LIBRARY_NAME_STATIC_GL="lib${WX_LIBRARY_GL}.a"
 
-    PORT_FILES="\${top_srcdir}/src/files.lst"
-    RPM_FILES="src/rpmfiles.lst"
-    RPM_SPEC="wxBase.spec"
+WXCONFIG_LIBS="-l${WX_LIBRARY}"
+WXCONFIG_LIBS_STATIC="lib${WX_LIBRARY}.a"
 
-        GUIDIST="BASE_DIST"
-    DISTDIR="wxBase"
+if test "$wxUSE_OPENGL" = "yes"; then
+    WXCONFIG_LIBS_GL="-l${WX_LIBRARY_GL} ${OPENGL_LIBS}"
+    WXCONFIG_LIBS_STATIC_GL="lib${WX_LIBRARY_GL}.a ${OPENGL_LIBS}"
 fi
 
-WX_LIBRARY_NAME="lib${WX_LIBRARY}.la"
-WX_LIBRARY_NAME_GL="lib${WX_LIBRARY}_gl.la"
 
-WX_LIBRARY_NAME_STATIC="lib${WX_LIBRARY}.a"
-WX_LIBRARY_NAME_STATIC_GL="lib${WX_LIBRARY}_gl.a"
 
-case "${host}" in
-  *-*-mingw32* )
-    WX_LIBRARY_NAME_SHARED="wx${WX_MAJOR_VERSION_NUMBER}${WX_MINOR_VERSION_NUMBER}_${WX_RELEASE_NUMBER}.dll"
-  ;;
-  * )
-    WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}-${WX_RELEASE}.so.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}"
-    WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.so.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}"
-  ;;
-esac
+if test "$wxUSE_SHARED" = "yes"; then
 
-WX_LIBRARY_LINK1="lib${WX_LIBRARY}-${WX_RELEASE}.so.${WX_CURRENT}"
-WX_LIBRARY_LINK2="lib${WX_LIBRARY}-${WX_RELEASE}.so"
-WX_LIBRARY_LINK3="lib${WX_LIBRARY}.so"
-WX_LIBRARY_LINK1_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.so.${WX_CURRENT}"
-WX_LIBRARY_LINK2_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.so"
-WX_LIBRARY_LINK3_GL="lib${WX_LIBRARY}_gl.so"
+        if test "$wxUSE_OPENGL" = "yes"; then
+        WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS CREATE_INSTALLED_LINKS_GL"
+        WX_ALL="\$(build_libdir)/${WX_LIBRARY_LINK1} \$(build_libdir)/${WX_LIBRARY_LINK1_GL}"
+    else
+        WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
+        WX_ALL="\$(build_libdir)/${WX_LIBRARY_LINK1}"
+    fi
 
-SHARED_LD=
-PIC_FLAG=
-WX_ALL=
-WX_ALL_INSTALLED=
-BURNT_LIBRARY_NAME=
-WX_TARGET_LIBRARY_SONAME=
+        if test "$GCC" = "yes"; then
+                PIC_FLAG="-fPIC"
+    fi
 
+        SHARED_LD="${CXX} -shared -o"
 
-if test "$wxUSE_SHARED" = "yes"; then
     case "${host}" in
       *-hp-hpux* )
-        if test "$GCC" = yes ; then
-            SHARED_LD="${CXX} -shared -fPIC -o"
-            PIC_FLAG="-fPIC"
-        else
-                        LDFLAGS="-L/usr/lib"
+                if test "$GCC" != "yes"; then
+                        LDFLAGS="$LDFLAGS -L/usr/lib"
 
             SHARED_LD="${CXX} -b -o"
             PIC_FLAG="+Z"
         fi
-        WX_LIBRARY_NAME_SHARED="libwx_${TOOLKIT_NAME}.sl"
-        WX_LIBRARY_NAME_SHARED_GL="libwx_${TOOLKIT_NAME}_gl.sl"
-        if test "$wxUSE_OPENGL" = "yes"; then
+
+                if test "$wxUSE_OPENGL" = "yes"; then
             WX_ALL_INSTALLED="preinstall_gl"
-            WX_ALL="${WX_LIBRARY_NAME_SHARED} ${WX_LIBRARY_NAME_SHARED_GL}"
+            WX_ALL="\$(build_libdir)/${WX_LIBRARY_NAME_SHARED} \$(build_libdir)/${WX_LIBRARY_NAME_SHARED_GL}"
         else
-            WX_ALL="${WX_LIBRARY_NAME_SHARED}"
+            WX_ALL="\$(build_libdir)/${WX_LIBRARY_NAME_SHARED}"
         fi
       ;;
 
-            *-*-linux* )
-        SHARED_LD="${CXX} -shared -o"
-        PIC_FLAG="-fPIC"
-        if test "$wxUSE_BURNT_NAME" = "yes" ; then
-            BURNT_LIBRARY_NAME="-Wl,-soname,${WX_LIBRARY_LINK1}"
-            BURNT_LIBRARY_NAME_GL="-Wl,-soname,${WX_LIBRARY_LINK1_GL}"
-                        WX_TARGET_LIBRARY_SONAME="-Wl,-soname,\$(TARGETLIB_LINK1)"
-        fi
-        if test "$wxUSE_OPENGL" = "yes"; then
-            WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS CREATE_INSTALLED_LINKS_GL"
-            WX_ALL="CREATE_LINKS CREATE_LINKS_GL"
-        else
-            WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
-            WX_ALL="CREATE_LINKS"
-        fi
-      ;;
-      *-*-irix5* | *-*-irix6* )
-        if test "$GCC" = yes ; then
-           SHARED_LD="${CXX} -shared -o"
-           PIC_FLAG="-fPIC"
-        else
-           SHARED_LD="${CXX} -shared -o"
+      *-*-linux* )
+        if test "$GCC" != "yes"; then
+            echo $ac_n "checking for Intel compiler""... $ac_c" 1>&6
+echo "configure:11954: checking for Intel compiler" >&5
+if eval "test \"`echo '$''{'wx_cv_prog_icc'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  
+                cat > conftest.$ac_ext <<EOF
+#line 11960 "configure"
+#include "confdefs.h"
+
+int main() {
+
+                        #ifndef __INTEL_COMPILER
+                        #error Not icc
+                        #endif
+                    
+; return 0; }
+EOF
+if { (eval echo configure:11971: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  wx_cv_prog_icc=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  wx_cv_prog_icc=no
+                
+fi
+rm -f conftest*
+            
+fi
+
+echo "$ac_t""$wx_cv_prog_icc" 1>&6
+            if test "$wx_cv_prog_icc" = "yes"; then
+                PIC_FLAG="-KPIC"
+            fi
         fi
-        if test "$wxUSE_OPENGL" = "yes"; then
-            WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS CREATE_INSTALLED_LINKS_GL"
-            WX_ALL="CREATE_LINKS CREATE_LINKS_GL"
-        else
-            WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
-            WX_ALL="CREATE_LINKS"
+
+        if test "$wxUSE_SONAME" = "yes" ; then
+            SONAME_FLAGS="-Wl,-soname,${WX_LIBRARY_LINK1}"
+            SONAME_FLAGS_GL="-Wl,-soname,${WX_LIBRARY_LINK1_GL}"
+                        WX_TARGET_LIBRARY_SONAME="-Wl,-soname,\$(TARGETLIB_LINK1)"
         fi
       ;;
+
       *-*-solaris2* )
         if test "$GCC" = yes ; then
-            SHARED_LD="${CXX} -shared -o"
-            PIC_FLAG="-fPIC"
-
                                     CPPFLAGS="$CPPFLAGS -isystem /usr/openwin/include"
         else
             SHARED_LD="${CXX} -G -o"
             PIC_FLAG="-KPIC"
-        fi
-        if test "$wxUSE_OPENGL" = "yes"; then
-            WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS CREATE_INSTALLED_LINKS_GL"
-            WX_ALL="CREATE_LINKS CREATE_LINKS_GL"
-        else
-            WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
-            WX_ALL="CREATE_LINKS"
-        fi
-      ;;
-      *-*-sunos4* )
-        SHARED_LD="${CXX} -shared -o"
-        PIC_FLAG="-fPIC"
-        WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
-        WX_ALL="CREATE_LINKS"
-      ;;
-      *-*-freebsd* | *-*-openbsd* | *-*-netbsd* )
-        SHARED_LD="${CXX} -shared -o"
-        PIC_FLAG="-fPIC"
-        if test "$wxUSE_OPENGL" = "yes"; then
-            WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS CREATE_INSTALLED_LINKS_GL"
-            WX_ALL="CREATE_LINKS CREATE_LINKS_GL"
-        else
-            WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
-            WX_ALL="CREATE_LINKS"
+            SONAME_FLAGS="-h ${WX_LIBRARY_NAME_SHARED}"
+            SONAME_FLAGS_GL="-h ${WX_LIBRARY_NAME_SHARED}"
         fi
       ;;
+
       *-*-darwin* )
-	TOOLKIT_DEF="${TOOLKIT_DEF} -D__UNIX__ -D__DARWIN__ -D__POWERPC__"
-	CFLAGS="${CFLAGS} -fno-common"
-	CPPFLAGS="${CPPFLAGS} -fno-common"
-        SHARED_LD="${CXX} -dynamiclib -o"
+        CFLAGS="$CFLAGS -fno-common -DDYLIB_INIT"
+        CXXFLAGS="$CXXFLAGS -fno-common -DDYLIB_INIT"
+        SHARED_LD="$CXX -dynamiclib -init _wxWindowsDylibInit -o"
         PIC_FLAG="-dynamic -fPIC"
-        if test "$wxUSE_OPENGL" = "yes"; then
-            WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS CREATE_INSTALLED_LINKS_GL"
-            WX_ALL="CREATE_LINKS CREATE_LINKS_GL"
-        else
-            WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
-            WX_ALL="CREATE_LINKS"
-        fi
-        	if test "$wxUSE_MAC" = 1 ; then
-	        WX_ALL="${WX_ALL} ./lib/lib${WX_LIBRARY}-${WX_RELEASE}.r"
-	fi
-                WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}-${WX_RELEASE}.dylib.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}"
-        WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.dylib.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}"
-                WX_LIBRARY_LINK1="lib${WX_LIBRARY}-${WX_RELEASE}.dylib.${WX_CURRENT}"
-        WX_LIBRARY_LINK2="lib${WX_LIBRARY}-${WX_RELEASE}.dylib"
-        WX_LIBRARY_LINK3="lib${WX_LIBRARY}.dylib"
-        WX_LIBRARY_LINK1_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.dylib.${WX_CURRENT}"
-        WX_LIBRARY_LINK2_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.dylib"
-        WX_LIBRARY_LINK3_GL="lib${WX_LIBRARY}_gl.dylib"
-      ;;
-      *-*-osf* )
-        SHARED_LD="${CXX} -shared -o"
-        PIC_FLAG="-fPIC"
-        WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
-        WX_ALL="CREATE_LINKS"
-      ;;
-      *-*-dgux5* )
-        SHARED_LD="${CXX} -shared -o"
-        PIC_FLAG="-fPIC"
-        WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
-        WX_ALL="CREATE_LINKS"
-      ;;
-      *-*-sysv5* )
-        SHARED_LD="${CXX} -shared -o"
-        PIC_FLAG="-fPIC"
-        WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
-        WX_ALL="CREATE_LINKS"
       ;;
+
       *-*-aix* )
         SHARED_LD="/usr/lpp/xlC/bin/makeC++SharedLib -p 0 -o"
-        WX_ALL=${WX_LIBRARY_NAME_SHARED}
-      ;;
-      *-*-cygwin* )
-                WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}"
-        WX_TARGET_LIBRARY_GL="${WX_LIBRARY_NAME_STATIC_GL}"
-        if test "$wxUSE_OPENGL" = "yes"; then
-            WX_ALL_INSTALLED="preinstall_gl"
-            WX_ALL="${WX_LIBRARY_NAME_STATIC} ${WX_LIBRARY_NAME_STATIC_GL}"
-        else
-            WX_ALL="${WX_LIBRARY_NAME_STATIC}"
-        fi
       ;;
-      *-*-mingw32* )
-        WX_LIBRARY_NAME_STATIC="lib/libwx${WX_MAJOR_VERSION_NUMBER}${WX_MINOR_VERSION_NUMBER}_${WX_RELEASE_NUMBER}.a"
-        SHARED_LD="${CC} -shared -Wl,--out-implib,${WX_LIBRARY_NAME_STATIC} -o"
-        TOOLKIT_DEF="${TOOLKIT_DEF} -DWXUSINGDLL=1"
-        WXMSW_DLL_DEFINES="-UWXUSINGDLL -DWXMAKINGDLL=1 -D_DLL=1 -D_WINDLL=1"
-        WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_SHARED}"
-        WX_TARGET_LIBRARY_GL="${WX_LIBRARY_NAME_SHARED_GL}"
-        if test "$wxUSE_OPENGL" = "yes"; then
+
+      *-*-cygwin* | *-*-mingw32* )
+
+        WX_LIBRARY_IMPORTLIB="${WX_LIBRARY_NAME_SHARED}.a"
+
+        SHARED_LD="${CXX} -shared -Wl,--out-implib,lib/${WX_LIBRARY_IMPORTLIB} -o"
+        TOOLCHAIN_DLL_DEFS="${TOOLCHAIN_DLL_DEFS} -DWXUSINGDLL=1"
+
+        PIC_FLAG="-UWXUSINGDLL -DWXMAKINGDLL=1 -D_DLL=1 -D_WINDLL=1"
+
+                if test "$wxUSE_OPENGL" = "yes"; then
             WX_ALL_INSTALLED="preinstall_gl"
-            WX_ALL="${WX_LIBRARY_NAME_SHARED} ${WX_LIBRARY_NAME_SHARED_GL}"
+            WX_ALL="\$(build_libdir)/${WX_LIBRARY_NAME_SHARED} \$(build_libdir)/${WX_LIBRARY_NAME_SHARED_GL}"
         else
-            WX_ALL="${WX_LIBRARY_NAME_SHARED}"
+            WX_ALL="\$(build_libdir)/${WX_LIBRARY_NAME_SHARED}"
         fi
       ;;
-      *-pc-os2_emx )
-                WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}"
-        WX_ALL="${WX_LIBRARY_NAME_STATIC}"
+
+      *-pc-os2_emx | *-pc-os2-emx )
+                wxUSE_SHARED=no
       ;;
+
       *-*-beos* )
                         SHARED_LD="${LD} -shared -o"
-        PIC_FLAG="-fPIC"
-        WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
-        WX_ALL="CREATE_LINKS"
       ;;
+
+      *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | \
+      *-*-sunos4* | \
+      *-*-irix5* | *-*-irix6* | \
+      *-*-osf* | \
+      *-*-dgux5* | \
+      *-*-sysv5* )
+              ;;
+
       *)
-        { echo "configure: error: unknown system type ${host}." 1>&2; exit 1; }
+        { echo "configure: error: unknown system type $host." 1>&2; exit 1; }
     esac
 
         if test "x$WX_TARGET_LIBRARY" = "x"; then
         WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_SHARED}"
         WX_TARGET_LIBRARY_GL="${WX_LIBRARY_NAME_SHARED_GL}"
     fi
+
         WX_TARGET_LIBRARY_TYPE="so"
-else
-        WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}"
-    WX_TARGET_LIBRARY_GL="${WX_LIBRARY_NAME_STATIC_GL}"
+    INSTALL_LIBRARY='$(INSTALL_PROGRAM)'
+fi
 
-    if test "$wxUSE_OPENGL" = "yes"; then
-        WX_ALL_INSTALLED="preinstall_gl"
-        WX_ALL="${WX_LIBRARY_NAME_STATIC} ${WX_LIBRARY_NAME_STATIC_GL}"
-    else
-        WX_ALL="${WX_LIBRARY_NAME_STATIC}"
-    fi
+if test "$wxUSE_SHARED" = "no"; then
 
-        if test "$wxUSE_GUI" = "no"; then
+        if test "$wxUSE_GUI" = "no" -o "$USE_WIN32" = 1 ; then
                 WX_ALL_INSTALLED="${WX_ALL_INSTALLED} preinstall"
     fi
 
-    WX_TARGET_LIBRARY_TYPE="a"
-fi
-
+    if test "$wxUSE_MAC" = 1; then
+        WX_ALL_INSTALLED="${WX_ALL_INSTALLED} preinstall"
+    fi
 
-for ac_hdr in strings.h
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11214: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 11219 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11224: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
+    if test "$wxUSE_OPENGL" = "yes"; then
+        WX_ALL_INSTALLED="${WX_ALL_INSTALLED} preinstall_gl"
+        WX_ALL="\$(build_libdir)/${WX_LIBRARY_NAME_STATIC} \$(build_libdir)/${WX_LIBRARY_NAME_STATIC_GL}"
+    else
+        WX_ALL="\$(build_libdir)/${WX_LIBRARY_NAME_STATIC}"
+    fi
 
-for ac_hdr in stdlib.h
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11254: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 11259 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11264: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
+    WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}"
+    WX_TARGET_LIBRARY_GL="${WX_LIBRARY_NAME_STATIC_GL}"
 
-for ac_hdr in unistd.h
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11294: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 11299 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11304: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
+    WX_TARGET_LIBRARY_TYPE="a"
+    INSTALL_LIBRARY='$(INSTALL_DATA)'
 fi
-done
 
-for ac_hdr in wchar.h
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11334: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+if test "$wxUSE_MAC" = 1; then
+        WX_ALL="${WX_ALL} \$(build_libdir)/lib${WX_LIBRARY}.r"
+    WX_ALL_INSTALLED="${WX_ALL_INSTALLED} preinstall_res"
+    # Extract the first word of "Rez", so it can be a program name with args.
+set dummy Rez; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:12096: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_RESCOMP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  cat > conftest.$ac_ext <<EOF
-#line 11339 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11344: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
+  if test -n "$RESCOMP"; then
+  ac_cv_prog_RESCOMP="$RESCOMP" # Let the user override the test.
+else
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_RESCOMP="Rez"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+  test -z "$ac_cv_prog_RESCOMP" && ac_cv_prog_RESCOMP="/Developer/Tools/Rez"
 fi
-rm -f conftest*
 fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
-EOF
- 
+RESCOMP="$ac_cv_prog_RESCOMP"
+if test -n "$RESCOMP"; then
+  echo "$ac_t""$RESCOMP" 1>&6
 else
   echo "$ac_t""no" 1>&6
 fi
-done
 
-for ac_hdr in wcstr.h
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11374: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+    # Extract the first word of "DeRez", so it can be a program name with args.
+set dummy DeRez; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:12126: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_DEREZ'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  cat > conftest.$ac_ext <<EOF
-#line 11379 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11384: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
+  if test -n "$DEREZ"; then
+  ac_cv_prog_DEREZ="$DEREZ" # Let the user override the test.
 else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_DEREZ="DeRez"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+  test -z "$ac_cv_prog_DEREZ" && ac_cv_prog_DEREZ="/Developer/Tools/DeRez"
 fi
-rm -f conftest*
 fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
-EOF
- 
+DEREZ="$ac_cv_prog_DEREZ"
+if test -n "$DEREZ"; then
+  echo "$ac_t""$DEREZ" 1>&6
 else
   echo "$ac_t""no" 1>&6
 fi
-done
 
-for ac_hdr in fnmatch.h
+    LIBWXMACRES="\$(top_builddir)/lib/lib${WX_LIBRARY}.r"
+    LIBWXMACRESCOMP="\$(RESCOMP) Carbon.r -t APPL ${LIBWXMACRES} -o \$(BIN_PROGRAM)"
+    LIBWXMACRESWXCONFIG="${RESCOMP} Carbon.r -t APPL \${prefix}/lib/${WX_RESOURCES_MACOSX_COMPILED} -o"
+fi
+
+
+if test "$wxUSE_MAC" != 1; then
+    for ac_hdr in strings.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11414: checking for $ac_hdr" >&5
+echo "configure:12164: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 11419 "configure"
+#line 12169 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11424: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12174: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -11446,21 +12196,23 @@ else
 fi
 done
 
-for ac_hdr in iconv.h
+fi
+
+for ac_hdr in stdlib.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11454: checking for $ac_hdr" >&5
+echo "configure:12206: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 11459 "configure"
+#line 12211 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11464: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12216: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -11486,21 +12238,21 @@ else
 fi
 done
 
-for ac_hdr in langinfo.h
+for ac_hdr in malloc.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11494: checking for $ac_hdr" >&5
+echo "configure:12246: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 11499 "configure"
+#line 12251 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11504: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12256: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -11526,24 +12278,21 @@ else
 fi
 done
 
-
-if test "$wxUSE_GUI" = "yes"; then
-    if test "$wxUSE_UNIX" = "yes"; then
-                for ac_hdr in X11/XKBlib.h
+for ac_hdr in unistd.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11537: checking for $ac_hdr" >&5
+echo "configure:12286: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 11542 "configure"
+#line 12291 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11547: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12296: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -11569,1690 +12318,1355 @@ else
 fi
 done
 
-    fi
-fi
-
-if test "$USE_WIN32" = 1; then
-    for ac_hdr in w32api.h
+for ac_hdr in wchar.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11581: checking for $ac_hdr" >&5
+echo "configure:12326: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 11586 "configure"
+#line 12331 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11591: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
-
-fi
-
-
-echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:11621: checking for ANSI C header files" >&5
-if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 11626 "configure"
-#include "confdefs.h"
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11634: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12336: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
-  ac_cv_header_stdc=yes
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-if test $ac_cv_header_stdc = yes; then
-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-cat > conftest.$ac_ext <<EOF
-#line 11651 "configure"
-#include "confdefs.h"
-#include <string.h>
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "memchr" >/dev/null 2>&1; then
-  :
-else
-  rm -rf conftest*
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-cat > conftest.$ac_ext <<EOF
-#line 11669 "configure"
-#include "confdefs.h"
-#include <stdlib.h>
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "free" >/dev/null 2>&1; then
-  :
-else
-  rm -rf conftest*
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-if test "$cross_compiling" = yes; then
-  :
-else
-  cat > conftest.$ac_ext <<EOF
-#line 11690 "configure"
-#include "confdefs.h"
-#include <ctype.h>
-#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-#define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int main () { int i; for (i = 0; i < 256; i++)
-if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
-exit (0); }
-
-EOF
-if { (eval echo configure:11701: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
-  :
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  ac_cv_header_stdc=no
-fi
-rm -fr conftest*
-fi
-
-fi
-fi
-
-echo "$ac_t""$ac_cv_header_stdc" 1>&6
-if test $ac_cv_header_stdc = yes; then
-  cat >> confdefs.h <<\EOF
-#define STDC_HEADERS 1
-EOF
-
-fi
-
-echo $ac_n "checking for mode_t""... $ac_c" 1>&6
-echo "configure:11725: checking for mode_t" >&5
-if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 11730 "configure"
-#include "confdefs.h"
-#include <sys/types.h>
-#if STDC_HEADERS
-#include <stdlib.h>
-#include <stddef.h>
-#endif
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "(^|[^a-zA-Z_0-9])mode_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
-  rm -rf conftest*
-  ac_cv_type_mode_t=yes
-else
-  rm -rf conftest*
-  ac_cv_type_mode_t=no
-fi
-rm -f conftest*
-
-fi
-echo "$ac_t""$ac_cv_type_mode_t" 1>&6
-if test $ac_cv_type_mode_t = no; then
-  cat >> confdefs.h <<\EOF
-#define mode_t int
-EOF
-
-fi
-
-echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:11758: checking for off_t" >&5
-if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 11763 "configure"
-#include "confdefs.h"
-#include <sys/types.h>
-#if STDC_HEADERS
-#include <stdlib.h>
-#include <stddef.h>
-#endif
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "(^|[^a-zA-Z_0-9])off_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
-  rm -rf conftest*
-  ac_cv_type_off_t=yes
+  eval "ac_cv_header_$ac_safe=yes"
 else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
   rm -rf conftest*
-  ac_cv_type_off_t=no
+  eval "ac_cv_header_$ac_safe=no"
 fi
 rm -f conftest*
-
 fi
-echo "$ac_t""$ac_cv_type_off_t" 1>&6
-if test $ac_cv_type_off_t = no; then
-  cat >> confdefs.h <<\EOF
-#define off_t long
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_hdr 1
 EOF
-
+ 
+else
+  echo "$ac_t""no" 1>&6
 fi
+done
 
-echo $ac_n "checking for pid_t""... $ac_c" 1>&6
-echo "configure:11791: checking for pid_t" >&5
-if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then
+for ac_hdr in wcstr.h
+do
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:12366: checking for $ac_hdr" >&5
+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 11796 "configure"
+#line 12371 "configure"
 #include "confdefs.h"
-#include <sys/types.h>
-#if STDC_HEADERS
-#include <stdlib.h>
-#include <stddef.h>
-#endif
+#include <$ac_hdr>
 EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "(^|[^a-zA-Z_0-9])pid_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:12376: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
   rm -rf conftest*
-  ac_cv_type_pid_t=yes
+  eval "ac_cv_header_$ac_safe=yes"
 else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
   rm -rf conftest*
-  ac_cv_type_pid_t=no
+  eval "ac_cv_header_$ac_safe=no"
 fi
 rm -f conftest*
-
 fi
-echo "$ac_t""$ac_cv_type_pid_t" 1>&6
-if test $ac_cv_type_pid_t = no; then
-  cat >> confdefs.h <<\EOF
-#define pid_t int
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_hdr 1
 EOF
-
+ 
+else
+  echo "$ac_t""no" 1>&6
 fi
+done
 
-echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:11824: checking for size_t" >&5
-if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
+for ac_hdr in wctype.h
+do
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:12406: checking for $ac_hdr" >&5
+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 11829 "configure"
+#line 12411 "configure"
 #include "confdefs.h"
-#include <sys/types.h>
-#if STDC_HEADERS
-#include <stdlib.h>
-#include <stddef.h>
-#endif
+#include <$ac_hdr>
 EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "(^|[^a-zA-Z_0-9])size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:12416: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
   rm -rf conftest*
-  ac_cv_type_size_t=yes
+  eval "ac_cv_header_$ac_safe=yes"
 else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
   rm -rf conftest*
-  ac_cv_type_size_t=no
+  eval "ac_cv_header_$ac_safe=no"
 fi
 rm -f conftest*
-
 fi
-echo "$ac_t""$ac_cv_type_size_t" 1>&6
-if test $ac_cv_type_size_t = no; then
-  cat >> confdefs.h <<\EOF
-#define size_t unsigned
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_hdr 1
 EOF
-
+ 
+else
+  echo "$ac_t""no" 1>&6
 fi
+done
 
-echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:11857: checking for uid_t in sys/types.h" >&5
-if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then
+for ac_hdr in fnmatch.h
+do
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:12446: checking for $ac_hdr" >&5
+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 11862 "configure"
+#line 12451 "configure"
 #include "confdefs.h"
-#include <sys/types.h>
+#include <$ac_hdr>
 EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "uid_t" >/dev/null 2>&1; then
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:12456: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
   rm -rf conftest*
-  ac_cv_type_uid_t=yes
+  eval "ac_cv_header_$ac_safe=yes"
 else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
   rm -rf conftest*
-  ac_cv_type_uid_t=no
+  eval "ac_cv_header_$ac_safe=no"
 fi
 rm -f conftest*
-
 fi
-
-echo "$ac_t""$ac_cv_type_uid_t" 1>&6
-if test $ac_cv_type_uid_t = no; then
-  cat >> confdefs.h <<\EOF
-#define uid_t int
-EOF
-
-  cat >> confdefs.h <<\EOF
-#define gid_t int
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_hdr 1
 EOF
-
+ 
+else
+  echo "$ac_t""no" 1>&6
 fi
+done
 
-
-echo $ac_n "checking for wchar_t""... $ac_c" 1>&6
-echo "configure:11892: checking for wchar_t" >&5
-if eval "test \"`echo '$''{'wx_cv_type_wchar_t'+set}'`\" = set"; then
+for ac_hdr in iconv.h
+do
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:12486: checking for $ac_hdr" >&5
+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  
-    cat > conftest.$ac_ext <<EOF
-#line 11898 "configure"
-#include "confdefs.h"
-#include <wchar.h>
-int main() {
-
-            wchar_t wc, *ws;
-            wc = L'a';
-            ws = L"Hello, world!";
-        
-; return 0; }
-EOF
-if { (eval echo configure:11909: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  wx_cv_type_wchar_t=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
   cat > conftest.$ac_ext <<EOF
-#line 11917 "configure"
+#line 12491 "configure"
 #include "confdefs.h"
-#include <stdlib.h>
-int main() {
-
-                wchar_t wc, *ws;
-                wc = L'a';
-                ws = L"Hello, world!";
-            
-; return 0; }
+#include <$ac_hdr>
 EOF
-if { (eval echo configure:11928: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:12496: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
   rm -rf conftest*
-  wx_cv_type_wchar_t=yes
+  eval "ac_cv_header_$ac_safe=yes"
 else
+  echo "$ac_err" >&5
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  wx_cv_type_wchar_t=no
-fi
-rm -f conftest*
-    
+  eval "ac_cv_header_$ac_safe=no"
 fi
 rm -f conftest*
-
 fi
-
-echo "$ac_t""$wx_cv_type_wchar_t" 1>&6
-
-if test "$wx_cv_type_wchar_t" = "yes"; then
-    cat >> confdefs.h <<\EOF
-#define wxUSE_WCHAR_T 1
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_hdr 1
 EOF
-
+ 
+else
+  echo "$ac_t""no" 1>&6
 fi
+done
 
-
-ac_ext=C
-# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cxx_cross
-
-echo $ac_n "checking if size_t is unsigned int""... $ac_c" 1>&6
-echo "configure:11962: checking if size_t is unsigned int" >&5
-if eval "test \"`echo '$''{'wx_cv_size_t_is_uint'+set}'`\" = set"; then
+for ac_hdr in langinfo.h
+do
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:12526: checking for $ac_hdr" >&5
+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-                          cat > conftest.$ac_ext <<EOF
-#line 11967 "configure"
+  cat > conftest.$ac_ext <<EOF
+#line 12531 "configure"
 #include "confdefs.h"
-#include <stddef.h>
-int main() {
-
-            return 0; }
-
-            struct Foo { void foo(size_t); void foo(unsigned int); };
-
-            int bar() {
-        
-; return 0; }
+#include <$ac_hdr>
 EOF
-if { (eval echo configure:11980: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:12536: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
   rm -rf conftest*
-  wx_cv_size_t_is_uint=no
+  eval "ac_cv_header_$ac_safe=yes"
 else
+  echo "$ac_err" >&5
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  wx_cv_size_t_is_uint=yes
-    
+  eval "ac_cv_header_$ac_safe=no"
 fi
 rm -f conftest*
-
 fi
-
-echo "$ac_t""$wx_cv_size_t_is_uint" 1>&6
-
-if test "$wx_cv_size_t_is_uint" = "yes"; then
-    cat >> confdefs.h <<\EOF
-#define wxSIZE_T_IS_UINT 1
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_hdr 1
 EOF
-
+ 
 else
-    echo $ac_n "checking if size_t is unsigned long""... $ac_c" 1>&6
-echo "configure:12003: checking if size_t is unsigned long" >&5
-if eval "test \"`echo '$''{'wx_cv_size_t_is_ulong'+set}'`\" = set"; then
+  echo "$ac_t""no" 1>&6
+fi
+done
+
+
+if test "$wxUSE_GUI" = "yes"; then
+    if test "$wxUSE_UNIX" = "yes"; then
+                for ac_hdr in X11/XKBlib.h
+do
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:12569: checking for $ac_hdr" >&5
+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 12008 "configure"
+#line 12574 "configure"
 #include "confdefs.h"
-#include <stddef.h>
-int main() {
-
-                return 0; }
-
-                struct Foo { void foo(size_t); void foo(unsigned long); };
-
-                int bar() {
-            
-; return 0; }
+#include <$ac_hdr>
 EOF
-if { (eval echo configure:12021: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:12579: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
   rm -rf conftest*
-  wx_cv_size_t_is_ulong=no
+  eval "ac_cv_header_$ac_safe=yes"
 else
+  echo "$ac_err" >&5
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  wx_cv_size_t_is_ulong=yes
-        
+  eval "ac_cv_header_$ac_safe=no"
 fi
 rm -f conftest*
-    
 fi
-
-echo "$ac_t""$wx_cv_size_t_is_ulong" 1>&6
-
-    if test "$wx_cv_size_t_is_ulong" = "yes"; then
-        cat >> confdefs.h <<\EOF
-#define wxSIZE_T_IS_ULONG 1
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_hdr 1
 EOF
+ 
+else
+  echo "$ac_t""no" 1>&6
+fi
+done
 
     fi
 fi
 
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-
 
-echo $ac_n "checking for pw_gecos in struct passwd""... $ac_c" 1>&6
-echo "configure:12055: checking for pw_gecos in struct passwd" >&5
-if eval "test \"`echo '$''{'wx_cv_struct_pw_gecos'+set}'`\" = set"; then
+echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
+echo "configure:12610: checking for ANSI C header files" >&5
+if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  
-        cat > conftest.$ac_ext <<EOF
-#line 12061 "configure"
+  cat > conftest.$ac_ext <<EOF
+#line 12615 "configure"
 #include "confdefs.h"
-#include <pwd.h>
-int main() {
-
-                char *p;
-                struct passwd *pw;
-                p = pw->pw_gecos;
-             
-; return 0; }
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <float.h>
 EOF
-if { (eval echo configure:12072: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:12623: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
   rm -rf conftest*
-  
-                wx_cv_struct_pw_gecos=yes
-             
+  ac_cv_header_stdc=yes
 else
+  echo "$ac_err" >&5
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  
-                wx_cv_struct_pw_gecos=no
-             
-        
+  ac_cv_header_stdc=no
 fi
 rm -f conftest*
-    
 
+if test $ac_cv_header_stdc = yes; then
+  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+cat > conftest.$ac_ext <<EOF
+#line 12640 "configure"
+#include "confdefs.h"
+#include <string.h>
+EOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  egrep "memchr" >/dev/null 2>&1; then
+  :
+else
+  rm -rf conftest*
+  ac_cv_header_stdc=no
 fi
+rm -f conftest*
 
-echo "$ac_t""$wx_cv_struct_pw_gecos" 1>&6
+fi
 
-if test "$wx_cv_struct_pw_gecos" = "yes"; then
-    cat >> confdefs.h <<\EOF
-#define HAVE_PW_GECOS 1
+if test $ac_cv_header_stdc = yes; then
+  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+cat > conftest.$ac_ext <<EOF
+#line 12658 "configure"
+#include "confdefs.h"
+#include <stdlib.h>
 EOF
-
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  egrep "free" >/dev/null 2>&1; then
+  :
+else
+  rm -rf conftest*
+  ac_cv_header_stdc=no
 fi
+rm -f conftest*
 
+fi
 
-echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:12102: checking for working const" >&5
-if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+if test $ac_cv_header_stdc = yes; then
+  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
+if test "$cross_compiling" = yes; then
+  :
 else
   cat > conftest.$ac_ext <<EOF
-#line 12107 "configure"
+#line 12679 "configure"
 #include "confdefs.h"
+#include <ctype.h>
+#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+#define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+int main () { int i; for (i = 0; i < 256; i++)
+if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
+exit (0); }
 
-int main() {
-
-/* Ultrix mips cc rejects this.  */
-typedef int charset[2]; const charset x;
-/* SunOS 4.1.1 cc rejects this.  */
-char const *const *ccp;
-char **p;
-/* NEC SVR4.0.2 mips cc rejects this.  */
-struct point {int x, y;};
-static struct point const zero = {0,0};
-/* AIX XL C 1.02.0.0 rejects this.
-   It does not let you subtract one const X* pointer from another in an arm
-   of an if-expression whose if-part is not a constant expression */
-const char *g = "string";
-ccp = &g + (g ? g-g : 0);
-/* HPUX 7.0 cc rejects these. */
-++ccp;
-p = (char**) ccp;
-ccp = (char const *const *) p;
-{ /* SCO 3.2v4 cc rejects this.  */
-  char *t;
-  char const *s = 0 ? (char *) 0 : (char const *) 0;
-
-  *t++ = 0;
-}
-{ /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
-  int x[] = {25, 17};
-  const int *foo = &x[0];
-  ++foo;
-}
-{ /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
-  typedef const int *iptr;
-  iptr p = 0;
-  ++p;
-}
-{ /* AIX XL C 1.02.0.0 rejects this saying
-     "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
-  struct s { int j; const int *ap[3]; };
-  struct s *b; b->j = 5;
-}
-{ /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
-  const int foo = 10;
-}
-
-; return 0; }
 EOF
-if { (eval echo configure:12156: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_c_const=yes
+if { (eval echo configure:12690: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  :
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_c_const=no
+  rm -fr conftest*
+  ac_cv_header_stdc=no
 fi
-rm -f conftest*
+rm -fr conftest*
 fi
 
-echo "$ac_t""$ac_cv_c_const" 1>&6
-if test $ac_cv_c_const = no; then
+fi
+fi
+
+echo "$ac_t""$ac_cv_header_stdc" 1>&6
+if test $ac_cv_header_stdc = yes; then
   cat >> confdefs.h <<\EOF
-#define const 
+#define STDC_HEADERS 1
 EOF
 
 fi
 
-echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:12177: checking for inline" >&5
-if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
+echo $ac_n "checking for mode_t""... $ac_c" 1>&6
+echo "configure:12714: checking for mode_t" >&5
+if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  ac_cv_c_inline=no
-for ac_kw in inline __inline__ __inline; do
   cat > conftest.$ac_ext <<EOF
-#line 12184 "configure"
+#line 12719 "configure"
 #include "confdefs.h"
-
-int main() {
-} $ac_kw foo() {
-; return 0; }
+#include <sys/types.h>
+#if STDC_HEADERS
+#include <stdlib.h>
+#include <stddef.h>
+#endif
 EOF
-if { (eval echo configure:12191: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  egrep "(^|[^a-zA-Z_0-9])mode_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
   rm -rf conftest*
-  ac_cv_c_inline=$ac_kw; break
+  ac_cv_type_mode_t=yes
 else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_type_mode_t=no
 fi
 rm -f conftest*
-done
 
 fi
-
-echo "$ac_t""$ac_cv_c_inline" 1>&6
-case "$ac_cv_c_inline" in
-  inline | yes) ;;
-  no) cat >> confdefs.h <<\EOF
-#define inline 
-EOF
- ;;
-  *)  cat >> confdefs.h <<EOF
-#define inline $ac_cv_c_inline
+echo "$ac_t""$ac_cv_type_mode_t" 1>&6
+if test $ac_cv_type_mode_t = no; then
+  cat >> confdefs.h <<\EOF
+#define mode_t int
 EOF
- ;;
-esac
 
+fi
 
-echo $ac_n "checking size of char""... $ac_c" 1>&6
-echo "configure:12218: checking size of char" >&5
-if eval "test \"`echo '$''{'ac_cv_sizeof_char'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test "$cross_compiling" = yes; then
-  ac_cv_sizeof_char=1
-else
-  cat > conftest.$ac_ext <<EOF
-#line 12226 "configure"
-#include "confdefs.h"
-#include <stdio.h>
-main()
-{
-  FILE *f=fopen("conftestval", "w");
-  if (!f) exit(1);
-  fprintf(f, "%d\n", sizeof(char));
-  exit(0);
-}
+echo $ac_n "checking for off_t""... $ac_c" 1>&6
+echo "configure:12747: checking for off_t" >&5
+if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 12752 "configure"
+#include "confdefs.h"
+#include <sys/types.h>
+#if STDC_HEADERS
+#include <stdlib.h>
+#include <stddef.h>
+#endif
 EOF
-if { (eval echo configure:12237: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
-  ac_cv_sizeof_char=`cat conftestval`
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  egrep "(^|[^a-zA-Z_0-9])off_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
+  rm -rf conftest*
+  ac_cv_type_off_t=yes
 else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  ac_cv_sizeof_char=0
-fi
-rm -fr conftest*
+  rm -rf conftest*
+  ac_cv_type_off_t=no
 fi
+rm -f conftest*
 
 fi
-echo "$ac_t""$ac_cv_sizeof_char" 1>&6
-cat >> confdefs.h <<EOF
-#define SIZEOF_CHAR $ac_cv_sizeof_char
+echo "$ac_t""$ac_cv_type_off_t" 1>&6
+if test $ac_cv_type_off_t = no; then
+  cat >> confdefs.h <<\EOF
+#define off_t long
 EOF
 
+fi
 
-echo $ac_n "checking size of short""... $ac_c" 1>&6
-echo "configure:12257: checking size of short" >&5
-if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then
+echo $ac_n "checking for pid_t""... $ac_c" 1>&6
+echo "configure:12780: checking for pid_t" >&5
+if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test "$cross_compiling" = yes; then
-  ac_cv_sizeof_short=2
 else
   cat > conftest.$ac_ext <<EOF
-#line 12265 "configure"
+#line 12785 "configure"
 #include "confdefs.h"
-#include <stdio.h>
-main()
-{
-  FILE *f=fopen("conftestval", "w");
-  if (!f) exit(1);
-  fprintf(f, "%d\n", sizeof(short));
-  exit(0);
-}
+#include <sys/types.h>
+#if STDC_HEADERS
+#include <stdlib.h>
+#include <stddef.h>
+#endif
 EOF
-if { (eval echo configure:12276: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
-  ac_cv_sizeof_short=`cat conftestval`
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  egrep "(^|[^a-zA-Z_0-9])pid_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
+  rm -rf conftest*
+  ac_cv_type_pid_t=yes
 else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  ac_cv_sizeof_short=0
-fi
-rm -fr conftest*
+  rm -rf conftest*
+  ac_cv_type_pid_t=no
 fi
+rm -f conftest*
 
 fi
-echo "$ac_t""$ac_cv_sizeof_short" 1>&6
-cat >> confdefs.h <<EOF
-#define SIZEOF_SHORT $ac_cv_sizeof_short
+echo "$ac_t""$ac_cv_type_pid_t" 1>&6
+if test $ac_cv_type_pid_t = no; then
+  cat >> confdefs.h <<\EOF
+#define pid_t int
 EOF
 
+fi
 
-echo $ac_n "checking size of int *""... $ac_c" 1>&6
-echo "configure:12296: checking size of int *" >&5
-if eval "test \"`echo '$''{'ac_cv_sizeof_int_p'+set}'`\" = set"; then
+echo $ac_n "checking for size_t""... $ac_c" 1>&6
+echo "configure:12813: checking for size_t" >&5
+if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test "$cross_compiling" = yes; then
-  ac_cv_sizeof_int_p=4
 else
   cat > conftest.$ac_ext <<EOF
-#line 12304 "configure"
+#line 12818 "configure"
 #include "confdefs.h"
-#include <stdio.h>
-main()
-{
-  FILE *f=fopen("conftestval", "w");
-  if (!f) exit(1);
-  fprintf(f, "%d\n", sizeof(int *));
-  exit(0);
-}
+#include <sys/types.h>
+#if STDC_HEADERS
+#include <stdlib.h>
+#include <stddef.h>
+#endif
 EOF
-if { (eval echo configure:12315: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
-  ac_cv_sizeof_int_p=`cat conftestval`
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  egrep "(^|[^a-zA-Z_0-9])size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
+  rm -rf conftest*
+  ac_cv_type_size_t=yes
 else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  ac_cv_sizeof_int_p=0
-fi
-rm -fr conftest*
+  rm -rf conftest*
+  ac_cv_type_size_t=no
 fi
+rm -f conftest*
 
 fi
-echo "$ac_t""$ac_cv_sizeof_int_p" 1>&6
-cat >> confdefs.h <<EOF
-#define SIZEOF_INT_P $ac_cv_sizeof_int_p
+echo "$ac_t""$ac_cv_type_size_t" 1>&6
+if test $ac_cv_type_size_t = no; then
+  cat >> confdefs.h <<\EOF
+#define size_t unsigned
 EOF
 
+fi
 
-echo $ac_n "checking size of int""... $ac_c" 1>&6
-echo "configure:12335: checking size of int" >&5
-if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
+echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
+echo "configure:12846: checking for uid_t in sys/types.h" >&5
+if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test "$cross_compiling" = yes; then
-  ac_cv_sizeof_int=4
 else
   cat > conftest.$ac_ext <<EOF
-#line 12343 "configure"
+#line 12851 "configure"
 #include "confdefs.h"
-#include <stdio.h>
-main()
-{
-  FILE *f=fopen("conftestval", "w");
-  if (!f) exit(1);
-  fprintf(f, "%d\n", sizeof(int));
-  exit(0);
-}
+#include <sys/types.h>
 EOF
-if { (eval echo configure:12354: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
-  ac_cv_sizeof_int=`cat conftestval`
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  egrep "uid_t" >/dev/null 2>&1; then
+  rm -rf conftest*
+  ac_cv_type_uid_t=yes
 else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  ac_cv_sizeof_int=0
-fi
-rm -fr conftest*
+  rm -rf conftest*
+  ac_cv_type_uid_t=no
 fi
+rm -f conftest*
 
 fi
-echo "$ac_t""$ac_cv_sizeof_int" 1>&6
-cat >> confdefs.h <<EOF
-#define SIZEOF_INT $ac_cv_sizeof_int
+
+echo "$ac_t""$ac_cv_type_uid_t" 1>&6
+if test $ac_cv_type_uid_t = no; then
+  cat >> confdefs.h <<\EOF
+#define uid_t int
+EOF
+
+  cat >> confdefs.h <<\EOF
+#define gid_t int
 EOF
 
+fi
 
-echo $ac_n "checking size of long""... $ac_c" 1>&6
-echo "configure:12374: checking size of long" >&5
-if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
+
+echo $ac_n "checking for wchar_t""... $ac_c" 1>&6
+echo "configure:12881: checking for wchar_t" >&5
+if eval "test \"`echo '$''{'wx_cv_type_wchar_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  if test "$cross_compiling" = yes; then
-  ac_cv_sizeof_long=4
-else
-  cat > conftest.$ac_ext <<EOF
-#line 12382 "configure"
+  
+    cat > conftest.$ac_ext <<EOF
+#line 12887 "configure"
 #include "confdefs.h"
-#include <stdio.h>
-main()
-{
-  FILE *f=fopen("conftestval", "w");
-  if (!f) exit(1);
-  fprintf(f, "%d\n", sizeof(long));
-  exit(0);
-}
+
+            #ifdef HAVE_WCHAR_H
+            #  ifdef __CYGWIN__
+            #    include <stddef.h>
+            #  endif
+            #  include <wchar.h>
+            #endif
+            #ifdef HAVE_STDLIB_H
+            #  include <stdlib.h>
+            #endif
+        
+int main() {
+
+            wchar_t wc, *ws;
+            wc = L'a';
+            ws = L"Hello, world!";
+        
+; return 0; }
 EOF
-if { (eval echo configure:12393: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
-  ac_cv_sizeof_long=`cat conftestval`
+if { (eval echo configure:12908: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  wx_cv_type_wchar_t=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  ac_cv_sizeof_long=0
-fi
-rm -fr conftest*
+  rm -rf conftest*
+  wx_cv_type_wchar_t=no
+    
 fi
+rm -f conftest*
 
 fi
-echo "$ac_t""$ac_cv_sizeof_long" 1>&6
-cat >> confdefs.h <<EOF
-#define SIZEOF_LONG $ac_cv_sizeof_long
+
+echo "$ac_t""$wx_cv_type_wchar_t" 1>&6
+
+if test "$wx_cv_type_wchar_t" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_WCHAR_T 1
 EOF
 
+fi
 
-echo $ac_n "checking size of long long""... $ac_c" 1>&6
-echo "configure:12413: checking size of long long" >&5
-if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then
+
+ac_ext=C
+# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cxx_cross
+
+echo $ac_n "checking if size_t is unsigned int""... $ac_c" 1>&6
+echo "configure:12940: checking if size_t is unsigned int" >&5
+if eval "test \"`echo '$''{'wx_cv_size_t_is_uint'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  if test "$cross_compiling" = yes; then
-  ac_cv_sizeof_long_long=0
-else
-  cat > conftest.$ac_ext <<EOF
-#line 12421 "configure"
+                          cat > conftest.$ac_ext <<EOF
+#line 12945 "configure"
 #include "confdefs.h"
-#include <stdio.h>
-main()
-{
-  FILE *f=fopen("conftestval", "w");
-  if (!f) exit(1);
-  fprintf(f, "%d\n", sizeof(long long));
-  exit(0);
-}
+#include <stddef.h>
+int main() {
+
+            return 0; }
+
+            struct Foo { void foo(size_t); void foo(unsigned int); };
+
+            int bar() {
+        
+; return 0; }
 EOF
-if { (eval echo configure:12432: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
-  ac_cv_sizeof_long_long=`cat conftestval`
+if { (eval echo configure:12958: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  wx_cv_size_t_is_uint=no
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  ac_cv_sizeof_long_long=0
-fi
-rm -fr conftest*
+  rm -rf conftest*
+  wx_cv_size_t_is_uint=yes
+    
 fi
+rm -f conftest*
 
 fi
-echo "$ac_t""$ac_cv_sizeof_long_long" 1>&6
-cat >> confdefs.h <<EOF
-#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long
-EOF
 
+echo "$ac_t""$wx_cv_size_t_is_uint" 1>&6
 
+if test "$wx_cv_size_t_is_uint" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxSIZE_T_IS_UINT 1
+EOF
 
-echo $ac_n "checking size of wchar_t""... $ac_c" 1>&6
-echo "configure:12453: checking size of wchar_t" >&5
-if eval "test \"`echo '$''{'wx_cv_sizeof_wchar_t'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
 else
-  
-    if test "$cross_compiling" = yes; then
-  wx_cv_sizeof_wchar_t=4
-    
+    echo $ac_n "checking if size_t is unsigned long""... $ac_c" 1>&6
+echo "configure:12981: checking if size_t is unsigned long" >&5
+if eval "test \"`echo '$''{'wx_cv_size_t_is_ulong'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 12463 "configure"
+#line 12986 "configure"
 #include "confdefs.h"
+#include <stddef.h>
+int main() {
 
-            #ifdef HAVE_WCHAR_H
-            #  include <wchar.h>
-            #endif
-            #ifdef HAVE_STDLIB_H
-            #  include <stdlib.h>
-            #endif
-            #include <stdio.h>
-            int main()
-            {
-                FILE *f=fopen("conftestval", "w");
-                if (!f) exit(1);
-                fprintf(f, "%i", sizeof(wchar_t));
-                exit(0);
-            }
-        
+                return 0; }
+
+                struct Foo { void foo(size_t); void foo(unsigned long); };
+
+                int bar() {
+            
+; return 0; }
 EOF
-if { (eval echo configure:12482: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
-  wx_cv_sizeof_wchar_t=`cat conftestval`
+if { (eval echo configure:12999: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  wx_cv_size_t_is_ulong=no
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  wx_cv_sizeof_wchar_t=0
+  rm -rf conftest*
+  wx_cv_size_t_is_ulong=yes
+        
 fi
-rm -fr conftest*
+rm -f conftest*
+    
 fi
 
+echo "$ac_t""$wx_cv_size_t_is_ulong" 1>&6
+
+    if test "$wx_cv_size_t_is_ulong" = "yes"; then
+        cat >> confdefs.h <<\EOF
+#define wxSIZE_T_IS_ULONG 1
+EOF
 
+    fi
 fi
 
-echo "$ac_t""$wx_cv_sizeof_wchar_t" 1>&6
+ac_ext=c
+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cc_cross
 
-cat >> confdefs.h <<EOF
-#define SIZEOF_WCHAR_T $wx_cv_sizeof_wchar_t
-EOF
 
 
-echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
-echo "configure:12505: checking whether byte ordering is bigendian" >&5
-if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then
+echo $ac_n "checking for pw_gecos in struct passwd""... $ac_c" 1>&6
+echo "configure:13033: checking for pw_gecos in struct passwd" >&5
+if eval "test \"`echo '$''{'wx_cv_struct_pw_gecos'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  ac_cv_c_bigendian=unknown
-# See if sys/param.h defines the BYTE_ORDER macro.
-cat > conftest.$ac_ext <<EOF
-#line 12512 "configure"
-#include "confdefs.h"
-#include <sys/types.h>
-#include <sys/param.h>
-int main() {
-
-#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN
- bogus endian macros
-#endif
-; return 0; }
-EOF
-if { (eval echo configure:12523: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  # It does; now see whether it defined to BIG_ENDIAN or not.
-cat > conftest.$ac_ext <<EOF
-#line 12527 "configure"
+  
+        cat > conftest.$ac_ext <<EOF
+#line 13039 "configure"
 #include "confdefs.h"
-#include <sys/types.h>
-#include <sys/param.h>
+#include <pwd.h>
 int main() {
 
-#if BYTE_ORDER != BIG_ENDIAN
- not big endian
-#endif
+                char *p;
+                struct passwd *pw;
+                p = pw->pw_gecos;
+             
 ; return 0; }
 EOF
-if { (eval echo configure:12538: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13050: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  ac_cv_c_bigendian=yes
+  
+                wx_cv_struct_pw_gecos=yes
+             
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  ac_cv_c_bigendian=no
-fi
-rm -f conftest*
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
+  
+                wx_cv_struct_pw_gecos=no
+             
+        
 fi
 rm -f conftest*
-if test $ac_cv_c_bigendian = unknown; then
-if test "$cross_compiling" = yes; then
-  ac_cv_c_bigendian=unknown
-else
-  cat > conftest.$ac_ext <<EOF
-#line 12558 "configure"
-#include "confdefs.h"
-main () {
-  /* Are we little or big endian?  From Harbison&Steele.  */
-  union
-  {
-    long l;
-    char c[sizeof (long)];
-  } u;
-  u.l = 1;
-  exit (u.c[sizeof (long) - 1] == 1);
-}
-EOF
-if { (eval echo configure:12571: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
-  ac_cv_c_bigendian=no
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  ac_cv_c_bigendian=yes
-fi
-rm -fr conftest*
-fi
-
-fi
-fi
-
-echo "$ac_t""$ac_cv_c_bigendian" 1>&6
-if test $ac_cv_c_bigendian = unknown; then
-  echo "configure: warning: Assuming little-endian target machine - this may be overriden by adding the line "ac_cv_c_bigendian=${ac_cv_c_bigendian='yes'}" to config.cache file" 1>&2
-fi
-if test $ac_cv_c_bigendian = yes; then
-  cat >> confdefs.h <<\EOF
-#define WORDS_BIGENDIAN 1
-EOF
+    
 
 fi
 
+echo "$ac_t""$wx_cv_struct_pw_gecos" 1>&6
 
-
-  if test "$cross_compiling" = "yes"; then
+if test "$wx_cv_struct_pw_gecos" = "yes"; then
     cat >> confdefs.h <<\EOF
-#define wxUSE_IOSTREAMH 1
+#define HAVE_PW_GECOS 1
 EOF
 
-  else
-    
-    ac_ext=C
-# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cxx_cross
+fi
 
 
-    for ac_hdr in iostream
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:12618: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+echo $ac_n "checking for working const""... $ac_c" 1>&6
+echo "configure:13080: checking for working const" >&5
+if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 12623 "configure"
+#line 13085 "configure"
 #include "confdefs.h"
-#include <$ac_hdr>
+
+int main() {
+
+/* Ultrix mips cc rejects this.  */
+typedef int charset[2]; const charset x;
+/* SunOS 4.1.1 cc rejects this.  */
+char const *const *ccp;
+char **p;
+/* NEC SVR4.0.2 mips cc rejects this.  */
+struct point {int x, y;};
+static struct point const zero = {0,0};
+/* AIX XL C 1.02.0.0 rejects this.
+   It does not let you subtract one const X* pointer from another in an arm
+   of an if-expression whose if-part is not a constant expression */
+const char *g = "string";
+ccp = &g + (g ? g-g : 0);
+/* HPUX 7.0 cc rejects these. */
+++ccp;
+p = (char**) ccp;
+ccp = (char const *const *) p;
+{ /* SCO 3.2v4 cc rejects this.  */
+  char *t;
+  char const *s = 0 ? (char *) 0 : (char const *) 0;
+
+  *t++ = 0;
+}
+{ /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
+  int x[] = {25, 17};
+  const int *foo = &x[0];
+  ++foo;
+}
+{ /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
+  typedef const int *iptr;
+  iptr p = 0;
+  ++p;
+}
+{ /* AIX XL C 1.02.0.0 rejects this saying
+     "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
+  struct s { int j; const int *ap[3]; };
+  struct s *b; b->j = 5;
+}
+{ /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
+  const int foo = 10;
+}
+
+; return 0; }
 EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12628: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
+if { (eval echo configure:13134: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
+  ac_cv_c_const=yes
 else
-  echo "$ac_err" >&5
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
+  ac_cv_c_const=no
 fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
+rm -f conftest*
 fi
-done
 
-
-    if test "$ac_cv_header_iostream" = "yes" ; then
-      :
-    else
-      cat >> confdefs.h <<\EOF
-#define wxUSE_IOSTREAMH 1
+echo "$ac_t""$ac_cv_c_const" 1>&6
+if test $ac_cv_c_const = no; then
+  cat >> confdefs.h <<\EOF
+#define const 
 EOF
 
-    fi
-
-    ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-  fi
-
-
+fi
 
-  echo $ac_n "checking if C++ compiler supports bool""... $ac_c" 1>&6
-echo "configure:12676: checking if C++ compiler supports bool" >&5
-if eval "test \"`echo '$''{'wx_cv_cpp_bool'+set}'`\" = set"; then
+echo $ac_n "checking for inline""... $ac_c" 1>&6
+echo "configure:13155: checking for inline" >&5
+if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  
-    
-    ac_ext=C
-# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cxx_cross
-
-
-    cat > conftest.$ac_ext <<EOF
-#line 12691 "configure"
+  ac_cv_c_inline=no
+for ac_kw in inline __inline__ __inline; do
+  cat > conftest.$ac_ext <<EOF
+#line 13162 "configure"
 #include "confdefs.h"
 
-      
 int main() {
-
-        bool b = true;
-
-        return 0;
-      
+} $ac_kw foo() {
 ; return 0; }
 EOF
-if { (eval echo configure:12703: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13169: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  
-        wx_cv_cpp_bool=yes
-      
+  ac_cv_c_inline=$ac_kw; break
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-        wx_cv_cpp_bool=no
-      
-    
 fi
 rm -f conftest*
+done
 
-    ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-  
 fi
 
-echo "$ac_t""$wx_cv_cpp_bool" 1>&6
-
-  if test "$wx_cv_cpp_bool" = "yes"; then
-    cat >> confdefs.h <<\EOF
-#define HAVE_BOOL 1
+echo "$ac_t""$ac_cv_c_inline" 1>&6
+case "$ac_cv_c_inline" in
+  inline | yes) ;;
+  no) cat >> confdefs.h <<\EOF
+#define inline 
 EOF
-
-  fi
-
+ ;;
+  *)  cat >> confdefs.h <<EOF
+#define inline $ac_cv_c_inline
+EOF
+ ;;
+esac
 
 
-echo $ac_n "checking for wcslen in -lc""... $ac_c" 1>&6
-echo "configure:12741: checking for wcslen in -lc" >&5
-ac_lib_var=`echo c'_'wcslen | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+echo $ac_n "checking size of char""... $ac_c" 1>&6
+echo "configure:13196: checking size of char" >&5
+if eval "test \"`echo '$''{'ac_cv_sizeof_char'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  ac_save_LIBS="$LIBS"
-LIBS="-lc  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 12749 "configure"
+  if test "$cross_compiling" = yes; then
+  ac_cv_sizeof_char=1
+else
+  cat > conftest.$ac_ext <<EOF
+#line 13204 "configure"
 #include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char wcslen();
-
-int main() {
-wcslen()
-; return 0; }
+#include <stdio.h>
+main()
+{
+  FILE *f=fopen("conftestval", "w");
+  if (!f) exit(1);
+  fprintf(f, "%d\n", sizeof(char));
+  exit(0);
+}
 EOF
-if { (eval echo configure:12760: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
+if { (eval echo configure:13215: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  ac_cv_sizeof_char=`cat conftestval`
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
+  rm -fr conftest*
+  ac_cv_sizeof_char=0
+fi
+rm -fr conftest*
 fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
 
 fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  
-            cat >> confdefs.h <<\EOF
-#define HAVE_WCSLEN 1
+echo "$ac_t""$ac_cv_sizeof_char" 1>&6
+cat >> confdefs.h <<EOF
+#define SIZEOF_CHAR $ac_cv_sizeof_char
 EOF
 
-            WCHAR_LINK=""
-        
-else
-  echo "$ac_t""no" 1>&6
 
-            echo $ac_n "checking for wcslen in -lw""... $ac_c" 1>&6
-echo "configure:12786: checking for wcslen in -lw" >&5
-ac_lib_var=`echo w'_'wcslen | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+echo $ac_n "checking size of short""... $ac_c" 1>&6
+echo "configure:13235: checking size of short" >&5
+if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  ac_save_LIBS="$LIBS"
-LIBS="-lw  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 12794 "configure"
+  if test "$cross_compiling" = yes; then
+  ac_cv_sizeof_short=2
+else
+  cat > conftest.$ac_ext <<EOF
+#line 13243 "configure"
 #include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char wcslen();
-
-int main() {
-wcslen()
-; return 0; }
+#include <stdio.h>
+main()
+{
+  FILE *f=fopen("conftestval", "w");
+  if (!f) exit(1);
+  fprintf(f, "%d\n", sizeof(short));
+  exit(0);
+}
 EOF
-if { (eval echo configure:12805: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
+if { (eval echo configure:13254: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  ac_cv_sizeof_short=`cat conftestval`
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
+  rm -fr conftest*
+  ac_cv_sizeof_short=0
+fi
+rm -fr conftest*
 fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
 
 fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  
-                cat >> confdefs.h <<\EOF
-#define HAVE_WCSLEN 1
+echo "$ac_t""$ac_cv_sizeof_short" 1>&6
+cat >> confdefs.h <<EOF
+#define SIZEOF_SHORT $ac_cv_sizeof_short
 EOF
 
-                WCHAR_LINK="-lw"
-            
-else
-  echo "$ac_t""no" 1>&6
 
-                echo $ac_n "checking for wcslen in -lmsvcrt""... $ac_c" 1>&6
-echo "configure:12831: checking for wcslen in -lmsvcrt" >&5
-ac_lib_var=`echo msvcrt'_'wcslen | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+echo $ac_n "checking size of int *""... $ac_c" 1>&6
+echo "configure:13274: checking size of int *" >&5
+if eval "test \"`echo '$''{'ac_cv_sizeof_int_p'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  ac_save_LIBS="$LIBS"
-LIBS="-lmsvcrt  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 12839 "configure"
+  if test "$cross_compiling" = yes; then
+  ac_cv_sizeof_int_p=4
+else
+  cat > conftest.$ac_ext <<EOF
+#line 13282 "configure"
 #include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char wcslen();
-
-int main() {
-wcslen()
-; return 0; }
+#include <stdio.h>
+main()
+{
+  FILE *f=fopen("conftestval", "w");
+  if (!f) exit(1);
+  fprintf(f, "%d\n", sizeof(int *));
+  exit(0);
+}
 EOF
-if { (eval echo configure:12850: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
+if { (eval echo configure:13293: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  ac_cv_sizeof_int_p=`cat conftestval`
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
+  rm -fr conftest*
+  ac_cv_sizeof_int_p=0
+fi
+rm -fr conftest*
 fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
 
 fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  
-                    cat >> confdefs.h <<\EOF
-#define HAVE_WCSLEN 1
+echo "$ac_t""$ac_cv_sizeof_int_p" 1>&6
+cat >> confdefs.h <<EOF
+#define SIZEOF_INT_P $ac_cv_sizeof_int_p
+EOF
+
+
+echo $ac_n "checking size of int""... $ac_c" 1>&6
+echo "configure:13313: checking size of int" >&5
+if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test "$cross_compiling" = yes; then
+  ac_cv_sizeof_int=4
+else
+  cat > conftest.$ac_ext <<EOF
+#line 13321 "configure"
+#include "confdefs.h"
+#include <stdio.h>
+main()
+{
+  FILE *f=fopen("conftestval", "w");
+  if (!f) exit(1);
+  fprintf(f, "%d\n", sizeof(int));
+  exit(0);
+}
 EOF
-
-                    WCHAR_LINK=""
-                
+if { (eval echo configure:13332: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  ac_cv_sizeof_int=`cat conftestval`
 else
-  echo "$ac_t""no" 1>&6
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  ac_cv_sizeof_int=0
 fi
-
-            
+rm -fr conftest*
 fi
 
-        
 fi
+echo "$ac_t""$ac_cv_sizeof_int" 1>&6
+cat >> confdefs.h <<EOF
+#define SIZEOF_INT $ac_cv_sizeof_int
+EOF
 
 
-echo $ac_n "checking for vprintf""... $ac_c" 1>&6
-echo "configure:12884: checking for vprintf" >&5
-if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then
+echo $ac_n "checking size of long""... $ac_c" 1>&6
+echo "configure:13352: checking size of long" >&5
+if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test "$cross_compiling" = yes; then
+  ac_cv_sizeof_long=4
 else
   cat > conftest.$ac_ext <<EOF
-#line 12889 "configure"
+#line 13360 "configure"
 #include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char vprintf(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char vprintf();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_vprintf) || defined (__stub___vprintf)
-choke me
-#else
-vprintf();
-#endif
-
-; return 0; }
+#include <stdio.h>
+main()
+{
+  FILE *f=fopen("conftestval", "w");
+  if (!f) exit(1);
+  fprintf(f, "%d\n", sizeof(long));
+  exit(0);
+}
 EOF
-if { (eval echo configure:12912: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_vprintf=yes"
+if { (eval echo configure:13371: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  ac_cv_sizeof_long=`cat conftestval`
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_vprintf=no"
+  rm -fr conftest*
+  ac_cv_sizeof_long=0
 fi
-rm -f conftest*
+rm -fr conftest*
 fi
 
-if eval "test \"`echo '$ac_cv_func_'vprintf`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  cat >> confdefs.h <<\EOF
-#define HAVE_VPRINTF 1
+fi
+echo "$ac_t""$ac_cv_sizeof_long" 1>&6
+cat >> confdefs.h <<EOF
+#define SIZEOF_LONG $ac_cv_sizeof_long
 EOF
 
-else
-  echo "$ac_t""no" 1>&6
-fi
 
-if test "$ac_cv_func_vprintf" != yes; then
-echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
-echo "configure:12936: checking for _doprnt" >&5
-if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then
+echo $ac_n "checking size of long long""... $ac_c" 1>&6
+echo "configure:13391: checking size of long long" >&5
+if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test "$cross_compiling" = yes; then
+  ac_cv_sizeof_long_long=0
 else
   cat > conftest.$ac_ext <<EOF
-#line 12941 "configure"
+#line 13399 "configure"
 #include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char _doprnt(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char _doprnt();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub__doprnt) || defined (__stub____doprnt)
-choke me
-#else
-_doprnt();
-#endif
-
-; return 0; }
+#include <stdio.h>
+main()
+{
+  FILE *f=fopen("conftestval", "w");
+  if (!f) exit(1);
+  fprintf(f, "%d\n", sizeof(long long));
+  exit(0);
+}
 EOF
-if { (eval echo configure:12964: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func__doprnt=yes"
+if { (eval echo configure:13410: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  ac_cv_sizeof_long_long=`cat conftestval`
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func__doprnt=no"
-fi
-rm -f conftest*
+  rm -fr conftest*
+  ac_cv_sizeof_long_long=0
 fi
-
-if eval "test \"`echo '$ac_cv_func_'_doprnt`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  cat >> confdefs.h <<\EOF
-#define HAVE_DOPRNT 1
-EOF
-
-else
-  echo "$ac_t""no" 1>&6
+rm -fr conftest*
 fi
 
 fi
+echo "$ac_t""$ac_cv_sizeof_long_long" 1>&6
+cat >> confdefs.h <<EOF
+#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long
+EOF
 
 
 
-
-
-
-
-echo $ac_n "checking for vsnprintf""... $ac_c" 1>&6
-echo "configure:12995: checking for vsnprintf" >&5
-if eval "test \"`echo '$''{'wx_cv_func_vsnprintf'+set}'`\" = set"; then
+echo $ac_n "checking size of wchar_t""... $ac_c" 1>&6
+echo "configure:13431: checking size of wchar_t" >&5
+if eval "test \"`echo '$''{'wx_cv_sizeof_wchar_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
-  cat > conftest.$ac_ext <<EOF
-#line 13001 "configure"
-#include "confdefs.h"
-
-                    #include <stdio.h>
-                    #include <stdarg.h>
-                 
-int main() {
-
-                    int wx_test_vsnprintf(const char *, ...);
-
-                    wx_test_vsnprintf("%s");
-                    return 0;
-                 }
-
-                 int wx_test_vsnprintf(const char *fmt, ...)
-                 {
-                    char *s;
-
-                    va_list argp;
-                    va_start(argp, fmt);
-                    vsnprintf(s, 42, fmt, argp);
-                    va_end(argp);
-                 
-; return 0; }
-EOF
-if { (eval echo configure:13026: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-                    wx_cv_func_vsnprintf=yes
-                 
+    if test "$cross_compiling" = yes; then
+  wx_cv_sizeof_wchar_t=4
+    
 else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-                    cat > conftest.$ac_ext <<EOF
-#line 13037 "configure"
+  cat > conftest.$ac_ext <<EOF
+#line 13441 "configure"
 #include "confdefs.h"
 
-                                      #include <stdio.h>
-                                      #include <stdarg.h>
-                                   
-int main() {
-
-                                      int wx_test_vsnprintf(const char *, ...);
-
-                                      wx_test_vsnprintf("%s");
-                                      return 0;
-                                   }
-
-                                   int wx_test_vsnprintf(const char *fmt, ...)
-                                   {
-                                      char *s;
-
-                                      va_list argp;
-                                      va_start(argp, fmt);
-                                      _vsnprintf(s, 42, fmt, argp);
-                                      va_end(argp);
-                                   
-; return 0; }
+            #ifdef HAVE_WCHAR_H
+            #  ifdef __CYGWIN__
+            #    include <stddef.h>
+            #  endif
+            #  include <wchar.h>
+            #endif
+            #ifdef HAVE_STDLIB_H
+            #  include <stdlib.h>
+            #endif
+            #include <stdio.h>
+            int main()
+            {
+                FILE *f=fopen("conftestval", "w");
+                if (!f) exit(1);
+                fprintf(f, "%i", sizeof(wchar_t));
+                exit(0);
+            }
+        
 EOF
-if { (eval echo configure:13062: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-                                      wx_cv_func_vsnprintf=yes
-                                   
+if { (eval echo configure:13463: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  wx_cv_sizeof_wchar_t=`cat conftestval`
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-                                      wx_cv_func_vsnprintf=no
-                                   
+  rm -fr conftest*
+  wx_cv_sizeof_wchar_t=0
 fi
-rm -f conftest*
-                 
+rm -fr conftest*
 fi
-rm -f conftest*
+
 
 fi
 
-echo "$ac_t""$wx_cv_func_vsnprintf" 1>&6
+echo "$ac_t""$wx_cv_sizeof_wchar_t" 1>&6
 
-if test "$wx_cv_func_vsnprintf" = yes; then
-    cat >> confdefs.h <<\EOF
-#define HAVE_VSNPRINTF 1
+cat >> confdefs.h <<EOF
+#define SIZEOF_WCHAR_T $wx_cv_sizeof_wchar_t
 EOF
 
-else
-    echo "configure: warning: unsafe function sprintf will be used instead of snprintf" 1>&2
-fi
 
-echo $ac_n "checking for vsscanf""... $ac_c" 1>&6
-echo "configure:13094: checking for vsscanf" >&5
-if eval "test \"`echo '$''{'wx_cv_func_vsscanf'+set}'`\" = set"; then
+echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
+echo "configure:13486: checking whether byte ordering is bigendian" >&5
+if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  
-  cat > conftest.$ac_ext <<EOF
-#line 13100 "configure"
+  ac_cv_c_bigendian=unknown
+# See if sys/param.h defines the BYTE_ORDER macro.
+cat > conftest.$ac_ext <<EOF
+#line 13493 "configure"
 #include "confdefs.h"
-
-                    #include <stdio.h>
-                    #include <stdarg.h>
-                
+#include <sys/types.h>
+#include <sys/param.h>
 int main() {
 
-                    int wx_test_vsscanf(const char *, ...);
-
-                    wx_test_vsscanf("%d");
-                    return 0;
-                }
+#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN
+ bogus endian macros
+#endif
+; return 0; }
+EOF
+if { (eval echo configure:13504: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  # It does; now see whether it defined to BIG_ENDIAN or not.
+cat > conftest.$ac_ext <<EOF
+#line 13508 "configure"
+#include "confdefs.h"
+#include <sys/types.h>
+#include <sys/param.h>
+int main() {
 
-                int wx_test_vsscanf(const char *fmt, ...)
-                {
-                    va_list argp;
-                    va_start(argp, fmt);
-                    vsscanf("42", fmt, argp);
-                    va_end(argp);
-                
+#if BYTE_ORDER != BIG_ENDIAN
+ not big endian
+#endif
 ; return 0; }
 EOF
-if { (eval echo configure:13123: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13519: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  
-                    wx_cv_func_vsscanf=yes
-                
+  ac_cv_c_bigendian=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  
-                    wx_cv_func_vsscanf=no
-                
+  ac_cv_c_bigendian=no
 fi
 rm -f conftest*
-
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
 fi
-
-echo "$ac_t""$wx_cv_func_vsscanf" 1>&6
-
-if test "$wx_cv_func_vsscanf" = yes; then
-    cat >> confdefs.h <<\EOF
-#define HAVE_VSSCANF 1
+rm -f conftest*
+if test $ac_cv_c_bigendian = unknown; then
+if test "$cross_compiling" = yes; then
+  ac_cv_c_bigendian=unknown
+else
+  cat > conftest.$ac_ext <<EOF
+#line 13539 "configure"
+#include "confdefs.h"
+main () {
+  /* Are we little or big endian?  From Harbison&Steele.  */
+  union
+  {
+    long l;
+    char c[sizeof (long)];
+  } u;
+  u.l = 1;
+  exit (u.c[sizeof (long) - 1] == 1);
+}
 EOF
+if { (eval echo configure:13552: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  ac_cv_c_bigendian=no
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  ac_cv_c_bigendian=yes
+fi
+rm -fr conftest*
+fi
 
+fi
 fi
 
-if test "$TOOLKIT" != "MSW"; then
+echo "$ac_t""$ac_cv_c_bigendian" 1>&6
+if test $ac_cv_c_bigendian = unknown; then
+  echo "configure: warning: Assuming little-endian target machine - this may be overriden by adding the line "ac_cv_c_bigendian=${ac_cv_c_bigendian='yes'}" to config.cache file" 1>&2
+fi
+if test $ac_cv_c_bigendian = yes; then
+  cat >> confdefs.h <<\EOF
+#define WORDS_BIGENDIAN 1
+EOF
 
+fi
 
 
-ac_ext=C
+echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6
+echo "configure:13580: checking how to run the C++ preprocessor" >&5
+if test -z "$CXXCPP"; then
+if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_ext=C
 # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
 ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
 cross_compiling=$ac_cv_prog_cxx_cross
-
-echo $ac_n "checking if iconv() takes char**""... $ac_c" 1>&6
-echo "configure:13161: checking if iconv() takes char**" >&5
-if eval "test \"`echo '$''{'wx_cv_iconv_takes_char'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-    cat > conftest.$ac_ext <<EOF
-#line 13167 "configure"
+  CXXCPP="${CXX-g++} -E"
+  cat > conftest.$ac_ext <<EOF
+#line 13593 "configure"
 #include "confdefs.h"
-#include <iconv.h>
-int main() {
-
-        char **inbuf, **outbuf;
-        iconv_t cd;
-        size_t insz, outsz;
-        iconv(cd, inbuf, &insz, outbuf, &outsz);
-    
-; return 0; }
+#include <stdlib.h>
 EOF
-if { (eval echo configure:13179: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  wx_cv_iconv_takes_char=yes
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:13598: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+  :
 else
+  echo "$ac_err" >&5
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  wx_cv_iconv_takes_char=no
+  CXXCPP=/lib/cpp
 fi
 rm -f conftest*
-
+  ac_cv_prog_CXXCPP="$CXXCPP"
+ac_ext=C
+# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cxx_cross
 fi
+fi
+CXXCPP="$ac_cv_prog_CXXCPP"
+echo "$ac_t""$CXXCPP" 1>&6
 
-echo "$ac_t""$wx_cv_iconv_takes_char" 1>&6
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
 
-if test "$wx_cv_iconv_takes_char" = yes ; then
+  if test "$cross_compiling" = "yes"; then
     cat >> confdefs.h <<\EOF
-#define WX_ICONV_TAKES_CHAR 1
+#define wxUSE_IOSTREAMH 1
 EOF
 
-fi
+  else
+    
+    ac_ext=C
+# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cxx_cross
 
 
-if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes" -a "$wxUSE_UNIX" = "yes"; then
-    for ac_func in sigaction
+    for ac_hdr in iostream
 do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:13212: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:13642: checking for $ac_hdr" >&5
+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 13217 "configure"
+#line 13647 "configure"
 #include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char $ac_func();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-$ac_func();
-#endif
-
-; return 0; }
+#include <$ac_hdr>
 EOF
-if { (eval echo configure:13240: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:13652: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
   rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
+  eval "ac_cv_header_$ac_safe=yes"
 else
+  echo "$ac_err" >&5
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  eval "ac_cv_func_$ac_func=no"
+  eval "ac_cv_header_$ac_safe=no"
 fi
 rm -f conftest*
 fi
-
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
   cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
+#define $ac_tr_hdr 1
 EOF
  
 else
@@ -13261,14 +13675,34 @@ fi
 done
 
 
-    if test "$ac_cv_func_sigaction" = "no"; then
-        echo "configure: warning: No POSIX signal functions on this system, wxApp::OnFatalException will not be called" 1>&2
-        wxUSE_ON_FATAL_EXCEPTION=no
+    if test "$ac_cv_header_iostream" = "yes" ; then
+      :
+    else
+      cat >> confdefs.h <<\EOF
+#define wxUSE_IOSTREAMH 1
+EOF
+
     fi
 
-    if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes"; then
-      
-      ac_ext=C
+    ac_ext=c
+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cc_cross
+
+  fi
+
+
+
+  echo $ac_n "checking if C++ compiler supports bool""... $ac_c" 1>&6
+echo "configure:13700: checking if C++ compiler supports bool" >&5
+if eval "test \"`echo '$''{'wx_cv_cpp_bool'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  
+    
+    ac_ext=C
 # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
@@ -13276,243 +13710,208 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes
 cross_compiling=$ac_cv_prog_cxx_cross
 
 
-      echo $ac_n "checking for sa_handler type""... $ac_c" 1>&6
-echo "configure:13281: checking for sa_handler type" >&5
-if eval "test \"`echo '$''{'wx_cv_type_sa_handler'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-        cat > conftest.$ac_ext <<EOF
-#line 13287 "configure"
+    cat > conftest.$ac_ext <<EOF
+#line 13715 "configure"
 #include "confdefs.h"
-#include <signal.h>
+
+      
 int main() {
 
-                        extern void testSigHandler(int);
+        bool b = true;
 
-                        struct sigaction sa;
-                        sa.sa_handler = testSigHandler;
-                     
+        return 0;
+      
 ; return 0; }
 EOF
-if { (eval echo configure:13299: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13727: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
-                        wx_cv_type_sa_handler=int
-                     
+        wx_cv_cpp_bool=yes
+      
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
   
-                        wx_cv_type_sa_handler=void
-                     
-fi
-rm -f conftest*
+        wx_cv_cpp_bool=no
       
+    
 fi
+rm -f conftest*
 
-echo "$ac_t""$wx_cv_type_sa_handler" 1>&6
-
-      ac_ext=c
+    ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
 ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
 cross_compiling=$ac_cv_prog_cc_cross
 
+  
+fi
 
-      cat >> confdefs.h <<EOF
-#define wxTYPE_SA_HANDLER $wx_cv_type_sa_handler
+echo "$ac_t""$wx_cv_cpp_bool" 1>&6
+
+  if test "$wx_cv_cpp_bool" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define HAVE_BOOL 1
 EOF
 
-    fi
-fi
+  fi
 
-for ac_func in vfork
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:13336: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+
+
+echo $ac_n "checking for wcslen in -lc""... $ac_c" 1>&6
+echo "configure:13765: checking for wcslen in -lc" >&5
+ac_lib_var=`echo c'_'wcslen | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  cat > conftest.$ac_ext <<EOF
-#line 13341 "configure"
+  ac_save_LIBS="$LIBS"
+LIBS="-lc  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 13773 "configure"
 #include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func(); below.  */
-#include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
-char $ac_func();
+char wcslen();
 
 int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-$ac_func();
-#endif
-
+wcslen()
 ; return 0; }
 EOF
-if { (eval echo configure:13364: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13784: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
+  eval "ac_cv_lib_$ac_lib_var=yes"
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  eval "ac_cv_func_$ac_func=no"
+  eval "ac_cv_lib_$ac_lib_var=no"
 fi
 rm -f conftest*
-fi
+LIBS="$ac_save_LIBS"
 
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
+  
+            cat >> confdefs.h <<\EOF
+#define HAVE_WCSLEN 1
 EOF
- 
+
+            WCHAR_LINK=
+        
 else
   echo "$ac_t""no" 1>&6
-fi
-done
 
-
-if test "$wxUSE_SNGLINST_CHECKER" = "yes"; then
-    for ac_func in fcntl flock
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:13393: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+            echo $ac_n "checking for wcslen in -lw""... $ac_c" 1>&6
+echo "configure:13810: checking for wcslen in -lw" >&5
+ac_lib_var=`echo w'_'wcslen | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  cat > conftest.$ac_ext <<EOF
-#line 13398 "configure"
+  ac_save_LIBS="$LIBS"
+LIBS="-lw  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 13818 "configure"
 #include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func(); below.  */
-#include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
-char $ac_func();
+char wcslen();
 
 int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-$ac_func();
-#endif
-
+wcslen()
 ; return 0; }
 EOF
-if { (eval echo configure:13421: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13829: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
+  eval "ac_cv_lib_$ac_lib_var=yes"
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  eval "ac_cv_func_$ac_func=no"
+  eval "ac_cv_lib_$ac_lib_var=no"
 fi
 rm -f conftest*
-fi
+LIBS="$ac_save_LIBS"
 
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
+  
+                cat >> confdefs.h <<\EOF
+#define HAVE_WCSLEN 1
 EOF
- break
+
+                WCHAR_LINK=" -lw"
+            
 else
   echo "$ac_t""no" 1>&6
-fi
-done
-
-
-    if test "$ac_cv_func_fcntl" != "yes" -a "$ac_cv_func_flock" != "yes"; then
-        echo "configure: warning: wxSingleInstanceChecker not available" 1>&2
-        wxUSE_SNGLINST_CHECKER=no
-    fi
-fi
 
-for ac_func in timegm
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:13455: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+                echo $ac_n "checking for wcslen in -lmsvcrt""... $ac_c" 1>&6
+echo "configure:13855: checking for wcslen in -lmsvcrt" >&5
+ac_lib_var=`echo msvcrt'_'wcslen | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  cat > conftest.$ac_ext <<EOF
-#line 13460 "configure"
+  ac_save_LIBS="$LIBS"
+LIBS="-lmsvcrt  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 13863 "configure"
 #include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func(); below.  */
-#include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
-char $ac_func();
+char wcslen();
 
 int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-$ac_func();
-#endif
-
+wcslen()
 ; return 0; }
 EOF
-if { (eval echo configure:13483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13874: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
+  eval "ac_cv_lib_$ac_lib_var=yes"
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  eval "ac_cv_func_$ac_func=no"
+  eval "ac_cv_lib_$ac_lib_var=no"
 fi
 rm -f conftest*
-fi
+LIBS="$ac_save_LIBS"
 
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
+  
+                    cat >> confdefs.h <<\EOF
+#define HAVE_WCSLEN 1
 EOF
- 
+
+                    WCHAR_LINK=
+                
 else
   echo "$ac_t""no" 1>&6
 fi
-done
 
+            
+fi
+
+        
+fi
 
-for ac_func in putenv setenv
+
+for ac_func in wcsrtombs
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:13511: checking for $ac_func" >&5
+echo "configure:13910: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 13516 "configure"
+#line 13915 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -13535,7 +13934,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:13539: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13938: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -13553,327 +13952,322 @@ if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
   cat >> confdefs.h <<EOF
 #define $ac_tr_func 1
 EOF
- break
+ 
 else
   echo "$ac_t""no" 1>&6
 fi
 done
 
 
-HAVE_SOME_SLEEP_FUNC=0
-if test "$USE_BEOS" = 1; then
-            cat >> confdefs.h <<\EOF
-#define HAVE_SLEEP 1
-EOF
-
-    HAVE_SOME_SLEEP_FUNC=1
-fi
-
-if test "$USE_DARWIN" = 1; then
-            cat >> confdefs.h <<\EOF
-#define HAVE_USLEEP 1
-EOF
-
-    HAVE_SOME_SLEEP_FUNC=1
-fi
-
-if test "$HAVE_SOME_SLEEP_FUNC" != 1; then
-        POSIX4_LINK=
-    for ac_func in nanosleep
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:13586: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+echo $ac_n "checking for vprintf""... $ac_c" 1>&6
+echo "configure:13964: checking for vprintf" >&5
+if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 13591 "configure"
+#line 13969 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func(); below.  */
+    which can conflict with char vprintf(); below.  */
 #include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
-char $ac_func();
+char vprintf();
 
 int main() {
 
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+#if defined (__stub_vprintf) || defined (__stub___vprintf)
 choke me
 #else
-$ac_func();
+vprintf();
 #endif
 
 ; return 0; }
 EOF
-if { (eval echo configure:13614: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
- cat >> confdefs.h <<\EOF
-#define HAVE_NANOSLEEP 1
-EOF
-
-else
-  echo "$ac_t""no" 1>&6
-echo $ac_n "checking for nanosleep in -lposix4""... $ac_c" 1>&6
-echo "configure:13639: checking for nanosleep in -lposix4" >&5
-ac_lib_var=`echo posix4'_'nanosleep | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-lposix4  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 13647 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char nanosleep();
-
-int main() {
-nanosleep()
-; return 0; }
-EOF
-if { (eval echo configure:13658: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13992: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
+  eval "ac_cv_func_vprintf=yes"
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
+  eval "ac_cv_func_vprintf=no"
 fi
 rm -f conftest*
-LIBS="$ac_save_LIBS"
-
 fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+
+if eval "test \"`echo '$ac_cv_func_'vprintf`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-  
-                    cat >> confdefs.h <<\EOF
-#define HAVE_NANOSLEEP 1
+  cat >> confdefs.h <<\EOF
+#define HAVE_VPRINTF 1
 EOF
 
-                    POSIX4_LINK="-lposix4"
-                
 else
   echo "$ac_t""no" 1>&6
+fi
 
-                    for ac_func in usleep
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:13686: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+if test "$ac_cv_func_vprintf" != yes; then
+echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
+echo "configure:14016: checking for _doprnt" >&5
+if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 13691 "configure"
+#line 14021 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func(); below.  */
+    which can conflict with char _doprnt(); below.  */
 #include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
-char $ac_func();
+char _doprnt();
 
 int main() {
 
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+#if defined (__stub__doprnt) || defined (__stub____doprnt)
 choke me
 #else
-$ac_func();
+_doprnt();
 #endif
 
 ; return 0; }
 EOF
-if { (eval echo configure:13714: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14044: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
+  eval "ac_cv_func__doprnt=yes"
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  eval "ac_cv_func_$ac_func=no"
+  eval "ac_cv_func__doprnt=no"
 fi
 rm -f conftest*
 fi
 
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
+if eval "test \"`echo '$ac_cv_func_'_doprnt`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
- cat >> confdefs.h <<\EOF
-#define HAVE_USLEEP 1
+  cat >> confdefs.h <<\EOF
+#define HAVE_DOPRNT 1
 EOF
 
 else
   echo "$ac_t""no" 1>&6
-echo "configure: warning: wxSleep() function will not work" 1>&2
-                    
 fi
-done
 
-                
-            
 fi
 
-        
-    
-fi
-done
 
-fi
 
-for ac_func in uname gethostname
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:13757: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+
+
+
+echo $ac_n "checking for vsnprintf""... $ac_c" 1>&6
+echo "configure:14074: checking for vsnprintf" >&5
+if eval "test \"`echo '$''{'wx_cv_func_vsnprintf'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
+  
   cat > conftest.$ac_ext <<EOF
-#line 13762 "configure"
+#line 14080 "configure"
 #include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char $ac_func();
 
+                    #include <stdio.h>
+                    #include <stdarg.h>
+                 
 int main() {
 
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-$ac_func();
-#endif
+                    int wx_test_vsnprintf(const char *, ...);
+
+                    wx_test_vsnprintf("%s");
+                    return 0;
+                 }
+
+                 int wx_test_vsnprintf(const char *fmt, ...)
+                 {
+                    char *s;
 
+                    va_list argp;
+                    va_start(argp, fmt);
+                    vsnprintf(s, 42, fmt, argp);
+                    va_end(argp);
+                 
 ; return 0; }
 EOF
-if { (eval echo configure:13785: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14105: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
+  
+                    wx_cv_func_vsnprintf=yes
+                 
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  eval "ac_cv_func_$ac_func=no"
-fi
-rm -f conftest*
-fi
+  
+                    cat > conftest.$ac_ext <<EOF
+#line 14116 "configure"
+#include "confdefs.h"
 
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
+                                      #include <stdio.h>
+                                      #include <stdarg.h>
+                                   
+int main() {
+
+                                      int wx_test_vsnprintf(const char *, ...);
+
+                                      wx_test_vsnprintf("%s");
+                                      return 0;
+                                   }
+
+                                   int wx_test_vsnprintf(const char *fmt, ...)
+                                   {
+                                      char *s;
+
+                                      va_list argp;
+                                      va_start(argp, fmt);
+                                      _vsnprintf(s, 42, fmt, argp);
+                                      va_end(argp);
+                                   
+; return 0; }
 EOF
- break
+if { (eval echo configure:14141: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  
+                                      wx_cv_func_vsnprintf=yes
+                                   
 else
-  echo "$ac_t""no" 1>&6
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  
+                                      wx_cv_func_vsnprintf=no
+                                   
 fi
-done
+rm -f conftest*
+                 
+fi
+rm -f conftest*
 
+fi
 
+echo "$ac_t""$wx_cv_func_vsnprintf" 1>&6
 
-ac_ext=C
-# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cxx_cross
+if test "$wx_cv_func_vsnprintf" = yes; then
+    cat >> confdefs.h <<\EOF
+#define HAVE_VSNPRINTF 1
+EOF
 
+else
+    echo "configure: warning: unsafe function sprintf will be used instead of snprintf" 1>&2
+fi
 
-for ac_func in strtok_r
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:13822: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+echo $ac_n "checking for vsscanf""... $ac_c" 1>&6
+echo "configure:14173: checking for vsscanf" >&5
+if eval "test \"`echo '$''{'wx_cv_func_vsscanf'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
+  
   cat > conftest.$ac_ext <<EOF
-#line 13827 "configure"
+#line 14179 "configure"
 #include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char $ac_func();
 
+                    #include <stdio.h>
+                    #include <stdarg.h>
+                
 int main() {
 
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-$ac_func();
-#endif
+                    int wx_test_vsscanf(const char *, ...);
+
+                    wx_test_vsscanf("%d");
+                    return 0;
+                }
 
+                int wx_test_vsscanf(const char *fmt, ...)
+                {
+                    va_list argp;
+                    va_start(argp, fmt);
+                    vsscanf("42", fmt, argp);
+                    va_end(argp);
+                
 ; return 0; }
 EOF
-if { (eval echo configure:13853: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14202: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
+  
+                    wx_cv_func_vsscanf=yes
+                
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  eval "ac_cv_func_$ac_func=no"
+  
+                    wx_cv_func_vsscanf=no
+                
 fi
 rm -f conftest*
+
 fi
 
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
+echo "$ac_t""$wx_cv_func_vsscanf" 1>&6
+
+if test "$wx_cv_func_vsscanf" = yes; then
+    cat >> confdefs.h <<\EOF
+#define HAVE_VSSCANF 1
 EOF
- 
+
+fi
+
+if test "$TOOLKIT" != "MSW"; then
+
+
+
+ac_ext=C
+# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cxx_cross
+
+echo $ac_n "checking if iconv() takes char**""... $ac_c" 1>&6
+echo "configure:14240: checking if iconv() takes char**" >&5
+if eval "test \"`echo '$''{'wx_cv_iconv_takes_char'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
 else
-  echo "$ac_t""no" 1>&6
+  
+    cat > conftest.$ac_ext <<EOF
+#line 14246 "configure"
+#include "confdefs.h"
+#include <iconv.h>
+int main() {
+
+        char **inbuf, **outbuf;
+        iconv_t cd;
+        size_t insz, outsz;
+        iconv(cd, inbuf, &insz, outbuf, &outsz);
+    
+; return 0; }
+EOF
+if { (eval echo configure:14258: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  wx_cv_iconv_takes_char=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  wx_cv_iconv_takes_char=no
 fi
-done
+rm -f conftest*
 
+fi
 
+echo "$ac_t""$wx_cv_iconv_takes_char" 1>&6
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 ac_cpp='$CPP $CPPFLAGS'
@@ -13881,17 +14275,24 @@ ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
 ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
 cross_compiling=$ac_cv_prog_cc_cross
 
+if test "$wx_cv_iconv_takes_char" = yes ; then
+    cat >> confdefs.h <<\EOF
+#define WX_ICONV_TAKES_CHAR 1
+EOF
+
+fi
+
 
-INET_LINK=
-for ac_func in inet_addr
+if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes" -a "$wxUSE_UNIX" = "yes"; then
+    for ac_func in sigaction
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:13890: checking for $ac_func" >&5
+echo "configure:14291: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 13895 "configure"
+#line 14296 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -13914,7 +14315,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:13918: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14319: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -13932,109 +14333,90 @@ if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
   cat >> confdefs.h <<EOF
 #define $ac_tr_func 1
 EOF
- cat >> confdefs.h <<\EOF
-#define HAVE_INET_ADDR 1
-EOF
-
+ 
 else
   echo "$ac_t""no" 1>&6
-echo $ac_n "checking for inet_addr in -lnsl""... $ac_c" 1>&6
-echo "configure:13943: checking for inet_addr in -lnsl" >&5
-ac_lib_var=`echo nsl'_'inet_addr | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-lnsl  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 13951 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char inet_addr();
-
-int main() {
-inet_addr()
-; return 0; }
-EOF
-if { (eval echo configure:13962: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
 fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
+done
 
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  INET_LINK="nsl"
-else
-  echo "$ac_t""no" 1>&6
-echo $ac_n "checking for inet_addr in -lresolv""... $ac_c" 1>&6
-echo "configure:13981: checking for inet_addr in -lresolv" >&5
-ac_lib_var=`echo resolv'_'inet_addr | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+
+    if test "$ac_cv_func_sigaction" = "no"; then
+        echo "configure: warning: No POSIX signal functions on this system, wxApp::OnFatalException will not be called" 1>&2
+        wxUSE_ON_FATAL_EXCEPTION=no
+    fi
+
+    if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes"; then
+      
+      ac_ext=C
+# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cxx_cross
+
+
+      echo $ac_n "checking for sa_handler type""... $ac_c" 1>&6
+echo "configure:14360: checking for sa_handler type" >&5
+if eval "test \"`echo '$''{'wx_cv_type_sa_handler'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  ac_save_LIBS="$LIBS"
-LIBS="-lresolv  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 13989 "configure"
+  
+        cat > conftest.$ac_ext <<EOF
+#line 14366 "configure"
 #include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char inet_addr();
-
+#include <signal.h>
 int main() {
-inet_addr()
+
+                        extern void testSigHandler(int);
+
+                        struct sigaction sa;
+                        sa.sa_handler = testSigHandler;
+                     
 ; return 0; }
 EOF
-if { (eval echo configure:14000: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14378: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
+  
+                        wx_cv_type_sa_handler=int
+                     
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
+  
+                        wx_cv_type_sa_handler=void
+                     
 fi
 rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  INET_LINK="resolv"
-            
-else
-  echo "$ac_t""no" 1>&6
+      
 fi
 
-        
-fi
+echo "$ac_t""$wx_cv_type_sa_handler" 1>&6
 
-    
+      ac_ext=c
+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cc_cross
 
-fi
-done
 
+      cat >> confdefs.h <<EOF
+#define wxTYPE_SA_HANDLER $wx_cv_type_sa_handler
+EOF
+
+    fi
+fi
 
-for ac_func in inet_aton
+for ac_func in vfork
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:14033: checking for $ac_func" >&5
+echo "configure:14415: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 14038 "configure"
+#line 14420 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -14057,7 +14439,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:14061: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14443: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -14075,286 +14457,246 @@ if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
   cat >> confdefs.h <<EOF
 #define $ac_tr_func 1
 EOF
- cat >> confdefs.h <<\EOF
-#define HAVE_INET_ATON 1
-EOF
-
+ 
 else
   echo "$ac_t""no" 1>&6
-            echo $ac_n "checking for inet_aton in -l$INET_LINK""... $ac_c" 1>&6
-echo "configure:14086: checking for inet_aton in -l$INET_LINK" >&5
-ac_lib_var=`echo $INET_LINK'_'inet_aton | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+fi
+done
+
+
+echo $ac_n "checking for statfs""... $ac_c" 1>&6
+echo "configure:14469: checking for statfs" >&5
+if eval "test \"`echo '$''{'wx_cv_func_statfs'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  ac_save_LIBS="$LIBS"
-LIBS="-l$INET_LINK  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 14094 "configure"
+  cat > conftest.$ac_ext <<EOF
+#line 14474 "configure"
 #include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char inet_aton();
 
+             #if defined(__BSD__)
+               #include <sys/param.h>
+               #include <sys/mount.h>
+             #else
+               #include <sys/vfs.h>
+             #endif
+        
 int main() {
-inet_aton()
+
+             long l;
+             struct statfs fs;
+             statfs("/", &fs);
+             l = fs.f_bsize;
+             l += fs.f_blocks;
+             l += fs.f_bavail;
+        
 ; return 0; }
 EOF
-if { (eval echo configure:14105: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14495: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
+  
+             wx_cv_func_statfs=yes
+        
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
+  
+             wx_cv_func_statfs=no
+        
+    
 fi
 rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  cat >> confdefs.h <<\EOF
-#define HAVE_INET_ATON 1
-EOF
-
-else
-  echo "$ac_t""no" 1>&6
-fi
 
-        
 fi
-done
 
+echo "$ac_t""$wx_cv_func_statfs" 1>&6
 
-if test "x$INET_LINK" != "x"; then
+if test "$wx_cv_func_statfs" = "yes"; then
     cat >> confdefs.h <<\EOF
-#define HAVE_INET_ADDR 1
+#define HAVE_STATFS 1
 EOF
 
-    INET_LINK="-l$INET_LINK"
-fi
-
-fi
-
-
-cat > confcache <<\EOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs.  It is not useful on other systems.
-# If it contains results you don't want to keep, you may remove or edit it.
-#
-# By default, configure uses ./config.cache as the cache file,
-# creating it if it does not exist already.  You can give configure
-# the --cache-file=FILE option to use a different cache file; that is
-# what configure does when it calls configure scripts in
-# subdirectories, so they share the cache.
-# Giving --cache-file=/dev/null disables caching, for debugging configure.
-# config.status only pays attention to the cache file if you give it the
-# --recheck option to rerun configure.
-#
-EOF
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(set) 2>&1 |
-  case `(ac_space=' '; set | grep ac_space) 2>&1` in
-  *ac_space=\ *)
-    # `set' does not quote correctly, so add quotes (double-quote substitution
-    # turns \\\\ into \\, and sed turns \\ into \).
-    sed -n \
-      -e "s/'/'\\\\''/g" \
-      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
-    ;;
-  *)
-    # `set' quotes correctly as required by POSIX, so do not add quotes.
-    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
-    ;;
-  esac >> confcache
-if cmp -s $cache_file confcache; then
-  :
 else
-  if test -w $cache_file; then
-    echo "updating cache $cache_file"
-    cat confcache > $cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-
-
-
-if test "$TOOLKIT" != "MSW"; then
-
-
-THREADS_LINK=""
-THREADS_OBJ=""
-
-if test "$wxUSE_THREADS" = "yes" ; then
-    if test "$wxUSE_WINE" = 1 ; then
-        echo "configure: warning: Threads are not supported under WINE" 1>&2
-        wxUSE_THREADS="no"
-    elif test "$USE_BEOS" = 1; then
-        echo "configure: warning: BeOS threads are not yet supported" 1>&2
-        wxUSE_THREADS="no"
-    fi
-fi
-
-if test "$wxUSE_THREADS" = "yes" ; then
-    
-        if test "$USE_AIX" = 1; then
-        THREADS_LIB=pthreads
-    else
-        THREADS_LIB=pthread
-    fi
-
-                echo $ac_n "checking for pthread_create in -l$THREADS_LIB""... $ac_c" 1>&6
-echo "configure:14218: checking for pthread_create in -l$THREADS_LIB" >&5
-ac_lib_var=`echo $THREADS_LIB'_'pthread_create | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+    echo $ac_n "checking for statvfs""... $ac_c" 1>&6
+echo "configure:14522: checking for statvfs" >&5
+if eval "test \"`echo '$''{'wx_cv_func_statvfs'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-l$THREADS_LIB  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 14226 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char pthread_create();
+else
+  cat > conftest.$ac_ext <<EOF
+#line 14527 "configure"
+#include "confdefs.h"
 
+                 #include <sys/statvfs.h>
+            
 int main() {
-pthread_create()
+
+                 long l;
+                 struct statvfs fs;
+                 statvfs("/", &fs);
+                 l = fs.f_bsize;
+                 l += fs.f_blocks;
+                 l += fs.f_bavail;
+            
 ; return 0; }
 EOF
-if { (eval echo configure:14237: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14543: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
+  
+                 wx_cv_func_statvfs=yes
+            
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
+  
+                 wx_cv_func_statvfs=no
+            
+        
 fi
 rm -f conftest*
-LIBS="$ac_save_LIBS"
+    
+fi
+
+echo "$ac_t""$wx_cv_func_statvfs" 1>&6
+
+    if test "$wx_cv_func_statvfs" = "yes"; then
+        cat >> confdefs.h <<\EOF
+#define HAVE_STATVFS 1
+EOF
 
+    else
+        echo "configure: warning: wxGetDiskSpace() function won't work without statfs()" 1>&2
+    fi
 fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  
-            THREADS_OBJ="threadpsx.lo"
-            THREADS_LINK=$THREADS_LIB
-        
-else
-  echo "$ac_t""no" 1>&6
 
-                        echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6
-echo "configure:14260: checking for pthread_create in -lc_r" >&5
-ac_lib_var=`echo c_r'_'pthread_create | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+if test "$wxUSE_SNGLINST_CHECKER" = "yes"; then
+    for ac_func in fcntl flock
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:14577: checking for $ac_func" >&5
+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  ac_save_LIBS="$LIBS"
-LIBS="-lc_r  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 14268 "configure"
+  cat > conftest.$ac_ext <<EOF
+#line 14582 "configure"
 #include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func(); below.  */
+#include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
-char pthread_create();
+char $ac_func();
 
 int main() {
-pthread_create()
+
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+$ac_func();
+#endif
+
 ; return 0; }
 EOF
-if { (eval echo configure:14279: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14605: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
+  eval "ac_cv_func_$ac_func=yes"
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
+  eval "ac_cv_func_$ac_func=no"
 fi
 rm -f conftest*
-LIBS="$ac_save_LIBS"
-
 fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-  
-                THREADS_OBJ="threadpsx.lo"
-                THREADS_LINK="c_r"
-            
+    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+ break
 else
   echo "$ac_t""no" 1>&6
+fi
+done
 
-                                ac_safe=`echo "sys/prctl.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for sys/prctl.h""... $ac_c" 1>&6
-echo "configure:14303: checking for sys/prctl.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+
+    if test "$ac_cv_func_fcntl" != "yes" -a "$ac_cv_func_flock" != "yes"; then
+        echo "configure: warning: wxSingleInstanceChecker not available" 1>&2
+        wxUSE_SNGLINST_CHECKER=no
+    fi
+fi
+
+for ac_func in timegm
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:14639: checking for $ac_func" >&5
+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 14308 "configure"
+#line 14644 "configure"
 #include "confdefs.h"
-#include <sys/prctl.h>
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func(); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char $ac_func();
+
+int main() {
+
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+$ac_func();
+#endif
+
+; return 0; }
 EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14313: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
+if { (eval echo configure:14667: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
+  eval "ac_cv_func_$ac_func=yes"
 else
-  echo "$ac_err" >&5
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
+  eval "ac_cv_func_$ac_func=no"
 fi
 rm -f conftest*
 fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-  
-                    THREADS_OBJ="threadsgi.lo"
-                
+    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+ 
 else
   echo "$ac_t""no" 1>&6
 fi
+done
 
-            
-fi
-
-        
-fi
-
-
-    if test -z "$THREADS_OBJ" ; then
-        wxUSE_THREADS=no
-        echo "configure: warning: No thread support on this system" 1>&2
-    fi
-fi
 
-if test "$wxUSE_THREADS" = "yes" ; then
-  for ac_func in thr_setconcurrency
+for ac_func in putenv setenv
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:14353: checking for $ac_func" >&5
+echo "configure:14695: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 14358 "configure"
+#line 14700 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -14377,7 +14719,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:14381: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14723: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -14395,76 +14737,108 @@ if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
   cat >> confdefs.h <<EOF
 #define $ac_tr_func 1
 EOF
- 
+ break
 else
   echo "$ac_t""no" 1>&6
 fi
 done
 
 
-                            
-  for ac_hdr in sched.h
+HAVE_SOME_SLEEP_FUNC=0
+if test "$USE_BEOS" = 1; then
+            cat >> confdefs.h <<\EOF
+#define HAVE_SLEEP 1
+EOF
+
+    HAVE_SOME_SLEEP_FUNC=1
+fi
+
+if test "$USE_DARWIN" = 1; then
+            cat >> confdefs.h <<\EOF
+#define HAVE_USLEEP 1
+EOF
+
+    HAVE_SOME_SLEEP_FUNC=1
+fi
+
+if test "$HAVE_SOME_SLEEP_FUNC" != 1; then
+        POSIX4_LINK=
+    for ac_func in nanosleep
 do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:14411: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:14770: checking for $ac_func" >&5
+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 14416 "configure"
+#line 14775 "configure"
 #include "confdefs.h"
-#include <$ac_hdr>
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func(); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char $ac_func();
+
+int main() {
+
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+$ac_func();
+#endif
+
+; return 0; }
 EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14421: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
+if { (eval echo configure:14798: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
+  eval "ac_cv_func_$ac_func=yes"
 else
-  echo "$ac_err" >&5
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
+  eval "ac_cv_func_$ac_func=no"
 fi
 rm -f conftest*
 fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
   cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
+#define $ac_tr_func 1
 EOF
- 
+ cat >> confdefs.h <<\EOF
+#define HAVE_NANOSLEEP 1
+EOF
+
 else
   echo "$ac_t""no" 1>&6
-fi
-done
-
-
-  echo $ac_n "checking for sched_yield in -l$THREADS_LINK""... $ac_c" 1>&6
-echo "configure:14449: checking for sched_yield in -l$THREADS_LINK" >&5
-ac_lib_var=`echo $THREADS_LINK'_'sched_yield | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for nanosleep in -lposix4""... $ac_c" 1>&6
+echo "configure:14823: checking for nanosleep in -lposix4" >&5
+ac_lib_var=`echo posix4'_'nanosleep | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
-LIBS="-l$THREADS_LINK  $LIBS"
+LIBS="-lposix4  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 14457 "configure"
+#line 14831 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
-char sched_yield();
+char nanosleep();
 
 int main() {
-sched_yield()
+nanosleep()
 ; return 0; }
 EOF
-if { (eval echo configure:14468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14842: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -14479,257 +14853,296 @@ LIBS="$ac_save_LIBS"
 fi
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-  cat >> confdefs.h <<\EOF
-#define HAVE_SCHED_YIELD 1
+  
+                    cat >> confdefs.h <<\EOF
+#define HAVE_NANOSLEEP 1
 EOF
 
+                    POSIX4_LINK=" -lposix4"
+                
 else
   echo "$ac_t""no" 1>&6
-echo $ac_n "checking for sched_yield in -lposix4""... $ac_c" 1>&6
-echo "configure:14490: checking for sched_yield in -lposix4" >&5
-ac_lib_var=`echo posix4'_'sched_yield | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+
+                    for ac_func in usleep
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:14870: checking for $ac_func" >&5
+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  ac_save_LIBS="$LIBS"
-LIBS="-lposix4  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 14498 "configure"
+  cat > conftest.$ac_ext <<EOF
+#line 14875 "configure"
 #include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func(); below.  */
+#include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
-char sched_yield();
+char $ac_func();
 
 int main() {
-sched_yield()
+
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+$ac_func();
+#endif
+
 ; return 0; }
 EOF
-if { (eval echo configure:14509: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14898: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
+  eval "ac_cv_func_$ac_func=yes"
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
+  eval "ac_cv_func_$ac_func=no"
 fi
 rm -f conftest*
-LIBS="$ac_save_LIBS"
-
 fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-  cat >> confdefs.h <<\EOF
-#define HAVE_SCHED_YIELD 1
+    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+ cat >> confdefs.h <<\EOF
+#define HAVE_USLEEP 1
 EOF
- POSIX4_LINK="-lposix4"
+
 else
   echo "$ac_t""no" 1>&6
-echo "configure: warning: wxThread::Yield will not work properly" 1>&2
+echo "configure: warning: wxSleep() function will not work" 1>&2
+                    
+fi
+done
+
                 
+            
 fi
 
-               
+        
+    
 fi
+done
 
+fi
 
-              HAVE_PRIOR_FUNCS=0
-  echo $ac_n "checking for pthread_attr_getschedpolicy in -l$THREADS_LINK""... $ac_c" 1>&6
-echo "configure:14540: checking for pthread_attr_getschedpolicy in -l$THREADS_LINK" >&5
-ac_lib_var=`echo $THREADS_LINK'_'pthread_attr_getschedpolicy | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+for ac_func in uname gethostname
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:14941: checking for $ac_func" >&5
+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  ac_save_LIBS="$LIBS"
-LIBS="-l$THREADS_LINK  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 14548 "configure"
+  cat > conftest.$ac_ext <<EOF
+#line 14946 "configure"
 #include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func(); below.  */
+#include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
-char pthread_attr_getschedpolicy();
+char $ac_func();
 
 int main() {
-pthread_attr_getschedpolicy()
+
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+$ac_func();
+#endif
+
 ; return 0; }
 EOF
-if { (eval echo configure:14559: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14969: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
+  eval "ac_cv_func_$ac_func=yes"
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
+  eval "ac_cv_func_$ac_func=no"
 fi
 rm -f conftest*
-LIBS="$ac_save_LIBS"
-
 fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  echo $ac_n "checking for pthread_attr_setschedparam in -l$THREADS_LINK""... $ac_c" 1>&6
-echo "configure:14575: checking for pthread_attr_setschedparam in -l$THREADS_LINK" >&5
-ac_lib_var=`echo $THREADS_LINK'_'pthread_attr_setschedparam | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-l$THREADS_LINK  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 14583 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char pthread_attr_setschedparam();
 
-int main() {
-pthread_attr_setschedparam()
-; return 0; }
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
 EOF
-if { (eval echo configure:14594: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
+ break
 else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
+  echo "$ac_t""no" 1>&6
 fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
+done
 
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  echo $ac_n "checking for sched_get_priority_max in -l$THREADS_LINK""... $ac_c" 1>&6
-echo "configure:14610: checking for sched_get_priority_max in -l$THREADS_LINK" >&5
-ac_lib_var=`echo $THREADS_LINK'_'sched_get_priority_max | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+
+
+ac_ext=C
+# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cxx_cross
+
+
+for ac_func in strtok_r
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:15006: checking for $ac_func" >&5
+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  ac_save_LIBS="$LIBS"
-LIBS="-l$THREADS_LINK  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 14618 "configure"
+  cat > conftest.$ac_ext <<EOF
+#line 15011 "configure"
 #include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func(); below.  */
+#include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
-char sched_get_priority_max();
+char $ac_func();
 
 int main() {
-sched_get_priority_max()
+
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+$ac_func();
+#endif
+
 ; return 0; }
 EOF
-if { (eval echo configure:14629: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15037: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
+  eval "ac_cv_func_$ac_func=yes"
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
+  eval "ac_cv_func_$ac_func=no"
 fi
 rm -f conftest*
-LIBS="$ac_save_LIBS"
-
 fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-  HAVE_PRIOR_FUNCS=1
+    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+ 
 else
   echo "$ac_t""no" 1>&6
-echo $ac_n "checking for sched_get_priority_max in -lposix4""... $ac_c" 1>&6
-echo "configure:14648: checking for sched_get_priority_max in -lposix4" >&5
-ac_lib_var=`echo posix4'_'sched_get_priority_max | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+fi
+done
+
+
+ac_ext=c
+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cc_cross
+
+
+INET_LINK=
+for ac_func in inet_addr
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:15074: checking for $ac_func" >&5
+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  ac_save_LIBS="$LIBS"
-LIBS="-lposix4  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 14656 "configure"
+  cat > conftest.$ac_ext <<EOF
+#line 15079 "configure"
 #include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func(); below.  */
+#include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
-char sched_get_priority_max();
+char $ac_func();
 
 int main() {
-sched_get_priority_max()
+
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+$ac_func();
+#endif
+
 ; return 0; }
 EOF
-if { (eval echo configure:14667: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15102: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
+  eval "ac_cv_func_$ac_func=yes"
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
+  eval "ac_cv_func_$ac_func=no"
 fi
 rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  
-                            HAVE_PRIOR_FUNCS=1
-                            POSIX4_LINK="-lposix4"
-                         
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-                   
 fi
 
-                 
-else
-  echo "$ac_t""no" 1>&6
-fi
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+ cat >> confdefs.h <<\EOF
+#define HAVE_INET_ADDR 1
+EOF
 
-               
 else
   echo "$ac_t""no" 1>&6
-fi
-
-
-  if test "$HAVE_PRIOR_FUNCS" = 1; then
-    cat >> confdefs.h <<\EOF
-#define HAVE_THREAD_PRIORITY_FUNCTIONS 1
-EOF
-
-  else
-    echo "configure: warning: Setting thread priority will not work" 1>&2
-  fi
-
-  echo $ac_n "checking for pthread_cancel in -l$THREADS_LINK""... $ac_c" 1>&6
-echo "configure:14714: checking for pthread_cancel in -l$THREADS_LINK" >&5
-ac_lib_var=`echo $THREADS_LINK'_'pthread_cancel | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for inet_addr in -lnsl""... $ac_c" 1>&6
+echo "configure:15127: checking for inet_addr in -lnsl" >&5
+ac_lib_var=`echo nsl'_'inet_addr | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
-LIBS="-l$THREADS_LINK  $LIBS"
+LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 14722 "configure"
+#line 15135 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
-char pthread_cancel();
+char inet_addr();
 
 int main() {
-pthread_cancel()
+inet_addr()
 ; return 0; }
 EOF
-if { (eval echo configure:14733: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15146: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -14744,416 +15157,345 @@ LIBS="$ac_save_LIBS"
 fi
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-  cat >> confdefs.h <<\EOF
-#define HAVE_PTHREAD_CANCEL 1
-EOF
-
+  INET_LINK="nsl"
 else
   echo "$ac_t""no" 1>&6
-echo "configure: warning: wxThread::Kill() will not work properly" 1>&2
-fi
-
-
-  echo $ac_n "checking for pthread_cleanup_push/pop""... $ac_c" 1>&6
-echo "configure:14759: checking for pthread_cleanup_push/pop" >&5
-if eval "test \"`echo '$''{'wx_cv_func_pthread_cleanup_push'+set}'`\" = set"; then
+echo $ac_n "checking for inet_addr in -lresolv""... $ac_c" 1>&6
+echo "configure:15165: checking for inet_addr in -lresolv" >&5
+ac_lib_var=`echo resolv'_'inet_addr | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-    cat > conftest.$ac_ext <<EOF
-#line 14765 "configure"
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-lresolv  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 15173 "configure"
 #include "confdefs.h"
-#include <pthread.h>
-int main() {
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char inet_addr();
 
-                    pthread_cleanup_push(NULL, NULL);
-                    pthread_cleanup_pop(0);
-                 
+int main() {
+inet_addr()
 ; return 0; }
 EOF
-if { (eval echo configure:14775: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:15184: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  
-                    wx_cv_func_pthread_cleanup_push=yes
-                 
+  eval "ac_cv_lib_$ac_lib_var=yes"
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  
-                    wx_cv_func_pthread_cleanup_push=no
-                 
+  eval "ac_cv_lib_$ac_lib_var=no"
 fi
 rm -f conftest*
-  
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  INET_LINK="resolv"
+            
+else
+  echo "$ac_t""no" 1>&6
 fi
 
-echo "$ac_t""$wx_cv_func_pthread_cleanup_push" 1>&6
+        
+fi
 
-  if test "$wx_cv_func_pthread_cleanup_push" = "yes"; then
-      cat >> confdefs.h <<\EOF
-#define HAVE_THREAD_CLEANUP_FUNCTIONS 1
-EOF
+    
 
-  fi
+fi
+done
 
-                
-      if test "x$wx_lib_glibc21" = "xyes"; then
-      CFLAGS="$CFLAGS -D_XOPEN_SOURCE=500"
-  fi
 
-  echo $ac_n "checking for pthread_mutexattr_t""... $ac_c" 1>&6
-echo "configure:14807: checking for pthread_mutexattr_t" >&5
-if eval "test \"`echo '$''{'wx_cv_type_pthread_mutexattr_t'+set}'`\" = set"; then
+for ac_func in inet_aton
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:15217: checking for $ac_func" >&5
+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  
-    cat > conftest.$ac_ext <<EOF
-#line 14813 "configure"
+  cat > conftest.$ac_ext <<EOF
+#line 15222 "configure"
 #include "confdefs.h"
-#include <pthread.h>
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func(); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char $ac_func();
+
 int main() {
 
-           pthread_mutexattr_t attr;
-           pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
-        
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+$ac_func();
+#endif
+
 ; return 0; }
 EOF
-if { (eval echo configure:14823: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:15245: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  
-           wx_cv_type_pthread_mutexattr_t=yes
-        
+  eval "ac_cv_func_$ac_func=yes"
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  
-           wx_cv_type_pthread_mutexattr_t=no
-        
-    
+  eval "ac_cv_func_$ac_func=no"
 fi
 rm -f conftest*
-  
 fi
 
-echo "$ac_t""$wx_cv_type_pthread_mutexattr_t" 1>&6
-
-  if test "$wx_cv_type_pthread_mutexattr_t" = "yes"; then
-    cat >> confdefs.h <<\EOF
-#define HAVE_PTHREAD_MUTEXATTR_T 1
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+ cat >> confdefs.h <<\EOF
+#define HAVE_INET_ATON 1
 EOF
 
-  else
-        echo $ac_n "checking for PTHREAD_RECURSIVE_MUTEX_INITIALIZER""... $ac_c" 1>&6
-echo "configure:14850: checking for PTHREAD_RECURSIVE_MUTEX_INITIALIZER" >&5
-if eval "test \"`echo '$''{'wx_cv_type_pthread_rec_mutex_init'+set}'`\" = set"; then
+else
+  echo "$ac_t""no" 1>&6
+            echo $ac_n "checking for inet_aton in -l$INET_LINK""... $ac_c" 1>&6
+echo "configure:15270: checking for inet_aton in -l$INET_LINK" >&5
+ac_lib_var=`echo $INET_LINK'_'inet_aton | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  
-        cat > conftest.$ac_ext <<EOF
-#line 14856 "configure"
+  ac_save_LIBS="$LIBS"
+LIBS="-l$INET_LINK  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 15278 "configure"
 #include "confdefs.h"
-#include <pthread.h>
-int main() {
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char inet_aton();
 
-                pthread_mutex_t attr = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
-            
+int main() {
+inet_aton()
 ; return 0; }
 EOF
-if { (eval echo configure:14865: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:15289: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  
-                wx_cv_type_pthread_rec_mutex_init=yes
-            
+  eval "ac_cv_lib_$ac_lib_var=yes"
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  
-                wx_cv_type_pthread_rec_mutex_init=no
-            
-        
+  eval "ac_cv_lib_$ac_lib_var=no"
 fi
 rm -f conftest*
-    
-fi
-
-echo "$ac_t""$wx_cv_type_pthread_rec_mutex_init" 1>&6
-    if test "$wx_cv_type_pthread_rec_mutex_init" = "yes"; then
-      cat >> confdefs.h <<\EOF
-#define HAVE_PTHREAD_RECURSIVE_MUTEX_INITIALIZER 1
-EOF
-
-    else
-            echo "configure: warning: wxMutex won't be recursive on this platform" 1>&2
-    fi
-  fi
-
-  THREADS_LINK="-l$THREADS_LINK"
-
-      if test "$USE_SOLARIS" = "yes" -a "$GCC" != "yes"; then
-      CFLAGS="${CFLAGS} -mt"
-      CXXFLAGS="${CXXFLAGS} -mt"
-      LDFLAGS="${LDFLAGS} -mt"
-  fi
-fi
+LIBS="$ac_save_LIBS"
 
 fi
-
-if test "$wxUSE_THREADS" = "yes"; then
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
   cat >> confdefs.h <<\EOF
-#define wxUSE_THREADS 1
+#define HAVE_INET_ATON 1
 EOF
 
-
-    if test "$USE_DARWIN" != 1; then
-    CFLAGS="${CFLAGS} -D_REENTRANT"
-    CXXFLAGS="${CXXFLAGS} -D_REENTRANT"
-  fi
-
-  SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS thread"
 else
-      if test "$ac_cv_func_strtok_r" = "yes"; then
-    echo $ac_n "checking if -D_REENTRANT is needed""... $ac_c" 1>&6
-echo "configure:14920: checking if -D_REENTRANT is needed" >&5
-    if test "$NEEDS_D_REENTRANT_FOR_R_FUNCS" = 1; then
-        CFLAGS="${CFLAGS} -D_REENTRANT"
-        CXXFLAGS="${CXXFLAGS} -D_REENTRANT"
-        echo "$ac_t""yes" 1>&6
-    else
-        echo "$ac_t""no" 1>&6
-    fi
-  fi
+  echo "$ac_t""no" 1>&6
 fi
 
-if test "$WXGTK20" = 1 ; then
-  cat >> confdefs.h <<EOF
-#define __WXGTK20__ $WXGTK20
-EOF
-
-  WXGTK12=1
+        
 fi
+done
 
-if test "$WXGTK12" = 1 ; then
-  cat >> confdefs.h <<EOF
-#define __WXGTK12__ $WXGTK12
-EOF
-
-fi
 
-if test "$WXGTK127" = 1 ; then
-  cat >> confdefs.h <<EOF
-#define __WXGTK127__ $WXGTK127
+if test "x$INET_LINK" != "x"; then
+    cat >> confdefs.h <<\EOF
+#define HAVE_INET_ADDR 1
 EOF
 
+    INET_LINK=" -l$INET_LINK"
 fi
 
-if test "$WXWINE" = 1 ; then
-  TOOLKIT_DEF="${TOOLKIT_DEF} -D__WXWINE__"
 fi
 
-if test "$wxUSE_MAC" = 1 ; then
-  TOOLKIT_DEF="${TOOLKIT_DEF} -DTARGET_CARBON"
-  CFLAGS="${CFLAGS} -fpascal-strings"
-  CPPFLAGS="${CPPFLAGS} -cpp-precomp -fpascal-strings"
-  # Extract the first word of "Rez", so it can be a program name with args.
-set dummy Rez; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:14964: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_REZ'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$REZ"; then
-  ac_cv_prog_REZ="$REZ" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_REZ="Rez"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_REZ" && ac_cv_prog_REZ="/Developer/Tools/Rez"
-fi
-fi
-REZ="$ac_cv_prog_REZ"
-if test -n "$REZ"; then
-  echo "$ac_t""$REZ" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
 
-  # Extract the first word of "Derez", so it can be a program name with args.
-set dummy Derez; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:14994: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_DEREZ'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$DEREZ"; then
-  ac_cv_prog_DEREZ="$DEREZ" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_DEREZ="Derez"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_DEREZ" && ac_cv_prog_DEREZ="/Developer/Tools/Derez"
-fi
-fi
-DEREZ="$ac_cv_prog_DEREZ"
-if test -n "$DEREZ"; then
-  echo "$ac_t""$DEREZ" 1>&6
+cat > confcache <<\EOF
+# This file is a shell script that caches the results of configure
+# tests run on this system so they can be shared between configure
+# scripts and configure runs.  It is not useful on other systems.
+# If it contains results you don't want to keep, you may remove or edit it.
+#
+# By default, configure uses ./config.cache as the cache file,
+# creating it if it does not exist already.  You can give configure
+# the --cache-file=FILE option to use a different cache file; that is
+# what configure does when it calls configure scripts in
+# subdirectories, so they share the cache.
+# Giving --cache-file=/dev/null disables caching, for debugging configure.
+# config.status only pays attention to the cache file if you give it the
+# --recheck option to rerun configure.
+#
+EOF
+# The following way of writing the cache mishandles newlines in values,
+# but we know of no workaround that is simple, portable, and efficient.
+# So, don't put newlines in cache variables' values.
+# Ultrix sh set writes to stderr and can't be redirected directly,
+# and sets the high bit in the cache file unless we assign to the vars.
+(set) 2>&1 |
+  case `(ac_space=' '; set | grep ac_space) 2>&1` in
+  *ac_space=\ *)
+    # `set' does not quote correctly, so add quotes (double-quote substitution
+    # turns \\\\ into \\, and sed turns \\ into \).
+    sed -n \
+      -e "s/'/'\\\\''/g" \
+      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
+    ;;
+  *)
+    # `set' quotes correctly as required by POSIX, so do not add quotes.
+    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
+    ;;
+  esac >> confcache
+if cmp -s $cache_file confcache; then
+  :
 else
-  echo "$ac_t""no" 1>&6
-fi
-
-  RESCOMP=${REZ}
-  REZFLAGS="-d __UNIX__ -useDF"
-  DEREZFLAGS="Carbon.r -useDF"
-  RESFLAGS="Carbon.r -t APPL"
-  LIBWXMACRES="\$(LIBWX_MACRES)"
-  LIBWXMACRESCOMP="\$(LIBWX_MACRESCOMP)"
-fi
-
-if test "$wxUSE_CYGWIN" = 1 ; then
-  TOOLKIT_DEF="${TOOLKIT_DEF} -D__WIN95__"
+  if test -w $cache_file; then
+    echo "updating cache $cache_file"
+    cat confcache > $cache_file
+  else
+    echo "not updating unwritable cache $cache_file"
+  fi
 fi
+rm -f confcache
 
-WXDEBUG=
-
-if test "$wxUSE_DEBUG_INFO" = "yes" ; then
-    WXDEBUG="-g"
-    wxUSE_OPTIMISE=no
-fi
 
-if test "$wxUSE_DEBUG_GDB" = "yes" ; then
-    wxUSE_DEBUG_INFO=yes
-    WXDEBUG="-ggdb"
-fi
 
-if test "$wxUSE_DEBUG_FLAG" = "yes" ; then
-    cat >> confdefs.h <<\EOF
-#define WXDEBUG 1
-EOF
+if test "$TOOLKIT" != "MSW"; then
 
-    WXDEBUG_DEFINE="-D__WXDEBUG__"
-else
-    if test "$wxUSE_GTK" = 1 ; then
-        WXDEBUG_DEFINE="-DGTK_NO_CHECK_CASTS"
+                
+    THREADS_LINK=
+    THREADS_OBJ=
+    CODE_GEN_FLAGS=
+    CODE_GEN_FLAGS_CXX=
+
+    if test "$wxUSE_THREADS" = "yes" ; then
+        if test "$wxUSE_WINE" = 1 ; then
+            echo "configure: warning: Threads are not supported under WINE... disabled" 1>&2
+            wxUSE_THREADS="no"
+        elif test "$USE_BEOS" = 1; then
+            echo "configure: warning: BeOS threads are not yet supported... disabled" 1>&2
+            wxUSE_THREADS="no"
+        fi
     fi
-fi
 
-if test "$wxUSE_MEM_TRACING" = "yes" ; then
-    cat >> confdefs.h <<\EOF
-#define wxUSE_MEMORY_TRACING 1
-EOF
+    if test "$wxUSE_THREADS" = "yes" ; then
+        
+                if test "$USE_AIX" = 1; then
+            THREADS_LIB=pthreads
+        else
+            THREADS_LIB=pthread
+        fi
 
-    cat >> confdefs.h <<\EOF
-#define wxUSE_GLOBAL_MEMORY_OPERATORS 1
-EOF
+                                echo $ac_n "checking for pthread_create in -l$THREADS_LIB""... $ac_c" 1>&6
+echo "configure:15404: checking for pthread_create in -l$THREADS_LIB" >&5
+ac_lib_var=`echo $THREADS_LIB'_'pthread_create | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-l$THREADS_LIB  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 15412 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char pthread_create();
 
-    cat >> confdefs.h <<\EOF
-#define wxUSE_DEBUG_NEW_ALWAYS 1
+int main() {
+pthread_create()
+; return 0; }
 EOF
-
-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS memcheck"
-fi
-
-if test "$wxUSE_DMALLOC" = "yes" ; then
-    DMALLOC_LINK="-ldmalloc"
-fi
-
-PROFILE=
-if test "$wxUSE_PROFILE" = "yes" ; then
-    PROFILE="-pg"
+if { (eval echo configure:15423: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
 fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
 
-DEP_INFO_FLAGS=
-CODE_GEN_FLAGS=
-CODE_GEN_FLAGS_CXX=
-if test "$GCC" = yes ; then
-    if test "$wxUSE_NO_RTTI" = "yes" ; then
-        CODE_GEN_FLAGS_CXX="$CODE_GEN_FLAGS -fno-rtti"
-    fi
-    if test "$wxUSE_NO_EXCEPTIONS" = "yes" ; then
-        CODE_GEN_FLAGS_CXX="$CODE_GEN_FLAGS -fno-exceptions"
-    fi
-    if test "$wxUSE_PERMISSIVE" = "yes" ; then
-       CODE_GEN_FLAGS="$CODE_GEN_FLAGS -fpermissive"
-    fi
-    if test "$wxUSE_NO_DEPS" = "no" ; then
-        DEP_INFO_FLAGS="-MMD"
-    fi
 fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  
+                THREADS_OBJ="threadpsx.lo"
+                THREADS_LINK=$THREADS_LIB
+            
+else
+  echo "$ac_t""no" 1>&6
 
-
-CXXFLAGS=`echo "${CXXFLAGS}" | sed "s/\-O.//g" `
-CFLAGS=`echo "${CFLAGS}" | sed "s/\-O.//g" `
-if test "$wxUSE_OPTIMISE" = "no" ; then
-    OPTIMISE=
+                                echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6
+echo "configure:15446: checking for pthread_create in -lc_r" >&5
+ac_lib_var=`echo c_r'_'pthread_create | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
 else
-    if test "$GCC" = yes ; then
-        OPTIMISE="-O2"
-        case "${host}" in
-            i586-*-*|i686-*-* )
-            OPTIMISE="${OPTIMISE} "
-        ;;
-        esac
-    else
-        OPTIMISE="-O"
-    fi
-fi
+  ac_save_LIBS="$LIBS"
+LIBS="-lc_r  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 15454 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char pthread_create();
 
-if test "$WXWIN_COMPATIBILITY_2" = "yes"; then
-    cat >> confdefs.h <<\EOF
-#define WXWIN_COMPATIBILITY_2 1
+int main() {
+pthread_create()
+; return 0; }
 EOF
-
-
-    WXWIN_COMPATIBILITY_2_2="yes"
+if { (eval echo configure:15465: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
 fi
-
-if test "$WXWIN_COMPATIBILITY_2_2" = "yes"; then
-    cat >> confdefs.h <<\EOF
-#define WXWIN_COMPATIBILITY_2_2 1
-EOF
+rm -f conftest*
+LIBS="$ac_save_LIBS"
 
 fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  
+                    THREADS_OBJ="threadpsx.lo"
+                    THREADS_LINK="c_r"
+                
+else
+  echo "$ac_t""no" 1>&6
 
-
-ZLIB_INCLUDE=
-if test "$wxUSE_ZLIB" = "yes" -o "$wxUSE_ZLIB" = "sys" ; then
-  cat >> confdefs.h <<\EOF
-#define wxUSE_ZLIB 1
-EOF
-
-  if test "$wxUSE_ZLIB" = "yes" ; then
-    ZLIB_INCLUDE="-I\${top_srcdir}/src/zlib"
-  else
-    ZLIB_LINK=
-    ac_safe=`echo "zlib.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for zlib.h""... $ac_c" 1>&6
-echo "configure:15147: checking for zlib.h" >&5
+                                        ac_safe=`echo "sys/prctl.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for sys/prctl.h""... $ac_c" 1>&6
+echo "configure:15489: checking for sys/prctl.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 15152 "configure"
+#line 15494 "configure"
 #include "confdefs.h"
-#include <zlib.h>
+#include <sys/prctl.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:15157: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:15499: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -15169,120 +15511,187 @@ rm -f conftest*
 fi
 if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-  echo $ac_n "checking for deflate in -lz""... $ac_c" 1>&6
-echo "configure:15174: checking for deflate in -lz" >&5
-ac_lib_var=`echo z'_'deflate | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  
+                        THREADS_OBJ="threadsgi.lo"
+                    
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+                
+fi
+
+            
+fi
+
+
+        if test -z "$THREADS_OBJ" ; then
+            wxUSE_THREADS=no
+            echo "configure: warning: No thread support on this system... disabled" 1>&2
+        fi
+    fi
+
+        if test "$wxUSE_THREADS" = "yes" ; then
+      for ac_func in thr_setconcurrency
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:15539: checking for $ac_func" >&5
+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  ac_save_LIBS="$LIBS"
-LIBS="-lz  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 15182 "configure"
+  cat > conftest.$ac_ext <<EOF
+#line 15544 "configure"
 #include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func(); below.  */
+#include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
-char deflate();
+char $ac_func();
 
 int main() {
-deflate()
+
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+$ac_func();
+#endif
+
 ; return 0; }
 EOF
-if { (eval echo configure:15193: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15567: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
+  eval "ac_cv_func_$ac_func=yes"
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
+  eval "ac_cv_func_$ac_func=no"
 fi
 rm -f conftest*
-LIBS="$ac_save_LIBS"
-
 fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-  ZLIB_LINK="-lz"
+    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+ 
 else
   echo "$ac_t""no" 1>&6
 fi
+done
+
 
+                                                                                    
+      for ac_hdr in sched.h
+do
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:15597: checking for $ac_hdr" >&5
+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
 else
-  echo "$ac_t""no" 1>&6
+  cat > conftest.$ac_ext <<EOF
+#line 15602 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:15607: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=yes"
+else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"
 fi
-
-    if test "x$ZLIB_LINK" = "x" ; then
-        { echo "configure: error: system zlib compression library not found! Use --with-zlib=yes to use built-in zlib" 1>&2; exit 1; }
-    fi
-  fi
+rm -f conftest*
 fi
-
-PNG_INCLUDE=
-if test "$wxUSE_LIBPNG" = "yes" -o "$wxUSE_LIBPNG" = "sys" ; then
-  cat >> confdefs.h <<\EOF
-#define wxUSE_LIBPNG 1
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_hdr 1
 EOF
+ 
+else
+  echo "$ac_t""no" 1>&6
+fi
+done
 
-      if test "$wxUSE_LIBPNG" = "sys" -a "$wxUSE_ZLIB" != "sys" ; then
-    echo "configure: warning: --with-libpng=sys doesn't work without --with-zlib=sys, will compile the built-in libpng instead" 1>&2
-    wxUSE_LIBPNG=yes
-  fi
-
-  if test "$wxUSE_LIBPNG" = "yes" ; then
-    PNG_INCLUDE="-I\${top_srcdir}/src/png"
-  else
-    PNG_LINK=
-    ac_safe=`echo "png.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for png.h""... $ac_c" 1>&6
-echo "configure:15240: checking for png.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+
+      echo $ac_n "checking for sched_yield in -l$THREADS_LINK""... $ac_c" 1>&6
+echo "configure:15635: checking for sched_yield in -l$THREADS_LINK" >&5
+ac_lib_var=`echo $THREADS_LINK'_'sched_yield | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  cat > conftest.$ac_ext <<EOF
-#line 15245 "configure"
+  ac_save_LIBS="$LIBS"
+LIBS="-l$THREADS_LINK  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 15643 "configure"
 #include "confdefs.h"
-#include <png.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char sched_yield();
+
+int main() {
+sched_yield()
+; return 0; }
 EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:15250: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
+if { (eval echo configure:15654: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
+  eval "ac_cv_lib_$ac_lib_var=yes"
 else
-  echo "$ac_err" >&5
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
+  eval "ac_cv_lib_$ac_lib_var=no"
 fi
 rm -f conftest*
+LIBS="$ac_save_LIBS"
+
 fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-  echo $ac_n "checking for png_check_sig in -lpng""... $ac_c" 1>&6
-echo "configure:15267: checking for png_check_sig in -lpng" >&5
-ac_lib_var=`echo png'_'png_check_sig | sed 'y%./+-%__p_%'`
+  cat >> confdefs.h <<\EOF
+#define HAVE_SCHED_YIELD 1
+EOF
+
+else
+  echo "$ac_t""no" 1>&6
+echo $ac_n "checking for sched_yield in -lposix4""... $ac_c" 1>&6
+echo "configure:15676: checking for sched_yield in -lposix4" >&5
+ac_lib_var=`echo posix4'_'sched_yield | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
-LIBS="-lpng -lz -lm $LIBS"
+LIBS="-lposix4  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 15275 "configure"
+#line 15684 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
-char png_check_sig();
+char sched_yield();
 
 int main() {
-png_check_sig()
+sched_yield()
 ; return 0; }
 EOF
-if { (eval echo configure:15286: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15695: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -15297,90 +15706,77 @@ LIBS="$ac_save_LIBS"
 fi
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-  PNG_LINK="-lpng"
+  cat >> confdefs.h <<\EOF
+#define HAVE_SCHED_YIELD 1
+EOF
+ POSIX4_LINK=" -lposix4"
 else
   echo "$ac_t""no" 1>&6
+echo "configure: warning: wxThread::Yield will not work properly" 1>&2
+                    
 fi
 
                    
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-    if test "x$PNG_LINK" = "x" ; then
-        { echo "configure: error: system png library not found! Use --with-libpng=yes to use the built-in libpng" 1>&2; exit 1; }
-    fi
-  fi
-
-  SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS png"
 fi
 
-JPEG_INCLUDE=
-if test "$wxUSE_LIBJPEG" = "yes" -o "$wxUSE_LIBJPEG" = "sys" ; then
-  cat >> confdefs.h <<\EOF
-#define wxUSE_LIBJPEG 1
-EOF
 
-  if test "$wxUSE_LIBJPEG" = "yes" ; then
-    JPEG_INCLUDE="-I\${top_srcdir}/src/jpeg"
-  else
-    JPEG_LINK=
-                echo $ac_n "checking for jpeglib.h""... $ac_c" 1>&6
-echo "configure:15330: checking for jpeglib.h" >&5
-    if eval "test \"`echo '$''{'ac_cv_header_jpeglib_h'+set}'`\" = set"; then
+                                          HAVE_PRIOR_FUNCS=0
+      echo $ac_n "checking for pthread_attr_getschedpolicy in -l$THREADS_LINK""... $ac_c" 1>&6
+echo "configure:15726: checking for pthread_attr_getschedpolicy in -l$THREADS_LINK" >&5
+ac_lib_var=`echo $THREADS_LINK'_'pthread_attr_getschedpolicy | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  cat > conftest.$ac_ext <<EOF
-#line 15335 "configure"
+  ac_save_LIBS="$LIBS"
+LIBS="-l$THREADS_LINK  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 15734 "configure"
 #include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char pthread_attr_getschedpolicy();
 
-                #undef HAVE_STDLIB_H
-                #include <stdio.h>
-                #include <jpeglib.h>
-            
 int main() {
-
-            
+pthread_attr_getschedpolicy()
 ; return 0; }
 EOF
-if { (eval echo configure:15347: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:15745: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  ac_cv_header_jpeglib_h=yes
+  eval "ac_cv_lib_$ac_lib_var=yes"
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  ac_cv_header_jpeglib_h=no
-        
+  eval "ac_cv_lib_$ac_lib_var=no"
 fi
 rm -f conftest*
-    
-fi
-
-    echo "$ac_t""$ac_cv_header_jpeglib_h" 1>&6
+LIBS="$ac_save_LIBS"
 
-    if test "$ac_cv_header_jpeglib_h" = "yes"; then
-        echo $ac_n "checking for jpeg_read_header in -ljpeg""... $ac_c" 1>&6
-echo "configure:15365: checking for jpeg_read_header in -ljpeg" >&5
-ac_lib_var=`echo jpeg'_'jpeg_read_header | sed 'y%./+-%__p_%'`
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  echo $ac_n "checking for pthread_attr_setschedparam in -l$THREADS_LINK""... $ac_c" 1>&6
+echo "configure:15761: checking for pthread_attr_setschedparam in -l$THREADS_LINK" >&5
+ac_lib_var=`echo $THREADS_LINK'_'pthread_attr_setschedparam | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
-LIBS="-ljpeg  $LIBS"
+LIBS="-l$THREADS_LINK  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 15373 "configure"
+#line 15769 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
-char jpeg_read_header();
+char pthread_attr_setschedparam();
 
 int main() {
-jpeg_read_header()
+pthread_attr_setschedparam()
 ; return 0; }
 EOF
-if { (eval echo configure:15384: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15780: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -15395,78 +15791,65 @@ LIBS="$ac_save_LIBS"
 fi
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-  JPEG_LINK="-ljpeg"
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-    fi
-
-    if test "x$JPEG_LINK" = "x" ; then
-        { echo "configure: error: system jpeg library not found! Use --with-libjpeg=yes to use the built-in one" 1>&2; exit 1; }
-    fi
-  fi
-fi
-
-TIFF_INCLUDE=
-if test "$wxUSE_LIBTIFF" = "yes" -o "$wxUSE_LIBTIFF" = "sys" ; then
-  cat >> confdefs.h <<\EOF
-#define wxUSE_LIBTIFF 1
-EOF
-
-  if test "$wxUSE_LIBTIFF" = "yes" ; then
-    TIFF_INCLUDE="-I\${top_srcdir}/src/tiff"
-  else
-    TIFF_LINK=
-    ac_safe=`echo "tiffio.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for tiffio.h""... $ac_c" 1>&6
-echo "configure:15424: checking for tiffio.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+  echo $ac_n "checking for sched_get_priority_max in -l$THREADS_LINK""... $ac_c" 1>&6
+echo "configure:15796: checking for sched_get_priority_max in -l$THREADS_LINK" >&5
+ac_lib_var=`echo $THREADS_LINK'_'sched_get_priority_max | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  cat > conftest.$ac_ext <<EOF
-#line 15429 "configure"
+  ac_save_LIBS="$LIBS"
+LIBS="-l$THREADS_LINK  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 15804 "configure"
 #include "confdefs.h"
-#include <tiffio.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char sched_get_priority_max();
+
+int main() {
+sched_get_priority_max()
+; return 0; }
 EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:15434: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
+if { (eval echo configure:15815: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
+  eval "ac_cv_lib_$ac_lib_var=yes"
 else
-  echo "$ac_err" >&5
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
+  eval "ac_cv_lib_$ac_lib_var=no"
 fi
 rm -f conftest*
+LIBS="$ac_save_LIBS"
+
 fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-  echo $ac_n "checking for TIFFError in -ltiff""... $ac_c" 1>&6
-echo "configure:15451: checking for TIFFError in -ltiff" >&5
-ac_lib_var=`echo tiff'_'TIFFError | sed 'y%./+-%__p_%'`
+  HAVE_PRIOR_FUNCS=1
+else
+  echo "$ac_t""no" 1>&6
+echo $ac_n "checking for sched_get_priority_max in -lposix4""... $ac_c" 1>&6
+echo "configure:15834: checking for sched_get_priority_max in -lposix4" >&5
+ac_lib_var=`echo posix4'_'sched_get_priority_max | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
-LIBS="-ltiff -lm $LIBS"
+LIBS="-lposix4  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 15459 "configure"
+#line 15842 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
-char TIFFError();
+char sched_get_priority_max();
 
 int main() {
-TIFFError()
+sched_get_priority_max()
 ; return 0; }
 EOF
-if { (eval echo configure:15470: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15853: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -15481,80 +15864,58 @@ LIBS="$ac_save_LIBS"
 fi
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-  TIFF_LINK="-ltiff"
+  
+                                HAVE_PRIOR_FUNCS=1
+                                POSIX4_LINK=" -lposix4"
+                             
 else
   echo "$ac_t""no" 1>&6
 fi
 
+                       
+fi
+
+                     
 else
   echo "$ac_t""no" 1>&6
 fi
 
-    if test "x$TIFF_LINK" = "x" ; then
-        { echo "configure: error: system tiff library not found! Use --with-libtiff=yes to use the built-in one" 1>&2; exit 1; }
-    fi
-  fi
+                   
+else
+  echo "$ac_t""no" 1>&6
 fi
 
-FREETYPE_INCLUDE=
-if test "$wxUSE_FREETYPE" = "yes" -o "$wxUSE_FREETYPE" = "sys" ; then
-  cat >> confdefs.h <<\EOF
-#define wxUSE_FREETYPE 1
-EOF
 
-  if test "$wxUSE_FREETYPE" = "yes" ; then
-    FREETYPE_INCLUDE="-I\${top_srcdir}/src/freetype"
-  else
-    FREETYPE_LINK=
-    ac_safe=`echo "freetype.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for freetype.h""... $ac_c" 1>&6
-echo "configure:15512: checking for freetype.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 15517 "configure"
-#include "confdefs.h"
-#include <freetype.h>
+      if test "$HAVE_PRIOR_FUNCS" = 1; then
+        cat >> confdefs.h <<\EOF
+#define HAVE_THREAD_PRIORITY_FUNCTIONS 1
 EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:15522: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  echo $ac_n "checking for FT_Render_Glyph in -lfreetype""... $ac_c" 1>&6
-echo "configure:15539: checking for FT_Render_Glyph in -lfreetype" >&5
-ac_lib_var=`echo freetype'_'FT_Render_Glyph | sed 'y%./+-%__p_%'`
+
+      else
+        echo "configure: warning: Setting thread priority will not work" 1>&2
+      fi
+
+      echo $ac_n "checking for pthread_cancel in -l$THREADS_LINK""... $ac_c" 1>&6
+echo "configure:15900: checking for pthread_cancel in -l$THREADS_LINK" >&5
+ac_lib_var=`echo $THREADS_LINK'_'pthread_cancel | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
-LIBS="-lfreetype -lm $LIBS"
+LIBS="-l$THREADS_LINK  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 15547 "configure"
+#line 15908 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
-char FT_Render_Glyph();
+char pthread_cancel();
 
 int main() {
-FT_Render_Glyph()
+pthread_cancel()
 ; return 0; }
 EOF
-if { (eval echo configure:15558: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15919: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -15569,166 +15930,308 @@ LIBS="$ac_save_LIBS"
 fi
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-  FREETYPE_LINK="-lfreetype"
+  cat >> confdefs.h <<\EOF
+#define HAVE_PTHREAD_CANCEL 1
+EOF
+
 else
   echo "$ac_t""no" 1>&6
+echo "configure: warning: wxThread::Kill() will not work properly" 1>&2
 fi
 
-                   
+
+      echo $ac_n "checking for pthread_cleanup_push/pop""... $ac_c" 1>&6
+echo "configure:15945: checking for pthread_cleanup_push/pop" >&5
+if eval "test \"`echo '$''{'wx_cv_func_pthread_cleanup_push'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
 else
-  echo "$ac_t""no" 1>&6
-fi
+  
+        cat > conftest.$ac_ext <<EOF
+#line 15951 "configure"
+#include "confdefs.h"
+#include <pthread.h>
+int main() {
 
-    if test "x$FREETYPE_LINK" = "x" ; then
-        { echo "configure: error: system freetype library not found! Use --with-freetype=yes to use the built-in freetype" 1>&2; exit 1; }
-    fi
-  fi
+                        pthread_cleanup_push(NULL, NULL);
+                        pthread_cleanup_pop(0);
+                     
+; return 0; }
+EOF
+if { (eval echo configure:15961: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  
+                        wx_cv_func_pthread_cleanup_push=yes
+                     
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  
+                        wx_cv_func_pthread_cleanup_push=no
+                     
+fi
+rm -f conftest*
+      
 fi
 
-if test "$wxUSE_OPENGL" = "yes"; then
-  if test "$wxUSE_MAC" = 1; then
-    cat >> confdefs.h <<\EOF
-#define wxUSE_OPENGL 1
-EOF
+echo "$ac_t""$wx_cv_func_pthread_cleanup_push" 1>&6
 
-    cat >> confdefs.h <<\EOF
-#define wxUSE_GLCANVAS 1
+      if test "$wx_cv_func_pthread_cleanup_push" = "yes"; then
+          cat >> confdefs.h <<\EOF
+#define HAVE_THREAD_CLEANUP_FUNCTIONS 1
 EOF
 
-    OPENGL_LINK="-framework OpenGL -framework AGL"
-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS opengl"
-  else
-    ac_safe=`echo "GL/gl.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for GL/gl.h""... $ac_c" 1>&6
-echo "configure:15604: checking for GL/gl.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+      fi
+
+                                                
+                              if test "x$wx_lib_glibc21" = "xyes"; then
+          CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
+      fi
+
+      echo $ac_n "checking for pthread_mutexattr_t""... $ac_c" 1>&6
+echo "configure:15993: checking for pthread_mutexattr_t" >&5
+if eval "test \"`echo '$''{'wx_cv_type_pthread_mutexattr_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  cat > conftest.$ac_ext <<EOF
-#line 15609 "configure"
+  
+        cat > conftest.$ac_ext <<EOF
+#line 15999 "configure"
 #include "confdefs.h"
-#include <GL/gl.h>
+#include <pthread.h>
+int main() {
+
+               pthread_mutexattr_t attr;
+               pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
+            
+; return 0; }
 EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:15614: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
+if { (eval echo configure:16009: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
+  
+               wx_cv_type_pthread_mutexattr_t=yes
+            
 else
-  echo "$ac_err" >&5
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
+  
+               wx_cv_type_pthread_mutexattr_t=no
+            
+        
 fi
 rm -f conftest*
+      
 fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  
-      cat >> confdefs.h <<\EOF
-#define wxUSE_OPENGL 1
-EOF
 
-      cat >> confdefs.h <<\EOF
-#define wxUSE_GLCANVAS 1
+echo "$ac_t""$wx_cv_type_pthread_mutexattr_t" 1>&6
+
+      if test "$wx_cv_type_pthread_mutexattr_t" = "yes"; then
+        cat >> confdefs.h <<\EOF
+#define HAVE_PTHREAD_MUTEXATTR_T 1
 EOF
 
-      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS opengl"
-      echo $ac_n "checking for glFlush in -lGL""... $ac_c" 1>&6
-echo "configure:15641: checking for glFlush in -lGL" >&5
-ac_lib_var=`echo GL'_'glFlush | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+      else
+                echo $ac_n "checking for PTHREAD_RECURSIVE_MUTEX_INITIALIZER""... $ac_c" 1>&6
+echo "configure:16036: checking for PTHREAD_RECURSIVE_MUTEX_INITIALIZER" >&5
+if eval "test \"`echo '$''{'wx_cv_type_pthread_rec_mutex_init'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  ac_save_LIBS="$LIBS"
-LIBS="-lGL  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 15649 "configure"
+  
+            cat > conftest.$ac_ext <<EOF
+#line 16042 "configure"
 #include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char glFlush();
-
+#include <pthread.h>
 int main() {
-glFlush()
+
+                    pthread_mutex_t attr = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
+                
 ; return 0; }
 EOF
-if { (eval echo configure:15660: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16051: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
+  
+                    wx_cv_type_pthread_rec_mutex_init=yes
+                
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
+  
+                    wx_cv_type_pthread_rec_mutex_init=no
+                
+            
 fi
 rm -f conftest*
-LIBS="$ac_save_LIBS"
+        
+fi
+
+echo "$ac_t""$wx_cv_type_pthread_rec_mutex_init" 1>&6
+        if test "$wx_cv_type_pthread_rec_mutex_init" = "yes"; then
+          cat >> confdefs.h <<\EOF
+#define HAVE_PTHREAD_RECURSIVE_MUTEX_INITIALIZER 1
+EOF
+
+        else
+                    echo "configure: warning: wxMutex won't be recursive on this platform" 1>&2
+        fi
+      fi
+
+      THREADS_LINK=" -l$THREADS_LINK"
+
+                  if test "$USE_SOLARIS" = "yes" -a "$GCC" != "yes"; then
+          CPPFLAGS="$CFLAGS -mt"
+          CXXFLAGS="$CXXFLAGS -mt"
+          LDFLAGS="$LDFLAGS -mt"
+      fi
+    fi
 
 fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  
-        OPENGL_LINK="-lGL -lGLU"
-      
-else
-  echo "$ac_t""no" 1>&6
 
-          echo $ac_n "checking for glFlush in -lMesaGL""... $ac_c" 1>&6
-echo "configure:15682: checking for glFlush in -lMesaGL" >&5
-ac_lib_var=`echo MesaGL'_'glFlush | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+if test "$wxUSE_THREADS" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_THREADS 1
+EOF
+
+
+    if test "$USE_DARWIN" != 1; then
+    TOOLCHAIN_DEFS="$TOOLCHAIN_DEFS -D_REENTRANT"
+  fi
+
+  SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS thread"
 else
-  ac_save_LIBS="$LIBS"
-LIBS="-lMesaGL  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 15690 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char glFlush();
+      if test "$ac_cv_func_strtok_r" = "yes"; then
+    echo $ac_n "checking if -D_REENTRANT is needed""... $ac_c" 1>&6
+echo "configure:16105: checking if -D_REENTRANT is needed" >&5
+    if test "$NEEDS_D_REENTRANT_FOR_R_FUNCS" = 1; then
+        TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D_REENTRANT"
+        echo "$ac_t""yes" 1>&6
+    else
+        echo "$ac_t""no" 1>&6
+    fi
+  fi
+fi
 
-int main() {
-glFlush()
-; return 0; }
+if test "$WXGTK20" = 1 ; then
+  cat >> confdefs.h <<EOF
+#define __WXGTK20__ $WXGTK20
 EOF
-if { (eval echo configure:15701: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
+
+  WXGTK12=1
 fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
+
+if test "$WXGTK12" = 1 ; then
+  cat >> confdefs.h <<EOF
+#define __WXGTK12__ $WXGTK12
+EOF
 
 fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  
-          OPENGL_LINK="-lMesaGL -lMesaGLU"
-        
+
+if test "$WXGTK127" = 1 ; then
+  cat >> confdefs.h <<EOF
+#define __WXGTK127__ $WXGTK127
+EOF
+
+fi
+
+WXDEBUG=
+
+if test "$wxUSE_DEBUG_INFO" = "yes" ; then
+    WXDEBUG="-g"
+    wxUSE_OPTIMISE=no
+fi
+
+if test "$wxUSE_DEBUG_GDB" = "yes" ; then
+    wxUSE_DEBUG_INFO=yes
+    WXDEBUG="-ggdb"
+fi
+
+if test "$wxUSE_DEBUG_FLAG" = "yes" ; then
+    cat >> confdefs.h <<\EOF
+#define WXDEBUG 1
+EOF
+
+    WXDEBUG_DEFINE="-D__WXDEBUG__"
 else
-  echo "$ac_t""no" 1>&6
+    if test "$wxUSE_GTK" = 1 ; then
+        WXDEBUG_DEFINE="-DGTK_NO_CHECK_CASTS"
+    fi
+fi
+
+if test "$wxUSE_MEM_TRACING" = "yes" ; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_MEMORY_TRACING 1
+EOF
+
+    cat >> confdefs.h <<\EOF
+#define wxUSE_GLOBAL_MEMORY_OPERATORS 1
+EOF
+
+    cat >> confdefs.h <<\EOF
+#define wxUSE_DEBUG_NEW_ALWAYS 1
+EOF
+
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS memcheck"
 fi
 
-       
+if test "$wxUSE_DMALLOC" = "yes" ; then
+    DMALLOC_LIBS="-ldmalloc"
 fi
 
-      
+PROFILE=
+if test "$wxUSE_PROFILE" = "yes" ; then
+    PROFILE=" -pg"
+fi
+
+if test "$GCC" = "yes" ; then
+    if test "$wxUSE_NO_RTTI" = "yes" ; then
+        CODE_GEN_FLAGS_CXX="$CODE_GEN_FLAGS_CXX -fno-rtti"
+    fi
+    if test "$wxUSE_NO_EXCEPTIONS" = "yes" ; then
+        CODE_GEN_FLAGS_CXX="$CODE_GEN_FLAGS_CXX -fno-exceptions"
+    fi
+    if test "$wxUSE_PERMISSIVE" = "yes" ; then
+        CODE_GEN_FLAGS="$CODE_GEN_FLAGS -fpermissive"
+    fi
+    if test "$USE_WIN32" = 1 ; then
+        # I'm not even really sure what this was ever added to solve,
+        # but someone added it for mingw native builds, so I guess
+        # they had a reason, right??
+        CODE_GEN_FLAGS="$CODE_GEN_FLAGS -fno-pcc-struct-return"
+    fi
+fi
+
+
+CXXFLAGS=`echo "${CXXFLAGS}" | sed "s/\-O.//g" `
+CFLAGS=`echo "${CFLAGS}" | sed "s/\-O.//g" `
+if test "$wxUSE_OPTIMISE" = "no" ; then
+    OPTIMISE=
 else
-  echo "$ac_t""no" 1>&6
-wxUSE_OPENGL=0
+    if test "$GCC" = yes ; then
+        OPTIMISE="-O2"
+        case "${host}" in
+            i586-*-*|i686-*-* )
+            OPTIMISE="${OPTIMISE} "
+        ;;
+        esac
+    else
+        OPTIMISE="-O"
+    fi
 fi
 
-  fi
+if test "$WXWIN_COMPATIBILITY_2" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define WXWIN_COMPATIBILITY_2 1
+EOF
+
+
+    WXWIN_COMPATIBILITY_2_2="yes"
+fi
+
+if test "$WXWIN_COMPATIBILITY_2_2" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define WXWIN_COMPATIBILITY_2_2 1
+EOF
+
 fi
 
 
@@ -15873,9 +16376,16 @@ EOF
 
 fi
 
+if test "$wxUSE_TEXTBUFFER" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_TEXTBUFFER 1
+EOF
+
+fi
+
 if test "$wxUSE_TEXTFILE" = "yes"; then
-  if test "$wxUSE_FILE" != "yes"; then
-    echo "configure: warning: wxTextFile requires wxFile and it won't be compiled without it" 1>&2
+  if test "$wxUSE_FILE" != "yes" -o "$wxUSE_TEXTBUFFER" != "yes" ; then
+    echo "configure: warning: wxTextFile requires wxFile and wxTextBuffer... disabled" 1>&2
   else
     cat >> confdefs.h <<\EOF
 #define wxUSE_TEXTFILE 1
@@ -15886,7 +16396,7 @@ fi
 
 if test "$wxUSE_CONFIG" = "yes" ; then
   if test "$wxUSE_TEXTFILE" != "yes"; then
-    echo "configure: warning: wxConfig requires wxTextFile and it won't be compiled without it" 1>&2
+    echo "configure: warning: wxConfig requires wxTextFile... disabled" 1>&2
   else
     cat >> confdefs.h <<\EOF
 #define wxUSE_CONFIG 1
@@ -15898,7 +16408,7 @@ fi
 
 if test "$wxUSE_INTL" = "yes" ; then
   if test "$wxUSE_FILE" != "yes"; then
-    echo "configure: warning: I18n code requires wxFile and it won't be compiled without it" 1>&2
+    echo "configure: warning: I18n code requires wxFile... disabled" 1>&2
   else
     cat >> confdefs.h <<\EOF
 #define wxUSE_INTL 1
@@ -15925,6 +16435,13 @@ EOF
     if test "$wxUSE_LOGWINDOW" = "yes"; then
       cat >> confdefs.h <<\EOF
 #define wxUSE_LOGWINDOW 1
+EOF
+
+    fi
+
+    if test "$wxUSE_LOGDIALOG" = "yes"; then
+      cat >> confdefs.h <<\EOF
+#define wxUSE_LOG_DIALOG 1
 EOF
 
     fi
@@ -15964,12 +16481,12 @@ if test "$wxUSE_DATETIME" = "yes"; then
         for ac_func in strptime
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:15968: checking for $ac_func" >&5
+echo "configure:16485: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 15973 "configure"
+#line 16490 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -15992,7 +16509,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:15996: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16513: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -16018,13 +16535,13 @@ done
 
 
         echo $ac_n "checking for timezone variable in <time.h>""... $ac_c" 1>&6
-echo "configure:16022: checking for timezone variable in <time.h>" >&5
+echo "configure:16539: checking for timezone variable in <time.h>" >&5
 if eval "test \"`echo '$''{'wx_cv_var_timezone'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
                         cat > conftest.$ac_ext <<EOF
-#line 16028 "configure"
+#line 16545 "configure"
 #include "confdefs.h"
 
                                 #include <time.h>
@@ -16036,7 +16553,7 @@ int main() {
                             
 ; return 0; }
 EOF
-if { (eval echo configure:16040: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:16557: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
                                 wx_cv_var_timezone=timezone
@@ -16047,7 +16564,7 @@ else
   rm -rf conftest*
   
                                 cat > conftest.$ac_ext <<EOF
-#line 16051 "configure"
+#line 16568 "configure"
 #include "confdefs.h"
 
                                         #include <time.h>
@@ -16059,7 +16576,7 @@ int main() {
                                     
 ; return 0; }
 EOF
-if { (eval echo configure:16063: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:16580: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
                                         wx_cv_var_timezone=_timezone
@@ -16070,7 +16587,7 @@ else
   rm -rf conftest*
   
                                         cat > conftest.$ac_ext <<EOF
-#line 16074 "configure"
+#line 16591 "configure"
 #include "confdefs.h"
 
                                                 #include <time.h>
@@ -16082,7 +16599,7 @@ int main() {
                                             
 ; return 0; }
 EOF
-if { (eval echo configure:16086: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:16603: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
                                                 wx_cv_var_timezone=__timezone
@@ -16117,12 +16634,12 @@ EOF
         for ac_func in localtime
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:16121: checking for $ac_func" >&5
+echo "configure:16638: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 16126 "configure"
+#line 16643 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -16145,7 +16662,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:16149: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16666: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -16172,13 +16689,13 @@ done
 
     if test "$ac_cv_func_localtime" = "yes"; then
         echo $ac_n "checking for tm_gmtoff in struct tm""... $ac_c" 1>&6
-echo "configure:16176: checking for tm_gmtoff in struct tm" >&5
+echo "configure:16693: checking for tm_gmtoff in struct tm" >&5
 if eval "test \"`echo '$''{'wx_cv_struct_tm_has_gmtoff'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
             cat > conftest.$ac_ext <<EOF
-#line 16182 "configure"
+#line 16699 "configure"
 #include "confdefs.h"
 
                     #include <time.h>
@@ -16190,7 +16707,7 @@ int main() {
                 
 ; return 0; }
 EOF
-if { (eval echo configure:16194: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:16711: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
                     wx_cv_struct_tm_has_gmtoff=yes
@@ -16219,12 +16736,12 @@ EOF
             for ac_func in gettimeofday ftime
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:16223: checking for $ac_func" >&5
+echo "configure:16740: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 16228 "configure"
+#line 16745 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -16247,7 +16764,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:16251: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16768: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -16274,7 +16791,7 @@ done
 
     if test "$ac_cv_func_gettimeofday" = "yes"; then
         echo $ac_n "checking whether gettimeofday takes two arguments""... $ac_c" 1>&6
-echo "configure:16278: checking whether gettimeofday takes two arguments" >&5
+echo "configure:16795: checking whether gettimeofday takes two arguments" >&5
 if eval "test \"`echo '$''{'wx_cv_func_gettimeofday_has_2_args'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -16289,7 +16806,7 @@ cross_compiling=$ac_cv_prog_cxx_cross
 
 
             cat > conftest.$ac_ext <<EOF
-#line 16293 "configure"
+#line 16810 "configure"
 #include "confdefs.h"
 
                     #include <sys/time.h>
@@ -16298,12 +16815,11 @@ cross_compiling=$ac_cv_prog_cxx_cross
 int main() {
 
                     struct timeval tv;
-                    struct timezone tz;
-                    gettimeofday(&tv, &tz);
+                    gettimeofday(&tv, NULL);
                 
 ; return 0; }
 EOF
-if { (eval echo configure:16307: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:16823: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   wx_cv_func_gettimeofday_has_2_args=yes
 else
@@ -16311,7 +16827,7 @@ else
   cat conftest.$ac_ext >&5
   rm -rf conftest*
   cat > conftest.$ac_ext <<EOF
-#line 16315 "configure"
+#line 16831 "configure"
 #include "confdefs.h"
 
                         #include <sys/time.h>
@@ -16324,14 +16840,17 @@ int main() {
                     
 ; return 0; }
 EOF
-if { (eval echo configure:16328: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:16844: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   wx_cv_func_gettimeofday_has_2_args=no
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  wx_cv_func_gettimeofday_has_2_args=unknown
+  
+                        echo "configure: warning: failed to determine number of gettimeofday() arguments" 1>&2
+                        wx_cv_func_gettimeofday_has_2_args=unknown
+                    
                 
 fi
 rm -f conftest*
@@ -16368,14 +16887,14 @@ fi
 
 if test "$TOOLKIT" != "MSW"; then
 
-if test "$wxUSE_SOCKETS" = "yes"; then
-        echo $ac_n "checking for socket""... $ac_c" 1>&6
-echo "configure:16374: checking for socket" >&5
+    if test "$wxUSE_SOCKETS" = "yes"; then
+                echo $ac_n "checking for socket""... $ac_c" 1>&6
+echo "configure:16893: checking for socket" >&5
 if eval "test \"`echo '$''{'ac_cv_func_socket'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 16379 "configure"
+#line 16898 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char socket(); below.  */
@@ -16398,7 +16917,7 @@ socket();
 
 ; return 0; }
 EOF
-if { (eval echo configure:16402: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16921: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_socket=yes"
 else
@@ -16416,7 +16935,7 @@ if eval "test \"`echo '$ac_cv_func_'socket`\" = yes"; then
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
-echo "configure:16420: checking for socket in -lsocket" >&5
+echo "configure:16939: checking for socket in -lsocket" >&5
 ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -16424,7 +16943,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 16428 "configure"
+#line 16947 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -16435,7 +16954,7 @@ int main() {
 socket()
 ; return 0; }
 EOF
-if { (eval echo configure:16439: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16958: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -16454,27 +16973,27 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
 else
   echo "$ac_t""no" 1>&6
 
-                echo "configure: warning: socket library not found - sockets will be disabled" 1>&2
-                wxUSE_SOCKETS=no
+                    echo "configure: warning: socket library not found - sockets will be disabled" 1>&2
+                    wxUSE_SOCKETS=no
+                
             
-        
-fi
-
-    
 fi
 
+        
 fi
 
+    fi
 
-if test "$wxUSE_SOCKETS" = "yes" ; then
-        echo $ac_n "checking what is the type of the third argument of getsockname""... $ac_c" 1>&6
-echo "configure:16472: checking what is the type of the third argument of getsockname" >&5
+            
+    if test "$wxUSE_SOCKETS" = "yes" ; then
+                echo $ac_n "checking what is the type of the third argument of getsockname""... $ac_c" 1>&6
+echo "configure:16991: checking what is the type of the third argument of getsockname" >&5
 if eval "test \"`echo '$''{'wx_cv_type_getsockname3'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
-            
-            ac_ext=C
+                
+                ac_ext=C
 # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
@@ -16482,21 +17001,21 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes
 cross_compiling=$ac_cv_prog_cxx_cross
 
 
-            cat > conftest.$ac_ext <<EOF
-#line 16487 "configure"
+                cat > conftest.$ac_ext <<EOF
+#line 17006 "configure"
 #include "confdefs.h"
 
-                    #include <sys/types.h>
-                    #include <sys/socket.h>
-                
+                        #include <sys/types.h>
+                        #include <sys/socket.h>
+                    
 int main() {
 
-                    socklen_t len;
-                    getsockname(0, 0, &len);
-                
+                        socklen_t len;
+                        getsockname(0, 0, &len);
+                    
 ; return 0; }
 EOF
-if { (eval echo configure:16500: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:17019: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   wx_cv_type_getsockname3=socklen_t
 else
@@ -16504,20 +17023,20 @@ else
   cat conftest.$ac_ext >&5
   rm -rf conftest*
   cat > conftest.$ac_ext <<EOF
-#line 16508 "configure"
+#line 17027 "configure"
 #include "confdefs.h"
 
-                        #include <sys/types.h>
-                        #include <sys/socket.h>
-                    
+                            #include <sys/types.h>
+                            #include <sys/socket.h>
+                        
 int main() {
 
-                        size_t len;
-                        getsockname(0, 0, &len);
-                    
+                            size_t len;
+                            getsockname(0, 0, &len);
+                        
 ; return 0; }
 EOF
-if { (eval echo configure:16521: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:17040: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   wx_cv_type_getsockname3=size_t
 else
@@ -16525,20 +17044,20 @@ else
   cat conftest.$ac_ext >&5
   rm -rf conftest*
   cat > conftest.$ac_ext <<EOF
-#line 16529 "configure"
+#line 17048 "configure"
 #include "confdefs.h"
 
-                            #include <sys/types.h>
-                            #include <sys/socket.h>
-                        
+                                #include <sys/types.h>
+                                #include <sys/socket.h>
+                            
 int main() {
 
-                            int len;
-                            getsockname(0, 0, &len);
-                        
+                                int len;
+                                getsockname(0, 0, &len);
+                            
 ; return 0; }
 EOF
-if { (eval echo configure:16542: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:17061: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   wx_cv_type_getsockname3=int
 else
@@ -16546,71 +17065,77 @@ else
   cat conftest.$ac_ext >&5
   rm -rf conftest*
   wx_cv_type_getsockname3=unknown
-                    
+                        
 fi
 rm -f conftest*
-                
+                    
 fi
 rm -f conftest*
-            
+                
 fi
 rm -f conftest*
 
-            ac_ext=c
+                ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
 ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
 cross_compiling=$ac_cv_prog_cc_cross
 
-        
+            
 fi
 
 echo "$ac_t""$wx_cv_type_getsockname3" 1>&6
 
-    if test "$wx_cv_type_getsockname3" = "unknown"; then
-        wxUSE_SOCKETS=no
-        echo "configure: warning: Couldn't find socklen_t synonym for this system" 1>&2
-    else
-        cat >> confdefs.h <<EOF
+        if test "$wx_cv_type_getsockname3" = "unknown"; then
+            wxUSE_SOCKETS=no
+            echo "configure: warning: Couldn't find socklen_t synonym for this system" 1>&2
+        else
+            cat >> confdefs.h <<EOF
 #define SOCKLEN_T $wx_cv_type_getsockname3
 EOF
 
+        fi
     fi
 fi
 
-fi
-
 if test "$wxUSE_SOCKETS" = "yes" ; then
     cat >> confdefs.h <<\EOF
 #define wxUSE_SOCKETS 1
 EOF
 
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS sockets"
-    INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS protocol"
 fi
 
 
 if test "$wxUSE_GUI" = "yes"; then
 
-if test "$TOOLKIT" != "MSW"; then
+    if test "$TOOLKIT" = "MAC"; then
+        echo "configure: warning: Joystick not yet supported under Mac OS X... disabled" 1>&2
+        wxUSE_JOYSTICK=no
+     fi
+    if test "$TOOLKIT" = "MOTIF"; then
+        echo "configure: warning: Joystick not yet supported under Motif... disabled" 1>&2
+        wxUSE_JOYSTICK=no
+     fi
 
-if test "$wxUSE_JOYSTICK" = "yes"; then
-    for ac_hdr in linux/joystick.h
+        if test "$TOOLKIT" != "MSW"; then
+        if test "$wxUSE_JOYSTICK" = "yes"; then
+                        for ac_hdr in linux/joystick.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:16604: checking for $ac_hdr" >&5
+echo "configure:17129: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 16609 "configure"
+#line 17134 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:16614: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:17139: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -16636,42 +17161,40 @@ else
 fi
 done
 
-  if test "$ac_cv_header_linux_joystick_h" != "yes"; then
-    wxUSE_JOYSTICK=no
-    echo "configure: warning: Joystick not supported by this system" 1>&2
-  fi
-fi
-
-fi
+            if test "$ac_cv_header_linux_joystick_h" != "yes"; then
+                wxUSE_JOYSTICK=no
+                echo "configure: warning: Joystick not supported by this system... disabled" 1>&2
+            fi
+        fi
+    fi
 
-if test "$wxUSE_JOYSTICK" = "yes"; then
-    cat >> confdefs.h <<\EOF
+    if test "$wxUSE_JOYSTICK" = "yes"; then
+        cat >> confdefs.h <<\EOF
 #define wxUSE_JOYSTICK 1
 EOF
 
-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS joytest"
-fi
-
+        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS joytest"
+    fi
 fi
 
 
 if test "$TOOLKIT" != "MSW"; then
 
-HAVE_DL_FUNCS=0
-HAVE_SHL_FUNCS=0
-if test "$wxUSE_DYNLIB_CLASS" = "yes"; then
-    if test "$USE_DARWIN" = 1; then
-                HAVE_DL_FUNCS=1
-    else
-                                for ac_func in dlopen
+    HAVE_DL_FUNCS=0
+    HAVE_SHL_FUNCS=0
+    if test "$wxUSE_DYNLIB_CLASS" = "yes"; then
+        if test "$USE_DARWIN" = 1; then
+                        HAVE_DL_FUNCS=1
+        else
+                                                for ac_func in dlopen
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:16670: checking for $ac_func" >&5
+echo "configure:17193: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 16675 "configure"
+#line 17198 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -16694,7 +17217,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:16698: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17221: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -16713,16 +17236,16 @@ if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
 #define $ac_tr_func 1
 EOF
  
-            cat >> confdefs.h <<\EOF
+                cat >> confdefs.h <<\EOF
 #define HAVE_DLOPEN 1
 EOF
 
-            HAVE_DL_FUNCS=1
-        
+                HAVE_DL_FUNCS=1
+            
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:16726: checking for dlopen in -ldl" >&5
+echo "configure:17249: checking for dlopen in -ldl" >&5
 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -16730,7 +17253,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ldl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 16734 "configure"
+#line 17257 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -16741,7 +17264,7 @@ int main() {
 dlopen()
 ; return 0; }
 EOF
-if { (eval echo configure:16745: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17268: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -16757,25 +17280,25 @@ fi
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   
-                            cat >> confdefs.h <<\EOF
+                                cat >> confdefs.h <<\EOF
 #define HAVE_DLOPEN 1
 EOF
 
-                            HAVE_DL_FUNCS=1
-                            LIBS="$LIBS -ldl"
-                        
+                                HAVE_DL_FUNCS=1
+                                DL_LINK=" -ldl$DL_LINK"
+                            
 else
   echo "$ac_t""no" 1>&6
 
-                            for ac_func in shl_load
+                                for ac_func in shl_load
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:16774: checking for $ac_func" >&5
+echo "configure:17297: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 16779 "configure"
+#line 17302 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -16798,7 +17321,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:16802: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17325: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -16817,16 +17340,16 @@ if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
 #define $ac_tr_func 1
 EOF
  
-                                            cat >> confdefs.h <<\EOF
+                                                cat >> confdefs.h <<\EOF
 #define HAVE_SHL_LOAD 1
 EOF
 
-                                            HAVE_SHL_FUNCS=1
-                                          
+                                                HAVE_SHL_FUNCS=1
+                                              
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for dld in -lshl_load""... $ac_c" 1>&6
-echo "configure:16830: checking for dld in -lshl_load" >&5
+echo "configure:17353: checking for dld in -lshl_load" >&5
 ac_lib_var=`echo shl_load'_'dld | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -16834,7 +17357,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lshl_load  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 16838 "configure"
+#line 17361 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -16845,7 +17368,7 @@ int main() {
 dld()
 ; return 0; }
 EOF
-if { (eval echo configure:16849: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17372: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -16861,35 +17384,35 @@ fi
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   
-                                                            HAVE_SHL_FUNCS=1
-                                                            LIBS="$LIBS -ldld"
-                                                         
+                                                                HAVE_SHL_FUNCS=1
+                                                                DL_LINK=" -ldld$DL_LINK"
+                                                             
 else
   echo "$ac_t""no" 1>&6
 fi
 
-                                          
+                                              
 fi
 done
 
-                        
+                            
 fi
 
-        
+            
 fi
 done
 
 
-        if test "$HAVE_DL_FUNCS" = 1; then
-        for ac_func in dlerror
+                if test "$HAVE_DL_FUNCS" = 1; then
+            for ac_func in dlerror
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:16888: checking for $ac_func" >&5
+echo "configure:17411: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 16893 "configure"
+#line 17416 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -16912,7 +17435,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:16916: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17439: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -16937,7 +17460,7 @@ EOF
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for dlerror in -ldl""... $ac_c" 1>&6
-echo "configure:16941: checking for dlerror in -ldl" >&5
+echo "configure:17464: checking for dlerror in -ldl" >&5
 ac_lib_var=`echo dl'_'dlerror | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -16945,7 +17468,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ldl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 16949 "configure"
+#line 17472 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -16956,7 +17479,7 @@ int main() {
 dlerror()
 ; return 0; }
 EOF
-if { (eval echo configure:16960: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -16982,23 +17505,22 @@ fi
 fi
 done
 
-    fi
-    fi
+        fi
+        fi
 
-    if test "$HAVE_DL_FUNCS" = 0; then
-        if test "$HAVE_SHL_FUNCS" = 0; then
-          if test "$USE_UNIX" = 1; then
-              echo "configure: warning: Missing dynamic loading support, several features will be disabled" 1>&2
-              wxUSE_DYNLIB_CLASS=no
-          else
-              echo "configure: warning: Assuming wxLibrary class works on this platform" 1>&2
-          fi
+        if test "$HAVE_DL_FUNCS" = 0; then
+            if test "$HAVE_SHL_FUNCS" = 0; then
+              if test "$USE_UNIX" = 1; then
+                  echo "configure: warning: Missing dynamic loading support, several features will be disabled" 1>&2
+                  wxUSE_DYNLIB_CLASS=no
+              else
+                  echo "configure: warning: Assuming wxLibrary class works on this platform" 1>&2
+              fi
+            fi
         fi
     fi
 fi
 
-fi
-
 if test "$wxUSE_DYNLIB_CLASS" = "yes" ; then
     cat >> confdefs.h <<\EOF
 #define wxUSE_DYNLIB_CLASS 1
@@ -17024,13 +17546,6 @@ EOF
 
 fi
 
-if test "$wxUSE_WCSRTOMBS" = "yes" ; then
-  cat >> confdefs.h <<\EOF
-#define wxUSE_WCSRTOMBS 1
-EOF
-
-fi
-
 if test "$wxUSE_wxUSE_EXPERIMENTAL_PRINTF" = "yes"; then
   cat >> confdefs.h <<\EOF
 #define wxUSE_EXPERIMENTAL_PRINTF 1
@@ -17085,11 +17600,18 @@ EOF
 fi
 
 if test "$wxUSE_MDI_ARCHITECTURE" = "yes"; then
-    cat >> confdefs.h <<\EOF
+    if test "$wxUSE_UNIVERSAL" = "yes"; then
+        echo "configure: warning: MDI not yet supported for wxUNIVERSAL... disabled" 1>&2
+        wxUSE_MDI_ARCHITECTURE=no
+    fi
+
+    if test "$wxUSE_MDI_ARCHITECTURE" = "yes"; then
+        cat >> confdefs.h <<\EOF
 #define wxUSE_MDI_ARCHITECTURE 1
 EOF
 
-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS mdi"
+        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS mdi"
+    fi
 fi
 
 if test "$wxUSE_DOC_VIEW_ARCHITECTURE" = "yes" ; then
@@ -17110,21 +17632,21 @@ EOF
 
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS help"
 
-    if test "$USE_WIN32" = 1; then
+    if test "$wxUSE_MSW" = 1; then
       if test "$wxUSE_MS_HTML_HELP" = "yes"; then
         ac_safe=`echo "htmlhelp.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for htmlhelp.h""... $ac_c" 1>&6
-echo "configure:17118: checking for htmlhelp.h" >&5
+echo "configure:17640: checking for htmlhelp.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 17123 "configure"
+#line 17645 "configure"
 #include "confdefs.h"
 #include <htmlhelp.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:17128: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:17650: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -17149,7 +17671,7 @@ EOF
 else
   echo "$ac_t""no" 1>&6
 
-                echo "configure: warning: MS HTML Help cannot be used without htmlhelp.h so it won't be compiled without it" 1>&2
+                echo "configure: warning: MS HTML Help cannot be used without htmlhelp.h... disabled" 1>&2
                 wxUSE_MS_HTML_HELP=no
             
 fi
@@ -17205,63 +17727,24 @@ EOF
 fi
 
 
-if test "$wxUSE_IPC" = "yes"; then
-    if test "$wxUSE_SOCKETS" != "yes"; then
-        echo "configure: warning: wxWindows IPC classes require sockets" 1>&2
-    fi
-
-    cat >> confdefs.h <<\EOF
-#define wxUSE_IPC 1
-EOF
-
-fi
-
-if test "$wxUSE_CLIPBOARD" = "yes"; then
-    cat >> confdefs.h <<\EOF
-#define wxUSE_CLIPBOARD 1
-EOF
-
-    cat >> confdefs.h <<\EOF
-#define wxUSE_DATAOBJ 1
-EOF
-
-fi
-
-if test "$wxUSE_DRAG_AND_DROP" = "yes" ; then
-    if test "$wxUSE_GTK" = 1; then
-        if test "$WXGTK12" != 1; then
-            echo "configure: warning: Drag and drop is only supported under GTK+ 1.2" 1>&2
-            wxUSE_DRAG_AND_DROP=no
-        fi
-    fi
-
-    if test "$wxUSE_MOTIF" = 1; then
-        echo "configure: warning: Drag and drop is not yet supported under Motif" 1>&2
-        wxUSE_DRAG_AND_DROP=no
-    fi
-
-    if test "$wxUSE_MAC" = 1; then
-        echo "configure: warning: Drag and drop is not yet supported under Mac OS X" 1>&2
-        wxUSE_DRAG_AND_DROP=no
-    fi
-
-    if test "$USE_WIN32" = 1; then
-                
-        for ac_hdr in ole2.h
+if test "$wxUSE_MSW" = 1 -a \( "$wxUSE_DATAOBJ"       = "yes" \
+                          -o "$wxUSE_CLIPBOARD"     = "yes" \
+                          -o "$wxUSE_DRAG_AND_DROP" = "yes" \) ; then
+    for ac_hdr in ole2.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:17255: checking for $ac_hdr" >&5
+echo "configure:17738: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 17260 "configure"
+#line 17743 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:17265: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:17748: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -17288,34 +17771,84 @@ fi
 done
 
 
-        if test "$ac_cv_header_ole2_h" = "yes" ; then
-            if test "$GCC" = yes ; then
-                ALL_OBJECTS="$ALL_OBJECTS \$(OLEOBJS)"
-                ALL_DEPFILES="$ALL_DEPFILES \$(OLEDEPS)"
-                CODE_GEN_FLAGS_CXX="$CODE_GEN_FLAGS_CXX -fvtable-thunks"
-                LIBS="$LIBS -lrpcrt4 -loleaut32 -lole32 -luuid"
-                cat >> confdefs.h <<\EOF
+    if test "$ac_cv_header_ole2_h" = "yes" ; then
+        if test "$GCC" = yes ; then
+            ALL_OBJECTS="$ALL_OBJECTS \$(OLEOBJS)"
+            CODE_GEN_FLAGS_CXX="$CODE_GEN_FLAGS_CXX -fvtable-thunks"
+            LIBS=" -lrpcrt4 -loleaut32 -lole32 -luuid$LIBS"
+            cat >> confdefs.h <<\EOF
 #define wxUSE_OLE 1
 EOF
 
 
-                                                if test "$wxUSE_METAFILE" = "yes"; then
-                    cat >> confdefs.h <<\EOF
+        fi
+
+                cat >> confdefs.h <<\EOF
+#define wxUSE_DATAOBJ 1
+EOF
+
+    else
+        echo "configure: warning: Some features disabled because OLE headers not found" 1>&2
+
+        wxUSE_CLIPBOARD=no
+        wxUSE_DRAG_AND_DROP=no
+        wxUSE_DATAOBJ=no
+    fi
+
+    if test "$wxUSE_METAFILE" = "yes"; then
+        cat >> confdefs.h <<\EOF
 #define wxUSE_METAFILE 1
 EOF
 
-                                        cat >> confdefs.h <<\EOF
+
+                cat >> confdefs.h <<\EOF
 #define wxUSE_ENH_METAFILE 1
 EOF
 
-                fi
-            fi
-        else
-            echo "configure: warning: Drag and drop disabled because OLE headers not found" 1>&2
+    fi
+fi
+
+if test "$wxUSE_IPC" = "yes"; then
+    if test "$wxUSE_SOCKETS" != "yes"; then
+        echo "configure: warning: wxWindows IPC classes require sockets... disabled" 1>&2
+    fi
+
+    cat >> confdefs.h <<\EOF
+#define wxUSE_IPC 1
+EOF
+
+fi
+
+if test "$wxUSE_CLIPBOARD" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_CLIPBOARD 1
+EOF
+
+
+        cat >> confdefs.h <<\EOF
+#define wxUSE_DATAOBJ 1
+EOF
+
+fi
+
+if test "$wxUSE_DRAG_AND_DROP" = "yes" ; then
+    if test "$wxUSE_GTK" = 1; then
+        if test "$WXGTK12" != 1; then
+            echo "configure: warning: Drag and drop is only supported under GTK+ 1.2... disabled" 1>&2
             wxUSE_DRAG_AND_DROP=no
         fi
     fi
 
+    if test "$wxUSE_MOTIF" = 1; then
+        echo "configure: warning: Drag and drop not yet supported under Motif... disabled" 1>&2
+        wxUSE_DRAG_AND_DROP=no
+    fi
+
+    if test "$wxUSE_MAC" = 1; then
+        echo "configure: warning: Drag and drop not yet supported under Mac OS X... disabled" 1>&2
+        wxUSE_DRAG_AND_DROP=no
+    fi
+
     if test "$wxUSE_DRAG_AND_DROP" = "yes"; then
         cat >> confdefs.h <<\EOF
 #define wxUSE_DRAG_AND_DROP 1
@@ -17617,7 +18150,11 @@ fi
 
 if test "$wxUSE_TOGGLEBTN" = "yes"; then
     if test "$wxUSE_MAC" = 1; then
-        echo "configure: warning: Toggle button is not yet supported under Mac OS X" 1>&2
+        echo "configure: warning: Toggle button not yet supported under Mac OS X... disabled" 1>&2
+        wxUSE_TOGGLEBTN=no
+    fi
+    if test "$wxUSE_UNIVERSAL" = "yes"; then
+        echo "configure: warning: Toggle button not yet supported under wxUNIVERSAL... disabled" 1>&2
         wxUSE_TOGGLEBTN=no
     fi
 
@@ -17663,15 +18200,19 @@ fi
 
 if test "$wxUSE_TOOLTIPS" = "yes"; then
     if test "$wxUSE_MOTIF" = 1; then
-        echo "configure: warning: wxTooltip not supported yet under Motif" 1>&2
+        echo "configure: warning: wxTooltip not supported yet under Motif... disabled" 1>&2
     else
         if test "$wxUSE_WINE" = 1; then
-            echo "configure: warning: wxTooltip not supported under WINE" 1>&2
+            echo "configure: warning: wxTooltip not supported under WINE... disabled" 1>&2
         else
-            cat >> confdefs.h <<\EOF
+            if test "$wxUSE_UNIVERSAL" = "yes"; then
+                echo "configure: warning: wxTooltip not supported yet in wxUNIVERSAL... disabled" 1>&2
+            else
+                cat >> confdefs.h <<\EOF
 #define wxUSE_TOOLTIPS 1
 EOF
 
+            fi
         fi
     fi
 fi
@@ -17691,13 +18232,25 @@ fi
 
 if test "$wxUSE_POPUPWIN" = "yes"; then
     if test "$wxUSE_MAC" = 1; then
-        echo "configure: warning: Popup window is not yet supported under Mac OS" 1>&2
+        echo "configure: warning: Popup window not yet supported under Mac OS X... disabled" 1>&2
     else
-        cat >> confdefs.h <<\EOF
+        if test "$wxUSE_MOTIF" = 1; then
+            echo "configure: warning: wxPopupWindow not yet supported under Motif... disabled" 1>&2
+        else
+            cat >> confdefs.h <<\EOF
 #define wxUSE_POPUPWIN 1
 EOF
 
-        USES_CONTROLS=1
+
+            if test "$wxUSE_TIPWINDOW" = "yes"; then
+                cat >> confdefs.h <<\EOF
+#define wxUSE_TIPWINDOW 1
+EOF
+
+            fi
+
+            USES_CONTROLS=1
+        fi
     fi
 fi
 
@@ -17768,7 +18321,6 @@ if test "$wxUSE_HTML" = "yes"; then
 EOF
 
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS html"
-    INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS html"
 fi
 
 if test "$wxUSE_VALIDATORS" = "yes"; then
@@ -17779,6 +18331,13 @@ EOF
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS validate"
 fi
 
+if test "$wxUSE_PALETTE" = "yes" ; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_PALETTE 1
+EOF
+
+fi
+
 if test "$wxUSE_IMAGE" = "yes" ; then
   cat >> confdefs.h <<\EOF
 #define wxUSE_IMAGE 1
@@ -17937,65 +18496,69 @@ EOF
 
 
 
-GUILIBS="$GUI_TK_LIBRARY $TOOLKIT_LINK"
-OPENGL_LIBS="$OPENGL_LINK"
-
-EXTRA_LIBS="$LIBS $POSIX4_LINK $INET_LINK $WCHAR_LINK $THREADS_LINK $DMALLOC_LINK $DL_LINK $ZLIB_LINK -lm"
-if test "$wxUSE_MAC" = 1 ; then
-    EXTRA_LIBS="$EXTRA_LIBS -framework Carbon -framework System"
-fi
-if test "$wxUSE_GUI" = "yes"; then
-    EXTRA_LIBS="$GUILIBS $PNG_LINK $JPEG_LINK $TIFF_LINK $FREETYPE_LINK $EXTRA_LIBS"
+if test "x$prefix" != "xNONE"; then
+    wxPREFIX=$prefix
+else
+    wxPREFIX=$ac_default_prefix
 fi
 
-LD_LIBS="\${top_builddir}/lib/${WX_LIBRARY_NAME_STATIC} $EXTRA_LIBS"
+cat >> confdefs.h <<EOF
+#define wxINSTALL_PREFIX "$wxPREFIX"
+EOF
 
-INCLUDES="-I. -I\${top_builddir}/include -I\${top_srcdir}/include \
-$REGEX_INCLUDE $ZLIB_INCLUDE $PNG_INCLUDE $JPEG_INCLUDE $TIFF_INCLUDE \
-$FREETYPE_INCLUDE $TOOLKIT_INCLUDE"
 
-if test "$wxUSE_GTK" = 1; then
-    WXCONFIG_INCLUDE=""
-else
-    WXCONFIG_INCLUDE="$TOOLKIT_INCLUDE"
-fi
 
-if test "$GXX" = yes ; then
-        CXXWARNINGS="-Wall"
-        fi
-EXTRA_CFLAGS="$WXDEBUG $WXODBCFLAG $PROFILE $OPTIMISE $INCLUDES"
 
-CFLAGS=`echo $CFLAGS $EXTRA_CFLAGS $CXXWARNINGS | sed 's/ \\+/ /g'`
-CXXFLAGS=`echo $CXXFLAGS $EXTRA_CFLAGS $CXXWARNINGS | sed 's/ \+/ /g'`
 
-LDFLAGS="$LDFLAGS $PROFILE"
+if test "$wxUSE_MAC" = 1 ; then
+    LDFLAGS="$LDFLAGS -framework Carbon -framework System"
+fi
+
+
+LIBS="$ZLIB_LINK$POSIX4_LINK$INET_LINK$WCHAR_LINK$THREADS_LINK$DL_LINK -lm$LIBS"
 
 if test "$wxUSE_GUI" = "yes"; then
+
+    LIBS=" $GUI_TK_LIBRARY$PNG_LINK$JPEG_LINK$TIFF_LINK$FREETYPE_LINK$LIBS"
+
         
             SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS controls dialogs \
                      drawing dynamic erase event exec font image \
                      minimal richedit rotate widgets"
 
-    if test "$wxUSE_UNIVERSAL" = "yes" ; then
-        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS univ"
-    fi
-
         CPPFLAGS="$CPPFLAGS \$(EXTRADEFS) \$(APPEXTRADEFS)"
 else
     SAMPLES_SUBDIRS="console"
 fi
 
-SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq | tr '\n' ' '| tr -d '\r'`"
-
-
-
 
+INCLUDES="-I\${top_builddir}/lib/wx/include/${TOOLCHAIN_NAME} -I\${top_srcdir}/include \
+$REGEX_INCLUDE $ZLIB_INCLUDE $PNG_INCLUDE $JPEG_INCLUDE $TIFF_INCLUDE \
+$FREETYPE_INCLUDE $TOOLKIT_INCLUDE"
 
+if test "$wxUSE_GTK" = 1; then
+    WXCONFIG_INCLUDE=
+else
+    WXCONFIG_INCLUDE="$TOOLKIT_INCLUDE"
+fi
 
+if test "$GXX" = yes ; then
+        CXXWARNINGS="-Wall"
+        
+            if test "$wxUSE_NO_DEPS" = "no" ; then
+        CFLAGS="-MMD $CFLAGS"
+        CXXFLAGS="-MMD $CXXFLAGS"
+    fi
+fi
 
+EXTRA_CFLAGS="$WXDEBUG $WXODBCFLAG$PROFILE $OPTIMISE $INCLUDES"
 
+CFLAGS=`echo $CFLAGS $EXTRA_CFLAGS $CXXWARNINGS | sed 's/ \\+/ /g'`
+CXXFLAGS=`echo $CXXFLAGS $EXTRA_CFLAGS $CXXWARNINGS | sed 's/ \+/ /g'`
 
+LDFLAGS="$LDFLAGS$PROFILE"
 
+SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq | tr '\n' ' '| tr -d '\r'`"
 
 
 
@@ -18082,7 +18645,7 @@ SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq
 
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:18086: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:18649: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -18109,14 +18672,8 @@ else
 fi
 
 
-if test -d include; then
-    if test -d include/wx; then
-        if test -d include/wx/${SETUPH_DIR}; then
-            if test -f include/wx/${SETUPH_DIR}/setup.h; then
-                mv -f include/wx/${SETUPH_DIR}/setup.h setup.h
-            fi
-        fi
-    fi
+if test -f lib/wx/include/${TOOLCHAIN_NAME}/wx/setup.h; then
+    mv -f lib/wx/include/${TOOLCHAIN_NAME}/wx/setup.h setup.h
 fi
 
 
@@ -18291,7 +18848,6 @@ s%@build_os@%$build_os%g
 s%@CC@%$CC%g
 s%@CPP@%$CPP%g
 s%@CXX@%$CXX%g
-s%@CXXCPP@%$CXXCPP%g
 s%@RANLIB@%$RANLIB%g
 s%@AR@%$AR%g
 s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
@@ -18310,84 +18866,73 @@ s%@X_CFLAGS@%$X_CFLAGS%g
 s%@X_PRE_LIBS@%$X_PRE_LIBS%g
 s%@X_LIBS@%$X_LIBS%g
 s%@X_EXTRA_LIBS@%$X_EXTRA_LIBS%g
-s%@REZ@%$REZ%g
+s%@RESCOMP@%$RESCOMP%g
 s%@DEREZ@%$DEREZ%g
+s%@CXXCPP@%$CXXCPP%g
 s%@LEX_STEM@%$LEX_STEM%g
 s%@PATH_IFS@%$PATH_IFS%g
 s%@WX_MAJOR_VERSION_NUMBER@%$WX_MAJOR_VERSION_NUMBER%g
 s%@WX_MINOR_VERSION_NUMBER@%$WX_MINOR_VERSION_NUMBER%g
 s%@WX_RELEASE_NUMBER@%$WX_RELEASE_NUMBER%g
-s%@WX_LIBRARY_NAME@%$WX_LIBRARY_NAME%g
 s%@WX_LIBRARY_NAME_STATIC@%$WX_LIBRARY_NAME_STATIC%g
 s%@WX_LIBRARY_NAME_SHARED@%$WX_LIBRARY_NAME_SHARED%g
-s%@WX_LIBRARY@%$WX_LIBRARY%g
+s%@WX_LIBRARY_IMPORTLIB@%$WX_LIBRARY_IMPORTLIB%g
 s%@WX_TARGET_LIBRARY@%$WX_TARGET_LIBRARY%g
 s%@WX_LIBRARY_LINK1@%$WX_LIBRARY_LINK1%g
 s%@WX_LIBRARY_LINK2@%$WX_LIBRARY_LINK2%g
-s%@WX_LIBRARY_LINK3@%$WX_LIBRARY_LINK3%g
 s%@PROGRAM_EXT@%$PROGRAM_EXT%g
-s%@WX_LIBRARY_NAME_GL@%$WX_LIBRARY_NAME_GL%g
 s%@WX_LIBRARY_NAME_STATIC_GL@%$WX_LIBRARY_NAME_STATIC_GL%g
 s%@WX_LIBRARY_NAME_SHARED_GL@%$WX_LIBRARY_NAME_SHARED_GL%g
-s%@WX_LIBRARY_GL@%$WX_LIBRARY_GL%g
 s%@WX_TARGET_LIBRARY_GL@%$WX_TARGET_LIBRARY_GL%g
 s%@WX_LIBRARY_LINK1_GL@%$WX_LIBRARY_LINK1_GL%g
 s%@WX_LIBRARY_LINK2_GL@%$WX_LIBRARY_LINK2_GL%g
-s%@WX_LIBRARY_LINK3_GL@%$WX_LIBRARY_LINK3_GL%g
 s%@WX_ALL@%$WX_ALL%g
 s%@WX_ALL_INSTALLED@%$WX_ALL_INSTALLED%g
 s%@SHARED_LD@%$SHARED_LD%g
 s%@PIC_FLAG@%$PIC_FLAG%g
-s%@DEP_INFO_FLAGS@%$DEP_INFO_FLAGS%g
 s%@CODE_GEN_FLAGS@%$CODE_GEN_FLAGS%g
 s%@CODE_GEN_FLAGS_CXX@%$CODE_GEN_FLAGS_CXX%g
-s%@BURNT_LIBRARY_NAME@%$BURNT_LIBRARY_NAME%g
-s%@BURNT_LIBRARY_NAME_GL@%$BURNT_LIBRARY_NAME_GL%g
+s%@SONAME_FLAGS@%$SONAME_FLAGS%g
+s%@SONAME_FLAGS_GL@%$SONAME_FLAGS_GL%g
 s%@WX_TARGET_LIBRARY_SONAME@%$WX_TARGET_LIBRARY_SONAME%g
 s%@WX_TARGET_LIBRARY_TYPE@%$WX_TARGET_LIBRARY_TYPE%g
 s%@WXDEBUG_DEFINE@%$WXDEBUG_DEFINE%g
 s%@USE_GUI@%$USE_GUI%g
 s%@AFMINSTALL@%$AFMINSTALL%g
-s%@SETUPH_DIR@%$SETUPH_DIR%g
 s%@TOOLKIT@%$TOOLKIT%g
-s%@TOOLKIT_DEF@%$TOOLKIT_DEF%g
 s%@TOOLKIT_DIR@%$TOOLKIT_DIR%g
-s%@TOOLKIT_NAME@%$TOOLKIT_NAME%g
-s%@TOOLKIT_INCLUDE@%$TOOLKIT_INCLUDE%g
 s%@TOOLKIT_VPATH@%$TOOLKIT_VPATH%g
+s%@TOOLCHAIN_NAME@%$TOOLCHAIN_NAME%g
+s%@TOOLCHAIN_DEFS@%$TOOLCHAIN_DEFS%g
+s%@TOOLCHAIN_DLL_DEFS@%$TOOLCHAIN_DLL_DEFS%g
+s%@cross_compiling@%$cross_compiling%g
+s%@WXCONFIG_LIBS@%$WXCONFIG_LIBS%g
+s%@WXCONFIG_LIBS_GL@%$WXCONFIG_LIBS_GL%g
+s%@WXCONFIG_LIBS_STATIC@%$WXCONFIG_LIBS_STATIC%g
+s%@WXCONFIG_LIBS_STATIC_GL@%$WXCONFIG_LIBS_STATIC_GL%g
 s%@WXCONFIG_INCLUDE@%$WXCONFIG_INCLUDE%g
 s%@ALL_OBJECTS@%$ALL_OBJECTS%g
-s%@ALL_DEPFILES@%$ALL_DEPFILES%g
 s%@GUIDIST@%$GUIDIST%g
 s%@PORT_FILES@%$PORT_FILES%g
 s%@DISTDIR@%$DISTDIR%g
-s%@RPM_SPEC@%$RPM_SPEC%g
-s%@RPM_FILES@%$RPM_FILES%g
-s%@SRC_SUBDIRS@%$SRC_SUBDIRS%g
-s%@INCLUDE_SUBDIRS@%$INCLUDE_SUBDIRS%g
-s%@UTILS_SUBDIRS@%$UTILS_SUBDIRS%g
-s%@DOCS_SUBDIRS@%$DOCS_SUBDIRS%g
 s%@SAMPLES_SUBDIRS@%$SAMPLES_SUBDIRS%g
-s%@USER_SUBDIRS@%$USER_SUBDIRS%g
-s%@EXTRA_LIBS@%$EXTRA_LIBS%g
+s%@LDFLAGS_GL@%$LDFLAGS_GL%g
 s%@OPENGL_LIBS@%$OPENGL_LIBS%g
+s%@DMALLOC_LIBS@%$DMALLOC_LIBS%g
 s%@EXTRADEFS@%$EXTRADEFS%g
-s%@LD_LIBS@%$LD_LIBS%g
-s%@WXMSW_DLL_DEFINES@%$WXMSW_DLL_DEFINES%g
-s%@RCINPUTSWITCH@%$RCINPUTSWITCH%g
-s%@RCOUTPUTSWITCH@%$RCOUTPUTSWITCH%g
-s%@RESPROGRAM@%$RESPROGRAM%g
-s%@RESCOMP@%$RESCOMP%g
 s%@RESFLAGS@%$RESFLAGS%g
-s%@REZFLAGS@%$REZFLAGS%g
-s%@DEREZFLAGS@%$DEREZFLAGS%g
+s%@RESPROGRAMOBJ@%$RESPROGRAMOBJ%g
+s%@WX_RESOURCES_MACOSX@%$WX_RESOURCES_MACOSX%g
+s%@WX_RESOURCES_MACOSX_COMPILED@%$WX_RESOURCES_MACOSX_COMPILED%g
 s%@LIBWXMACRES@%$LIBWXMACRES%g
 s%@LIBWXMACRESCOMP@%$LIBWXMACRESCOMP%g
+s%@LIBWXMACRESWXCONFIG@%$LIBWXMACRESWXCONFIG%g
 s%@DLLTOOL@%$DLLTOOL%g
 s%@AS@%$AS%g
 s%@NM@%$NM%g
 s%@LD@%$LD%g
 s%@MAKEINFO@%$MAKEINFO%g
+s%@INSTALL_LIBRARY@%$INSTALL_LIBRARY%g
 s%@SET_MAKE@%$SET_MAKE%g
 s%@subdirs@%$subdirs%g
 
@@ -18605,21 +19150,19 @@ fi; done
 EOF
 cat >> $CONFIG_STATUS <<EOF
 
-            SETUPH_DIR="${SETUPH_DIR}"
-            TOOLKIT_NAME="${TOOLKIT_NAME}"
+            TOOLCHAIN_NAME="${TOOLCHAIN_NAME}"
             LN_S="${LN_S}"
           
          
 EOF
 cat >> $CONFIG_STATUS <<\EOF
 
-                                                if test ! -f wx${TOOLKIT_NAME}-config; then
+                                                                                                if test ! -h wx-config; then
                 chmod +x wx-config
-                mv wx-config wx${TOOLKIT_NAME}-config
-                ${LN_S} wx${TOOLKIT_NAME}-config wx-config
+                mv wx-config wx${TOOLCHAIN_NAME}-config
+                ${LN_S} wx${TOOLCHAIN_NAME}-config wx-config
             fi
 
-                        
             if test ! -d lib; then
               mkdir lib
             fi
@@ -18629,30 +19172,15 @@ cat >> $CONFIG_STATUS <<\EOF
             if test ! -d lib/wx/include; then
               mkdir lib/wx/include
             fi
-            if test ! -d lib/wx/include/wx; then
-              mkdir lib/wx/include/wx
+            if test ! -d lib/wx/include/${TOOLCHAIN_NAME}; then
+              mkdir lib/wx/include/${TOOLCHAIN_NAME}
             fi
-            if test ! -d lib/wx/include/wx/${TOOLKIT_NAME}; then
-              mkdir lib/wx/include/wx/${TOOLKIT_NAME}
+            if test ! -d lib/wx/include/${TOOLCHAIN_NAME}/wx; then
+              mkdir lib/wx/include/${TOOLCHAIN_NAME}/wx
             fi
             if test -f setup.h; then
-                cp -fp setup.h lib/wx/include/wx/${TOOLKIT_NAME}/setup.h
+              mv -f setup.h lib/wx/include/${TOOLCHAIN_NAME}/wx/setup.h
             fi
-
-            
-            if test ! -d include; then
-              mkdir include
-            fi
-            if test ! -d include/wx; then
-              mkdir include/wx
-            fi
-            if test ! -d include/wx/${SETUPH_DIR}; then
-              mkdir include/wx/${SETUPH_DIR}
-            fi
-            if test -f setup.h; then
-                cp -fp setup.h include/wx/${SETUPH_DIR}/setup.h
-            fi
-
           
 exit 0
 EOF