implemented EVT_LIST_CACHE_HINT support: send this message from OnPaint() now

[wxWidgets.git] / configure

diff --git a/configure b/configure
index 7a4e79bc819dba9e5c3c1117606f460126b96467..5f830dbd84fc3f64938f121df1355beb3abbeee8 100755 (executable)
--- a/configure
+++ b/configure
@@ -35,12 +35,13 @@
 
 
 
 
 
 

+
+# Configure paths for GTK+
+# Owen Taylor     97-11-3

 
 
 
 
 
 
 
 

-# Configure paths for GTK+
-# Owen Taylor     97-11-3

 
 
 # Guess values for system-dependent variables and create Makefiles.
 
 
 # Guess values for system-dependent variables and create Makefiles.


@@ -55,7 +56,9 @@ ac_help=
 ac_default_prefix=/usr/local
 # Any additions from configure.in:
 ac_help="$ac_help
 ac_default_prefix=/usr/local
 # Any additions from configure.in:
 ac_help="$ac_help

---enable-gui            use GUI classes"
+  --enable-gui            use GUI classes"
+ac_help="$ac_help
+  --enable-universal      use wxWindows GUI controls instead of native ones"

 ac_help="$ac_help
   --with-gtk              use GTK+"
 ac_help="$ac_help
 ac_help="$ac_help
   --with-gtk              use GTK+"
 ac_help="$ac_help


@@ -71,235 +74,295 @@ ac_help="$ac_help
 ac_help="$ac_help
   --with-pm               use OS/2 Presentation Manager"
 ac_help="$ac_help
 ac_help="$ac_help
   --with-pm               use OS/2 Presentation Manager"
 ac_help="$ac_help

-  --with-gtk-prefix=PFX   Prefix where GTK is installed"
+  --with-mgl              use MGL"
+ac_help="$ac_help
+  --enable-gtk2           use GTK+ 2.0 if available (EXPERIMENTAL)"
+ac_help="$ac_help
+  --with-libpng           use libpng (PNG image format)"
+ac_help="$ac_help
+  --with-libjpeg          use libjpeg (JPEG file format)"
+ac_help="$ac_help
+  --with-libtiff          use libtiff (TIFF file format)"
+ac_help="$ac_help
+  --with-freetype         use freetype (font rasterizer)"
+ac_help="$ac_help
+  --with-opengl           use OpenGL (or Mesa)"
+ac_help="$ac_help
+  --with-dmalloc          use dmalloc library (www.letters.com/dmalloc)"
+ac_help="$ac_help
+  --with-regex            enable support for wxRegEx class"
+ac_help="$ac_help
+  --with-zlib             use zlib for LZW compression"
+ac_help="$ac_help
+  --with-odbc             use the IODBC and wxODBC classes"
+ac_help="$ac_help
+  --enable-shared         create shared library code"
+ac_help="$ac_help
+  --enable-burnt_name     create set name in shared library "
+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-debug_flag     set __WXDEBUG__ flag (recommended for developers!)"
+ac_help="$ac_help
+  --enable-debug_info     create code with debugging information"
+ac_help="$ac_help
+  --enable-debug_gdb      create code with extra GDB debugging information"
+ac_help="$ac_help
+  --enable-debug_cntxt    use wxDebugContext"
+ac_help="$ac_help
+  --enable-mem_tracing    create code with memory tracing"
+ac_help="$ac_help
+  --enable-profile        create code with profiling information"
+ac_help="$ac_help
+  --enable-no_rtti        create code without RTTI information"
+ac_help="$ac_help
+  --enable-no_exceptions  create code without exceptions information"
+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"
+ac_help="$ac_help
+  --enable-compat22       enable wxWin 2.2 compatibility"

 ac_help="$ac_help
 ac_help="$ac_help

-  --with-gtk-exec-prefix=PFX  Exec prefix where GTK is installed"
+  --enable-intl           use internationalization system"

 ac_help="$ac_help
 ac_help="$ac_help

---with-libpng           use libpng (PNG image format)"
+  --enable-config         use wxConfig (and derived) classes"

 ac_help="$ac_help
 ac_help="$ac_help

---with-libjpeg          use libjpeg (JPEG file format)"
+  --enable-sockets        use socket/network classes"

 ac_help="$ac_help
 ac_help="$ac_help

---with-libtiff          use libtiff (TIFF file format)"
+  --enable-ipc            use interprocess communication (wxSocket etc.)"

 ac_help="$ac_help
 ac_help="$ac_help

---with-freetype         use freetype (font rasterizer)"
+  --enable-cmdline        use wxCmdLineParser class"

 ac_help="$ac_help
 ac_help="$ac_help

---with-opengl           use OpenGL (or Mesa)"
+  --enable-datetime       use wxDateTime class"

 ac_help="$ac_help
 ac_help="$ac_help

---with-dmalloc          use dmalloc library (www.letters.com/dmalloc)"
+  --enable-timedate       use obsolete wxDate/wxTime classes"

 ac_help="$ac_help
 ac_help="$ac_help

---with-zlib             use zlib for LZW compression"
+  --enable-stopwatch      use wxStopWatch class"

 ac_help="$ac_help
 ac_help="$ac_help

---with-odbc             use the IODBC and wxODBC classes"
+  --enable-dialupman      use dialup network classes"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-shared         create shared library code"
+  --enable-apple_ieee     use the Apple IEEE codec"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-burnt_name     create set name in shared library "
+  --enable-timer          use wxTimer class"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-optimise       create optimised code"
+  --enable-wave           use wxWave class"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-debug          same as debug_flag and debug_info"
+  --enable-fraction       use wxFraction class"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-debug_flag     set __WXDEBUG__ flag (recommended for developers!)"
+  --enable-dynlib         use wxLibrary class for DLL loading"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-debug_info     create code with debugging information"
+  --enable-longlong       use wxLongLong class"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-debug_gdb      create code with extra GDB debugging information"
+  --enable-geometry       use geometry class"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-debug_cntxt    use wxDebugContext"
+  --enable-log            use logging system"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-mem_tracing    create code with memory tracing"
+  --enable-streams        use wxStream etc classes"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-profile        create code with profiling information"
+  --enable-file           use wxFile classes"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-no_rtti        create code without RTTI information"
+  --enable-ffile          use wxFFile classes"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-no_exceptions  create code without exceptions information"
+  --enable-textfile       use wxTextFile classes"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-permissive     compile code disregarding strict ANSI"
+  --enable-fontmap        use font encodings conversion classes"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-no_deps        create code without dependency information"
+  --enable-unicode        compile wxString with Unicode support"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-intl           use internationalization system"
+  --enable-wcsrtombs      use wcsrtombs instead of buggy (GNU libc1/Linux libc5) wcstombs"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-config         use wxConfig (and derived) classes"
+  --enable-wxprintfv      use wxWindows implementation of vprintf()"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-sockets        use socket/network classes"
+  --enable-std_iostreams  use standard C++ stream classes"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-ipc            use interprocess communication (wxSocket etc.)"
+  --enable-filesystem     use virtual file systems classes"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-dialupman      use dialup network classes"
+  --enable-fs_inet        use virtual HTTP/FTP filesystems"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-apple_ieee     use the Apple IEEE codec"
+  --enable-fs_zip         use virtual ZIP filesystems"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-timedate       use date/time classes"
+  --enable-zipstream      use wxZipInputStream"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-wave           use wxWave class"
+  --enable-catch_segvs    catch signals and pass them to wxApp::OnFatalException"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-fraction       use wxFraction class"
+  --enable-snglinst       use wxSingleInstanceChecker class"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-dynlib         use wxLibrary class for DLL loading"
+  --enable-mimetypes      use wxMimeTypesManager"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-longlong       use wxLongLong class"
+  --enable-sysoptions      use wxSystemOptions"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-geometry       use geometry class"
+  --enable-threads        use threads"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-log            use logging system"
+  --enable-serial         use class serialization"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-streams        use wxStream etc classes"
+  --enable-docview        use document view architecture"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-file           use wxFile classes"
+  --enable-help           use help subsystem"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-textfile       use wxTextFile classes"
+  --enable-mshtmlhelp     use MS HTML Help (win32)"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-unicode        compile wxString with Unicode support"
+  --enable-html           use wxHTML sub-library"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-wcsrtombs      use wcsrtombs instead of buggy (GNU libc1/Linux libc5) wcstombs"
+  --enable-htmlhelp       use wxHTML-based help"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-wxprintfv      use wxWindows implementation of vprintf()"
+  --enable-constraints    use layout-constraints system"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-std_iostreams  use standard C++ stream classes"
+  --enable-printarch      use printing architecture"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-filesystem     use virtual file systems classes"
+  --enable-mdi            use multiple document interface architecture"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-fs_inet        use virtual HTTP/FTP filesystems"
+  --enable-loggui         use standard GUI logger"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-fs_zip         use virtual ZIP filesystems"
+  --enable-logwin         use wxLogWindow"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-zipstream      use wxZipInputStream"
+  --enable-postscript     use wxPostscriptDC device context (default for gtk+)"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-catch_segvs    catch signals and pass them to wxApp::OnFatalException"
+  --enable-prologio       use Prolog IO library"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-snglinst       use wxSingleInstanceChecker class"
+  --enable-resources      use wxWindows resources"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-threads        use threads"
+  --enable-xresources     use X resources for save (default for gtk+)"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-serial         use class serialization"
+  --enable-clipboard      use wxClipboard classes"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-docview        use document view architecture"
+  --enable-dnd            use Drag'n'Drop classes"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-help           use help (using external browser at present)"
+  --enable-metafile       use win32 metafiles"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-constraints    use layout-constraints system"
+  --enable-wxtree         make wxTree library"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-printarch      use printing architecture"
+  --enable-controls       use all usual controls"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-mdi            use multiple document interface architecture"
+  --enable-accel          use accelerators"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-postscript     use wxPostscriptDC device context (default for gtk+)"
+  --enable-button         use wxButton class"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-prologio       use Prolog IO library"
+  --enable-bmpbutton      use wxBitmapButton class"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-resources      use wxWindows resources"
+  --enable-calendar       use wxCalendarCtrl class"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-xresources     use X resources for save (default for gtk+)"
+  --enable-caret          use wxCaret class"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-clipboard      use wxClipboard classes"
+  --enable-checkbox       use wxCheckBox class"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-dnd            use Drag'n'Drop classes"
+  --enable-checklst       use wxCheckListBox (listbox with checkboxes) class"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-metafile       use win32 metafiles"
+  --enable-choice         use wxChoice class"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-wxtree         make wxTree library"
+  --enable-combobox       use wxComboBox classes"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-controls       use all usual controls"
+  --enable-gauge          use wxGauge class"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-accel          use accelerators"
+  --enable-grid           use wxGrid class"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-caret          use wxCaret class"
+  --enable-newgrid        use new wxGrid class"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-bmpbutton      use wxBitmapButton class"
+  --enable-imaglist       use wxImageList class"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-checkbox       use wxCheckBox class"
+  --enable-listbox        use wxListBox class"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-checklst       use wxCheckListBox (listbox with checkboxes) class"
+  --enable-listctrl       use wxListCtrl class"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-choice         use wxChoice class"
+  --enable-notebook       use wxNotebook class"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-combobox       use wxComboBox classes"
+  --enable-radiobox       use wxRadioBox class"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-gauge          use wxGauge class"
+  --enable-radiobtn       use wxRadioButton class"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-grid           use wxGrid class"
+  --enable-sash           use wxSashWindow class"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-newgrid        use new wxGrid class"
+  --enable-scrollbar      use wxScrollBar class and scrollable windows"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-imaglist       use wxImageList class"
+  --enable-slider         use wxSlider class"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-listbox        use wxListBox class"
+  --enable-spinbtn        use wxSpinButton class"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-listctrl       use wxListCtrl class"
+  --enable-spinctrl       use wxSpinCtrl class"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-notebook       use wxNotebook class"
+  --enable-splitter       use wxSplitterWindow class"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-radiobox       use wxRadioBox class"
+  --enable-statbmp        use wxStaticBitmap class"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-radiobtn       use wxRadioButton class"
+  --enable-statbox        use wxStaticBox class"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-sash           use wxSashWindow class"
+  --enable-statline       use wxStaticLine class"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-scrollbar      use wxScrollBar class and scrollable windows"
+  --enable-stattext       use wxStaticText class"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-slider         use wxSlider class"
+  --enable-statusbar      use wxStatusBar class"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-spinbtn        use wxSpinButton class"
+  --enable-tabdialog      use wxTabControl class"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-spinctrl       use wxSpinCtrl class"
+  --enable-textctrl       use wxTextCtrl class"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-splitter       use wxSplitterWindow class"
+  --enable-togglebtn      use wxToggleButton class"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-statbmp        use wxStaticBitmap class"
+  --enable-toolbar        use wxToolBar class"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-statbox        use wxStaticBox class"
+  --enable-tbarnative     use native wxToolBar class"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-statline       use wxStaticLine class"
+  --enable-tbarsmpl       use wxToolBarSimple class"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-statusbar      use wxStatusBar class"
+  --enable-treectrl       use wxTreeCtrl class"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-tabdialog      use wxTabControl class"
+  --enable-popupwin       use wxPopUpWindow class"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-togglebtn      use wxToggleButton class"
+  --enable-commondlg      use common dialogs (wxDirDialog, wxProgressDialog, wxTextDialog, ...)"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-toolbar        use wxToolBar class"
+  --enable-choicedlg      use wxChoiceDialog"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-tbarnative     use native wxToolBar class"
+  --enable-coldlg         use wxColourDialog"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-tbarsmpl       use wxToolBarSimple class"
+  --enable-filedlg        use wxFileDialog"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-treectrl       use wxTreeCtrl class"
+  --enable-fontdlg        use wxFontDialog"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-commondlg      use common dialogs (wxDirDialog, wxProgressDialog, wxTextDialog, ...)"
+  --enable-dirdlg         use wxDirDialog"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-dirdlg         use wxDirDialog"
+  --enable-msgdlg         use wxMessageDialog"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-textdlg        use wxTextDialog"
+  --enable-numberdlg      use wxNumberEntryDialog"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-tipdlg         use startup tips"
+  --enable-textdlg        use wxTextDialog"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-progressdlg    use wxProgressDialog"
+  --enable-tipdlg         use startup tips"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-miniframe      use wxMiniFrame class"
+  --enable-progressdlg    use wxProgressDialog"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-html           use wxHTML sub-library"
+  --enable-wizarddlg      use wxWizard"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-tooltips       use wxToolTip class"
+  --enable-menus          use wxMenu/wxMenuBar/wxMenuItem classes"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-splines        use spline drawing code"
+  --enable-miniframe      use wxMiniFrame class"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-validators     use wxValidator and derived classes"
+  --enable-tooltips       use wxToolTip class"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-busyinfo       use wxBusyInfo"
+  --enable-splines        use spline drawing code"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-joystick       compile in joystick support (Linux only)"
+  --enable-validators     use wxValidator and derived classes"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-image          use wxImage class"
+  --enable-busyinfo       use wxBusyInfo"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-gif            use gif images (GIF file format)"
+  --enable-joystick       compile in joystick support (Linux only)"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-pcx            use pcx images (PCX file format)"
+  --enable-metafiles      use wxMetaFile (Windows only)"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-pnm            use pnm images (PNM file format)"
+  --enable-dragimage      use wxDragImage"

 ac_help="$ac_help
 ac_help="$ac_help

---enable-xpm            use xpm images (XPM file format)"
+  --enable-image          use wxImage class"
+ac_help="$ac_help
+  --enable-gif            use gif images (GIF file format)"
+ac_help="$ac_help
+  --enable-pcx            use pcx images (PCX file format)"
+ac_help="$ac_help
+  --enable-pnm            use pnm images (PNM file format)"
+ac_help="$ac_help
+  --enable-xpm            use xpm images (XPM file format)"

 ac_help="$ac_help
   --with-gtk-prefix=PFX   Prefix where GTK is installed (optional)"
 ac_help="$ac_help
 ac_help="$ac_help
   --with-gtk-prefix=PFX   Prefix where GTK is installed (optional)"
 ac_help="$ac_help


@@ -866,7 +929,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
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6

-echo "configure:870: checking host system type" >&5
+echo "configure:933: checking host system type" >&5

 
 host_alias=$host
 case "$host_alias" in
 
 host_alias=$host
 case "$host_alias" in


@@ -887,7 +950,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 "$ac_t""$host" 1>&6
 
 echo $ac_n "checking target system type""... $ac_c" 1>&6

-echo "configure:891: checking target system type" >&5
+echo "configure:954: checking target system type" >&5

 
 target_alias=$target
 case "$target_alias" in
 
 target_alias=$target
 case "$target_alias" in


@@ -905,7 +968,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 "$ac_t""$target" 1>&6
 
 echo $ac_n "checking build system type""... $ac_c" 1>&6

-echo "configure:909: checking build system type" >&5
+echo "configure:972: checking build system type" >&5

 
 build_alias=$build
 case "$build_alias" in
 
 build_alias=$build
 case "$build_alias" in


@@ -931,12 +994,12 @@ test "$host_alias" != "$target_alias" &&
 
 WX_MAJOR_VERSION_NUMBER=2
 WX_MINOR_VERSION_NUMBER=3
 
 WX_MAJOR_VERSION_NUMBER=2
 WX_MINOR_VERSION_NUMBER=3

-WX_RELEASE_NUMBER=1
+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_VERSION=$WX_MAJOR_VERSION_NUMBER.$WX_MINOR_VERSION_NUMBER.$WX_RELEASE_NUMBER
 WX_RELEASE=$WX_MAJOR_VERSION_NUMBER.$WX_MINOR_VERSION_NUMBER
 

-WX_CURRENT=0
+WX_CURRENT=1

 WX_REVISION=0
 WX_AGE=0
 
 WX_REVISION=0
 WX_AGE=0
 


@@ -959,6 +1022,7 @@ USE_SUNOS=
 USE_ALPHA=
 USE_OSF=
 USE_BSD=
 USE_ALPHA=
 USE_OSF=
 USE_BSD=

+USE_DARWIN=

 USE_FREEBSD=
 USE_OPENBSD=
 USE_NETBSD=
 USE_FREEBSD=
 USE_OPENBSD=
 USE_NETBSD=


@@ -970,21 +1034,23 @@ USE_DATA_GENERAL=
 
 NEEDS_D_REENTRANT_FOR_R_FUNCS=0
 
 
 NEEDS_D_REENTRANT_FOR_R_FUNCS=0
 

-ALL_TOOLKITS="CYGWIN GTK MINGW MOTIF MAC WINE PM"
+ALL_TOOLKITS="CYGWIN GTK MAC MGL MINGW MOTIF PM WINE"

 
 DEFAULT_wxUSE_GTK=0
 
 DEFAULT_wxUSE_GTK=0

+DEFAULT_wxUSE_MAC=0
+DEFAULT_wxUSE_MGL=0

 DEFAULT_wxUSE_MOTIF=0
 DEFAULT_wxUSE_MSW=0
 DEFAULT_wxUSE_MOTIF=0
 DEFAULT_wxUSE_MSW=0

-DEFAULT_wxUSE_MAC=0
-DEFAULT_wxUSE_WINE=0

 DEFAULT_wxUSE_PM=0
 DEFAULT_wxUSE_PM=0

+DEFAULT_wxUSE_WINE=0

 
 DEFAULT_DEFAULT_wxUSE_GTK=0
 
 DEFAULT_DEFAULT_wxUSE_GTK=0

+DEFAULT_DEFAULT_wxUSE_MAC=0
+DEFAULT_DEFAULT_wxUSE_MGL=0

 DEFAULT_DEFAULT_wxUSE_MOTIF=0
 DEFAULT_DEFAULT_wxUSE_MSW=0
 DEFAULT_DEFAULT_wxUSE_MOTIF=0
 DEFAULT_DEFAULT_wxUSE_MSW=0

-DEFAULT_DEFAULT_wxUSE_MAC=0
-DEFAULT_DEFAULT_wxUSE_WINE=0

 DEFAULT_DEFAULT_wxUSE_PM=0
 DEFAULT_DEFAULT_wxUSE_PM=0

+DEFAULT_DEFAULT_wxUSE_WINE=0

 
 PROGRAM_EXT=
 
 
 PROGRAM_EXT=
 


@@ -1204,13 +1270,13 @@ EOF
 
   *-*-darwin* )
     USE_BSD=1
 
   *-*-darwin* )
     USE_BSD=1

-    USE_MAC=1
+    USE_DARWIN=1

     cat >> confdefs.h <<\EOF
     cat >> confdefs.h <<\EOF

-#define __MAC__ 1
+#define __BSD__ 1

 EOF
 
     cat >> confdefs.h <<\EOF
 EOF
 
     cat >> confdefs.h <<\EOF

-#define __BSD__ 1
+#define __DARWIN__ 1

 EOF
 
     cat >> confdefs.h <<\EOF
 EOF
 
     cat >> confdefs.h <<\EOF


@@ -1250,7 +1316,7 @@ fi
 
 if test "$USE_LINUX" = 1; then
   echo $ac_n "checking for gettext in -lc""... $ac_c" 1>&6
 
 if test "$USE_LINUX" = 1; then
   echo $ac_n "checking for gettext in -lc""... $ac_c" 1>&6

-echo "configure:1254: checking for gettext in -lc" >&5
+echo "configure:1320: checking for gettext in -lc" >&5

 ac_lib_var=`echo c'_'gettext | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 ac_lib_var=`echo c'_'gettext | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6


@@ -1258,7 +1324,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lc  $LIBS"
 cat > conftest.$ac_ext <<EOF
   ac_save_LIBS="$LIBS"
 LIBS="-lc  $LIBS"
 cat > conftest.$ac_ext <<EOF

-#line 1262 "configure"
+#line 1328 "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
 #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


@@ -1269,7 +1335,7 @@ int main() {
 gettext()
 ; return 0; }
 EOF
 gettext()
 ; return 0; }
 EOF

-if { (eval echo configure:1273: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1339: \"$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
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else


@@ -1306,11 +1372,13 @@ fi
 
 DEBUG_CONFIGURE=0
 if test $DEBUG_CONFIGURE = 1; then
 
 DEBUG_CONFIGURE=0
 if test $DEBUG_CONFIGURE = 1; then

+  DEFAULT_wxUSE_UNIVERSAL=no
+

   DEFAULT_wxUSE_THREADS=yes
 
   DEFAULT_wxUSE_SHARED=yes
   DEFAULT_wxUSE_BURNT_NAME=no
   DEFAULT_wxUSE_THREADS=yes
 
   DEFAULT_wxUSE_SHARED=yes
   DEFAULT_wxUSE_BURNT_NAME=no

-  DEFAULT_wxUSE_OPTIMISE=yes
+  DEFAULT_wxUSE_OPTIMISE=no

   DEFAULT_wxUSE_PROFILE=no
   DEFAULT_wxUSE_NO_DEPS=no
   DEFAULT_wxUSE_NO_RTTI=no
   DEFAULT_wxUSE_PROFILE=no
   DEFAULT_wxUSE_NO_DEPS=no
   DEFAULT_wxUSE_NO_RTTI=no


@@ -1325,9 +1393,13 @@ if test $DEBUG_CONFIGURE = 1; then
   DEFAULT_wxUSE_APPLE_IEEE=no
 
   DEFAULT_wxUSE_LOG=yes
   DEFAULT_wxUSE_APPLE_IEEE=no
 
   DEFAULT_wxUSE_LOG=yes

+  DEFAULT_wxUSE_LOGWINDOW=no
+  DEFAULT_wxUSE_LOGGUI=no

 
   DEFAULT_wxUSE_GUI=yes
 
   DEFAULT_wxUSE_GUI=yes

+  DEFAULT_wxUSE_CONTROLS=no

 
 

+  DEFAULT_wxUSE_REGEX=no

   DEFAULT_wxUSE_ZLIB=no
   DEFAULT_wxUSE_LIBPNG=no
   DEFAULT_wxUSE_LIBJPEG=no
   DEFAULT_wxUSE_ZLIB=no
   DEFAULT_wxUSE_LIBPNG=no
   DEFAULT_wxUSE_LIBJPEG=no


@@ -1339,12 +1411,18 @@ if test $DEBUG_CONFIGURE = 1; then
   DEFAULT_wxUSE_ON_FATAL_EXCEPTION=no
   DEFAULT_wxUSE_SNGLINST_CHECKER=no
   DEFAULT_wxUSE_STD_IOSTREAM=no
   DEFAULT_wxUSE_ON_FATAL_EXCEPTION=no
   DEFAULT_wxUSE_SNGLINST_CHECKER=no
   DEFAULT_wxUSE_STD_IOSTREAM=no

+  DEFAULT_wxUSE_CMDLINE_PARSER=no
+  DEFAULT_wxUSE_DATETIME=no
+  DEFAULT_wxUSE_TIMEDATE=no
+  DEFAULT_wxUSE_TIMER=no
+  DEFAULT_wxUSE_STOPWATCH=no

   DEFAULT_wxUSE_FILE=no
   DEFAULT_wxUSE_FILE=no

+  DEFAULT_wxUSE_FFILE=no

   DEFAULT_wxUSE_TEXTFILE=no
   DEFAULT_wxUSE_TEXTFILE=no

-  DEFAULT_wxUSE_TIMEDATE=no

   DEFAULT_wxUSE_WAVE=no
   DEFAULT_wxUSE_INTL=no
   DEFAULT_wxUSE_CONFIG=no
   DEFAULT_wxUSE_WAVE=no
   DEFAULT_wxUSE_INTL=no
   DEFAULT_wxUSE_CONFIG=no

+  DEFAULT_wxUSE_FONTMAP=no

   DEFAULT_wxUSE_STREAMS=no
   DEFAULT_wxUSE_SOCKETS=no
   DEFAULT_wxUSE_DIALUP_MANAGER=no
   DEFAULT_wxUSE_STREAMS=no
   DEFAULT_wxUSE_SOCKETS=no
   DEFAULT_wxUSE_DIALUP_MANAGER=no


@@ -1362,6 +1440,7 @@ if test $DEBUG_CONFIGURE = 1; then
   DEFAULT_wxUSE_CLIPBOARD=no
   DEFAULT_wxUSE_TOOLTIPS=no
   DEFAULT_wxUSE_DRAG_AND_DROP=no
   DEFAULT_wxUSE_CLIPBOARD=no
   DEFAULT_wxUSE_TOOLTIPS=no
   DEFAULT_wxUSE_DRAG_AND_DROP=no

+  DEFAULT_wxUSE_DRAGIMAGE=no

   DEFAULT_wxUSE_SPLINES=no
 
   DEFAULT_wxUSE_MDI_ARCHITECTURE=no
   DEFAULT_wxUSE_SPLINES=no
 
   DEFAULT_wxUSE_MDI_ARCHITECTURE=no


@@ -1373,14 +1452,27 @@ if test $DEBUG_CONFIGURE = 1; then
   DEFAULT_wxUSE_CONSTRAINTS=no
   DEFAULT_wxUSE_IPC=no
   DEFAULT_wxUSE_HELP=no
   DEFAULT_wxUSE_CONSTRAINTS=no
   DEFAULT_wxUSE_IPC=no
   DEFAULT_wxUSE_HELP=no

+  DEFAULT_wxUSE_MS_HTML_HELP=no
+  DEFAULT_wxUSE_WXHTML_HELP=no

   DEFAULT_wxUSE_WXTREE=no
   DEFAULT_wxUSE_METAFILE=no
   DEFAULT_wxUSE_WXTREE=no
   DEFAULT_wxUSE_METAFILE=no

+  DEFAULT_wxUSE_MIMETYPE=no
+  DEFAULT_wxUSE_SYSTEM_OPTIONS=yes

 
   DEFAULT_wxUSE_COMMONDLGS=no
 
   DEFAULT_wxUSE_COMMONDLGS=no

+  DEFAULT_wxUSE_CHOICEDLG=no
+  DEFAULT_wxUSE_COLOURDLG=no

   DEFAULT_wxUSE_DIRDLG=no
   DEFAULT_wxUSE_DIRDLG=no

+  DEFAULT_wxUSE_FILEDLG=no
+  DEFAULT_wxUSE_FONTDLG=no
+  DEFAULT_wxUSE_MSGDLG=no
+  DEFAULT_wxUSE_NUMBERDLG=no

   DEFAULT_wxUSE_TEXTDLG=no
   DEFAULT_wxUSE_STARTUP_TIPS=no
   DEFAULT_wxUSE_PROGRESSDLG=no
   DEFAULT_wxUSE_TEXTDLG=no
   DEFAULT_wxUSE_STARTUP_TIPS=no
   DEFAULT_wxUSE_PROGRESSDLG=no

+  DEFAULT_wxUSE_WIZARDDLG=no
+
+  DEFAULT_wxUSE_MENUS=no

   DEFAULT_wxUSE_MINIFRAME=no
   DEFAULT_wxUSE_HTML=no
   DEFAULT_wxUSE_FILESYSTEM=no
   DEFAULT_wxUSE_MINIFRAME=no
   DEFAULT_wxUSE_HTML=no
   DEFAULT_wxUSE_FILESYSTEM=no


@@ -1388,14 +1480,16 @@ if test $DEBUG_CONFIGURE = 1; then
   DEFAULT_wxUSE_FS_ZIP=no
   DEFAULT_wxUSE_BUSYINFO=no
   DEFAULT_wxUSE_ZIPSTREAM=no
   DEFAULT_wxUSE_FS_ZIP=no
   DEFAULT_wxUSE_BUSYINFO=no
   DEFAULT_wxUSE_ZIPSTREAM=no

-  DEFAULT_wxUSE_VALIDATORS=yes
+  DEFAULT_wxUSE_VALIDATORS=no

 
   DEFAULT_wxUSE_ACCEL=no
 
   DEFAULT_wxUSE_ACCEL=no

-  DEFAULT_wxUSE_CARET=no
+  DEFAULT_wxUSE_BUTTON=no

   DEFAULT_wxUSE_BMPBUTTON=no
   DEFAULT_wxUSE_BMPBUTTON=no

+  DEFAULT_wxUSE_CALCTRL=no
+  DEFAULT_wxUSE_CARET=no

   DEFAULT_wxUSE_CHECKBOX=no
   DEFAULT_wxUSE_CHECKLST=no
   DEFAULT_wxUSE_CHECKBOX=no
   DEFAULT_wxUSE_CHECKLST=no

-  DEFAULT_wxUSE_CHOICE=yes
+  DEFAULT_wxUSE_CHOICE=no

   DEFAULT_wxUSE_COMBOBOX=no
   DEFAULT_wxUSE_GAUGE=no
   DEFAULT_wxUSE_GRID=no
   DEFAULT_wxUSE_COMBOBOX=no
   DEFAULT_wxUSE_GAUGE=no
   DEFAULT_wxUSE_GRID=no


@@ -1415,13 +1509,16 @@ if test $DEBUG_CONFIGURE = 1; then
   DEFAULT_wxUSE_STATBMP=no
   DEFAULT_wxUSE_STATBOX=no
   DEFAULT_wxUSE_STATLINE=no
   DEFAULT_wxUSE_STATBMP=no
   DEFAULT_wxUSE_STATBOX=no
   DEFAULT_wxUSE_STATLINE=no

+  DEFAULT_wxUSE_STATTEXT=no

   DEFAULT_wxUSE_STATUSBAR=yes
   DEFAULT_wxUSE_TABDIALOG=no
   DEFAULT_wxUSE_STATUSBAR=yes
   DEFAULT_wxUSE_TABDIALOG=no

+  DEFAULT_wxUSE_TEXTCTRL=no

   DEFAULT_wxUSE_TOGGLEBTN=no
   DEFAULT_wxUSE_TOOLBAR=no
   DEFAULT_wxUSE_TOOLBAR_NATIVE=no
   DEFAULT_wxUSE_TOOLBAR_SIMPLE=no
   DEFAULT_wxUSE_TREECTRL=no
   DEFAULT_wxUSE_TOGGLEBTN=no
   DEFAULT_wxUSE_TOOLBAR=no
   DEFAULT_wxUSE_TOOLBAR_NATIVE=no
   DEFAULT_wxUSE_TOOLBAR_SIMPLE=no
   DEFAULT_wxUSE_TREECTRL=no

+  DEFAULT_wxUSE_POPUPWIN=no

 
   DEFAULT_wxUSE_UNICODE=no
   DEFAULT_wxUSE_WCSRTOMBS=no
 
   DEFAULT_wxUSE_UNICODE=no
   DEFAULT_wxUSE_WCSRTOMBS=no


@@ -1432,6 +1529,8 @@ if test $DEBUG_CONFIGURE = 1; then
   DEFAULT_wxUSE_PNM=no
   DEFAULT_wxUSE_XPM=no
 else
   DEFAULT_wxUSE_PNM=no
   DEFAULT_wxUSE_XPM=no
 else

+  DEFAULT_wxUSE_UNIVERSAL=no
+

   DEFAULT_wxUSE_THREADS=yes
 
   DEFAULT_wxUSE_SHARED=yes
   DEFAULT_wxUSE_THREADS=yes
 
   DEFAULT_wxUSE_SHARED=yes


@@ -1451,9 +1550,12 @@ else
   DEFAULT_wxUSE_APPLE_IEEE=yes
 
   DEFAULT_wxUSE_LOG=yes
   DEFAULT_wxUSE_APPLE_IEEE=yes
 
   DEFAULT_wxUSE_LOG=yes

+  DEFAULT_wxUSE_LOGWINDOW=yes
+  DEFAULT_wxUSE_LOGGUI=yes

 
   DEFAULT_wxUSE_GUI=yes
 
 
   DEFAULT_wxUSE_GUI=yes
 

+  DEFAULT_wxUSE_REGEX=yes

   DEFAULT_wxUSE_ZLIB=yes
   DEFAULT_wxUSE_LIBPNG=yes
   DEFAULT_wxUSE_LIBJPEG=yes
   DEFAULT_wxUSE_ZLIB=yes
   DEFAULT_wxUSE_LIBPNG=yes
   DEFAULT_wxUSE_LIBJPEG=yes


@@ -1465,12 +1567,18 @@ else
   DEFAULT_wxUSE_ON_FATAL_EXCEPTION=yes
   DEFAULT_wxUSE_SNGLINST_CHECKER=yes
   DEFAULT_wxUSE_STD_IOSTREAM=no
   DEFAULT_wxUSE_ON_FATAL_EXCEPTION=yes
   DEFAULT_wxUSE_SNGLINST_CHECKER=yes
   DEFAULT_wxUSE_STD_IOSTREAM=no

+  DEFAULT_wxUSE_CMDLINE_PARSER=yes
+  DEFAULT_wxUSE_DATETIME=yes
+  DEFAULT_wxUSE_TIMEDATE=no
+  DEFAULT_wxUSE_TIMER=yes
+  DEFAULT_wxUSE_STOPWATCH=yes

   DEFAULT_wxUSE_FILE=yes
   DEFAULT_wxUSE_FILE=yes

+  DEFAULT_wxUSE_FFILE=yes

   DEFAULT_wxUSE_TEXTFILE=yes
   DEFAULT_wxUSE_TEXTFILE=yes

-  DEFAULT_wxUSE_TIMEDATE=yes

   DEFAULT_wxUSE_WAVE=no
   DEFAULT_wxUSE_INTL=yes
   DEFAULT_wxUSE_CONFIG=yes
   DEFAULT_wxUSE_WAVE=no
   DEFAULT_wxUSE_INTL=yes
   DEFAULT_wxUSE_CONFIG=yes

+  DEFAULT_wxUSE_FONTMAP=yes

   DEFAULT_wxUSE_STREAMS=yes
   DEFAULT_wxUSE_SOCKETS=yes
   DEFAULT_wxUSE_DIALUP_MANAGER=yes
   DEFAULT_wxUSE_STREAMS=yes
   DEFAULT_wxUSE_SOCKETS=yes
   DEFAULT_wxUSE_DIALUP_MANAGER=yes


@@ -1488,6 +1596,7 @@ else
   DEFAULT_wxUSE_CLIPBOARD=yes
   DEFAULT_wxUSE_TOOLTIPS=yes
   DEFAULT_wxUSE_DRAG_AND_DROP=yes
   DEFAULT_wxUSE_CLIPBOARD=yes
   DEFAULT_wxUSE_TOOLTIPS=yes
   DEFAULT_wxUSE_DRAG_AND_DROP=yes

+  DEFAULT_wxUSE_DRAGIMAGE=yes

   DEFAULT_wxUSE_SPLINES=yes
 
   DEFAULT_wxUSE_MDI_ARCHITECTURE=yes
   DEFAULT_wxUSE_SPLINES=yes
 
   DEFAULT_wxUSE_MDI_ARCHITECTURE=yes


@@ -1499,14 +1608,27 @@ else
   DEFAULT_wxUSE_CONSTRAINTS=yes
   DEFAULT_wxUSE_IPC=yes
   DEFAULT_wxUSE_HELP=yes
   DEFAULT_wxUSE_CONSTRAINTS=yes
   DEFAULT_wxUSE_IPC=yes
   DEFAULT_wxUSE_HELP=yes

+  DEFAULT_wxUSE_MS_HTML_HELP=yes
+  DEFAULT_wxUSE_WXHTML_HELP=yes

   DEFAULT_wxUSE_WXTREE=yes
   DEFAULT_wxUSE_METAFILE=yes
   DEFAULT_wxUSE_WXTREE=yes
   DEFAULT_wxUSE_METAFILE=yes

+  DEFAULT_wxUSE_MIMETYPE=yes
+  DEFAULT_wxUSE_SYSTEM_OPTIONS=yes

 
   DEFAULT_wxUSE_COMMONDLGS=yes
 
   DEFAULT_wxUSE_COMMONDLGS=yes

+  DEFAULT_wxUSE_CHOICEDLG=yes
+  DEFAULT_wxUSE_COLOURDLG=yes

   DEFAULT_wxUSE_DIRDLG=yes
   DEFAULT_wxUSE_DIRDLG=yes

+  DEFAULT_wxUSE_FILEDLG=yes
+  DEFAULT_wxUSE_FONTDLG=yes
+  DEFAULT_wxUSE_MSGDLG=yes
+  DEFAULT_wxUSE_NUMBERDLG=yes

   DEFAULT_wxUSE_TEXTDLG=yes
   DEFAULT_wxUSE_STARTUP_TIPS=yes
   DEFAULT_wxUSE_PROGRESSDLG=yes
   DEFAULT_wxUSE_TEXTDLG=yes
   DEFAULT_wxUSE_STARTUP_TIPS=yes
   DEFAULT_wxUSE_PROGRESSDLG=yes

+  DEFAULT_wxUSE_WIZARDDLG=yes
+
+  DEFAULT_wxUSE_MENUS=yes

   DEFAULT_wxUSE_MINIFRAME=yes
   DEFAULT_wxUSE_HTML=yes
   DEFAULT_wxUSE_FILESYSTEM=yes
   DEFAULT_wxUSE_MINIFRAME=yes
   DEFAULT_wxUSE_HTML=yes
   DEFAULT_wxUSE_FILESYSTEM=yes


@@ -1517,8 +1639,10 @@ else
   DEFAULT_wxUSE_VALIDATORS=yes
 
   DEFAULT_wxUSE_ACCEL=yes
   DEFAULT_wxUSE_VALIDATORS=yes
 
   DEFAULT_wxUSE_ACCEL=yes

-  DEFAULT_wxUSE_CARET=yes
+  DEFAULT_wxUSE_BUTTON=yes

   DEFAULT_wxUSE_BMPBUTTON=yes
   DEFAULT_wxUSE_BMPBUTTON=yes

+  DEFAULT_wxUSE_CALCTRL=yes
+  DEFAULT_wxUSE_CARET=yes

   DEFAULT_wxUSE_CHECKBOX=yes
   DEFAULT_wxUSE_CHECKLST=yes
   DEFAULT_wxUSE_CHOICE=yes
   DEFAULT_wxUSE_CHECKBOX=yes
   DEFAULT_wxUSE_CHECKLST=yes
   DEFAULT_wxUSE_CHOICE=yes


@@ -1541,13 +1665,16 @@ else
   DEFAULT_wxUSE_STATBMP=yes
   DEFAULT_wxUSE_STATBOX=yes
   DEFAULT_wxUSE_STATLINE=yes
   DEFAULT_wxUSE_STATBMP=yes
   DEFAULT_wxUSE_STATBOX=yes
   DEFAULT_wxUSE_STATLINE=yes

+  DEFAULT_wxUSE_STATTEXT=yes

   DEFAULT_wxUSE_STATUSBAR=yes
   DEFAULT_wxUSE_TABDIALOG=no
   DEFAULT_wxUSE_STATUSBAR=yes
   DEFAULT_wxUSE_TABDIALOG=no

+  DEFAULT_wxUSE_TEXTCTRL=yes

   DEFAULT_wxUSE_TOGGLEBTN=yes
   DEFAULT_wxUSE_TOOLBAR=yes
   DEFAULT_wxUSE_TOOLBAR_NATIVE=yes
   DEFAULT_wxUSE_TOOLBAR_SIMPLE=yes
   DEFAULT_wxUSE_TREECTRL=yes
   DEFAULT_wxUSE_TOGGLEBTN=yes
   DEFAULT_wxUSE_TOOLBAR=yes
   DEFAULT_wxUSE_TOOLBAR_NATIVE=yes
   DEFAULT_wxUSE_TOOLBAR_SIMPLE=yes
   DEFAULT_wxUSE_TREECTRL=yes

+  DEFAULT_wxUSE_POPUPWIN=yes

 
   DEFAULT_wxUSE_UNICODE=no
   DEFAULT_wxUSE_WCSRTOMBS=no
 
   DEFAULT_wxUSE_UNICODE=no
   DEFAULT_wxUSE_WCSRTOMBS=no


@@ -1572,8 +1699,8 @@ done
 
 
 
 
 
 

-          echo $ac_n "checking "for --enable-gui"""... $ac_c" 1>&6
-echo "configure:1577: checking "for --enable-gui"" >&5
+          echo $ac_n "checking for --enable-gui""... $ac_c" 1>&6
+echo "configure:1704: checking for --enable-gui" >&5

           no_cache=0
           # Check whether --enable-gui or --disable-gui was given.
 if test "${enable_gui+set}" = set; then
           no_cache=0
           # Check whether --enable-gui or --disable-gui was given.
 if test "${enable_gui+set}" = set; then


@@ -1613,6 +1740,45 @@ fi
 
 if test "$wxUSE_GUI" = "yes"; then
 
 
 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
+          no_cache=0
+          # Check whether --enable-universal or --disable-universal was given.
+if test "${enable_universal+set}" = set; then
+  enableval="$enable_universal"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_universal='wxUSE_UNIVERSAL=yes'
+                          else
+                            ac_cv_use_universal='wxUSE_UNIVERSAL=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_UNIVERSAL" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_universal='wxUSE_UNIVERSAL='$DEFAULT_wxUSE_UNIVERSAL
+                        
+fi
+
+
+          eval "$ac_cv_use_universal"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_universal >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_UNIVERSAL" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        

 # Check whether --with-gtk or --without-gtk was given.
 if test "${with_gtk+set}" = set; then
   withval="$with_gtk"
 # Check whether --with-gtk or --without-gtk was given.
 if test "${with_gtk+set}" = set; then
   withval="$with_gtk"


@@ -1655,27 +1821,25 @@ if test "${with_pm+set}" = set; then
   wxUSE_PM="$withval" CACHE_PM=1 TOOLKIT_GIVEN=1
 fi
 
   wxUSE_PM="$withval" CACHE_PM=1 TOOLKIT_GIVEN=1
 fi
 

-
-# 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=""
+# Check whether --with-mgl or --without-mgl was given.
+if test "${with_mgl+set}" = set; then
+  withval="$with_mgl"
+  wxUSE_MGL="$withval" CACHE_MGL=1 TOOLKIT_GIVEN=1

 fi
 
 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"
+
+# Check whether --enable-gtk2 or --disable-gtk2 was given.
+if test "${enable_gtk2+set}" = set; then
+  enableval="$enable_gtk2"
+  wxUSE_GTK2=1

 else
 else

-  gtk_config_exec_prefix=""
+  wxUSE_GTK2=0

 fi
 
 
 
 fi
 
 
 

-          echo $ac_n "checking "for --with-libpng"""... $ac_c" 1>&6
-echo "configure:1679: checking "for --with-libpng"" >&5
+          echo $ac_n "checking for --with-libpng""... $ac_c" 1>&6
+echo "configure:1843: checking for --with-libpng" >&5

           no_cache=0
           # Check whether --with-libpng or --without-libpng was given.
 if test "${with_libpng+set}" = set; then
           no_cache=0
           # Check whether --with-libpng or --without-libpng was given.
 if test "${with_libpng+set}" = set; then


@@ -1721,8 +1885,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --with-libjpeg"""... $ac_c" 1>&6
-echo "configure:1726: checking "for --with-libjpeg"" >&5
+          echo $ac_n "checking for --with-libjpeg""... $ac_c" 1>&6
+echo "configure:1890: checking for --with-libjpeg" >&5

           no_cache=0
           # Check whether --with-libjpeg or --without-libjpeg was given.
 if test "${with_libjpeg+set}" = set; then
           no_cache=0
           # Check whether --with-libjpeg or --without-libjpeg was given.
 if test "${with_libjpeg+set}" = set; then


@@ -1768,8 +1932,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --with-libtiff"""... $ac_c" 1>&6
-echo "configure:1773: checking "for --with-libtiff"" >&5
+          echo $ac_n "checking for --with-libtiff""... $ac_c" 1>&6
+echo "configure:1937: checking for --with-libtiff" >&5

           no_cache=0
           # Check whether --with-libtiff or --without-libtiff was given.
 if test "${with_libtiff+set}" = set; then
           no_cache=0
           # Check whether --with-libtiff or --without-libtiff was given.
 if test "${with_libtiff+set}" = set; then


@@ -1815,8 +1979,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --with-freetype"""... $ac_c" 1>&6
-echo "configure:1820: checking "for --with-freetype"" >&5
+          echo $ac_n "checking for --with-freetype""... $ac_c" 1>&6
+echo "configure:1984: checking for --with-freetype" >&5

           no_cache=0
           # Check whether --with-freetype or --without-freetype was given.
 if test "${with_freetype+set}" = set; then
           no_cache=0
           # Check whether --with-freetype or --without-freetype was given.
 if test "${with_freetype+set}" = set; then


@@ -1862,8 +2026,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --with-opengl"""... $ac_c" 1>&6
-echo "configure:1867: checking "for --with-opengl"" >&5
+          echo $ac_n "checking for --with-opengl""... $ac_c" 1>&6
+echo "configure:2031: checking for --with-opengl" >&5

           no_cache=0
           # Check whether --with-opengl or --without-opengl was given.
 if test "${with_opengl+set}" = set; then
           no_cache=0
           # Check whether --with-opengl or --without-opengl was given.
 if test "${with_opengl+set}" = set; then


@@ -1904,8 +2068,8 @@ fi
 fi
 
 
 fi
 
 

-          echo $ac_n "checking "for --with-dmalloc"""... $ac_c" 1>&6
-echo "configure:1909: checking "for --with-dmalloc"" >&5
+          echo $ac_n "checking for --with-dmalloc""... $ac_c" 1>&6
+echo "configure:2073: checking for --with-dmalloc" >&5

           no_cache=0
           # Check whether --with-dmalloc or --without-dmalloc was given.
 if test "${with_dmalloc+set}" = set; then
           no_cache=0
           # Check whether --with-dmalloc or --without-dmalloc was given.
 if test "${with_dmalloc+set}" = set; then


@@ -1943,8 +2107,55 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --with-zlib"""... $ac_c" 1>&6
-echo "configure:1948: checking "for --with-zlib"" >&5
+          echo $ac_n "checking for --with-regex""... $ac_c" 1>&6
+echo "configure:2112: checking for --with-regex" >&5
+          no_cache=0
+          # Check whether --with-regex or --without-regex was given.
+if test "${with_regex+set}" = set; then
+  withval="$with_regex"
+  
+                        if test "$withval" = yes; then
+                          ac_cv_use_regex='wxUSE_REGEX=yes'
+                        elif test "$withval" = no; then
+                          ac_cv_use_regex='wxUSE_REGEX=no'
+                        elif test "$withval" = sys; then
+                          ac_cv_use_regex='wxUSE_REGEX=sys'
+                        else
+                          { echo "configure: error: Invalid value for --with-regex: should be yes, no or sys" 1>&2; exit 1; }
+                        fi
+                      
+else
+  
+                        LINE=`grep "wxUSE_REGEX" ${wx_arg_cache_file}`
+                        if test "x$LINE" != x ; then
+                          eval "DEFAULT_$LINE"
+                        else
+                          no_cache=1
+                        fi
+
+                        ac_cv_use_regex='wxUSE_REGEX='$DEFAULT_wxUSE_REGEX
+                      
+fi
+
+
+          eval "$ac_cv_use_regex"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_regex >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_REGEX" = yes; then
+            echo "$ac_t""yes" 1>&6
+          elif test "$wxUSE_REGEX" = no; then
+            echo "$ac_t""no" 1>&6
+          elif test "$wxUSE_REGEX" = sys; then
+            echo "$ac_t""system version" 1>&6
+          else
+            { echo "configure: error: Invalid value for --with-regex: should be yes, no or sys" 1>&2; exit 1; }
+          fi
+        
+
+          echo $ac_n "checking for --with-zlib""... $ac_c" 1>&6
+echo "configure:2159: checking for --with-zlib" >&5

           no_cache=0
           # Check whether --with-zlib or --without-zlib was given.
 if test "${with_zlib+set}" = set; then
           no_cache=0
           # Check whether --with-zlib or --without-zlib was given.
 if test "${with_zlib+set}" = set; then


@@ -1990,8 +2201,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --with-odbc"""... $ac_c" 1>&6
-echo "configure:1995: checking "for --with-odbc"" >&5
+          echo $ac_n "checking for --with-odbc""... $ac_c" 1>&6
+echo "configure:2206: checking for --with-odbc" >&5

           no_cache=0
           # Check whether --with-odbc or --without-odbc was given.
 if test "${with_odbc+set}" = set; then
           no_cache=0
           # Check whether --with-odbc or --without-odbc was given.
 if test "${with_odbc+set}" = set; then


@@ -2032,8 +2243,8 @@ fi
 
 
 
 
 
 

-          echo $ac_n "checking "for --enable-shared"""... $ac_c" 1>&6
-echo "configure:2037: checking "for --enable-shared"" >&5
+          echo $ac_n "checking for --enable-shared""... $ac_c" 1>&6
+echo "configure:2248: checking for --enable-shared" >&5

           no_cache=0
           # Check whether --enable-shared or --disable-shared was given.
 if test "${enable_shared+set}" = set; then
           no_cache=0
           # Check whether --enable-shared or --disable-shared was given.
 if test "${enable_shared+set}" = set; then


@@ -2071,8 +2282,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-burnt_name"""... $ac_c" 1>&6
-echo "configure:2076: checking "for --enable-burnt_name"" >&5
+          echo $ac_n "checking for --enable-burnt_name""... $ac_c" 1>&6
+echo "configure:2287: checking for --enable-burnt_name" >&5

           no_cache=0
           # Check whether --enable-burnt_name or --disable-burnt_name was given.
 if test "${enable_burnt_name+set}" = set; then
           no_cache=0
           # Check whether --enable-burnt_name or --disable-burnt_name was given.
 if test "${enable_burnt_name+set}" = set; then


@@ -2110,8 +2321,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-optimise"""... $ac_c" 1>&6
-echo "configure:2115: checking "for --enable-optimise"" >&5
+          echo $ac_n "checking for --enable-optimise""... $ac_c" 1>&6
+echo "configure:2326: checking for --enable-optimise" >&5

           no_cache=0
           # Check whether --enable-optimise or --disable-optimise was given.
 if test "${enable_optimise+set}" = set; then
           no_cache=0
           # Check whether --enable-optimise or --disable-optimise was given.
 if test "${enable_optimise+set}" = set; then


@@ -2149,8 +2360,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-debug"""... $ac_c" 1>&6
-echo "configure:2154: checking "for --enable-debug"" >&5
+          echo $ac_n "checking for --enable-debug""... $ac_c" 1>&6
+echo "configure:2365: checking for --enable-debug" >&5

           no_cache=0
           # Check whether --enable-debug or --disable-debug was given.
 if test "${enable_debug+set}" = set; then
           no_cache=0
           # Check whether --enable-debug or --disable-debug was given.
 if test "${enable_debug+set}" = set; then


@@ -2197,8 +2408,8 @@ elif test "$wxUSE_DEBUG" = "no"; then
 fi
 
 
 fi
 
 

-          echo $ac_n "checking "for --enable-debug_flag"""... $ac_c" 1>&6
-echo "configure:2202: checking "for --enable-debug_flag"" >&5
+          echo $ac_n "checking for --enable-debug_flag""... $ac_c" 1>&6
+echo "configure:2413: 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
           no_cache=0
           # Check whether --enable-debug_flag or --disable-debug_flag was given.
 if test "${enable_debug_flag+set}" = set; then


@@ -2236,8 +2447,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-debug_info"""... $ac_c" 1>&6
-echo "configure:2241: checking "for --enable-debug_info"" >&5
+          echo $ac_n "checking for --enable-debug_info""... $ac_c" 1>&6
+echo "configure:2452: 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
           no_cache=0
           # Check whether --enable-debug_info or --disable-debug_info was given.
 if test "${enable_debug_info+set}" = set; then


@@ -2275,8 +2486,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-debug_gdb"""... $ac_c" 1>&6
-echo "configure:2280: checking "for --enable-debug_gdb"" >&5
+          echo $ac_n "checking for --enable-debug_gdb""... $ac_c" 1>&6
+echo "configure:2491: 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
           no_cache=0
           # Check whether --enable-debug_gdb or --disable-debug_gdb was given.
 if test "${enable_debug_gdb+set}" = set; then


@@ -2314,8 +2525,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-debug_cntxt"""... $ac_c" 1>&6
-echo "configure:2319: checking "for --enable-debug_cntxt"" >&5
+          echo $ac_n "checking for --enable-debug_cntxt""... $ac_c" 1>&6
+echo "configure:2530: 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
           no_cache=0
           # Check whether --enable-debug_cntxt or --disable-debug_cntxt was given.
 if test "${enable_debug_cntxt+set}" = set; then


@@ -2353,8 +2564,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-mem_tracing"""... $ac_c" 1>&6
-echo "configure:2358: checking "for --enable-mem_tracing"" >&5
+          echo $ac_n "checking for --enable-mem_tracing""... $ac_c" 1>&6
+echo "configure:2569: 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
           no_cache=0
           # Check whether --enable-mem_tracing or --disable-mem_tracing was given.
 if test "${enable_mem_tracing+set}" = set; then


@@ -2392,8 +2603,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-profile"""... $ac_c" 1>&6
-echo "configure:2397: checking "for --enable-profile"" >&5
+          echo $ac_n "checking for --enable-profile""... $ac_c" 1>&6
+echo "configure:2608: checking for --enable-profile" >&5

           no_cache=0
           # Check whether --enable-profile or --disable-profile was given.
 if test "${enable_profile+set}" = set; then
           no_cache=0
           # Check whether --enable-profile or --disable-profile was given.
 if test "${enable_profile+set}" = set; then


@@ -2431,8 +2642,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-no_rtti"""... $ac_c" 1>&6
-echo "configure:2436: checking "for --enable-no_rtti"" >&5
+          echo $ac_n "checking for --enable-no_rtti""... $ac_c" 1>&6
+echo "configure:2647: 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
           no_cache=0
           # Check whether --enable-no_rtti or --disable-no_rtti was given.
 if test "${enable_no_rtti+set}" = set; then


@@ -2470,8 +2681,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-no_exceptions"""... $ac_c" 1>&6
-echo "configure:2475: checking "for --enable-no_exceptions"" >&5
+          echo $ac_n "checking for --enable-no_exceptions""... $ac_c" 1>&6
+echo "configure:2686: 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
           no_cache=0
           # Check whether --enable-no_exceptions or --disable-no_exceptions was given.
 if test "${enable_no_exceptions+set}" = set; then


@@ -2509,8 +2720,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-permissive"""... $ac_c" 1>&6
-echo "configure:2514: checking "for --enable-permissive"" >&5
+          echo $ac_n "checking for --enable-permissive""... $ac_c" 1>&6
+echo "configure:2725: checking for --enable-permissive" >&5

           no_cache=0
           # Check whether --enable-permissive or --disable-permissive was given.
 if test "${enable_permissive+set}" = set; then
           no_cache=0
           # Check whether --enable-permissive or --disable-permissive was given.
 if test "${enable_permissive+set}" = set; then


@@ -2548,8 +2759,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-no_deps"""... $ac_c" 1>&6
-echo "configure:2553: checking "for --enable-no_deps"" >&5
+          echo $ac_n "checking for --enable-no_deps""... $ac_c" 1>&6
+echo "configure:2764: 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
           no_cache=0
           # Check whether --enable-no_deps or --disable-no_deps was given.
 if test "${enable_no_deps+set}" = set; then


@@ -2588,9 +2799,88 @@ fi
         
 
 
         
 
 

+          echo $ac_n "checking for --enable-compat20""... $ac_c" 1>&6
+echo "configure:2804: checking for --enable-compat20" >&5
+          no_cache=0
+          # Check whether --enable-compat20 or --disable-compat20 was given.
+if test "${enable_compat20+set}" = set; then
+  enableval="$enable_compat20"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_compat20='WXWIN_COMPATIBILITY_2=yes'
+                          else
+                            ac_cv_use_compat20='WXWIN_COMPATIBILITY_2=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "WXWIN_COMPATIBILITY_2" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_compat20='WXWIN_COMPATIBILITY_2='$DEFAULT_WXWIN_COMPATIBILITY_2
+                        
+fi
+
+
+          eval "$ac_cv_use_compat20"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_compat20 >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$WXWIN_COMPATIBILITY_2" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-compat22""... $ac_c" 1>&6
+echo "configure:2843: checking for --enable-compat22" >&5
+          no_cache=0
+          # Check whether --enable-compat22 or --disable-compat22 was given.
+if test "${enable_compat22+set}" = set; then
+  enableval="$enable_compat22"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_compat22='WXWIN_COMPATIBILITY_2_2=yes'
+                          else
+                            ac_cv_use_compat22='WXWIN_COMPATIBILITY_2_2=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "WXWIN_COMPATIBILITY_2_2" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_compat22='WXWIN_COMPATIBILITY_2_2='$DEFAULT_WXWIN_COMPATIBILITY_2_2
+                        
+fi
+
+
+          eval "$ac_cv_use_compat22"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_compat22 >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$WXWIN_COMPATIBILITY_2_2" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+

 
 

-          echo $ac_n "checking "for --enable-intl"""... $ac_c" 1>&6
-echo "configure:2594: checking "for --enable-intl"" >&5
+          echo $ac_n "checking for --enable-intl""... $ac_c" 1>&6
+echo "configure:2884: checking for --enable-intl" >&5

           no_cache=0
           # Check whether --enable-intl or --disable-intl was given.
 if test "${enable_intl+set}" = set; then
           no_cache=0
           # Check whether --enable-intl or --disable-intl was given.
 if test "${enable_intl+set}" = set; then


@@ -2628,8 +2918,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-config"""... $ac_c" 1>&6
-echo "configure:2633: checking "for --enable-config"" >&5
+          echo $ac_n "checking for --enable-config""... $ac_c" 1>&6
+echo "configure:2923: checking for --enable-config" >&5

           no_cache=0
           # Check whether --enable-config or --disable-config was given.
 if test "${enable_config+set}" = set; then
           no_cache=0
           # Check whether --enable-config or --disable-config was given.
 if test "${enable_config+set}" = set; then


@@ -2668,8 +2958,8 @@ fi
         
 
 
         
 
 

-          echo $ac_n "checking "for --enable-sockets"""... $ac_c" 1>&6
-echo "configure:2673: checking "for --enable-sockets"" >&5
+          echo $ac_n "checking for --enable-sockets""... $ac_c" 1>&6
+echo "configure:2963: checking for --enable-sockets" >&5

           no_cache=0
           # Check whether --enable-sockets or --disable-sockets was given.
 if test "${enable_sockets+set}" = set; then
           no_cache=0
           # Check whether --enable-sockets or --disable-sockets was given.
 if test "${enable_sockets+set}" = set; then


@@ -2708,8 +2998,8 @@ fi
         
 
 
         
 
 

-          echo $ac_n "checking "for --enable-ipc"""... $ac_c" 1>&6
-echo "configure:2713: checking "for --enable-ipc"" >&5
+          echo $ac_n "checking for --enable-ipc""... $ac_c" 1>&6
+echo "configure:3003: checking for --enable-ipc" >&5

           no_cache=0
           # Check whether --enable-ipc or --disable-ipc was given.
 if test "${enable_ipc+set}" = set; then
           no_cache=0
           # Check whether --enable-ipc or --disable-ipc was given.
 if test "${enable_ipc+set}" = set; then


@@ -2748,86 +3038,86 @@ fi
         
 
 
         
 
 

-          echo $ac_n "checking "for --enable-dialupman"""... $ac_c" 1>&6
-echo "configure:2753: checking "for --enable-dialupman"" >&5
+          echo $ac_n "checking for --enable-cmdline""... $ac_c" 1>&6
+echo "configure:3043: checking for --enable-cmdline" >&5

           no_cache=0
           no_cache=0

-          # Check whether --enable-dialupman or --disable-dialupman was given.
-if test "${enable_dialupman+set}" = set; then
-  enableval="$enable_dialupman"
+          # Check whether --enable-cmdline or --disable-cmdline was given.
+if test "${enable_cmdline+set}" = set; then
+  enableval="$enable_cmdline"

   
                           if test "$enableval" = yes; then
   
                           if test "$enableval" = yes; then

-                            ac_cv_use_dialupman='wxUSE_DIALUP_MANAGER=yes'
+                            ac_cv_use_cmdline='wxUSE_CMDLINE_PARSER=yes'

                           else
                           else

-                            ac_cv_use_dialupman='wxUSE_DIALUP_MANAGER=no'
+                            ac_cv_use_cmdline='wxUSE_CMDLINE_PARSER=no'

                           fi
                         
 else
   
                           fi
                         
 else
   

-                          LINE=`grep "wxUSE_DIALUP_MANAGER" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_CMDLINE_PARSER" ${wx_arg_cache_file}`

                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 

-                          ac_cv_use_dialupman='wxUSE_DIALUP_MANAGER='$DEFAULT_wxUSE_DIALUP_MANAGER
+                          ac_cv_use_cmdline='wxUSE_CMDLINE_PARSER='$DEFAULT_wxUSE_CMDLINE_PARSER

                         
 fi
 
 
                         
 fi
 
 

-          eval "$ac_cv_use_dialupman"
+          eval "$ac_cv_use_cmdline"

           if test "$no_cache" != 1; then
           if test "$no_cache" != 1; then

-            echo $ac_cv_use_dialupman >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_cmdline >> ${wx_arg_cache_file}.tmp

           fi
 
           fi
 

-          if test "$wxUSE_DIALUP_MANAGER" = yes; then
+          if test "$wxUSE_CMDLINE_PARSER" = yes; then

             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 

-          echo $ac_n "checking "for --enable-apple_ieee"""... $ac_c" 1>&6
-echo "configure:2792: checking "for --enable-apple_ieee"" >&5
+          echo $ac_n "checking for --enable-datetime""... $ac_c" 1>&6
+echo "configure:3082: checking for --enable-datetime" >&5

           no_cache=0
           no_cache=0

-          # Check whether --enable-apple_ieee or --disable-apple_ieee was given.
-if test "${enable_apple_ieee+set}" = set; then
-  enableval="$enable_apple_ieee"
+          # Check whether --enable-datetime or --disable-datetime was given.
+if test "${enable_datetime+set}" = set; then
+  enableval="$enable_datetime"

   
                           if test "$enableval" = yes; then
   
                           if test "$enableval" = yes; then

-                            ac_cv_use_apple_ieee='wxUSE_APPLE_IEEE=yes'
+                            ac_cv_use_datetime='wxUSE_DATETIME=yes'

                           else
                           else

-                            ac_cv_use_apple_ieee='wxUSE_APPLE_IEEE=no'
+                            ac_cv_use_datetime='wxUSE_DATETIME=no'

                           fi
                         
 else
   
                           fi
                         
 else
   

-                          LINE=`grep "wxUSE_APPLE_IEEE" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_DATETIME" ${wx_arg_cache_file}`

                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 

-                          ac_cv_use_apple_ieee='wxUSE_APPLE_IEEE='$DEFAULT_wxUSE_APPLE_IEEE
+                          ac_cv_use_datetime='wxUSE_DATETIME='$DEFAULT_wxUSE_DATETIME

                         
 fi
 
 
                         
 fi
 
 

-          eval "$ac_cv_use_apple_ieee"
+          eval "$ac_cv_use_datetime"

           if test "$no_cache" != 1; then
           if test "$no_cache" != 1; then

-            echo $ac_cv_use_apple_ieee >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_datetime >> ${wx_arg_cache_file}.tmp

           fi
 
           fi
 

-          if test "$wxUSE_APPLE_IEEE" = yes; then
+          if test "$wxUSE_DATETIME" = yes; then

             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 

-          echo $ac_n "checking "for --enable-timedate"""... $ac_c" 1>&6
-echo "configure:2831: checking "for --enable-timedate"" >&5
+          echo $ac_n "checking for --enable-timedate""... $ac_c" 1>&6
+echo "configure:3121: checking for --enable-timedate" >&5

           no_cache=0
           # Check whether --enable-timedate or --disable-timedate was given.
 if test "${enable_timedate+set}" = set; then
           no_cache=0
           # Check whether --enable-timedate or --disable-timedate was given.
 if test "${enable_timedate+set}" = set; then


@@ -2865,127 +3155,283 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-wave"""... $ac_c" 1>&6
-echo "configure:2870: checking "for --enable-wave"" >&5
+          echo $ac_n "checking for --enable-stopwatch""... $ac_c" 1>&6
+echo "configure:3160: checking for --enable-stopwatch" >&5

           no_cache=0
           no_cache=0

-          # Check whether --enable-wave or --disable-wave was given.
-if test "${enable_wave+set}" = set; then
-  enableval="$enable_wave"
+          # Check whether --enable-stopwatch or --disable-stopwatch was given.
+if test "${enable_stopwatch+set}" = set; then
+  enableval="$enable_stopwatch"

   
                           if test "$enableval" = yes; then
   
                           if test "$enableval" = yes; then

-                            ac_cv_use_wave='wxUSE_WAVE=yes'
+                            ac_cv_use_stopwatch='wxUSE_STOPWATCH=yes'

                           else
                           else

-                            ac_cv_use_wave='wxUSE_WAVE=no'
+                            ac_cv_use_stopwatch='wxUSE_STOPWATCH=no'

                           fi
                         
 else
   
                           fi
                         
 else
   

-                          LINE=`grep "wxUSE_WAVE" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_STOPWATCH" ${wx_arg_cache_file}`

                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 

-                          ac_cv_use_wave='wxUSE_WAVE='$DEFAULT_wxUSE_WAVE
+                          ac_cv_use_stopwatch='wxUSE_STOPWATCH='$DEFAULT_wxUSE_STOPWATCH

                         
 fi
 
 
                         
 fi
 
 

-          eval "$ac_cv_use_wave"
+          eval "$ac_cv_use_stopwatch"

           if test "$no_cache" != 1; then
           if test "$no_cache" != 1; then

-            echo $ac_cv_use_wave >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_stopwatch >> ${wx_arg_cache_file}.tmp

           fi
 
           fi
 

-          if test "$wxUSE_WAVE" = yes; then
+          if test "$wxUSE_STOPWATCH" = yes; then

             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 

-          echo $ac_n "checking "for --enable-fraction"""... $ac_c" 1>&6
-echo "configure:2909: checking "for --enable-fraction"" >&5
+          echo $ac_n "checking for --enable-dialupman""... $ac_c" 1>&6
+echo "configure:3199: checking for --enable-dialupman" >&5

           no_cache=0
           no_cache=0

-          # Check whether --enable-fraction or --disable-fraction was given.
-if test "${enable_fraction+set}" = set; then
-  enableval="$enable_fraction"
+          # Check whether --enable-dialupman or --disable-dialupman was given.
+if test "${enable_dialupman+set}" = set; then
+  enableval="$enable_dialupman"

   
                           if test "$enableval" = yes; then
   
                           if test "$enableval" = yes; then

-                            ac_cv_use_fraction='wxUSE_FRACTION=yes'
+                            ac_cv_use_dialupman='wxUSE_DIALUP_MANAGER=yes'

                           else
                           else

-                            ac_cv_use_fraction='wxUSE_FRACTION=no'
+                            ac_cv_use_dialupman='wxUSE_DIALUP_MANAGER=no'

                           fi
                         
 else
   
                           fi
                         
 else
   

-                          LINE=`grep "wxUSE_FRACTION" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_DIALUP_MANAGER" ${wx_arg_cache_file}`

                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 

-                          ac_cv_use_fraction='wxUSE_FRACTION='$DEFAULT_wxUSE_FRACTION
+                          ac_cv_use_dialupman='wxUSE_DIALUP_MANAGER='$DEFAULT_wxUSE_DIALUP_MANAGER

                         
 fi
 
 
                         
 fi
 
 

-          eval "$ac_cv_use_fraction"
+          eval "$ac_cv_use_dialupman"

           if test "$no_cache" != 1; then
           if test "$no_cache" != 1; then

-            echo $ac_cv_use_fraction >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_dialupman >> ${wx_arg_cache_file}.tmp

           fi
 
           fi
 

-          if test "$wxUSE_FRACTION" = yes; then
+          if test "$wxUSE_DIALUP_MANAGER" = yes; then

             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 

-          echo $ac_n "checking "for --enable-dynlib"""... $ac_c" 1>&6
-echo "configure:2948: checking "for --enable-dynlib"" >&5
+          echo $ac_n "checking for --enable-apple_ieee""... $ac_c" 1>&6
+echo "configure:3238: checking for --enable-apple_ieee" >&5

           no_cache=0
           no_cache=0

-          # Check whether --enable-dynlib or --disable-dynlib was given.
-if test "${enable_dynlib+set}" = set; then
-  enableval="$enable_dynlib"
+          # Check whether --enable-apple_ieee or --disable-apple_ieee was given.
+if test "${enable_apple_ieee+set}" = set; then
+  enableval="$enable_apple_ieee"

   
                           if test "$enableval" = yes; then
   
                           if test "$enableval" = yes; then

-                            ac_cv_use_dynlib='wxUSE_DYNLIB_CLASS=yes'
+                            ac_cv_use_apple_ieee='wxUSE_APPLE_IEEE=yes'

                           else
                           else

-                            ac_cv_use_dynlib='wxUSE_DYNLIB_CLASS=no'
+                            ac_cv_use_apple_ieee='wxUSE_APPLE_IEEE=no'

                           fi
                         
 else
   
                           fi
                         
 else
   

-                          LINE=`grep "wxUSE_DYNLIB_CLASS" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_APPLE_IEEE" ${wx_arg_cache_file}`

                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 

-                          ac_cv_use_dynlib='wxUSE_DYNLIB_CLASS='$DEFAULT_wxUSE_DYNLIB_CLASS
+                          ac_cv_use_apple_ieee='wxUSE_APPLE_IEEE='$DEFAULT_wxUSE_APPLE_IEEE

                         
 fi
 
 
                         
 fi
 
 

-          eval "$ac_cv_use_dynlib"
+          eval "$ac_cv_use_apple_ieee"

           if test "$no_cache" != 1; then
           if test "$no_cache" != 1; then

-            echo $ac_cv_use_dynlib >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_apple_ieee >> ${wx_arg_cache_file}.tmp

           fi
 
           fi
 

-          if test "$wxUSE_DYNLIB_CLASS" = yes; then
+          if test "$wxUSE_APPLE_IEEE" = yes; then

             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 

-          echo $ac_n "checking "for --enable-longlong"""... $ac_c" 1>&6
-echo "configure:2987: checking "for --enable-longlong"" >&5
+          echo $ac_n "checking for --enable-timer""... $ac_c" 1>&6
+echo "configure:3277: checking for --enable-timer" >&5

           no_cache=0
           no_cache=0

-          # Check whether --enable-longlong or --disable-longlong was given.
+          # Check whether --enable-timer or --disable-timer was given.
+if test "${enable_timer+set}" = set; then
+  enableval="$enable_timer"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_timer='wxUSE_TIMER=yes'
+                          else
+                            ac_cv_use_timer='wxUSE_TIMER=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_TIMER" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_timer='wxUSE_TIMER='$DEFAULT_wxUSE_TIMER
+                        
+fi
+
+
+          eval "$ac_cv_use_timer"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_timer >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_TIMER" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-wave""... $ac_c" 1>&6
+echo "configure:3316: checking for --enable-wave" >&5
+          no_cache=0
+          # Check whether --enable-wave or --disable-wave was given.
+if test "${enable_wave+set}" = set; then
+  enableval="$enable_wave"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_wave='wxUSE_WAVE=yes'
+                          else
+                            ac_cv_use_wave='wxUSE_WAVE=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_WAVE" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_wave='wxUSE_WAVE='$DEFAULT_wxUSE_WAVE
+                        
+fi
+
+
+          eval "$ac_cv_use_wave"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_wave >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_WAVE" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-fraction""... $ac_c" 1>&6
+echo "configure:3355: checking for --enable-fraction" >&5
+          no_cache=0
+          # Check whether --enable-fraction or --disable-fraction was given.
+if test "${enable_fraction+set}" = set; then
+  enableval="$enable_fraction"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_fraction='wxUSE_FRACTION=yes'
+                          else
+                            ac_cv_use_fraction='wxUSE_FRACTION=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_FRACTION" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_fraction='wxUSE_FRACTION='$DEFAULT_wxUSE_FRACTION
+                        
+fi
+
+
+          eval "$ac_cv_use_fraction"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_fraction >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_FRACTION" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-dynlib""... $ac_c" 1>&6
+echo "configure:3394: checking for --enable-dynlib" >&5
+          no_cache=0
+          # Check whether --enable-dynlib or --disable-dynlib was given.
+if test "${enable_dynlib+set}" = set; then
+  enableval="$enable_dynlib"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_dynlib='wxUSE_DYNLIB_CLASS=yes'
+                          else
+                            ac_cv_use_dynlib='wxUSE_DYNLIB_CLASS=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_DYNLIB_CLASS" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_dynlib='wxUSE_DYNLIB_CLASS='$DEFAULT_wxUSE_DYNLIB_CLASS
+                        
+fi
+
+
+          eval "$ac_cv_use_dynlib"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_dynlib >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_DYNLIB_CLASS" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-longlong""... $ac_c" 1>&6
+echo "configure:3433: checking for --enable-longlong" >&5
+          no_cache=0
+          # Check whether --enable-longlong or --disable-longlong was given.

 if test "${enable_longlong+set}" = set; then
   enableval="$enable_longlong"
   
 if test "${enable_longlong+set}" = set; then
   enableval="$enable_longlong"
   


@@ -3021,8 +3467,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-geometry"""... $ac_c" 1>&6
-echo "configure:3026: checking "for --enable-geometry"" >&5
+          echo $ac_n "checking for --enable-geometry""... $ac_c" 1>&6
+echo "configure:3472: checking for --enable-geometry" >&5

           no_cache=0
           # Check whether --enable-geometry or --disable-geometry was given.
 if test "${enable_geometry+set}" = set; then
           no_cache=0
           # Check whether --enable-geometry or --disable-geometry was given.
 if test "${enable_geometry+set}" = set; then


@@ -3060,8 +3506,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-log"""... $ac_c" 1>&6
-echo "configure:3065: checking "for --enable-log"" >&5
+          echo $ac_n "checking for --enable-log""... $ac_c" 1>&6
+echo "configure:3511: checking for --enable-log" >&5

           no_cache=0
           # Check whether --enable-log or --disable-log was given.
 if test "${enable_log+set}" = set; then
           no_cache=0
           # Check whether --enable-log or --disable-log was given.
 if test "${enable_log+set}" = set; then


@@ -3099,8 +3545,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-streams"""... $ac_c" 1>&6
-echo "configure:3104: checking "for --enable-streams"" >&5
+          echo $ac_n "checking for --enable-streams""... $ac_c" 1>&6
+echo "configure:3550: checking for --enable-streams" >&5

           no_cache=0
           # Check whether --enable-streams or --disable-streams was given.
 if test "${enable_streams+set}" = set; then
           no_cache=0
           # Check whether --enable-streams or --disable-streams was given.
 if test "${enable_streams+set}" = set; then


@@ -3138,8 +3584,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-file"""... $ac_c" 1>&6
-echo "configure:3143: checking "for --enable-file"" >&5
+          echo $ac_n "checking for --enable-file""... $ac_c" 1>&6
+echo "configure:3589: checking for --enable-file" >&5

           no_cache=0
           # Check whether --enable-file or --disable-file was given.
 if test "${enable_file+set}" = set; then
           no_cache=0
           # Check whether --enable-file or --disable-file was given.
 if test "${enable_file+set}" = set; then


@@ -3177,8 +3623,47 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-textfile"""... $ac_c" 1>&6
-echo "configure:3182: checking "for --enable-textfile"" >&5
+          echo $ac_n "checking for --enable-ffile""... $ac_c" 1>&6
+echo "configure:3628: checking for --enable-ffile" >&5
+          no_cache=0
+          # Check whether --enable-ffile or --disable-ffile was given.
+if test "${enable_ffile+set}" = set; then
+  enableval="$enable_ffile"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_ffile='wxUSE_FFILE=yes'
+                          else
+                            ac_cv_use_ffile='wxUSE_FFILE=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_FFILE" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_ffile='wxUSE_FFILE='$DEFAULT_wxUSE_FFILE
+                        
+fi
+
+
+          eval "$ac_cv_use_ffile"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_ffile >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_FFILE" = 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

           no_cache=0
           # Check whether --enable-textfile or --disable-textfile was given.
 if test "${enable_textfile+set}" = set; then
           no_cache=0
           # Check whether --enable-textfile or --disable-textfile was given.
 if test "${enable_textfile+set}" = set; then


@@ -3216,8 +3701,47 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-unicode"""... $ac_c" 1>&6
-echo "configure:3221: checking "for --enable-unicode"" >&5
+          echo $ac_n "checking for --enable-fontmap""... $ac_c" 1>&6
+echo "configure:3706: checking for --enable-fontmap" >&5
+          no_cache=0
+          # Check whether --enable-fontmap or --disable-fontmap was given.
+if test "${enable_fontmap+set}" = set; then
+  enableval="$enable_fontmap"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_fontmap='wxUSE_FONTMAP=yes'
+                          else
+                            ac_cv_use_fontmap='wxUSE_FONTMAP=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_FONTMAP" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_fontmap='wxUSE_FONTMAP='$DEFAULT_wxUSE_FONTMAP
+                        
+fi
+
+
+          eval "$ac_cv_use_fontmap"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_fontmap >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_FONTMAP" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-unicode""... $ac_c" 1>&6
+echo "configure:3745: checking for --enable-unicode" >&5

           no_cache=0
           # Check whether --enable-unicode or --disable-unicode was given.
 if test "${enable_unicode+set}" = set; then
           no_cache=0
           # Check whether --enable-unicode or --disable-unicode was given.
 if test "${enable_unicode+set}" = set; then


@@ -3255,8 +3779,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-wcsrtombs"""... $ac_c" 1>&6
-echo "configure:3260: checking "for --enable-wcsrtombs"" >&5
+          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
           no_cache=0
           # Check whether --enable-wcsrtombs or --disable-wcsrtombs was given.
 if test "${enable_wcsrtombs+set}" = set; then


@@ -3294,8 +3818,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-wxprintfv"""... $ac_c" 1>&6
-echo "configure:3299: checking "for --enable-wxprintfv"" >&5
+          echo $ac_n "checking for --enable-wxprintfv""... $ac_c" 1>&6
+echo "configure:3823: checking for --enable-wxprintfv" >&5

           no_cache=0
           # Check whether --enable-wxprintfv or --disable-wxprintfv was given.
 if test "${enable_wxprintfv+set}" = set; then
           no_cache=0
           # Check whether --enable-wxprintfv or --disable-wxprintfv was given.
 if test "${enable_wxprintfv+set}" = set; then


@@ -3333,8 +3857,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-std_iostreams"""... $ac_c" 1>&6
-echo "configure:3338: checking "for --enable-std_iostreams"" >&5
+          echo $ac_n "checking for --enable-std_iostreams""... $ac_c" 1>&6
+echo "configure:3862: 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
           no_cache=0
           # Check whether --enable-std_iostreams or --disable-std_iostreams was given.
 if test "${enable_std_iostreams+set}" = set; then


@@ -3372,8 +3896,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-filesystem"""... $ac_c" 1>&6
-echo "configure:3377: checking "for --enable-filesystem"" >&5
+          echo $ac_n "checking for --enable-filesystem""... $ac_c" 1>&6
+echo "configure:3901: checking for --enable-filesystem" >&5

           no_cache=0
           # Check whether --enable-filesystem or --disable-filesystem was given.
 if test "${enable_filesystem+set}" = set; then
           no_cache=0
           # Check whether --enable-filesystem or --disable-filesystem was given.
 if test "${enable_filesystem+set}" = set; then


@@ -3411,8 +3935,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-fs_inet"""... $ac_c" 1>&6
-echo "configure:3416: checking "for --enable-fs_inet"" >&5
+          echo $ac_n "checking for --enable-fs_inet""... $ac_c" 1>&6
+echo "configure:3940: 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
           no_cache=0
           # Check whether --enable-fs_inet or --disable-fs_inet was given.
 if test "${enable_fs_inet+set}" = set; then


@@ -3450,8 +3974,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-fs_zip"""... $ac_c" 1>&6
-echo "configure:3455: checking "for --enable-fs_zip"" >&5
+          echo $ac_n "checking for --enable-fs_zip""... $ac_c" 1>&6
+echo "configure:3979: 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
           no_cache=0
           # Check whether --enable-fs_zip or --disable-fs_zip was given.
 if test "${enable_fs_zip+set}" = set; then


@@ -3489,8 +4013,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-zipstream"""... $ac_c" 1>&6
-echo "configure:3494: checking "for --enable-zipstream"" >&5
+          echo $ac_n "checking for --enable-zipstream""... $ac_c" 1>&6
+echo "configure:4018: checking for --enable-zipstream" >&5

           no_cache=0
           # Check whether --enable-zipstream or --disable-zipstream was given.
 if test "${enable_zipstream+set}" = set; then
           no_cache=0
           # Check whether --enable-zipstream or --disable-zipstream was given.
 if test "${enable_zipstream+set}" = set; then


@@ -3529,8 +4053,8 @@ fi
         
 
 
         
 
 

-          echo $ac_n "checking "for --enable-catch_segvs"""... $ac_c" 1>&6
-echo "configure:3534: checking "for --enable-catch_segvs"" >&5
+          echo $ac_n "checking for --enable-catch_segvs""... $ac_c" 1>&6
+echo "configure:4058: 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
           no_cache=0
           # Check whether --enable-catch_segvs or --disable-catch_segvs was given.
 if test "${enable_catch_segvs+set}" = set; then


@@ -3568,8 +4092,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-snglinst"""... $ac_c" 1>&6
-echo "configure:3573: checking "for --enable-snglinst"" >&5
+          echo $ac_n "checking for --enable-snglinst""... $ac_c" 1>&6
+echo "configure:4097: checking for --enable-snglinst" >&5

           no_cache=0
           # Check whether --enable-snglinst or --disable-snglinst was given.
 if test "${enable_snglinst+set}" = set; then
           no_cache=0
           # Check whether --enable-snglinst or --disable-snglinst was given.
 if test "${enable_snglinst+set}" = set; then


@@ -3608,9 +4132,88 @@ fi
         
 
 
         
 
 

+          echo $ac_n "checking for --enable-mimetype""... $ac_c" 1>&6
+echo "configure:4137: checking for --enable-mimetype" >&5
+          no_cache=0
+          # Check whether --enable-mimetype or --disable-mimetype was given.
+if test "${enable_mimetype+set}" = set; then
+  enableval="$enable_mimetype"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_mimetype='wxUSE_MIMETYPE=yes'
+                          else
+                            ac_cv_use_mimetype='wxUSE_MIMETYPE=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_MIMETYPE" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_mimetype='wxUSE_MIMETYPE='$DEFAULT_wxUSE_MIMETYPE
+                        
+fi
+
+
+          eval "$ac_cv_use_mimetype"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_mimetype >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_MIMETYPE" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-system_options""... $ac_c" 1>&6
+echo "configure:4176: 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
+  enableval="$enable_system_options"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_system_options='wxUSE_SYSTEM_OPTIONS=yes'
+                          else
+                            ac_cv_use_system_options='wxUSE_SYSTEM_OPTIONS=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_SYSTEM_OPTIONS" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_system_options='wxUSE_SYSTEM_OPTIONS='$DEFAULT_wxUSE_SYSTEM_OPTIONS
+                        
+fi
+
+
+          eval "$ac_cv_use_system_options"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_system_options >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_SYSTEM_OPTIONS" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+

 
 

-          echo $ac_n "checking "for --enable-threads"""... $ac_c" 1>&6
-echo "configure:3614: checking "for --enable-threads"" >&5
+          echo $ac_n "checking for --enable-threads""... $ac_c" 1>&6
+echo "configure:4217: checking for --enable-threads" >&5

           no_cache=0
           # Check whether --enable-threads or --disable-threads was given.
 if test "${enable_threads+set}" = set; then
           no_cache=0
           # Check whether --enable-threads or --disable-threads was given.
 if test "${enable_threads+set}" = set; then


@@ -3648,8 +4251,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-serial"""... $ac_c" 1>&6
-echo "configure:3653: checking "for --enable-serial"" >&5
+          echo $ac_n "checking for --enable-serial""... $ac_c" 1>&6
+echo "configure:4256: checking for --enable-serial" >&5

           no_cache=0
           # Check whether --enable-serial or --disable-serial was given.
 if test "${enable_serial+set}" = set; then
           no_cache=0
           # Check whether --enable-serial or --disable-serial was given.
 if test "${enable_serial+set}" = set; then


@@ -3691,8 +4294,8 @@ if test "$wxUSE_GUI" = "yes"; then
 
 
 
 
 
 

-          echo $ac_n "checking "for --enable-docview"""... $ac_c" 1>&6
-echo "configure:3696: checking "for --enable-docview"" >&5
+          echo $ac_n "checking for --enable-docview""... $ac_c" 1>&6
+echo "configure:4299: checking for --enable-docview" >&5

           no_cache=0
           # Check whether --enable-docview or --disable-docview was given.
 if test "${enable_docview+set}" = set; then
           no_cache=0
           # Check whether --enable-docview or --disable-docview was given.
 if test "${enable_docview+set}" = set; then


@@ -3730,8 +4333,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-help"""... $ac_c" 1>&6
-echo "configure:3735: checking "for --enable-help"" >&5
+          echo $ac_n "checking for --enable-help""... $ac_c" 1>&6
+echo "configure:4338: checking for --enable-help" >&5

           no_cache=0
           # Check whether --enable-help or --disable-help was given.
 if test "${enable_help+set}" = set; then
           no_cache=0
           # Check whether --enable-help or --disable-help was given.
 if test "${enable_help+set}" = set; then


@@ -3769,34 +4372,151 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-constraints"""... $ac_c" 1>&6
-echo "configure:3774: checking "for --enable-constraints"" >&5
+          echo $ac_n "checking for --enable-mshtmlhelp""... $ac_c" 1>&6
+echo "configure:4377: checking for --enable-mshtmlhelp" >&5

           no_cache=0
           no_cache=0

-          # Check whether --enable-constraints or --disable-constraints was given.
-if test "${enable_constraints+set}" = set; then
-  enableval="$enable_constraints"
+          # Check whether --enable-mshtmlhelp or --disable-mshtmlhelp was given.
+if test "${enable_mshtmlhelp+set}" = set; then
+  enableval="$enable_mshtmlhelp"

   
                           if test "$enableval" = yes; then
   
                           if test "$enableval" = yes; then

-                            ac_cv_use_constraints='wxUSE_CONSTRAINTS=yes'
+                            ac_cv_use_mshtmlhelp='wxUSE_MS_HTML_HELP=yes'

                           else
                           else

-                            ac_cv_use_constraints='wxUSE_CONSTRAINTS=no'
+                            ac_cv_use_mshtmlhelp='wxUSE_MS_HTML_HELP=no'

                           fi
                         
 else
   
                           fi
                         
 else
   

-                          LINE=`grep "wxUSE_CONSTRAINTS" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_MS_HTML_HELP" ${wx_arg_cache_file}`

                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 

-                          ac_cv_use_constraints='wxUSE_CONSTRAINTS='$DEFAULT_wxUSE_CONSTRAINTS
+                          ac_cv_use_mshtmlhelp='wxUSE_MS_HTML_HELP='$DEFAULT_wxUSE_MS_HTML_HELP

                         
 fi
 
 
                         
 fi
 
 

-          eval "$ac_cv_use_constraints"
+          eval "$ac_cv_use_mshtmlhelp"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_mshtmlhelp >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_MS_HTML_HELP" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-html""... $ac_c" 1>&6
+echo "configure:4416: checking for --enable-html" >&5
+          no_cache=0
+          # Check whether --enable-html or --disable-html was given.
+if test "${enable_html+set}" = set; then
+  enableval="$enable_html"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_html='wxUSE_HTML=yes'
+                          else
+                            ac_cv_use_html='wxUSE_HTML=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_HTML" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_html='wxUSE_HTML='$DEFAULT_wxUSE_HTML
+                        
+fi
+
+
+          eval "$ac_cv_use_html"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_html >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_HTML" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-htmlhelp""... $ac_c" 1>&6
+echo "configure:4455: checking for --enable-htmlhelp" >&5
+          no_cache=0
+          # Check whether --enable-htmlhelp or --disable-htmlhelp was given.
+if test "${enable_htmlhelp+set}" = set; then
+  enableval="$enable_htmlhelp"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_htmlhelp='wxUSE_WXHTML_HELP=yes'
+                          else
+                            ac_cv_use_htmlhelp='wxUSE_WXHTML_HELP=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_WXHTML_HELP" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_htmlhelp='wxUSE_WXHTML_HELP='$DEFAULT_wxUSE_WXHTML_HELP
+                        
+fi
+
+
+          eval "$ac_cv_use_htmlhelp"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_htmlhelp >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_WXHTML_HELP" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-constraints""... $ac_c" 1>&6
+echo "configure:4494: checking for --enable-constraints" >&5
+          no_cache=0
+          # Check whether --enable-constraints or --disable-constraints was given.
+if test "${enable_constraints+set}" = set; then
+  enableval="$enable_constraints"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_constraints='wxUSE_CONSTRAINTS=yes'
+                          else
+                            ac_cv_use_constraints='wxUSE_CONSTRAINTS=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_CONSTRAINTS" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_constraints='wxUSE_CONSTRAINTS='$DEFAULT_wxUSE_CONSTRAINTS
+                        
+fi
+
+
+          eval "$ac_cv_use_constraints"

           if test "$no_cache" != 1; then
             echo $ac_cv_use_constraints >> ${wx_arg_cache_file}.tmp
           fi
           if test "$no_cache" != 1; then
             echo $ac_cv_use_constraints >> ${wx_arg_cache_file}.tmp
           fi


@@ -3808,8 +4528,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-printarch"""... $ac_c" 1>&6
-echo "configure:3813: checking "for --enable-printarch"" >&5
+          echo $ac_n "checking for --enable-printarch""... $ac_c" 1>&6
+echo "configure:4533: checking for --enable-printarch" >&5

           no_cache=0
           # Check whether --enable-printarch or --disable-printarch was given.
 if test "${enable_printarch+set}" = set; then
           no_cache=0
           # Check whether --enable-printarch or --disable-printarch was given.
 if test "${enable_printarch+set}" = set; then


@@ -3847,8 +4567,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-mdi"""... $ac_c" 1>&6
-echo "configure:3852: checking "for --enable-mdi"" >&5
+          echo $ac_n "checking for --enable-mdi""... $ac_c" 1>&6
+echo "configure:4572: checking for --enable-mdi" >&5

           no_cache=0
           # Check whether --enable-mdi or --disable-mdi was given.
 if test "${enable_mdi+set}" = set; then
           no_cache=0
           # Check whether --enable-mdi or --disable-mdi was given.
 if test "${enable_mdi+set}" = set; then


@@ -3886,9 +4606,87 @@ fi
           fi
         
 
           fi
         
 

+          echo $ac_n "checking for --enable-loggui""... $ac_c" 1>&6
+echo "configure:4611: checking for --enable-loggui" >&5
+          no_cache=0
+          # Check whether --enable-loggui or --disable-loggui was given.
+if test "${enable_loggui+set}" = set; then
+  enableval="$enable_loggui"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_loggui='wxUSE_LOGGUI=yes'
+                          else
+                            ac_cv_use_loggui='wxUSE_LOGGUI=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_LOGGUI" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_loggui='wxUSE_LOGGUI='$DEFAULT_wxUSE_LOGGUI
+                        
+fi
+
+
+          eval "$ac_cv_use_loggui"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_loggui >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_LOGGUI" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-logwin""... $ac_c" 1>&6
+echo "configure:4650: checking for --enable-logwin" >&5
+          no_cache=0
+          # Check whether --enable-logwin or --disable-logwin was given.
+if test "${enable_logwin+set}" = set; then
+  enableval="$enable_logwin"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_logwin='wxUSE_LOGWINDOW=yes'
+                          else
+                            ac_cv_use_logwin='wxUSE_LOGWINDOW=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_LOGWINDOW" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi

 
 

-          echo $ac_n "checking "for --enable-postscript"""... $ac_c" 1>&6
-echo "configure:3892: checking "for --enable-postscript"" >&5
+                          ac_cv_use_logwin='wxUSE_LOGWINDOW='$DEFAULT_wxUSE_LOGWINDOW
+                        
+fi
+
+
+          eval "$ac_cv_use_logwin"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_logwin >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_LOGWINDOW" = 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

           no_cache=0
           # Check whether --enable-postscript or --disable-postscript was given.
 if test "${enable_postscript+set}" = set; then
           no_cache=0
           # Check whether --enable-postscript or --disable-postscript was given.
 if test "${enable_postscript+set}" = set; then


@@ -3928,8 +4726,9 @@ fi
 
 
 
 
 
 

-          echo $ac_n "checking "for --enable-prologio"""... $ac_c" 1>&6
-echo "configure:3933: checking "for --enable-prologio"" >&5
+
+          echo $ac_n "checking for --enable-prologio""... $ac_c" 1>&6
+echo "configure:4732: checking for --enable-prologio" >&5

           no_cache=0
           # Check whether --enable-prologio or --disable-prologio was given.
 if test "${enable_prologio+set}" = set; then
           no_cache=0
           # Check whether --enable-prologio or --disable-prologio was given.
 if test "${enable_prologio+set}" = set; then


@@ -3967,8 +4766,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-resources"""... $ac_c" 1>&6
-echo "configure:3972: checking "for --enable-resources"" >&5
+          echo $ac_n "checking for --enable-resources""... $ac_c" 1>&6
+echo "configure:4771: checking for --enable-resources" >&5

           no_cache=0
           # Check whether --enable-resources or --disable-resources was given.
 if test "${enable_resources+set}" = set; then
           no_cache=0
           # Check whether --enable-resources or --disable-resources was given.
 if test "${enable_resources+set}" = set; then


@@ -4007,8 +4806,8 @@ fi
         
 
 
         
 
 

-          echo $ac_n "checking "for --enable-xresources"""... $ac_c" 1>&6
-echo "configure:4012: checking "for --enable-xresources"" >&5
+          echo $ac_n "checking for --enable-xresources""... $ac_c" 1>&6
+echo "configure:4811: checking for --enable-xresources" >&5

           no_cache=0
           # Check whether --enable-xresources or --disable-xresources was given.
 if test "${enable_xresources+set}" = set; then
           no_cache=0
           # Check whether --enable-xresources or --disable-xresources was given.
 if test "${enable_xresources+set}" = set; then


@@ -4048,8 +4847,8 @@ fi
 
 
 
 
 
 

-          echo $ac_n "checking "for --enable-clipboard"""... $ac_c" 1>&6
-echo "configure:4053: checking "for --enable-clipboard"" >&5
+          echo $ac_n "checking for --enable-clipboard""... $ac_c" 1>&6
+echo "configure:4852: checking for --enable-clipboard" >&5

           no_cache=0
           # Check whether --enable-clipboard or --disable-clipboard was given.
 if test "${enable_clipboard+set}" = set; then
           no_cache=0
           # Check whether --enable-clipboard or --disable-clipboard was given.
 if test "${enable_clipboard+set}" = set; then


@@ -4087,8 +4886,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-dnd"""... $ac_c" 1>&6
-echo "configure:4092: checking "for --enable-dnd"" >&5
+          echo $ac_n "checking for --enable-dnd""... $ac_c" 1>&6
+echo "configure:4891: checking for --enable-dnd" >&5

           no_cache=0
           # Check whether --enable-dnd or --disable-dnd was given.
 if test "${enable_dnd+set}" = set; then
           no_cache=0
           # Check whether --enable-dnd or --disable-dnd was given.
 if test "${enable_dnd+set}" = set; then


@@ -4126,8 +4925,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-metafile"""... $ac_c" 1>&6
-echo "configure:4131: checking "for --enable-metafile"" >&5
+          echo $ac_n "checking for --enable-metafile""... $ac_c" 1>&6
+echo "configure:4930: checking for --enable-metafile" >&5

           no_cache=0
           # Check whether --enable-metafile or --disable-metafile was given.
 if test "${enable_metafile+set}" = set; then
           no_cache=0
           # Check whether --enable-metafile or --disable-metafile was given.
 if test "${enable_metafile+set}" = set; then


@@ -4166,8 +4965,8 @@ fi
         
 
 
         
 
 

-          echo $ac_n "checking "for --enable-wxtree"""... $ac_c" 1>&6
-echo "configure:4171: checking "for --enable-wxtree"" >&5
+          echo $ac_n "checking for --enable-wxtree""... $ac_c" 1>&6
+echo "configure:4970: checking for --enable-wxtree" >&5

           no_cache=0
           # Check whether --enable-wxtree or --disable-wxtree was given.
 if test "${enable_wxtree+set}" = set; then
           no_cache=0
           # Check whether --enable-wxtree or --disable-wxtree was given.
 if test "${enable_wxtree+set}" = set; then


@@ -4207,8 +5006,8 @@ fi
 
 
 
 
 
 

-          echo $ac_n "checking "for --enable-controls"""... $ac_c" 1>&6
-echo "configure:4212: checking "for --enable-controls"" >&5
+          echo $ac_n "checking for --enable-controls""... $ac_c" 1>&6
+echo "configure:5011: checking for --enable-controls" >&5

           no_cache=0
           # Check whether --enable-controls or --disable-controls was given.
 if test "${enable_controls+set}" = set; then
           no_cache=0
           # Check whether --enable-controls or --disable-controls was given.
 if test "${enable_controls+set}" = set; then


@@ -4248,9 +5047,11 @@ fi
 
 if test "$wxUSE_CONTROLS" = "yes"; then
   DEFAULT_wxUSE_ACCEL=yes
 
 if test "$wxUSE_CONTROLS" = "yes"; then
   DEFAULT_wxUSE_ACCEL=yes

+  DEFAULT_wxUSE_BMPBUTTON=yes
+  DEFAULT_wxUSE_BUTTON=yes
+  DEFAULT_wxUSE_CALCTRL=no

   DEFAULT_wxUSE_CARET=yes
   DEFAULT_wxUSE_COMBOBOX=yes
   DEFAULT_wxUSE_CARET=yes
   DEFAULT_wxUSE_COMBOBOX=yes

-  DEFAULT_wxUSE_BMPBUTTON=yes

   DEFAULT_wxUSE_CHECKBOX=yes
   DEFAULT_wxUSE_CHECKLISTBOX=yes
   DEFAULT_wxUSE_CHOICE=yes
   DEFAULT_wxUSE_CHECKBOX=yes
   DEFAULT_wxUSE_CHECKLISTBOX=yes
   DEFAULT_wxUSE_CHOICE=yes


@@ -4280,11 +5081,14 @@ if test "$wxUSE_CONTROLS" = "yes"; then
   DEFAULT_wxUSE_TOOLBAR_SIMPLE=yes
   DEFAULT_wxUSE_TOOLTIPS=yes
   DEFAULT_wxUSE_TREECTRL=yes
   DEFAULT_wxUSE_TOOLBAR_SIMPLE=yes
   DEFAULT_wxUSE_TOOLTIPS=yes
   DEFAULT_wxUSE_TREECTRL=yes

+  DEFAULT_wxUSE_POPUPWIN=yes

 elif test "$wxUSE_CONTROLS" = "no"; then
   DEFAULT_wxUSE_ACCEL=no
 elif test "$wxUSE_CONTROLS" = "no"; then
   DEFAULT_wxUSE_ACCEL=no

+  DEFAULT_wxUSE_BMPBUTTON=no
+  DEFAULT_wxUSE_BUTTON=no
+  DEFAULT_wxUSE_CALCTRL=no

   DEFAULT_wxUSE_CARET=no
   DEFAULT_wxUSE_COMBOBOX=no
   DEFAULT_wxUSE_CARET=no
   DEFAULT_wxUSE_COMBOBOX=no

-  DEFAULT_wxUSE_BMPBUTTON=no

   DEFAULT_wxUSE_CHECKBOX=no
   DEFAULT_wxUSE_CHECKLISTBOX=no
   DEFAULT_wxUSE_CHOICE=no
   DEFAULT_wxUSE_CHECKBOX=no
   DEFAULT_wxUSE_CHECKLISTBOX=no
   DEFAULT_wxUSE_CHOICE=no


@@ -4314,11 +5118,12 @@ elif test "$wxUSE_CONTROLS" = "no"; then
   DEFAULT_wxUSE_TOOLBAR_SIMPLE=no
   DEFAULT_wxUSE_TOOLTIPS=no
   DEFAULT_wxUSE_TREECTRL=no
   DEFAULT_wxUSE_TOOLBAR_SIMPLE=no
   DEFAULT_wxUSE_TOOLTIPS=no
   DEFAULT_wxUSE_TREECTRL=no

+  DEFAULT_wxUSE_POPUPWIN=no

 fi
 
 
 fi
 
 

-          echo $ac_n "checking "for --enable-accel"""... $ac_c" 1>&6
-echo "configure:4322: checking "for --enable-accel"" >&5
+          echo $ac_n "checking for --enable-accel""... $ac_c" 1>&6
+echo "configure:5127: checking for --enable-accel" >&5

           no_cache=0
           # Check whether --enable-accel or --disable-accel was given.
 if test "${enable_accel+set}" = set; then
           no_cache=0
           # Check whether --enable-accel or --disable-accel was given.
 if test "${enable_accel+set}" = set; then


@@ -4356,47 +5161,47 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-caret"""... $ac_c" 1>&6
-echo "configure:4361: checking "for --enable-caret"" >&5
+          echo $ac_n "checking for --enable-button""... $ac_c" 1>&6
+echo "configure:5166: checking for --enable-button" >&5

           no_cache=0
           no_cache=0

-          # Check whether --enable-caret or --disable-caret was given.
-if test "${enable_caret+set}" = set; then
-  enableval="$enable_caret"
+          # Check whether --enable-button or --disable-button was given.
+if test "${enable_button+set}" = set; then
+  enableval="$enable_button"

   
                           if test "$enableval" = yes; then
   
                           if test "$enableval" = yes; then

-                            ac_cv_use_caret='wxUSE_CARET=yes'
+                            ac_cv_use_button='wxUSE_BUTTON=yes'

                           else
                           else

-                            ac_cv_use_caret='wxUSE_CARET=no'
+                            ac_cv_use_button='wxUSE_BUTTON=no'

                           fi
                         
 else
   
                           fi
                         
 else
   

-                          LINE=`grep "wxUSE_CARET" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_BUTTON" ${wx_arg_cache_file}`

                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 

-                          ac_cv_use_caret='wxUSE_CARET='$DEFAULT_wxUSE_CARET
+                          ac_cv_use_button='wxUSE_BUTTON='$DEFAULT_wxUSE_BUTTON

                         
 fi
 
 
                         
 fi
 
 

-          eval "$ac_cv_use_caret"
+          eval "$ac_cv_use_button"

           if test "$no_cache" != 1; then
           if test "$no_cache" != 1; then

-            echo $ac_cv_use_caret >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_button >> ${wx_arg_cache_file}.tmp

           fi
 
           fi
 

-          if test "$wxUSE_CARET" = yes; then
+          if test "$wxUSE_BUTTON" = yes; then

             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 

-          echo $ac_n "checking "for --enable-bmpbutton"""... $ac_c" 1>&6
-echo "configure:4400: checking "for --enable-bmpbutton"" >&5
+          echo $ac_n "checking for --enable-bmpbutton""... $ac_c" 1>&6
+echo "configure:5205: checking for --enable-bmpbutton" >&5

           no_cache=0
           # Check whether --enable-bmpbutton or --disable-bmpbutton was given.
 if test "${enable_bmpbutton+set}" = set; then
           no_cache=0
           # Check whether --enable-bmpbutton or --disable-bmpbutton was given.
 if test "${enable_bmpbutton+set}" = set; then


@@ -4434,8 +5239,86 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-checkbox"""... $ac_c" 1>&6
-echo "configure:4439: checking "for --enable-checkbox"" >&5
+          echo $ac_n "checking for --enable-calendar""... $ac_c" 1>&6
+echo "configure:5244: checking for --enable-calendar" >&5
+          no_cache=0
+          # Check whether --enable-calendar or --disable-calendar was given.
+if test "${enable_calendar+set}" = set; then
+  enableval="$enable_calendar"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_calendar='wxUSE_CALCTRL=yes'
+                          else
+                            ac_cv_use_calendar='wxUSE_CALCTRL=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_CALCTRL" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_calendar='wxUSE_CALCTRL='$DEFAULT_wxUSE_CALCTRL
+                        
+fi
+
+
+          eval "$ac_cv_use_calendar"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_calendar >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_CALCTRL" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-caret""... $ac_c" 1>&6
+echo "configure:5283: checking for --enable-caret" >&5
+          no_cache=0
+          # Check whether --enable-caret or --disable-caret was given.
+if test "${enable_caret+set}" = set; then
+  enableval="$enable_caret"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_caret='wxUSE_CARET=yes'
+                          else
+                            ac_cv_use_caret='wxUSE_CARET=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_CARET" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_caret='wxUSE_CARET='$DEFAULT_wxUSE_CARET
+                        
+fi
+
+
+          eval "$ac_cv_use_caret"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_caret >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_CARET" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-checkbox""... $ac_c" 1>&6
+echo "configure:5322: checking for --enable-checkbox" >&5

           no_cache=0
           # Check whether --enable-checkbox or --disable-checkbox was given.
 if test "${enable_checkbox+set}" = set; then
           no_cache=0
           # Check whether --enable-checkbox or --disable-checkbox was given.
 if test "${enable_checkbox+set}" = set; then


@@ -4473,8 +5356,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-checklst"""... $ac_c" 1>&6
-echo "configure:4478: checking "for --enable-checklst"" >&5
+          echo $ac_n "checking for --enable-checklst""... $ac_c" 1>&6
+echo "configure:5361: checking for --enable-checklst" >&5

           no_cache=0
           # Check whether --enable-checklst or --disable-checklst was given.
 if test "${enable_checklst+set}" = set; then
           no_cache=0
           # Check whether --enable-checklst or --disable-checklst was given.
 if test "${enable_checklst+set}" = set; then


@@ -4512,8 +5395,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-choice"""... $ac_c" 1>&6
-echo "configure:4517: checking "for --enable-choice"" >&5
+          echo $ac_n "checking for --enable-choice""... $ac_c" 1>&6
+echo "configure:5400: checking for --enable-choice" >&5

           no_cache=0
           # Check whether --enable-choice or --disable-choice was given.
 if test "${enable_choice+set}" = set; then
           no_cache=0
           # Check whether --enable-choice or --disable-choice was given.
 if test "${enable_choice+set}" = set; then


@@ -4551,8 +5434,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-combobox"""... $ac_c" 1>&6
-echo "configure:4556: checking "for --enable-combobox"" >&5
+          echo $ac_n "checking for --enable-combobox""... $ac_c" 1>&6
+echo "configure:5439: checking for --enable-combobox" >&5

           no_cache=0
           # Check whether --enable-combobox or --disable-combobox was given.
 if test "${enable_combobox+set}" = set; then
           no_cache=0
           # Check whether --enable-combobox or --disable-combobox was given.
 if test "${enable_combobox+set}" = set; then


@@ -4590,8 +5473,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-gauge"""... $ac_c" 1>&6
-echo "configure:4595: checking "for --enable-gauge"" >&5
+          echo $ac_n "checking for --enable-gauge""... $ac_c" 1>&6
+echo "configure:5478: checking for --enable-gauge" >&5

           no_cache=0
           # Check whether --enable-gauge or --disable-gauge was given.
 if test "${enable_gauge+set}" = set; then
           no_cache=0
           # Check whether --enable-gauge or --disable-gauge was given.
 if test "${enable_gauge+set}" = set; then


@@ -4629,8 +5512,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-grid"""... $ac_c" 1>&6
-echo "configure:4634: checking "for --enable-grid"" >&5
+          echo $ac_n "checking for --enable-grid""... $ac_c" 1>&6
+echo "configure:5517: checking for --enable-grid" >&5

           no_cache=0
           # Check whether --enable-grid or --disable-grid was given.
 if test "${enable_grid+set}" = set; then
           no_cache=0
           # Check whether --enable-grid or --disable-grid was given.
 if test "${enable_grid+set}" = set; then


@@ -4668,8 +5551,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-newgrid"""... $ac_c" 1>&6
-echo "configure:4673: checking "for --enable-newgrid"" >&5
+          echo $ac_n "checking for --enable-newgrid""... $ac_c" 1>&6
+echo "configure:5556: checking for --enable-newgrid" >&5

           no_cache=0
           # Check whether --enable-newgrid or --disable-newgrid was given.
 if test "${enable_newgrid+set}" = set; then
           no_cache=0
           # Check whether --enable-newgrid or --disable-newgrid was given.
 if test "${enable_newgrid+set}" = set; then


@@ -4707,8 +5590,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-imaglist"""... $ac_c" 1>&6
-echo "configure:4712: checking "for --enable-imaglist"" >&5
+          echo $ac_n "checking for --enable-imaglist""... $ac_c" 1>&6
+echo "configure:5595: checking for --enable-imaglist" >&5

           no_cache=0
           # Check whether --enable-imaglist or --disable-imaglist was given.
 if test "${enable_imaglist+set}" = set; then
           no_cache=0
           # Check whether --enable-imaglist or --disable-imaglist was given.
 if test "${enable_imaglist+set}" = set; then


@@ -4746,8 +5629,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-listbox"""... $ac_c" 1>&6
-echo "configure:4751: checking "for --enable-listbox"" >&5
+          echo $ac_n "checking for --enable-listbox""... $ac_c" 1>&6
+echo "configure:5634: checking for --enable-listbox" >&5

           no_cache=0
           # Check whether --enable-listbox or --disable-listbox was given.
 if test "${enable_listbox+set}" = set; then
           no_cache=0
           # Check whether --enable-listbox or --disable-listbox was given.
 if test "${enable_listbox+set}" = set; then


@@ -4785,8 +5668,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-listctrl"""... $ac_c" 1>&6
-echo "configure:4790: checking "for --enable-listctrl"" >&5
+          echo $ac_n "checking for --enable-listctrl""... $ac_c" 1>&6
+echo "configure:5673: checking for --enable-listctrl" >&5

           no_cache=0
           # Check whether --enable-listctrl or --disable-listctrl was given.
 if test "${enable_listctrl+set}" = set; then
           no_cache=0
           # Check whether --enable-listctrl or --disable-listctrl was given.
 if test "${enable_listctrl+set}" = set; then


@@ -4824,8 +5707,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-notebook"""... $ac_c" 1>&6
-echo "configure:4829: checking "for --enable-notebook"" >&5
+          echo $ac_n "checking for --enable-notebook""... $ac_c" 1>&6
+echo "configure:5712: checking for --enable-notebook" >&5

           no_cache=0
           # Check whether --enable-notebook or --disable-notebook was given.
 if test "${enable_notebook+set}" = set; then
           no_cache=0
           # Check whether --enable-notebook or --disable-notebook was given.
 if test "${enable_notebook+set}" = set; then


@@ -4863,8 +5746,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-radiobox"""... $ac_c" 1>&6
-echo "configure:4868: checking "for --enable-radiobox"" >&5
+          echo $ac_n "checking for --enable-radiobox""... $ac_c" 1>&6
+echo "configure:5751: checking for --enable-radiobox" >&5

           no_cache=0
           # Check whether --enable-radiobox or --disable-radiobox was given.
 if test "${enable_radiobox+set}" = set; then
           no_cache=0
           # Check whether --enable-radiobox or --disable-radiobox was given.
 if test "${enable_radiobox+set}" = set; then


@@ -4902,8 +5785,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-radiobtn"""... $ac_c" 1>&6
-echo "configure:4907: checking "for --enable-radiobtn"" >&5
+          echo $ac_n "checking for --enable-radiobtn""... $ac_c" 1>&6
+echo "configure:5790: checking for --enable-radiobtn" >&5

           no_cache=0
           # Check whether --enable-radiobtn or --disable-radiobtn was given.
 if test "${enable_radiobtn+set}" = set; then
           no_cache=0
           # Check whether --enable-radiobtn or --disable-radiobtn was given.
 if test "${enable_radiobtn+set}" = set; then


@@ -4941,8 +5824,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-sash"""... $ac_c" 1>&6
-echo "configure:4946: checking "for --enable-sash"" >&5
+          echo $ac_n "checking for --enable-sash""... $ac_c" 1>&6
+echo "configure:5829: checking for --enable-sash" >&5

           no_cache=0
           # Check whether --enable-sash or --disable-sash was given.
 if test "${enable_sash+set}" = set; then
           no_cache=0
           # Check whether --enable-sash or --disable-sash was given.
 if test "${enable_sash+set}" = set; then


@@ -4980,8 +5863,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-scrollbar"""... $ac_c" 1>&6
-echo "configure:4985: checking "for --enable-scrollbar"" >&5
+          echo $ac_n "checking for --enable-scrollbar""... $ac_c" 1>&6
+echo "configure:5868: checking for --enable-scrollbar" >&5

           no_cache=0
           # Check whether --enable-scrollbar or --disable-scrollbar was given.
 if test "${enable_scrollbar+set}" = set; then
           no_cache=0
           # Check whether --enable-scrollbar or --disable-scrollbar was given.
 if test "${enable_scrollbar+set}" = set; then


@@ -5019,8 +5902,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-slider"""... $ac_c" 1>&6
-echo "configure:5024: checking "for --enable-slider"" >&5
+          echo $ac_n "checking for --enable-slider""... $ac_c" 1>&6
+echo "configure:5907: checking for --enable-slider" >&5

           no_cache=0
           # Check whether --enable-slider or --disable-slider was given.
 if test "${enable_slider+set}" = set; then
           no_cache=0
           # Check whether --enable-slider or --disable-slider was given.
 if test "${enable_slider+set}" = set; then


@@ -5058,8 +5941,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-spinbtn"""... $ac_c" 1>&6
-echo "configure:5063: checking "for --enable-spinbtn"" >&5
+          echo $ac_n "checking for --enable-spinbtn""... $ac_c" 1>&6
+echo "configure:5946: checking for --enable-spinbtn" >&5

           no_cache=0
           # Check whether --enable-spinbtn or --disable-spinbtn was given.
 if test "${enable_spinbtn+set}" = set; then
           no_cache=0
           # Check whether --enable-spinbtn or --disable-spinbtn was given.
 if test "${enable_spinbtn+set}" = set; then


@@ -5097,8 +5980,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-spinctrl"""... $ac_c" 1>&6
-echo "configure:5102: checking "for --enable-spinctrl"" >&5
+          echo $ac_n "checking for --enable-spinctrl""... $ac_c" 1>&6
+echo "configure:5985: checking for --enable-spinctrl" >&5

           no_cache=0
           # Check whether --enable-spinctrl or --disable-spinctrl was given.
 if test "${enable_spinctrl+set}" = set; then
           no_cache=0
           # Check whether --enable-spinctrl or --disable-spinctrl was given.
 if test "${enable_spinctrl+set}" = set; then


@@ -5136,8 +6019,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-splitter"""... $ac_c" 1>&6
-echo "configure:5141: checking "for --enable-splitter"" >&5
+          echo $ac_n "checking for --enable-splitter""... $ac_c" 1>&6
+echo "configure:6024: checking for --enable-splitter" >&5

           no_cache=0
           # Check whether --enable-splitter or --disable-splitter was given.
 if test "${enable_splitter+set}" = set; then
           no_cache=0
           # Check whether --enable-splitter or --disable-splitter was given.
 if test "${enable_splitter+set}" = set; then


@@ -5175,8 +6058,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-statbmp"""... $ac_c" 1>&6
-echo "configure:5180: checking "for --enable-statbmp"" >&5
+          echo $ac_n "checking for --enable-statbmp""... $ac_c" 1>&6
+echo "configure:6063: checking for --enable-statbmp" >&5

           no_cache=0
           # Check whether --enable-statbmp or --disable-statbmp was given.
 if test "${enable_statbmp+set}" = set; then
           no_cache=0
           # Check whether --enable-statbmp or --disable-statbmp was given.
 if test "${enable_statbmp+set}" = set; then


@@ -5214,8 +6097,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-statbox"""... $ac_c" 1>&6
-echo "configure:5219: checking "for --enable-statbox"" >&5
+          echo $ac_n "checking for --enable-statbox""... $ac_c" 1>&6
+echo "configure:6102: checking for --enable-statbox" >&5

           no_cache=0
           # Check whether --enable-statbox or --disable-statbox was given.
 if test "${enable_statbox+set}" = set; then
           no_cache=0
           # Check whether --enable-statbox or --disable-statbox was given.
 if test "${enable_statbox+set}" = set; then


@@ -5253,8 +6136,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-statline"""... $ac_c" 1>&6
-echo "configure:5258: checking "for --enable-statline"" >&5
+          echo $ac_n "checking for --enable-statline""... $ac_c" 1>&6
+echo "configure:6141: checking for --enable-statline" >&5

           no_cache=0
           # Check whether --enable-statline or --disable-statline was given.
 if test "${enable_statline+set}" = set; then
           no_cache=0
           # Check whether --enable-statline or --disable-statline was given.
 if test "${enable_statline+set}" = set; then


@@ -5292,8 +6175,47 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-statusbar"""... $ac_c" 1>&6
-echo "configure:5297: checking "for --enable-statusbar"" >&5
+          echo $ac_n "checking for --enable-stattext""... $ac_c" 1>&6
+echo "configure:6180: checking for --enable-stattext" >&5
+          no_cache=0
+          # Check whether --enable-stattext or --disable-stattext was given.
+if test "${enable_stattext+set}" = set; then
+  enableval="$enable_stattext"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_stattext='wxUSE_STATTEXT=yes'
+                          else
+                            ac_cv_use_stattext='wxUSE_STATTEXT=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_STATTEXT" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_stattext='wxUSE_STATTEXT='$DEFAULT_wxUSE_STATTEXT
+                        
+fi
+
+
+          eval "$ac_cv_use_stattext"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_stattext >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_STATTEXT" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-statusbar""... $ac_c" 1>&6
+echo "configure:6219: checking for --enable-statusbar" >&5

           no_cache=0
           # Check whether --enable-statusbar or --disable-statusbar was given.
 if test "${enable_statusbar+set}" = set; then
           no_cache=0
           # Check whether --enable-statusbar or --disable-statusbar was given.
 if test "${enable_statusbar+set}" = set; then


@@ -5331,8 +6253,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-tabdialog"""... $ac_c" 1>&6
-echo "configure:5336: checking "for --enable-tabdialog"" >&5
+          echo $ac_n "checking for --enable-tabdialog""... $ac_c" 1>&6
+echo "configure:6258: checking for --enable-tabdialog" >&5

           no_cache=0
           # Check whether --enable-tabdialog or --disable-tabdialog was given.
 if test "${enable_tabdialog+set}" = set; then
           no_cache=0
           # Check whether --enable-tabdialog or --disable-tabdialog was given.
 if test "${enable_tabdialog+set}" = set; then


@@ -5370,8 +6292,47 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-togglebtn"""... $ac_c" 1>&6
-echo "configure:5375: checking "for --enable-togglebtn"" >&5
+          echo $ac_n "checking for --enable-textctrl""... $ac_c" 1>&6
+echo "configure:6297: checking for --enable-textctrl" >&5
+          no_cache=0
+          # Check whether --enable-textctrl or --disable-textctrl was given.
+if test "${enable_textctrl+set}" = set; then
+  enableval="$enable_textctrl"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_textctrl='wxUSE_TEXTCTRL=yes'
+                          else
+                            ac_cv_use_textctrl='wxUSE_TEXTCTRL=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_TEXTCTRL" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_textctrl='wxUSE_TEXTCTRL='$DEFAULT_wxUSE_TEXTCTRL
+                        
+fi
+
+
+          eval "$ac_cv_use_textctrl"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_textctrl >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_TEXTCTRL" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-togglebtn""... $ac_c" 1>&6
+echo "configure:6336: checking for --enable-togglebtn" >&5

           no_cache=0
           # Check whether --enable-togglebtn or --disable-togglebtn was given.
 if test "${enable_togglebtn+set}" = set; then
           no_cache=0
           # Check whether --enable-togglebtn or --disable-togglebtn was given.
 if test "${enable_togglebtn+set}" = set; then


@@ -5409,8 +6370,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-toolbar"""... $ac_c" 1>&6
-echo "configure:5414: checking "for --enable-toolbar"" >&5
+          echo $ac_n "checking for --enable-toolbar""... $ac_c" 1>&6
+echo "configure:6375: checking for --enable-toolbar" >&5

           no_cache=0
           # Check whether --enable-toolbar or --disable-toolbar was given.
 if test "${enable_toolbar+set}" = set; then
           no_cache=0
           # Check whether --enable-toolbar or --disable-toolbar was given.
 if test "${enable_toolbar+set}" = set; then


@@ -5448,8 +6409,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-tbarnative"""... $ac_c" 1>&6
-echo "configure:5453: checking "for --enable-tbarnative"" >&5
+          echo $ac_n "checking for --enable-tbarnative""... $ac_c" 1>&6
+echo "configure:6414: checking for --enable-tbarnative" >&5

           no_cache=0
           # Check whether --enable-tbarnative or --disable-tbarnative was given.
 if test "${enable_tbarnative+set}" = set; then
           no_cache=0
           # Check whether --enable-tbarnative or --disable-tbarnative was given.
 if test "${enable_tbarnative+set}" = set; then


@@ -5487,8 +6448,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-tbarsmpl"""... $ac_c" 1>&6
-echo "configure:5492: checking "for --enable-tbarsmpl"" >&5
+          echo $ac_n "checking for --enable-tbarsmpl""... $ac_c" 1>&6
+echo "configure:6453: checking for --enable-tbarsmpl" >&5

           no_cache=0
           # Check whether --enable-tbarsmpl or --disable-tbarsmpl was given.
 if test "${enable_tbarsmpl+set}" = set; then
           no_cache=0
           # Check whether --enable-tbarsmpl or --disable-tbarsmpl was given.
 if test "${enable_tbarsmpl+set}" = set; then


@@ -5526,8 +6487,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-treectrl"""... $ac_c" 1>&6
-echo "configure:5531: checking "for --enable-treectrl"" >&5
+          echo $ac_n "checking for --enable-treectrl""... $ac_c" 1>&6
+echo "configure:6492: checking for --enable-treectrl" >&5

           no_cache=0
           # Check whether --enable-treectrl or --disable-treectrl was given.
 if test "${enable_treectrl+set}" = set; then
           no_cache=0
           # Check whether --enable-treectrl or --disable-treectrl was given.
 if test "${enable_treectrl+set}" = set; then


@@ -5553,100 +6514,373 @@ else
 fi
 
 
 fi
 
 

-          eval "$ac_cv_use_treectrl"
+          eval "$ac_cv_use_treectrl"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_treectrl >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_TREECTRL" = 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:6531: checking for --enable-popupwin" >&5
+          no_cache=0
+          # Check whether --enable-popupwin or --disable-popupwin was given.
+if test "${enable_popupwin+set}" = set; then
+  enableval="$enable_popupwin"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_popupwin='wxUSE_POPUPWIN=yes'
+                          else
+                            ac_cv_use_popupwin='wxUSE_POPUPWIN=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_POPUPWIN" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_popupwin='wxUSE_POPUPWIN='$DEFAULT_wxUSE_POPUPWIN
+                        
+fi
+
+
+          eval "$ac_cv_use_popupwin"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_popupwin >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_POPUPWIN" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+
+
+          echo $ac_n "checking for --enable-commondlg""... $ac_c" 1>&6
+echo "configure:6572: checking for --enable-commondlg" >&5
+          no_cache=0
+          # Check whether --enable-commondlg or --disable-commondlg was given.
+if test "${enable_commondlg+set}" = set; then
+  enableval="$enable_commondlg"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_commondlg='wxUSE_COMMONDLGS=yes'
+                          else
+                            ac_cv_use_commondlg='wxUSE_COMMONDLGS=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_COMMONDLGS" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_commondlg='wxUSE_COMMONDLGS='$DEFAULT_wxUSE_COMMONDLGS
+                        
+fi
+
+
+          eval "$ac_cv_use_commondlg"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_commondlg >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_COMMONDLGS" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-choicedlg""... $ac_c" 1>&6
+echo "configure:6611: checking for --enable-choicedlg" >&5
+          no_cache=0
+          # Check whether --enable-choicedlg or --disable-choicedlg was given.
+if test "${enable_choicedlg+set}" = set; then
+  enableval="$enable_choicedlg"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_choicedlg='wxUSE_CHOICEDLG=yes'
+                          else
+                            ac_cv_use_choicedlg='wxUSE_CHOICEDLG=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_CHOICEDLG" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_choicedlg='wxUSE_CHOICEDLG='$DEFAULT_wxUSE_CHOICEDLG
+                        
+fi
+
+
+          eval "$ac_cv_use_choicedlg"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_choicedlg >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_CHOICEDLG" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-coldlg""... $ac_c" 1>&6
+echo "configure:6650: checking for --enable-coldlg" >&5
+          no_cache=0
+          # Check whether --enable-coldlg or --disable-coldlg was given.
+if test "${enable_coldlg+set}" = set; then
+  enableval="$enable_coldlg"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_coldlg='wxUSE_COLOURDLG=yes'
+                          else
+                            ac_cv_use_coldlg='wxUSE_COLOURDLG=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_COLOURDLG" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_coldlg='wxUSE_COLOURDLG='$DEFAULT_wxUSE_COLOURDLG
+                        
+fi
+
+
+          eval "$ac_cv_use_coldlg"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_coldlg >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_COLOURDLG" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-filedlg""... $ac_c" 1>&6
+echo "configure:6689: checking for --enable-filedlg" >&5
+          no_cache=0
+          # Check whether --enable-filedlg or --disable-filedlg was given.
+if test "${enable_filedlg+set}" = set; then
+  enableval="$enable_filedlg"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_filedlg='wxUSE_FILEDLG=yes'
+                          else
+                            ac_cv_use_filedlg='wxUSE_FILEDLG=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_FILEDLG" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_filedlg='wxUSE_FILEDLG='$DEFAULT_wxUSE_FILEDLG
+                        
+fi
+
+
+          eval "$ac_cv_use_filedlg"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_filedlg >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_FILEDLG" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-fontdlg""... $ac_c" 1>&6
+echo "configure:6728: checking for --enable-fontdlg" >&5
+          no_cache=0
+          # Check whether --enable-fontdlg or --disable-fontdlg was given.
+if test "${enable_fontdlg+set}" = set; then
+  enableval="$enable_fontdlg"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_fontdlg='wxUSE_FONTDLG=yes'
+                          else
+                            ac_cv_use_fontdlg='wxUSE_FONTDLG=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_FONTDLG" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_fontdlg='wxUSE_FONTDLG='$DEFAULT_wxUSE_FONTDLG
+                        
+fi
+
+
+          eval "$ac_cv_use_fontdlg"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_fontdlg >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_FONTDLG" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-dirdlg""... $ac_c" 1>&6
+echo "configure:6767: checking for --enable-dirdlg" >&5
+          no_cache=0
+          # Check whether --enable-dirdlg or --disable-dirdlg was given.
+if test "${enable_dirdlg+set}" = set; then
+  enableval="$enable_dirdlg"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_dirdlg='wxUSE_DIRDLG=yes'
+                          else
+                            ac_cv_use_dirdlg='wxUSE_DIRDLG=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_DIRDLG" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_dirdlg='wxUSE_DIRDLG='$DEFAULT_wxUSE_DIRDLG
+                        
+fi
+
+
+          eval "$ac_cv_use_dirdlg"

           if test "$no_cache" != 1; then
           if test "$no_cache" != 1; then

-            echo $ac_cv_use_treectrl >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_dirdlg >> ${wx_arg_cache_file}.tmp

           fi
 
           fi
 

-          if test "$wxUSE_TREECTRL" = yes; then
+          if test "$wxUSE_DIRDLG" = yes; then

             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 

-
-
-          echo $ac_n "checking "for --enable-commondlg"""... $ac_c" 1>&6
-echo "configure:5572: checking "for --enable-commondlg"" >&5
+          echo $ac_n "checking for --enable-msgdlg""... $ac_c" 1>&6
+echo "configure:6806: checking for --enable-msgdlg" >&5

           no_cache=0
           no_cache=0

-          # Check whether --enable-commondlg or --disable-commondlg was given.
-if test "${enable_commondlg+set}" = set; then
-  enableval="$enable_commondlg"
+          # Check whether --enable-msgdlg or --disable-msgdlg was given.
+if test "${enable_msgdlg+set}" = set; then
+  enableval="$enable_msgdlg"

   
                           if test "$enableval" = yes; then
   
                           if test "$enableval" = yes; then

-                            ac_cv_use_commondlg='wxUSE_COMMONDLGS=yes'
+                            ac_cv_use_msgdlg='wxUSE_MSGDLG=yes'

                           else
                           else

-                            ac_cv_use_commondlg='wxUSE_COMMONDLGS=no'
+                            ac_cv_use_msgdlg='wxUSE_MSGDLG=no'

                           fi
                         
 else
   
                           fi
                         
 else
   

-                          LINE=`grep "wxUSE_COMMONDLGS" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_MSGDLG" ${wx_arg_cache_file}`

                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 

-                          ac_cv_use_commondlg='wxUSE_COMMONDLGS='$DEFAULT_wxUSE_COMMONDLGS
+                          ac_cv_use_msgdlg='wxUSE_MSGDLG='$DEFAULT_wxUSE_MSGDLG

                         
 fi
 
 
                         
 fi
 
 

-          eval "$ac_cv_use_commondlg"
+          eval "$ac_cv_use_msgdlg"

           if test "$no_cache" != 1; then
           if test "$no_cache" != 1; then

-            echo $ac_cv_use_commondlg >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_msgdlg >> ${wx_arg_cache_file}.tmp

           fi
 
           fi
 

-          if test "$wxUSE_COMMONDLGS" = yes; then
+          if test "$wxUSE_MSGDLG" = yes; then

             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 

-          echo $ac_n "checking "for --enable-dirdlg"""... $ac_c" 1>&6
-echo "configure:5611: checking "for --enable-dirdlg"" >&5
+          echo $ac_n "checking for --enable-numberdlg""... $ac_c" 1>&6
+echo "configure:6845: checking for --enable-numberdlg" >&5

           no_cache=0
           no_cache=0

-          # Check whether --enable-dirdlg or --disable-dirdlg was given.
-if test "${enable_dirdlg+set}" = set; then
-  enableval="$enable_dirdlg"
+          # Check whether --enable-numberdlg or --disable-numberdlg was given.
+if test "${enable_numberdlg+set}" = set; then
+  enableval="$enable_numberdlg"

   
                           if test "$enableval" = yes; then
   
                           if test "$enableval" = yes; then

-                            ac_cv_use_dirdlg='wxUSE_DIRDLG=yes'
+                            ac_cv_use_numberdlg='wxUSE_NUMBERDLG=yes'

                           else
                           else

-                            ac_cv_use_dirdlg='wxUSE_DIRDLG=no'
+                            ac_cv_use_numberdlg='wxUSE_NUMBERDLG=no'

                           fi
                         
 else
   
                           fi
                         
 else
   

-                          LINE=`grep "wxUSE_DIRDLG" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_NUMBERDLG" ${wx_arg_cache_file}`

                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 

-                          ac_cv_use_dirdlg='wxUSE_DIRDLG='$DEFAULT_wxUSE_DIRDLG
+                          ac_cv_use_numberdlg='wxUSE_NUMBERDLG='$DEFAULT_wxUSE_NUMBERDLG

                         
 fi
 
 
                         
 fi
 
 

-          eval "$ac_cv_use_dirdlg"
+          eval "$ac_cv_use_numberdlg"

           if test "$no_cache" != 1; then
           if test "$no_cache" != 1; then

-            echo $ac_cv_use_dirdlg >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_numberdlg >> ${wx_arg_cache_file}.tmp

           fi
 
           fi
 

-          if test "$wxUSE_DIRDLG" = yes; then
+          if test "$wxUSE_NUMBERDLG" = yes; then

             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 

-          echo $ac_n "checking "for --enable-textdlg"""... $ac_c" 1>&6
-echo "configure:5650: checking "for --enable-textdlg"" >&5
+          echo $ac_n "checking for --enable-textdlg""... $ac_c" 1>&6
+echo "configure:6884: checking for --enable-textdlg" >&5

           no_cache=0
           # Check whether --enable-textdlg or --disable-textdlg was given.
 if test "${enable_textdlg+set}" = set; then
           no_cache=0
           # Check whether --enable-textdlg or --disable-textdlg was given.
 if test "${enable_textdlg+set}" = set; then


@@ -5684,8 +6918,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-tipdlg"""... $ac_c" 1>&6
-echo "configure:5689: checking "for --enable-tipdlg"" >&5
+          echo $ac_n "checking for --enable-tipdlg""... $ac_c" 1>&6
+echo "configure:6923: checking for --enable-tipdlg" >&5

           no_cache=0
           # Check whether --enable-tipdlg or --disable-tipdlg was given.
 if test "${enable_tipdlg+set}" = set; then
           no_cache=0
           # Check whether --enable-tipdlg or --disable-tipdlg was given.
 if test "${enable_tipdlg+set}" = set; then


@@ -5723,8 +6957,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-progressdlg"""... $ac_c" 1>&6
-echo "configure:5728: checking "for --enable-progressdlg"" >&5
+          echo $ac_n "checking for --enable-progressdlg""... $ac_c" 1>&6
+echo "configure:6962: checking for --enable-progressdlg" >&5

           no_cache=0
           # Check whether --enable-progressdlg or --disable-progressdlg was given.
 if test "${enable_progressdlg+set}" = set; then
           no_cache=0
           # Check whether --enable-progressdlg or --disable-progressdlg was given.
 if test "${enable_progressdlg+set}" = set; then


@@ -5762,86 +6996,127 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-miniframe"""... $ac_c" 1>&6
-echo "configure:5767: checking "for --enable-miniframe"" >&5
+          echo $ac_n "checking for --enable-wizarddlg""... $ac_c" 1>&6
+echo "configure:7001: checking for --enable-wizarddlg" >&5

           no_cache=0
           no_cache=0

-          # Check whether --enable-miniframe or --disable-miniframe was given.
-if test "${enable_miniframe+set}" = set; then
-  enableval="$enable_miniframe"
+          # Check whether --enable-wizarddlg or --disable-wizarddlg was given.
+if test "${enable_wizarddlg+set}" = set; then
+  enableval="$enable_wizarddlg"

   
                           if test "$enableval" = yes; then
   
                           if test "$enableval" = yes; then

-                            ac_cv_use_miniframe='wxUSE_MINIFRAME=yes'
+                            ac_cv_use_wizarddlg='wxUSE_WIZARDDLG=yes'

                           else
                           else

-                            ac_cv_use_miniframe='wxUSE_MINIFRAME=no'
+                            ac_cv_use_wizarddlg='wxUSE_WIZARDDLG=no'

                           fi
                         
 else
   
                           fi
                         
 else
   

-                          LINE=`grep "wxUSE_MINIFRAME" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_WIZARDDLG" ${wx_arg_cache_file}`

                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 

-                          ac_cv_use_miniframe='wxUSE_MINIFRAME='$DEFAULT_wxUSE_MINIFRAME
+                          ac_cv_use_wizarddlg='wxUSE_WIZARDDLG='$DEFAULT_wxUSE_WIZARDDLG

                         
 fi
 
 
                         
 fi
 
 

-          eval "$ac_cv_use_miniframe"
+          eval "$ac_cv_use_wizarddlg"

           if test "$no_cache" != 1; then
           if test "$no_cache" != 1; then

-            echo $ac_cv_use_miniframe >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_wizarddlg >> ${wx_arg_cache_file}.tmp

           fi
 
           fi
 

-          if test "$wxUSE_MINIFRAME" = yes; then
+          if test "$wxUSE_WIZARDDLG" = yes; then

             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 

-          echo $ac_n "checking "for --enable-html"""... $ac_c" 1>&6
-echo "configure:5806: checking "for --enable-html"" >&5
+
+
+          echo $ac_n "checking for --enable-menus""... $ac_c" 1>&6
+echo "configure:7042: checking for --enable-menus" >&5

           no_cache=0
           no_cache=0

-          # Check whether --enable-html or --disable-html was given.
-if test "${enable_html+set}" = set; then
-  enableval="$enable_html"
+          # Check whether --enable-menus or --disable-menus was given.
+if test "${enable_menus+set}" = set; then
+  enableval="$enable_menus"

   
                           if test "$enableval" = yes; then
   
                           if test "$enableval" = yes; then

-                            ac_cv_use_html='wxUSE_HTML=yes'
+                            ac_cv_use_menus='wxUSE_MENUS=yes'

                           else
                           else

-                            ac_cv_use_html='wxUSE_HTML=no'
+                            ac_cv_use_menus='wxUSE_MENUS=no'

                           fi
                         
 else
   
                           fi
                         
 else
   

-                          LINE=`grep "wxUSE_HTML" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_MENUS" ${wx_arg_cache_file}`

                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 

-                          ac_cv_use_html='wxUSE_HTML='$DEFAULT_wxUSE_HTML
+                          ac_cv_use_menus='wxUSE_MENUS='$DEFAULT_wxUSE_MENUS

                         
 fi
 
 
                         
 fi
 
 

-          eval "$ac_cv_use_html"
+          eval "$ac_cv_use_menus"

           if test "$no_cache" != 1; then
           if test "$no_cache" != 1; then

-            echo $ac_cv_use_html >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_menus >> ${wx_arg_cache_file}.tmp

           fi
 
           fi
 

-          if test "$wxUSE_HTML" = yes; then
+          if test "$wxUSE_MENUS" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-miniframe""... $ac_c" 1>&6
+echo "configure:7081: checking for --enable-miniframe" >&5
+          no_cache=0
+          # Check whether --enable-miniframe or --disable-miniframe was given.
+if test "${enable_miniframe+set}" = set; then
+  enableval="$enable_miniframe"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_miniframe='wxUSE_MINIFRAME=yes'
+                          else
+                            ac_cv_use_miniframe='wxUSE_MINIFRAME=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_MINIFRAME" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_miniframe='wxUSE_MINIFRAME='$DEFAULT_wxUSE_MINIFRAME
+                        
+fi
+
+
+          eval "$ac_cv_use_miniframe"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_miniframe >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_MINIFRAME" = yes; then

             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 

-          echo $ac_n "checking "for --enable-tooltips"""... $ac_c" 1>&6
-echo "configure:5845: checking "for --enable-tooltips"" >&5
+          echo $ac_n "checking for --enable-tooltips""... $ac_c" 1>&6
+echo "configure:7120: checking for --enable-tooltips" >&5

           no_cache=0
           # Check whether --enable-tooltips or --disable-tooltips was given.
 if test "${enable_tooltips+set}" = set; then
           no_cache=0
           # Check whether --enable-tooltips or --disable-tooltips was given.
 if test "${enable_tooltips+set}" = set; then


@@ -5879,8 +7154,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-splines"""... $ac_c" 1>&6
-echo "configure:5884: checking "for --enable-splines"" >&5
+          echo $ac_n "checking for --enable-splines""... $ac_c" 1>&6
+echo "configure:7159: checking for --enable-splines" >&5

           no_cache=0
           # Check whether --enable-splines or --disable-splines was given.
 if test "${enable_splines+set}" = set; then
           no_cache=0
           # Check whether --enable-splines or --disable-splines was given.
 if test "${enable_splines+set}" = set; then


@@ -5918,8 +7193,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-validators"""... $ac_c" 1>&6
-echo "configure:5923: checking "for --enable-validators"" >&5
+          echo $ac_n "checking for --enable-validators""... $ac_c" 1>&6
+echo "configure:7198: checking for --enable-validators" >&5

           no_cache=0
           # Check whether --enable-validators or --disable-validators was given.
 if test "${enable_validators+set}" = set; then
           no_cache=0
           # Check whether --enable-validators or --disable-validators was given.
 if test "${enable_validators+set}" = set; then


@@ -5957,8 +7232,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-busyinfo"""... $ac_c" 1>&6
-echo "configure:5962: checking "for --enable-busyinfo"" >&5
+          echo $ac_n "checking for --enable-busyinfo""... $ac_c" 1>&6
+echo "configure:7237: checking for --enable-busyinfo" >&5

           no_cache=0
           # Check whether --enable-busyinfo or --disable-busyinfo was given.
 if test "${enable_busyinfo+set}" = set; then
           no_cache=0
           # Check whether --enable-busyinfo or --disable-busyinfo was given.
 if test "${enable_busyinfo+set}" = set; then


@@ -5996,8 +7271,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-joystick"""... $ac_c" 1>&6
-echo "configure:6001: checking "for --enable-joystick"" >&5
+          echo $ac_n "checking for --enable-joystick""... $ac_c" 1>&6
+echo "configure:7276: checking for --enable-joystick" >&5

           no_cache=0
           # Check whether --enable-joystick or --disable-joystick was given.
 if test "${enable_joystick+set}" = set; then
           no_cache=0
           # Check whether --enable-joystick or --disable-joystick was given.
 if test "${enable_joystick+set}" = set; then


@@ -6035,10 +7310,88 @@ fi
           fi
         
 
           fi
         
 

+          echo $ac_n "checking for --enable-metafile""... $ac_c" 1>&6
+echo "configure:7315: checking for --enable-metafile" >&5
+          no_cache=0
+          # Check whether --enable-metafile or --disable-metafile was given.
+if test "${enable_metafile+set}" = set; then
+  enableval="$enable_metafile"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_metafile='wxUSE_METAFILE=yes'
+                          else
+                            ac_cv_use_metafile='wxUSE_METAFILE=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_METAFILE" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_metafile='wxUSE_METAFILE='$DEFAULT_wxUSE_METAFILE
+                        
+fi
+
+
+          eval "$ac_cv_use_metafile"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_metafile >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_METAFILE" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-dragimage""... $ac_c" 1>&6
+echo "configure:7354: checking for --enable-dragimage" >&5
+          no_cache=0
+          # Check whether --enable-dragimage or --disable-dragimage was given.
+if test "${enable_dragimage+set}" = set; then
+  enableval="$enable_dragimage"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_dragimage='wxUSE_DRAGIMAGE=yes'
+                          else
+                            ac_cv_use_dragimage='wxUSE_DRAGIMAGE=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_DRAGIMAGE" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_dragimage='wxUSE_DRAGIMAGE='$DEFAULT_wxUSE_DRAGIMAGE
+                        
+fi
+
+
+          eval "$ac_cv_use_dragimage"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_dragimage >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_DRAGIMAGE" = 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:6042: checking "for --enable-image"" >&5
+          echo $ac_n "checking for --enable-image""... $ac_c" 1>&6
+echo "configure:7395: checking for --enable-image" >&5

           no_cache=0
           # Check whether --enable-image or --disable-image was given.
 if test "${enable_image+set}" = set; then
           no_cache=0
           # Check whether --enable-image or --disable-image was given.
 if test "${enable_image+set}" = set; then


@@ -6076,8 +7429,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-gif"""... $ac_c" 1>&6
-echo "configure:6081: checking "for --enable-gif"" >&5
+          echo $ac_n "checking for --enable-gif""... $ac_c" 1>&6
+echo "configure:7434: checking for --enable-gif" >&5

           no_cache=0
           # Check whether --enable-gif or --disable-gif was given.
 if test "${enable_gif+set}" = set; then
           no_cache=0
           # Check whether --enable-gif or --disable-gif was given.
 if test "${enable_gif+set}" = set; then


@@ -6115,8 +7468,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-pcx"""... $ac_c" 1>&6
-echo "configure:6120: checking "for --enable-pcx"" >&5
+          echo $ac_n "checking for --enable-pcx""... $ac_c" 1>&6
+echo "configure:7473: checking for --enable-pcx" >&5

           no_cache=0
           # Check whether --enable-pcx or --disable-pcx was given.
 if test "${enable_pcx+set}" = set; then
           no_cache=0
           # Check whether --enable-pcx or --disable-pcx was given.
 if test "${enable_pcx+set}" = set; then


@@ -6154,8 +7507,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-pnm"""... $ac_c" 1>&6
-echo "configure:6159: checking "for --enable-pnm"" >&5
+          echo $ac_n "checking for --enable-pnm""... $ac_c" 1>&6
+echo "configure:7512: checking for --enable-pnm" >&5

           no_cache=0
           # Check whether --enable-pnm or --disable-pnm was given.
 if test "${enable_pnm+set}" = set; then
           no_cache=0
           # Check whether --enable-pnm or --disable-pnm was given.
 if test "${enable_pnm+set}" = set; then


@@ -6193,8 +7546,8 @@ fi
           fi
         
 
           fi
         
 

-          echo $ac_n "checking "for --enable-pnm"""... $ac_c" 1>&6
-echo "configure:6198: checking "for --enable-pnm"" >&5
+          echo $ac_n "checking for --enable-pnm""... $ac_c" 1>&6
+echo "configure:7551: checking for --enable-pnm" >&5

           no_cache=0
           # Check whether --enable-pnm or --disable-pnm was given.
 if test "${enable_pnm+set}" = set; then
           no_cache=0
           # Check whether --enable-pnm or --disable-pnm was given.
 if test "${enable_pnm+set}" = set; then


@@ -6241,7 +7594,7 @@ fi
 
 
 echo $ac_n "checking for toolkit""... $ac_c" 1>&6
 
 
 echo $ac_n "checking for toolkit""... $ac_c" 1>&6

-echo "configure:6245: checking for toolkit" >&5
+echo "configure:7598: checking for toolkit" >&5

 
 if test "$wxUSE_GUI" = "yes"; then
 
 
 if test "$wxUSE_GUI" = "yes"; then
 


@@ -6266,7 +7619,7 @@ else
   done
 fi
 
   done
 fi
 

-NUM_TOOLKITS=`expr ${wxUSE_GTK:-0} + ${wxUSE_MOTIF:-0} + ${wxUSE_MAC:-0} + ${wxUSE_WINE:-0} + ${wxUSE_MINGW:-0} + ${wxUSE_CYGWIN:-0}`
+NUM_TOOLKITS=`expr ${wxUSE_GTK:-0} + ${wxUSE_MOTIF:-0} + ${wxUSE_MAC:-0} + ${wxUSE_WINE:-0} + ${wxUSE_MINGW:-0} + ${wxUSE_CYGWIN:-0} + ${wxUSE_MGL:-0}`

 
 case "${host}" in
   *-pc-os2_emx )
 
 case "${host}" in
   *-pc-os2_emx )


@@ -6300,7 +7653,8 @@ for toolkit in `echo $ALL_TOOLKITS`; do
       echo "$var=$value" >> ${wx_arg_cache_file}
     fi
     if test "$value" = 1; then
       echo "$var=$value" >> ${wx_arg_cache_file}
     fi
     if test "$value" = 1; then

-      echo "$ac_t""`echo $toolkit | tr A-Z a-z`" 1>&6
+      toolkit_echo=`echo $toolkit | tr [A-Z] [a-z]`
+      echo "$ac_t""$toolkit_echo" 1>&6

     fi
   fi
 done
     fi
   fi
 done


@@ -6374,7 +7728,7 @@ 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
 # 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:6378: checking for $ac_word" >&5
+echo "configure:7732: 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
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -6404,7 +7758,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
   # 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:6408: checking for $ac_word" >&5
+echo "configure:7762: 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
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -6455,7 +7809,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
       # 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:6459: checking for $ac_word" >&5
+echo "configure:7813: 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
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -6487,7 +7841,7 @@ fi
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6

-echo "configure:6491: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:7845: 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.
 
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.


@@ -6498,12 +7852,12 @@ cross_compiling=$ac_cv_prog_cc_cross
 
 cat > conftest.$ac_ext << EOF
 
 
 cat > conftest.$ac_ext << EOF
 

-#line 6502 "configure"
+#line 7856 "configure"

 #include "confdefs.h"
 
 main(){return(0);}
 EOF
 #include "confdefs.h"
 
 main(){return(0);}
 EOF

-if { (eval echo configure:6507: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7861: \"$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
   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


@@ -6529,12 +7883,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: 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:6533: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:7887: 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 "$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:6538: checking whether we are using GNU C" >&5
+echo "configure:7892: 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
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -6543,7 +7897,7 @@ else
   yes;
 #endif
 EOF
   yes;
 #endif
 EOF

-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:6547: \"$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:7901: \"$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
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no


@@ -6562,7 +7916,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6

-echo "configure:6566: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:7920: 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
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -6597,7 +7951,7 @@ fi
 CFLAGS=`echo "$CFLAGS" | sed 's/-g//g'`
 
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
 CFLAGS=`echo "$CFLAGS" | sed 's/-g//g'`
 
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6

-echo "configure:6601: checking how to run the C preprocessor" >&5
+echo "configure:7955: checking how to run the C preprocessor" >&5

 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=


@@ -6612,13 +7966,13 @@ else
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF

-#line 6616 "configure"
+#line 7970 "configure"

 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:6622: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7976: \"$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
   :
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :


@@ -6629,13 +7983,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF

-#line 6633 "configure"
+#line 7987 "configure"

 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:6639: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7993: \"$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
   :
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :


@@ -6646,13 +8000,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -nologo -E"
   cat > conftest.$ac_ext <<EOF
   rm -rf conftest*
   CPP="${CC-cc} -nologo -E"
   cat > conftest.$ac_ext <<EOF

-#line 6650 "configure"
+#line 8004 "configure"

 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:6656: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8010: \"$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
   :
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :


@@ -6679,13 +8033,13 @@ 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
 
 if test $ac_cv_prog_gcc = yes; then
     echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6

-echo "configure:6683: checking whether ${CC-cc} needs -traditional" >&5
+echo "configure:8037: 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
 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 6689 "configure"
+#line 8043 "configure"

 #include "confdefs.h"
 #include <sgtty.h>
 Autoconf TIOCGETP
 #include "confdefs.h"
 #include <sgtty.h>
 Autoconf TIOCGETP


@@ -6703,7 +8057,7 @@ rm -f conftest*
 
   if test $ac_cv_prog_gcc_traditional = no; then
     cat > conftest.$ac_ext <<EOF
 
   if test $ac_cv_prog_gcc_traditional = no; then
     cat > conftest.$ac_ext <<EOF

-#line 6707 "configure"
+#line 8061 "configure"

 #include "confdefs.h"
 #include <termio.h>
 Autoconf TCGETA
 #include "confdefs.h"
 #include <termio.h>
 Autoconf TCGETA


@@ -6739,7 +8093,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
 # 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:6743: checking for $ac_word" >&5
+echo "configure:8097: 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
 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -6771,7 +8125,7 @@ test -n "$CXX" || CXX="gcc"
 
 
 echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
 
 
 echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6

-echo "configure:6775: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
+echo "configure:8129: 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.
 
 ac_ext=C
 # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.


@@ -6782,12 +8136,12 @@ cross_compiling=$ac_cv_prog_cxx_cross
 
 cat > conftest.$ac_ext << EOF
 
 
 cat > conftest.$ac_ext << EOF
 

-#line 6786 "configure"
+#line 8140 "configure"

 #include "confdefs.h"
 
 int main(){return(0);}
 EOF
 #include "confdefs.h"
 
 int main(){return(0);}
 EOF

-if { (eval echo configure:6791: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8145: \"$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
   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


@@ -6813,12 +8167,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: 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:6817: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:8171: 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 "$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:6822: checking whether we are using GNU C++" >&5
+echo "configure:8176: 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
 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -6827,7 +8181,7 @@ else
   yes;
 #endif
 EOF
   yes;
 #endif
 EOF

-if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:6831: \"$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:8185: \"$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
   ac_cv_prog_gxx=yes
 else
   ac_cv_prog_gxx=no


@@ -6846,7 +8200,7 @@ ac_test_CXXFLAGS="${CXXFLAGS+set}"
 ac_save_CXXFLAGS="$CXXFLAGS"
 CXXFLAGS=
 echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
 ac_save_CXXFLAGS="$CXXFLAGS"
 CXXFLAGS=
 echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6

-echo "configure:6850: checking whether ${CXX-g++} accepts -g" >&5
+echo "configure:8204: 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
 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -6879,7 +8233,7 @@ fi
 
 
 echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6
 
 
 echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6

-echo "configure:6883: checking how to run the C++ preprocessor" >&5
+echo "configure:8237: 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
 if test -z "$CXXCPP"; then
 if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6


@@ -6892,12 +8246,12 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes
 cross_compiling=$ac_cv_prog_cxx_cross
   CXXCPP="${CXX-g++} -E"
   cat > conftest.$ac_ext <<EOF
 cross_compiling=$ac_cv_prog_cxx_cross
   CXXCPP="${CXX-g++} -E"
   cat > conftest.$ac_ext <<EOF

-#line 6896 "configure"
+#line 8250 "configure"

 #include "confdefs.h"
 #include <stdlib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:6901: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8255: \"$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
   :
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :


@@ -6935,7 +8289,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
 # 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:6939: checking for $ac_word" >&5
+echo "configure:8293: 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
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -6966,7 +8320,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
 # 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:6970: checking for $ac_word" >&5
+echo "configure:8324: 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
 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -7006,7 +8360,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
 # 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:7010: checking for a BSD compatible install" >&5
+echo "configure:8364: 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
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6


@@ -7062,7 +8416,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 # 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
 # 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:7066: checking for $ac_word" >&5
+echo "configure:8420: 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
 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -7090,8 +8444,8 @@ else
 fi
 
 
 fi
 
 

-echo $ac_n "checking "make for VPATH support"""... $ac_c" 1>&6
-echo "configure:7095: checking "make for VPATH support"" >&5
+echo $ac_n "checking make for VPATH support""... $ac_c" 1>&6
+echo "configure:8449: checking make for VPATH support" >&5

 cat - << EOF > confMake
 check : file
        cp \$? \$@
 cat - << EOF > confMake
 check : file
        cp \$? \$@


@@ -7110,9 +8464,17 @@ if test "$RESULT" = 0; then
   echo "$ac_t""yes" 1>&6
 else
   echo "$ac_t""no" 1>&6
   echo "$ac_t""yes" 1>&6
 else
   echo "$ac_t""no" 1>&6

-  { echo "configure: error: You need a make-utility that is able to use the variable
+  { echo "configure: error: 
+You need a make-utility that is able to use the variable

 VPATH correctly.
 VPATH correctly.

-If your version of make does not support VPATH correctly" 1>&2; exit 1; }
+If your version of make does not support VPATH correctly,
+please install GNU-make (possibly as gmake), and start
+configure with the following command:
+export MAKE=gmake; ./configure  for sh-type shells
+setenv MAKE gmake; ./configure  for csh-type shells
+Also please do remember to use gmake in this case every time
+you are trying to compile.
+" 1>&2; exit 1; }

 fi
 
 for ac_prog in 'bison -y' byacc
 fi
 
 for ac_prog in 'bison -y' byacc


@@ -7120,7 +8482,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
 # 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:7124: checking for $ac_word" >&5
+echo "configure:8486: 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
 if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -7154,7 +8516,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
 # 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:7158: checking for $ac_word" >&5
+echo "configure:8520: 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
 if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -7188,7 +8550,7 @@ then
   *) ac_lib=l ;;
   esac
   echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6
   *) ac_lib=l ;;
   esac
   echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6

-echo "configure:7192: checking for yywrap in -l$ac_lib" >&5
+echo "configure:8554: 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
 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


@@ -7196,7 +8558,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-l$ac_lib  $LIBS"
 cat > conftest.$ac_ext <<EOF
   ac_save_LIBS="$LIBS"
 LIBS="-l$ac_lib  $LIBS"
 cat > conftest.$ac_ext <<EOF

-#line 7200 "configure"
+#line 8562 "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
 #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


@@ -7207,7 +8569,7 @@ int main() {
 yywrap()
 ; return 0; }
 EOF
 yywrap()
 ; return 0; }
 EOF

-if { (eval echo configure:7211: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8573: \"$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
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else


@@ -7231,7 +8593,7 @@ fi
 
 
 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
 
 
 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6

-echo "configure:7235: checking whether ln -s works" >&5
+echo "configure:8597: 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
 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -7375,73 +8737,97 @@ rm -f confcache
 AFMINSTALL=
 
 if test "$wxUSE_GUI" = "yes"; then
 AFMINSTALL=
 
 if test "$wxUSE_GUI" = "yes"; then

+    USE_GUI=1

 
 

-USE_GUI=1
+    TOOLKIT=
+    TOOLKIT_INCLUDE=

 
 

-TOOLKIT=
-TOOLKIT_INCLUDE=
+    GUI_TK_LIBRARY=
+    GUI_TK_LINK=

 
 

-GUI_TK_LIBRARY=
-GUI_TK_LINK=
+    WXGTK12=
+    WXGTK127=
+    WXGTK20=

 
 

-WXGTK12=
-WXGTK127=
-WXGTK20=
+    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:8758: 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 8763 "configure"
+#include "confdefs.h"
+#include <windows.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:8768: \"$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

 
 

-WXWINE=
+                { echo "configure: error: please set CFLAGS to contain the location of windows.h" 1>&2; exit 1; }
+            
+fi

 
 

-if test "$wxUSE_CYGWIN" = 1 || test "$wxUSE_MINGW" = 1 ; then
-    if test "$cross_compiling" = "yes" ; then
-                echo "configure: warning: skipping windows.h check for cross-compilation" 1>&2
-    else
-        echo $ac_n "checking for Windows headers""... $ac_c" 1>&6
-echo "configure:7399: checking for Windows headers" >&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
+        INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS msw"
+                        LIBS="$LIBS -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lctl3d32 -ladvapi32 -lwsock32"

 
 

-        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; }
+                if test "$wxUSE_ODBC" = "yes" ; then
+            LIBS="$LIBS -lodbc32 -lole32 -loleaut32"

         fi
         fi

-    fi

 
 

-    INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS msw"
-            LIBS="$LIBS -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lctl3d32 -lcrtdll -ladvapi32 -lwsock32"
-
-        if test "$wxUSE_ODBC" = "yes" ; then
-        LIBS="$LIBS -lodbc32 -lole32 -loleaut32"
-    fi
+                if test "$wxUSE_MINGW" = 1; then
+            LDFLAGS="$LDFLAGS -mwindows"
+        fi

 
 

-        if test "$wxUSE_MINGW" = 1; then
-        LDFLAGS="$LDFLAGS -mwindows"
-    fi
+        TOOLKIT=MSW
+        GUIDIST=MSW_DIST

 
 

-    TOOLKIT=MSW
-    GUIDIST=MSW_DIST
+                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__"

 
 

-        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

 
 

-        RESPROGRAM="\$(RES_PROGRAM)"
+    if test "$wxUSE_GTK" = 1; then
+        echo $ac_n "checking for GTK+ version""... $ac_c" 1>&6
+echo "configure:8819: checking for GTK+ version" >&5

 
 

-fi
+        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

 
 

-if test "$wxUSE_GTK" = 1; then
-            # Check whether --with-gtk-prefix or --without-gtk-prefix was given.
+                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"
 if test "${with_gtk_prefix+set}" = set; then
   withval="$with_gtk_prefix"
   gtk_config_prefix="$withval"


@@ -7466,10 +8852,10 @@ else
 fi
 
 
 fi
 
 

-  for module in . gthread
+  for module in . 

   do
       case "$module" in
   do
       case "$module" in

-         gthread) 
+         gthread)

              gtk_config_args="$gtk_config_args gthread"
          ;;
       esac
              gtk_config_args="$gtk_config_args gthread"
          ;;
       esac


@@ -7491,7 +8877,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
   # 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:7495: checking for $ac_word" >&5
+echo "configure:8881: 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
 if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG_2_0'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -7526,7 +8912,7 @@ fi
 
   min_gtk_version=1.3.1
   echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6
 
   min_gtk_version=1.3.1
   echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6

-echo "configure:7530: checking for GTK - version >= $min_gtk_version" >&5
+echo "configure:8916: checking for GTK - version >= $min_gtk_version" >&5

   no_gtk=""
   if test "$GTK_CONFIG_2_0" = "no" ; then
     no_gtk=yes
   no_gtk=""
   if test "$GTK_CONFIG_2_0" = "no" ; then
     no_gtk=yes


@@ -7549,14 +8935,14 @@ echo "configure:7530: checking for GTK - version >= $min_gtk_version" >&5
   echo $ac_n "cross compiling; assumed OK... $ac_c"
 else
   cat > conftest.$ac_ext <<EOF
   echo $ac_n "cross compiling; assumed OK... $ac_c"
 else
   cat > conftest.$ac_ext <<EOF

-#line 7553 "configure"
+#line 8939 "configure"

 #include "confdefs.h"
 
 #include <gtk/gtk.h>
 #include <stdio.h>
 #include <stdlib.h>
 
 #include "confdefs.h"
 
 #include <gtk/gtk.h>
 #include <stdio.h>
 #include <stdlib.h>
 

-int 
+int

 main ()
 {
   int major, minor, micro;
 main ()
 {
   int major, minor, micro;


@@ -7575,7 +8961,7 @@ main ()
       (gtk_minor_version != $gtk_config_minor_version) ||
       (gtk_micro_version != $gtk_config_micro_version))
     {
       (gtk_minor_version != $gtk_config_minor_version) ||
       (gtk_micro_version != $gtk_config_micro_version))
     {

-      printf("\n*** 'gtk-config-2.0 --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", 
+      printf("\n*** 'gtk-config-2.0 --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n",

              $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
              gtk_major_version, gtk_minor_version, gtk_micro_version);
       printf ("*** was found! If gtk-config-2.0 was correct, then it is best\n");
              $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
              gtk_major_version, gtk_minor_version, gtk_micro_version);
       printf ("*** was found! If gtk-config-2.0 was correct, then it is best\n");


@@ -7586,16 +8972,16 @@ main ()
       printf("*** If gtk-config-2.0 was wrong, set the environment variable GTK_CONFIG_2_0\n");
       printf("*** to point to the correct copy of gtk-config-2.0, and remove the file config.cache\n");
       printf("*** before re-running configure\n");
       printf("*** If gtk-config-2.0 was wrong, set the environment variable GTK_CONFIG_2_0\n");
       printf("*** to point to the correct copy of gtk-config-2.0, and remove the file config.cache\n");
       printf("*** before re-running configure\n");

-    } 
+    }

 #if defined (GTK_MAJOR_VERSION) && defined (GTK_MINOR_VERSION) && defined (GTK_MICRO_VERSION)
   else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
 #if defined (GTK_MAJOR_VERSION) && defined (GTK_MINOR_VERSION) && defined (GTK_MICRO_VERSION)
   else if ((gtk_major_version != GTK_MAJOR_VERSION) ||

-          (gtk_minor_version != GTK_MINOR_VERSION) ||
+           (gtk_minor_version != GTK_MINOR_VERSION) ||

            (gtk_micro_version != GTK_MICRO_VERSION))
     {
       printf("*** GTK+ header files (version %d.%d.%d) do not match\n",
            (gtk_micro_version != GTK_MICRO_VERSION))
     {
       printf("*** GTK+ header files (version %d.%d.%d) do not match\n",

-            GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
+             GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);

       printf("*** library (version %d.%d.%d)\n",
       printf("*** library (version %d.%d.%d)\n",

-            gtk_major_version, gtk_minor_version, gtk_micro_version);
+             gtk_major_version, gtk_minor_version, gtk_micro_version);

     }
 #endif /* defined (GTK_MAJOR_VERSION) ... */
   else
     }
 #endif /* defined (GTK_MAJOR_VERSION) ... */
   else


@@ -7611,7 +8997,7 @@ main ()
         printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n",
                gtk_major_version, gtk_minor_version, gtk_micro_version);
         printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n",
         printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n",
                gtk_major_version, gtk_minor_version, gtk_micro_version);
         printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n",

-              major, minor, micro);
+               major, minor, micro);

         printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");
         printf("***\n");
         printf("*** If you have already installed a sufficiently new version, this error\n");
         printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");
         printf("***\n");
         printf("*** If you have already installed a sufficiently new version, this error\n");


@@ -7627,7 +9013,7 @@ main ()
 }
 
 EOF
 }
 
 EOF

-if { (eval echo configure:7631: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:9017: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null

 then
   :
 else
 then
   :
 else


@@ -7645,7 +9031,7 @@ fi
   fi
   if test "x$no_gtk" = x ; then
      echo "$ac_t""yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)" 1>&6
   fi
   if test "x$no_gtk" = x ; then
      echo "$ac_t""yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)" 1>&6

-     WXGTK20=1     
+     wx_cv_lib_gtk=2.0

   else
      echo "$ac_t""no" 1>&6
      if test "$GTK_CONFIG_2_0" = "no" ; then
   else
      echo "$ac_t""no" 1>&6
      if test "$GTK_CONFIG_2_0" = "no" ; then


@@ -7661,7 +9047,7 @@ fi
           CFLAGS="$CFLAGS $GTK_CFLAGS"
           LIBS="$LIBS $GTK_LIBS"
           cat > conftest.$ac_ext <<EOF
           CFLAGS="$CFLAGS $GTK_CFLAGS"
           LIBS="$LIBS $GTK_LIBS"
           cat > conftest.$ac_ext <<EOF

-#line 7665 "configure"
+#line 9051 "configure"

 #include "confdefs.h"
 
 #include <gtk/gtk.h>
 #include "confdefs.h"
 
 #include <gtk/gtk.h>


@@ -7671,7 +9057,7 @@ int main() {
  return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); 
 ; return 0; }
 EOF
  return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); 
 ; return 0; }
 EOF

-if { (eval echo configure:7675: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9061: \"$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"
   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"


@@ -7679,7 +9065,7 @@ if { (eval echo configure:7675: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && t
           echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
           echo "*** to the installed location  Also, make sure you have run ldconfig if that"
           echo "*** is required on your system"
           echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
           echo "*** to the installed location  Also, make sure you have run ldconfig if that"
           echo "*** is required on your system"

-         echo "***"
+          echo "***"

           echo "*** If you have an old version installed, it is best to remove it, although"
           echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
           echo "***"
           echo "*** If you have an old version installed, it is best to remove it, although"
           echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
           echo "***"


@@ -7703,8 +9089,16 @@ rm -f conftest*
      fi
      GTK_CFLAGS=""
      GTK_LIBS=""
      fi
      GTK_CFLAGS=""
      GTK_LIBS=""

-     
-      
+     gthread
+  fi
+  
+  
+  rm -f conf.gtktest
+
+                fi
+
+                if test -z "$wx_cv_lib_gtk"; then
+                    

   if test x$gtk_config_exec_prefix != x ; then
      gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix"
      if test x${GTK_CONFIG+set} != xset ; then
   if test x$gtk_config_exec_prefix != x ; then
      gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix"
      if test x${GTK_CONFIG+set} != xset ; then


@@ -7721,7 +9115,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
   # 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:7725: checking for $ac_word" >&5
+echo "configure:9119: 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
 if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -7756,7 +9150,7 @@ fi
 
   min_gtk_version=1.2.7
   echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6
 
   min_gtk_version=1.2.7
   echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6

-echo "configure:7760: checking for GTK - version >= $min_gtk_version" >&5
+echo "configure:9154: checking for GTK - version >= $min_gtk_version" >&5

   no_gtk=""
   if test "$GTK_CONFIG" != "no" ; then
     GTK_CFLAGS=`$GTK_CONFIG --cflags`
   no_gtk=""
   if test "$GTK_CONFIG" != "no" ; then
     GTK_CFLAGS=`$GTK_CONFIG --cflags`


@@ -7769,7 +9163,7 @@ echo "configure:7760: checking for GTK - version >= $min_gtk_version" >&5
   echo $ac_n "cross compiling; assumed OK... $ac_c"
 else
   cat > conftest.$ac_ext <<EOF
   echo $ac_n "cross compiling; assumed OK... $ac_c"
 else
   cat > conftest.$ac_ext <<EOF

-#line 7773 "configure"
+#line 9167 "configure"

 #include "confdefs.h"
 
 #include <gtk/gtk.h>
 #include "confdefs.h"
 
 #include <gtk/gtk.h>


@@ -7802,7 +9196,7 @@ main ()
 }
 
 EOF
 }
 
 EOF

-if { (eval echo configure:7806: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:9200: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null

 then
   :
 else
 then
   :
 else


@@ -7821,7 +9215,7 @@ fi
   fi
   if test "x$no_gtk" = x ; then
      echo "$ac_t""yes" 1>&6
   fi
   if test "x$no_gtk" = x ; then
      echo "$ac_t""yes" 1>&6

-     WXGTK127=1
+     wx_cv_lib_gtk=1.2.7

   else
      echo "$ac_t""no" 1>&6
      GTK_CFLAGS=""
   else
      echo "$ac_t""no" 1>&6
      GTK_CFLAGS=""


@@ -7831,7 +9225,10 @@ fi
   
   
 
   
   
 

-      
+                fi
+
+                if test -z "$wx_cv_lib_gtk"; then
+                    

   if test x$gtk_config_exec_prefix != x ; then
      gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix"
      if test x${GTK_CONFIG+set} != xset ; then
   if test x$gtk_config_exec_prefix != x ; then
      gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix"
      if test x${GTK_CONFIG+set} != xset ; then


@@ -7848,7 +9245,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
   # 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:7852: checking for $ac_word" >&5
+echo "configure:9249: 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
 if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -7883,7 +9280,7 @@ fi
 
   min_gtk_version=1.2.3
   echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6
 
   min_gtk_version=1.2.3
   echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6

-echo "configure:7887: checking for GTK - version >= $min_gtk_version" >&5
+echo "configure:9284: checking for GTK - version >= $min_gtk_version" >&5

   no_gtk=""
   if test "$GTK_CONFIG" != "no" ; then
     GTK_CFLAGS=`$GTK_CONFIG --cflags`
   no_gtk=""
   if test "$GTK_CONFIG" != "no" ; then
     GTK_CFLAGS=`$GTK_CONFIG --cflags`


@@ -7896,7 +9293,7 @@ echo "configure:7887: checking for GTK - version >= $min_gtk_version" >&5
   echo $ac_n "cross compiling; assumed OK... $ac_c"
 else
   cat > conftest.$ac_ext <<EOF
   echo $ac_n "cross compiling; assumed OK... $ac_c"
 else
   cat > conftest.$ac_ext <<EOF

-#line 7900 "configure"
+#line 9297 "configure"

 #include "confdefs.h"
 
 #include <gtk/gtk.h>
 #include "confdefs.h"
 
 #include <gtk/gtk.h>


@@ -7929,7 +9326,7 @@ main ()
 }
 
 EOF
 }
 
 EOF

-if { (eval echo configure:7933: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:9330: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null

 then
   :
 else
 then
   :
 else


@@ -7948,7 +9345,7 @@ fi
   fi
   if test "x$no_gtk" = x ; then
      echo "$ac_t""yes" 1>&6
   fi
   if test "x$no_gtk" = x ; then
      echo "$ac_t""yes" 1>&6

-     WXGTK12=1
+     wx_cv_lib_gtk=1.2.3

   else
      echo "$ac_t""no" 1>&6
      GTK_CFLAGS=""
   else
      echo "$ac_t""no" 1>&6
      GTK_CFLAGS=""


@@ -7958,34 +9355,49 @@ fi
   
   
 
   
   
 

-    
-  fi
-  
-  
-  rm -f conf.gtktest
-
+                fi

 
 

-    if test "$WXGTK12" != 1 -a "$WXGTK20" != 1; then
-        { echo "configure: error: 
-            Please check that gtk-config is in path, the directory
-            where GTK+ libraries are installed (returned by
-            'gtk-config --libs' command) is in LD_LIBRARY_PATH or
-            equivalent variable and GTK+ is version 1.2.3 or above.
-        " 1>&2; exit 1; }
-    fi
+                if test -z "$wx_cv_lib_gtk"; then
+                                        wx_cv_lib_gtk=none
+                else
+                                                            wx_cv_cflags_gtk=$GTK_CFLAGS
+                    wx_cv_libs_gtk=$GTK_LIBS
+                fi
+            
+        
+fi

 
 

-    TOOLKIT_INCLUDE="$GTK_CFLAGS"

 
 

+                        if test "$gtk_version_cached" = 1; then
+            echo "$ac_t""$wx_cv_lib_gtk" 1>&6
+        fi

 
 

-    GUI_TK_LIBRARY="$GTK_LIBS"
+        case "$wx_cv_lib_gtk" in
+            2.0)    WXGTK20=1
+                    ;;
+            1.2.7)  WXGTK127=1
+                    WXGTK12=1
+                    ;;
+            1.2.3)  WXGTK12=1
+                    ;;
+            *)      { echo "configure: error: 
+Please check that gtk-config is in path, the directory
+where GTK+ libraries are installed (returned by
+'gtk-config --libs' command) is in LD_LIBRARY_PATH or
+equivalent variable and GTK+ is version 1.2.3 or above.
+                            " 1>&2; exit 1; }
+                    ;;
+        esac

 
 

+        TOOLKIT_INCLUDE="$wx_cv_cflags_gtk"
+        GUI_TK_LIBRARY="$wx_cv_libs_gtk"

 
 

-    AFMINSTALL=afminstall
-    TOOLKIT=GTK
-    GUIDIST=GTK_DIST
+        AFMINSTALL=afminstall
+        TOOLKIT=GTK
+        GUIDIST=GTK_DIST

 
 

-        echo $ac_n "checking for gdk_im_open in -lgdk""... $ac_c" 1>&6
-echo "configure:7989: checking for gdk_im_open in -lgdk" >&5
+                echo $ac_n "checking for gdk_im_open in -lgdk""... $ac_c" 1>&6
+echo "configure:9401: 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
 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


@@ -7993,7 +9405,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lgdk  $LIBS"
 cat > conftest.$ac_ext <<EOF
   ac_save_LIBS="$LIBS"
 LIBS="-lgdk  $LIBS"
 cat > conftest.$ac_ext <<EOF

-#line 7997 "configure"
+#line 9409 "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
 #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


@@ -8004,7 +9416,7 @@ int main() {
 gdk_im_open()
 ; return 0; }
 EOF
 gdk_im_open()
 ; return 0; }
 EOF

-if { (eval echo configure:8008: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9420: \"$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
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else


@@ -8027,12 +9439,47 @@ else
   echo "$ac_t""no" 1>&6
 fi
 
   echo "$ac_t""no" 1>&6
 fi
 

-fi
+    fi

 
 

-if test "$wxUSE_WINE" = 1; then
-    echo $ac_n "checking for WINE includes""... $ac_c" 1>&6
-echo "configure:8035: checking for WINE includes" >&5
-    
+    if test "$wxUSE_MGL" = 1; then
+        
+        echo $ac_n "checking for SciTech MGL library""... $ac_c" 1>&6
+echo "configure:9448: 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; }
+        else
+            echo "$ac_t""$MGL_ROOT" 1>&6
+        fi
+
+        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
+            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
+            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"
+
+        AFMINSTALL=afminstall
+        TOOLKIT=MGL
+        GUIDIST=MGL_DIST
+    fi
+
+    if test "$wxUSE_WINE" = 1; then
+        echo $ac_n "checking for WINE includes""... $ac_c" 1>&6
+echo "configure:9482: checking for WINE includes" >&5
+        

 ac_find_includes=
 for ac_dir in $SEARCH_INCLUDE;
   do
 ac_find_includes=
 for ac_dir in $SEARCH_INCLUDE;
   do


@@ -8042,22 +9489,22 @@ for ac_dir in $SEARCH_INCLUDE;
     fi
   done
 
     fi
   done
 

-    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
+        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

 
 

-    XPM_LINK=""
-    echo $ac_n "checking for Xpm library""... $ac_c" 1>&6
-echo "configure:8056: checking for Xpm library" >&5
-    
+        XPM_LINK=""
+        echo $ac_n "checking for Xpm library""... $ac_c" 1>&6
+echo "configure:9503: checking for Xpm library" >&5
+        

 ac_find_libraries=
 for ac_dir in $SEARCH_LIB;
   do
 ac_find_libraries=
 for ac_dir in $SEARCH_LIB;
   do

-    for ac_extension in a so sl; do
+    for ac_extension in a so sl dylib; do

       if test -f "$ac_dir/libXpm.$ac_extension"; then
         ac_find_libraries=$ac_dir
         break 2
       if test -f "$ac_dir/libXpm.$ac_extension"; then
         ac_find_libraries=$ac_dir
         break 2


@@ -8065,27 +9512,27 @@ for ac_dir in $SEARCH_LIB;
     done
   done
 
     done
   done
 

-    if test "$ac_find_libraries" != "" ; then
-        GUI_TK_LIBRARY="-L$ac_find_libraries"
-        XPM_LINK="-lXpm"
-        cat >> confdefs.h <<\EOF
+        if test "$ac_find_libraries" != "" ; then
+            GUI_TK_LIBRARY="-L$ac_find_libraries"
+            XPM_LINK="-lXpm"
+            cat >> confdefs.h <<\EOF

 #define wxHAVE_LIB_XPM 1
 EOF
 
 #define wxHAVE_LIB_XPM 1
 EOF
 

-        echo "$ac_t""found at $ac_find_libraries" 1>&6
-    else
-        echo "$ac_t""no" 1>&6
-        echo "configure: warning: library will be compiled without support for images in XPM format" 1>&2
-    fi
+            echo "$ac_t""found at $ac_find_libraries" 1>&6
+        else
+            echo "$ac_t""no" 1>&6
+            echo "configure: warning: library will be compiled without support for images in XPM format" 1>&2
+        fi

 
 

-    MESA_LINK=""
-    echo $ac_n "checking for Mesa library""... $ac_c" 1>&6
-echo "configure:8084: checking for Mesa library" >&5
-    
+        MESA_LINK=""
+        echo $ac_n "checking for Mesa library""... $ac_c" 1>&6
+echo "configure:9531: checking for Mesa library" >&5
+        

 ac_find_libraries=
 for ac_dir in $SEARCH_LIB;
   do
 ac_find_libraries=
 for ac_dir in $SEARCH_LIB;
   do

-    for ac_extension in a so sl; 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
       if test -f "$ac_dir/libMesaGL.$ac_extension"; then
         ac_find_libraries=$ac_dir
         break 2


@@ -8093,28 +9540,28 @@ for ac_dir in $SEARCH_LIB;
     done
   done
 
     done
   done
 

-    if test "$ac_find_libraries" != "" ; then
-        GUI_TK_LIBRARY="$GUI_TK_LIBRARY -L$ac_find_libraries"
-        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
-    TOOLKIT=MSW
-    GUIDIST=MSW_DIST
-fi
+        if test "$ac_find_libraries" != "" ; then
+            GUI_TK_LIBRARY="$GUI_TK_LIBRARY -L$ac_find_libraries"
+            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
+        TOOLKIT=MSW
+        GUIDIST=MSW_DIST
+    fi

 
 

-# If we find X, set shell vars x_includes and x_libraries to the
+                
+    # 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
 # 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:8118: checking for X" >&5
+echo "configure:9565: checking for X" >&5

 
 # Check whether --with-x or --without-x was given.
 if test "${with_x+set}" = set; then
 
 # Check whether --with-x or --without-x was given.
 if test "${with_x+set}" = set; then


@@ -8176,12 +9623,12 @@ if test "$ac_x_includes" = NO; then
 
   # First, try using that file with no special directory specified.
 cat > conftest.$ac_ext <<EOF
 
   # First, try using that file with no special directory specified.
 cat > conftest.$ac_ext <<EOF

-#line 8180 "configure"
+#line 9627 "configure"

 #include "confdefs.h"
 #include <$x_direct_test_include>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 #include "confdefs.h"
 #include <$x_direct_test_include>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:8185: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9632: \"$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_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*


@@ -8250,14 +9697,14 @@ if test "$ac_x_libraries" = NO; then
   ac_save_LIBS="$LIBS"
   LIBS="-l$x_direct_test_library $LIBS"
 cat > conftest.$ac_ext <<EOF
   ac_save_LIBS="$LIBS"
   LIBS="-l$x_direct_test_library $LIBS"
 cat > conftest.$ac_ext <<EOF

-#line 8254 "configure"
+#line 9701 "configure"

 #include "confdefs.h"
 
 int main() {
 ${x_direct_test_function}()
 ; return 0; }
 EOF
 #include "confdefs.h"
 
 int main() {
 ${x_direct_test_function}()
 ; return 0; }
 EOF

-if { (eval echo configure:8261: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9708: \"$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.
   rm -rf conftest*
   LIBS="$ac_save_LIBS"
 # We can link X programs with no special library path.


@@ -8363,17 +9810,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
     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:8367: checking whether -R must be followed by a space" >&5
+echo "configure:9814: checking whether -R must be followed by a space" >&5

       ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries"
       cat > conftest.$ac_ext <<EOF
       ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries"
       cat > conftest.$ac_ext <<EOF

-#line 8370 "configure"
+#line 9817 "configure"

 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF

-if { (eval echo configure:8377: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9824: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

   rm -rf conftest*
   ac_R_nospace=yes
 else
   rm -rf conftest*
   ac_R_nospace=yes
 else


@@ -8389,14 +9836,14 @@ rm -f conftest*
       else
        LIBS="$ac_xsave_LIBS -R $x_libraries"
        cat > conftest.$ac_ext <<EOF
       else
        LIBS="$ac_xsave_LIBS -R $x_libraries"
        cat > conftest.$ac_ext <<EOF

-#line 8393 "configure"
+#line 9840 "configure"

 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF

-if { (eval echo configure:8400: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9847: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

   rm -rf conftest*
   ac_R_space=yes
 else
   rm -rf conftest*
   ac_R_space=yes
 else


@@ -8428,7 +9875,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
     # 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:8432: checking for dnet_ntoa in -ldnet" >&5
+echo "configure:9879: 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
 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


@@ -8436,7 +9883,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ldnet  $LIBS"
 cat > conftest.$ac_ext <<EOF
   ac_save_LIBS="$LIBS"
 LIBS="-ldnet  $LIBS"
 cat > conftest.$ac_ext <<EOF

-#line 8440 "configure"
+#line 9887 "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
 #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


@@ -8447,7 +9894,7 @@ int main() {
 dnet_ntoa()
 ; return 0; }
 EOF
 dnet_ntoa()
 ; return 0; }
 EOF

-if { (eval echo configure:8451: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9898: \"$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
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else


@@ -8469,7 +9916,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
 
     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:8473: checking for dnet_ntoa in -ldnet_stub" >&5
+echo "configure:9920: 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
 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


@@ -8477,7 +9924,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ldnet_stub  $LIBS"
 cat > conftest.$ac_ext <<EOF
   ac_save_LIBS="$LIBS"
 LIBS="-ldnet_stub  $LIBS"
 cat > conftest.$ac_ext <<EOF

-#line 8481 "configure"
+#line 9928 "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
 #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


@@ -8488,7 +9935,7 @@ int main() {
 dnet_ntoa()
 ; return 0; }
 EOF
 dnet_ntoa()
 ; return 0; }
 EOF

-if { (eval echo configure:8492: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9939: \"$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
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else


@@ -8517,12 +9964,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
     # 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:8521: checking for gethostbyname" >&5
+echo "configure:9968: 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
 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 8526 "configure"
+#line 9973 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname(); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname(); below.  */


@@ -8545,7 +9992,7 @@ gethostbyname();
 
 ; return 0; }
 EOF
 
 ; return 0; }
 EOF

-if { (eval echo configure:8549: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9996: \"$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
   rm -rf conftest*
   eval "ac_cv_func_gethostbyname=yes"
 else


@@ -8566,7 +10013,7 @@ fi
 
     if test $ac_cv_func_gethostbyname = no; then
       echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
 
     if test $ac_cv_func_gethostbyname = no; then
       echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6

-echo "configure:8570: checking for gethostbyname in -lnsl" >&5
+echo "configure:10017: 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
 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


@@ -8574,7 +10021,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF

-#line 8578 "configure"
+#line 10025 "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
 #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


@@ -8585,7 +10032,7 @@ int main() {
 gethostbyname()
 ; return 0; }
 EOF
 gethostbyname()
 ; return 0; }
 EOF

-if { (eval echo configure:8589: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10036: \"$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
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else


@@ -8615,12 +10062,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
     # -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:8619: checking for connect" >&5
+echo "configure:10066: 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
 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 8624 "configure"
+#line 10071 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char connect(); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char connect(); below.  */


@@ -8643,7 +10090,7 @@ connect();
 
 ; return 0; }
 EOF
 
 ; return 0; }
 EOF

-if { (eval echo configure:8647: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10094: \"$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
   rm -rf conftest*
   eval "ac_cv_func_connect=yes"
 else


@@ -8664,7 +10111,7 @@ fi
 
     if test $ac_cv_func_connect = no; then
       echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
 
     if test $ac_cv_func_connect = no; then
       echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6

-echo "configure:8668: checking for connect in -lsocket" >&5
+echo "configure:10115: 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
 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


@@ -8672,7 +10119,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF

-#line 8676 "configure"
+#line 10123 "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
 #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


@@ -8683,7 +10130,7 @@ int main() {
 connect()
 ; return 0; }
 EOF
 connect()
 ; return 0; }
 EOF

-if { (eval echo configure:8687: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10134: \"$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
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else


@@ -8707,12 +10154,12 @@ fi
 
     # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX.
     echo $ac_n "checking for remove""... $ac_c" 1>&6
 
     # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX.
     echo $ac_n "checking for remove""... $ac_c" 1>&6

-echo "configure:8711: checking for remove" >&5
+echo "configure:10158: 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
 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 8716 "configure"
+#line 10163 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char remove(); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char remove(); below.  */


@@ -8735,7 +10182,7 @@ remove();
 
 ; return 0; }
 EOF
 
 ; return 0; }
 EOF

-if { (eval echo configure:8739: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10186: \"$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
   rm -rf conftest*
   eval "ac_cv_func_remove=yes"
 else


@@ -8756,7 +10203,7 @@ fi
 
     if test $ac_cv_func_remove = no; then
       echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
 
     if test $ac_cv_func_remove = no; then
       echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6

-echo "configure:8760: checking for remove in -lposix" >&5
+echo "configure:10207: 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
 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


@@ -8764,7 +10211,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lposix  $LIBS"
 cat > conftest.$ac_ext <<EOF
   ac_save_LIBS="$LIBS"
 LIBS="-lposix  $LIBS"
 cat > conftest.$ac_ext <<EOF

-#line 8768 "configure"
+#line 10215 "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
 #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


@@ -8775,7 +10222,7 @@ int main() {
 remove()
 ; return 0; }
 EOF
 remove()
 ; return 0; }
 EOF

-if { (eval echo configure:8779: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10226: \"$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
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else


@@ -8799,12 +10246,12 @@ fi
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
     echo $ac_n "checking for shmat""... $ac_c" 1>&6
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
     echo $ac_n "checking for shmat""... $ac_c" 1>&6

-echo "configure:8803: checking for shmat" >&5
+echo "configure:10250: 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
 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 8808 "configure"
+#line 10255 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char shmat(); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char shmat(); below.  */


@@ -8827,7 +10274,7 @@ shmat();
 
 ; return 0; }
 EOF
 
 ; return 0; }
 EOF

-if { (eval echo configure:8831: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10278: \"$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
   rm -rf conftest*
   eval "ac_cv_func_shmat=yes"
 else


@@ -8848,7 +10295,7 @@ fi
 
     if test $ac_cv_func_shmat = no; then
       echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
 
     if test $ac_cv_func_shmat = no; then
       echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6

-echo "configure:8852: checking for shmat in -lipc" >&5
+echo "configure:10299: 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
 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


@@ -8856,7 +10303,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lipc  $LIBS"
 cat > conftest.$ac_ext <<EOF
   ac_save_LIBS="$LIBS"
 LIBS="-lipc  $LIBS"
 cat > conftest.$ac_ext <<EOF

-#line 8860 "configure"
+#line 10307 "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
 #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


@@ -8867,7 +10314,7 @@ int main() {
 shmat()
 ; return 0; }
 EOF
 shmat()
 ; return 0; }
 EOF

-if { (eval echo configure:8871: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10318: \"$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
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else


@@ -8900,7 +10347,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
   # 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:8904: checking for IceConnectionNumber in -lICE" >&5
+echo "configure:10351: 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
 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


@@ -8908,7 +10355,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
   ac_save_LIBS="$LIBS"
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF

-#line 8912 "configure"
+#line 10359 "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
 #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


@@ -8919,7 +10366,7 @@ int main() {
 IceConnectionNumber()
 ; return 0; }
 EOF
 IceConnectionNumber()
 ; return 0; }
 EOF

-if { (eval echo configure:8923: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10370: \"$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
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else


@@ -8943,25 +10390,25 @@ fi
 
 fi
 
 
 fi
 

-CPPFLAGS="$CPPFLAGS $X_CFLAGS"
-LDFLAGS="$LDFLAGS $X_LIBS"
+    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
+    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"
+        GUI_TK_LIBRARY="$X_LIBS"
+        TOOLKIT_INCLUDE="$X_CFLAGS"

 
 

-    AFMINSTALL=afminstall
+        AFMINSTALL=afminstall

 
 

-                                                                                                
-    COMPILED_X_PROGRAM=0
+                                                                                                                                                                                                
+        COMPILED_X_PROGRAM=0

 
 

-    echo $ac_n "checking for Motif/Lesstif headers""... $ac_c" 1>&6
-echo "configure:8964: checking for Motif/Lesstif headers" >&5
-    
+        echo $ac_n "checking for Motif/Lesstif headers""... $ac_c" 1>&6
+echo "configure:10411: checking for Motif/Lesstif headers" >&5
+        

 ac_find_includes=
 for ac_dir in $SEARCH_INCLUDE;
   do
 ac_find_includes=
 for ac_dir in $SEARCH_INCLUDE;
   do


@@ -8971,50 +10418,50 @@ for ac_dir in $SEARCH_INCLUDE;
     fi
   done
 
     fi
   done
 

-    if test "$ac_find_includes" != "" ; then
-        echo "$ac_t""found $ac_find_includes" 1>&6
-    else
-        cat > conftest.$ac_ext <<EOF
-#line 8979 "configure"
+        if test "$ac_find_includes" != "" ; then
+            echo "$ac_t""found $ac_find_includes" 1>&6
+        else
+            cat > conftest.$ac_ext <<EOF
+#line 10426 "configure"

 #include "confdefs.h"
 
 #include "confdefs.h"
 

-                #include <Xm/Xm.h>
-            
+                    #include <Xm/Xm.h>
+                

 int main() {
 
 int main() {
 

-                int version;
+                    int version;

 
 

-                version = xmUseVersion;
-            
+                    version = xmUseVersion;
+                

 ; return 0; }
 EOF
 ; return 0; }
 EOF

-if { (eval echo configure:8992: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10439: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

   rm -rf conftest*
   
   rm -rf conftest*
   

-                echo "$ac_t""found in default search path" 1>&6
-                COMPILED_X_PROGRAM=1
-            
+                    echo "$ac_t""found in default search path" 1>&6
+                    COMPILED_X_PROGRAM=1
+                

 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
   
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
   

-                echo "$ac_t""no" 1>&6
-                { echo "configure: error: please set CFLAGS to contain the location of Xm/Xm.h" 1>&2; exit 1; }
+                    echo "$ac_t""no" 1>&6
+                    { echo "configure: error: please set CFLAGS to contain the location of Xm/Xm.h" 1>&2; exit 1; }
+                

             
             

-        

 fi
 rm -f conftest*
 fi
 rm -f conftest*

-    fi
+        fi

 
 

-    if test "$COMPILED_X_PROGRAM" = 0; then
-        echo $ac_n "checking for Motif/Lesstif library""... $ac_c" 1>&6
-echo "configure:9013: checking for Motif/Lesstif library" >&5
-        
+        if test "$COMPILED_X_PROGRAM" = 0; then
+            echo $ac_n "checking for Motif/Lesstif library""... $ac_c" 1>&6
+echo "configure:10460: checking for Motif/Lesstif library" >&5
+            

 ac_find_libraries=
 for ac_dir in $SEARCH_LIB;
   do
 ac_find_libraries=
 for ac_dir in $SEARCH_LIB;
   do

-    for ac_extension in a so sl; do
+    for ac_extension in a so sl dylib; do

       if test -f "$ac_dir/libXm.$ac_extension"; then
         ac_find_libraries=$ac_dir
         break 2
       if test -f "$ac_dir/libXm.$ac_extension"; then
         ac_find_libraries=$ac_dir
         break 2


@@ -9022,8 +10469,8 @@ for ac_dir in $SEARCH_LIB;
     done
   done
 
     done
   done
 

-        if test "$ac_find_libraries" != "" ; then
-            
+            if test "$ac_find_libraries" != "" ; then
+                

   ac_path_to_include=$ac_find_includes
   echo "$TOOLKIT_INCLUDE" | grep "\-I$ac_find_includes" > /dev/null
   result=$?
   ac_path_to_include=$ac_find_includes
   echo "$TOOLKIT_INCLUDE" | grep "\-I$ac_find_includes" > /dev/null
   result=$?


@@ -9033,7 +10480,7 @@ for ac_dir in $SEARCH_LIB;
     ac_path_to_include="-I$ac_find_includes"
   fi
 
     ac_path_to_include="-I$ac_find_includes"
   fi
 

-            
+                

   echo "$GUI_TK_LIBRARY" | grep "\-L$ac_find_libraries" > /dev/null
   result=$?
   if test $result = 0; then
   echo "$GUI_TK_LIBRARY" | grep "\-L$ac_find_libraries" > /dev/null
   result=$?
   if test $result = 0; then


@@ -9043,53 +10490,53 @@ for ac_dir in $SEARCH_LIB;
   fi
 
 
   fi
 
 

-            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 9052 "configure"
+                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 10499 "configure"

 #include "confdefs.h"
 
 #include "confdefs.h"
 

-                    #include <Xm/Xm.h>
-                
+                        #include <Xm/Xm.h>
+                    

 int main() {
 
 int main() {
 

-                    int version;
+                        int version;

 
 

-                    version = xmUseVersion;
-                
+                        version = xmUseVersion;
+                    

 ; return 0; }
 EOF
 ; return 0; }
 EOF

-if { (eval echo configure:9065: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10512: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

   rm -rf conftest*
   
   rm -rf conftest*
   

-                    echo "$ac_t""found in default search path" 1>&6
-                    COMPILED_X_PROGRAM=1
-                
+                        echo "$ac_t""found in default search path" 1>&6
+                        COMPILED_X_PROGRAM=1
+                    

 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
   
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
   

-                    echo "$ac_t""no" 1>&6
-                    { echo "configure: error: please set LDFLAGS to contain the location of libXm" 1>&2; exit 1; }
+                        echo "$ac_t""no" 1>&6
+                        { echo "configure: error: please set LDFLAGS to contain the location of libXm" 1>&2; exit 1; }
+                    

                 
                 

-            

 fi
 rm -f conftest*
 fi
 rm -f conftest*

+            fi

         fi
         fi

-    fi

 
 

-                                                                                                                            
-    XPM_LINK=""
-    echo $ac_n "checking for Xpm library""... $ac_c" 1>&6
-echo "configure:9088: checking for Xpm library" >&5
-    
+                                                                                                                                                                                                                                                        
+        XPM_LINK=""
+        echo $ac_n "checking for Xpm library""... $ac_c" 1>&6
+echo "configure:10535: checking for Xpm library" >&5
+        

 ac_find_libraries=
 for ac_dir in $SEARCH_LIB;
   do
 ac_find_libraries=
 for ac_dir in $SEARCH_LIB;
   do

-    for ac_extension in a so sl; do
+    for ac_extension in a so sl dylib; do

       if test -f "$ac_dir/libXpm.$ac_extension"; then
         ac_find_libraries=$ac_dir
         break 2
       if test -f "$ac_dir/libXpm.$ac_extension"; then
         ac_find_libraries=$ac_dir
         break 2


@@ -9097,8 +10544,8 @@ for ac_dir in $SEARCH_LIB;
     done
   done
 
     done
   done
 

-    if test "$ac_find_libraries" != "" ; then
-        
+        if test "$ac_find_libraries" != "" ; then
+            

   echo "$GUI_TK_LIBRARY" | grep "\-L$ac_find_libraries" > /dev/null
   result=$?
   if test $result = 0; then
   echo "$GUI_TK_LIBRARY" | grep "\-L$ac_find_libraries" > /dev/null
   result=$?
   if test $result = 0; then


@@ -9107,88 +10554,126 @@ for ac_dir in $SEARCH_LIB;
     ac_path_to_link="-L$ac_find_libraries"
   fi
 
     ac_path_to_link="-L$ac_find_libraries"
   fi
 

-        GUI_TK_LIBRARY="$GUI_TK_LIBRARY $ac_path_to_link"
-        XPM_LINK="-lXpm "
-        cat >> confdefs.h <<\EOF
+            GUI_TK_LIBRARY="$GUI_TK_LIBRARY $ac_path_to_link"
+            XPM_LINK="-lXpm "
+            cat >> confdefs.h <<\EOF

 #define wxHAVE_LIB_XPM 1
 EOF
 
 #define wxHAVE_LIB_XPM 1
 EOF
 

-        echo "$ac_t""found at $ac_find_libraries" 1>&6
-    else
-        cat > conftest.$ac_ext <<EOF
-#line 9120 "configure"
+            echo "$ac_t""found at $ac_find_libraries" 1>&6
+        else
+            cat > conftest.$ac_ext <<EOF
+#line 10567 "configure"

 #include "confdefs.h"
 
 #include "confdefs.h"
 

-                #include <X11/xpm.h>
-            
+                    #include <X11/xpm.h>
+                

 int main() {
 
 int main() {
 

-                int version;
+                    int version;

 
 

-                version = XpmLibraryVersion();
-            
+                    version = XpmLibraryVersion();
+                

 ; return 0; }
 EOF
 ; return 0; }
 EOF

-if { (eval echo configure:9133: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10580: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

   rm -rf conftest*
   
   rm -rf conftest*
   

-            XPM_LINK="-lXpm "
-            cat >> confdefs.h <<\EOF
+                XPM_LINK="-lXpm "
+                cat >> confdefs.h <<\EOF

 #define wxHAVE_LIB_XPM 1
 EOF
 
 #define wxHAVE_LIB_XPM 1
 EOF
 

-                echo "$ac_t""found in default search path" 1>&6
-                COMPILED_X_PROGRAM=0
-            
+                    echo "$ac_t""found in default search path" 1>&6
+                    COMPILED_X_PROGRAM=0
+                

 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
   
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
   

-                echo "$ac_t""no" 1>&6
-                echo "configure: warning: library will be compiled without support for images in XPM format" 1>&2
+                    echo "$ac_t""no" 1>&6
+                    echo "configure: warning: library will be compiled without support for images in XPM format" 1>&2
+                

             
             

-        

 fi
 rm -f conftest*
 fi
 rm -f conftest*

+        fi
+
+        GUI_TK_LINK="-lXm $XPM_LINK -lXmu -lXext -lXt -lX11"
+        GUI_TK_LIBRARY="$GUI_TK_LIBRARY $GUI_TK_LINK"
+        TOOLKIT=MOTIF
+        GUIDIST=MOTIF_DIST

     fi
 
     fi
 

-    GUI_TK_LINK="-lXm $XPM_LINK -lXmu -lXext -lXt -lX11"
-    GUI_TK_LIBRARY="$GUI_TK_LIBRARY $GUI_TK_LINK"
-    TOOLKIT=MOTIF
-    GUIDIST=MOTIF_DIST
-fi
+    if test "$wxUSE_MAC" = 1; then
+        TOOLKIT=MAC
+                GUIDIST=MACX_DIST
+    fi

 
 

-if test "$wxUSE_MAC" = 1; then
-    TOOLKIT=MAC
-        GUIDIST=MACX_DIST
-fi
+    if test "$wxUSE_PM" = 1; then
+        TOOLKIT=PM
+        GUIDIST=GTK_DIST
+    fi

 
 

-if test "$wxUSE_PM" = 1; then
-    TOOLKIT=PM
-    GUIDIST=GTK_DIST
-fi
+        if test "$TOOLKIT" != "PM" ; then
+        TOOLKIT_DIR=`echo ${TOOLKIT} | tr "[A-Z]" "[a-z]"`
+    else
+        TOOLKIT_DIR="os2"
+    fi

 
 

-if test "$TOOLKIT" != "PM" ; then
-    TOOLKIT_DIR=`echo ${TOOLKIT} | tr "[A-Z]" "[a-z]"`
-else
-    TOOLKIT_DIR="os2"
-fi
+        TOOLKIT_NAME="${TOOLKIT_DIR}"

 
 

-        if test "$wxUSE_DEBUG_FLAG" = "yes"; then
-        TOOLKIT_NAME="${TOOLKIT_DIR}d"
+        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
     else

-        TOOLKIT_NAME="${TOOLKIT_DIR}"
+        SETUPH_DIR="${TOOLKIT_DIR}"
+    fi
+
+        if test "$wxUSE_DEBUG_FLAG" = "yes"; then
+        TOOLKIT_NAME="${TOOLKIT_NAME}d"

     fi
 
         TOOLKIT_DEF="-D__WX${TOOLKIT}__"
     fi
 
         TOOLKIT_DEF="-D__WX${TOOLKIT}__"

+    if test "$wxUSE_UNIVERSAL" = "yes"; then
+        TOOLKIT_DEF="${TOOLKIT_DEF} -D__WXUNIVERSAL__"
+    fi

 
         WX_LIBRARY="wx_${TOOLKIT_NAME}"
 
 
         WX_LIBRARY="wx_${TOOLKIT_NAME}"
 

-        ALL_OBJECTS="\$(GUIOBJS) \$(COMMONOBJS) \$(GENERICOBJS) \$(UNIXOBJS) \$(HTMLOBJS) \$(OGLOBJS)"
+        if test "$wxUSE_UNIVERSAL" = "yes"; then
+        ALL_OBJECTS="\$(GUI_LOWLEVEL_OBJS) \${UNIVOBJS}"
+    else
+        ALL_OBJECTS="\$(GUIOBJS)"
+    fi
+
+    ALL_OBJECTS="${ALL_OBJECTS} \$(COMMONOBJS) \$(GENERICOBJS)"
+
+    if test "$TOOLKIT" != "MSW"; then
+        ALL_OBJECTS="${ALL_OBJECTS} \$(UNIXOBJS)"
+    fi
+
+    if test "$wxUSE_HTML" = "yes"; then
+        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 "$TOOLKIT" != "MSW" -a "$wxUSE_ODBC" = "yes" ; then
-        ALL_OBJECTS="${ALL_OBJECTS} \$(IODBCOBJS)"
+            if test "x$REGEX_INCLUDE" != "x" ; then
+        ALL_OBJECTS="${ALL_OBJECTS} \$(REGEXOBJS)"

     fi
 
     if test "$wxUSE_LIBJPEG" = "yes" ; then
     fi
 
     if test "$wxUSE_LIBJPEG" = "yes" ; then


@@ -9206,9 +10691,27 @@ fi
     if test "$wxUSE_FREETYPE" = "yes" ; then
         ALL_OBJECTS="${ALL_OBJECTS} \$(FREETYPEOBJS)"
     fi
     if test "$wxUSE_FREETYPE" = "yes" ; then
         ALL_OBJECTS="${ALL_OBJECTS} \$(FREETYPEOBJS)"
     fi

-    ALL_DEPFILES="\$(GUIDEPS) \$(COMMONDEPS) \$(GENERICDEPS) \$(UNIXDEPS) \$(HTMLDEPS) \$(OGLDEPS)"

 
 

-    PORT_FILES="src/\$(TOOLKITDIR)/files.lst"
+        if test "$wxUSE_UNIVERSAL" = "yes"; then
+        ALL_DEPFILES="\$(GUI_LOWLEVEL_DEPS) \$(UNIVDEPS)"
+    else
+        ALL_DEPFILES="\$(GUIDEPS)"
+    fi
+
+    ALL_DEPFILES="${ALL_DEPFILES} \$(COMMONDEPS) \$(GENERICDEPS)"
+
+    if test "$TOOLKIT" != "MSW"; then
+        ALL_DEPFILES="${ALL_DEPFILES} \$(UNIXDEPS)"
+    fi
+
+    if test "$wxUSE_HTML" = "yes"; then
+        ALL_DEPFILES="${ALL_DEPFILES} \$(HTMLDEPS)"
+    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"
+    fi

     RPM_FILES="src/\$(TOOLKITDIR)/rpmfiles.lst"
     RPM_SPEC="wx\$(TOOLKIT).spec"
 
     RPM_FILES="src/\$(TOOLKITDIR)/rpmfiles.lst"
     RPM_SPEC="wx\$(TOOLKIT).spec"
 


@@ -9219,6 +10722,8 @@ else
 
         TOOLKIT_DIR="base"
 
 
         TOOLKIT_DIR="base"
 

+        TOOLKIT_VPATH="."
+

         if test "$wxUSE_DEBUG_FLAG" = "yes"; then
         TOOLKIT_NAME="${TOOLKIT_DIR}d"
     else
         if test "$wxUSE_DEBUG_FLAG" = "yes"; then
         TOOLKIT_NAME="${TOOLKIT_DIR}d"
     else


@@ -9230,13 +10735,17 @@ else
         ALL_OBJECTS="\$(BASE_OBJS) \$(BASE_UNIX_OBJS)"
     ALL_DEPFILES="\$(BASE_DEPS) \$(BASE_UNIX_DEPS)"
 
         ALL_OBJECTS="\$(BASE_OBJS) \$(BASE_UNIX_OBJS)"
     ALL_DEPFILES="\$(BASE_DEPS) \$(BASE_UNIX_DEPS)"
 

+            if test "x$REGEX_INCLUDE" != "x" ; then
+        ALL_OBJECTS="${ALL_OBJECTS} \$(REGEXOBJS)"
+    fi
+

     if test "$wxUSE_ZLIB" = "yes" ; then
         ALL_OBJECTS="${ALL_OBJECTS} \$(ZLIBOBJS)"
     fi
 
         WX_LIBRARY="wx_${TOOLKIT_NAME}"
 
     if test "$wxUSE_ZLIB" = "yes" ; then
         ALL_OBJECTS="${ALL_OBJECTS} \$(ZLIBOBJS)"
     fi
 
         WX_LIBRARY="wx_${TOOLKIT_NAME}"
 

-    PORT_FILES="src/files.lst"
+    PORT_FILES="\${top_srcdir}/src/files.lst"

     RPM_FILES="src/rpmfiles.lst"
     RPM_SPEC="wxBase.spec"
 
     RPM_FILES="src/rpmfiles.lst"
     RPM_SPEC="wxBase.spec"
 


@@ -9357,6 +10866,9 @@ if test "$wxUSE_SHARED" = "yes"; then
         fi
       ;;
       *-*-darwin* )
         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"
         PIC_FLAG="-dynamic -fPIC"
         if test "$wxUSE_OPENGL" = "yes"; then
         SHARED_LD="${CXX} -dynamiclib -o"
         PIC_FLAG="-dynamic -fPIC"
         if test "$wxUSE_OPENGL" = "yes"; then


@@ -9366,15 +10878,17 @@ if test "$wxUSE_SHARED" = "yes"; then
             WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
             WX_ALL="CREATE_LINKS"
         fi
             WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
             WX_ALL="CREATE_LINKS"
         fi

-               WX_ALL="${WX_ALL} ./lib/lib${WX_LIBRARY}-${WX_RELEASE}.r"
-               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"
+               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"
       ;;
       *-*-osf* )
         SHARED_LD="${CXX} -shared -o"


@@ -9460,17 +10974,17 @@ 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
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6

-echo "configure:9464: checking for $ac_hdr" >&5
+echo "configure:10978: 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
 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 9469 "configure"
+#line 10983 "configure"

 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:9474: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10988: \"$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_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*


@@ -9500,17 +11014,17 @@ 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
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6

-echo "configure:9504: checking for $ac_hdr" >&5
+echo "configure:11018: 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
 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 9509 "configure"
+#line 11023 "configure"

 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:9514: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11028: \"$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_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*


@@ -9540,17 +11054,17 @@ 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
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6

-echo "configure:9544: checking for $ac_hdr" >&5
+echo "configure:11058: 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
 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 9549 "configure"
+#line 11063 "configure"

 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:9554: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11068: \"$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_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*


@@ -9580,17 +11094,17 @@ 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
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6

-echo "configure:9584: checking for $ac_hdr" >&5
+echo "configure:11098: 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
 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 9589 "configure"
+#line 11103 "configure"

 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:9594: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11108: \"$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_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*


@@ -9620,17 +11134,17 @@ 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
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6

-echo "configure:9624: checking for $ac_hdr" >&5
+echo "configure:11138: 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
 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 9629 "configure"
+#line 11143 "configure"

 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:9634: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11148: \"$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_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*


@@ -9660,17 +11174,17 @@ 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
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6

-echo "configure:9664: checking for $ac_hdr" >&5
+echo "configure:11178: 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
 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 9669 "configure"
+#line 11183 "configure"

 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:9674: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11188: \"$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_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*


@@ -9700,17 +11214,17 @@ 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
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6

-echo "configure:9704: checking for $ac_hdr" >&5
+echo "configure:11218: 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
 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 9709 "configure"
+#line 11223 "configure"

 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:9714: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11228: \"$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_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*


@@ -9740,17 +11254,17 @@ 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
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6

-echo "configure:9744: checking for $ac_hdr" >&5
+echo "configure:11258: 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
 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 9749 "configure"
+#line 11263 "configure"

 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:9754: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11268: \"$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_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*


@@ -9783,17 +11297,17 @@ if test "$wxUSE_GUI" = "yes"; then
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6

-echo "configure:9787: checking for $ac_hdr" >&5
+echo "configure:11301: 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
 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 9792 "configure"
+#line 11306 "configure"

 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:9797: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11311: \"$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_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*


@@ -9822,14 +11336,57 @@ done
     fi
 fi
 
     fi
 fi
 

+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:11345: 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 11350 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:11355: \"$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 $ac_n "checking for ANSI C header files""... $ac_c" 1>&6

-echo "configure:9828: checking for ANSI C header files" >&5
+echo "configure:11385: 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
 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 9833 "configure"
+#line 11390 "configure"

 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>


@@ -9837,7 +11394,7 @@ else
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:9841: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11398: \"$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_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*


@@ -9854,7 +11411,7 @@ 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
 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 9858 "configure"
+#line 11415 "configure"

 #include "confdefs.h"
 #include <string.h>
 EOF
 #include "confdefs.h"
 #include <string.h>
 EOF


@@ -9872,7 +11429,7 @@ 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
 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 9876 "configure"
+#line 11433 "configure"

 #include "confdefs.h"
 #include <stdlib.h>
 EOF
 #include "confdefs.h"
 #include <stdlib.h>
 EOF


@@ -9893,7 +11450,7 @@ if test "$cross_compiling" = yes; then
   :
 else
   cat > conftest.$ac_ext <<EOF
   :
 else
   cat > conftest.$ac_ext <<EOF

-#line 9897 "configure"
+#line 11454 "configure"

 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')


@@ -9904,7 +11461,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
 exit (0); }
 
 EOF
 exit (0); }
 
 EOF

-if { (eval echo configure:9908: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:11465: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null

 then
   :
 else
 then
   :
 else


@@ -9928,12 +11485,12 @@ EOF
 fi
 
 echo $ac_n "checking for mode_t""... $ac_c" 1>&6
 fi
 
 echo $ac_n "checking for mode_t""... $ac_c" 1>&6

-echo "configure:9932: checking for mode_t" >&5
+echo "configure:11489: 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
 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 9937 "configure"
+#line 11494 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS


@@ -9961,12 +11518,12 @@ EOF
 fi
 
 echo $ac_n "checking for off_t""... $ac_c" 1>&6
 fi
 
 echo $ac_n "checking for off_t""... $ac_c" 1>&6

-echo "configure:9965: checking for off_t" >&5
+echo "configure:11522: 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
 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 9970 "configure"
+#line 11527 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS


@@ -9994,12 +11551,12 @@ EOF
 fi
 
 echo $ac_n "checking for pid_t""... $ac_c" 1>&6
 fi
 
 echo $ac_n "checking for pid_t""... $ac_c" 1>&6

-echo "configure:9998: checking for pid_t" >&5
+echo "configure:11555: 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
   cat > conftest.$ac_ext <<EOF
 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF

-#line 10003 "configure"
+#line 11560 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS


@@ -10027,12 +11584,12 @@ EOF
 fi
 
 echo $ac_n "checking for size_t""... $ac_c" 1>&6
 fi
 
 echo $ac_n "checking for size_t""... $ac_c" 1>&6

-echo "configure:10031: checking for size_t" >&5
+echo "configure:11588: 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
   cat > conftest.$ac_ext <<EOF
 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF

-#line 10036 "configure"
+#line 11593 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS


@@ -10060,12 +11617,12 @@ EOF
 fi
 
 echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
 fi
 
 echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6

-echo "configure:10064: checking for uid_t in sys/types.h" >&5
+echo "configure:11621: 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
   cat > conftest.$ac_ext <<EOF
 if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF

-#line 10069 "configure"
+#line 11626 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 EOF
 #include "confdefs.h"
 #include <sys/types.h>
 EOF


@@ -10094,76 +11651,177 @@ EOF
 fi
 
 
 fi
 
 

-echo $ac_n "checking for wchar_t""... $ac_c" 1>&6
-echo "configure:10099: checking for wchar_t" >&5
-if eval "test \"`echo '$''{'wx_cv_type_wchar_t'+set}'`\" = set"; then
+echo $ac_n "checking for wchar_t""... $ac_c" 1>&6
+echo "configure:11656: 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
+  
+    cat > conftest.$ac_ext <<EOF
+#line 11662 "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:11673: \"$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 11681 "configure"
+#include "confdefs.h"
+#include <stdlib.h>
+int main() {
+
+                wchar_t wc, *ws;
+                wc = L'a';
+                ws = L"Hello, world!";
+            
+; return 0; }
+EOF
+if { (eval echo configure:11692: \"$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*
+  wx_cv_type_wchar_t=no
+fi
+rm -f conftest*
+    
+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
+EOF
+
+fi
+
+
+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:11726: 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
   echo $ac_n "(cached) $ac_c" 1>&6
 else

-  
-    cat > conftest.$ac_ext <<EOF
-#line 10105 "configure"
+                          cat > conftest.$ac_ext <<EOF
+#line 11731 "configure"

 #include "confdefs.h"
 #include "confdefs.h"

-#include <wchar.h>
+#include <stddef.h>

 int main() {
 
 int main() {
 

-           wchar_t wc, *ws;
-           wc = L'a';
-           ws = L"Hello, world!";
+            return 0; }
+
+            struct Foo { void foo(size_t); void foo(unsigned int); };
+
+            int bar() {

         
 ; return 0; }
 EOF
         
 ; return 0; }
 EOF

-if { (eval echo configure:10116: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11744: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

   rm -rf conftest*
   rm -rf conftest*

-  wx_cv_type_wchar_t=yes
+  wx_cv_size_t_is_uint=no

 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*

+  wx_cv_size_t_is_uint=yes
+    
+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
+EOF
+
+else
+    echo $ac_n "checking if size_t is unsigned long""... $ac_c" 1>&6
+echo "configure:11767: 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
   cat > conftest.$ac_ext <<EOF

-#line 10124 "configure"
+#line 11772 "configure"

 #include "confdefs.h"
 #include "confdefs.h"

-#include <stdlib.h>
+#include <stddef.h>

 int main() {
 
 int main() {
 

-               wchar_t wc, *ws;
-               wc = L'a';
-               ws = L"Hello, world!";
+                return 0; }
+
+                struct Foo { void foo(size_t); void foo(unsigned long); };
+
+                int bar() {

             
 ; return 0; }
 EOF
             
 ; return 0; }
 EOF

-if { (eval echo configure:10135: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11785: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

   rm -rf conftest*
   rm -rf conftest*

-  wx_cv_type_wchar_t=yes
+  wx_cv_size_t_is_ulong=no

 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*

-  wx_cv_type_wchar_t=no
+  wx_cv_size_t_is_ulong=yes
+        

 fi
 rm -f conftest*
 fi
 rm -f conftest*

-       
+    

 fi
 fi

-rm -f conftest*

 
 

-fi
+echo "$ac_t""$wx_cv_size_t_is_ulong" 1>&6

 
 

-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 test "$wx_cv_size_t_is_ulong" = "yes"; then
+        cat >> confdefs.h <<\EOF
+#define wxSIZE_T_IS_ULONG 1

 EOF
 
 EOF
 

+    fi

 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 $ac_n "checking for pw_gecos in struct passwd""... $ac_c" 1>&6

-echo "configure:10161: checking for pw_gecos in struct passwd" >&5
+echo "configure:11819: 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
   
         cat > conftest.$ac_ext <<EOF
 if eval "test \"`echo '$''{'wx_cv_struct_pw_gecos'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
         cat > conftest.$ac_ext <<EOF

-#line 10167 "configure"
+#line 11825 "configure"

 #include "confdefs.h"
 #include <pwd.h>
 int main() {
 #include "confdefs.h"
 #include <pwd.h>
 int main() {


@@ -10174,7 +11832,7 @@ int main() {
              
 ; return 0; }
 EOF
              
 ; return 0; }
 EOF

-if { (eval echo configure:10178: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11836: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

   rm -rf conftest*
   
                 wx_cv_struct_pw_gecos=yes
   rm -rf conftest*
   
                 wx_cv_struct_pw_gecos=yes


@@ -10204,18 +11862,18 @@ fi
 
 
 echo $ac_n "checking for working const""... $ac_c" 1>&6
 
 
 echo $ac_n "checking for working const""... $ac_c" 1>&6

-echo "configure:10208: checking for working const" >&5
+echo "configure:11866: 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
 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 10213 "configure"
+#line 11871 "configure"

 #include "confdefs.h"
 
 int main() {
 
 /* Ultrix mips cc rejects this.  */
 #include "confdefs.h"
 
 int main() {
 
 /* Ultrix mips cc rejects this.  */

-typedef int charset[2]; const charset x = {0,0};
+typedef int charset[2]; const charset x;

 /* SunOS 4.1.1 cc rejects this.  */
 char const *const *ccp;
 char **p;
 /* SunOS 4.1.1 cc rejects this.  */
 char const *const *ccp;
 char **p;


@@ -10258,7 +11916,7 @@ ccp = (char const *const *) p;
 
 ; return 0; }
 EOF
 
 ; return 0; }
 EOF

-if { (eval echo configure:10262: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11920: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

   rm -rf conftest*
   ac_cv_c_const=yes
 else
   rm -rf conftest*
   ac_cv_c_const=yes
 else


@@ -10279,21 +11937,21 @@ EOF
 fi
 
 echo $ac_n "checking for inline""... $ac_c" 1>&6
 fi
 
 echo $ac_n "checking for inline""... $ac_c" 1>&6

-echo "configure:10283: checking for inline" >&5
+echo "configure:11941: 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_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat > conftest.$ac_ext <<EOF
 if eval "test \"`echo '$''{'ac_cv_c_inline'+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 10290 "configure"
+#line 11948 "configure"

 #include "confdefs.h"
 
 int main() {
 #include "confdefs.h"
 
 int main() {

-} int $ac_kw foo() {
+} $ac_kw foo() {

 ; return 0; }
 EOF
 ; return 0; }
 EOF

-if { (eval echo configure:10297: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11955: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

   rm -rf conftest*
   ac_cv_c_inline=$ac_kw; break
 else
   rm -rf conftest*
   ac_cv_c_inline=$ac_kw; break
 else


@@ -10320,7 +11978,7 @@ esac
 
 
 echo $ac_n "checking size of char""... $ac_c" 1>&6
 
 
 echo $ac_n "checking size of char""... $ac_c" 1>&6

-echo "configure:10324: checking size of char" >&5
+echo "configure:11982: 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 eval "test \"`echo '$''{'ac_cv_sizeof_char'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -10328,7 +11986,7 @@ else
   ac_cv_sizeof_char=1
 else
   cat > conftest.$ac_ext <<EOF
   ac_cv_sizeof_char=1
 else
   cat > conftest.$ac_ext <<EOF

-#line 10332 "configure"
+#line 11990 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 main()
 #include "confdefs.h"
 #include <stdio.h>
 main()


@@ -10339,7 +11997,7 @@ main()
   exit(0);
 }
 EOF
   exit(0);
 }
 EOF

-if { (eval echo configure:10343: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:12001: \"$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
 then
   ac_cv_sizeof_char=`cat conftestval`
 else


@@ -10359,7 +12017,7 @@ EOF
 
 
 echo $ac_n "checking size of short""... $ac_c" 1>&6
 
 
 echo $ac_n "checking size of short""... $ac_c" 1>&6

-echo "configure:10363: checking size of short" >&5
+echo "configure:12021: 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
 if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -10367,7 +12025,7 @@ else
   ac_cv_sizeof_short=2
 else
   cat > conftest.$ac_ext <<EOF
   ac_cv_sizeof_short=2
 else
   cat > conftest.$ac_ext <<EOF

-#line 10371 "configure"
+#line 12029 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 main()
 #include "confdefs.h"
 #include <stdio.h>
 main()


@@ -10378,7 +12036,7 @@ main()
   exit(0);
 }
 EOF
   exit(0);
 }
 EOF

-if { (eval echo configure:10382: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:12040: \"$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
 then
   ac_cv_sizeof_short=`cat conftestval`
 else


@@ -10398,7 +12056,7 @@ EOF
 
 
 echo $ac_n "checking size of int *""... $ac_c" 1>&6
 
 
 echo $ac_n "checking size of int *""... $ac_c" 1>&6

-echo "configure:10402: checking size of int *" >&5
+echo "configure:12060: 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
 if eval "test \"`echo '$''{'ac_cv_sizeof_int_p'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -10406,7 +12064,7 @@ else
   ac_cv_sizeof_int_p=4
 else
   cat > conftest.$ac_ext <<EOF
   ac_cv_sizeof_int_p=4
 else
   cat > conftest.$ac_ext <<EOF

-#line 10410 "configure"
+#line 12068 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 main()
 #include "confdefs.h"
 #include <stdio.h>
 main()


@@ -10417,7 +12075,7 @@ main()
   exit(0);
 }
 EOF
   exit(0);
 }
 EOF

-if { (eval echo configure:10421: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:12079: \"$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
 then
   ac_cv_sizeof_int_p=`cat conftestval`
 else


@@ -10437,7 +12095,7 @@ EOF
 
 
 echo $ac_n "checking size of int""... $ac_c" 1>&6
 
 
 echo $ac_n "checking size of int""... $ac_c" 1>&6

-echo "configure:10441: checking size of int" >&5
+echo "configure:12099: 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 eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -10445,7 +12103,7 @@ else
   ac_cv_sizeof_int=4
 else
   cat > conftest.$ac_ext <<EOF
   ac_cv_sizeof_int=4
 else
   cat > conftest.$ac_ext <<EOF

-#line 10449 "configure"
+#line 12107 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 main()
 #include "confdefs.h"
 #include <stdio.h>
 main()


@@ -10456,7 +12114,7 @@ main()
   exit(0);
 }
 EOF
   exit(0);
 }
 EOF

-if { (eval echo configure:10460: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:12118: \"$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
 then
   ac_cv_sizeof_int=`cat conftestval`
 else


@@ -10476,7 +12134,7 @@ EOF
 
 
 echo $ac_n "checking size of long""... $ac_c" 1>&6
 
 
 echo $ac_n "checking size of long""... $ac_c" 1>&6

-echo "configure:10480: checking size of long" >&5
+echo "configure:12138: 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 eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -10484,7 +12142,7 @@ else
   ac_cv_sizeof_long=4
 else
   cat > conftest.$ac_ext <<EOF
   ac_cv_sizeof_long=4
 else
   cat > conftest.$ac_ext <<EOF

-#line 10488 "configure"
+#line 12146 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 main()
 #include "confdefs.h"
 #include <stdio.h>
 main()


@@ -10495,7 +12153,7 @@ main()
   exit(0);
 }
 EOF
   exit(0);
 }
 EOF

-if { (eval echo configure:10499: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:12157: \"$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
 then
   ac_cv_sizeof_long=`cat conftestval`
 else


@@ -10515,7 +12173,7 @@ EOF
 
 
 echo $ac_n "checking size of long long""... $ac_c" 1>&6
 
 
 echo $ac_n "checking size of long long""... $ac_c" 1>&6

-echo "configure:10519: checking size of long long" >&5
+echo "configure:12177: 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 eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -10523,7 +12181,7 @@ else
   ac_cv_sizeof_long_long=0
 else
   cat > conftest.$ac_ext <<EOF
   ac_cv_sizeof_long_long=0
 else
   cat > conftest.$ac_ext <<EOF

-#line 10527 "configure"
+#line 12185 "configure"

 #include "confdefs.h"
 #include <stdio.h>
 main()
 #include "confdefs.h"
 #include <stdio.h>
 main()


@@ -10534,7 +12192,7 @@ main()
   exit(0);
 }
 EOF
   exit(0);
 }
 EOF

-if { (eval echo configure:10538: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:12196: \"$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
 then
   ac_cv_sizeof_long_long=`cat conftestval`
 else


@@ -10555,36 +12213,36 @@ EOF
 
 
 echo $ac_n "checking size of wchar_t""... $ac_c" 1>&6
 
 
 echo $ac_n "checking size of wchar_t""... $ac_c" 1>&6

-echo "configure:10559: checking size of wchar_t" >&5
+echo "configure:12217: 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
 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

-       
+    

 else
   cat > conftest.$ac_ext <<EOF
 else
   cat > conftest.$ac_ext <<EOF

-#line 10569 "configure"
+#line 12227 "configure"

 #include "confdefs.h"
 
 #include "confdefs.h"
 

-           #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);
-           }
+            #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);
+            }

         
 EOF
         
 EOF

-if { (eval echo configure:10588: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:12246: \"$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
 then
   wx_cv_sizeof_wchar_t=`cat conftestval`
 else


@@ -10606,16 +12264,15 @@ cat >> confdefs.h <<EOF
 EOF
 
 
 EOF
 
 

-

 echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
 echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6

-echo "configure:10612: checking whether byte ordering is bigendian" >&5
+echo "configure:12269: 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
   ac_cv_c_bigendian=unknown
 # See if sys/param.h defines the BYTE_ORDER macro.
 cat > conftest.$ac_ext <<EOF
 if eval "test \"`echo '$''{'ac_cv_c_bigendian'+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 10619 "configure"
+#line 12276 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/param.h>
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/param.h>


@@ -10626,11 +12283,11 @@ int main() {
 #endif
 ; return 0; }
 EOF
 #endif
 ; return 0; }
 EOF

-if { (eval echo configure:10630: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:12287: \"$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
   rm -rf conftest*
   # It does; now see whether it defined to BIG_ENDIAN or not.
 cat > conftest.$ac_ext <<EOF

-#line 10634 "configure"
+#line 12291 "configure"

 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/param.h>
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/param.h>


@@ -10641,7 +12298,7 @@ int main() {
 #endif
 ; return 0; }
 EOF
 #endif
 ; return 0; }
 EOF

-if { (eval echo configure:10645: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:12302: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

   rm -rf conftest*
   ac_cv_c_bigendian=yes
 else
   rm -rf conftest*
   ac_cv_c_bigendian=yes
 else


@@ -10661,7 +12318,7 @@ if test "$cross_compiling" = yes; then
   ac_cv_c_bigendian=unknown
 else
   cat > conftest.$ac_ext <<EOF
   ac_cv_c_bigendian=unknown
 else
   cat > conftest.$ac_ext <<EOF

-#line 10665 "configure"
+#line 12322 "configure"

 #include "confdefs.h"
 main () {
   /* Are we little or big endian?  From Harbison&Steele.  */
 #include "confdefs.h"
 main () {
   /* Are we little or big endian?  From Harbison&Steele.  */


@@ -10674,7 +12331,7 @@ main () {
   exit (u.c[sizeof (long) - 1] == 1);
 }
 EOF
   exit (u.c[sizeof (long) - 1] == 1);
 }
 EOF

-if { (eval echo configure:10678: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:12335: \"$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
 then
   ac_cv_c_bigendian=no
 else


@@ -10721,17 +12378,17 @@ cross_compiling=$ac_cv_prog_cxx_cross
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6

-echo "configure:10725: checking for $ac_hdr" >&5
+echo "configure:12382: 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
 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 10730 "configure"
+#line 12387 "configure"

 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:10735: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12392: \"$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_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*


@@ -10758,13 +12415,13 @@ fi
 done
 
 
 done
 
 

-    if test "x$HAVE_IOSTREAM" = x ; then
+    if test "$ac_cv_header_iostream" = "yes" ; then
+      :
+    else

       cat >> confdefs.h <<\EOF
 #define wxUSE_IOSTREAMH 1
 EOF
 
       cat >> confdefs.h <<\EOF
 #define wxUSE_IOSTREAMH 1
 EOF
 

-    else
-      :

     fi
 
     ac_ext=c
     fi
 
     ac_ext=c


@@ -10779,7 +12436,7 @@ cross_compiling=$ac_cv_prog_cc_cross
 
 
   echo $ac_n "checking if C++ compiler supports bool""... $ac_c" 1>&6
 
 
   echo $ac_n "checking if C++ compiler supports bool""... $ac_c" 1>&6

-echo "configure:10783: checking if C++ compiler supports bool" >&5
+echo "configure:12440: 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
 if eval "test \"`echo '$''{'wx_cv_cpp_bool'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -10794,7 +12451,7 @@ cross_compiling=$ac_cv_prog_cxx_cross
 
 
     cat > conftest.$ac_ext <<EOF
 
 
     cat > conftest.$ac_ext <<EOF

-#line 10798 "configure"
+#line 12455 "configure"

 #include "confdefs.h"
 
       
 #include "confdefs.h"
 
       


@@ -10806,7 +12463,7 @@ int main() {
       
 ; return 0; }
 EOF
       
 ; return 0; }
 EOF

-if { (eval echo configure:10810: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:12467: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

   rm -rf conftest*
   
         wx_cv_cpp_bool=yes
   rm -rf conftest*
   
         wx_cv_cpp_bool=yes


@@ -10843,52 +12500,8 @@ EOF
 
 
 
 
 
 

-echo $ac_n "checking if you need GNU extensions""... $ac_c" 1>&6
-echo "configure:10848: checking if you need GNU extensions" >&5
-if eval "test \"`echo '$''{'wx_cv_gnu_extensions'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-   cat > conftest.$ac_ext <<EOF
-#line 10854 "configure"
-#include "confdefs.h"
-#include <features.h>
-int main() {
-
-
-#ifndef __GNU_LIBRARY__
- Compile error wanted
-#endif
-
-
-; return 0; }
-EOF
-if { (eval echo configure:10867: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  wx_cv_gnu_extensions=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  wx_cv_gnu_extensions=no
-fi
-rm -f conftest*
-
-fi
-
-
-echo "$ac_t""$wx_cv_gnu_extensions" 1>&6
-if test "$wx_cv_gnu_extensions" = "yes"; then
-  cat >> confdefs.h <<EOF
-#define _GNU_SOURCE 1
-EOF
-
-fi
-
-
-

 echo $ac_n "checking for wcslen in -lc""... $ac_c" 1>&6
 echo $ac_n "checking for wcslen in -lc""... $ac_c" 1>&6

-echo "configure:10892: checking for wcslen in -lc" >&5
+echo "configure:12505: 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
 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


@@ -10896,7 +12509,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lc  $LIBS"
 cat > conftest.$ac_ext <<EOF
   ac_save_LIBS="$LIBS"
 LIBS="-lc  $LIBS"
 cat > conftest.$ac_ext <<EOF

-#line 10900 "configure"
+#line 12513 "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
 #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


@@ -10907,7 +12520,7 @@ int main() {
 wcslen()
 ; return 0; }
 EOF
 wcslen()
 ; return 0; }
 EOF

-if { (eval echo configure:10911: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12524: \"$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
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else


@@ -10933,7 +12546,7 @@ else
   echo "$ac_t""no" 1>&6
 
             echo $ac_n "checking for wcslen in -lw""... $ac_c" 1>&6
   echo "$ac_t""no" 1>&6
 
             echo $ac_n "checking for wcslen in -lw""... $ac_c" 1>&6

-echo "configure:10937: checking for wcslen in -lw" >&5
+echo "configure:12550: 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
 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


@@ -10941,7 +12554,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lw  $LIBS"
 cat > conftest.$ac_ext <<EOF
   ac_save_LIBS="$LIBS"
 LIBS="-lw  $LIBS"
 cat > conftest.$ac_ext <<EOF

-#line 10945 "configure"
+#line 12558 "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
 #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


@@ -10952,7 +12565,7 @@ int main() {
 wcslen()
 ; return 0; }
 EOF
 wcslen()
 ; return 0; }
 EOF

-if { (eval echo configure:10956: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12569: \"$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
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else


@@ -10983,12 +12596,12 @@ fi
 
 
 echo $ac_n "checking for vprintf""... $ac_c" 1>&6
 
 
 echo $ac_n "checking for vprintf""... $ac_c" 1>&6

-echo "configure:10987: checking for vprintf" >&5
+echo "configure:12600: 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
 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 10992 "configure"
+#line 12605 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char vprintf(); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char vprintf(); below.  */


@@ -11011,7 +12624,7 @@ vprintf();
 
 ; return 0; }
 EOF
 
 ; return 0; }
 EOF

-if { (eval echo configure:11015: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12628: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

   rm -rf conftest*
   eval "ac_cv_func_vprintf=yes"
 else
   rm -rf conftest*
   eval "ac_cv_func_vprintf=yes"
 else


@@ -11035,12 +12648,12 @@ fi
 
 if test "$ac_cv_func_vprintf" != yes; then
 echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
 
 if test "$ac_cv_func_vprintf" != yes; then
 echo $ac_n "checking for _doprnt""... $ac_c" 1>&6

-echo "configure:11039: checking for _doprnt" >&5
+echo "configure:12652: 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
 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 11044 "configure"
+#line 12657 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char _doprnt(); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char _doprnt(); below.  */


@@ -11063,7 +12676,7 @@ _doprnt();
 
 ; return 0; }
 EOF
 
 ; return 0; }
 EOF

-if { (eval echo configure:11067: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12680: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then

   rm -rf conftest*
   eval "ac_cv_func__doprnt=yes"
 else
   rm -rf conftest*
   eval "ac_cv_func__doprnt=yes"
 else


@@ -11094,13 +12707,13 @@ fi
 
 
 echo $ac_n "checking for vsnprintf""... $ac_c" 1>&6
 
 
 echo $ac_n "checking for vsnprintf""... $ac_c" 1>&6

-echo "configure:11098: checking for vsnprintf" >&5
+echo "configure:12711: 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
 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 11104 "configure"
+#line 12717 "configure"

 #include "confdefs.h"
 
                     #include <stdio.h>
 #include "confdefs.h"
 
                     #include <stdio.h>


@@ -11125,7 +12738,7 @@ int main() {
                  
 ; return 0; }
 EOF
                  
 ; return 0; }
 EOF

-if { (eval echo configure:11129: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:12742: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

   rm -rf conftest*
   
                     wx_cv_func_vsnprintf=yes
   rm -rf conftest*
   
                     wx_cv_func_vsnprintf=yes


@@ -11136,7 +12749,7 @@ else
   rm -rf conftest*
   
                     cat > conftest.$ac_ext <<EOF
   rm -rf conftest*
   
                     cat > conftest.$ac_ext <<EOF

-#line 11140 "configure"
+#line 12753 "configure"

 #include "confdefs.h"
 
                                       #include <stdio.h>
 #include "confdefs.h"
 
                                       #include <stdio.h>


@@ -11161,7 +12774,7 @@ int main() {
                                    
 ; return 0; }
 EOF
                                    
 ; return 0; }
 EOF

-if { (eval echo configure:11165: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:12778: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

   rm -rf conftest*
   
                                       wx_cv_func_vsnprintf=yes
   rm -rf conftest*
   
                                       wx_cv_func_vsnprintf=yes


@@ -11193,13 +12806,13 @@ else
 fi
 
 echo $ac_n "checking for vsscanf""... $ac_c" 1>&6
 fi
 
 echo $ac_n "checking for vsscanf""... $ac_c" 1>&6

-echo "configure:11197: checking for vsscanf" >&5
+echo "configure:12810: 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
 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 11203 "configure"
+#line 12816 "configure"

 #include "confdefs.h"
 
                     #include <stdio.h>
 #include "confdefs.h"
 
                     #include <stdio.h>


@@ -11222,7 +12835,7 @@ int main() {
                 
 ; return 0; }
 EOF
                 
 ; return 0; }
 EOF

-if { (eval echo configure:11226: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:12839: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

   rm -rf conftest*
   
                     wx_cv_func_vsscanf=yes
   rm -rf conftest*
   
                     wx_cv_func_vsscanf=yes


@@ -11260,25 +12873,25 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes
 cross_compiling=$ac_cv_prog_cxx_cross
 
 echo $ac_n "checking if iconv() takes char**""... $ac_c" 1>&6
 cross_compiling=$ac_cv_prog_cxx_cross
 
 echo $ac_n "checking if iconv() takes char**""... $ac_c" 1>&6

-echo "configure:11264: checking if iconv() takes char**" >&5
+echo "configure:12877: 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
 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 11270 "configure"
+#line 12883 "configure"

 #include "confdefs.h"
 #include <iconv.h>
 int main() {
 
         char **inbuf, **outbuf;
 #include "confdefs.h"
 #include <iconv.h>
 int main() {
 
         char **inbuf, **outbuf;

-       iconv_t cd;
-       size_t insz, outsz;
-       iconv(cd, inbuf, &insz, outbuf, &outsz);
+        iconv_t cd;
+        size_t insz, outsz;
+        iconv(cd, inbuf, &insz, outbuf, &outsz);

     
 ; return 0; }
 EOF
     
 ; return 0; }
 EOF

-if { (eval echo configure:11282: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:12895: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

   rm -rf conftest*
   wx_cv_iconv_takes_char=yes
 else
   rm -rf conftest*
   wx_cv_iconv_takes_char=yes
 else


@@ -11311,12 +12924,12 @@ 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
     for ac_func in sigaction
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6

-echo "configure:11315: checking for $ac_func" >&5
+echo "configure:12928: 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
 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 11320 "configure"
+#line 12933 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */


@@ -11339,7 +12952,7 @@ $ac_func();
 
 ; return 0; }
 EOF
 
 ; return 0; }
 EOF

-if { (eval echo configure:11343: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12956: \"$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
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else


@@ -11380,13 +12993,13 @@ cross_compiling=$ac_cv_prog_cxx_cross
 
 
       echo $ac_n "checking for sa_handler type""... $ac_c" 1>&6
 
 
       echo $ac_n "checking for sa_handler type""... $ac_c" 1>&6

-echo "configure:11384: checking for sa_handler type" >&5
+echo "configure:12997: 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
 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 11390 "configure"
+#line 13003 "configure"

 #include "confdefs.h"
 #include <signal.h>
 int main() {
 #include "confdefs.h"
 #include <signal.h>
 int main() {


@@ -11398,7 +13011,7 @@ int main() {
                      
 ; return 0; }
 EOF
                      
 ; return 0; }
 EOF

-if { (eval echo configure:11402: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13015: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

   rm -rf conftest*
   
                         wx_cv_type_sa_handler=int
   rm -rf conftest*
   
                         wx_cv_type_sa_handler=int


@@ -11435,12 +13048,12 @@ fi
 for ac_func in vfork
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
 for ac_func in vfork
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6

-echo "configure:11439: checking for $ac_func" >&5
+echo "configure:13052: 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
 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 11444 "configure"
+#line 13057 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */


@@ -11463,7 +13076,7 @@ $ac_func();
 
 ; return 0; }
 EOF
 
 ; return 0; }
 EOF

-if { (eval echo configure:11467: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13080: \"$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
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else


@@ -11492,12 +13105,12 @@ 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
     for ac_func in fcntl flock
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6

-echo "configure:11496: checking for $ac_func" >&5
+echo "configure:13109: 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
 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 11501 "configure"
+#line 13114 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */


@@ -11520,7 +13133,7 @@ $ac_func();
 
 ; return 0; }
 EOF
 
 ; return 0; }
 EOF

-if { (eval echo configure:11524: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13137: \"$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
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else


@@ -11554,12 +13167,12 @@ fi
 for ac_func in timegm
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
 for ac_func in timegm
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6

-echo "configure:11558: checking for $ac_func" >&5
+echo "configure:13171: 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
 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 11563 "configure"
+#line 13176 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */


@@ -11582,7 +13195,7 @@ $ac_func();
 
 ; return 0; }
 EOF
 
 ; return 0; }
 EOF

-if { (eval echo configure:11586: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13199: \"$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
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else


@@ -11610,12 +13223,12 @@ done
 for ac_func in putenv setenv
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
 for ac_func in putenv setenv
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6

-echo "configure:11614: checking for $ac_func" >&5
+echo "configure:13227: 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
 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 11619 "configure"
+#line 13232 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */


@@ -11638,7 +13251,7 @@ $ac_func();
 
 ; return 0; }
 EOF
 
 ; return 0; }
 EOF

-if { (eval echo configure:11642: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13255: \"$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
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else


@@ -11672,7 +13285,7 @@ EOF
     HAVE_SOME_SLEEP_FUNC=1
 fi
 
     HAVE_SOME_SLEEP_FUNC=1
 fi
 

-if test "$USE_MAC" = 1; then
+if test "$USE_DARWIN" = 1; then

             cat >> confdefs.h <<\EOF
 #define HAVE_USLEEP 1
 EOF
             cat >> confdefs.h <<\EOF
 #define HAVE_USLEEP 1
 EOF


@@ -11685,12 +13298,12 @@ if test "$HAVE_SOME_SLEEP_FUNC" != 1; then
     for ac_func in nanosleep
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
     for ac_func in nanosleep
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6

-echo "configure:11689: checking for $ac_func" >&5
+echo "configure:13302: 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
 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 11694 "configure"
+#line 13307 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */


@@ -11713,7 +13326,7 @@ $ac_func();
 
 ; return 0; }
 EOF
 
 ; return 0; }
 EOF

-if { (eval echo configure:11717: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13330: \"$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
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else


@@ -11738,7 +13351,7 @@ EOF
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for nanosleep in -lposix4""... $ac_c" 1>&6
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for nanosleep in -lposix4""... $ac_c" 1>&6

-echo "configure:11742: checking for nanosleep in -lposix4" >&5
+echo "configure:13355: 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
 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


@@ -11746,7 +13359,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lposix4  $LIBS"
 cat > conftest.$ac_ext <<EOF
   ac_save_LIBS="$LIBS"
 LIBS="-lposix4  $LIBS"
 cat > conftest.$ac_ext <<EOF

-#line 11750 "configure"
+#line 13363 "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
 #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


@@ -11757,7 +13370,7 @@ int main() {
 nanosleep()
 ; return 0; }
 EOF
 nanosleep()
 ; return 0; }
 EOF

-if { (eval echo configure:11761: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13374: \"$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
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else


@@ -11785,12 +13398,12 @@ else
                     for ac_func in usleep
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
                     for ac_func in usleep
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6

-echo "configure:11789: checking for $ac_func" >&5
+echo "configure:13402: 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
 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 11794 "configure"
+#line 13407 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */


@@ -11813,7 +13426,7 @@ $ac_func();
 
 ; return 0; }
 EOF
 
 ; return 0; }
 EOF

-if { (eval echo configure:11817: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13430: \"$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
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else


@@ -11856,12 +13469,12 @@ fi
 for ac_func in uname gethostname
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
 for ac_func in uname gethostname
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6

-echo "configure:11860: checking for $ac_func" >&5
+echo "configure:13473: 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
 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 11865 "configure"
+#line 13478 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */


@@ -11884,7 +13497,7 @@ $ac_func();
 
 ; return 0; }
 EOF
 
 ; return 0; }
 EOF

-if { (eval echo configure:11888: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13501: \"$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
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else


@@ -11921,12 +13534,12 @@ 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
 for ac_func in strtok_r
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6

-echo "configure:11925: checking for $ac_func" >&5
+echo "configure:13538: 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
 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 11930 "configure"
+#line 13543 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */


@@ -11952,7 +13565,7 @@ $ac_func();
 
 ; return 0; }
 EOF
 
 ; return 0; }
 EOF

-if { (eval echo configure:11956: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13569: \"$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
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else


@@ -11989,12 +13602,12 @@ INET_LINK=
 for ac_func in inet_addr
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
 for ac_func in inet_addr
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6

-echo "configure:11993: checking for $ac_func" >&5
+echo "configure:13606: 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
 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 11998 "configure"
+#line 13611 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */


@@ -12017,7 +13630,7 @@ $ac_func();
 
 ; return 0; }
 EOF
 
 ; return 0; }
 EOF

-if { (eval echo configure:12021: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13634: \"$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
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else


@@ -12042,7 +13655,7 @@ EOF
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for inet_addr in -lnsl""... $ac_c" 1>&6
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for inet_addr in -lnsl""... $ac_c" 1>&6

-echo "configure:12046: checking for inet_addr in -lnsl" >&5
+echo "configure:13659: 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
 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


@@ -12050,7 +13663,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF

-#line 12054 "configure"
+#line 13667 "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
 #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


@@ -12061,7 +13674,7 @@ int main() {
 inet_addr()
 ; return 0; }
 EOF
 inet_addr()
 ; return 0; }
 EOF

-if { (eval echo configure:12065: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13678: \"$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
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else


@@ -12080,7 +13693,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for inet_addr in -lresolv""... $ac_c" 1>&6
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for inet_addr in -lresolv""... $ac_c" 1>&6

-echo "configure:12084: checking for inet_addr in -lresolv" >&5
+echo "configure:13697: 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
 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


@@ -12088,7 +13701,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lresolv  $LIBS"
 cat > conftest.$ac_ext <<EOF
   ac_save_LIBS="$LIBS"
 LIBS="-lresolv  $LIBS"
 cat > conftest.$ac_ext <<EOF

-#line 12092 "configure"
+#line 13705 "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
 #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


@@ -12099,7 +13712,7 @@ int main() {
 inet_addr()
 ; return 0; }
 EOF
 inet_addr()
 ; return 0; }
 EOF

-if { (eval echo configure:12103: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13716: \"$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
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else


@@ -12132,12 +13745,12 @@ done
 for ac_func in inet_aton
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
 for ac_func in inet_aton
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6

-echo "configure:12136: checking for $ac_func" >&5
+echo "configure:13749: 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
 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 12141 "configure"
+#line 13754 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */


@@ -12160,7 +13773,7 @@ $ac_func();
 
 ; return 0; }
 EOF
 
 ; return 0; }
 EOF

-if { (eval echo configure:12164: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13777: \"$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
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else


@@ -12185,7 +13798,7 @@ EOF
 else
   echo "$ac_t""no" 1>&6
             echo $ac_n "checking for inet_aton in -l$INET_LINK""... $ac_c" 1>&6
 else
   echo "$ac_t""no" 1>&6
             echo $ac_n "checking for inet_aton in -l$INET_LINK""... $ac_c" 1>&6

-echo "configure:12189: checking for inet_aton in -l$INET_LINK" >&5
+echo "configure:13802: 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
 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


@@ -12193,7 +13806,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-l$INET_LINK  $LIBS"
 cat > conftest.$ac_ext <<EOF
   ac_save_LIBS="$LIBS"
 LIBS="-l$INET_LINK  $LIBS"
 cat > conftest.$ac_ext <<EOF

-#line 12197 "configure"
+#line 13810 "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
 #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


@@ -12204,7 +13817,7 @@ int main() {
 inet_aton()
 ; return 0; }
 EOF
 inet_aton()
 ; return 0; }
 EOF

-if { (eval echo configure:12208: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13821: \"$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
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else


@@ -12317,7 +13930,7 @@ if test "$wxUSE_THREADS" = "yes" ; then
     fi
 
                 echo $ac_n "checking for pthread_create in -l$THREADS_LIB""... $ac_c" 1>&6
     fi
 
                 echo $ac_n "checking for pthread_create in -l$THREADS_LIB""... $ac_c" 1>&6

-echo "configure:12321: checking for pthread_create in -l$THREADS_LIB" >&5
+echo "configure:13934: 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
 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


@@ -12325,7 +13938,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-l$THREADS_LIB  $LIBS"
 cat > conftest.$ac_ext <<EOF
   ac_save_LIBS="$LIBS"
 LIBS="-l$THREADS_LIB  $LIBS"
 cat > conftest.$ac_ext <<EOF

-#line 12329 "configure"
+#line 13942 "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
 #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


@@ -12336,7 +13949,7 @@ int main() {
 pthread_create()
 ; return 0; }
 EOF
 pthread_create()
 ; return 0; }
 EOF

-if { (eval echo configure:12340: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13953: \"$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
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else


@@ -12359,7 +13972,7 @@ else
   echo "$ac_t""no" 1>&6
 
                         echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6
   echo "$ac_t""no" 1>&6
 
                         echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6

-echo "configure:12363: checking for pthread_create in -lc_r" >&5
+echo "configure:13976: 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
 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


@@ -12367,7 +13980,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lc_r  $LIBS"
 cat > conftest.$ac_ext <<EOF
   ac_save_LIBS="$LIBS"
 LIBS="-lc_r  $LIBS"
 cat > conftest.$ac_ext <<EOF

-#line 12371 "configure"
+#line 13984 "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
 #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


@@ -12378,7 +13991,7 @@ int main() {
 pthread_create()
 ; return 0; }
 EOF
 pthread_create()
 ; return 0; }
 EOF

-if { (eval echo configure:12382: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13995: \"$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
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else


@@ -12402,17 +14015,17 @@ else
 
                                 ac_safe=`echo "sys/prctl.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for sys/prctl.h""... $ac_c" 1>&6
 
                                 ac_safe=`echo "sys/prctl.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for sys/prctl.h""... $ac_c" 1>&6

-echo "configure:12406: checking for sys/prctl.h" >&5
+echo "configure:14019: 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
 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 12411 "configure"
+#line 14024 "configure"

 #include "confdefs.h"
 #include <sys/prctl.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 #include "confdefs.h"
 #include <sys/prctl.h>
 EOF
 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; }
+{ (eval echo configure:14029: \"$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_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*


@@ -12452,12 +14065,12 @@ if test "$wxUSE_THREADS" = "yes" ; then
   for ac_func in thr_setconcurrency
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
   for ac_func in thr_setconcurrency
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6

-echo "configure:12456: checking for $ac_func" >&5
+echo "configure:14069: 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
 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 12461 "configure"
+#line 14074 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */


@@ -12480,7 +14093,7 @@ $ac_func();
 
 ; return 0; }
 EOF
 
 ; return 0; }
 EOF

-if { (eval echo configure:12484: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14097: \"$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
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else


@@ -12510,17 +14123,17 @@ done
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6

-echo "configure:12514: checking for $ac_hdr" >&5
+echo "configure:14127: 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
 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 12519 "configure"
+#line 14132 "configure"

 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:12524: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14137: \"$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_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*


@@ -12548,7 +14161,7 @@ done
 
 
   echo $ac_n "checking for sched_yield in -l$THREADS_LINK""... $ac_c" 1>&6
 
 
   echo $ac_n "checking for sched_yield in -l$THREADS_LINK""... $ac_c" 1>&6

-echo "configure:12552: checking for sched_yield in -l$THREADS_LINK" >&5
+echo "configure:14165: 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
 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


@@ -12556,7 +14169,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-l$THREADS_LINK  $LIBS"
 cat > conftest.$ac_ext <<EOF
   ac_save_LIBS="$LIBS"
 LIBS="-l$THREADS_LINK  $LIBS"
 cat > conftest.$ac_ext <<EOF

-#line 12560 "configure"
+#line 14173 "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
 #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


@@ -12567,7 +14180,7 @@ int main() {
 sched_yield()
 ; return 0; }
 EOF
 sched_yield()
 ; return 0; }
 EOF

-if { (eval echo configure:12571: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14184: \"$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
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else


@@ -12588,16 +14201,16 @@ EOF
 
 else
   echo "$ac_t""no" 1>&6
 
 else
   echo "$ac_t""no" 1>&6

-echo $ac_n "checking for sched_yield in -l"posix4"""... $ac_c" 1>&6
-echo "configure:12593: checking for sched_yield in -l"posix4"" >&5
-ac_lib_var=`echo "posix4"'_'sched_yield | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for sched_yield in -lposix4""... $ac_c" 1>&6
+echo "configure:14206: 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"
 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"posix4"  $LIBS"
+LIBS="-lposix4  $LIBS"

 cat > conftest.$ac_ext <<EOF
 cat > conftest.$ac_ext <<EOF

-#line 12601 "configure"
+#line 14214 "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
 #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


@@ -12608,7 +14221,7 @@ int main() {
 sched_yield()
 ; return 0; }
 EOF
 sched_yield()
 ; return 0; }
 EOF

-if { (eval echo configure:12612: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14225: \"$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
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else


@@ -12639,7 +14252,7 @@ fi
 
               HAVE_PRIOR_FUNCS=0
   echo $ac_n "checking for pthread_attr_getschedpolicy in -l$THREADS_LINK""... $ac_c" 1>&6
 
               HAVE_PRIOR_FUNCS=0
   echo $ac_n "checking for pthread_attr_getschedpolicy in -l$THREADS_LINK""... $ac_c" 1>&6

-echo "configure:12643: checking for pthread_attr_getschedpolicy in -l$THREADS_LINK" >&5
+echo "configure:14256: 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
 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


@@ -12647,7 +14260,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-l$THREADS_LINK  $LIBS"
 cat > conftest.$ac_ext <<EOF
   ac_save_LIBS="$LIBS"
 LIBS="-l$THREADS_LINK  $LIBS"
 cat > conftest.$ac_ext <<EOF

-#line 12651 "configure"
+#line 14264 "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
 #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


@@ -12658,7 +14271,7 @@ int main() {
 pthread_attr_getschedpolicy()
 ; return 0; }
 EOF
 pthread_attr_getschedpolicy()
 ; return 0; }
 EOF

-if { (eval echo configure:12662: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14275: \"$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
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else


@@ -12674,7 +14287,7 @@ 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
 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:12678: checking for pthread_attr_setschedparam in -l$THREADS_LINK" >&5
+echo "configure:14291: 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
 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


@@ -12682,7 +14295,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-l$THREADS_LINK  $LIBS"
 cat > conftest.$ac_ext <<EOF
   ac_save_LIBS="$LIBS"
 LIBS="-l$THREADS_LINK  $LIBS"
 cat > conftest.$ac_ext <<EOF

-#line 12686 "configure"
+#line 14299 "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
 #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


@@ -12693,7 +14306,7 @@ int main() {
 pthread_attr_setschedparam()
 ; return 0; }
 EOF
 pthread_attr_setschedparam()
 ; return 0; }
 EOF

-if { (eval echo configure:12697: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14310: \"$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
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else


@@ -12709,7 +14322,7 @@ 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
 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:12713: checking for sched_get_priority_max in -l$THREADS_LINK" >&5
+echo "configure:14326: 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
 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


@@ -12717,7 +14330,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-l$THREADS_LINK  $LIBS"
 cat > conftest.$ac_ext <<EOF
   ac_save_LIBS="$LIBS"
 LIBS="-l$THREADS_LINK  $LIBS"
 cat > conftest.$ac_ext <<EOF

-#line 12721 "configure"
+#line 14334 "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
 #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


@@ -12728,7 +14341,7 @@ int main() {
 sched_get_priority_max()
 ; return 0; }
 EOF
 sched_get_priority_max()
 ; return 0; }
 EOF

-if { (eval echo configure:12732: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14345: \"$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
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else


@@ -12746,16 +14359,16 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   HAVE_PRIOR_FUNCS=1
 else
   echo "$ac_t""no" 1>&6
   HAVE_PRIOR_FUNCS=1
 else
   echo "$ac_t""no" 1>&6

-echo $ac_n "checking for sched_get_priority_max in -l"posix4"""... $ac_c" 1>&6
-echo "configure:12751: checking for sched_get_priority_max in -l"posix4"" >&5
-ac_lib_var=`echo "posix4"'_'sched_get_priority_max | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for sched_get_priority_max in -lposix4""... $ac_c" 1>&6
+echo "configure:14364: 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"
 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"posix4"  $LIBS"
+LIBS="-lposix4  $LIBS"

 cat > conftest.$ac_ext <<EOF
 cat > conftest.$ac_ext <<EOF

-#line 12759 "configure"
+#line 14372 "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
 #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


@@ -12766,7 +14379,7 @@ int main() {
 sched_get_priority_max()
 ; return 0; }
 EOF
 sched_get_priority_max()
 ; return 0; }
 EOF

-if { (eval echo configure:12770: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14383: \"$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
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else


@@ -12813,7 +14426,7 @@ EOF
   fi
 
   echo $ac_n "checking for pthread_cancel in -l$THREADS_LINK""... $ac_c" 1>&6
   fi
 
   echo $ac_n "checking for pthread_cancel in -l$THREADS_LINK""... $ac_c" 1>&6

-echo "configure:12817: checking for pthread_cancel in -l$THREADS_LINK" >&5
+echo "configure:14430: 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
 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


@@ -12821,7 +14434,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-l$THREADS_LINK  $LIBS"
 cat > conftest.$ac_ext <<EOF
   ac_save_LIBS="$LIBS"
 LIBS="-l$THREADS_LINK  $LIBS"
 cat > conftest.$ac_ext <<EOF

-#line 12825 "configure"
+#line 14438 "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
 #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


@@ -12832,7 +14445,7 @@ int main() {
 pthread_cancel()
 ; return 0; }
 EOF
 pthread_cancel()
 ; return 0; }
 EOF

-if { (eval echo configure:12836: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14449: \"$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
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else


@@ -12858,13 +14471,13 @@ fi
 
 
   echo $ac_n "checking for pthread_cleanup_push/pop""... $ac_c" 1>&6
 
 
   echo $ac_n "checking for pthread_cleanup_push/pop""... $ac_c" 1>&6

-echo "configure:12862: checking for pthread_cleanup_push/pop" >&5
+echo "configure:14475: 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
   
     cat > conftest.$ac_ext <<EOF
 if eval "test \"`echo '$''{'wx_cv_func_pthread_cleanup_push'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
     cat > conftest.$ac_ext <<EOF

-#line 12868 "configure"
+#line 14481 "configure"

 #include "confdefs.h"
 #include <pthread.h>
 int main() {
 #include "confdefs.h"
 #include <pthread.h>
 int main() {


@@ -12874,7 +14487,7 @@ int main() {
                  
 ; return 0; }
 EOF
                  
 ; return 0; }
 EOF

-if { (eval echo configure:12878: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14491: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

   rm -rf conftest*
   
                     wx_cv_func_pthread_cleanup_push=yes
   rm -rf conftest*
   
                     wx_cv_func_pthread_cleanup_push=yes


@@ -12902,13 +14515,13 @@ EOF
 
                 
   echo $ac_n "checking for pthread_mutexattr_t""... $ac_c" 1>&6
 
                 
   echo $ac_n "checking for pthread_mutexattr_t""... $ac_c" 1>&6

-echo "configure:12906: checking for pthread_mutexattr_t" >&5
+echo "configure:14519: 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
 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 12912 "configure"
+#line 14525 "configure"

 #include "confdefs.h"
 #include <pthread.h>
 int main() {
 #include "confdefs.h"
 #include <pthread.h>
 int main() {


@@ -12918,7 +14531,7 @@ int main() {
         
 ; return 0; }
 EOF
         
 ; return 0; }
 EOF

-if { (eval echo configure:12922: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14535: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

   rm -rf conftest*
   
            wx_cv_type_pthread_mutexattr_t=yes
   rm -rf conftest*
   
            wx_cv_type_pthread_mutexattr_t=yes


@@ -12945,13 +14558,13 @@ EOF
 
   else
         echo $ac_n "checking for PTHREAD_RECURSIVE_MUTEX_INITIALIZER""... $ac_c" 1>&6
 
   else
         echo $ac_n "checking for PTHREAD_RECURSIVE_MUTEX_INITIALIZER""... $ac_c" 1>&6

-echo "configure:12949: checking for PTHREAD_RECURSIVE_MUTEX_INITIALIZER" >&5
+echo "configure:14562: 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
   
         cat > conftest.$ac_ext <<EOF
 if eval "test \"`echo '$''{'wx_cv_type_pthread_rec_mutex_init'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
         cat > conftest.$ac_ext <<EOF

-#line 12955 "configure"
+#line 14568 "configure"

 #include "confdefs.h"
 #include <pthread.h>
 int main() {
 #include "confdefs.h"
 #include <pthread.h>
 int main() {


@@ -12960,7 +14573,7 @@ int main() {
             
 ; return 0; }
 EOF
             
 ; return 0; }
 EOF

-if { (eval echo configure:12964: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14577: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

   rm -rf conftest*
   
                 wx_cv_type_pthread_rec_mutex_init=yes
   rm -rf conftest*
   
                 wx_cv_type_pthread_rec_mutex_init=yes


@@ -13006,7 +14619,7 @@ if test "$wxUSE_THREADS" = "yes"; then
 EOF
 
 
 EOF
 
 

-    if test "$wxUSE_MAC" = "0"; then
+    if test "x$wxUSE_DARWIN" != "x1"; then

     CFLAGS="${CFLAGS} -D_REENTRANT"
     CXXFLAGS="${CXXFLAGS} -D_REENTRANT"
   fi
     CFLAGS="${CFLAGS} -D_REENTRANT"
     CXXFLAGS="${CXXFLAGS} -D_REENTRANT"
   fi


@@ -13015,7 +14628,7 @@ EOF
 else
       if test "$ac_cv_func_strtok_r" = "yes"; then
     echo $ac_n "checking if -D_REENTRANT is needed""... $ac_c" 1>&6
 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:13019: checking if -D_REENTRANT is needed" >&5
+echo "configure:14632: 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"
     if test "$NEEDS_D_REENTRANT_FOR_R_FUNCS" = 1; then
         CFLAGS="${CFLAGS} -D_REENTRANT"
         CXXFLAGS="${CXXFLAGS} -D_REENTRANT"


@@ -13053,13 +14666,13 @@ if test "$WXWINE" = 1 ; then
 fi
 
 if test "$wxUSE_MAC" = 1 ; then
 fi
 
 if test "$wxUSE_MAC" = 1 ; then

-  TOOLKIT_DEF="${TOOLKIT_DEF} -D__UNIX__ -D__POWERPC__ -DTARGET_CARBON"
-  CFLAGS="${CFLAGS} -fno-common -fpascal-strings"
-  CPPFLAGS="${CPPFLAGS} -fno-common -fpascal-strings"
+  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
   # 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:13063: checking for $ac_word" >&5
+echo "configure:14676: 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 eval "test \"`echo '$''{'ac_cv_prog_REZ'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -13089,7 +14702,7 @@ 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
   # 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:13093: checking for $ac_word" >&5
+echo "configure:14706: 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 eval "test \"`echo '$''{'ac_cv_prog_DEREZ'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -13213,6 +14826,126 @@ else
     fi
 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
+
+
+REGEX_INCLUDE=
+if test "$wxUSE_REGEX" != "no"; then
+            ac_safe=`echo "regex.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for regex.h""... $ac_c" 1>&6
+echo "configure:14851: 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 14856 "configure"
+#include "confdefs.h"
+#include <regex.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:14861: \"$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
+  for ac_func in regcomp
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:14880: 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 14885 "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; }
+EOF
+if { (eval echo configure:14908: \"$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
+ 
+else
+  echo "$ac_t""no" 1>&6
+fi
+done
+
+else
+  echo "$ac_t""no" 1>&6
+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; }
+        fi
+
+                REGEX_INCLUDE="-I\${top_srcdir}/src/regex"
+    fi
+
+    cat >> confdefs.h <<\EOF
+#define wxUSE_REGEX 1
+EOF
+
+fi

 
 ZLIB_INCLUDE=
 if test "$wxUSE_ZLIB" = "yes" -o "$wxUSE_ZLIB" = "sys" ; then
 
 ZLIB_INCLUDE=
 if test "$wxUSE_ZLIB" = "yes" -o "$wxUSE_ZLIB" = "sys" ; then


@@ -13226,17 +14959,17 @@ EOF
     ZLIB_LINK=
     ac_safe=`echo "zlib.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for zlib.h""... $ac_c" 1>&6
     ZLIB_LINK=
     ac_safe=`echo "zlib.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for zlib.h""... $ac_c" 1>&6

-echo "configure:13230: checking for zlib.h" >&5
+echo "configure:14963: 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
 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 13235 "configure"
+#line 14968 "configure"

 #include "confdefs.h"
 #include <zlib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 #include "confdefs.h"
 #include <zlib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:13240: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14973: \"$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_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*


@@ -13253,7 +14986,7 @@ 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
 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:13257: checking for deflate in -lz" >&5
+echo "configure:14990: 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
 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


@@ -13261,7 +14994,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lz  $LIBS"
 cat > conftest.$ac_ext <<EOF
   ac_save_LIBS="$LIBS"
 LIBS="-lz  $LIBS"
 cat > conftest.$ac_ext <<EOF

-#line 13265 "configure"
+#line 14998 "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
 #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


@@ -13272,7 +15005,7 @@ int main() {
 deflate()
 ; return 0; }
 EOF
 deflate()
 ; return 0; }
 EOF

-if { (eval echo configure:13276: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15009: \"$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
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else


@@ -13319,17 +15052,17 @@ EOF
     PNG_LINK=
     ac_safe=`echo "png.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for png.h""... $ac_c" 1>&6
     PNG_LINK=
     ac_safe=`echo "png.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for png.h""... $ac_c" 1>&6

-echo "configure:13323: checking for png.h" >&5
+echo "configure:15056: 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
 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 13328 "configure"
+#line 15061 "configure"

 #include "confdefs.h"
 #include <png.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 #include "confdefs.h"
 #include <png.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:13333: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:15066: \"$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_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*


@@ -13346,7 +15079,7 @@ 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
 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:13350: checking for png_check_sig in -lpng" >&5
+echo "configure:15083: 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
 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


@@ -13354,7 +15087,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lpng -lz -lm $LIBS"
 cat > conftest.$ac_ext <<EOF
   ac_save_LIBS="$LIBS"
 LIBS="-lpng -lz -lm $LIBS"
 cat > conftest.$ac_ext <<EOF

-#line 13358 "configure"
+#line 15091 "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
 #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


@@ -13365,7 +15098,7 @@ int main() {
 png_check_sig()
 ; return 0; }
 EOF
 png_check_sig()
 ; return 0; }
 EOF

-if { (eval echo configure:13369: \"$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"
 else
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else


@@ -13408,36 +15141,43 @@ EOF
     JPEG_INCLUDE="-I\${top_srcdir}/src/jpeg"
   else
     JPEG_LINK=
     JPEG_INCLUDE="-I\${top_srcdir}/src/jpeg"
   else
     JPEG_LINK=

-    ac_safe=`echo "jpeglib.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for jpeglib.h""... $ac_c" 1>&6
-echo "configure:13414: checking for jpeglib.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+                echo $ac_n "checking for jpeglib.h""... $ac_c" 1>&6
+echo "configure:15146: 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
   cat > conftest.$ac_ext <<EOF
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF

-#line 13419 "configure"
+#line 15151 "configure"

 #include "confdefs.h"
 #include "confdefs.h"

-#include <jpeglib.h>
+
+                #undef HAVE_STDLIB_H
+                #include <stdio.h>
+                #include <jpeglib.h>
+            
+int main() {
+
+            
+; return 0; }

 EOF
 EOF

-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13424: \"$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:15163: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

   rm -rf conftest*
   rm -rf conftest*

-  eval "ac_cv_header_$ac_safe=yes"
+  ac_cv_header_jpeglib_h=yes

 else
 else

-  echo "$ac_err" >&5

   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*

-  eval "ac_cv_header_$ac_safe=no"
+  ac_cv_header_jpeglib_h=no
+        

 fi
 rm -f conftest*
 fi
 rm -f conftest*

+    

 fi
 fi

-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  echo $ac_n "checking for jpeg_read_header in -ljpeg""... $ac_c" 1>&6
-echo "configure:13441: checking for jpeg_read_header in -ljpeg" >&5
+
+    echo "$ac_t""$ac_cv_header_jpeglib_h" 1>&6
+
+    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:15181: 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
 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


@@ -13445,7 +15185,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ljpeg  $LIBS"
 cat > conftest.$ac_ext <<EOF
   ac_save_LIBS="$LIBS"
 LIBS="-ljpeg  $LIBS"
 cat > conftest.$ac_ext <<EOF

-#line 13449 "configure"
+#line 15189 "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
 #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


@@ -13456,7 +15196,7 @@ int main() {
 jpeg_read_header()
 ; return 0; }
 EOF
 jpeg_read_header()
 ; return 0; }
 EOF

-if { (eval echo configure:13460: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15200: \"$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
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else


@@ -13476,9 +15216,7 @@ else
   echo "$ac_t""no" 1>&6
 fi
 
   echo "$ac_t""no" 1>&6
 fi
 

-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; }
 
     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; }


@@ -13498,17 +15236,17 @@ EOF
     TIFF_LINK=
     ac_safe=`echo "tiffio.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for tiffio.h""... $ac_c" 1>&6
     TIFF_LINK=
     ac_safe=`echo "tiffio.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for tiffio.h""... $ac_c" 1>&6

-echo "configure:13502: checking for tiffio.h" >&5
+echo "configure:15240: 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
 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 13507 "configure"
+#line 15245 "configure"

 #include "confdefs.h"
 #include <tiffio.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 #include "confdefs.h"
 #include <tiffio.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:13512: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (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
   rm -rf conftest*
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*


@@ -13525,7 +15263,7 @@ 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
 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:13529: checking for TIFFError in -ltiff" >&5
+echo "configure:15267: 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
 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


@@ -13533,7 +15271,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ltiff -lm $LIBS"
 cat > conftest.$ac_ext <<EOF
   ac_save_LIBS="$LIBS"
 LIBS="-ltiff -lm $LIBS"
 cat > conftest.$ac_ext <<EOF

-#line 13537 "configure"
+#line 15275 "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
 #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


@@ -13544,7 +15282,7 @@ int main() {
 TIFFError()
 ; return 0; }
 EOF
 TIFFError()
 ; return 0; }
 EOF

-if { (eval echo configure:13548: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15286: \"$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
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else


@@ -13586,17 +15324,17 @@ EOF
     FREETYPE_LINK=
     ac_safe=`echo "freetype.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for freetype.h""... $ac_c" 1>&6
     FREETYPE_LINK=
     ac_safe=`echo "freetype.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for freetype.h""... $ac_c" 1>&6

-echo "configure:13590: checking for freetype.h" >&5
+echo "configure:15328: 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
 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 13595 "configure"
+#line 15333 "configure"

 #include "confdefs.h"
 #include <freetype.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 #include "confdefs.h"
 #include <freetype.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:13600: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:15338: \"$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_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*


@@ -13613,7 +15351,7 @@ 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
 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:13617: checking for FT_Render_Glyph in -lfreetype" >&5
+echo "configure:15355: 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
 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


@@ -13621,7 +15359,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lfreetype -lm $LIBS"
 cat > conftest.$ac_ext <<EOF
   ac_save_LIBS="$LIBS"
 LIBS="-lfreetype -lm $LIBS"
 cat > conftest.$ac_ext <<EOF

-#line 13625 "configure"
+#line 15363 "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
 #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


@@ -13632,7 +15370,7 @@ int main() {
 FT_Render_Glyph()
 ; return 0; }
 EOF
 FT_Render_Glyph()
 ; return 0; }
 EOF

-if { (eval echo configure:13636: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15374: \"$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
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else


@@ -13666,17 +15404,17 @@ fi
 if test "$wxUSE_OPENGL" = "yes"; then
   ac_safe=`echo "GL/gl.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for GL/gl.h""... $ac_c" 1>&6
 if test "$wxUSE_OPENGL" = "yes"; then
   ac_safe=`echo "GL/gl.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for GL/gl.h""... $ac_c" 1>&6

-echo "configure:13670: checking for GL/gl.h" >&5
+echo "configure:15408: 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
 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 13675 "configure"
+#line 15413 "configure"

 #include "confdefs.h"
 #include <GL/gl.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 #include "confdefs.h"
 #include <GL/gl.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:13680: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:15418: \"$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_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*


@@ -13702,7 +15440,7 @@ EOF
 EOF
 
     echo $ac_n "checking for glFlush in -lGL""... $ac_c" 1>&6
 EOF
 
     echo $ac_n "checking for glFlush in -lGL""... $ac_c" 1>&6

-echo "configure:13706: checking for glFlush in -lGL" >&5
+echo "configure:15444: 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
   echo $ac_n "(cached) $ac_c" 1>&6
 ac_lib_var=`echo GL'_'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


@@ -13710,7 +15448,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lGL  $LIBS"
 cat > conftest.$ac_ext <<EOF
   ac_save_LIBS="$LIBS"
 LIBS="-lGL  $LIBS"
 cat > conftest.$ac_ext <<EOF

-#line 13714 "configure"
+#line 15452 "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
 #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


@@ -13721,7 +15459,7 @@ int main() {
 glFlush()
 ; return 0; }
 EOF
 glFlush()
 ; return 0; }
 EOF

-if { (eval echo configure:13725: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15463: \"$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
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else


@@ -13743,7 +15481,7 @@ else
   echo "$ac_t""no" 1>&6
 
         echo $ac_n "checking for glFlush in -lMesaGL""... $ac_c" 1>&6
   echo "$ac_t""no" 1>&6
 
         echo $ac_n "checking for glFlush in -lMesaGL""... $ac_c" 1>&6

-echo "configure:13747: checking for glFlush in -lMesaGL" >&5
+echo "configure:15485: 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
 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


@@ -13751,7 +15489,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lMesaGL  $LIBS"
 cat > conftest.$ac_ext <<EOF
   ac_save_LIBS="$LIBS"
 LIBS="-lMesaGL  $LIBS"
 cat > conftest.$ac_ext <<EOF

-#line 13755 "configure"
+#line 15493 "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
 #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


@@ -13762,7 +15500,7 @@ int main() {
 glFlush()
 ; return 0; }
 EOF
 glFlush()
 ; return 0; }
 EOF

-if { (eval echo configure:13766: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15504: \"$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
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else


@@ -13825,6 +15563,13 @@ EOF
 
 fi
 
 
 fi
 

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

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


@@ -13832,6 +15577,34 @@ EOF
 
 fi
 
 
 fi
 

+if test "$wxUSE_CMDLINE_PARSER" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_CMDLINE_PARSER 1
+EOF
+
+fi
+
+if test "$wxUSE_STOPWATCH" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_STOPWATCH 1
+EOF
+
+fi
+
+if test "$wxUSE_DATETIME" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_DATETIME 1
+EOF
+
+fi
+
+if test "$wxUSE_TIMEDATE" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_TIMEDATE 1
+EOF
+
+fi
+

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


@@ -13839,6 +15612,13 @@ EOF
 
 fi
 
 
 fi
 

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

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


@@ -13931,11 +15711,25 @@ EOF
   fi
 fi
 
   fi
 fi
 

-if test "$wxUSE_LOG" = "yes"; then
-  cat >> confdefs.h <<\EOF
-#define wxUSE_LOG 1
+if test "$wxUSE_LOG" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_LOG 1
+EOF
+
+
+    if test "$wxUSE_LOGGUI" = "yes"; then
+      cat >> confdefs.h <<\EOF
+#define wxUSE_LOGGUI 1
+EOF
+
+    fi
+
+    if test "$wxUSE_LOGWINDOW" = "yes"; then
+      cat >> confdefs.h <<\EOF
+#define wxUSE_LOGWINDOW 1

 EOF
 
 EOF
 

+    fi

 fi
 
 if test "$wxUSE_LONGLONG" = "yes"; then
 fi
 
 if test "$wxUSE_LONGLONG" = "yes"; then


@@ -13968,16 +15762,16 @@ EOF
 fi
 
 
 fi
 
 

-if test "$wxUSE_TIMEDATE" = "yes"; then
+if test "$wxUSE_DATETIME" = "yes"; then

         for ac_func in strptime
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
         for ac_func in strptime
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6

-echo "configure:13976: checking for $ac_func" >&5
+echo "configure:15770: 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
 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 13981 "configure"
+#line 15775 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */


@@ -14000,7 +15794,7 @@ $ac_func();
 
 ; return 0; }
 EOF
 
 ; return 0; }
 EOF

-if { (eval echo configure:14004: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15798: \"$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
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else


@@ -14026,13 +15820,13 @@ done
 
 
         echo $ac_n "checking for timezone variable in <time.h>""... $ac_c" 1>&6
 
 
         echo $ac_n "checking for timezone variable in <time.h>""... $ac_c" 1>&6

-echo "configure:14030: checking for timezone variable in <time.h>" >&5
+echo "configure:15824: 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
 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 14036 "configure"
+#line 15830 "configure"

 #include "confdefs.h"
 
                                 #include <time.h>
 #include "confdefs.h"
 
                                 #include <time.h>


@@ -14040,14 +15834,14 @@ else
 int main() {
 
                                 int tz;
 int main() {
 
                                 int tz;

-                                tz = __timezone;
+                                tz = timezone;

                             
 ; return 0; }
 EOF
                             
 ; return 0; }
 EOF

-if { (eval echo configure:14048: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:15842: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

   rm -rf conftest*
   
   rm -rf conftest*
   

-                                wx_cv_var_timezone=__timezone
+                                wx_cv_var_timezone=timezone

                             
 else
   echo "configure: failed program was:" >&5
                             
 else
   echo "configure: failed program was:" >&5


@@ -14055,7 +15849,7 @@ else
   rm -rf conftest*
   
                                 cat > conftest.$ac_ext <<EOF
   rm -rf conftest*
   
                                 cat > conftest.$ac_ext <<EOF

-#line 14059 "configure"
+#line 15853 "configure"

 #include "confdefs.h"
 
                                         #include <time.h>
 #include "confdefs.h"
 
                                         #include <time.h>


@@ -14067,7 +15861,7 @@ int main() {
                                     
 ; return 0; }
 EOF
                                     
 ; return 0; }
 EOF

-if { (eval echo configure:14071: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:15865: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

   rm -rf conftest*
   
                                         wx_cv_var_timezone=_timezone
   rm -rf conftest*
   
                                         wx_cv_var_timezone=_timezone


@@ -14078,7 +15872,7 @@ else
   rm -rf conftest*
   
                                         cat > conftest.$ac_ext <<EOF
   rm -rf conftest*
   
                                         cat > conftest.$ac_ext <<EOF

-#line 14082 "configure"
+#line 15876 "configure"

 #include "confdefs.h"
 
                                                 #include <time.h>
 #include "confdefs.h"
 
                                                 #include <time.h>


@@ -14086,14 +15880,14 @@ else
 int main() {
 
                                                 int tz;
 int main() {
 
                                                 int tz;

-                                                tz = timezone;
+                                                tz = __timezone;

                                             
 ; return 0; }
 EOF
                                             
 ; return 0; }
 EOF

-if { (eval echo configure:14094: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:15888: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

   rm -rf conftest*
   
   rm -rf conftest*
   

-                                                wx_cv_var_timezone=timezone
+                                                wx_cv_var_timezone=__timezone

                                             
 else
   echo "configure: failed program was:" >&5
                                             
 else
   echo "configure: failed program was:" >&5


@@ -14125,12 +15919,12 @@ EOF
         for ac_func in localtime
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
         for ac_func in localtime
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6

-echo "configure:14129: checking for $ac_func" >&5
+echo "configure:15923: 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
 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 14134 "configure"
+#line 15928 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */


@@ -14153,7 +15947,7 @@ $ac_func();
 
 ; return 0; }
 EOF
 
 ; return 0; }
 EOF

-if { (eval echo configure:14157: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15951: \"$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
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else


@@ -14180,13 +15974,13 @@ done
 
     if test "$ac_cv_func_localtime" = "yes"; then
         echo $ac_n "checking for tm_gmtoff in struct tm""... $ac_c" 1>&6
 
     if test "$ac_cv_func_localtime" = "yes"; then
         echo $ac_n "checking for tm_gmtoff in struct tm""... $ac_c" 1>&6

-echo "configure:14184: checking for tm_gmtoff in struct tm" >&5
+echo "configure:15978: 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
 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 14190 "configure"
+#line 15984 "configure"

 #include "confdefs.h"
 
                     #include <time.h>
 #include "confdefs.h"
 
                     #include <time.h>


@@ -14198,7 +15992,7 @@ int main() {
                 
 ; return 0; }
 EOF
                 
 ; return 0; }
 EOF

-if { (eval echo configure:14202: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:15996: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

   rm -rf conftest*
   
                     wx_cv_struct_tm_has_gmtoff=yes
   rm -rf conftest*
   
                     wx_cv_struct_tm_has_gmtoff=yes


@@ -14227,12 +16021,12 @@ EOF
             for ac_func in gettimeofday ftime
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
             for ac_func in gettimeofday ftime
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6

-echo "configure:14231: checking for $ac_func" >&5
+echo "configure:16025: 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
 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 14236 "configure"
+#line 16030 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */


@@ -14255,7 +16049,7 @@ $ac_func();
 
 ; return 0; }
 EOF
 
 ; return 0; }
 EOF

-if { (eval echo configure:14259: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16053: \"$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
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else


@@ -14282,7 +16076,7 @@ done
 
     if test "$ac_cv_func_gettimeofday" = "yes"; then
         echo $ac_n "checking whether gettimeofday takes two arguments""... $ac_c" 1>&6
 
     if test "$ac_cv_func_gettimeofday" = "yes"; then
         echo $ac_n "checking whether gettimeofday takes two arguments""... $ac_c" 1>&6

-echo "configure:14286: checking whether gettimeofday takes two arguments" >&5
+echo "configure:16080: 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
 if eval "test \"`echo '$''{'wx_cv_func_gettimeofday_has_2_args'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -14297,7 +16091,7 @@ cross_compiling=$ac_cv_prog_cxx_cross
 
 
             cat > conftest.$ac_ext <<EOF
 
 
             cat > conftest.$ac_ext <<EOF

-#line 14301 "configure"
+#line 16095 "configure"

 #include "confdefs.h"
 
                     #include <sys/time.h>
 #include "confdefs.h"
 
                     #include <sys/time.h>


@@ -14311,7 +16105,7 @@ int main() {
                 
 ; return 0; }
 EOF
                 
 ; return 0; }
 EOF

-if { (eval echo configure:14315: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:16109: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

   rm -rf conftest*
   wx_cv_func_gettimeofday_has_2_args=yes
 else
   rm -rf conftest*
   wx_cv_func_gettimeofday_has_2_args=yes
 else


@@ -14319,7 +16113,7 @@ else
   cat conftest.$ac_ext >&5
   rm -rf conftest*
   cat > conftest.$ac_ext <<EOF
   cat conftest.$ac_ext >&5
   rm -rf conftest*
   cat > conftest.$ac_ext <<EOF

-#line 14323 "configure"
+#line 16117 "configure"

 #include "confdefs.h"
 
                         #include <sys/time.h>
 #include "confdefs.h"
 
                         #include <sys/time.h>


@@ -14332,7 +16126,7 @@ int main() {
                     
 ; return 0; }
 EOF
                     
 ; return 0; }
 EOF

-if { (eval echo configure:14336: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:16130: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

   rm -rf conftest*
   wx_cv_func_gettimeofday_has_2_args=no
 else
   rm -rf conftest*
   wx_cv_func_gettimeofday_has_2_args=no
 else


@@ -14378,12 +16172,12 @@ if test "$TOOLKIT" != "MSW"; then
 
 if test "$wxUSE_SOCKETS" = "yes"; then
         echo $ac_n "checking for socket""... $ac_c" 1>&6
 
 if test "$wxUSE_SOCKETS" = "yes"; then
         echo $ac_n "checking for socket""... $ac_c" 1>&6

-echo "configure:14382: checking for socket" >&5
+echo "configure:16176: 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
 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 14387 "configure"
+#line 16181 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char socket(); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char socket(); below.  */


@@ -14406,7 +16200,7 @@ socket();
 
 ; return 0; }
 EOF
 
 ; return 0; }
 EOF

-if { (eval echo configure:14410: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16204: \"$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
   rm -rf conftest*
   eval "ac_cv_func_socket=yes"
 else


@@ -14424,7 +16218,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
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6

-echo "configure:14428: checking for socket in -lsocket" >&5
+echo "configure:16222: 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
 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


@@ -14432,7 +16226,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket  $LIBS"
 cat > conftest.$ac_ext <<EOF
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket  $LIBS"
 cat > conftest.$ac_ext <<EOF

-#line 14436 "configure"
+#line 16230 "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
 #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


@@ -14443,7 +16237,7 @@ int main() {
 socket()
 ; return 0; }
 EOF
 socket()
 ; return 0; }
 EOF

-if { (eval echo configure:14447: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16241: \"$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
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else


@@ -14476,7 +16270,7 @@ 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
 
 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:14480: checking what is the type of the third argument of getsockname" >&5
+echo "configure:16274: 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
 if eval "test \"`echo '$''{'wx_cv_type_getsockname3'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else


@@ -14491,7 +16285,7 @@ cross_compiling=$ac_cv_prog_cxx_cross
 
 
             cat > conftest.$ac_ext <<EOF
 
 
             cat > conftest.$ac_ext <<EOF

-#line 14495 "configure"
+#line 16289 "configure"

 #include "confdefs.h"
 
                     #include <sys/types.h>
 #include "confdefs.h"
 
                     #include <sys/types.h>


@@ -14504,7 +16298,7 @@ int main() {
                 
 ; return 0; }
 EOF
                 
 ; return 0; }
 EOF

-if { (eval echo configure:14508: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:16302: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

   rm -rf conftest*
   wx_cv_type_getsockname3=socklen_t
 else
   rm -rf conftest*
   wx_cv_type_getsockname3=socklen_t
 else


@@ -14512,7 +16306,7 @@ else
   cat conftest.$ac_ext >&5
   rm -rf conftest*
   cat > conftest.$ac_ext <<EOF
   cat conftest.$ac_ext >&5
   rm -rf conftest*
   cat > conftest.$ac_ext <<EOF

-#line 14516 "configure"
+#line 16310 "configure"

 #include "confdefs.h"
 
                         #include <sys/types.h>
 #include "confdefs.h"
 
                         #include <sys/types.h>


@@ -14525,7 +16319,7 @@ int main() {
                     
 ; return 0; }
 EOF
                     
 ; return 0; }
 EOF

-if { (eval echo configure:14529: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:16323: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

   rm -rf conftest*
   wx_cv_type_getsockname3=size_t
 else
   rm -rf conftest*
   wx_cv_type_getsockname3=size_t
 else


@@ -14533,7 +16327,7 @@ else
   cat conftest.$ac_ext >&5
   rm -rf conftest*
   cat > conftest.$ac_ext <<EOF
   cat conftest.$ac_ext >&5
   rm -rf conftest*
   cat > conftest.$ac_ext <<EOF

-#line 14537 "configure"
+#line 16331 "configure"

 #include "confdefs.h"
 
                             #include <sys/types.h>
 #include "confdefs.h"
 
                             #include <sys/types.h>


@@ -14546,7 +16340,7 @@ int main() {
                         
 ; return 0; }
 EOF
                         
 ; return 0; }
 EOF

-if { (eval echo configure:14550: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:16344: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then

   rm -rf conftest*
   wx_cv_type_getsockname3=int
 else
   rm -rf conftest*
   wx_cv_type_getsockname3=int
 else


@@ -14608,17 +16402,17 @@ if test "$wxUSE_JOYSTICK" = "yes"; then
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6

-echo "configure:14612: checking for $ac_hdr" >&5
+echo "configure:16406: 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
 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 14617 "configure"
+#line 16411 "configure"

 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:14622: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:16416: \"$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_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*


@@ -14668,18 +16462,18 @@ if test "$TOOLKIT" != "MSW"; then
 HAVE_DL_FUNCS=0
 HAVE_SHL_FUNCS=0
 if test "$wxUSE_DYNLIB_CLASS" = "yes"; then
 HAVE_DL_FUNCS=0
 HAVE_SHL_FUNCS=0
 if test "$wxUSE_DYNLIB_CLASS" = "yes"; then

-    if test "$USE_MAC" = 1; 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
                 HAVE_DL_FUNCS=1
     else
                                 for ac_func in dlopen
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6

-echo "configure:14678: checking for $ac_func" >&5
+echo "configure:16472: 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
 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 14683 "configure"
+#line 16477 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */


@@ -14702,7 +16496,7 @@ $ac_func();
 
 ; return 0; }
 EOF
 
 ; return 0; }
 EOF

-if { (eval echo configure:14706: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16500: \"$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
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else


@@ -14730,7 +16524,7 @@ EOF
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6

-echo "configure:14734: checking for dlopen in -ldl" >&5
+echo "configure:16528: 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
 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


@@ -14738,7 +16532,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ldl  $LIBS"
 cat > conftest.$ac_ext <<EOF
   ac_save_LIBS="$LIBS"
 LIBS="-ldl  $LIBS"
 cat > conftest.$ac_ext <<EOF

-#line 14742 "configure"
+#line 16536 "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
 #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


@@ -14749,7 +16543,7 @@ int main() {
 dlopen()
 ; return 0; }
 EOF
 dlopen()
 ; return 0; }
 EOF

-if { (eval echo configure:14753: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16547: \"$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
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else


@@ -14778,12 +16572,12 @@ else
                             for ac_func in shl_load
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
                             for ac_func in shl_load
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6

-echo "configure:14782: checking for $ac_func" >&5
+echo "configure:16576: 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
 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 14787 "configure"
+#line 16581 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */


@@ -14806,7 +16600,7 @@ $ac_func();
 
 ; return 0; }
 EOF
 
 ; return 0; }
 EOF

-if { (eval echo configure:14810: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16604: \"$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
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else


@@ -14834,7 +16628,7 @@ EOF
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for dld in -lshl_load""... $ac_c" 1>&6
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for dld in -lshl_load""... $ac_c" 1>&6

-echo "configure:14838: checking for dld in -lshl_load" >&5
+echo "configure:16632: 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
 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


@@ -14842,7 +16636,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lshl_load  $LIBS"
 cat > conftest.$ac_ext <<EOF
   ac_save_LIBS="$LIBS"
 LIBS="-lshl_load  $LIBS"
 cat > conftest.$ac_ext <<EOF

-#line 14846 "configure"
+#line 16640 "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
 #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


@@ -14853,7 +16647,7 @@ int main() {
 dld()
 ; return 0; }
 EOF
 dld()
 ; return 0; }
 EOF

-if { (eval echo configure:14857: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16651: \"$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
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else


@@ -14892,12 +16686,12 @@ done
         for ac_func in dlerror
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
         for ac_func in dlerror
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6

-echo "configure:14896: checking for $ac_func" >&5
+echo "configure:16690: 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
 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 14901 "configure"
+#line 16695 "configure"

 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */


@@ -14920,7 +16714,7 @@ $ac_func();
 
 ; return 0; }
 EOF
 
 ; return 0; }
 EOF

-if { (eval echo configure:14924: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16718: \"$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
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else


@@ -14945,7 +16739,7 @@ EOF
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for dlerror in -ldl""... $ac_c" 1>&6
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for dlerror in -ldl""... $ac_c" 1>&6

-echo "configure:14949: checking for dlerror in -ldl" >&5
+echo "configure:16743: 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
 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


@@ -14953,7 +16747,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ldl  $LIBS"
 cat > conftest.$ac_ext <<EOF
   ac_save_LIBS="$LIBS"
 LIBS="-ldl  $LIBS"
 cat > conftest.$ac_ext <<EOF

-#line 14957 "configure"
+#line 16751 "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
 #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


@@ -14964,7 +16758,7 @@ int main() {
 dlerror()
 ; return 0; }
 EOF
 dlerror()
 ; return 0; }
 EOF

-if { (eval echo configure:14968: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16762: \"$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
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else


@@ -15018,6 +16812,13 @@ else
 fi
 
 
 fi
 
 

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

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


@@ -15110,6 +16911,69 @@ if test "$wxUSE_HELP" = "yes"; then
 EOF
 
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS help"
 EOF
 
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS help"

+
+    if test "$USE_WIN32" = 1; then
+      if test "$wxUSE_MS_HTML_HELP" = "yes"; then
+        cat >> confdefs.h <<\EOF
+#define wxUSE_MS_HTML_HELP 1
+EOF
+
+        ac_safe=`echo "htmlhelp.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for htmlhelp.h""... $ac_c" 1>&6
+echo "configure:16924: 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 16929 "configure"
+#include "confdefs.h"
+#include <htmlhelp.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:16934: \"$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
+  
+                cat >> confdefs.h <<\EOF
+#define wxUSE_MS_HTML_HELP 1
+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
+                wxUSE_MS_HTML_HELP=no
+            
+fi
+
+      fi
+    fi
+
+    if test "$wxUSE_WXHTML_HELP" = "yes"; then
+      if test "$wxUSE_HTML" = "yes"; then
+        cat >> confdefs.h <<\EOF
+#define wxUSE_WXHTML_HELP 1
+EOF
+
+      else
+        echo "configure: warning: Cannot use wxHTML-based help without wxHTML so it won't be compiled" 1>&2
+        wxUSE_WXHTML_HELP=no
+      fi
+    fi

 fi
 
 if test "$wxUSE_PRINTING_ARCHITECTURE" = "yes" ; then
 fi
 
 if test "$wxUSE_PRINTING_ARCHITECTURE" = "yes" ; then


@@ -15132,15 +16996,11 @@ EOF
 fi
 
 if test "$wxUSE_RESOURCES" = "yes" ; then
 fi
 
 if test "$wxUSE_RESOURCES" = "yes" ; then

-    if test "$wxUSE_PROLOGIO" = "yes" ; then
-        cat >> confdefs.h <<\EOF
+    cat >> confdefs.h <<\EOF

 #define wxUSE_RESOURCES 1
 EOF
 
 #define wxUSE_RESOURCES 1
 EOF
 

-        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS resource"
-    else
-        echo "configure: warning: wxWindows ressource system requires PrologIO and can't be compiled without it." 1>&2
-    fi
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS resource"

 fi
 
 if test "$wxUSE_X_RESOURCES" = "yes"; then
 fi
 
 if test "$wxUSE_X_RESOURCES" = "yes"; then


@@ -15165,6 +17025,10 @@ fi
 if test "$wxUSE_CLIPBOARD" = "yes"; then
     cat >> confdefs.h <<\EOF
 #define wxUSE_CLIPBOARD 1
 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
 EOF
 
 fi


@@ -15193,17 +17057,17 @@ if test "$wxUSE_DRAG_AND_DROP" = "yes" ; then
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6

-echo "configure:15197: checking for $ac_hdr" >&5
+echo "configure:17061: 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
 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 15202 "configure"
+#line 17066 "configure"

 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"

-{ (eval echo configure:15207: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:17071: \"$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_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*


@@ -15230,12 +17094,16 @@ fi
 done
 
 
 done
 
 

-                               if test "$ac_cv_header_ole2_h" = "yes" ; then
+        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 -lole32 -luuid"
             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 -lole32 -luuid"

+                cat >> confdefs.h <<\EOF
+#define wxUSE_OLE 1
+EOF
+

 
                                                 if test "$wxUSE_METAFILE" = "yes"; then
                     cat >> confdefs.h <<\EOF
 
                                                 if test "$wxUSE_METAFILE" = "yes"; then
                     cat >> confdefs.h <<\EOF


@@ -15272,11 +17140,42 @@ EOF
 fi
 
 
 fi
 
 

+USES_CONTROLS=0
+if test "$wxUSE_CONTROLS" = "yes"; then
+  USES_CONTROLS=1
+fi
+

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

+  USES_CONTROLS=1
+fi
+
+if test "$wxUSE_BUTTON" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_BUTTON 1
+EOF
+
+  USES_CONTROLS=1
+fi
+
+if test "$wxUSE_BMPBUTTON" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_BMPBUTTON 1
+EOF
+
+  USES_CONTROLS=1
+fi
+
+if test "$wxUSE_CALCTRL" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_CALENDARCTRL 1
+EOF
+
+  USES_CONTROLS=1
+  SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS calendar"

 fi
 
 if test "$wxUSE_CARET" = "yes"; then
 fi
 
 if test "$wxUSE_CARET" = "yes"; then


@@ -15284,6 +17183,7 @@ if test "$wxUSE_CARET" = "yes"; then
 #define wxUSE_CARET 1
 EOF
 
 #define wxUSE_CARET 1
 EOF
 

+  USES_CONTROLS=1

   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS caret"
 fi
 
   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS caret"
 fi
 


@@ -15292,6 +17192,7 @@ if test "$wxUSE_COMBOBOX" = "yes"; then
 #define wxUSE_COMBOBOX 1
 EOF
 
 #define wxUSE_COMBOBOX 1
 EOF
 

+  USES_CONTROLS=1

 fi
 
 if test "$wxUSE_CHOICE" = "yes"; then
 fi
 
 if test "$wxUSE_CHOICE" = "yes"; then


@@ -15299,13 +17200,7 @@ if test "$wxUSE_CHOICE" = "yes"; then
 #define wxUSE_CHOICE 1
 EOF
 
 #define wxUSE_CHOICE 1
 EOF
 

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

 fi
 
 if test "$wxUSE_CHECKBOX" = "yes"; then
 fi
 
 if test "$wxUSE_CHECKBOX" = "yes"; then


@@ -15313,6 +17208,7 @@ if test "$wxUSE_CHECKBOX" = "yes"; then
 #define wxUSE_CHECKBOX 1
 EOF
 
 #define wxUSE_CHECKBOX 1
 EOF
 

+  USES_CONTROLS=1

 fi
 
 if test "$wxUSE_CHECKLST" = "yes"; then
 fi
 
 if test "$wxUSE_CHECKLST" = "yes"; then


@@ -15320,6 +17216,7 @@ if test "$wxUSE_CHECKLST" = "yes"; then
 #define wxUSE_CHECKLISTBOX 1
 EOF
 
 #define wxUSE_CHECKLISTBOX 1
 EOF
 

+  USES_CONTROLS=1

   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS checklst"
 fi
 
   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS checklst"
 fi
 


@@ -15328,6 +17225,7 @@ if test "$wxUSE_GAUGE" = "yes"; then
 #define wxUSE_GAUGE 1
 EOF
 
 #define wxUSE_GAUGE 1
 EOF
 

+  USES_CONTROLS=1

 fi
 
 if test "$wxUSE_NEW_GRID" = "yes"; then
 fi
 
 if test "$wxUSE_NEW_GRID" = "yes"; then


@@ -15336,6 +17234,7 @@ if test "$wxUSE_NEW_GRID" = "yes"; then
 #define wxUSE_NEW_GRID 1
 EOF
 
 #define wxUSE_NEW_GRID 1
 EOF
 

+  USES_CONTROLS=1

   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS newgrid"
 fi
 
   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS newgrid"
 fi
 


@@ -15344,6 +17243,7 @@ if test "$wxUSE_GRID" = "yes"; then
 #define wxUSE_GRID 1
 EOF
 
 #define wxUSE_GRID 1
 EOF
 

+  USES_CONTROLS=1

   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS grid"
 fi
 
   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS grid"
 fi
 


@@ -15359,6 +17259,7 @@ if test "$wxUSE_LISTBOX" = "yes"; then
 #define wxUSE_LISTBOX 1
 EOF
 
 #define wxUSE_LISTBOX 1
 EOF
 

+    USES_CONTROLS=1

 fi
 
 if test "$wxUSE_LISTCTRL" = "yes"; then
 fi
 
 if test "$wxUSE_LISTCTRL" = "yes"; then


@@ -15367,6 +17268,7 @@ if test "$wxUSE_LISTCTRL" = "yes"; then
 #define wxUSE_LISTCTRL 1
 EOF
 
 #define wxUSE_LISTCTRL 1
 EOF
 

+        USES_CONTROLS=1

         SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS listctrl"
     else
         echo "configure: warning: wxListCtrl requires wxImageList and won't be compiled without it" 1>&2
         SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS listctrl"
     else
         echo "configure: warning: wxListCtrl requires wxImageList and won't be compiled without it" 1>&2


@@ -15378,6 +17280,7 @@ if test "$wxUSE_NOTEBOOK" = "yes"; then
 #define wxUSE_NOTEBOOK 1
 EOF
 
 #define wxUSE_NOTEBOOK 1
 EOF
 

+    USES_CONTROLS=1

     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS notebook"
 fi
 
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS notebook"
 fi
 


@@ -15386,6 +17289,7 @@ if test "$wxUSE_RADIOBOX" = "yes"; then
 #define wxUSE_RADIOBOX 1
 EOF
 
 #define wxUSE_RADIOBOX 1
 EOF
 

+    USES_CONTROLS=1

 fi
 
 if test "$wxUSE_RADIOBTN" = "yes"; then
 fi
 
 if test "$wxUSE_RADIOBTN" = "yes"; then


@@ -15393,6 +17297,7 @@ if test "$wxUSE_RADIOBTN" = "yes"; then
 #define wxUSE_RADIOBTN 1
 EOF
 
 #define wxUSE_RADIOBTN 1
 EOF
 

+    USES_CONTROLS=1

 fi
 
 if test "$wxUSE_SASH" = "yes"; then
 fi
 
 if test "$wxUSE_SASH" = "yes"; then


@@ -15408,6 +17313,7 @@ if test "$wxUSE_SCROLLBAR" = "yes"; then
 #define wxUSE_SCROLLBAR 1
 EOF
 
 #define wxUSE_SCROLLBAR 1
 EOF
 

+    USES_CONTROLS=1

     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS scroll scrollsub"
 fi
 
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS scroll scrollsub"
 fi
 


@@ -15416,6 +17322,7 @@ if test "$wxUSE_SLIDER" = "yes"; then
 #define wxUSE_SLIDER 1
 EOF
 
 #define wxUSE_SLIDER 1
 EOF
 

+    USES_CONTROLS=1

 fi
 
 if test "$wxUSE_SPINBTN" = "yes"; then
 fi
 
 if test "$wxUSE_SPINBTN" = "yes"; then


@@ -15423,6 +17330,7 @@ if test "$wxUSE_SPINBTN" = "yes"; then
 #define wxUSE_SPINBTN 1
 EOF
 
 #define wxUSE_SPINBTN 1
 EOF
 

+    USES_CONTROLS=1

 fi
 
 if test "$wxUSE_SPINCTRL" = "yes"; then
 fi
 
 if test "$wxUSE_SPINCTRL" = "yes"; then


@@ -15430,6 +17338,7 @@ if test "$wxUSE_SPINCTRL" = "yes"; then
 #define wxUSE_SPINCTRL 1
 EOF
 
 #define wxUSE_SPINCTRL 1
 EOF
 

+    USES_CONTROLS=1

 fi
 
 if test "$wxUSE_SPLITTER" = "yes"; then
 fi
 
 if test "$wxUSE_SPLITTER" = "yes"; then


@@ -15445,6 +17354,7 @@ if test "$wxUSE_STATBMP" = "yes"; then
 #define wxUSE_STATBMP 1
 EOF
 
 #define wxUSE_STATBMP 1
 EOF
 

+    USES_CONTROLS=1

 fi
 
 if test "$wxUSE_STATBOX" = "yes"; then
 fi
 
 if test "$wxUSE_STATBOX" = "yes"; then


@@ -15452,6 +17362,15 @@ if test "$wxUSE_STATBOX" = "yes"; then
 #define wxUSE_STATBOX 1
 EOF
 
 #define wxUSE_STATBOX 1
 EOF
 

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

 fi
 
 if test "$wxUSE_STATLINE" = "yes"; then
 fi
 
 if test "$wxUSE_STATLINE" = "yes"; then


@@ -15462,6 +17381,7 @@ if test "$wxUSE_STATLINE" = "yes"; then
 #define wxUSE_STATLINE 1
 EOF
 
 #define wxUSE_STATLINE 1
 EOF
 

+        USES_CONTROLS=1

     fi
 fi
 
     fi
 fi
 


@@ -15470,6 +17390,7 @@ if test "$wxUSE_STATUSBAR" = "yes"; then
 #define wxUSE_STATUSBAR 1
 EOF
 
 #define wxUSE_STATUSBAR 1
 EOF
 

+    USES_CONTROLS=1

 
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS statbar"
 fi
 
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS statbar"
 fi


@@ -15482,11 +17403,28 @@ EOF
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS tab"
 fi
 
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS tab"
 fi
 

+if test "$wxUSE_TEXTCTRL" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_TEXTCTRL 1
+EOF
+
+    USES_CONTROLS=1
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS text"
+fi
+

 if test "$wxUSE_TOGGLEBTN" = "yes"; then
 if test "$wxUSE_TOGGLEBTN" = "yes"; then

-  cat >> confdefs.h <<\EOF
+    if test "$wxUSE_MAC" = 1; then
+        echo "configure: warning: Toggle button is not yet supported under Mac OS X" 1>&2
+        wxUSE_TOGGLEBTN=no
+    fi
+
+    if test "$wxUSE_TOGGLEBTN" = "yes"; then
+        cat >> confdefs.h <<\EOF

 #define wxUSE_TOGGLEBTN 1
 EOF
 
 #define wxUSE_TOGGLEBTN 1
 EOF
 

+        USES_CONTROLS=1
+    fi

 fi
 
 if test "$wxUSE_TOOLBAR_SIMPLE" = "yes"; then
 fi
 
 if test "$wxUSE_TOOLBAR_SIMPLE" = "yes"; then


@@ -15495,6 +17433,7 @@ if test "$wxUSE_TOOLBAR_SIMPLE" = "yes"; then
 EOF
 
     wxUSE_TOOLBAR="yes"
 EOF
 
     wxUSE_TOOLBAR="yes"

+    USES_CONTROLS=1

 fi
 
 if test "$wxUSE_TOOLBAR" = "yes"; then
 fi
 
 if test "$wxUSE_TOOLBAR" = "yes"; then


@@ -15502,19 +17441,21 @@ if test "$wxUSE_TOOLBAR" = "yes"; then
 #define wxUSE_TOOLBAR 1
 EOF
 
 #define wxUSE_TOOLBAR 1
 EOF
 

+    USES_CONTROLS=1

 
         if test "$wxUSE_TOOLBAR_SIMPLE" != "yes"; then
         wxUSE_TOOLBAR_NATIVE="yes"
     fi
 
 
         if test "$wxUSE_TOOLBAR_SIMPLE" != "yes"; then
         wxUSE_TOOLBAR_NATIVE="yes"
     fi
 

-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS toolbar"
-fi
-
-if test "$wxUSE_TOOLBAR_NATIVE" = "yes"; then
-    cat >> confdefs.h <<\EOF
+    if test "$wxUSE_TOOLBAR_NATIVE" = "yes"; then
+        cat >> confdefs.h <<\EOF

 #define wxUSE_TOOLBAR_NATIVE 1
 EOF
 
 #define wxUSE_TOOLBAR_NATIVE 1
 EOF
 

+        USES_CONTROLS=1
+    fi
+
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS toolbar"

 fi
 
 if test "$wxUSE_TOOLTIPS" = "yes"; then
 fi
 
 if test "$wxUSE_TOOLTIPS" = "yes"; then


@@ -15538,56 +17479,69 @@ if test "$wxUSE_TREECTRL" = "yes"; then
 #define wxUSE_TREECTRL 1
 EOF
 
 #define wxUSE_TREECTRL 1
 EOF
 

+        USES_CONTROLS=1

         SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS treectrl"
     else
         echo "configure: warning: wxTreeCtrl requires wxImageList and won't be compiled without it" 1>&2
     fi
 fi
 
         SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS treectrl"
     else
         echo "configure: warning: wxTreeCtrl requires wxImageList and won't be compiled without it" 1>&2
     fi
 fi
 

-
-
-if test "$wxUSE_DIRDLG" = "yes"; then
-    if test "$wxUSE_CONSTRAINTS" != "yes"; then
-       echo "configure: warning: wxDirDialog requires constraints so it won't be compiled without them" 1>&2
+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

     else
     else

-        if test "$wxUSE_TREECTRL" != "yes"; then
-            echo "configure: warning: wxDirDialog requires wxTreeCtrl so it won't be compiled without it" 1>&2
-        else
-            cat >> confdefs.h <<\EOF
-#define wxUSE_DIRDLG 1
+        cat >> confdefs.h <<\EOF
+#define wxUSE_POPUPWIN 1

 EOF
 
 EOF
 

-        fi
+        USES_CONTROLS=1

     fi
 fi
 
     fi
 fi
 

-if test "$wxUSE_TEXTDLG" = "yes"; then
+if test "$USES_CONTROLS" = 1; then

     cat >> confdefs.h <<\EOF
     cat >> confdefs.h <<\EOF

-#define wxUSE_TEXTDLG 1
+#define wxUSE_CONTROLS 1

 EOF
 
 fi
 
 EOF
 
 fi
 

-if test "$wxUSE_STARTUP_TIPS" = "yes"; then
-    if test "$wxUSE_CONSTRAINTS" != "yes"; then
-       echo "configure: warning: Startup tips requires constraints and won't be compiled without them" 1>&2
-    else
-        cat >> confdefs.h <<\EOF
-#define wxUSE_STARTUP_TIPS 1
+
+
+if test "$wxUSE_DRAGIMAGE" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_DRAGIMAGE 1

 EOF
 
 EOF
 

-    fi
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dragimag"

 fi
 
 fi
 

-if test "$wxUSE_PROGRESSDLG" = "yes"; then
-    if test "$wxUSE_CONSTRAINTS" != "yes"; then
-       echo "configure: warning: wxProgressDialog requires constraints so it won't be compiled without them" 1>&2
-    else
-        cat >> confdefs.h <<\EOF
-#define wxUSE_PROGRESSDLG 1
+if test "$wxUSE_MENUS" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_MENUS 1
+EOF
+
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS menu"
+fi
+
+if test "$wxUSE_METAFILE" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_METAFILE 1
+EOF
+
+fi
+
+if test "$wxUSE_MIMETYPE" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_MIMETYPE 1
+EOF
+
+fi
+
+if test "$wxUSE_SYSTEM_OPTIONS" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_SYSTEM_OPTIONS 1

 EOF
 
 EOF
 

-    fi

 fi
 
 if test "$wxUSE_MINIFRAME" = "yes"; then
 fi
 
 if test "$wxUSE_MINIFRAME" = "yes"; then


@@ -15651,6 +17605,101 @@ EOF
 fi
 
 
 fi
 
 

+if test "$wxUSE_CHOICEDLG" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_CHOICEDLG 1
+EOF
+
+fi
+
+if test "$wxUSE_COLOURDLG" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_COLOURDLG 1
+EOF
+
+fi
+
+if test "$wxUSE_FILEDLG" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_FILEDLG 1
+EOF
+
+fi
+
+if test "$wxUSE_FONTDLG" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_FONTDLG 1
+EOF
+
+fi
+
+if test "$wxUSE_DIRDLG" = "yes"; then
+    if test "$wxUSE_CONSTRAINTS" != "yes"; then
+       echo "configure: warning: wxDirDialog requires constraints so it won't be compiled without them" 1>&2
+    else
+        if test "$wxUSE_TREECTRL" != "yes"; then
+            echo "configure: warning: wxDirDialog requires wxTreeCtrl so it won't be compiled without it" 1>&2
+        else
+            cat >> confdefs.h <<\EOF
+#define wxUSE_DIRDLG 1
+EOF
+
+        fi
+    fi
+fi
+
+if test "$wxUSE_MSGDLG" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_MSGDLG 1
+EOF
+
+fi
+
+if test "$wxUSE_NUMBERDLG" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_NUMBERDLG 1
+EOF
+
+fi
+
+if test "$wxUSE_PROGRESSDLG" = "yes"; then
+    if test "$wxUSE_CONSTRAINTS" != "yes"; then
+       echo "configure: warning: wxProgressDialog requires constraints so it won't be compiled without them" 1>&2
+    else
+        cat >> confdefs.h <<\EOF
+#define wxUSE_PROGRESSDLG 1
+EOF
+
+    fi
+fi
+
+if test "$wxUSE_STARTUP_TIPS" = "yes"; then
+    if test "$wxUSE_CONSTRAINTS" != "yes"; then
+       echo "configure: warning: Startup tips requires constraints and won't be compiled without them" 1>&2
+    else
+        cat >> confdefs.h <<\EOF
+#define wxUSE_STARTUP_TIPS 1
+EOF
+
+    fi
+fi
+
+if test "$wxUSE_TEXTDLG" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_TEXTDLG 1
+EOF
+
+fi
+
+if test "$wxUSE_WIZARDDLG" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_WIZARDDLG 1
+EOF
+
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS wizard"
+fi
+
+

 if test "$cross_compiling" = "yes"; then
         OSINFO="\"$host\""
 else
 if test "$cross_compiling" = "yes"; then
         OSINFO="\"$host\""
 else


@@ -15668,7 +17717,7 @@ 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"
 OPENGL_LIBS="$OPENGL_LINK"
 
 EXTRA_LIBS="$LIBS $POSIX4_LINK $INET_LINK $WCHAR_LINK $THREADS_LINK $DMALLOC_LINK $DL_LINK $ZLIB_LINK -lm"

-if test "$USE_MAC" = 1 ; then
+if test "$wxUSE_MAC" = 1 ; then

     EXTRA_LIBS="$EXTRA_LIBS -framework Carbon -framework System"
 fi
 if test "$wxUSE_GUI" = "yes"; then
     EXTRA_LIBS="$EXTRA_LIBS -framework Carbon -framework System"
 fi
 if test "$wxUSE_GUI" = "yes"; then


@@ -15677,7 +17726,9 @@ fi
 
 LD_LIBS="\${top_builddir}/lib/${WX_LIBRARY_NAME_STATIC} $EXTRA_LIBS"
 
 
 LD_LIBS="\${top_builddir}/lib/${WX_LIBRARY_NAME_STATIC} $EXTRA_LIBS"
 

-INCLUDES="-I. -I\${top_builddir}/include -I\${top_srcdir}/include $ZLIB_INCLUDE $PNG_INCLUDE $JPEG_INCLUDE $TIFF_INCLUDE $FREETYPE_INCLUDE $TOOLKIT_INCLUDE"
+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=""
 
 if test "$wxUSE_GTK" = 1; then
     WXCONFIG_INCLUDE=""


@@ -15697,9 +17748,13 @@ LDFLAGS="$LDFLAGS $PROFILE"
 
 if test "$wxUSE_GUI" = "yes"; then
         
 
 if test "$wxUSE_GUI" = "yes"; then
         

-            SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS controls dialogs dragimag \
-                     drawing dynamic event font fractal image menu \
-                     minimal richedit"
+            SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS controls dialogs \
+                     drawing dynamic event font fractal image \
+                     minimal richedit widgets"
+
+    if test "$wxUSE_UNIVERSAL" = "yes" ; then
+        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS univ"
+    fi

 
         CPPFLAGS="$CPPFLAGS \$(EXTRADEFS) \$(APPEXTRADEFS)"
 else
 
         CPPFLAGS="$CPPFLAGS \$(EXTRADEFS) \$(APPEXTRADEFS)"
 else


@@ -15796,11 +17851,13 @@ 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 $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6

-echo "configure:15804: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:17861: 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
 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


@@ -15829,9 +17886,9 @@ fi
 
 if test -d include; then
     if test -d include/wx; then
 
 if test -d include; then
     if test -d include/wx; then

-        if test -d include/wx/${TOOLKIT_DIR}; then
-            if test -f include/wx/${TOOLKIT_DIR}/setup.h; then
-                mv -f include/wx/${TOOLKIT_DIR}/setup.h setup.h
+        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
             fi
         fi
     fi


@@ -15845,6 +17902,8 @@ if test "$wxUSE_GUI" = "yes"; then
     wx_cv_program_ext=$PROGRAM_EXT
     wx_cv_target_library=$WX_TARGET_LIBRARY
     wx_cv_target_libtype=$WX_TARGET_LIBRARY_TYPE
     wx_cv_program_ext=$PROGRAM_EXT
     wx_cv_target_library=$WX_TARGET_LIBRARY
     wx_cv_target_libtype=$WX_TARGET_LIBRARY_TYPE

+            export wx_cv_path_samplesubdirs wx_cv_path_ifs wx_cv_program_ext \
+           wx_cv_target_library wx_cv_target_libtype

     subdirs="demos samples utils contrib"
 
 fi
     subdirs="demos samples utils contrib"
 
 fi


@@ -16018,9 +18077,9 @@ s%@LEX@%$LEX%g
 s%@LEXLIB@%$LEXLIB%g
 s%@LN_S@%$LN_S%g
 s%@GTK_CONFIG_2_0@%$GTK_CONFIG_2_0%g
 s%@LEXLIB@%$LEXLIB%g
 s%@LN_S@%$LN_S%g
 s%@GTK_CONFIG_2_0@%$GTK_CONFIG_2_0%g

-s%@GTK_CONFIG@%$GTK_CONFIG%g

 s%@GTK_CFLAGS@%$GTK_CFLAGS%g
 s%@GTK_LIBS@%$GTK_LIBS%g
 s%@GTK_CFLAGS@%$GTK_CFLAGS%g
 s%@GTK_LIBS@%$GTK_LIBS%g

+s%@GTK_CONFIG@%$GTK_CONFIG%g

 s%@X_CFLAGS@%$X_CFLAGS%g
 s%@X_PRE_LIBS@%$X_PRE_LIBS%g
 s%@X_LIBS@%$X_LIBS%g
 s%@X_CFLAGS@%$X_CFLAGS%g
 s%@X_PRE_LIBS@%$X_PRE_LIBS%g
 s%@X_LIBS@%$X_LIBS%g


@@ -16063,11 +18122,13 @@ 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%@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@%$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%@WXCONFIG_INCLUDE@%$WXCONFIG_INCLUDE%g
 s%@ALL_OBJECTS@%$ALL_OBJECTS%g
 s%@ALL_DEPFILES@%$ALL_DEPFILES%g
 s%@WXCONFIG_INCLUDE@%$WXCONFIG_INCLUDE%g
 s%@ALL_OBJECTS@%$ALL_OBJECTS%g
 s%@ALL_DEPFILES@%$ALL_DEPFILES%g


@@ -16317,7 +18378,7 @@ fi; done
 EOF
 cat >> $CONFIG_STATUS <<EOF
 
 EOF
 cat >> $CONFIG_STATUS <<EOF
 

-            TOOLKIT_DIR="${TOOLKIT_DIR}"
+            SETUPH_DIR="${SETUPH_DIR}"

             TOOLKIT_NAME="${TOOLKIT_NAME}"
             LN_S="${LN_S}"
           
             TOOLKIT_NAME="${TOOLKIT_NAME}"
             LN_S="${LN_S}"
           


@@ -16325,9 +18386,11 @@ cat >> $CONFIG_STATUS <<EOF
 EOF
 cat >> $CONFIG_STATUS <<\EOF
 
 EOF
 cat >> $CONFIG_STATUS <<\EOF
 

-            chmod +x wx-config
-            mv wx-config wx${TOOLKIT_NAME}-config
-            ${LN_S} wx${TOOLKIT_NAME}-config wx-config
+                                                if test ! -f wx${TOOLKIT_NAME}-config; then
+                chmod +x wx-config
+                mv wx-config wx${TOOLKIT_NAME}-config
+                ${LN_S} wx${TOOLKIT_NAME}-config wx-config
+            fi

 
                         
             if test ! -d lib; then
 
                         
             if test ! -d lib; then


@@ -16356,11 +18419,11 @@ cat >> $CONFIG_STATUS <<\EOF
             if test ! -d include/wx; then
               mkdir include/wx
             fi
             if test ! -d include/wx; then
               mkdir include/wx
             fi

-            if test ! -d include/wx/${TOOLKIT_DIR}; then
-              mkdir include/wx/${TOOLKIT_DIR}
+            if test ! -d include/wx/${SETUPH_DIR}; then
+              mkdir include/wx/${SETUPH_DIR}

             fi
             if test -f setup.h; then
             fi
             if test -f setup.h; then

-                cp -fp setup.h include/wx/${TOOLKIT_DIR}/setup.h
+                cp -fp setup.h include/wx/${SETUPH_DIR}/setup.h

             fi
 
           
             fi