]> git.saurik.com Git - wxWidgets.git/blobdiff - configure
added container class source
[wxWidgets.git] / configure
index 6ee9c8408cc14e6c19de7787f6e181b11c4a772b..52287b79e203c03dfb817c14a3829a066b7d2e53 100755 (executable)
--- a/configure
+++ b/configure
@@ -7,72 +7,18 @@
 
 
 
-# Do all the work for Automake.  This macro actually does too much --
-# some checks are only needed if your package does certain things.
-# But this isn't really a big deal.
 
-# serial 1
 
 
 
 
 
-# serial 1
 
 
 
-#
-# Check to make sure that the build environment is sane.
-#
-
-
-
-
-
-
-
-
-
-# serial 29 AM_PROG_LIBTOOL
-
-
-# AM_ENABLE_SHARED - implement the --enable-shared flag
-# Usage: AM_ENABLE_SHARED[(DEFAULT)]
-#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
-#   `yes'.
-
-
-# AM_DISABLE_SHARED - set the default shared flag to --disable-shared
-
 
-# AM_DISABLE_STATIC - set the default static flag to --disable-static
 
 
-# AM_ENABLE_STATIC - implement the --enable-static flag
-# Usage: AM_ENABLE_STATIC[(DEFAULT)]
-#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
-#   `yes'.
-
-
-
-# AM_PROG_LD - find the path to the GNU or non-GNU linker
-
-
-
-
-# AM_PROG_NM - find the path to a BSD-compatible name lister
-
-
-# AM_SYS_NM_PARSE - Check for command ro grab the raw symbol name followed
-# by C symbol name from nm.
-
-
-# AM_SYS_LIBTOOL_CYGWIN32 - find tools needed on cygwin32
-
-
-# AM_SYS_SYMBOL_UNDERSCORE - does the compiler prefix global symbols
-#                            with an underscore?
-
 
 
 
@@ -90,6 +36,8 @@
 
 
 
+# Configure paths for GTK+
+# Owen Taylor     97-11-3
 
 
 
@@ -108,35 +56,53 @@ ac_help=
 ac_default_prefix=/usr/local
 # Any additions from configure.in:
 ac_help="$ac_help
-  --with-gtk-prefix=PFX   prefix where GTK is installed"
+  --enable-gui            use GUI classes"
 ac_help="$ac_help
-  --with-gtk-exec-prefix=PFX  exec prefix where GTK is installed"
+  --enable-universal      use wxWindows GUI controls instead of native ones"
 ac_help="$ac_help
   --with-gtk              use GTK+"
 ac_help="$ac_help
   --with-motif            use Motif/Lesstif"
+ac_help="$ac_help
+  --with-mac              use Mac OS X"
+ac_help="$ac_help
+  --with-wine             use WINE"
 ac_help="$ac_help
   --with-cygwin           use Cygwin for MS-Windows"
 ac_help="$ac_help
   --with-mingw            use GCC Minimal MS-Windows"
 ac_help="$ac_help
-  --with-dmalloc          use dmalloc library (www.letters.com/dmalloc)"
+  --with-pm               use OS/2 Presentation Manager"
 ac_help="$ac_help
-  --with-zlib             use zlib for LZW compression"
+  --with-mgl              use MGL"
 ac_help="$ac_help
-  --with-libpng           use libpng (PNG image format)"
+  --enable-gtk2           use GTK+ 2.0 if available (EXPERIMENTAL)"
 ac_help="$ac_help
-  --with-libgif          use libgif (GIF file format)"
+  --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-optimize       create optimized code"
+  --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
@@ -150,7 +116,17 @@ ac_help="$ac_help
 ac_help="$ac_help
   --enable-profile        create code with profiling information"
 ac_help="$ac_help
-  --enable-gui            use GUI classes"
+  --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
   --enable-intl           use internationalization system"
 ac_help="$ac_help
@@ -159,30 +135,66 @@ ac_help="$ac_help
   --enable-sockets        use socket/network classes"
 ac_help="$ac_help
   --enable-ipc            use interprocess communication (wxSocket etc.)"
+ac_help="$ac_help
+  --enable-cmdline        use wxCmdLineParser class"
+ac_help="$ac_help
+  --enable-datetime       use wxDateTime class"
+ac_help="$ac_help
+  --enable-timedate       use obsolete wxDate/wxTime classes"
+ac_help="$ac_help
+  --enable-stopwatch      use wxStopWatch class"
+ac_help="$ac_help
+  --enable-dialupman      use dialup network classes"
 ac_help="$ac_help
   --enable-apple_ieee     use the Apple IEEE codec"
 ac_help="$ac_help
-  --enable-timedate       use date/time classes"
+  --enable-timer          use wxTimer class"
+ac_help="$ac_help
+  --enable-wave           use wxWave class"
 ac_help="$ac_help
   --enable-fraction       use wxFraction class"
 ac_help="$ac_help
   --enable-dynlib         use wxLibrary class for DLL loading"
 ac_help="$ac_help
   --enable-longlong       use wxLongLong class"
+ac_help="$ac_help
+  --enable-geometry       use geometry class"
 ac_help="$ac_help
   --enable-log            use logging system"
 ac_help="$ac_help
   --enable-streams        use wxStream etc classes"
 ac_help="$ac_help
   --enable-file           use wxFile classes"
+ac_help="$ac_help
+  --enable-ffile          use wxFFile classes"
 ac_help="$ac_help
   --enable-textfile       use wxTextFile classes"
+ac_help="$ac_help
+  --enable-fontmap        use font encodings conversion classes"
 ac_help="$ac_help
   --enable-unicode        compile wxString with Unicode support"
 ac_help="$ac_help
   --enable-wcsrtombs      use wcsrtombs instead of buggy (GNU libc1/Linux libc5) wcstombs"
 ac_help="$ac_help
-  --enable-joystick       compile in joystick support (Linux only)"
+  --enable-wxprintfv      use wxWindows implementation of vprintf()"
+ac_help="$ac_help
+  --enable-std_iostreams  use standard C++ stream classes"
+ac_help="$ac_help
+  --enable-filesystem     use virtual file systems classes"
+ac_help="$ac_help
+  --enable-fs_inet        use virtual HTTP/FTP filesystems"
+ac_help="$ac_help
+  --enable-fs_zip         use virtual ZIP filesystems"
+ac_help="$ac_help
+  --enable-zipstream      use wxZipInputStream"
+ac_help="$ac_help
+  --enable-catch_segvs    catch signals and pass them to wxApp::OnFatalException"
+ac_help="$ac_help
+  --enable-snglinst       use wxSingleInstanceChecker class"
+ac_help="$ac_help
+  --enable-mimetypes      use wxMimeTypesManager"
+ac_help="$ac_help
+  --enable-sysoptions      use wxSystemOptions"
 ac_help="$ac_help
   --enable-threads        use threads"
 ac_help="$ac_help
@@ -190,13 +202,23 @@ ac_help="$ac_help
 ac_help="$ac_help
   --enable-docview        use document view architecture"
 ac_help="$ac_help
-  --enable-help           use help (using external browser at present)"
+  --enable-help           use help subsystem"
+ac_help="$ac_help
+  --enable-mshtmlhelp     use MS HTML Help (win32)"
+ac_help="$ac_help
+  --enable-html           use wxHTML sub-library"
+ac_help="$ac_help
+  --enable-htmlhelp       use wxHTML-based help"
 ac_help="$ac_help
   --enable-constraints    use layout-constraints system"
 ac_help="$ac_help
   --enable-printarch      use printing architecture"
 ac_help="$ac_help
   --enable-mdi            use multiple document interface architecture"
+ac_help="$ac_help
+  --enable-loggui         use standard GUI logger"
+ac_help="$ac_help
+  --enable-logwin         use wxLogWindow"
 ac_help="$ac_help
   --enable-postscript     use wxPostscriptDC device context (default for gtk+)"
 ac_help="$ac_help
@@ -210,25 +232,35 @@ ac_help="$ac_help
 ac_help="$ac_help
   --enable-dnd            use Drag'n'Drop classes"
 ac_help="$ac_help
-  --enable-wxtree         make wxTree library"
+  --enable-metafile       use win32 metafiles"
+ac_help="$ac_help
+  --enable-treelayout     use wxTreeLayout classes"
 ac_help="$ac_help
   --enable-controls       use all usual controls"
 ac_help="$ac_help
   --enable-accel          use accelerators"
 ac_help="$ac_help
-  --enable-caret          use wxCaret class"
+  --enable-button         use wxButton class"
 ac_help="$ac_help
   --enable-bmpbutton      use wxBitmapButton class"
+ac_help="$ac_help
+  --enable-calendar       use wxCalendarCtrl class"
+ac_help="$ac_help
+  --enable-caret          use wxCaret class"
 ac_help="$ac_help
   --enable-checkbox       use wxCheckBox class"
 ac_help="$ac_help
   --enable-checklst       use wxCheckListBox (listbox with checkboxes) class"
 ac_help="$ac_help
-  --enable-combobox       use wxChoice and wxComboBox classes"
+  --enable-choice         use wxChoice class"
+ac_help="$ac_help
+  --enable-combobox       use wxComboBox classes"
 ac_help="$ac_help
   --enable-gauge          use wxGauge class"
 ac_help="$ac_help
   --enable-grid           use wxGrid class"
+ac_help="$ac_help
+  --enable-newgrid        use new wxGrid class"
 ac_help="$ac_help
   --enable-imaglist       use wxImageList class"
 ac_help="$ac_help
@@ -237,6 +269,8 @@ ac_help="$ac_help
   --enable-listctrl       use wxListCtrl class"
 ac_help="$ac_help
   --enable-notebook       use wxNotebook class"
+ac_help="$ac_help
+  --enable-propsheet      use wxPropertySheet class"
 ac_help="$ac_help
   --enable-radiobox       use wxRadioBox class"
 ac_help="$ac_help
@@ -249,24 +283,66 @@ ac_help="$ac_help
   --enable-slider         use wxSlider class"
 ac_help="$ac_help
   --enable-spinbtn        use wxSpinButton class"
+ac_help="$ac_help
+  --enable-spinctrl       use wxSpinCtrl class"
 ac_help="$ac_help
   --enable-splitter       use wxSplitterWindow class"
 ac_help="$ac_help
-  --enable-statbmp         use wxStaticBitmap class"
+  --enable-statbmp        use wxStaticBitmap class"
 ac_help="$ac_help
-  --enable-statbox       use wxStaticBox class"
+  --enable-statbox        use wxStaticBox class"
 ac_help="$ac_help
   --enable-statline       use wxStaticLine class"
+ac_help="$ac_help
+  --enable-stattext       use wxStaticText class"
 ac_help="$ac_help
   --enable-statusbar      use wxStatusBar class"
 ac_help="$ac_help
-  --enable-tabdialog        use wxTabControl class"
+  --enable-tabdialog      use wxTabControl class"
+ac_help="$ac_help
+  --enable-textctrl       use wxTextCtrl class"
+ac_help="$ac_help
+  --enable-togglebtn      use wxToggleButton class"
 ac_help="$ac_help
-  --enable-toolbar      use wxToolBar class"
+  --enable-toolbar        use wxToolBar class"
+ac_help="$ac_help
+  --enable-tbarnative     use native wxToolBar class"
+ac_help="$ac_help
+  --enable-tbarsmpl       use wxToolBarSimple class"
 ac_help="$ac_help
   --enable-treectrl       use wxTreeCtrl class"
+ac_help="$ac_help
+  --enable-popupwin       use wxPopUpWindow class"
 ac_help="$ac_help
   --enable-commondlg      use common dialogs (wxDirDialog, wxProgressDialog, wxTextDialog, ...)"
+ac_help="$ac_help
+  --enable-choicedlg      use wxChoiceDialog"
+ac_help="$ac_help
+  --enable-coldlg         use wxColourDialog"
+ac_help="$ac_help
+  --enable-filedlg        use wxFileDialog"
+ac_help="$ac_help
+  --enable-finddlg        use wxFindReplaceDialog"
+ac_help="$ac_help
+  --enable-fontdlg        use wxFontDialog"
+ac_help="$ac_help
+  --enable-dirdlg         use wxDirDialog"
+ac_help="$ac_help
+  --enable-msgdlg         use wxMessageDialog"
+ac_help="$ac_help
+  --enable-numberdlg      use wxNumberEntryDialog"
+ac_help="$ac_help
+  --enable-splash         use wxSplashScreen"
+ac_help="$ac_help
+  --enable-textdlg        use wxTextDialog"
+ac_help="$ac_help
+  --enable-tipdlg         use startup tips"
+ac_help="$ac_help
+  --enable-progressdlg    use wxProgressDialog"
+ac_help="$ac_help
+  --enable-wizarddlg      use wxWizard"
+ac_help="$ac_help
+  --enable-menus          use wxMenu/wxMenuBar/wxMenuItem classes"
 ac_help="$ac_help
   --enable-miniframe      use wxMiniFrame class"
 ac_help="$ac_help
@@ -276,23 +352,31 @@ ac_help="$ac_help
 ac_help="$ac_help
   --enable-validators     use wxValidator and derived classes"
 ac_help="$ac_help
-  --enable-static[=PKGS]  build static libraries [default=no]"
+  --enable-busyinfo       use wxBusyInfo"
+ac_help="$ac_help
+  --enable-joystick       compile in joystick support (Linux only)"
 ac_help="$ac_help
-  --enable-shared[=PKGS]  build shared libraries [default=yes]"
+  --enable-metafiles      use wxMetaFile (Windows only)"
 ac_help="$ac_help
-  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]"
+  --enable-dragimage      use wxDragImage"
 ac_help="$ac_help
-  --disable-libtool-lock  force libtool not to do file locking"
+  --enable-image          use wxImage class"
 ac_help="$ac_help
-  --with-x                use the X Window System"
+  --enable-gif            use gif images (GIF file format)"
 ac_help="$ac_help
-**--with-gtk-prefix=PFX       Prefix where GTK is installed"
+  --enable-pcx            use pcx images (PCX file format)"
 ac_help="$ac_help
-**--with-gtk-exec-prefix=PFX  Exec prefix where GTK is installed"
+  --enable-pnm            use pnm images (PNM file format)"
 ac_help="$ac_help
-**--with-gtk-prefix=PFX       Prefix where GTK is installed"
+  --enable-xpm            use xpm images (XPM file format)"
 ac_help="$ac_help
-**--with-gtk-exec-prefix=PFX  Exec prefix where GTK is installed"
+  --with-gtk-prefix=PFX   Prefix where GTK is installed (optional)"
+ac_help="$ac_help
+  --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional)"
+ac_help="$ac_help
+  --disable-gtktest       Do not try to compile and run a test GTK program"
+ac_help="$ac_help
+  --with-x                use the X Window System"
 
 # Initialize some variables set by options.
 # The variables have the same names as the options, with
@@ -824,13 +908,34 @@ ac_config_sub=$ac_aux_dir/config.sub
 ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
 
 
+# Do some error checking and defaulting for the host and target type.
+# The inputs are:
+#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
+#
+# The rules are:
+# 1. You are not allowed to specify --host, --target, and nonopt at the
+#    same time.
+# 2. Host defaults to nonopt.
+# 3. If nonopt is not specified, then host defaults to the current host,
+#    as determined by config.guess.
+# 4. Target and build default to nonopt.
+# 5. If nonopt is not specified, then target and build default to host.
+
+# The aliases save the names the user supplied, while $host etc.
+# will get canonicalized.
+case $host---$target---$nonopt in
+NONE---*---* | *---NONE---* | *---*---NONE) ;;
+*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
+esac
+
+
 # Make sure we can run config.sub.
 if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
 else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:834: checking host system type" >&5
+echo "configure:939: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -850,249 +955,67 @@ host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$host" 1>&6
 
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# 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:866: 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
-else
-    IFS="${IFS=        }"; ac_save_IFS="$IFS"; IFS=":"
-  for ac_dir in $PATH; do
-    # Account for people who put trailing slashes in PATH elements.
-    case "$ac_dir/" in
-    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
-    *)
-      # OSF1 and SCO ODT 3.0 have their own names for install.
-      # Don't use installbsd from OSF since it installs stuff as root
-      # by default.
-      for ac_prog in ginstall scoinst install; do
-        if test -f $ac_dir/$ac_prog; then
-         if test $ac_prog = install &&
-            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
-           # AIX install.  It has an incompatible calling convention.
-           :
-         else
-           ac_cv_path_install="$ac_dir/$ac_prog -c"
-           break 2
-         fi
-       fi
-      done
-      ;;
-    esac
-  done
-  IFS="$ac_save_IFS"
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL="$ac_cv_path_install"
-  else
-    # As a last resort, use the slow shell script.  We don't cache a
-    # path for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the path is relative.
-    INSTALL="$ac_install_sh"
-  fi
-fi
-echo "$ac_t""$INSTALL" 1>&6
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:919: checking whether build environment is sane" >&5
-# Just in case
-sleep 1
-echo timestamp > conftestfile
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
-   if test "$*" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftestfile`
-   fi
-   if test "$*" != "X $srcdir/configure conftestfile" \
-      && test "$*" != "X conftestfile $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      { echo "configure: error: ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" 1>&2; exit 1; }
-   fi
-
-   test "$2" = conftestfile
-   )
-then
-   # Ok.
-   :
-else
-   { echo "configure: error: newly created file is older than distributed files!
-Check your system clock" 1>&2; exit 1; }
-fi
-rm -f conftest*
-echo "$ac_t""yes" 1>&6
-if test "$program_transform_name" = s,x,x,; then
-  program_transform_name=
-else
-  # Double any \ or $.  echo might interpret backslashes.
-  cat <<\EOF_SED > conftestsed
-s,\\,\\\\,g; s,\$,$$,g
-EOF_SED
-  program_transform_name="`echo $program_transform_name|sed -f conftestsed`"
-  rm -f conftestsed
-fi
-test "$program_prefix" != NONE &&
-  program_transform_name="s,^,${program_prefix},; $program_transform_name"
-# Use a double $ so make ignores it.
-test "$program_suffix" != NONE &&
-  program_transform_name="s,\$\$,${program_suffix},; $program_transform_name"
-
-# sed with no file args requires a program.
-test "$program_transform_name" = "" && program_transform_name="s,x,x,"
-
-echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:976: 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
-else
-  cat > conftestmake <<\EOF
-all:
-       @echo 'ac_maketemp="${MAKE}"'
-EOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=`
-if test -n "$ac_maketemp"; then
-  eval ac_cv_prog_make_${ac_make}_set=yes
-else
-  eval ac_cv_prog_make_${ac_make}_set=no
-fi
-rm -f conftestmake
-fi
-if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  SET_MAKE=
-else
-  echo "$ac_t""no" 1>&6
-  SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-
-PACKAGE=wxWindows
-
-VERSION=2.1.0
-
-if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
-  { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
-fi
-cat >> confdefs.h <<EOF
-#define PACKAGE "$PACKAGE"
-EOF
+echo $ac_n "checking target system type""... $ac_c" 1>&6
+echo "configure:960: checking target system type" >&5
 
-cat >> confdefs.h <<EOF
-#define VERSION "$VERSION"
-EOF
+target_alias=$target
+case "$target_alias" in
+NONE)
+  case $nonopt in
+  NONE) target_alias=$host_alias ;;
+  *) target_alias=$nonopt ;;
+  esac ;;
+esac
 
+target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
+target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+echo "$ac_t""$target" 1>&6
 
+echo $ac_n "checking build system type""... $ac_c" 1>&6
+echo "configure:978: checking build system type" >&5
 
-missing_dir=`cd $ac_aux_dir && pwd`
-echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
-echo "configure:1022: checking for working aclocal" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (aclocal --version) < /dev/null > /dev/null 2>&1; then
-   ACLOCAL=aclocal
-   echo "$ac_t""found" 1>&6
-else
-   ACLOCAL="$missing_dir/missing aclocal"
-   echo "$ac_t""missing" 1>&6
-fi
+build_alias=$build
+case "$build_alias" in
+NONE)
+  case $nonopt in
+  NONE) build_alias=$host_alias ;;
+  *) build_alias=$nonopt ;;
+  esac ;;
+esac
 
-echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:1035: checking for working autoconf" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (autoconf --version) < /dev/null > /dev/null 2>&1; then
-   AUTOCONF=autoconf
-   echo "$ac_t""found" 1>&6
-else
-   AUTOCONF="$missing_dir/missing autoconf"
-   echo "$ac_t""missing" 1>&6
-fi
+build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
+build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+echo "$ac_t""$build" 1>&6
 
-echo $ac_n "checking for working automake""... $ac_c" 1>&6
-echo "configure:1048: checking for working automake" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (automake --version) < /dev/null > /dev/null 2>&1; then
-   AUTOMAKE=automake
-   echo "$ac_t""found" 1>&6
-else
-   AUTOMAKE="$missing_dir/missing automake"
-   echo "$ac_t""missing" 1>&6
-fi
+test "$host_alias" != "$target_alias" &&
+  test "$program_prefix$program_suffix$program_transform_name" = \
+    NONENONEs,x,x, &&
+  program_prefix=${target_alias}-
 
-echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:1061: checking for working autoheader" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (autoheader --version) < /dev/null > /dev/null 2>&1; then
-   AUTOHEADER=autoheader
-   echo "$ac_t""found" 1>&6
-else
-   AUTOHEADER="$missing_dir/missing autoheader"
-   echo "$ac_t""missing" 1>&6
-fi
 
-echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:1074: checking for working makeinfo" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (makeinfo --version) < /dev/null > /dev/null 2>&1; then
-   MAKEINFO=makeinfo
-   echo "$ac_t""found" 1>&6
-else
-   MAKEINFO="$missing_dir/missing makeinfo"
-   echo "$ac_t""missing" 1>&6
-fi
 
+WX_MAJOR_VERSION_NUMBER=2
+WX_MINOR_VERSION_NUMBER=3
+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_MAJOR_VERSION_NUMBER=2
-WX_MINOR_VERSION_NUMBER=1
-WX_RELEASE_NUMBER=0
+WX_CURRENT=1
+WX_REVISION=0
+WX_AGE=0
 
-LIBOBJS=
-LIBOBJS="$LIBOBJS common/extended.o"
 
 
 USE_UNIX=1
+USE_WIN32=0
+USE_BEOS=0
+USE_MAC=0
+
 USE_LINUX=
 USE_SGI=
 USE_HPUX=
@@ -1105,21 +1028,43 @@ USE_SUNOS=
 USE_ALPHA=
 USE_OSF=
 USE_BSD=
+USE_DARWIN=
 USE_FREEBSD=
+USE_OPENBSD=
+USE_NETBSD=
 USE_VMS=
 USE_ULTRIX=
 USE_CYGWIN=
-USE_MINGW32=
+USE_MINGW=
 USE_DATA_GENERAL=
 
+NEEDS_D_REENTRANT_FOR_R_FUNCS=0
+
+ALL_TOOLKITS="CYGWIN GTK MAC MGL MINGW MOTIF PM WINE"
+
 DEFAULT_wxUSE_GTK=0
+DEFAULT_wxUSE_MAC=0
+DEFAULT_wxUSE_MGL=0
 DEFAULT_wxUSE_MOTIF=0
 DEFAULT_wxUSE_MSW=0
+DEFAULT_wxUSE_PM=0
+DEFAULT_wxUSE_WINE=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_PM=0
+DEFAULT_DEFAULT_wxUSE_WINE=0
+
+PROGRAM_EXT=
 
 case "${host}" in
   *-hp-hpux* )
     USE_HPUX=1
-    DEFAULT_wxUSE_MOTIF=1
+    DEFAULT_DEFAULT_wxUSE_MOTIF=1
+    NEEDS_D_REENTRANT_FOR_R_FUNCS=1
     cat >> confdefs.h <<\EOF
 #define __HPUX__ 1
 EOF
@@ -1139,7 +1084,7 @@ EOF
 EOF
 
     fi
-    DEFAULT_wxUSE_GTK=1
+    DEFAULT_DEFAULT_wxUSE_GTK=1
   ;;
   *-*-irix5* | *-*-irix6* )
     USE_SGI=1
@@ -1152,7 +1097,7 @@ EOF
 #define __SVR4__ 1
 EOF
 
-    DEFAULT_wxUSE_MOTIF=1
+    DEFAULT_DEFAULT_wxUSE_MOTIF=1
   ;;
   *-*-solaris2* )
     USE_SUN=1
@@ -1170,7 +1115,8 @@ EOF
 #define __SVR4__ 1
 EOF
 
-    DEFAULT_wxUSE_MOTIF=1
+    DEFAULT_DEFAULT_wxUSE_MOTIF=1
+    NEEDS_D_REENTRANT_FOR_R_FUNCS=1
   ;;
   *-*-sunos4* )
     USE_SUN=1
@@ -1188,9 +1134,9 @@ EOF
 #define __BSD__ 1
 EOF
 
-    DEFAULT_wxUSE_MOTIF=1
+    DEFAULT_DEFAULT_wxUSE_MOTIF=1
   ;;
-  *-*-freebsd* | *-*-netbsd*)
+  *-*-freebsd*)
     USE_BSD=1
     USE_FREEBSD=1
     cat >> confdefs.h <<\EOF
@@ -1201,7 +1147,33 @@ EOF
 #define __BSD__ 1
 EOF
 
-    DEFAULT_wxUSE_GTK=1
+    DEFAULT_DEFAULT_wxUSE_GTK=1
+  ;;
+  *-*-openbsd*)
+    USE_BSD=1
+    USE_OPENBSD=1
+    cat >> confdefs.h <<\EOF
+#define __FREEBSD__ 1
+EOF
+
+    cat >> confdefs.h <<\EOF
+#define __OPENBSD__ 1
+EOF
+
+    DEFAULT_DEFAULT_wxUSE_GTK=1
+  ;;
+  *-*-netbsd*)
+    USE_BSD=1
+    USE_NETBSD=1
+    cat >> confdefs.h <<\EOF
+#define __FREEBSD__ 1
+EOF
+
+    cat >> confdefs.h <<\EOF
+#define __NETBSD__ 1
+EOF
+
+    DEFAULT_DEFAULT_wxUSE_GTK=1
   ;;
   *-*-osf* )
     USE_ALPHA=1
@@ -1214,7 +1186,8 @@ EOF
 #define __OSF__ 1
 EOF
 
-    DEFAULT_wxUSE_MOTIF=1
+    DEFAULT_DEFAULT_wxUSE_MOTIF=1
+    NEEDS_D_REENTRANT_FOR_R_FUNCS=1
   ;;
   *-*-dgux5* )
     USE_ALPHA=1
@@ -1227,7 +1200,7 @@ EOF
 #define __SVR4__ 1
 EOF
 
-    DEFAULT_wxUSE_MOTIF=1
+    DEFAULT_DEFAULT_wxUSE_MOTIF=1
   ;;
   *-*-sysv5* )
     USE_SYSV=1
@@ -1240,7 +1213,7 @@ EOF
 #define __SVR4__ 1
 EOF
 
-    DEFAULT_wxUSE_MOTIF=1
+    DEFAULT_DEFAULT_wxUSE_MOTIF=1
   ;;
   *-*-aix* )
     USE_AIX=1
@@ -1258,110 +1231,212 @@ EOF
 #define __SVR4__ 1
 EOF
 
-    DEFAULT_wxUSE_MOTIF=1
+    DEFAULT_DEFAULT_wxUSE_MOTIF=1
+  ;;
+
+  *-*-cygwin* | *-*-mingw32* )
+    USE_UNIX=0
+    USE_WIN32=1
+    cat >> confdefs.h <<\EOF
+#define __WIN32__ 1
+EOF
+
+    cat >> confdefs.h <<\EOF
+#define __WIN95__ 1
+EOF
+
+    cat >> confdefs.h <<\EOF
+#define __WINDOWS__ 1
+EOF
+
+    cat >> confdefs.h <<\EOF
+#define __GNUWIN32__ 1
+EOF
+
+    cat >> confdefs.h <<\EOF
+#define STRICT 1
+EOF
+
+    cat >> confdefs.h <<\EOF
+#define WINVER 0x0400
+EOF
+
+    PROGRAM_EXT=".exe"
+    DEFAULT_DEFAULT_wxUSE_MSW=1
+  ;;
+
+  *-pc-os2_emx )
+    cat >> confdefs.h <<\EOF
+#define __EMX__ 1
+EOF
+
+    PROGRAM_EXT=".exe"
+    DEFAULT_DEFAULT_wxUSE_PM=1
+  ;;
+
+  *-*-darwin* )
+    USE_BSD=1
+    USE_DARWIN=1
+    cat >> confdefs.h <<\EOF
+#define __BSD__ 1
+EOF
+
+    cat >> confdefs.h <<\EOF
+#define __DARWIN__ 1
+EOF
+
+    cat >> confdefs.h <<\EOF
+#define __UNIX__ 1
+EOF
+
+    DEFAULT_DEFAULT_wxUSE_MAC=1
+  ;;
+
+  *-*-beos* )
+        USE_BEOS=1
+    cat >> confdefs.h <<\EOF
+#define __BEOS__ 1
+EOF
+
   ;;
+
   *)
-    { echo "configure: error: unknown system type $(host)." 1>&2; exit 1; }
+    { echo "configure: error: unknown system type ${host}." 1>&2; exit 1; }
 esac
 
 if test "$USE_UNIX" = 1 ; then
-  wxUSE_UNIX=yes
-  cat >> confdefs.h <<\EOF
+    wxUSE_UNIX=yes
+    cat >> confdefs.h <<\EOF
 #define __UNIX__ 1
 EOF
 
-  EXTRA_VPATH="$EXTRA_VPATH:\$(srcdir)/unix"
-  INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS unix"
+
+    SRC_SUBDIRS="$SRC_SUBDIRS unix"
+    INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS unix"
+fi
+
+if test "$USE_BEOS" = 1; then
+    SRC_SUBDIRS="$SRC_SUBDIRS be"
+    INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS be"
 fi
 
 if test "$USE_LINUX" = 1; then
-  echo $ac_n "checking for gettext in -lc""... $ac_c" 1>&6
-echo "configure:1280: 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 "checking for glibc 2.1 or later""... $ac_c" 1>&6
+echo "configure:1326: checking for glibc 2.1 or later" >&5
+if eval "test \"`echo '$''{'wx_lib_glibc21'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  ac_save_LIBS="$LIBS"
-LIBS="-lc  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 1288 "configure"
+  cat > conftest.$ac_ext <<EOF
+#line 1331 "configure"
 #include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char gettext();
-
+#include <features.h>
 int main() {
-gettext()
+
+                #if !__GLIBC_PREREQ(2, 1)
+                    #error not glibc2.1
+                #endif
+            
 ; return 0; }
 EOF
-if { (eval echo configure:1299: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1342: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
+  
+                wx_lib_glibc21=yes
+            
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
+  
+                wx_lib_glibc21=no
+            
+        
 fi
 rm -f conftest*
-LIBS="$ac_save_LIBS"
-
+    
 fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  cat >> confdefs.h <<\EOF
+
+echo "$ac_t""$wx_lib_glibc21" 1>&6
+
+    if test "$wx_lib_glibc21" = "yes"; then
+        cat >> confdefs.h <<\EOF
 #define wxHAVE_GLIBC2 1
 EOF
 
-else
-  echo "$ac_t""no" 1>&6
-fi
-
+    fi
 fi
 
-cat >> confdefs.h <<\EOF
-#define __UNIX__ 1
-EOF
-
 
 
 
+          wx_arg_cache_file="configarg.cache"
+          echo "loading argument cache $wx_arg_cache_file"
+          rm -f ${wx_arg_cache_file}.tmp
+          touch ${wx_arg_cache_file}.tmp
+          touch ${wx_arg_cache_file}
+        
 
 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_OPTIMISE=no
   DEFAULT_wxUSE_PROFILE=no
+  DEFAULT_wxUSE_NO_DEPS=no
+  DEFAULT_wxUSE_NO_RTTI=no
+  DEFAULT_wxUSE_NO_EXCEPTIONS=no
+  DEFAULT_wxUSE_PERMISSIVE=no
   DEFAULT_wxUSE_DEBUG_FLAG=yes
   DEFAULT_wxUSE_DEBUG_INFO=yes
   DEFAULT_wxUSE_DEBUG_GDB=yes
   DEFAULT_wxUSE_MEM_TRACING=no
+  DEFAULT_wxUSE_DEBUG_CONTEXT=no
   DEFAULT_wxUSE_DMALLOC=no
   DEFAULT_wxUSE_APPLE_IEEE=no
 
   DEFAULT_wxUSE_LOG=yes
+  DEFAULT_wxUSE_LOGWINDOW=no
+  DEFAULT_wxUSE_LOGGUI=no
 
   DEFAULT_wxUSE_GUI=yes
+  DEFAULT_wxUSE_CONTROLS=no
 
+  DEFAULT_wxUSE_REGEX=no
   DEFAULT_wxUSE_ZLIB=no
   DEFAULT_wxUSE_LIBPNG=no
-  DEFAULT_wxUSE_LIBGIF=no
   DEFAULT_wxUSE_LIBJPEG=no
+  DEFAULT_wxUSE_LIBTIFF=no
   DEFAULT_wxUSE_ODBC=no
-
+  DEFAULT_wxUSE_FREETYPE=no
+  DEFAULT_wxUSE_OPENGL=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_FFILE=no
   DEFAULT_wxUSE_TEXTFILE=no
-  DEFAULT_wxUSE_TIMEDATE=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_SERIAL=no
   DEFAULT_wxUSE_JOYSTICK=no
   DEFAULT_wxUSE_DYNLIB_CLASS=no
   DEFAULT_wxUSE_LONGLONG=no
+  DEFAULT_wxUSE_GEOMETRY=no
 
   DEFAULT_wxUSE_AFM_FOR_POSTSCRIPT=no
   DEFAULT_wxUSE_NORMALIZED_PS_FONTS=no
@@ -1371,6 +1446,7 @@ if test $DEBUG_CONFIGURE = 1; then
   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
@@ -1382,75 +1458,144 @@ if test $DEBUG_CONFIGURE = 1; then
   DEFAULT_wxUSE_CONSTRAINTS=no
   DEFAULT_wxUSE_IPC=no
   DEFAULT_wxUSE_HELP=no
-  DEFAULT_wxUSE_WXTREE=no
+  DEFAULT_wxUSE_MS_HTML_HELP=no
+  DEFAULT_wxUSE_WXHTML_HELP=no
+  DEFAULT_wxUSE_TREELAYOUT=no
   DEFAULT_wxUSE_METAFILE=no
+  DEFAULT_wxUSE_MIMETYPE=no
+  DEFAULT_wxUSE_SYSTEM_OPTIONS=yes
 
   DEFAULT_wxUSE_COMMONDLGS=no
+  DEFAULT_wxUSE_CHOICEDLG=no
+  DEFAULT_wxUSE_COLOURDLG=no
+  DEFAULT_wxUSE_DIRDLG=no
+  DEFAULT_wxUSE_FILEDLG=no
+  DEFAULT_wxUSE_FINDREPLDLG=no
+  DEFAULT_wxUSE_FONTDLG=no
+  DEFAULT_wxUSE_MSGDLG=no
+  DEFAULT_wxUSE_NUMBERDLG=no
+  DEFAULT_wxUSE_TEXTDLG=no
+  DEFAULT_wxUSE_SPLASH=no
+  DEFAULT_wxUSE_STARTUP_TIPS=no
+  DEFAULT_wxUSE_PROGRESSDLG=no
+  DEFAULT_wxUSE_WIZARDDLG=no
+
+  DEFAULT_wxUSE_MENUS=no
   DEFAULT_wxUSE_MINIFRAME=no
-  DEFAULT_wxUSE_VALIDATORS=yes
+  DEFAULT_wxUSE_HTML=no
+  DEFAULT_wxUSE_FILESYSTEM=no
+  DEFAULT_wxUSE_FS_INET=no
+  DEFAULT_wxUSE_FS_ZIP=no
+  DEFAULT_wxUSE_BUSYINFO=no
+  DEFAULT_wxUSE_ZIPSTREAM=no
+  DEFAULT_wxUSE_VALIDATORS=no
 
   DEFAULT_wxUSE_ACCEL=no
-  DEFAULT_wxUSE_CARET=no
+  DEFAULT_wxUSE_BUTTON=no
   DEFAULT_wxUSE_BMPBUTTON=no
+  DEFAULT_wxUSE_CALCTRL=no
+  DEFAULT_wxUSE_CARET=no
   DEFAULT_wxUSE_CHECKBOX=no
   DEFAULT_wxUSE_CHECKLST=no
+  DEFAULT_wxUSE_CHOICE=no
   DEFAULT_wxUSE_COMBOBOX=no
   DEFAULT_wxUSE_GAUGE=no
   DEFAULT_wxUSE_GRID=no
+  DEFAULT_wxUSE_NEW_GRID=no
   DEFAULT_wxUSE_IMAGLIST=no
   DEFAULT_wxUSE_LISTBOX=no
   DEFAULT_wxUSE_LISTCTRL=no
   DEFAULT_wxUSE_NOTEBOOK=no
+  DEFAULT_wxUSE_PROPSHEET=no
   DEFAULT_wxUSE_RADIOBOX=no
   DEFAULT_wxUSE_RADIOBTN=no
-  DEFAULT_wxUSE_SASHWINDOW=no
+  DEFAULT_wxUSE_SASH=no
   DEFAULT_wxUSE_SCROLLBAR=no
   DEFAULT_wxUSE_SLIDER=no
   DEFAULT_wxUSE_SPINBTN=no
+  DEFAULT_wxUSE_SPINCTRL=no
   DEFAULT_wxUSE_SPLITTER=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_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_POPUPWIN=no
 
   DEFAULT_wxUSE_UNICODE=no
   DEFAULT_wxUSE_WCSRTOMBS=no
+
+  DEFAULT_wxUSE_IMAGE=no
+  DEFAULT_wxUSE_GIF=no
+  DEFAULT_wxUSE_PCX=no
+  DEFAULT_wxUSE_PNM=no
+  DEFAULT_wxUSE_XPM=no
 else
+  DEFAULT_wxUSE_UNIVERSAL=no
+
   DEFAULT_wxUSE_THREADS=yes
 
+  DEFAULT_wxUSE_SHARED=yes
+  DEFAULT_wxUSE_BURNT_NAME=no
   DEFAULT_wxUSE_OPTIMISE=yes
   DEFAULT_wxUSE_PROFILE=no
+  DEFAULT_wxUSE_NO_DEPS=no
+  DEFAULT_wxUSE_NO_RTTI=no
+  DEFAULT_wxUSE_NO_EXCEPTIONS=no
+  DEFAULT_wxUSE_PERMISSIVE=no
   DEFAULT_wxUSE_DEBUG_FLAG=no
   DEFAULT_wxUSE_DEBUG_INFO=no
   DEFAULT_wxUSE_DEBUG_GDB=no
   DEFAULT_wxUSE_MEM_TRACING=no
+  DEFAULT_wxUSE_DEBUG_CONTEXT=no
   DEFAULT_wxUSE_DMALLOC=no
   DEFAULT_wxUSE_APPLE_IEEE=yes
 
   DEFAULT_wxUSE_LOG=yes
+  DEFAULT_wxUSE_LOGWINDOW=yes
+  DEFAULT_wxUSE_LOGGUI=yes
 
   DEFAULT_wxUSE_GUI=yes
 
+  DEFAULT_wxUSE_REGEX=yes
   DEFAULT_wxUSE_ZLIB=yes
   DEFAULT_wxUSE_LIBPNG=yes
-  DEFAULT_wxUSE_LIBGIF=yes
   DEFAULT_wxUSE_LIBJPEG=yes
+  DEFAULT_wxUSE_LIBTIFF=yes
   DEFAULT_wxUSE_ODBC=no
-
+  DEFAULT_wxUSE_FREETYPE=no
+  DEFAULT_wxUSE_OPENGL=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_FFILE=yes
   DEFAULT_wxUSE_TEXTFILE=yes
-  DEFAULT_wxUSE_TIMEDATE=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_SERIAL=yes
   DEFAULT_wxUSE_JOYSTICK=yes
   DEFAULT_wxUSE_DYNLIB_CLASS=yes
-  DEFAULT_wxUSE_LONGLONG=no
+  DEFAULT_wxUSE_LONGLONG=yes
+  DEFAULT_wxUSE_GEOMETRY=yes
 
   DEFAULT_wxUSE_AFM_FOR_POSTSCRIPT=yes
   DEFAULT_wxUSE_NORMALIZED_PS_FONTS=yes
@@ -1460,6 +1605,7 @@ else
   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_CONSTRAINTS=yes
   DEFAULT_wxUSE_IPC=yes
   DEFAULT_wxUSE_HELP=yes
-  DEFAULT_wxUSE_WXTREE=yes
+  DEFAULT_wxUSE_MS_HTML_HELP=yes
+  DEFAULT_wxUSE_WXHTML_HELP=yes
+  DEFAULT_wxUSE_TREELAYOUT=yes
   DEFAULT_wxUSE_METAFILE=yes
+  DEFAULT_wxUSE_MIMETYPE=yes
+  DEFAULT_wxUSE_SYSTEM_OPTIONS=yes
 
   DEFAULT_wxUSE_COMMONDLGS=yes
+  DEFAULT_wxUSE_CHOICEDLG=yes
+  DEFAULT_wxUSE_COLOURDLG=yes
+  DEFAULT_wxUSE_DIRDLG=yes
+  DEFAULT_wxUSE_FILEDLG=yes
+  DEFAULT_wxUSE_FINDREPLDLG=yes
+  DEFAULT_wxUSE_FONTDLG=yes
+  DEFAULT_wxUSE_MSGDLG=yes
+  DEFAULT_wxUSE_NUMBERDLG=yes
+  DEFAULT_wxUSE_TEXTDLG=yes
+  DEFAULT_wxUSE_SPLASH=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_FS_INET=yes
+  DEFAULT_wxUSE_FS_ZIP=yes
+  DEFAULT_wxUSE_BUSYINFO=yes
+  DEFAULT_wxUSE_ZIPSTREAM=yes
   DEFAULT_wxUSE_VALIDATORS=yes
 
   DEFAULT_wxUSE_ACCEL=yes
-  DEFAULT_wxUSE_CARET=yes
+  DEFAULT_wxUSE_BUTTON=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_COMBOBOX=yes
   DEFAULT_wxUSE_GAUGE=yes
   DEFAULT_wxUSE_GRID=yes
+  DEFAULT_wxUSE_NEW_GRID=yes
   DEFAULT_wxUSE_IMAGLIST=yes
   DEFAULT_wxUSE_LISTBOX=yes
   DEFAULT_wxUSE_LISTCTRL=yes
   DEFAULT_wxUSE_NOTEBOOK=yes
+  DEFAULT_wxUSE_PROPSHEET=yes
   DEFAULT_wxUSE_RADIOBOX=yes
   DEFAULT_wxUSE_RADIOBTN=yes
-  DEFAULT_wxUSE_SASHWINDOW=yes
+  DEFAULT_wxUSE_SASH=yes
   DEFAULT_wxUSE_SCROLLBAR=yes
   DEFAULT_wxUSE_SLIDER=yes
   DEFAULT_wxUSE_SPINBTN=yes
+  DEFAULT_wxUSE_SPINCTRL=yes
   DEFAULT_wxUSE_SPLITTER=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_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_POPUPWIN=yes
 
   DEFAULT_wxUSE_UNICODE=no
   DEFAULT_wxUSE_WCSRTOMBS=no
+
+  DEFAULT_wxUSE_IMAGE=yes
+  DEFAULT_wxUSE_GIF=yes
+  DEFAULT_wxUSE_PCX=yes
+  DEFAULT_wxUSE_PNM=yes
+  DEFAULT_wxUSE_XPM=yes
 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"
+for toolkit in `echo $ALL_TOOLKITS`; do
+  LINE=`grep "wxUSE_$toolkit" ${wx_arg_cache_file}`
+  if test "x$LINE" != x ; then
+    has_toolkit_in_cache=1
+    eval "DEFAULT_$LINE"
+    eval "CACHE_$toolkit=1"
+  fi
+done
+
+
+
+          echo $ac_n "checking for --enable-gui""... $ac_c" 1>&6
+echo "configure:1716: checking for --enable-gui" >&5
+          no_cache=0
+          # Check whether --enable-gui or --disable-gui was given.
+if test "${enable_gui+set}" = set; then
+  enableval="$enable_gui"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_gui='wxUSE_GUI=yes'
+                          else
+                            ac_cv_use_gui='wxUSE_GUI=no'
+                          fi
+                        
 else
-  gtk_config_prefix=""
+  
+                          LINE=`grep "wxUSE_GUI" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_gui='wxUSE_GUI='$DEFAULT_wxUSE_GUI
+                        
 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"
+
+          eval "$ac_cv_use_gui"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_gui >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_GUI" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+if test "$wxUSE_GUI" = "yes"; then
+
+
+          echo $ac_n "checking for --enable-universal""... $ac_c" 1>&6
+echo "configure:1758: 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
-  gtk_config_exec_prefix=""
+  
+                          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"
-  wxUSE_GTK="$withval"
-else
-  wxUSE_GTK=0
+  wxUSE_GTK="$withval" CACHE_GTK=1 TOOLKIT_GIVEN=1
 fi
 
 # Check whether --with-motif or --without-motif was given.
 if test "${with_motif+set}" = set; then
   withval="$with_motif"
-  wxUSE_MOTIF="$withval"
-else
-  wxUSE_MOTIF=0
+  wxUSE_MOTIF="$withval" CACHE_MOTIF=1 TOOLKIT_GIVEN=1
+fi
+
+# Check whether --with-mac or --without-mac was given.
+if test "${with_mac+set}" = set; then
+  withval="$with_mac"
+  wxUSE_MAC="$withval" TOOLKIT_GIVEN=1
+fi
+
+# Check whether --with-wine or --without-wine was given.
+if test "${with_wine+set}" = set; then
+  withval="$with_wine"
+  wxUSE_WINE="$withval" CACHE_WINE=1 TOOLKIT_GIVEN=1
 fi
 
 # Check whether --with-cygwin or --without-cygwin was given.
 if test "${with_cygwin+set}" = set; then
   withval="$with_cygwin"
-  wxUSE_CYGWIN="$withval"
-else
-  wxUSE_CYGWIN=0
+  wxUSE_CYGWIN="$withval" CACHE_CYGWIN=1 TOOLKIT_GIVEN=1
 fi
 
 # Check whether --with-mingw or --without-mingw was given.
 if test "${with_mingw+set}" = set; then
   withval="$with_mingw"
-  wxUSE_MINGW="$withval"
-else
-  wxUSE_MINGW=0
+  wxUSE_MINGW="$withval" CACHE_MINGW=1 TOOLKIT_GIVEN=1
 fi
 
+# Check whether --with-pm or --without-pm was given.
+if test "${with_pm+set}" = set; then
+  withval="$with_pm"
+  wxUSE_PM="$withval" CACHE_PM=1 TOOLKIT_GIVEN=1
+fi
 
-# Check whether --with-dmalloc or --without-dmalloc was given.
-if test "${with_dmalloc+set}" = set; then
-  withval="$with_dmalloc"
-  wxUSE_DMALLOC="$withval"
-else
-  wxUSE_DMALLOC=$DEFAULT_wxUSE_DMALLOC
+# 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
 
-# Check whether --with-zlib or --without-zlib was given.
-if test "${with_zlib+set}" = set; then
-  withval="$with_zlib"
-  wxUSE_ZLIB="$withval"
+
+# Check whether --enable-gtk2 or --disable-gtk2 was given.
+if test "${enable_gtk2+set}" = set; then
+  enableval="$enable_gtk2"
+  wxUSE_GTK2=1
 else
-  wxUSE_ZLIB=$DEFAULT_wxUSE_ZLIB
+  wxUSE_GTK2=0
 fi
 
-# Check whether --with-libpng or --without-libpng was given.
+
+
+          echo $ac_n "checking for --with-libpng""... $ac_c" 1>&6
+echo "configure:1855: checking for --with-libpng" >&5
+          no_cache=0
+          # Check whether --with-libpng or --without-libpng was given.
 if test "${with_libpng+set}" = set; then
   withval="$with_libpng"
-  wxUSE_LIBPNG="$withval"
-else
-  wxUSE_LIBPNG=$DEFAULT_wxUSE_LIBPNG
-fi
-
-# Check whether --with-libgif or --without-libgif was given.
-if test "${with_libgif+set}" = set; then
-  withval="$with_libgif"
-  wxUSE_LIBGIF="${withval}"
+  
+                        if test "$withval" = yes; then
+                          ac_cv_use_libpng='wxUSE_LIBPNG=yes'
+                        elif test "$withval" = no; then
+                          ac_cv_use_libpng='wxUSE_LIBPNG=no'
+                        elif test "$withval" = sys; then
+                          ac_cv_use_libpng='wxUSE_LIBPNG=sys'
+                        else
+                          { echo "configure: error: Invalid value for --with-libpng: should be yes, no or sys" 1>&2; exit 1; }
+                        fi
+                      
 else
-  wxUSE_LIBGIF=$DEFAULT_wxUSE_LIBGIF
-fi
+  
+                        LINE=`grep "wxUSE_LIBPNG" ${wx_arg_cache_file}`
+                        if test "x$LINE" != x ; then
+                          eval "DEFAULT_$LINE"
+                        else
+                          no_cache=1
+                        fi
+
+                        ac_cv_use_libpng='wxUSE_LIBPNG='$DEFAULT_wxUSE_LIBPNG
+                      
+fi
+
+
+          eval "$ac_cv_use_libpng"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_libpng >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_LIBPNG" = yes; then
+            echo "$ac_t""yes" 1>&6
+          elif test "$wxUSE_LIBPNG" = no; then
+            echo "$ac_t""no" 1>&6
+          elif test "$wxUSE_LIBPNG" = sys; then
+            echo "$ac_t""system version" 1>&6
+          else
+            { echo "configure: error: Invalid value for --with-libpng: should be yes, no or sys" 1>&2; exit 1; }
+          fi
+        
 
-# Check whether --with-libjpeg or --without-libjpeg was given.
+          echo $ac_n "checking for --with-libjpeg""... $ac_c" 1>&6
+echo "configure:1902: checking for --with-libjpeg" >&5
+          no_cache=0
+          # Check whether --with-libjpeg or --without-libjpeg was given.
 if test "${with_libjpeg+set}" = set; then
   withval="$with_libjpeg"
-  wxUSE_LIBJPEG="${withval}"
+  
+                        if test "$withval" = yes; then
+                          ac_cv_use_libjpeg='wxUSE_LIBJPEG=yes'
+                        elif test "$withval" = no; then
+                          ac_cv_use_libjpeg='wxUSE_LIBJPEG=no'
+                        elif test "$withval" = sys; then
+                          ac_cv_use_libjpeg='wxUSE_LIBJPEG=sys'
+                        else
+                          { echo "configure: error: Invalid value for --with-libjpeg: should be yes, no or sys" 1>&2; exit 1; }
+                        fi
+                      
 else
-  wxUSE_LIBJPEG=$DEFAULT_wxUSE_LIBJPEG
-fi
+  
+                        LINE=`grep "wxUSE_LIBJPEG" ${wx_arg_cache_file}`
+                        if test "x$LINE" != x ; then
+                          eval "DEFAULT_$LINE"
+                        else
+                          no_cache=1
+                        fi
+
+                        ac_cv_use_libjpeg='wxUSE_LIBJPEG='$DEFAULT_wxUSE_LIBJPEG
+                      
+fi
+
+
+          eval "$ac_cv_use_libjpeg"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_libjpeg >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_LIBJPEG" = yes; then
+            echo "$ac_t""yes" 1>&6
+          elif test "$wxUSE_LIBJPEG" = no; then
+            echo "$ac_t""no" 1>&6
+          elif test "$wxUSE_LIBJPEG" = sys; then
+            echo "$ac_t""system version" 1>&6
+          else
+            { echo "configure: error: Invalid value for --with-libjpeg: should be yes, no or sys" 1>&2; exit 1; }
+          fi
+        
+
+          echo $ac_n "checking for --with-libtiff""... $ac_c" 1>&6
+echo "configure:1949: checking for --with-libtiff" >&5
+          no_cache=0
+          # Check whether --with-libtiff or --without-libtiff was given.
+if test "${with_libtiff+set}" = set; then
+  withval="$with_libtiff"
+  
+                        if test "$withval" = yes; then
+                          ac_cv_use_libtiff='wxUSE_LIBTIFF=yes'
+                        elif test "$withval" = no; then
+                          ac_cv_use_libtiff='wxUSE_LIBTIFF=no'
+                        elif test "$withval" = sys; then
+                          ac_cv_use_libtiff='wxUSE_LIBTIFF=sys'
+                        else
+                          { echo "configure: error: Invalid value for --with-libtiff: should be yes, no or sys" 1>&2; exit 1; }
+                        fi
+                      
+else
+  
+                        LINE=`grep "wxUSE_LIBTIFF" ${wx_arg_cache_file}`
+                        if test "x$LINE" != x ; then
+                          eval "DEFAULT_$LINE"
+                        else
+                          no_cache=1
+                        fi
+
+                        ac_cv_use_libtiff='wxUSE_LIBTIFF='$DEFAULT_wxUSE_LIBTIFF
+                      
+fi
+
+
+          eval "$ac_cv_use_libtiff"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_libtiff >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_LIBTIFF" = yes; then
+            echo "$ac_t""yes" 1>&6
+          elif test "$wxUSE_LIBTIFF" = no; then
+            echo "$ac_t""no" 1>&6
+          elif test "$wxUSE_LIBTIFF" = sys; then
+            echo "$ac_t""system version" 1>&6
+          else
+            { echo "configure: error: Invalid value for --with-libtiff: should be yes, no or sys" 1>&2; exit 1; }
+          fi
+        
+
+          echo $ac_n "checking for --with-freetype""... $ac_c" 1>&6
+echo "configure:1996: checking for --with-freetype" >&5
+          no_cache=0
+          # Check whether --with-freetype or --without-freetype was given.
+if test "${with_freetype+set}" = set; then
+  withval="$with_freetype"
+  
+                        if test "$withval" = yes; then
+                          ac_cv_use_freetype='wxUSE_FREETYPE=yes'
+                        elif test "$withval" = no; then
+                          ac_cv_use_freetype='wxUSE_FREETYPE=no'
+                        elif test "$withval" = sys; then
+                          ac_cv_use_freetype='wxUSE_FREETYPE=sys'
+                        else
+                          { echo "configure: error: Invalid value for --with-freetype: should be yes, no or sys" 1>&2; exit 1; }
+                        fi
+                      
+else
+  
+                        LINE=`grep "wxUSE_FREETYPE" ${wx_arg_cache_file}`
+                        if test "x$LINE" != x ; then
+                          eval "DEFAULT_$LINE"
+                        else
+                          no_cache=1
+                        fi
+
+                        ac_cv_use_freetype='wxUSE_FREETYPE='$DEFAULT_wxUSE_FREETYPE
+                      
+fi
+
+
+          eval "$ac_cv_use_freetype"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_freetype >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_FREETYPE" = yes; then
+            echo "$ac_t""yes" 1>&6
+          elif test "$wxUSE_FREETYPE" = no; then
+            echo "$ac_t""no" 1>&6
+          elif test "$wxUSE_FREETYPE" = sys; then
+            echo "$ac_t""system version" 1>&6
+          else
+            { echo "configure: error: Invalid value for --with-freetype: should be yes, no or sys" 1>&2; exit 1; }
+          fi
+        
 
-# Check whether --with-opengl or --without-opengl was given.
+          echo $ac_n "checking for --with-opengl""... $ac_c" 1>&6
+echo "configure:2043: checking for --with-opengl" >&5
+          no_cache=0
+          # Check whether --with-opengl or --without-opengl was given.
 if test "${with_opengl+set}" = set; then
   withval="$with_opengl"
-  wxUSE_OPENGL="$withval"
+  
+                        if test "$withval" = yes; then
+                          ac_cv_use_opengl='wxUSE_OPENGL=yes'
+                        else
+                          ac_cv_use_opengl='wxUSE_OPENGL=no'
+                        fi
+                      
 else
-  wxUSE_OPENGL=$DEFAULT_wxUSE_OPENGL
-fi
+  
+                        LINE=`grep "wxUSE_OPENGL" ${wx_arg_cache_file}`
+                        if test "x$LINE" != x ; then
+                          eval "DEFAULT_$LINE"
+                        else
+                          no_cache=1
+                        fi
 
-# Check whether --with-odbc or --without-odbc was given.
-if test "${with_odbc+set}" = set; then
-  withval="$with_odbc"
-  wxUSE_ODBC="$withval"
-else
-  wxUSE_ODBC=$DEFAULT_wxUSE_ODBC
+                        ac_cv_use_opengl='wxUSE_OPENGL='$DEFAULT_wxUSE_OPENGL
+                      
 fi
 
 
+          eval "$ac_cv_use_opengl"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_opengl >> ${wx_arg_cache_file}.tmp
+          fi
 
+          if test "$wxUSE_OPENGL" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
 
-# Check whether --enable-optimise or --disable-optimise was given.
-if test "${enable_optimise+set}" = set; then
-  enableval="$enable_optimise"
-  wxUSE_OPTIMISE="$enableval"
-else
-  wxUSE_OPTIMISE=$DEFAULT_wxUSE_OPTIMISE
 fi
 
-# Check whether --enable-optimize or --disable-optimize was given.
-if test "${enable_optimize+set}" = set; then
-  enableval="$enable_optimize"
-  wxUSE_OPTIMISE="$enableval"
+
+          echo $ac_n "checking for --with-dmalloc""... $ac_c" 1>&6
+echo "configure:2085: checking for --with-dmalloc" >&5
+          no_cache=0
+          # Check whether --with-dmalloc or --without-dmalloc was given.
+if test "${with_dmalloc+set}" = set; then
+  withval="$with_dmalloc"
+  
+                        if test "$withval" = yes; then
+                          ac_cv_use_dmalloc='wxUSE_DMALLOC=yes'
+                        else
+                          ac_cv_use_dmalloc='wxUSE_DMALLOC=no'
+                        fi
+                      
 else
-  wxUSE_OPTIMISE=$DEFAULT_wxUSE_OPTIMISE
+  
+                        LINE=`grep "wxUSE_DMALLOC" ${wx_arg_cache_file}`
+                        if test "x$LINE" != x ; then
+                          eval "DEFAULT_$LINE"
+                        else
+                          no_cache=1
+                        fi
+
+                        ac_cv_use_dmalloc='wxUSE_DMALLOC='$DEFAULT_wxUSE_DMALLOC
+                      
 fi
 
-# Check whether --enable-debug_flag or --disable-debug_flag was given.
-if test "${enable_debug_flag+set}" = set; then
-  enableval="$enable_debug_flag"
-  wxUSE_DEBUG_FLAG="$enableval"
+
+          eval "$ac_cv_use_dmalloc"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_dmalloc >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_DMALLOC" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --with-regex""... $ac_c" 1>&6
+echo "configure:2124: 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
-  wxUSE_DEBUG_FLAG=$DEFAULT_wxUSE_DEBUG_FLAG
-fi
+  
+                        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
+        
 
-# Check whether --enable-debug_info or --disable-debug_info was given.
-if test "${enable_debug_info+set}" = set; then
-  enableval="$enable_debug_info"
-  wxUSE_DEBUG_INFO="$enableval"
+          echo $ac_n "checking for --with-zlib""... $ac_c" 1>&6
+echo "configure:2171: checking for --with-zlib" >&5
+          no_cache=0
+          # Check whether --with-zlib or --without-zlib was given.
+if test "${with_zlib+set}" = set; then
+  withval="$with_zlib"
+  
+                        if test "$withval" = yes; then
+                          ac_cv_use_zlib='wxUSE_ZLIB=yes'
+                        elif test "$withval" = no; then
+                          ac_cv_use_zlib='wxUSE_ZLIB=no'
+                        elif test "$withval" = sys; then
+                          ac_cv_use_zlib='wxUSE_ZLIB=sys'
+                        else
+                          { echo "configure: error: Invalid value for --with-zlib: should be yes, no or sys" 1>&2; exit 1; }
+                        fi
+                      
 else
-  wxUSE_DEBUG_INFO=$DEFAULT_wxUSE_DEBUG_INFO
-fi
+  
+                        LINE=`grep "wxUSE_ZLIB" ${wx_arg_cache_file}`
+                        if test "x$LINE" != x ; then
+                          eval "DEFAULT_$LINE"
+                        else
+                          no_cache=1
+                        fi
+
+                        ac_cv_use_zlib='wxUSE_ZLIB='$DEFAULT_wxUSE_ZLIB
+                      
+fi
+
+
+          eval "$ac_cv_use_zlib"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_zlib >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_ZLIB" = yes; then
+            echo "$ac_t""yes" 1>&6
+          elif test "$wxUSE_ZLIB" = no; then
+            echo "$ac_t""no" 1>&6
+          elif test "$wxUSE_ZLIB" = sys; then
+            echo "$ac_t""system version" 1>&6
+          else
+            { echo "configure: error: Invalid value for --with-zlib: should be yes, no or sys" 1>&2; exit 1; }
+          fi
+        
 
-# Check whether --enable-debug_gdb or --disable-debug_gdb was given.
-if test "${enable_debug_gdb+set}" = set; then
-  enableval="$enable_debug_gdb"
-  wxUSE_DEBUG_GDB="$enableval"
+          echo $ac_n "checking for --with-odbc""... $ac_c" 1>&6
+echo "configure:2218: checking for --with-odbc" >&5
+          no_cache=0
+          # Check whether --with-odbc or --without-odbc was given.
+if test "${with_odbc+set}" = set; then
+  withval="$with_odbc"
+  
+                        if test "$withval" = yes; then
+                          ac_cv_use_odbc='wxUSE_ODBC=yes'
+                        else
+                          ac_cv_use_odbc='wxUSE_ODBC=no'
+                        fi
+                      
 else
-  wxUSE_DEBUG_GDB=$DEFAULT_wxUSE_DEBUG_GDB
+  
+                        LINE=`grep "wxUSE_ODBC" ${wx_arg_cache_file}`
+                        if test "x$LINE" != x ; then
+                          eval "DEFAULT_$LINE"
+                        else
+                          no_cache=1
+                        fi
+
+                        ac_cv_use_odbc='wxUSE_ODBC='$DEFAULT_wxUSE_ODBC
+                      
 fi
 
-# Check whether --enable-debug_cntxt or --disable-debug_cntxt was given.
-if test "${enable_debug_cntxt+set}" = set; then
-  enableval="$enable_debug_cntxt"
-  cat >> confdefs.h <<\EOF
-#define wxUSE_DEBUG_CONTEXT 1
-EOF
 
-fi
+          eval "$ac_cv_use_odbc"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_odbc >> ${wx_arg_cache_file}.tmp
+          fi
 
-# Check whether --enable-mem_tracing or --disable-mem_tracing was given.
-if test "${enable_mem_tracing+set}" = set; then
-  enableval="$enable_mem_tracing"
-  wxUSE_MEM_TRACING="$enableval"
-else
-  wxUSE_MEM_TRACING=$DEFAULT_wxUSE_MEM_TRACING
-fi
+          if test "$wxUSE_ODBC" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
 
-# Check whether --enable-profile or --disable-profile was given.
-if test "${enable_profile+set}" = set; then
-  enableval="$enable_profile"
-  wxUSE_PROFILE="$enableval"
-else
-  wxUSE_PROFILE=$DEFAULT_wxUSE_PROFILE
-fi
 
 
 
-# Check whether --enable-gui or --disable-gui was given.
-if test "${enable_gui+set}" = set; then
-  enableval="$enable_gui"
-  wxUSE_GUI="$enableval"
+          echo $ac_n "checking for --enable-shared""... $ac_c" 1>&6
+echo "configure:2260: checking for --enable-shared" >&5
+          no_cache=0
+          # Check whether --enable-shared or --disable-shared was given.
+if test "${enable_shared+set}" = set; then
+  enableval="$enable_shared"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_shared='wxUSE_SHARED=yes'
+                          else
+                            ac_cv_use_shared='wxUSE_SHARED=no'
+                          fi
+                        
 else
-  wxUSE_GUI=$DEFAULT_wxUSE_GUI
+  
+                          LINE=`grep "wxUSE_SHARED" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_shared='wxUSE_SHARED='$DEFAULT_wxUSE_SHARED
+                        
 fi
 
 
+          eval "$ac_cv_use_shared"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_shared >> ${wx_arg_cache_file}.tmp
+          fi
 
-# Check whether --enable-intl or --disable-intl was given.
-if test "${enable_intl+set}" = set; then
-  enableval="$enable_intl"
-  wxUSE_INTL="$enableval"
-else
-  wxUSE_INTL=$DEFAULT_wxUSE_INTL
-fi
+          if test "$wxUSE_SHARED" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
 
-# Check whether --enable-config or --disable-config was given.
-if test "${enable_config+set}" = set; then
-  enableval="$enable_config"
-  wxUSE_CONFIG="$enableval"
+          echo $ac_n "checking for --enable-burnt_name""... $ac_c" 1>&6
+echo "configure:2299: 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
+  enableval="$enable_burnt_name"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_burnt_name='wxUSE_BURNT_NAME=yes'
+                          else
+                            ac_cv_use_burnt_name='wxUSE_BURNT_NAME=no'
+                          fi
+                        
 else
-  wxUSE_CONFIG=$DEFAULT_wxUSE_CONFIG
-fi
+  
+                          LINE=`grep "wxUSE_BURNT_NAME" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
 
-# Check whether --enable-sockets or --disable-sockets was given.
-if test "${enable_sockets+set}" = set; then
-  enableval="$enable_sockets"
-  wxUSE_SOCKETS="$enableval"
-else
-  wxUSE_SOCKETS=$DEFAULT_wxUSE_SOCKETS
+                          ac_cv_use_burnt_name='wxUSE_BURNT_NAME='$DEFAULT_wxUSE_BURNT_NAME
+                        
 fi
 
-# Check whether --enable-ipc or --disable-ipc was given.
-if test "${enable_ipc+set}" = set; then
-  enableval="$enable_ipc"
-  wxUSE_IPC="$enableval"
-else
-  wxUSE_IPC=$DEFAULT_wxUSE_IPC
-fi
 
-# Check whether --enable-apple_ieee or --disable-apple_ieee was given.
-if test "${enable_apple_ieee+set}" = set; then
-  enableval="$enable_apple_ieee"
-  wxUSE_APPLE_IEEE="$enableval"
-else
-  wxUSE_APPLE_IEEE=$DEFAULT_wxUSE_APPLE_IEEE
-fi
+          eval "$ac_cv_use_burnt_name"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_burnt_name >> ${wx_arg_cache_file}.tmp
+          fi
 
-# Check whether --enable-timedate or --disable-timedate was given.
-if test "${enable_timedate+set}" = set; then
-  enableval="$enable_timedate"
-  wxUSE_TIMEDATE="$enableval"
-else
-  wxUSE_TIMEDATE=$DEFAULT_wxUSE_TIMEDATE
-fi
+          if test "$wxUSE_BURNT_NAME" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
 
-# Check whether --enable-fraction or --disable-fraction was given.
-if test "${enable_fraction+set}" = set; then
-  enableval="$enable_fraction"
-  wxUSE_FRACTION="$enableval"
+          echo $ac_n "checking for --enable-optimise""... $ac_c" 1>&6
+echo "configure:2338: checking for --enable-optimise" >&5
+          no_cache=0
+          # Check whether --enable-optimise or --disable-optimise was given.
+if test "${enable_optimise+set}" = set; then
+  enableval="$enable_optimise"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_optimise='wxUSE_OPTIMISE=yes'
+                          else
+                            ac_cv_use_optimise='wxUSE_OPTIMISE=no'
+                          fi
+                        
 else
-  wxUSE_FRACTION=$DEFAULT_wxUSE_FRACTION
-fi
+  
+                          LINE=`grep "wxUSE_OPTIMISE" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
 
-# Check whether --enable-dynlib or --disable-dynlib was given.
-if test "${enable_dynlib+set}" = set; then
-  enableval="$enable_dynlib"
-  wxUSE_DYNLIB_CLASS="$enableval"
-else
-  wxUSE_DYNLIB_CLASS=$DEFAULT_wxUSE_DYNLIB_CLASS
+                          ac_cv_use_optimise='wxUSE_OPTIMISE='$DEFAULT_wxUSE_OPTIMISE
+                        
 fi
 
-# Check whether --enable-longlong or --disable-longlong was given.
-if test "${enable_longlong+set}" = set; then
-  enableval="$enable_longlong"
-  wxUSE_LONGLONG="${enableval}"
+
+          eval "$ac_cv_use_optimise"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_optimise >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_OPTIMISE" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-debug""... $ac_c" 1>&6
+echo "configure:2377: checking for --enable-debug" >&5
+          no_cache=0
+          # Check whether --enable-debug or --disable-debug was given.
+if test "${enable_debug+set}" = set; then
+  enableval="$enable_debug"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_debug='wxUSE_DEBUG=yes'
+                          else
+                            ac_cv_use_debug='wxUSE_DEBUG=no'
+                          fi
+                        
 else
-  wxUSE_LONGLONG=$DEFAULT_wxUSE_LONGLONG
+  
+                          LINE=`grep "wxUSE_DEBUG" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_debug='wxUSE_DEBUG='$DEFAULT_wxUSE_DEBUG
+                        
 fi
 
-# Check whether --enable-log or --disable-log was given.
-if test "${enable_log+set}" = set; then
-  enableval="$enable_log"
-  wxUSE_LOG="$enableval"
-else
-  wxUSE_LOG=$DEFAULT_wxUSE_LOG
+
+          eval "$ac_cv_use_debug"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_debug >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_DEBUG" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+if test "$wxUSE_DEBUG" = "yes"; then
+  DEFAULT_wxUSE_DEBUG_FLAG=yes
+  DEFAULT_wxUSE_DEBUG_INFO=yes
+elif test "$wxUSE_DEBUG" = "no"; then
+  DEFAULT_wxUSE_DEBUG_FLAG=no
+  DEFAULT_wxUSE_DEBUG_INFO=no
 fi
 
-# Check whether --enable-streams or --disable-streams was given.
-if test "${enable_streams+set}" = set; then
-  enableval="$enable_streams"
-  wxUSE_STREAMS="$enableval"
+
+          echo $ac_n "checking for --enable-debug_flag""... $ac_c" 1>&6
+echo "configure:2425: 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
+  enableval="$enable_debug_flag"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_debug_flag='wxUSE_DEBUG_FLAG=yes'
+                          else
+                            ac_cv_use_debug_flag='wxUSE_DEBUG_FLAG=no'
+                          fi
+                        
 else
-  wxUSE_STREAMS=$DEFAULT_wxUSE_STREAMS
+  
+                          LINE=`grep "wxUSE_DEBUG_FLAG" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_debug_flag='wxUSE_DEBUG_FLAG='$DEFAULT_wxUSE_DEBUG_FLAG
+                        
 fi
 
-# Check whether --enable-file or --disable-file was given.
-if test "${enable_file+set}" = set; then
-  enableval="$enable_file"
-  wxUSE_FILE="$enableval"
+
+          eval "$ac_cv_use_debug_flag"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_debug_flag >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_DEBUG_FLAG" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-debug_info""... $ac_c" 1>&6
+echo "configure:2464: 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
+  enableval="$enable_debug_info"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_debug_info='wxUSE_DEBUG_INFO=yes'
+                          else
+                            ac_cv_use_debug_info='wxUSE_DEBUG_INFO=no'
+                          fi
+                        
 else
-  wxUSE_FILE=$DEFAULT_wxUSE_FILE
+  
+                          LINE=`grep "wxUSE_DEBUG_INFO" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_debug_info='wxUSE_DEBUG_INFO='$DEFAULT_wxUSE_DEBUG_INFO
+                        
 fi
 
-# Check whether --enable-textfile or --disable-textfile was given.
-if test "${enable_textfile+set}" = set; then
-  enableval="$enable_textfile"
-  wxUSE_TEXTFILE="$enableval"
+
+          eval "$ac_cv_use_debug_info"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_debug_info >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_DEBUG_INFO" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-debug_gdb""... $ac_c" 1>&6
+echo "configure:2503: 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
+  enableval="$enable_debug_gdb"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_debug_gdb='wxUSE_DEBUG_GDB=yes'
+                          else
+                            ac_cv_use_debug_gdb='wxUSE_DEBUG_GDB=no'
+                          fi
+                        
 else
-  wxUSE_TEXTFILE=$DEFAULT_wxUSE_TEXTFILE
+  
+                          LINE=`grep "wxUSE_DEBUG_GDB" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_debug_gdb='wxUSE_DEBUG_GDB='$DEFAULT_wxUSE_DEBUG_GDB
+                        
 fi
 
-# Check whether --enable-unicode or --disable-unicode was given.
-if test "${enable_unicode+set}" = set; then
-  enableval="$enable_unicode"
-  wxUSE_UNICODE="$enableval"
+
+          eval "$ac_cv_use_debug_gdb"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_debug_gdb >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_DEBUG_GDB" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-debug_cntxt""... $ac_c" 1>&6
+echo "configure:2542: 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
+  enableval="$enable_debug_cntxt"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_debug_cntxt='wxUSE_DEBUG_CONTEXT=yes'
+                          else
+                            ac_cv_use_debug_cntxt='wxUSE_DEBUG_CONTEXT=no'
+                          fi
+                        
 else
-  wxUSE_UNICODE=$DEFAULT_wxUSE_UNICODE
+  
+                          LINE=`grep "wxUSE_DEBUG_CONTEXT" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_debug_cntxt='wxUSE_DEBUG_CONTEXT='$DEFAULT_wxUSE_DEBUG_CONTEXT
+                        
 fi
 
-# Check whether --enable-wcsrtombs or --disable-wcsrtombs was given.
-if test "${enable_wcsrtombs+set}" = set; then
-  enableval="$enable_wcsrtombs"
-  wxUSE_WCSRTOMBS="$enableval"
+
+          eval "$ac_cv_use_debug_cntxt"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_debug_cntxt >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_DEBUG_CONTEXT" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-mem_tracing""... $ac_c" 1>&6
+echo "configure:2581: 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
+  enableval="$enable_mem_tracing"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_mem_tracing='wxUSE_MEM_TRACING=yes'
+                          else
+                            ac_cv_use_mem_tracing='wxUSE_MEM_TRACING=no'
+                          fi
+                        
 else
-  wxUSE_WCSRTOMBS=$DEFAULT_wxUSE_WCSRTOMBS
+  
+                          LINE=`grep "wxUSE_MEM_TRACING" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_mem_tracing='wxUSE_MEM_TRACING='$DEFAULT_wxUSE_MEM_TRACING
+                        
 fi
 
-# Check whether --enable-joystick or --disable-joystick was given.
-if test "${enable_joystick+set}" = set; then
-  enableval="$enable_joystick"
-  wxUSE_JOYSTICK="$enableval"
+
+          eval "$ac_cv_use_mem_tracing"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_mem_tracing >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_MEM_TRACING" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-profile""... $ac_c" 1>&6
+echo "configure:2620: checking for --enable-profile" >&5
+          no_cache=0
+          # Check whether --enable-profile or --disable-profile was given.
+if test "${enable_profile+set}" = set; then
+  enableval="$enable_profile"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_profile='wxUSE_PROFILE=yes'
+                          else
+                            ac_cv_use_profile='wxUSE_PROFILE=no'
+                          fi
+                        
 else
-  wxUSE_JOYSTICK=$DEFAULT_wxUSE_JOYSTICK
+  
+                          LINE=`grep "wxUSE_PROFILE" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_profile='wxUSE_PROFILE='$DEFAULT_wxUSE_PROFILE
+                        
 fi
 
 
+          eval "$ac_cv_use_profile"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_profile >> ${wx_arg_cache_file}.tmp
+          fi
 
-# Check whether --enable-threads or --disable-threads was given.
-if test "${enable_threads+set}" = set; then
-  enableval="$enable_threads"
-  wxUSE_THREADS="${enableval}"
+          if test "$wxUSE_PROFILE" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-no_rtti""... $ac_c" 1>&6
+echo "configure:2659: 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
+  enableval="$enable_no_rtti"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_no_rtti='wxUSE_NO_RTTI=yes'
+                          else
+                            ac_cv_use_no_rtti='wxUSE_NO_RTTI=no'
+                          fi
+                        
 else
-  wxUSE_THREADS=$DEFAULT_wxUSE_THREADS
+  
+                          LINE=`grep "wxUSE_NO_RTTI" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_no_rtti='wxUSE_NO_RTTI='$DEFAULT_wxUSE_NO_RTTI
+                        
 fi
 
-# Check whether --enable-serial or --disable-serial was given.
-if test "${enable_serial+set}" = set; then
-  enableval="$enable_serial"
-  wxUSE_SERIAL="${enableval}"
+
+          eval "$ac_cv_use_no_rtti"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_no_rtti >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_NO_RTTI" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-no_exceptions""... $ac_c" 1>&6
+echo "configure:2698: 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
+  enableval="$enable_no_exceptions"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_no_exceptions='wxUSE_NO_EXCEPTIONS=yes'
+                          else
+                            ac_cv_use_no_exceptions='wxUSE_NO_EXCEPTIONS=no'
+                          fi
+                        
 else
-  wxUSE_SERIAL=$DEFAULT_wxUSE_SERIAL
+  
+                          LINE=`grep "wxUSE_NO_EXCEPTIONS" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_no_exceptions='wxUSE_NO_EXCEPTIONS='$DEFAULT_wxUSE_NO_EXCEPTIONS
+                        
 fi
 
 
+          eval "$ac_cv_use_no_exceptions"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_no_exceptions >> ${wx_arg_cache_file}.tmp
+          fi
 
-# Check whether --enable-docview or --disable-docview was given.
-if test "${enable_docview+set}" = set; then
-  enableval="$enable_docview"
-  wxUSE_DOC_VIEW_ARCHITECTURE="$enableval"
+          if test "$wxUSE_NO_EXCEPTIONS" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-permissive""... $ac_c" 1>&6
+echo "configure:2737: checking for --enable-permissive" >&5
+          no_cache=0
+          # Check whether --enable-permissive or --disable-permissive was given.
+if test "${enable_permissive+set}" = set; then
+  enableval="$enable_permissive"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_permissive='wxUSE_PERMISSIVE=yes'
+                          else
+                            ac_cv_use_permissive='wxUSE_PERMISSIVE=no'
+                          fi
+                        
 else
-  wxUSE_DOC_VIEW_ARCHITECTURE=$DEFAULT_wxUSE_DOC_VIEW_ARCHITECTURE
+  
+                          LINE=`grep "wxUSE_PERMISSIVE" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_permissive='wxUSE_PERMISSIVE='$DEFAULT_wxUSE_PERMISSIVE
+                        
 fi
 
-# Check whether --enable-help or --disable-help was given.
-if test "${enable_help+set}" = set; then
-  enableval="$enable_help"
-  wxUSE_HELP="$enableval"
+
+          eval "$ac_cv_use_permissive"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_permissive >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_PERMISSIVE" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-no_deps""... $ac_c" 1>&6
+echo "configure:2776: 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
+  enableval="$enable_no_deps"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_no_deps='wxUSE_NO_DEPS=yes'
+                          else
+                            ac_cv_use_no_deps='wxUSE_NO_DEPS=no'
+                          fi
+                        
 else
-  wxUSE_HELP=$DEFAULT_wxUSE_HELP
+  
+                          LINE=`grep "wxUSE_NO_DEPS" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_no_deps='wxUSE_NO_DEPS='$DEFAULT_wxUSE_NO_DEPS
+                        
 fi
 
-# Check whether --enable-constraints or --disable-constraints was given.
-if test "${enable_constraints+set}" = set; then
-  enableval="$enable_constraints"
-  wxUSE_CONSTRAINTS="$enableval"
+
+          eval "$ac_cv_use_no_deps"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_no_deps >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_NO_DEPS" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+
+          echo $ac_n "checking for --enable-compat20""... $ac_c" 1>&6
+echo "configure:2816: 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
-  wxUSE_CONSTRAINTS=$DEFAULT_wxUSE_CONSTRAINTS
+  
+                          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
 
-# Check whether --enable-printarch or --disable-printarch was given.
-if test "${enable_printarch+set}" = set; then
-  enableval="$enable_printarch"
-  wxUSE_PRINTING_ARCHITECTURE="${enableval}"
+
+          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:2855: 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
-  wxUSE_PRINTING_ARCHITECTURE=$DEFAULT_wxUSE_PRINTING_ARCHITECTURE
+  
+                          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
 
-# Check whether --enable-mdi or --disable-mdi was given.
-if test "${enable_mdi+set}" = set; then
-  enableval="$enable_mdi"
-  wxUSE_MDI_ARCHITECTURE="${enableval}"
+
+          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:2896: checking for --enable-intl" >&5
+          no_cache=0
+          # Check whether --enable-intl or --disable-intl was given.
+if test "${enable_intl+set}" = set; then
+  enableval="$enable_intl"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_intl='wxUSE_INTL=yes'
+                          else
+                            ac_cv_use_intl='wxUSE_INTL=no'
+                          fi
+                        
 else
-  wxUSE_MDI_ARCHITECTURE=$DEFAULT_wxUSE_MDI_ARCHITECTURE
+  
+                          LINE=`grep "wxUSE_INTL" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_intl='wxUSE_INTL='$DEFAULT_wxUSE_INTL
+                        
 fi
 
 
-# Check whether --enable-postscript or --disable-postscript was given.
-if test "${enable_postscript+set}" = set; then
-  enableval="$enable_postscript"
-  wxUSE_POSTSCRIPT="$enableval"
+          eval "$ac_cv_use_intl"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_intl >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_INTL" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-config""... $ac_c" 1>&6
+echo "configure:2935: checking for --enable-config" >&5
+          no_cache=0
+          # Check whether --enable-config or --disable-config was given.
+if test "${enable_config+set}" = set; then
+  enableval="$enable_config"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_config='wxUSE_CONFIG=yes'
+                          else
+                            ac_cv_use_config='wxUSE_CONFIG=no'
+                          fi
+                        
 else
-  wxUSE_POSTSCRIPT=$DEFAULT_wxUSE_POSTSCRIPT
+  
+                          LINE=`grep "wxUSE_CONFIG" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_config='wxUSE_CONFIG='$DEFAULT_wxUSE_CONFIG
+                        
 fi
 
 
+          eval "$ac_cv_use_config"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_config >> ${wx_arg_cache_file}.tmp
+          fi
 
-# Check whether --enable-prologio or --disable-prologio was given.
-if test "${enable_prologio+set}" = set; then
-  enableval="$enable_prologio"
-  wxUSE_PROLOGIO="${enableval}"
+          if test "$wxUSE_CONFIG" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+
+          echo $ac_n "checking for --enable-sockets""... $ac_c" 1>&6
+echo "configure:2975: checking for --enable-sockets" >&5
+          no_cache=0
+          # Check whether --enable-sockets or --disable-sockets was given.
+if test "${enable_sockets+set}" = set; then
+  enableval="$enable_sockets"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_sockets='wxUSE_SOCKETS=yes'
+                          else
+                            ac_cv_use_sockets='wxUSE_SOCKETS=no'
+                          fi
+                        
 else
-  wxUSE_PROLOGIO=$DEFAULT_wxUSE_PROLOGIO
+  
+                          LINE=`grep "wxUSE_SOCKETS" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_sockets='wxUSE_SOCKETS='$DEFAULT_wxUSE_SOCKETS
+                        
 fi
 
-# Check whether --enable-resources or --disable-resources was given.
-if test "${enable_resources+set}" = set; then
-  enableval="$enable_resources"
-  wxUSE_RESOURCES="${enableval}"
+
+          eval "$ac_cv_use_sockets"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_sockets >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_SOCKETS" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+
+          echo $ac_n "checking for --enable-ipc""... $ac_c" 1>&6
+echo "configure:3015: checking for --enable-ipc" >&5
+          no_cache=0
+          # Check whether --enable-ipc or --disable-ipc was given.
+if test "${enable_ipc+set}" = set; then
+  enableval="$enable_ipc"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_ipc='wxUSE_IPC=yes'
+                          else
+                            ac_cv_use_ipc='wxUSE_IPC=no'
+                          fi
+                        
 else
-  wxUSE_RESOURCES=$DEFAULT_wxUSE_RESOURCES
+  
+                          LINE=`grep "wxUSE_IPC" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_ipc='wxUSE_IPC='$DEFAULT_wxUSE_IPC
+                        
 fi
 
 
-# Check whether --enable-xresources or --disable-xresources was given.
-if test "${enable_xresources+set}" = set; then
-  enableval="$enable_xresources"
-  wxUSE_X_RESOURCES="${enableval}"
+          eval "$ac_cv_use_ipc"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_ipc >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_IPC" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+
+          echo $ac_n "checking for --enable-cmdline""... $ac_c" 1>&6
+echo "configure:3055: checking for --enable-cmdline" >&5
+          no_cache=0
+          # Check whether --enable-cmdline or --disable-cmdline was given.
+if test "${enable_cmdline+set}" = set; then
+  enableval="$enable_cmdline"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_cmdline='wxUSE_CMDLINE_PARSER=yes'
+                          else
+                            ac_cv_use_cmdline='wxUSE_CMDLINE_PARSER=no'
+                          fi
+                        
 else
-  wxUSE_X_RESOURCES=$DEFAULT_wxUSE_X_RESOURCES
+  
+                          LINE=`grep "wxUSE_CMDLINE_PARSER" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_cmdline='wxUSE_CMDLINE_PARSER='$DEFAULT_wxUSE_CMDLINE_PARSER
+                        
 fi
 
-# Check whether --enable-clipboard or --disable-clipboard was given.
-if test "${enable_clipboard+set}" = set; then
-  enableval="$enable_clipboard"
-  wxUSE_CLIPBOARD="${enableval}"
+
+          eval "$ac_cv_use_cmdline"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_cmdline >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_CMDLINE_PARSER" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-datetime""... $ac_c" 1>&6
+echo "configure:3094: checking for --enable-datetime" >&5
+          no_cache=0
+          # Check whether --enable-datetime or --disable-datetime was given.
+if test "${enable_datetime+set}" = set; then
+  enableval="$enable_datetime"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_datetime='wxUSE_DATETIME=yes'
+                          else
+                            ac_cv_use_datetime='wxUSE_DATETIME=no'
+                          fi
+                        
 else
-  wxUSE_CLIPBOARD=$DEFAULT_wxUSE_CLIPBOARD
+  
+                          LINE=`grep "wxUSE_DATETIME" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_datetime='wxUSE_DATETIME='$DEFAULT_wxUSE_DATETIME
+                        
 fi
 
-# Check whether --enable-dnd or --disable-dnd was given.
-if test "${enable_dnd+set}" = set; then
-  enableval="$enable_dnd"
-  wxUSE_DRAG_AND_DROP="${enableval}"
+
+          eval "$ac_cv_use_datetime"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_datetime >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_DATETIME" = yes; then
+            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:3133: checking for --enable-timedate" >&5
+          no_cache=0
+          # Check whether --enable-timedate or --disable-timedate was given.
+if test "${enable_timedate+set}" = set; then
+  enableval="$enable_timedate"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_timedate='wxUSE_TIMEDATE=yes'
+                          else
+                            ac_cv_use_timedate='wxUSE_TIMEDATE=no'
+                          fi
+                        
 else
-  wxUSE_DRAG_AND_DROP=$DEFAULT_wxUSE_DRAG_AND_DROP
+  
+                          LINE=`grep "wxUSE_TIMEDATE" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_timedate='wxUSE_TIMEDATE='$DEFAULT_wxUSE_TIMEDATE
+                        
 fi
 
 
-# Check whether --enable-wxtree or --disable-wxtree was given.
-if test "${enable_wxtree+set}" = set; then
-  enableval="$enable_wxtree"
-  wxUSE_WXTREE="${enableval}"
+          eval "$ac_cv_use_timedate"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_timedate >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_TIMEDATE" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-stopwatch""... $ac_c" 1>&6
+echo "configure:3172: checking for --enable-stopwatch" >&5
+          no_cache=0
+          # Check whether --enable-stopwatch or --disable-stopwatch was given.
+if test "${enable_stopwatch+set}" = set; then
+  enableval="$enable_stopwatch"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_stopwatch='wxUSE_STOPWATCH=yes'
+                          else
+                            ac_cv_use_stopwatch='wxUSE_STOPWATCH=no'
+                          fi
+                        
 else
-  wxUSE_WXTREE=$DEFAULT_wxUSE_WXTREE
+  
+                          LINE=`grep "wxUSE_STOPWATCH" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_stopwatch='wxUSE_STOPWATCH='$DEFAULT_wxUSE_STOPWATCH
+                        
 fi
 
 
+          eval "$ac_cv_use_stopwatch"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_stopwatch >> ${wx_arg_cache_file}.tmp
+          fi
 
-# Check whether --enable-controls or --disable-controls was given.
-if test "${enable_controls+set}" = set; then
-  enableval="$enable_controls"
-  wxUSE_CONTROLS="${enableval}"
+          if test "$wxUSE_STOPWATCH" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-dialupman""... $ac_c" 1>&6
+echo "configure:3211: checking for --enable-dialupman" >&5
+          no_cache=0
+          # Check whether --enable-dialupman or --disable-dialupman was given.
+if test "${enable_dialupman+set}" = set; then
+  enableval="$enable_dialupman"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_dialupman='wxUSE_DIALUP_MANAGER=yes'
+                          else
+                            ac_cv_use_dialupman='wxUSE_DIALUP_MANAGER=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_DIALUP_MANAGER" ${wx_arg_cache_file}`
+                          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
+                        
 fi
 
 
-if test "$wxUSE_CONTROLS" = "yes"; then
-  DEFAULT_wxUSE_ACCEL=yes
-  DEFAULT_wxUSE_CARET=yes
-  DEFAULT_wxUSE_COMBOBOX=yes
-  DEFAULT_wxUSE_BMPBUTTON=yes
-  DEFAULT_wxUSE_CHECKBOX=yes
-  DEFAULT_wxUSE_CHECKLISTBOX=yes
-  DEFAULT_wxUSE_GAUGE=yes
-  DEFAULT_wxUSE_GRID=yes
-  DEFAULT_wxUSE_IMAGLIST=yes
-  DEFAULT_wxUSE_LISTBOX=yes
-  DEFAULT_wxUSE_LISTCTRL=yes
-  DEFAULT_wxUSE_NOTEBOOK=yes
-  DEFAULT_wxUSE_RADIOBOX=yes
-  DEFAULT_wxUSE_RADIOBTN=yes
-  DEFAULT_wxUSE_SASH=yes
-  DEFAULT_wxUSE_SCROLLBAR=yes
-  DEFAULT_wxUSE_SLIDER=yes
-  DEFAULT_wxUSE_SPINBTN=yes
-  DEFAULT_wxUSE_SPLITTER=yes
-  DEFAULT_wxUSE_STATBMP=yes
-  DEFAULT_wxUSE_STATBOX=yes
-  DEFAULT_wxUSE_STATLINE=yes
-  DEFAULT_wxUSE_STATUSBAR=yes
-  DEFAULT_wxUSE_TAB_DIALOG=yes
-  DEFAULT_wxUSE_TOOLBAR=yes
-  DEFAULT_wxUSE_TOOLTIPS=yes
-  DEFAULT_wxUSE_TREECTRL=yes
-elif test "$wxUSE_CONTROLS" = "no"; then
-  DEFAULT_wxUSE_ACCEL=no
-  DEFAULT_wxUSE_CARET=no
-  DEFAULT_wxUSE_COMBOBOX=no
-  DEFAULT_wxUSE_BMPBUTTON=no
-  DEFAULT_wxUSE_CHECKBOX=no
-  DEFAULT_wxUSE_CHECKLISTBOX=no
-  DEFAULT_wxUSE_GAUGE=no
-  DEFAULT_wxUSE_GRID=no
-  DEFAULT_wxUSE_IMAGLIST=no
-  DEFAULT_wxUSE_LISTBOX=no
-  DEFAULT_wxUSE_LISTCTRL=no
-  DEFAULT_wxUSE_NOTEBOOK=no
-  DEFAULT_wxUSE_RADIOBOX=no
-  DEFAULT_wxUSE_RADIOBTN=no
-  DEFAULT_wxUSE_SASH=no
-  DEFAULT_wxUSE_SCROLLBAR=no
-  DEFAULT_wxUSE_SLIDER=no
-  DEFAULT_wxUSE_SPINBTN=no
-  DEFAULT_wxUSE_SPLITTER=no
-  DEFAULT_wxUSE_STATBMP=no
-  DEFAULT_wxUSE_STATBOX=no
-  DEFAULT_wxUSE_STATLINE=no
-  DEFAULT_wxUSE_STATUSBAR=no
-  DEFAULT_wxUSE_TAB_DIALOG=no
-  DEFAULT_wxUSE_TOOLBAR=no
-  DEFAULT_wxUSE_TOOLTIPS=no
-  DEFAULT_wxUSE_TREECTRL=no
-fi
+          eval "$ac_cv_use_dialupman"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_dialupman >> ${wx_arg_cache_file}.tmp
+          fi
 
-# Check whether --enable-accel or --disable-accel was given.
-if test "${enable_accel+set}" = set; then
-  enableval="$enable_accel"
-  wxUSE_ACCEL="${enableval}"
-else
-  wxUSE_ACCEL=$DEFAULT_wxUSE_ACCEL
-fi
+          if test "$wxUSE_DIALUP_MANAGER" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
 
-# Check whether --enable-caret or --disable-caret was given.
-if test "${enable_caret+set}" = set; then
-  enableval="$enable_caret"
-  wxUSE_CARET="${enableval}"
+          echo $ac_n "checking for --enable-apple_ieee""... $ac_c" 1>&6
+echo "configure:3250: checking for --enable-apple_ieee" >&5
+          no_cache=0
+          # Check whether --enable-apple_ieee or --disable-apple_ieee was given.
+if test "${enable_apple_ieee+set}" = set; then
+  enableval="$enable_apple_ieee"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_apple_ieee='wxUSE_APPLE_IEEE=yes'
+                          else
+                            ac_cv_use_apple_ieee='wxUSE_APPLE_IEEE=no'
+                          fi
+                        
 else
-  wxUSE_CARET=$DEFAULT_wxUSE_CARET
-fi
+  
+                          LINE=`grep "wxUSE_APPLE_IEEE" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
 
-# Check whether --enable-bmpbutton or --disable-bmpbutton was given.
-if test "${enable_bmpbutton+set}" = set; then
-  enableval="$enable_bmpbutton"
-  wxUSE_BMPBUTTON="${enableval}"
-else
-  wxUSE_BMPBUTTON=$DEFAULT_wxUSE_BMPBUTTON
+                          ac_cv_use_apple_ieee='wxUSE_APPLE_IEEE='$DEFAULT_wxUSE_APPLE_IEEE
+                        
 fi
 
-# Check whether --enable-checkbox or --disable-checkbox was given.
-if test "${enable_checkbox+set}" = set; then
-  enableval="$enable_checkbox"
-  wxUSE_CHECKBOX="${enableval}"
-else
-  wxUSE_CHECKBOX=$DEFAULT_wxUSE_CHECKBOX
-fi
 
-# Check whether --enable-checklst or --disable-checklst was given.
-if test "${enable_checklst+set}" = set; then
-  enableval="$enable_checklst"
-  wxUSE_CHECKLST="${enableval}"
-else
-  wxUSE_CHECKLST=$DEFAULT_wxUSE_CHECKLST
-fi
+          eval "$ac_cv_use_apple_ieee"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_apple_ieee >> ${wx_arg_cache_file}.tmp
+          fi
 
-# Check whether --enable-combobox or --disable-combobox was given.
-if test "${enable_combobox+set}" = set; then
-  enableval="$enable_combobox"
-  wxUSE_COMBOBOX="${enableval}"
-else
-  wxUSE_COMBOBOX=$DEFAULT_wxUSE_COMBOBOX
-fi
+          if test "$wxUSE_APPLE_IEEE" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
 
-# Check whether --enable-gauge or --disable-gauge was given.
-if test "${enable_gauge+set}" = set; then
-  enableval="$enable_gauge"
-  wxUSE_GAUGE="${enableval}"
+          echo $ac_n "checking for --enable-timer""... $ac_c" 1>&6
+echo "configure:3289: checking for --enable-timer" >&5
+          no_cache=0
+          # 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
-  wxUSE_GAUGE=$DEFAULT_wxUSE_GAUGE
-fi
+  
+                          LINE=`grep "wxUSE_TIMER" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
 
-# Check whether --enable-grid or --disable-grid was given.
-if test "${enable_grid+set}" = set; then
-  enableval="$enable_grid"
-  wxUSE_GRID="${enableval}"
-else
-  wxUSE_GRID=$DEFAULT_wxUSE_GRID
+                          ac_cv_use_timer='wxUSE_TIMER='$DEFAULT_wxUSE_TIMER
+                        
 fi
 
-# Check whether --enable-imaglist or --disable-imaglist was given.
-if test "${enable_imaglist+set}" = set; then
-  enableval="$enable_imaglist"
-  wxUSE_IMAGLIST="${enableval}"
-else
-  wxUSE_IMAGLIST=$DEFAULT_wxUSE_IMAGLIST
-fi
 
-# Check whether --enable-listbox or --disable-listbox was given.
-if test "${enable_listbox+set}" = set; then
-  enableval="$enable_listbox"
-  wxUSE_LISTBOX="${enableval}"
-else
-  wxUSE_LISTBOX=$DEFAULT_wxUSE_LISTBOX
-fi
+          eval "$ac_cv_use_timer"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_timer >> ${wx_arg_cache_file}.tmp
+          fi
 
-# Check whether --enable-listctrl or --disable-listctrl was given.
-if test "${enable_listctrl+set}" = set; then
-  enableval="$enable_listctrl"
-  wxUSE_LISTCTRL="${enableval}"
-else
-  wxUSE_LISTCTRL=$DEFAULT_wxUSE_LISTCTRL
-fi
+          if test "$wxUSE_TIMER" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
 
-# Check whether --enable-notebook or --disable-notebook was given.
-if test "${enable_notebook+set}" = set; then
-  enableval="$enable_notebook"
-  wxUSE_NOTEBOOK="${enableval}"
+          echo $ac_n "checking for --enable-wave""... $ac_c" 1>&6
+echo "configure:3328: 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
-  wxUSE_NOTEBOOK=$DEFAULT_wxUSE_NOTEBOOK
-fi
+  
+                          LINE=`grep "wxUSE_WAVE" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
 
-# Check whether --enable-radiobox or --disable-radiobox was given.
-if test "${enable_radiobox+set}" = set; then
-  enableval="$enable_radiobox"
-  wxUSE_RADIOBOX="${enableval}"
-else
-  wxUSE_RADIOBOX=$DEFAULT_wxUSE_RADIOBOX
+                          ac_cv_use_wave='wxUSE_WAVE='$DEFAULT_wxUSE_WAVE
+                        
 fi
 
-# Check whether --enable-radiobtn or --disable-radiobtn was given.
-if test "${enable_radiobtn+set}" = set; then
-  enableval="$enable_radiobtn"
-  wxUSE_RADIOBTN="${enableval}"
-else
-  wxUSE_RADIOBTN=$DEFAULT_wxUSE_RADIOBTN
-fi
 
-# Check whether --enable-sash or --disable-sash was given.
-if test "${enable_sash+set}" = set; then
-  enableval="$enable_sash"
-  wxUSE_SASH="${enableval}"
-else
-  wxUSE_SASH=$DEFAULT_wxUSE_SASH
-fi
+          eval "$ac_cv_use_wave"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_wave >> ${wx_arg_cache_file}.tmp
+          fi
 
-# Check whether --enable-scrollbar or --disable-scrollbar was given.
-if test "${enable_scrollbar+set}" = set; then
-  enableval="$enable_scrollbar"
-  wxUSE_SCROLLBAR="${enableval}"
-else
-  wxUSE_SCROLLBAR=$DEFAULT_wxUSE_SCROLLBAR
-fi
+          if test "$wxUSE_WAVE" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
 
-# Check whether --enable-slider or --disable-slider was given.
-if test "${enable_slider+set}" = set; then
-  enableval="$enable_slider"
-  wxUSE_SLIDER="${enableval}"
+          echo $ac_n "checking for --enable-fraction""... $ac_c" 1>&6
+echo "configure:3367: 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
-  wxUSE_SLIDER=$DEFAULT_wxUSE_SLIDER
-fi
+  
+                          LINE=`grep "wxUSE_FRACTION" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
 
-# Check whether --enable-spinbtn or --disable-spinbtn was given.
-if test "${enable_spinbtn+set}" = set; then
-  enableval="$enable_spinbtn"
-  wxUSE_SPINBTN="${enableval}"
-else
-  wxUSE_SPINBTN=$DEFAULT_wxUSE_SPINBTN
+                          ac_cv_use_fraction='wxUSE_FRACTION='$DEFAULT_wxUSE_FRACTION
+                        
 fi
 
-# Check whether --enable-splitter or --disable-splitter was given.
-if test "${enable_splitter+set}" = set; then
-  enableval="$enable_splitter"
-  wxUSE_SPLITTER="${enableval}"
-else
-  wxUSE_SPLITTER=$DEFAULT_wxUSE_SPLITTER
-fi
 
-# Check whether --enable-statbmp or --disable-statbmp was given.
-if test "${enable_statbmp+set}" = set; then
-  enableval="$enable_statbmp"
-  wxUSE_STATBMP="${enableval}"
-else
-  wxUSE_STATBMP=$DEFAULT_wxUSE_STATBMP
-fi
+          eval "$ac_cv_use_fraction"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_fraction >> ${wx_arg_cache_file}.tmp
+          fi
 
-# Check whether --enable-statbox or --disable-statbox was given.
-if test "${enable_statbox+set}" = set; then
-  enableval="$enable_statbox"
-  wxUSE_STATBOX="${enableval}"
+          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:3406: 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
-  wxUSE_STATBOX=$DEFAULT_wxUSE_STATBOX
+  
+                          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
 
-# Check whether --enable-statline or --disable-statline was given.
-if test "${enable_statline+set}" = set; then
-  enableval="$enable_statline"
-  wxUSE_STATLINE="${enableval}"
+
+          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:3445: 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 "$enableval" = yes; then
+                            ac_cv_use_longlong='wxUSE_LONGLONG=yes'
+                          else
+                            ac_cv_use_longlong='wxUSE_LONGLONG=no'
+                          fi
+                        
 else
-  wxUSE_STATLINE=$DEFAULT_wxUSE_STATLINE
+  
+                          LINE=`grep "wxUSE_LONGLONG" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_longlong='wxUSE_LONGLONG='$DEFAULT_wxUSE_LONGLONG
+                        
 fi
 
-# Check whether --enable-statusbar or --disable-statusbar was given.
-if test "${enable_statusbar+set}" = set; then
-  enableval="$enable_statusbar"
-  wxUSE_STATUSBAR="${enableval}"
+
+          eval "$ac_cv_use_longlong"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_longlong >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_LONGLONG" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-geometry""... $ac_c" 1>&6
+echo "configure:3484: checking for --enable-geometry" >&5
+          no_cache=0
+          # Check whether --enable-geometry or --disable-geometry was given.
+if test "${enable_geometry+set}" = set; then
+  enableval="$enable_geometry"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_geometry='wxUSE_GEOMETRY=yes'
+                          else
+                            ac_cv_use_geometry='wxUSE_GEOMETRY=no'
+                          fi
+                        
 else
-  wxUSE_STATUSBAR=$DEFAULT_wxUSE_STATUSBAR
+  
+                          LINE=`grep "wxUSE_GEOMETRY" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_geometry='wxUSE_GEOMETRY='$DEFAULT_wxUSE_GEOMETRY
+                        
 fi
 
-# Check whether --enable-tabdialog or --disable-tabdialog was given.
-if test "${enable_tabdialog+set}" = set; then
-  enableval="$enable_tabdialog"
-  wxUSE_TABDIALOG="${enableval}"
+
+          eval "$ac_cv_use_geometry"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_geometry >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_GEOMETRY" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-log""... $ac_c" 1>&6
+echo "configure:3523: checking for --enable-log" >&5
+          no_cache=0
+          # Check whether --enable-log or --disable-log was given.
+if test "${enable_log+set}" = set; then
+  enableval="$enable_log"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_log='wxUSE_LOG=yes'
+                          else
+                            ac_cv_use_log='wxUSE_LOG=no'
+                          fi
+                        
 else
-  wxUSE_TABDIALOG=$DEFAULT_wxUSE_TABDIALOG
+  
+                          LINE=`grep "wxUSE_LOG" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_log='wxUSE_LOG='$DEFAULT_wxUSE_LOG
+                        
 fi
 
-# Check whether --enable-toolbar or --disable-toolbar was given.
-if test "${enable_toolbar+set}" = set; then
-  enableval="$enable_toolbar"
-  wxUSE_TOOLBAR="${enableval}"
+
+          eval "$ac_cv_use_log"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_log >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_LOG" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-streams""... $ac_c" 1>&6
+echo "configure:3562: checking for --enable-streams" >&5
+          no_cache=0
+          # Check whether --enable-streams or --disable-streams was given.
+if test "${enable_streams+set}" = set; then
+  enableval="$enable_streams"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_streams='wxUSE_STREAMS=yes'
+                          else
+                            ac_cv_use_streams='wxUSE_STREAMS=no'
+                          fi
+                        
 else
-  wxUSE_TOOLBAR=$DEFAULT_wxUSE_TOOLBAR
+  
+                          LINE=`grep "wxUSE_STREAMS" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_streams='wxUSE_STREAMS='$DEFAULT_wxUSE_STREAMS
+                        
 fi
 
-# Check whether --enable-treectrl or --disable-treectrl was given.
-if test "${enable_treectrl+set}" = set; then
-  enableval="$enable_treectrl"
-  wxUSE_TREECTRL="${enableval}"
+
+          eval "$ac_cv_use_streams"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_streams >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_STREAMS" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-file""... $ac_c" 1>&6
+echo "configure:3601: checking for --enable-file" >&5
+          no_cache=0
+          # Check whether --enable-file or --disable-file was given.
+if test "${enable_file+set}" = set; then
+  enableval="$enable_file"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_file='wxUSE_FILE=yes'
+                          else
+                            ac_cv_use_file='wxUSE_FILE=no'
+                          fi
+                        
 else
-  wxUSE_TREECTRL=$DEFAULT_wxUSE_TREECTRL
+  
+                          LINE=`grep "wxUSE_FILE" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_file='wxUSE_FILE='$DEFAULT_wxUSE_FILE
+                        
 fi
 
 
+          eval "$ac_cv_use_file"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_file >> ${wx_arg_cache_file}.tmp
+          fi
 
-# Check whether --enable-commondlg or --disable-commondlg was given.
-if test "${enable_commondlg+set}" = set; then
-  enableval="$enable_commondlg"
-  wxUSE_COMMONDLGS="${enableval}"
+          if test "$wxUSE_FILE" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-ffile""... $ac_c" 1>&6
+echo "configure:3640: 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
-  wxUSE_COMMONDLGS=$DEFAULT_wxUSE_COMMONDLGS
+  
+                          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
 
-# Check whether --enable-miniframe or --disable-miniframe was given.
-if test "${enable_miniframe+set}" = set; then
-  enableval="$enable_miniframe"
-  wxUSE_MINIFRAME="${enableval}"
+
+          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:3679: checking for --enable-textfile" >&5
+          no_cache=0
+          # Check whether --enable-textfile or --disable-textfile was given.
+if test "${enable_textfile+set}" = set; then
+  enableval="$enable_textfile"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_textfile='wxUSE_TEXTFILE=yes'
+                          else
+                            ac_cv_use_textfile='wxUSE_TEXTFILE=no'
+                          fi
+                        
 else
-  wxUSE_MINIFRAME=$DEFAULT_wxUSE_MINIFRAME
+  
+                          LINE=`grep "wxUSE_TEXTFILE" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_textfile='wxUSE_TEXTFILE='$DEFAULT_wxUSE_TEXTFILE
+                        
 fi
 
-# Check whether --enable-tooltips or --disable-tooltips was given.
-if test "${enable_tooltips+set}" = set; then
-  enableval="$enable_tooltips"
-  wxUSE_TOOLTIPS="${enableval}"
+
+          eval "$ac_cv_use_textfile"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_textfile >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_TEXTFILE" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-fontmap""... $ac_c" 1>&6
+echo "configure:3718: 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
-  wxUSE_TOOLTIPS=$DEFAULT_wxUSE_TOOLTIPS
+  
+                          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
 
-# Check whether --enable-splines or --disable-splines was given.
-if test "${enable_splines+set}" = set; then
-  enableval="$enable_splines"
-  wxUSE_SPLINES="${enableval}"
+
+          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:3757: checking for --enable-unicode" >&5
+          no_cache=0
+          # Check whether --enable-unicode or --disable-unicode was given.
+if test "${enable_unicode+set}" = set; then
+  enableval="$enable_unicode"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_unicode='wxUSE_UNICODE=yes'
+                          else
+                            ac_cv_use_unicode='wxUSE_UNICODE=no'
+                          fi
+                        
 else
-  wxUSE_SPLINES=$DEFAULT_wxUSE_SPLINES
+  
+                          LINE=`grep "wxUSE_UNICODE" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_unicode='wxUSE_UNICODE='$DEFAULT_wxUSE_UNICODE
+                        
 fi
 
-# Check whether --enable-validators or --disable-validators was given.
-if test "${enable_validators+set}" = set; then
-  enableval="$enable_validators"
-  wxUSE_VALIDATORS="${enableval}"
+
+          eval "$ac_cv_use_unicode"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_unicode >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_UNICODE" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-wcsrtombs""... $ac_c" 1>&6
+echo "configure:3796: checking for --enable-wcsrtombs" >&5
+          no_cache=0
+          # Check whether --enable-wcsrtombs or --disable-wcsrtombs was given.
+if test "${enable_wcsrtombs+set}" = set; then
+  enableval="$enable_wcsrtombs"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_wcsrtombs='wxUSE_WCSRTOMBS=yes'
+                          else
+                            ac_cv_use_wcsrtombs='wxUSE_WCSRTOMBS=no'
+                          fi
+                        
 else
-  wxUSE_VALIDATORS=$DEFAULT_wxUSE_VALIDATORS
+  
+                          LINE=`grep "wxUSE_WCSRTOMBS" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_wcsrtombs='wxUSE_WCSRTOMBS='$DEFAULT_wxUSE_WCSRTOMBS
+                        
 fi
 
 
-NUM_TOOLKITS="$((${wxUSE_GTK:-0}+${wxUSE_MOTIF:-0}+${wxUSE_MSW:-0}))"
-
-case "$NUM_TOOLKITS" in
-  1)
-  ;;
-  0)
-    if test "$((${DEFAULT_wxUSE_GTK:-0}+${DEFAULT_wxUSE_MOTIF:-0}+${DEFAULT_wxUSE_MSW:-0}))" = 0; then
-      { echo "configure: error: Please specify a toolkit" 1>&2; exit 1; }
-    fi
-
-    wxUSE_GTK=$DEFAULT_wxUSE_GTK
-    wxUSE_MOTIF=$DEFAULT_wxUSE_MOTIF
-    wxUSE_MSW=$DEFAULT_wxUSE_MSW
-  ;;
-  *)
-    { echo "configure: error: Please specify at most one toolkit" 1>&2; exit 1; }
-esac
+          eval "$ac_cv_use_wcsrtombs"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_wcsrtombs >> ${wx_arg_cache_file}.tmp
+          fi
 
+          if test "$wxUSE_WCSRTOMBS" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
 
-cat > confcache <<\EOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs.  It is not useful on other systems.
-# If it contains results you don't want to keep, you may remove or edit it.
-#
-# By default, configure uses ./config.cache as the cache file,
-# creating it if it does not exist already.  You can give configure
-# the --cache-file=FILE option to use a different cache file; that is
-# what configure does when it calls configure scripts in
-# subdirectories, so they share the cache.
-# Giving --cache-file=/dev/null disables caching, for debugging configure.
-# config.status only pays attention to the cache file if you give it the
-# --recheck option to rerun configure.
-#
-EOF
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(set) 2>&1 |
-  case `(ac_space=' '; set | grep ac_space) 2>&1` in
-  *ac_space=\ *)
-    # `set' does not quote correctly, so add quotes (double-quote substitution
-    # turns \\\\ into \\, and sed turns \\ into \).
-    sed -n \
-      -e "s/'/'\\\\''/g" \
-      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
-    ;;
-  *)
-    # `set' quotes correctly as required by POSIX, so do not add quotes.
-    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
-    ;;
-  esac >> confcache
-if cmp -s $cache_file confcache; then
-  :
+          echo $ac_n "checking for --enable-wxprintfv""... $ac_c" 1>&6
+echo "configure:3835: checking for --enable-wxprintfv" >&5
+          no_cache=0
+          # Check whether --enable-wxprintfv or --disable-wxprintfv was given.
+if test "${enable_wxprintfv+set}" = set; then
+  enableval="$enable_wxprintfv"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_wxprintfv='wxUSE_EXPERIMENTAL_PRINTF=yes'
+                          else
+                            ac_cv_use_wxprintfv='wxUSE_EXPERIMENTAL_PRINTF=no'
+                          fi
+                        
 else
-  if test -w $cache_file; then
-    echo "updating cache $cache_file"
-    cat confcache > $cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
+  
+                          LINE=`grep "wxUSE_EXPERIMENTAL_PRINTF" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_wxprintfv='wxUSE_EXPERIMENTAL_PRINTF='$DEFAULT_wxUSE_EXPERIMENTAL_PRINTF
+                        
 fi
-rm -f confcache
 
 
-if eval "test $host != $build"; then
-  if eval "test $build != NONE"; then
-    CC="$build-gcc"
-    CXX="$build-g++"
-    RANLIB="$build-ranlib"
-    NM="$build-nm"
-  fi
-fi
+          eval "$ac_cv_use_wxprintfv"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_wxprintfv >> ${wx_arg_cache_file}.tmp
+          fi
 
-# Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2346: 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 test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="gcc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
+          if test "$wxUSE_EXPERIMENTAL_PRINTF" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-std_iostreams""... $ac_c" 1>&6
+echo "configure:3874: 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
+  enableval="$enable_std_iostreams"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_std_iostreams='wxUSE_STD_IOSTREAM=yes'
+                          else
+                            ac_cv_use_std_iostreams='wxUSE_STD_IOSTREAM=no'
+                          fi
+                        
 else
-  echo "$ac_t""no" 1>&6
+  
+                          LINE=`grep "wxUSE_STD_IOSTREAM" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_std_iostreams='wxUSE_STD_IOSTREAM='$DEFAULT_wxUSE_STD_IOSTREAM
+                        
 fi
 
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2376: 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 test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
+
+          eval "$ac_cv_use_std_iostreams"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_std_iostreams >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_STD_IOSTREAM" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-filesystem""... $ac_c" 1>&6
+echo "configure:3913: checking for --enable-filesystem" >&5
+          no_cache=0
+          # Check whether --enable-filesystem or --disable-filesystem was given.
+if test "${enable_filesystem+set}" = set; then
+  enableval="$enable_filesystem"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_filesystem='wxUSE_FILESYSTEM=yes'
+                          else
+                            ac_cv_use_filesystem='wxUSE_FILESYSTEM=no'
+                          fi
+                        
 else
-  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS=":"
-  ac_prog_rejected=no
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
-        ac_prog_rejected=yes
-       continue
-      fi
-      ac_cv_prog_CC="cc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# -gt 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    set dummy "$ac_dir/$ac_word" "$@"
-    shift
-    ac_cv_prog_CC="$@"
-  fi
-fi
-fi
+  
+                          LINE=`grep "wxUSE_FILESYSTEM" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_filesystem='wxUSE_FILESYSTEM='$DEFAULT_wxUSE_FILESYSTEM
+                        
 fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
+
+
+          eval "$ac_cv_use_filesystem"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_filesystem >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_FILESYSTEM" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-fs_inet""... $ac_c" 1>&6
+echo "configure:3952: 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
+  enableval="$enable_fs_inet"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_fs_inet='wxUSE_FS_INET=yes'
+                          else
+                            ac_cv_use_fs_inet='wxUSE_FS_INET=no'
+                          fi
+                        
 else
-  echo "$ac_t""no" 1>&6
+  
+                          LINE=`grep "wxUSE_FS_INET" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_fs_inet='wxUSE_FS_INET='$DEFAULT_wxUSE_FS_INET
+                        
 fi
 
-  if test -z "$CC"; then
-    case "`uname -s`" in
-    *win32* | *WIN32*)
-      # 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:2427: 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 test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
+
+          eval "$ac_cv_use_fs_inet"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_fs_inet >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_FS_INET" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-fs_zip""... $ac_c" 1>&6
+echo "configure:3991: 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
+  enableval="$enable_fs_zip"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_fs_zip='wxUSE_FS_ZIP=yes'
+                          else
+                            ac_cv_use_fs_zip='wxUSE_FS_ZIP=no'
+                          fi
+                        
 else
-  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="cl"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
+  
+                          LINE=`grep "wxUSE_FS_ZIP" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_fs_zip='wxUSE_FS_ZIP='$DEFAULT_wxUSE_FS_ZIP
+                        
 fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
+
+
+          eval "$ac_cv_use_fs_zip"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_fs_zip >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_FS_ZIP" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-zipstream""... $ac_c" 1>&6
+echo "configure:4030: checking for --enable-zipstream" >&5
+          no_cache=0
+          # Check whether --enable-zipstream or --disable-zipstream was given.
+if test "${enable_zipstream+set}" = set; then
+  enableval="$enable_zipstream"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_zipstream='wxUSE_ZIPSTREAM=yes'
+                          else
+                            ac_cv_use_zipstream='wxUSE_ZIPSTREAM=no'
+                          fi
+                        
 else
-  echo "$ac_t""no" 1>&6
-fi
- ;;
-    esac
-  fi
-  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
+  
+                          LINE=`grep "wxUSE_ZIPSTREAM" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_zipstream='wxUSE_ZIPSTREAM='$DEFAULT_wxUSE_ZIPSTREAM
+                        
 fi
 
-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:2459: 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_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
+          eval "$ac_cv_use_zipstream"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_zipstream >> ${wx_arg_cache_file}.tmp
+          fi
 
-cat > conftest.$ac_ext << EOF
+          if test "$wxUSE_ZIPSTREAM" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
 
-#line 2470 "configure"
-#include "confdefs.h"
 
-main(){return(0);}
-EOF
-if { (eval echo configure:2475: \"$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_cross=no
-  else
-    ac_cv_prog_cc_cross=yes
-  fi
+          echo $ac_n "checking for --enable-catch_segvs""... $ac_c" 1>&6
+echo "configure:4070: 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
+  enableval="$enable_catch_segvs"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_catch_segvs='wxUSE_ON_FATAL_EXCEPTION=yes'
+                          else
+                            ac_cv_use_catch_segvs='wxUSE_ON_FATAL_EXCEPTION=no'
+                          fi
+                        
 else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  ac_cv_prog_cc_works=no
-fi
-rm -fr conftest*
-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
+  
+                          LINE=`grep "wxUSE_ON_FATAL_EXCEPTION" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
 
-echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
-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; }
+                          ac_cv_use_catch_segvs='wxUSE_ON_FATAL_EXCEPTION='$DEFAULT_wxUSE_ON_FATAL_EXCEPTION
+                        
 fi
-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:2501: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
-echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
-cross_compiling=$ac_cv_prog_cc_cross
 
-echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:2506: 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
-  cat > conftest.c <<EOF
-#ifdef __GNUC__
-  yes;
-#endif
-EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2515: \"$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
-fi
-fi
 
-echo "$ac_t""$ac_cv_prog_gcc" 1>&6
+          eval "$ac_cv_use_catch_segvs"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_catch_segvs >> ${wx_arg_cache_file}.tmp
+          fi
 
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
+          if test "$wxUSE_ON_FATAL_EXCEPTION" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-snglinst""... $ac_c" 1>&6
+echo "configure:4109: checking for --enable-snglinst" >&5
+          no_cache=0
+          # Check whether --enable-snglinst or --disable-snglinst was given.
+if test "${enable_snglinst+set}" = set; then
+  enableval="$enable_snglinst"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_snglinst='wxUSE_SNGLINST_CHECKER=yes'
+                          else
+                            ac_cv_use_snglinst='wxUSE_SNGLINST_CHECKER=no'
+                          fi
+                        
 else
-  GCC=
+  
+                          LINE=`grep "wxUSE_SNGLINST_CHECKER" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_snglinst='wxUSE_SNGLINST_CHECKER='$DEFAULT_wxUSE_SNGLINST_CHECKER
+                        
 fi
 
-ac_test_CFLAGS="${CFLAGS+set}"
-ac_save_CFLAGS="$CFLAGS"
-CFLAGS=
-echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:2534: 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
-  echo 'void f(){}' > conftest.c
-if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
-  ac_cv_prog_cc_g=yes
+
+          eval "$ac_cv_use_snglinst"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_snglinst >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_SNGLINST_CHECKER" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+
+          echo $ac_n "checking for --enable-mimetype""... $ac_c" 1>&6
+echo "configure:4149: 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
-  ac_cv_prog_cc_g=no
-fi
-rm -f conftest*
+  
+                          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
 
-echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
-if test "$ac_test_CFLAGS" = set; then
-  CFLAGS="$ac_save_CFLAGS"
-elif test $ac_cv_prog_cc_g = yes; then
-  if test "$GCC" = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-g"
-  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:4188: 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
-  if test "$GCC" = yes; then
-    CFLAGS="-O2"
-  else
-    CFLAGS=
-  fi
+  
+                          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
 
 
-CFLAGS=`echo "$CFLAGS" | sed 's/-g//g'`
+          eval "$ac_cv_use_system_options"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_system_options >> ${wx_arg_cache_file}.tmp
+          fi
 
-echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:2569: checking how to run the C preprocessor" >&5
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
-  CPP=
-fi
-if test -z "$CPP"; then
-if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    # This must be in double quotes, not single quotes, because CPP may get
-  # substituted into the Makefile and "${CC-cc}" will confuse make.
-  CPP="${CC-cc} -E"
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp.
-  cat > conftest.$ac_ext <<EOF
-#line 2584 "configure"
-#include "confdefs.h"
-#include <assert.h>
-Syntax Error
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2590: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  :
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  CPP="${CC-cc} -E -traditional-cpp"
-  cat > conftest.$ac_ext <<EOF
-#line 2601 "configure"
-#include "confdefs.h"
-#include <assert.h>
-Syntax Error
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2607: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  :
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  CPP="${CC-cc} -nologo -E"
-  cat > conftest.$ac_ext <<EOF
-#line 2618 "configure"
-#include "confdefs.h"
-#include <assert.h>
-Syntax Error
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2624: \"$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 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:4229: checking for --enable-threads" >&5
+          no_cache=0
+          # Check whether --enable-threads or --disable-threads was given.
+if test "${enable_threads+set}" = set; then
+  enableval="$enable_threads"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_threads='wxUSE_THREADS=yes'
+                          else
+                            ac_cv_use_threads='wxUSE_THREADS=no'
+                          fi
+                        
 else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  CPP=/lib/cpp
-fi
-rm -f conftest*
-fi
-rm -f conftest*
-fi
-rm -f conftest*
-  ac_cv_prog_CPP="$CPP"
+  
+                          LINE=`grep "wxUSE_THREADS" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_threads='wxUSE_THREADS='$DEFAULT_wxUSE_THREADS
+                        
 fi
-  CPP="$ac_cv_prog_CPP"
+
+
+          eval "$ac_cv_use_threads"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_threads >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_THREADS" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-serial""... $ac_c" 1>&6
+echo "configure:4268: checking for --enable-serial" >&5
+          no_cache=0
+          # Check whether --enable-serial or --disable-serial was given.
+if test "${enable_serial+set}" = set; then
+  enableval="$enable_serial"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_serial='wxUSE_SERIAL=yes'
+                          else
+                            ac_cv_use_serial='wxUSE_SERIAL=no'
+                          fi
+                        
 else
-  ac_cv_prog_CPP="$CPP"
+  
+                          LINE=`grep "wxUSE_SERIAL" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_serial='wxUSE_SERIAL='$DEFAULT_wxUSE_SERIAL
+                        
 fi
-echo "$ac_t""$CPP" 1>&6
 
 
-if test $ac_cv_prog_gcc = yes; then
-    echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6
-echo "configure:2651: checking whether ${CC-cc} needs -traditional" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    ac_pattern="Autoconf.*'x'"
-  cat > conftest.$ac_ext <<EOF
-#line 2657 "configure"
-#include "confdefs.h"
-#include <sgtty.h>
-Autoconf TIOCGETP
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "$ac_pattern" >/dev/null 2>&1; then
-  rm -rf conftest*
-  ac_cv_prog_gcc_traditional=yes
+          eval "$ac_cv_use_serial"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_serial >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_SERIAL" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+if test "$wxUSE_GUI" = "yes"; then
+
+
+
+          echo $ac_n "checking for --enable-docview""... $ac_c" 1>&6
+echo "configure:4311: checking for --enable-docview" >&5
+          no_cache=0
+          # Check whether --enable-docview or --disable-docview was given.
+if test "${enable_docview+set}" = set; then
+  enableval="$enable_docview"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_docview='wxUSE_DOC_VIEW_ARCHITECTURE=yes'
+                          else
+                            ac_cv_use_docview='wxUSE_DOC_VIEW_ARCHITECTURE=no'
+                          fi
+                        
 else
-  rm -rf conftest*
-  ac_cv_prog_gcc_traditional=no
+  
+                          LINE=`grep "wxUSE_DOC_VIEW_ARCHITECTURE" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_docview='wxUSE_DOC_VIEW_ARCHITECTURE='$DEFAULT_wxUSE_DOC_VIEW_ARCHITECTURE
+                        
 fi
-rm -f conftest*
 
 
-  if test $ac_cv_prog_gcc_traditional = no; then
-    cat > conftest.$ac_ext <<EOF
-#line 2675 "configure"
-#include "confdefs.h"
-#include <termio.h>
-Autoconf TCGETA
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "$ac_pattern" >/dev/null 2>&1; then
-  rm -rf conftest*
-  ac_cv_prog_gcc_traditional=yes
-fi
-rm -f conftest*
+          eval "$ac_cv_use_docview"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_docview >> ${wx_arg_cache_file}.tmp
+          fi
 
-  fi
-fi
+          if test "$wxUSE_DOC_VIEW_ARCHITECTURE" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
 
-echo "$ac_t""$ac_cv_prog_gcc_traditional" 1>&6
-  if test $ac_cv_prog_gcc_traditional = yes; then
-    CC="$CC -traditional"
-  fi
-fi
+          echo $ac_n "checking for --enable-help""... $ac_c" 1>&6
+echo "configure:4350: checking for --enable-help" >&5
+          no_cache=0
+          # Check whether --enable-help or --disable-help was given.
+if test "${enable_help+set}" = set; then
+  enableval="$enable_help"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_help='wxUSE_HELP=yes'
+                          else
+                            ac_cv_use_help='wxUSE_HELP=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_HELP" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
 
+                          ac_cv_use_help='wxUSE_HELP='$DEFAULT_wxUSE_HELP
+                        
+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
+          eval "$ac_cv_use_help"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_help >> ${wx_arg_cache_file}.tmp
+          fi
 
+          if test "$wxUSE_HELP" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
 
-for ac_prog in $CCC c++ g++ gcc CC cxx cc++ cl
-do
-# Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2711: 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 test -n "$CXX"; then
-  ac_cv_prog_CXX="$CXX" # Let the user override the test.
+          echo $ac_n "checking for --enable-mshtmlhelp""... $ac_c" 1>&6
+echo "configure:4389: checking for --enable-mshtmlhelp" >&5
+          no_cache=0
+          # Check whether --enable-mshtmlhelp or --disable-mshtmlhelp was given.
+if test "${enable_mshtmlhelp+set}" = set; then
+  enableval="$enable_mshtmlhelp"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_mshtmlhelp='wxUSE_MS_HTML_HELP=yes'
+                          else
+                            ac_cv_use_mshtmlhelp='wxUSE_MS_HTML_HELP=no'
+                          fi
+                        
 else
-  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CXX="$ac_prog"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
+  
+                          LINE=`grep "wxUSE_MS_HTML_HELP" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_mshtmlhelp='wxUSE_MS_HTML_HELP='$DEFAULT_wxUSE_MS_HTML_HELP
+                        
 fi
+
+
+          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:4428: 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
-CXX="$ac_cv_prog_CXX"
-if test -n "$CXX"; then
-  echo "$ac_t""$CXX" 1>&6
+
+
+          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:4467: 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
-  echo "$ac_t""no" 1>&6
+  
+                          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
 
-test -n "$CXX" && break
-done
-test -n "$CXX" || CXX="gcc"
 
+          eval "$ac_cv_use_htmlhelp"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_htmlhelp >> ${wx_arg_cache_file}.tmp
+          fi
 
-echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:2743: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
+          if test "$wxUSE_WXHTML_HELP" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          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 for --enable-constraints""... $ac_c" 1>&6
+echo "configure:4506: 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
 
-cat > conftest.$ac_ext << EOF
+                          ac_cv_use_constraints='wxUSE_CONSTRAINTS='$DEFAULT_wxUSE_CONSTRAINTS
+                        
+fi
 
-#line 2754 "configure"
-#include "confdefs.h"
 
-int main(){return(0);}
-EOF
-if { (eval echo configure:2759: \"$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_cross=no
-  else
-    ac_cv_prog_cxx_cross=yes
-  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 "$wxUSE_CONSTRAINTS" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-printarch""... $ac_c" 1>&6
+echo "configure:4545: checking for --enable-printarch" >&5
+          no_cache=0
+          # Check whether --enable-printarch or --disable-printarch was given.
+if test "${enable_printarch+set}" = set; then
+  enableval="$enable_printarch"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE=yes'
+                          else
+                            ac_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE=no'
+                          fi
+                        
 else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  ac_cv_prog_cxx_works=no
-fi
-rm -fr conftest*
-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
+  
+                          LINE=`grep "wxUSE_PRINTING_ARCHITECTURE" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
 
-echo "$ac_t""$ac_cv_prog_cxx_works" 1>&6
-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; }
+                          ac_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE='$DEFAULT_wxUSE_PRINTING_ARCHITECTURE
+                        
 fi
-echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:2785: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
-echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
-cross_compiling=$ac_cv_prog_cxx_cross
 
-echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
-echo "configure:2790: 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
-  cat > conftest.C <<EOF
-#ifdef __GNUC__
-  yes;
-#endif
-EOF
-if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:2799: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-  ac_cv_prog_gxx=yes
+
+          eval "$ac_cv_use_printarch"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_printarch >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_PRINTING_ARCHITECTURE" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-mdi""... $ac_c" 1>&6
+echo "configure:4584: checking for --enable-mdi" >&5
+          no_cache=0
+          # Check whether --enable-mdi or --disable-mdi was given.
+if test "${enable_mdi+set}" = set; then
+  enableval="$enable_mdi"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_mdi='wxUSE_MDI_ARCHITECTURE=yes'
+                          else
+                            ac_cv_use_mdi='wxUSE_MDI_ARCHITECTURE=no'
+                          fi
+                        
 else
-  ac_cv_prog_gxx=no
-fi
+  
+                          LINE=`grep "wxUSE_MDI_ARCHITECTURE" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_mdi='wxUSE_MDI_ARCHITECTURE='$DEFAULT_wxUSE_MDI_ARCHITECTURE
+                        
 fi
 
-echo "$ac_t""$ac_cv_prog_gxx" 1>&6
 
-if test $ac_cv_prog_gxx = yes; then
-  GXX=yes
+          eval "$ac_cv_use_mdi"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_mdi >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_MDI_ARCHITECTURE" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-loggui""... $ac_c" 1>&6
+echo "configure:4623: 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
-  GXX=
+  
+                          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
 
-ac_test_CXXFLAGS="${CXXFLAGS+set}"
-ac_save_CXXFLAGS="$CXXFLAGS"
-CXXFLAGS=
-echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
-echo "configure:2818: 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
-  echo 'void f(){}' > conftest.cc
-if test -z "`${CXX-g++} -g -c conftest.cc 2>&1`"; then
-  ac_cv_prog_cxx_g=yes
+
+          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:4662: 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
-  ac_cv_prog_cxx_g=no
-fi
-rm -f conftest*
+  
+                          LINE=`grep "wxUSE_LOGWINDOW" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
 
+                          ac_cv_use_logwin='wxUSE_LOGWINDOW='$DEFAULT_wxUSE_LOGWINDOW
+                        
 fi
 
-echo "$ac_t""$ac_cv_prog_cxx_g" 1>&6
-if test "$ac_test_CXXFLAGS" = set; then
-  CXXFLAGS="$ac_save_CXXFLAGS"
-elif test $ac_cv_prog_cxx_g = yes; then
-  if test "$GXX" = yes; then
-    CXXFLAGS="-g -O2"
-  else
-    CXXFLAGS="-g"
-  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:4702: checking for --enable-postscript" >&5
+          no_cache=0
+          # Check whether --enable-postscript or --disable-postscript was given.
+if test "${enable_postscript+set}" = set; then
+  enableval="$enable_postscript"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_postscript='wxUSE_POSTSCRIPT=yes'
+                          else
+                            ac_cv_use_postscript='wxUSE_POSTSCRIPT=no'
+                          fi
+                        
 else
-  if test "$GXX" = yes; then
-    CXXFLAGS="-O2"
-  else
-    CXXFLAGS=
-  fi
+  
+                          LINE=`grep "wxUSE_POSTSCRIPT" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_postscript='wxUSE_POSTSCRIPT='$DEFAULT_wxUSE_POSTSCRIPT
+                        
 fi
 
 
-echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6
-echo "configure:2851: checking how to run the C++ preprocessor" >&5
-if test -z "$CXXCPP"; then
-if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_ext=C
-# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cxx_cross
-  CXXCPP="${CXX-g++} -E"
-  cat > conftest.$ac_ext <<EOF
-#line 2864 "configure"
-#include "confdefs.h"
-#include <stdlib.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2869: \"$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
-  :
+          eval "$ac_cv_use_postscript"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_postscript >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_POSTSCRIPT" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+
+
+
+          echo $ac_n "checking for --enable-prologio""... $ac_c" 1>&6
+echo "configure:4744: checking for --enable-prologio" >&5
+          no_cache=0
+          # Check whether --enable-prologio or --disable-prologio was given.
+if test "${enable_prologio+set}" = set; then
+  enableval="$enable_prologio"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_prologio='wxUSE_PROLOGIO=yes'
+                          else
+                            ac_cv_use_prologio='wxUSE_PROLOGIO=no'
+                          fi
+                        
 else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  CXXCPP=/lib/cpp
-fi
-rm -f conftest*
-  ac_cv_prog_CXXCPP="$CXXCPP"
-ac_ext=C
-# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cxx_cross
+  
+                          LINE=`grep "wxUSE_PROLOGIO" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_prologio='wxUSE_PROLOGIO='$DEFAULT_wxUSE_PROLOGIO
+                        
 fi
+
+
+          eval "$ac_cv_use_prologio"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_prologio >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_PROLOGIO" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-resources""... $ac_c" 1>&6
+echo "configure:4783: checking for --enable-resources" >&5
+          no_cache=0
+          # Check whether --enable-resources or --disable-resources was given.
+if test "${enable_resources+set}" = set; then
+  enableval="$enable_resources"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_resources='wxUSE_RESOURCES=yes'
+                          else
+                            ac_cv_use_resources='wxUSE_RESOURCES=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_RESOURCES" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_resources='wxUSE_RESOURCES='$DEFAULT_wxUSE_RESOURCES
+                        
 fi
-CXXCPP="$ac_cv_prog_CXXCPP"
-echo "$ac_t""$CXXCPP" 1>&6
 
 
-CXXFLAGS=`echo "$CXXFLAGS" | sed 's/-g//g'`
+          eval "$ac_cv_use_resources"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_resources >> ${wx_arg_cache_file}.tmp
+          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
+          if test "$wxUSE_RESOURCES" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
 
 
-# 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:2907: 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 test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+          echo $ac_n "checking for --enable-xresources""... $ac_c" 1>&6
+echo "configure:4823: checking for --enable-xresources" >&5
+          no_cache=0
+          # Check whether --enable-xresources or --disable-xresources was given.
+if test "${enable_xresources+set}" = set; then
+  enableval="$enable_xresources"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_xresources='wxUSE_X_RESOURCES=yes'
+                          else
+                            ac_cv_use_xresources='wxUSE_X_RESOURCES=no'
+                          fi
+                        
 else
-  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
-fi
+  
+                          LINE=`grep "wxUSE_X_RESOURCES" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_xresources='wxUSE_X_RESOURCES='$DEFAULT_wxUSE_X_RESOURCES
+                        
 fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
+
+
+          eval "$ac_cv_use_xresources"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_xresources >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_X_RESOURCES" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+
+
+          echo $ac_n "checking for --enable-clipboard""... $ac_c" 1>&6
+echo "configure:4864: checking for --enable-clipboard" >&5
+          no_cache=0
+          # Check whether --enable-clipboard or --disable-clipboard was given.
+if test "${enable_clipboard+set}" = set; then
+  enableval="$enable_clipboard"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_clipboard='wxUSE_CLIPBOARD=yes'
+                          else
+                            ac_cv_use_clipboard='wxUSE_CLIPBOARD=no'
+                          fi
+                        
 else
-  echo "$ac_t""no" 1>&6
+  
+                          LINE=`grep "wxUSE_CLIPBOARD" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_clipboard='wxUSE_CLIPBOARD='$DEFAULT_wxUSE_CLIPBOARD
+                        
 fi
 
 
-# Extract the first word of "ar", so it can be a program name with args.
-set dummy ar; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2938: 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 test -n "$AR"; then
-  ac_cv_prog_AR="$AR" # Let the user override the test.
+          eval "$ac_cv_use_clipboard"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_clipboard >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_CLIPBOARD" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-dnd""... $ac_c" 1>&6
+echo "configure:4903: checking for --enable-dnd" >&5
+          no_cache=0
+          # Check whether --enable-dnd or --disable-dnd was given.
+if test "${enable_dnd+set}" = set; then
+  enableval="$enable_dnd"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_dnd='wxUSE_DRAG_AND_DROP=yes'
+                          else
+                            ac_cv_use_dnd='wxUSE_DRAG_AND_DROP=no'
+                          fi
+                        
 else
-  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AR="ar"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_AR" && ac_cv_prog_AR="ar"
-fi
+  
+                          LINE=`grep "wxUSE_DRAG_AND_DROP" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_dnd='wxUSE_DRAG_AND_DROP='$DEFAULT_wxUSE_DRAG_AND_DROP
+                        
 fi
-AR="$ac_cv_prog_AR"
-if test -n "$AR"; then
-  echo "$ac_t""$AR" 1>&6
+
+
+          eval "$ac_cv_use_dnd"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_dnd >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_DRAG_AND_DROP" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-metafile""... $ac_c" 1>&6
+echo "configure:4942: 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
-  echo "$ac_t""no" 1>&6
+  
+                          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
 
 
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# 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:2978: 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
+          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-treelayout""... $ac_c" 1>&6
+echo "configure:4982: checking for --enable-treelayout" >&5
+          no_cache=0
+          # Check whether --enable-treelayout or --disable-treelayout was given.
+if test "${enable_treelayout+set}" = set; then
+  enableval="$enable_treelayout"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_treelayout='wxUSE_TREELAYOUT=yes'
+                          else
+                            ac_cv_use_treelayout='wxUSE_TREELAYOUT=no'
+                          fi
+                        
 else
-    IFS="${IFS=        }"; ac_save_IFS="$IFS"; IFS=":"
-  for ac_dir in $PATH; do
-    # Account for people who put trailing slashes in PATH elements.
-    case "$ac_dir/" in
-    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
-    *)
-      # OSF1 and SCO ODT 3.0 have their own names for install.
-      # Don't use installbsd from OSF since it installs stuff as root
-      # by default.
-      for ac_prog in ginstall scoinst install; do
-        if test -f $ac_dir/$ac_prog; then
-         if test $ac_prog = install &&
-            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
-           # AIX install.  It has an incompatible calling convention.
-           :
-         else
-           ac_cv_path_install="$ac_dir/$ac_prog -c"
-           break 2
-         fi
-       fi
-      done
-      ;;
-    esac
-  done
-  IFS="$ac_save_IFS"
+  
+                          LINE=`grep "wxUSE_TREELAYOUT" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
 
+                          ac_cv_use_treelayout='wxUSE_TREELAYOUT='$DEFAULT_wxUSE_TREELAYOUT
+                        
 fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL="$ac_cv_path_install"
-  else
-    # As a last resort, use the slow shell script.  We don't cache a
-    # path for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the path is relative.
-    INSTALL="$ac_install_sh"
-  fi
-fi
-echo "$ac_t""$INSTALL" 1>&6
 
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
 
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
+          eval "$ac_cv_use_treelayout"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_treelayout >> ${wx_arg_cache_file}.tmp
+          fi
 
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+          if test "$wxUSE_TREELAYOUT" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
 
 
-echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:3032: 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
-  rm -f conftestdata
-if ln -s X conftestdata 2>/dev/null
-then
-  rm -f conftestdata
-  ac_cv_prog_LN_S="ln -s"
+
+          echo $ac_n "checking for --enable-controls""... $ac_c" 1>&6
+echo "configure:5023: checking for --enable-controls" >&5
+          no_cache=0
+          # Check whether --enable-controls or --disable-controls was given.
+if test "${enable_controls+set}" = set; then
+  enableval="$enable_controls"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_controls='wxUSE_CONTROLS=yes'
+                          else
+                            ac_cv_use_controls='wxUSE_CONTROLS=no'
+                          fi
+                        
 else
-  ac_cv_prog_LN_S=ln
+  
+                          LINE=`grep "wxUSE_CONTROLS" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_controls='wxUSE_CONTROLS='$DEFAULT_wxUSE_CONTROLS
+                        
 fi
+
+
+          eval "$ac_cv_use_controls"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_controls >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_CONTROLS" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+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_CHECKBOX=yes
+  DEFAULT_wxUSE_CHECKLISTBOX=yes
+  DEFAULT_wxUSE_CHOICE=yes
+  DEFAULT_wxUSE_GAUGE=yes
+  DEFAULT_wxUSE_GRID=yes
+  DEFAULT_wxUSE_NEW_GRID=yes
+  DEFAULT_wxUSE_IMAGLIST=yes
+  DEFAULT_wxUSE_LISTBOX=yes
+  DEFAULT_wxUSE_LISTCTRL=yes
+  DEFAULT_wxUSE_NOTEBOOK=yes
+  DEFAULT_wxUSE_PROPSHEET=yes
+  DEFAULT_wxUSE_RADIOBOX=yes
+  DEFAULT_wxUSE_RADIOBTN=yes
+  DEFAULT_wxUSE_SASH=yes
+  DEFAULT_wxUSE_SCROLLBAR=yes
+  DEFAULT_wxUSE_SLIDER=yes
+  DEFAULT_wxUSE_SPINBTN=yes
+  DEFAULT_wxUSE_SPINCTRL=yes
+  DEFAULT_wxUSE_SPLITTER=yes
+  DEFAULT_wxUSE_STATBMP=yes
+  DEFAULT_wxUSE_STATBOX=yes
+  DEFAULT_wxUSE_STATLINE=yes
+  DEFAULT_wxUSE_STATUSBAR=yes
+  DEFAULT_wxUSE_TAB_DIALOG=yes
+  DEFAULT_wxUSE_TOGGLEBTN=yes
+  DEFAULT_wxUSE_TOOLBAR=yes
+  DEFAULT_wxUSE_TOOLBAR_NATIVE=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
+  DEFAULT_wxUSE_BMPBUTTON=no
+  DEFAULT_wxUSE_BUTTON=no
+  DEFAULT_wxUSE_CALCTRL=no
+  DEFAULT_wxUSE_CARET=no
+  DEFAULT_wxUSE_COMBOBOX=no
+  DEFAULT_wxUSE_CHECKBOX=no
+  DEFAULT_wxUSE_CHECKLISTBOX=no
+  DEFAULT_wxUSE_CHOICE=no
+  DEFAULT_wxUSE_GAUGE=no
+  DEFAULT_wxUSE_GRID=no
+  DEFAULT_wxUSE_NEW_GRID=no
+  DEFAULT_wxUSE_IMAGLIST=no
+  DEFAULT_wxUSE_LISTBOX=no
+  DEFAULT_wxUSE_LISTCTRL=no
+  DEFAULT_wxUSE_NOTEBOOK=no
+  DEFAULT_wxUSE_PROPSHEET=no
+  DEFAULT_wxUSE_RADIOBOX=no
+  DEFAULT_wxUSE_RADIOBTN=no
+  DEFAULT_wxUSE_SASH=no
+  DEFAULT_wxUSE_SCROLLBAR=no
+  DEFAULT_wxUSE_SLIDER=no
+  DEFAULT_wxUSE_SPINBTN=no
+  DEFAULT_wxUSE_SPINCTRL=no
+  DEFAULT_wxUSE_SPLITTER=no
+  DEFAULT_wxUSE_STATBMP=no
+  DEFAULT_wxUSE_STATBOX=no
+  DEFAULT_wxUSE_STATLINE=no
+  DEFAULT_wxUSE_STATUSBAR=no
+  DEFAULT_wxUSE_TAB_DIALOG=no
+  DEFAULT_wxUSE_TOGGLEBTN=no
+  DEFAULT_wxUSE_TOOLBAR=no
+  DEFAULT_wxUSE_TOOLBAR_NATIVE=no
+  DEFAULT_wxUSE_TOOLBAR_SIMPLE=no
+  DEFAULT_wxUSE_TOOLTIPS=no
+  DEFAULT_wxUSE_TREECTRL=no
+  DEFAULT_wxUSE_POPUPWIN=no
 fi
-LN_S="$ac_cv_prog_LN_S"
-if test "$ac_cv_prog_LN_S" = "ln -s"; then
-  echo "$ac_t""yes" 1>&6
+
+
+          echo $ac_n "checking for --enable-accel""... $ac_c" 1>&6
+echo "configure:5141: checking for --enable-accel" >&5
+          no_cache=0
+          # Check whether --enable-accel or --disable-accel was given.
+if test "${enable_accel+set}" = set; then
+  enableval="$enable_accel"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_accel='wxUSE_ACCEL=yes'
+                          else
+                            ac_cv_use_accel='wxUSE_ACCEL=no'
+                          fi
+                        
 else
-  echo "$ac_t""no" 1>&6
+  
+                          LINE=`grep "wxUSE_ACCEL" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_accel='wxUSE_ACCEL='$DEFAULT_wxUSE_ACCEL
+                        
 fi
 
 
-# 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:3056: 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 test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+          eval "$ac_cv_use_accel"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_accel >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_ACCEL" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-button""... $ac_c" 1>&6
+echo "configure:5180: checking for --enable-button" >&5
+          no_cache=0
+          # Check whether --enable-button or --disable-button was given.
+if test "${enable_button+set}" = set; then
+  enableval="$enable_button"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_button='wxUSE_BUTTON=yes'
+                          else
+                            ac_cv_use_button='wxUSE_BUTTON=no'
+                          fi
+                        
 else
-  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_STRIP="strip"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_STRIP" && ac_cv_prog_STRIP="true"
-fi
+  
+                          LINE=`grep "wxUSE_BUTTON" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_button='wxUSE_BUTTON='$DEFAULT_wxUSE_BUTTON
+                        
 fi
-STRIP="$ac_cv_prog_STRIP"
-if test -n "$STRIP"; then
-  echo "$ac_t""$STRIP" 1>&6
+
+
+          eval "$ac_cv_use_button"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_button >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_BUTTON" = yes; then
+            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:5219: checking for --enable-bmpbutton" >&5
+          no_cache=0
+          # Check whether --enable-bmpbutton or --disable-bmpbutton was given.
+if test "${enable_bmpbutton+set}" = set; then
+  enableval="$enable_bmpbutton"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_bmpbutton='wxUSE_BMPBUTTON=yes'
+                          else
+                            ac_cv_use_bmpbutton='wxUSE_BMPBUTTON=no'
+                          fi
+                        
 else
-  echo "$ac_t""no" 1>&6
+  
+                          LINE=`grep "wxUSE_BMPBUTTON" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_bmpbutton='wxUSE_BMPBUTTON='$DEFAULT_wxUSE_BMPBUTTON
+                        
 fi
 
 
-echo $ac_n "checking "make for VPATH support"""... $ac_c" 1>&6
-echo "configure:3085: checking "make for VPATH support"" >&5
-cat - << EOF > confMake
-check : file
-       cp \$? \$@
-       cp \$? final_file
-EOF
+          eval "$ac_cv_use_bmpbutton"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_bmpbutton >> ${wx_arg_cache_file}.tmp
+          fi
 
-if test ! -d sub ; then
-  mkdir sub
-fi
-echo dummy > sub/file
-${MAKE-make} -f confMake VPATH=sub 2> config.log > /dev/null
-RESULT=$?
-rm -f sub/file check final_file confMake
-rmdir sub
-if test "$RESULT" = 0; then
-  echo "$ac_t""yes" 1>&6
+          if test "$wxUSE_BMPBUTTON" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-calendar""... $ac_c" 1>&6
+echo "configure:5258: 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
-  echo "$ac_t""no" 1>&6
-  { echo "configure: error: You need a make-utility that is able to use the variable
-VPATH correctly.
-If your version of make does not support VPATH correctly" 1>&2; exit 1; }
+  
+                          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
 
-for ac_prog in 'bison -y' byacc
-do
-# Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3114: 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 test -n "$YACC"; then
-  ac_cv_prog_YACC="$YACC" # Let the user override the test.
+
+          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:5297: 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
-  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_YACC="$ac_prog"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
+  
+                          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
-YACC="$ac_cv_prog_YACC"
-if test -n "$YACC"; then
-  echo "$ac_t""$YACC" 1>&6
+
+
+          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:5336: checking for --enable-checkbox" >&5
+          no_cache=0
+          # Check whether --enable-checkbox or --disable-checkbox was given.
+if test "${enable_checkbox+set}" = set; then
+  enableval="$enable_checkbox"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_checkbox='wxUSE_CHECKBOX=yes'
+                          else
+                            ac_cv_use_checkbox='wxUSE_CHECKBOX=no'
+                          fi
+                        
 else
-  echo "$ac_t""no" 1>&6
+  
+                          LINE=`grep "wxUSE_CHECKBOX" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_checkbox='wxUSE_CHECKBOX='$DEFAULT_wxUSE_CHECKBOX
+                        
 fi
 
-test -n "$YACC" && break
-done
-test -n "$YACC" || YACC="yacc"
 
+          eval "$ac_cv_use_checkbox"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_checkbox >> ${wx_arg_cache_file}.tmp
+          fi
 
-missing_dir=`cd $ac_aux_dir && pwd`
-for ac_prog in flex lex
-do
-# Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3151: 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 test -n "$LEX"; then
-  ac_cv_prog_LEX="$LEX" # Let the user override the test.
-else
-  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_LEX="$ac_prog"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-LEX="$ac_cv_prog_LEX"
-if test -n "$LEX"; then
-  echo "$ac_t""$LEX" 1>&6
+          if test "$wxUSE_CHECKBOX" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-checklst""... $ac_c" 1>&6
+echo "configure:5375: checking for --enable-checklst" >&5
+          no_cache=0
+          # Check whether --enable-checklst or --disable-checklst was given.
+if test "${enable_checklst+set}" = set; then
+  enableval="$enable_checklst"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_checklst='wxUSE_CHECKLST=yes'
+                          else
+                            ac_cv_use_checklst='wxUSE_CHECKLST=no'
+                          fi
+                        
 else
-  echo "$ac_t""no" 1>&6
+  
+                          LINE=`grep "wxUSE_CHECKLST" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_checklst='wxUSE_CHECKLST='$DEFAULT_wxUSE_CHECKLST
+                        
 fi
 
-test -n "$LEX" && break
-done
-test -n "$LEX" || LEX=""$missing_dir/missing flex""
 
-# 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:3184: 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 test -n "$LEX"; then
-  ac_cv_prog_LEX="$LEX" # Let the user override the test.
-else
-  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_LEX="flex"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_LEX" && ac_cv_prog_LEX="lex"
-fi
-fi
-LEX="$ac_cv_prog_LEX"
-if test -n "$LEX"; then
-  echo "$ac_t""$LEX" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
+          eval "$ac_cv_use_checklst"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_checklst >> ${wx_arg_cache_file}.tmp
+          fi
 
-if test -z "$LEXLIB"
-then
-  case "$LEX" in
-  flex*) ac_lib=fl ;;
-  *) ac_lib=l ;;
-  esac
-  echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6
-echo "configure:3218: 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
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-l$ac_lib  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 3226 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char yywrap();
+          if test "$wxUSE_CHECKLST" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
 
-int main() {
-yywrap()
-; return 0; }
-EOF
-if { (eval echo configure:3237: \"$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"
+          echo $ac_n "checking for --enable-choice""... $ac_c" 1>&6
+echo "configure:5414: checking for --enable-choice" >&5
+          no_cache=0
+          # Check whether --enable-choice or --disable-choice was given.
+if test "${enable_choice+set}" = set; then
+  enableval="$enable_choice"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_choice='wxUSE_CHOICE=yes'
+                          else
+                            ac_cv_use_choice='wxUSE_CHOICE=no'
+                          fi
+                        
 else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
+  
+                          LINE=`grep "wxUSE_CHOICE" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
 
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  LEXLIB="-l$ac_lib"
-else
-  echo "$ac_t""no" 1>&6
+                          ac_cv_use_choice='wxUSE_CHOICE='$DEFAULT_wxUSE_CHOICE
+                        
 fi
 
-fi
 
-echo $ac_n "checking lex output file root""... $ac_c" 1>&6
-echo "configure:3260: checking lex output file root" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_lex_root'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  # The minimal lex program is just a single line: %%.  But some broken lexes
-# (Solaris, I think it was) want two %% lines, so accommodate them.
-echo '%%
-%%' | $LEX
-if test -f lex.yy.c; then
-  ac_cv_prog_lex_root=lex.yy
-elif test -f lexyy.c; then
-  ac_cv_prog_lex_root=lexyy
+          eval "$ac_cv_use_choice"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_choice >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_CHOICE" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-combobox""... $ac_c" 1>&6
+echo "configure:5453: checking for --enable-combobox" >&5
+          no_cache=0
+          # Check whether --enable-combobox or --disable-combobox was given.
+if test "${enable_combobox+set}" = set; then
+  enableval="$enable_combobox"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_combobox='wxUSE_COMBOBOX=yes'
+                          else
+                            ac_cv_use_combobox='wxUSE_COMBOBOX=no'
+                          fi
+                        
 else
-  { echo "configure: error: cannot find output from $LEX; giving up" 1>&2; exit 1; }
-fi
+  
+                          LINE=`grep "wxUSE_COMBOBOX" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_combobox='wxUSE_COMBOBOX='$DEFAULT_wxUSE_COMBOBOX
+                        
 fi
 
-echo "$ac_t""$ac_cv_prog_lex_root" 1>&6
-LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root
 
-echo $ac_n "checking whether yytext is a pointer""... $ac_c" 1>&6
-echo "configure:3281: checking whether yytext is a pointer" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_lex_yytext_pointer'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  # POSIX says lex can declare yytext either as a pointer or an array; the
-# default is implementation-dependent. Figure out which it is, since
-# not all implementations provide the %pointer and %array declarations.
-ac_cv_prog_lex_yytext_pointer=no
-echo 'extern char *yytext;' >>$LEX_OUTPUT_ROOT.c
-ac_save_LIBS="$LIBS"
-LIBS="$LIBS $LEXLIB"
-cat > conftest.$ac_ext <<EOF
-#line 3293 "configure"
-#include "confdefs.h"
-`cat $LEX_OUTPUT_ROOT.c`
-int main() {
+          eval "$ac_cv_use_combobox"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_combobox >> ${wx_arg_cache_file}.tmp
+          fi
 
-; return 0; }
-EOF
-if { (eval echo configure:3300: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  ac_cv_prog_lex_yytext_pointer=yes
+          if test "$wxUSE_COMBOBOX" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-gauge""... $ac_c" 1>&6
+echo "configure:5492: checking for --enable-gauge" >&5
+          no_cache=0
+          # Check whether --enable-gauge or --disable-gauge was given.
+if test "${enable_gauge+set}" = set; then
+  enableval="$enable_gauge"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_gauge='wxUSE_GAUGE=yes'
+                          else
+                            ac_cv_use_gauge='wxUSE_GAUGE=no'
+                          fi
+                        
 else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-rm -f "${LEX_OUTPUT_ROOT}.c"
+  
+                          LINE=`grep "wxUSE_GAUGE" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
 
+                          ac_cv_use_gauge='wxUSE_GAUGE='$DEFAULT_wxUSE_GAUGE
+                        
 fi
 
-echo "$ac_t""$ac_cv_prog_lex_yytext_pointer" 1>&6
-if test $ac_cv_prog_lex_yytext_pointer = yes; then
-  cat >> confdefs.h <<\EOF
-#define YYTEXT_POINTER 1
-EOF
 
-fi
+          eval "$ac_cv_use_gauge"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_gauge >> ${wx_arg_cache_file}.tmp
+          fi
 
+          if test "$wxUSE_GAUGE" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
 
-# Check whether --enable-static or --disable-static was given.
-if test "${enable_static+set}" = set; then
-  enableval="$enable_static"
-  p=${PACKAGE-default}
-case "$enableval" in
-yes) enable_static=yes ;;
-no) enable_static=no ;;
-*)
-  enable_static=no
-  # Look at the argument we got.  We use all the common list separators.
-  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-  for pkg in $enableval; do
-    if test "X$pkg" = "X$p"; then
-      enable_static=yes
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac
+          echo $ac_n "checking for --enable-grid""... $ac_c" 1>&6
+echo "configure:5531: checking for --enable-grid" >&5
+          no_cache=0
+          # Check whether --enable-grid or --disable-grid was given.
+if test "${enable_grid+set}" = set; then
+  enableval="$enable_grid"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_grid='wxUSE_GRID=yes'
+                          else
+                            ac_cv_use_grid='wxUSE_GRID=no'
+                          fi
+                        
 else
-  enable_static=no
-fi
+  
+                          LINE=`grep "wxUSE_GRID" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
 
-# Check whether --enable-shared or --disable-shared was given.
-if test "${enable_shared+set}" = set; then
-  enableval="$enable_shared"
-  p=${PACKAGE-default}
-case "$enableval" in
-yes) enable_shared=yes ;;
-no) enable_shared=no ;;
-*)
-  enable_shared=no
-  # Look at the argument we got.  We use all the common list separators.
-  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-  for pkg in $enableval; do
-    if test "X$pkg" = "X$p"; then
-      enable_shared=yes
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac
-else
-  enable_shared=yes
+                          ac_cv_use_grid='wxUSE_GRID='$DEFAULT_wxUSE_GRID
+                        
 fi
 
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:3369: checking build system type" >&5
 
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
+          eval "$ac_cv_use_grid"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_grid >> ${wx_arg_cache_file}.tmp
+          fi
 
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
+          if test "$wxUSE_GRID" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
 
-# Check whether --with-gnu-ld or --without-gnu-ld was given.
-if test "${with_gnu_ld+set}" = set; then
-  withval="$with_gnu_ld"
-  test "$withval" = no || with_gnu_ld=yes
-else
-  with_gnu_ld=no
-fi
-
-ac_prog=ld
-if test "$ac_cv_prog_gcc" = yes; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
-echo "configure:3398: checking for ld used by GCC" >&5
-  ac_prog=`($CC -print-prog-name=ld) 2>&5`
-  case "$ac_prog" in
-    # Accept absolute paths.
-    /* | [A-Za-z]:/*)
-      # Canonicalize the path of ld
-      re_direlt='/[^/][^/]*/\.\./'
-      sub_uncdrive='s%^\([A-Za-z]\):/%//\1/%'
-      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-        ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
-      done
-      case "$host_os" in
-      cygwin*)
-        # Convert to a UNC path for cygwin
-        test -z "$LD" && LD=`echo X$ac_prog | $Xsed -e "$sub_uncdrive"`
-       ;;
-      *)
-        test -z "$LD" && LD="$ac_prog"
-       ;;
-      esac
-      ;;
-    ##
-    ## FIXME:  The code fails later on if we try to use an $LD with
-    ##         '\\' path separators.
-    ##
-    [A-Za-z]:[\\]*)
-      # Canonicalize the path of ld
-      re_direlt='\\[^\\][^\\]*\\\.\.\(\\\)'
-      sub_uncdrive='s%^\([A-Za-z]\):\\%//\1/%'
-      sub_uncdir='s%\\%/%g'
-      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-        ac_prog=`echo $ac_prog| sed "s%$re_direlt%\1%"`
-      done
-      case "$host_os" in
-      cygwin*)
-        # Convert to a UNC path for cygwin
-        test -z "$LD" && LD=`echo X$ac_prog | sed -e 's%^X%%' -e "$sub_uncdrive" -e "$sub_uncdir"`
-       ;;
-      *)
-        test -z "$LD" && LD="$ac_prog"
-       ;;
-      esac
-      ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test "$with_gnu_ld" = yes; then
-  echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
-echo "configure:3452: checking for GNU ld" >&5
-else
-  echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
-echo "configure:3455: checking for non-GNU ld" >&5
-fi
-if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -z "$LD"; then
-  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog"; then
-      ac_cv_path_LD="$ac_dir/$ac_prog"
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some GNU ld's only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      if "$ac_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
-       test "$with_gnu_ld" != no && break
-      else
-        test "$with_gnu_ld" != yes && break
-      fi
-    fi
-  done
-  IFS="$ac_save_ifs"
+          echo $ac_n "checking for --enable-newgrid""... $ac_c" 1>&6
+echo "configure:5570: checking for --enable-newgrid" >&5
+          no_cache=0
+          # Check whether --enable-newgrid or --disable-newgrid was given.
+if test "${enable_newgrid+set}" = set; then
+  enableval="$enable_newgrid"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_newgrid='wxUSE_NEW_GRID=yes'
+                          else
+                            ac_cv_use_newgrid='wxUSE_NEW_GRID=no'
+                          fi
+                        
 else
-  ac_cv_path_LD="$LD" # Let the user override the test with a path.
-fi
+  
+                          LINE=`grep "wxUSE_NEW_GRID" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_newgrid='wxUSE_NEW_GRID='$DEFAULT_wxUSE_NEW_GRID
+                        
 fi
 
-LD="$ac_cv_path_LD"
-if test -n "$LD"; then
-  echo "$ac_t""$LD" 1>&6
+
+          eval "$ac_cv_use_newgrid"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_newgrid >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_NEW_GRID" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-imaglist""... $ac_c" 1>&6
+echo "configure:5609: checking for --enable-imaglist" >&5
+          no_cache=0
+          # Check whether --enable-imaglist or --disable-imaglist was given.
+if test "${enable_imaglist+set}" = set; then
+  enableval="$enable_imaglist"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_imaglist='wxUSE_IMAGLIST=yes'
+                          else
+                            ac_cv_use_imaglist='wxUSE_IMAGLIST=no'
+                          fi
+                        
 else
-  echo "$ac_t""no" 1>&6
+  
+                          LINE=`grep "wxUSE_IMAGLIST" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_imaglist='wxUSE_IMAGLIST='$DEFAULT_wxUSE_IMAGLIST
+                        
 fi
-test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
 
-echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
-echo "configure:3491: checking if the linker ($LD) is GNU ld" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_gnu_ld'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  # I'd rather use --version here, but apparently some GNU ld's only accept -v.
-if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
-  ac_cv_prog_gnu_ld=yes
+
+          eval "$ac_cv_use_imaglist"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_imaglist >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_IMAGLIST" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-listbox""... $ac_c" 1>&6
+echo "configure:5648: checking for --enable-listbox" >&5
+          no_cache=0
+          # Check whether --enable-listbox or --disable-listbox was given.
+if test "${enable_listbox+set}" = set; then
+  enableval="$enable_listbox"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_listbox='wxUSE_LISTBOX=yes'
+                          else
+                            ac_cv_use_listbox='wxUSE_LISTBOX=no'
+                          fi
+                        
 else
-  ac_cv_prog_gnu_ld=no
-fi
+  
+                          LINE=`grep "wxUSE_LISTBOX" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_listbox='wxUSE_LISTBOX='$DEFAULT_wxUSE_LISTBOX
+                        
 fi
 
-echo "$ac_t""$ac_cv_prog_gnu_ld" 1>&6
 
+          eval "$ac_cv_use_listbox"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_listbox >> ${wx_arg_cache_file}.tmp
+          fi
 
-echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6
-echo "configure:3507: checking for BSD-compatible nm" >&5
-if eval "test \"`echo '$''{'ac_cv_path_NM'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$NM"; then
-  # Let the user override the test.
-  ac_cv_path_NM="$NM"
+          if test "$wxUSE_LISTBOX" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-listctrl""... $ac_c" 1>&6
+echo "configure:5687: checking for --enable-listctrl" >&5
+          no_cache=0
+          # Check whether --enable-listctrl or --disable-listctrl was given.
+if test "${enable_listctrl+set}" = set; then
+  enableval="$enable_listctrl"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_listctrl='wxUSE_LISTCTRL=yes'
+                          else
+                            ac_cv_use_listctrl='wxUSE_LISTCTRL=no'
+                          fi
+                        
 else
-  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in /usr/ucb /usr/ccs/bin $PATH /bin; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/nm; then
-      # Check to see if the nm accepts a BSD-compat flag.
-      # Adding the `sed 1q' prevents false positives on HP-UX, which says:
-      #   nm: unknown option "B" ignored
-      if ($ac_dir/nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
-        ac_cv_path_NM="$ac_dir/nm -B"
-      elif ($ac_dir/nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
-        ac_cv_path_NM="$ac_dir/nm -p"
-      else
-        ac_cv_path_NM="$ac_dir/nm"
-      fi
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_path_NM" && ac_cv_path_NM=nm
-fi
+  
+                          LINE=`grep "wxUSE_LISTCTRL" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_listctrl='wxUSE_LISTCTRL='$DEFAULT_wxUSE_LISTCTRL
+                        
 fi
 
-NM="$ac_cv_path_NM"
-echo "$ac_t""$NM" 1>&6
 
+          eval "$ac_cv_use_listctrl"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_listctrl >> ${wx_arg_cache_file}.tmp
+          fi
 
-# Check for command to grab the raw symbol name followed by C symbol from nm.
-echo $ac_n "checking command to parse $NM output""... $ac_c" 1>&6
-echo "configure:3543: checking command to parse $NM output" >&5
-if eval "test \"`echo '$''{'ac_cv_sys_global_symbol_pipe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+          if test "$wxUSE_LISTCTRL" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-notebook""... $ac_c" 1>&6
+echo "configure:5726: checking for --enable-notebook" >&5
+          no_cache=0
+          # Check whether --enable-notebook or --disable-notebook was given.
+if test "${enable_notebook+set}" = set; then
+  enableval="$enable_notebook"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_notebook='wxUSE_NOTEBOOK=yes'
+                          else
+                            ac_cv_use_notebook='wxUSE_NOTEBOOK=no'
+                          fi
+                        
 else
-  # These are sane defaults that work on at least a few old systems.
-# {They come from Ultrix.  What could be older than Ultrix?!! ;)}
+  
+                          LINE=`grep "wxUSE_NOTEBOOK" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
 
-# Character class describing NM global symbol codes.
-ac_symcode='[BCDEGRSTU]'
+                          ac_cv_use_notebook='wxUSE_NOTEBOOK='$DEFAULT_wxUSE_NOTEBOOK
+                        
+fi
 
-# Regexp to match symbols that can be accessed directly from C.
-ac_sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
 
-# Transform the above into a raw symbol and a C symbol.
-ac_symxfrm='\1 \1'
+          eval "$ac_cv_use_notebook"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_notebook >> ${wx_arg_cache_file}.tmp
+          fi
 
-# Define system-specific variables.
-case "$host_os" in
-aix*)
-  ac_symcode='[BCDTU]'
-  ;;
-sunos* | cygwin32* | mingw32*)
-  ac_sympat='_\([_A-Za-z][_A-Za-z0-9]*\)'
-  ac_symxfrm='_\1 \1'
-  ;;
-irix*)
-  # Cannot use undefined symbols on IRIX because inlined functions mess us up.
-  ac_symcode='[BCDEGRST]'
-  ;;
-solaris*)
-  ac_symcode='[BDTU]'
-  ;;
-esac
+          if test "$wxUSE_NOTEBOOK" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-propsheet""... $ac_c" 1>&6
+echo "configure:5765: checking for --enable-propsheet" >&5
+          no_cache=0
+          # Check whether --enable-propsheet or --disable-propsheet was given.
+if test "${enable_propsheet+set}" = set; then
+  enableval="$enable_propsheet"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_propsheet='wxUSE_PROPSHEET=yes'
+                          else
+                            ac_cv_use_propsheet='wxUSE_PROPSHEET=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_PROPSHEET" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
 
-# If we're using GNU nm, then use its standard symbol codes.
-if $NM -V 2>&1 | egrep '(GNU|with BFD)' > /dev/null; then
-  ac_symcode='[ABCDGISTUW]'
+                          ac_cv_use_propsheet='wxUSE_PROPSHEET='$DEFAULT_wxUSE_PROPSHEET
+                        
 fi
 
-case "$host_os" in
-cygwin32* | mingw32*)
-  # We do not want undefined symbols on cygwin32.  The user must
-  # arrange to define them via -l arguments.
-  ac_symcode='[ABCDGISTW]'
-  ;;
-esac
 
-# Write the raw and C identifiers.
-ac_cv_sys_global_symbol_pipe="sed -n -e 's/^.* $ac_symcode $ac_sympat$/$ac_symxfrm/p'"
+          eval "$ac_cv_use_propsheet"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_propsheet >> ${wx_arg_cache_file}.tmp
+          fi
 
-# Check to see that the pipe works correctly.
-ac_pipe_works=no
-cat > conftest.$ac_ext <<EOF
-#ifdef __cplusplus
-extern "C" {
-#endif
-char nm_test_var;
-void nm_test_func(){}
-#ifdef __cplusplus
-}
-#endif
-int main(){nm_test_var='a';nm_test_func;return 0;}
-EOF
-if { (eval echo configure:3606: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  # Now try to grab the symbols.
-  ac_nlist=conftest.nm
-  if { (eval echo configure:3609: \"$NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist) 2>&5; } && test -s "$ac_nlist"; then
-
-    # Try sorting and uniquifying the output.
-    if sort "$ac_nlist" | uniq > "$ac_nlist"T; then
-      mv -f "$ac_nlist"T "$ac_nlist"
-      ac_wcout=`wc "$ac_nlist" 2>/dev/null`
-      ac_count=`echo "X$ac_wcout" | sed -e 's,^X,,' -e 's/^[   ]*\([0-9][0-9]*\).*$/\1/'`
-      (test "$ac_count" -ge 0) 2>/dev/null || ac_count=-1
-    else
-      rm -f "$ac_nlist"T
-      ac_count=-1
-    fi
+          if test "$wxUSE_PROPSHEET" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
 
-    # Make sure that we snagged all the symbols we need.
-    if egrep ' nm_test_var$' "$ac_nlist" >/dev/null; then
-      if egrep ' nm_test_func$' "$ac_nlist" >/dev/null; then
-       cat <<EOF > conftest.c
-#ifdef __cplusplus
-extern "C" {
-#endif
+          echo $ac_n "checking for --enable-radiobox""... $ac_c" 1>&6
+echo "configure:5804: checking for --enable-radiobox" >&5
+          no_cache=0
+          # Check whether --enable-radiobox or --disable-radiobox was given.
+if test "${enable_radiobox+set}" = set; then
+  enableval="$enable_radiobox"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_radiobox='wxUSE_RADIOBOX=yes'
+                          else
+                            ac_cv_use_radiobox='wxUSE_RADIOBOX=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_RADIOBOX" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
 
-EOF
-        # Now generate the symbol file.
-        sed 's/^.* \(.*\)$/extern char \1;/' < "$ac_nlist" >> conftest.c
+                          ac_cv_use_radiobox='wxUSE_RADIOBOX='$DEFAULT_wxUSE_RADIOBOX
+                        
+fi
 
-       cat <<EOF >> conftest.c
-#if defined (__STDC__) && __STDC__
-# define __ptr_t void *
-#else
-# define __ptr_t char *
-#endif
 
-/* The number of symbols in dld_preloaded_symbols, -1 if unsorted. */
-int dld_preloaded_symbol_count = $ac_count;
+          eval "$ac_cv_use_radiobox"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_radiobox >> ${wx_arg_cache_file}.tmp
+          fi
 
-/* The mapping between symbol names and symbols. */
-struct {
-  char *name;
-  __ptr_t address;
-}
-dld_preloaded_symbols[] =
-{
-EOF
-        sed 's/^\(.*\) \(.*\)$/  {"\1", (__ptr_t) \&\2},/' < "$ac_nlist" >> conftest.c
-        cat <<\EOF >> conftest.c
-  {0, (__ptr_t) 0}
-};
+          if test "$wxUSE_RADIOBOX" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
 
-#ifdef __cplusplus
-}
-#endif
-EOF
-        # Now try linking the two files.
-        mv conftest.$ac_objext conftestm.$ac_objext
-       ac_save_LIBS="$LIBS"
-       ac_save_CFLAGS="$CFLAGS"
-        LIBS="conftestm.$ac_objext"
-       CFLAGS="$CFLAGS$no_builtin_flag"
-        if { (eval echo configure:3667: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-          ac_pipe_works=yes
-        else
-          echo "configure: failed program was:" >&5
-          cat conftest.c >&5
-        fi
-        LIBS="$ac_save_LIBS"
-       CFLAGS="$ac_save_CFLAGS"
-      else
-        echo "cannot find nm_test_func in $ac_nlist" >&5
-      fi
-    else
-      echo "cannot find nm_test_var in $ac_nlist" >&5
-    fi
-  else
-    echo "cannot run $ac_cv_sys_global_symbol_pipe" >&5
-  fi
+          echo $ac_n "checking for --enable-radiobtn""... $ac_c" 1>&6
+echo "configure:5843: checking for --enable-radiobtn" >&5
+          no_cache=0
+          # Check whether --enable-radiobtn or --disable-radiobtn was given.
+if test "${enable_radiobtn+set}" = set; then
+  enableval="$enable_radiobtn"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_radiobtn='wxUSE_RADIOBTN=yes'
+                          else
+                            ac_cv_use_radiobtn='wxUSE_RADIOBTN=no'
+                          fi
+                        
 else
-  echo "$progname: failed program was:" >&5
-  cat conftest.c >&5
-fi
-rm -rf conftest*
-
-# Do not use the global_symbol_pipe unless it works.
-test "$ac_pipe_works" = yes || ac_cv_sys_global_symbol_pipe=
+  
+                          LINE=`grep "wxUSE_RADIOBTN" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
 
+                          ac_cv_use_radiobtn='wxUSE_RADIOBTN='$DEFAULT_wxUSE_RADIOBTN
+                        
 fi
 
 
-ac_result=yes
-if test -z "$ac_cv_sys_global_symbol_pipe"; then
-   ac_result=no
-fi
-echo "$ac_t""$ac_result" 1>&6
+          eval "$ac_cv_use_radiobtn"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_radiobtn >> ${wx_arg_cache_file}.tmp
+          fi
 
-echo $ac_n "checking for _ prefix in compiled symbols""... $ac_c" 1>&6
-echo "configure:3703: checking for _ prefix in compiled symbols" >&5
-if eval "test \"`echo '$''{'ac_cv_sys_symbol_underscore'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_cv_sys_symbol_underscore=no
-cat > conftest.$ac_ext <<EOF
-void nm_test_func(){}
-int main(){nm_test_func;return 0;}
-EOF
-if { (eval echo configure:3712: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  # Now try to grab the symbols.
-  ac_nlist=conftest.nm
-  if { (eval echo configure:3715: \"$NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $ac_cv_sys_global_symbol_pipe \> $ac_nlist) 2>&5; } && test -s "$ac_nlist"; then
-    # See whether the symbols have a leading underscore.
-    if egrep '^_nm_test_func' "$ac_nlist" >/dev/null; then
-      ac_cv_sys_symbol_underscore=yes
-    else
-      if egrep '^nm_test_func ' "$ac_nlist" >/dev/null; then
-        :
-      else
-        echo "configure: cannot find nm_test_func in $ac_nlist" >&5
-      fi
-    fi
-  else
-    echo "configure: cannot run $ac_cv_sys_global_symbol_pipe" >&5
-  fi
+          if test "$wxUSE_RADIOBTN" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-sash""... $ac_c" 1>&6
+echo "configure:5882: checking for --enable-sash" >&5
+          no_cache=0
+          # Check whether --enable-sash or --disable-sash was given.
+if test "${enable_sash+set}" = set; then
+  enableval="$enable_sash"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_sash='wxUSE_SASH=yes'
+                          else
+                            ac_cv_use_sash='wxUSE_SASH=no'
+                          fi
+                        
 else
-  echo "configure: failed program was:" >&5
-  cat conftest.c >&5
-fi
-rm -rf conftest*
+  
+                          LINE=`grep "wxUSE_SASH" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
 
+                          ac_cv_use_sash='wxUSE_SASH='$DEFAULT_wxUSE_SASH
+                        
 fi
 
-echo "$ac_t""$ac_cv_sys_symbol_underscore" 1>&6
-if test x$ac_cv_sys_symbol_underscore = xyes; then
-  cat >> confdefs.h <<\EOF
-#define WITH_SYMBOL_UNDERSCORE 1
-EOF
 
-fi
+          eval "$ac_cv_use_sash"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_sash >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_SASH" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
 
-if test $host != $build; then
-  ac_tool_prefix=${host_alias}-
+          echo $ac_n "checking for --enable-scrollbar""... $ac_c" 1>&6
+echo "configure:5921: checking for --enable-scrollbar" >&5
+          no_cache=0
+          # Check whether --enable-scrollbar or --disable-scrollbar was given.
+if test "${enable_scrollbar+set}" = set; then
+  enableval="$enable_scrollbar"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_scrollbar='wxUSE_SCROLLBAR=yes'
+                          else
+                            ac_cv_use_scrollbar='wxUSE_SCROLLBAR=no'
+                          fi
+                        
 else
-  ac_tool_prefix=
+  
+                          LINE=`grep "wxUSE_SCROLLBAR" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_scrollbar='wxUSE_SCROLLBAR='$DEFAULT_wxUSE_SCROLLBAR
+                        
 fi
 
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
 
-# Check for any special flags to pass to ltconfig.
-libtool_flags=
-test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
-test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
-test "$silent" = yes && libtool_flags="$libtool_flags --silent"
-test "$ac_cv_prog_gcc" = yes && libtool_flags="$libtool_flags --with-gcc"
-test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
+          eval "$ac_cv_use_scrollbar"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_scrollbar >> ${wx_arg_cache_file}.tmp
+          fi
 
-# Some flags need to be propagated to the compiler or linker for good
-# libtool support.
-case "$host" in
-*-*-irix6*)
-  # Find out which ABI we are using.
-  echo '#line 3767 "configure"' > conftest.$ac_ext
-  if { (eval echo configure:3768: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-    case "`/usr/bin/file conftest.o`" in
-    *32-bit*)
-      LD="${LD-ld} -32"
-      ;;
-    *N32*)
-      LD="${LD-ld} -n32"
-      ;;
-    *64-bit*)
-      LD="${LD-ld} -64"
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
+          if test "$wxUSE_SCROLLBAR" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
 
-*-*-sco3.2v5*)
-  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-  SAVE_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS -belf"
-  echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6
-echo "configure:3789: checking whether the C compiler needs -belf" >&5
-if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+          echo $ac_n "checking for --enable-slider""... $ac_c" 1>&6
+echo "configure:5960: checking for --enable-slider" >&5
+          no_cache=0
+          # Check whether --enable-slider or --disable-slider was given.
+if test "${enable_slider+set}" = set; then
+  enableval="$enable_slider"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_slider='wxUSE_SLIDER=yes'
+                          else
+                            ac_cv_use_slider='wxUSE_SLIDER=no'
+                          fi
+                        
 else
-  cat > conftest.$ac_ext <<EOF
-#line 3794 "configure"
-#include "confdefs.h"
-
-int main() {
+  
+                          LINE=`grep "wxUSE_SLIDER" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
 
-; return 0; }
-EOF
-if { (eval echo configure:3801: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  lt_cv_cc_needs_belf=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  lt_cv_cc_needs_belf=no
-fi
-rm -f conftest*
+                          ac_cv_use_slider='wxUSE_SLIDER='$DEFAULT_wxUSE_SLIDER
+                        
 fi
 
-echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6
-  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
-    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-    CFLAGS="$SAVE_CFLAGS"
-  fi
-  ;;
 
-*-*-cygwin32*)
-  # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
-set dummy ${ac_tool_prefix}dlltool; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3824: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$DLLTOOL"; then
-  ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
+          eval "$ac_cv_use_slider"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_slider >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_SLIDER" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-spinbtn""... $ac_c" 1>&6
+echo "configure:5999: checking for --enable-spinbtn" >&5
+          no_cache=0
+          # Check whether --enable-spinbtn or --disable-spinbtn was given.
+if test "${enable_spinbtn+set}" = set; then
+  enableval="$enable_spinbtn"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_spinbtn='wxUSE_SPINBTN=yes'
+                          else
+                            ac_cv_use_spinbtn='wxUSE_SPINBTN=no'
+                          fi
+                        
 else
-  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
+  
+                          LINE=`grep "wxUSE_SPINBTN" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_spinbtn='wxUSE_SPINBTN='$DEFAULT_wxUSE_SPINBTN
+                        
 fi
-DLLTOOL="$ac_cv_prog_DLLTOOL"
-if test -n "$DLLTOOL"; then
-  echo "$ac_t""$DLLTOOL" 1>&6
+
+
+          eval "$ac_cv_use_spinbtn"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_spinbtn >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_SPINBTN" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-spinctrl""... $ac_c" 1>&6
+echo "configure:6038: checking for --enable-spinctrl" >&5
+          no_cache=0
+          # Check whether --enable-spinctrl or --disable-spinctrl was given.
+if test "${enable_spinctrl+set}" = set; then
+  enableval="$enable_spinctrl"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_spinctrl='wxUSE_SPINCTRL=yes'
+                          else
+                            ac_cv_use_spinctrl='wxUSE_SPINCTRL=no'
+                          fi
+                        
 else
-  echo "$ac_t""no" 1>&6
+  
+                          LINE=`grep "wxUSE_SPINCTRL" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_spinctrl='wxUSE_SPINCTRL='$DEFAULT_wxUSE_SPINCTRL
+                        
 fi
 
 
-if test -z "$ac_cv_prog_DLLTOOL"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "dlltool", so it can be a program name with args.
-set dummy dlltool; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3856: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$DLLTOOL"; then
-  ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
+          eval "$ac_cv_use_spinctrl"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_spinctrl >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_SPINCTRL" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-splitter""... $ac_c" 1>&6
+echo "configure:6077: checking for --enable-splitter" >&5
+          no_cache=0
+          # Check whether --enable-splitter or --disable-splitter was given.
+if test "${enable_splitter+set}" = set; then
+  enableval="$enable_splitter"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_splitter='wxUSE_SPLITTER=yes'
+                          else
+                            ac_cv_use_splitter='wxUSE_SPLITTER=no'
+                          fi
+                        
 else
-  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_DLLTOOL="dlltool"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_DLLTOOL" && ac_cv_prog_DLLTOOL="false"
-fi
+  
+                          LINE=`grep "wxUSE_SPLITTER" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_splitter='wxUSE_SPLITTER='$DEFAULT_wxUSE_SPLITTER
+                        
 fi
-DLLTOOL="$ac_cv_prog_DLLTOOL"
-if test -n "$DLLTOOL"; then
-  echo "$ac_t""$DLLTOOL" 1>&6
+
+
+          eval "$ac_cv_use_splitter"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_splitter >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_SPLITTER" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-statbmp""... $ac_c" 1>&6
+echo "configure:6116: checking for --enable-statbmp" >&5
+          no_cache=0
+          # Check whether --enable-statbmp or --disable-statbmp was given.
+if test "${enable_statbmp+set}" = set; then
+  enableval="$enable_statbmp"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_statbmp='wxUSE_STATBMP=yes'
+                          else
+                            ac_cv_use_statbmp='wxUSE_STATBMP=no'
+                          fi
+                        
 else
-  echo "$ac_t""no" 1>&6
+  
+                          LINE=`grep "wxUSE_STATBMP" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_statbmp='wxUSE_STATBMP='$DEFAULT_wxUSE_STATBMP
+                        
 fi
 
+
+          eval "$ac_cv_use_statbmp"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_statbmp >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_STATBMP" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-statbox""... $ac_c" 1>&6
+echo "configure:6155: checking for --enable-statbox" >&5
+          no_cache=0
+          # Check whether --enable-statbox or --disable-statbox was given.
+if test "${enable_statbox+set}" = set; then
+  enableval="$enable_statbox"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_statbox='wxUSE_STATBOX=yes'
+                          else
+                            ac_cv_use_statbox='wxUSE_STATBOX=no'
+                          fi
+                        
 else
-  DLLTOOL="false"
-fi
+  
+                          LINE=`grep "wxUSE_STATBOX" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_statbox='wxUSE_STATBOX='$DEFAULT_wxUSE_STATBOX
+                        
 fi
 
-# Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
-set dummy ${ac_tool_prefix}as; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3891: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$AS"; then
-  ac_cv_prog_AS="$AS" # Let the user override the test.
+
+          eval "$ac_cv_use_statbox"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_statbox >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_STATBOX" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-statline""... $ac_c" 1>&6
+echo "configure:6194: checking for --enable-statline" >&5
+          no_cache=0
+          # Check whether --enable-statline or --disable-statline was given.
+if test "${enable_statline+set}" = set; then
+  enableval="$enable_statline"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_statline='wxUSE_STATLINE=yes'
+                          else
+                            ac_cv_use_statline='wxUSE_STATLINE=no'
+                          fi
+                        
 else
-  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AS="${ac_tool_prefix}as"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
+  
+                          LINE=`grep "wxUSE_STATLINE" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_statline='wxUSE_STATLINE='$DEFAULT_wxUSE_STATLINE
+                        
 fi
-AS="$ac_cv_prog_AS"
-if test -n "$AS"; then
-  echo "$ac_t""$AS" 1>&6
+
+
+          eval "$ac_cv_use_statline"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_statline >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_STATLINE" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-stattext""... $ac_c" 1>&6
+echo "configure:6233: 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
-  echo "$ac_t""no" 1>&6
+  
+                          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
 
 
-if test -z "$ac_cv_prog_AS"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "as", so it can be a program name with args.
-set dummy as; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3923: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$AS"; then
-  ac_cv_prog_AS="$AS" # Let the user override the test.
+          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:6272: checking for --enable-statusbar" >&5
+          no_cache=0
+          # Check whether --enable-statusbar or --disable-statusbar was given.
+if test "${enable_statusbar+set}" = set; then
+  enableval="$enable_statusbar"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_statusbar='wxUSE_STATUSBAR=yes'
+                          else
+                            ac_cv_use_statusbar='wxUSE_STATUSBAR=no'
+                          fi
+                        
 else
-  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AS="as"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_AS" && ac_cv_prog_AS="false"
-fi
+  
+                          LINE=`grep "wxUSE_STATUSBAR" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_statusbar='wxUSE_STATUSBAR='$DEFAULT_wxUSE_STATUSBAR
+                        
 fi
-AS="$ac_cv_prog_AS"
-if test -n "$AS"; then
-  echo "$ac_t""$AS" 1>&6
+
+
+          eval "$ac_cv_use_statusbar"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_statusbar >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_STATUSBAR" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-tabdialog""... $ac_c" 1>&6
+echo "configure:6311: checking for --enable-tabdialog" >&5
+          no_cache=0
+          # Check whether --enable-tabdialog or --disable-tabdialog was given.
+if test "${enable_tabdialog+set}" = set; then
+  enableval="$enable_tabdialog"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_tabdialog='wxUSE_TABDIALOG=yes'
+                          else
+                            ac_cv_use_tabdialog='wxUSE_TABDIALOG=no'
+                          fi
+                        
 else
-  echo "$ac_t""no" 1>&6
+  
+                          LINE=`grep "wxUSE_TABDIALOG" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_tabdialog='wxUSE_TABDIALOG='$DEFAULT_wxUSE_TABDIALOG
+                        
 fi
 
+
+          eval "$ac_cv_use_tabdialog"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_tabdialog >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_TABDIALOG" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-textctrl""... $ac_c" 1>&6
+echo "configure:6350: 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
-  AS="false"
-fi
-fi
+  
+                          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
 
-  ;;
 
-esac
+          eval "$ac_cv_use_textctrl"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_textctrl >> ${wx_arg_cache_file}.tmp
+          fi
 
-# enable the --disable-libtool-lock switch
+          if test "$wxUSE_TEXTCTRL" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
 
-# Check whether --enable-libtool-lock or --disable-libtool-lock was given.
-if test "${enable_libtool_lock+set}" = set; then
-  enableval="$enable_libtool_lock"
-  need_locks=$enableval
+          echo $ac_n "checking for --enable-togglebtn""... $ac_c" 1>&6
+echo "configure:6389: checking for --enable-togglebtn" >&5
+          no_cache=0
+          # Check whether --enable-togglebtn or --disable-togglebtn was given.
+if test "${enable_togglebtn+set}" = set; then
+  enableval="$enable_togglebtn"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_togglebtn='wxUSE_TOGGLEBTN=yes'
+                          else
+                            ac_cv_use_togglebtn='wxUSE_TOGGLEBTN=no'
+                          fi
+                        
 else
-  need_locks=yes
+  
+                          LINE=`grep "wxUSE_TOGGLEBTN" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_togglebtn='wxUSE_TOGGLEBTN='$DEFAULT_wxUSE_TOGGLEBTN
+                        
 fi
 
 
-if test x"$need_locks" = xno; then
-  libtool_flags="$libtool_flags --disable-lock"
-fi
+          eval "$ac_cv_use_togglebtn"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_togglebtn >> ${wx_arg_cache_file}.tmp
+          fi
 
+          if test "$wxUSE_TOGGLEBTN" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
 
-# Actually configure libtool.  ac_aux_dir is where install-sh is found.
-CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
-LD="$LD" NM="$NM" RANLIB="$RANLIB" LN_S="$LN_S" \
-DLLTOOL="$DLLTOOL" AS="$AS" \
-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
-$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
-|| { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
+          echo $ac_n "checking for --enable-toolbar""... $ac_c" 1>&6
+echo "configure:6428: checking for --enable-toolbar" >&5
+          no_cache=0
+          # Check whether --enable-toolbar or --disable-toolbar was given.
+if test "${enable_toolbar+set}" = set; then
+  enableval="$enable_toolbar"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_toolbar='wxUSE_TOOLBAR=yes'
+                          else
+                            ac_cv_use_toolbar='wxUSE_TOOLBAR=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_TOOLBAR" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
 
-# Redirect the config.log output again, so that the ltconfig log is not
-# clobbered by the next message.
-exec 5>>./config.log
+                          ac_cv_use_toolbar='wxUSE_TOOLBAR='$DEFAULT_wxUSE_TOOLBAR
+                        
+fi
+
+
+          eval "$ac_cv_use_toolbar"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_toolbar >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_TOOLBAR" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-tbarnative""... $ac_c" 1>&6
+echo "configure:6467: checking for --enable-tbarnative" >&5
+          no_cache=0
+          # Check whether --enable-tbarnative or --disable-tbarnative was given.
+if test "${enable_tbarnative+set}" = set; then
+  enableval="$enable_tbarnative"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE=yes'
+                          else
+                            ac_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_TOOLBAR_NATIVE" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_tbarnative='wxUSE_TOOLBAR_NATIVE='$DEFAULT_wxUSE_TOOLBAR_NATIVE
+                        
+fi
+
+
+          eval "$ac_cv_use_tbarnative"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_tbarnative >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_TOOLBAR_NATIVE" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-tbarsmpl""... $ac_c" 1>&6
+echo "configure:6506: checking for --enable-tbarsmpl" >&5
+          no_cache=0
+          # Check whether --enable-tbarsmpl or --disable-tbarsmpl was given.
+if test "${enable_tbarsmpl+set}" = set; then
+  enableval="$enable_tbarsmpl"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_tbarsmpl='wxUSE_TOOLBAR_SIMPLE=yes'
+                          else
+                            ac_cv_use_tbarsmpl='wxUSE_TOOLBAR_SIMPLE=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_TOOLBAR_SIMPLE" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_tbarsmpl='wxUSE_TOOLBAR_SIMPLE='$DEFAULT_wxUSE_TOOLBAR_SIMPLE
+                        
+fi
+
+
+          eval "$ac_cv_use_tbarsmpl"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_tbarsmpl >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_TOOLBAR_SIMPLE" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-treectrl""... $ac_c" 1>&6
+echo "configure:6545: checking for --enable-treectrl" >&5
+          no_cache=0
+          # Check whether --enable-treectrl or --disable-treectrl was given.
+if test "${enable_treectrl+set}" = set; then
+  enableval="$enable_treectrl"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_treectrl='wxUSE_TREECTRL=yes'
+                          else
+                            ac_cv_use_treectrl='wxUSE_TREECTRL=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_TREECTRL" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_treectrl='wxUSE_TREECTRL='$DEFAULT_wxUSE_TREECTRL
+                        
+fi
+
+
+          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:6584: 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:6625: 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:6664: 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:6703: 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:6742: 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-filedlg""... $ac_c" 1>&6
+echo "configure:6781: 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_FINDREPLDLG=yes'
+                          else
+                            ac_cv_use_filedlg='wxUSE_FINDREPLDLG=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_FINDREPLDLG" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_filedlg='wxUSE_FINDREPLDLG='$DEFAULT_wxUSE_FINDREPLDLG
+                        
+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_FINDREPLDLG" = 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:6820: 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:6859: 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
+            echo $ac_cv_use_dirdlg >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_DIRDLG" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-msgdlg""... $ac_c" 1>&6
+echo "configure:6898: checking for --enable-msgdlg" >&5
+          no_cache=0
+          # Check whether --enable-msgdlg or --disable-msgdlg was given.
+if test "${enable_msgdlg+set}" = set; then
+  enableval="$enable_msgdlg"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_msgdlg='wxUSE_MSGDLG=yes'
+                          else
+                            ac_cv_use_msgdlg='wxUSE_MSGDLG=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_MSGDLG" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_msgdlg='wxUSE_MSGDLG='$DEFAULT_wxUSE_MSGDLG
+                        
+fi
+
+
+          eval "$ac_cv_use_msgdlg"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_msgdlg >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_MSGDLG" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-numberdlg""... $ac_c" 1>&6
+echo "configure:6937: checking for --enable-numberdlg" >&5
+          no_cache=0
+          # Check whether --enable-numberdlg or --disable-numberdlg was given.
+if test "${enable_numberdlg+set}" = set; then
+  enableval="$enable_numberdlg"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_numberdlg='wxUSE_NUMBERDLG=yes'
+                          else
+                            ac_cv_use_numberdlg='wxUSE_NUMBERDLG=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_NUMBERDLG" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_numberdlg='wxUSE_NUMBERDLG='$DEFAULT_wxUSE_NUMBERDLG
+                        
+fi
+
+
+          eval "$ac_cv_use_numberdlg"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_numberdlg >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_NUMBERDLG" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-splash""... $ac_c" 1>&6
+echo "configure:6976: checking for --enable-splash" >&5
+          no_cache=0
+          # Check whether --enable-splash or --disable-splash was given.
+if test "${enable_splash+set}" = set; then
+  enableval="$enable_splash"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_splash='wxUSE_SPLASH=yes'
+                          else
+                            ac_cv_use_splash='wxUSE_SPLASH=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_SPLASH" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_splash='wxUSE_SPLASH='$DEFAULT_wxUSE_SPLASH
+                        
+fi
+
+
+          eval "$ac_cv_use_splash"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_splash >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_SPLASH" = yes; then
+            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:7015: checking for --enable-textdlg" >&5
+          no_cache=0
+          # Check whether --enable-textdlg or --disable-textdlg was given.
+if test "${enable_textdlg+set}" = set; then
+  enableval="$enable_textdlg"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_textdlg='wxUSE_TEXTDLG=yes'
+                          else
+                            ac_cv_use_textdlg='wxUSE_TEXTDLG=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_TEXTDLG" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_textdlg='wxUSE_TEXTDLG='$DEFAULT_wxUSE_TEXTDLG
+                        
+fi
+
+
+          eval "$ac_cv_use_textdlg"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_textdlg >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_TEXTDLG" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-tipdlg""... $ac_c" 1>&6
+echo "configure:7054: checking for --enable-tipdlg" >&5
+          no_cache=0
+          # Check whether --enable-tipdlg or --disable-tipdlg was given.
+if test "${enable_tipdlg+set}" = set; then
+  enableval="$enable_tipdlg"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_tipdlg='wxUSE_STARTUP_TIPS=yes'
+                          else
+                            ac_cv_use_tipdlg='wxUSE_STARTUP_TIPS=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_STARTUP_TIPS" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_tipdlg='wxUSE_STARTUP_TIPS='$DEFAULT_wxUSE_STARTUP_TIPS
+                        
+fi
+
+
+          eval "$ac_cv_use_tipdlg"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_tipdlg >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_STARTUP_TIPS" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-progressdlg""... $ac_c" 1>&6
+echo "configure:7093: checking for --enable-progressdlg" >&5
+          no_cache=0
+          # Check whether --enable-progressdlg or --disable-progressdlg was given.
+if test "${enable_progressdlg+set}" = set; then
+  enableval="$enable_progressdlg"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_progressdlg='wxUSE_PROGRESSDLG=yes'
+                          else
+                            ac_cv_use_progressdlg='wxUSE_PROGRESSDLG=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_PROGRESSDLG" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_progressdlg='wxUSE_PROGRESSDLG='$DEFAULT_wxUSE_PROGRESSDLG
+                        
+fi
+
+
+          eval "$ac_cv_use_progressdlg"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_progressdlg >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_PROGRESSDLG" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-wizarddlg""... $ac_c" 1>&6
+echo "configure:7132: checking for --enable-wizarddlg" >&5
+          no_cache=0
+          # Check whether --enable-wizarddlg or --disable-wizarddlg was given.
+if test "${enable_wizarddlg+set}" = set; then
+  enableval="$enable_wizarddlg"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_wizarddlg='wxUSE_WIZARDDLG=yes'
+                          else
+                            ac_cv_use_wizarddlg='wxUSE_WIZARDDLG=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_WIZARDDLG" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_wizarddlg='wxUSE_WIZARDDLG='$DEFAULT_wxUSE_WIZARDDLG
+                        
+fi
+
+
+          eval "$ac_cv_use_wizarddlg"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_wizarddlg >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_WIZARDDLG" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+
+
+          echo $ac_n "checking for --enable-menus""... $ac_c" 1>&6
+echo "configure:7173: checking for --enable-menus" >&5
+          no_cache=0
+          # Check whether --enable-menus or --disable-menus was given.
+if test "${enable_menus+set}" = set; then
+  enableval="$enable_menus"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_menus='wxUSE_MENUS=yes'
+                          else
+                            ac_cv_use_menus='wxUSE_MENUS=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_MENUS" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_menus='wxUSE_MENUS='$DEFAULT_wxUSE_MENUS
+                        
+fi
+
+
+          eval "$ac_cv_use_menus"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_menus >> ${wx_arg_cache_file}.tmp
+          fi
+
+          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:7212: 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_n "checking for --enable-tooltips""... $ac_c" 1>&6
+echo "configure:7251: checking for --enable-tooltips" >&5
+          no_cache=0
+          # Check whether --enable-tooltips or --disable-tooltips was given.
+if test "${enable_tooltips+set}" = set; then
+  enableval="$enable_tooltips"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_tooltips='wxUSE_TOOLTIPS=yes'
+                          else
+                            ac_cv_use_tooltips='wxUSE_TOOLTIPS=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_TOOLTIPS" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_tooltips='wxUSE_TOOLTIPS='$DEFAULT_wxUSE_TOOLTIPS
+                        
+fi
+
+
+          eval "$ac_cv_use_tooltips"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_tooltips >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_TOOLTIPS" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-splines""... $ac_c" 1>&6
+echo "configure:7290: checking for --enable-splines" >&5
+          no_cache=0
+          # Check whether --enable-splines or --disable-splines was given.
+if test "${enable_splines+set}" = set; then
+  enableval="$enable_splines"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_splines='wxUSE_SPLINES=yes'
+                          else
+                            ac_cv_use_splines='wxUSE_SPLINES=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_SPLINES" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_splines='wxUSE_SPLINES='$DEFAULT_wxUSE_SPLINES
+                        
+fi
+
+
+          eval "$ac_cv_use_splines"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_splines >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_SPLINES" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-validators""... $ac_c" 1>&6
+echo "configure:7329: checking for --enable-validators" >&5
+          no_cache=0
+          # Check whether --enable-validators or --disable-validators was given.
+if test "${enable_validators+set}" = set; then
+  enableval="$enable_validators"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_validators='wxUSE_VALIDATORS=yes'
+                          else
+                            ac_cv_use_validators='wxUSE_VALIDATORS=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_VALIDATORS" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_validators='wxUSE_VALIDATORS='$DEFAULT_wxUSE_VALIDATORS
+                        
+fi
+
+
+          eval "$ac_cv_use_validators"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_validators >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_VALIDATORS" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-busyinfo""... $ac_c" 1>&6
+echo "configure:7368: checking for --enable-busyinfo" >&5
+          no_cache=0
+          # Check whether --enable-busyinfo or --disable-busyinfo was given.
+if test "${enable_busyinfo+set}" = set; then
+  enableval="$enable_busyinfo"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_busyinfo='wxUSE_BUSYINFO=yes'
+                          else
+                            ac_cv_use_busyinfo='wxUSE_BUSYINFO=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_BUSYINFO" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_busyinfo='wxUSE_BUSYINFO='$DEFAULT_wxUSE_BUSYINFO
+                        
+fi
+
+
+          eval "$ac_cv_use_busyinfo"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_busyinfo >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_BUSYINFO" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-joystick""... $ac_c" 1>&6
+echo "configure:7407: checking for --enable-joystick" >&5
+          no_cache=0
+          # Check whether --enable-joystick or --disable-joystick was given.
+if test "${enable_joystick+set}" = set; then
+  enableval="$enable_joystick"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_joystick='wxUSE_JOYSTICK=yes'
+                          else
+                            ac_cv_use_joystick='wxUSE_JOYSTICK=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_JOYSTICK" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_joystick='wxUSE_JOYSTICK='$DEFAULT_wxUSE_JOYSTICK
+                        
+fi
+
+
+          eval "$ac_cv_use_joystick"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_joystick >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_JOYSTICK" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-metafile""... $ac_c" 1>&6
+echo "configure:7446: 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:7485: 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:7526: checking for --enable-image" >&5
+          no_cache=0
+          # Check whether --enable-image or --disable-image was given.
+if test "${enable_image+set}" = set; then
+  enableval="$enable_image"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_image='wxUSE_IMAGE=yes'
+                          else
+                            ac_cv_use_image='wxUSE_IMAGE=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_IMAGE" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_image='wxUSE_IMAGE='$DEFAULT_wxUSE_IMAGE
+                        
+fi
+
+
+          eval "$ac_cv_use_image"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_image >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_IMAGE" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-gif""... $ac_c" 1>&6
+echo "configure:7565: checking for --enable-gif" >&5
+          no_cache=0
+          # Check whether --enable-gif or --disable-gif was given.
+if test "${enable_gif+set}" = set; then
+  enableval="$enable_gif"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_gif='wxUSE_GIF=yes'
+                          else
+                            ac_cv_use_gif='wxUSE_GIF=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_GIF" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_gif='wxUSE_GIF='$DEFAULT_wxUSE_GIF
+                        
+fi
+
+
+          eval "$ac_cv_use_gif"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_gif >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_GIF" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-pcx""... $ac_c" 1>&6
+echo "configure:7604: checking for --enable-pcx" >&5
+          no_cache=0
+          # Check whether --enable-pcx or --disable-pcx was given.
+if test "${enable_pcx+set}" = set; then
+  enableval="$enable_pcx"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_pcx='wxUSE_PCX=yes'
+                          else
+                            ac_cv_use_pcx='wxUSE_PCX=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_PCX" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_pcx='wxUSE_PCX='$DEFAULT_wxUSE_PCX
+                        
+fi
+
+
+          eval "$ac_cv_use_pcx"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_pcx >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_PCX" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-pnm""... $ac_c" 1>&6
+echo "configure:7643: checking for --enable-pnm" >&5
+          no_cache=0
+          # Check whether --enable-pnm or --disable-pnm was given.
+if test "${enable_pnm+set}" = set; then
+  enableval="$enable_pnm"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_pnm='wxUSE_PNM=yes'
+                          else
+                            ac_cv_use_pnm='wxUSE_PNM=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_PNM" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_pnm='wxUSE_PNM='$DEFAULT_wxUSE_PNM
+                        
+fi
+
+
+          eval "$ac_cv_use_pnm"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_pnm >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_PNM" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking for --enable-pnm""... $ac_c" 1>&6
+echo "configure:7682: checking for --enable-pnm" >&5
+          no_cache=0
+          # Check whether --enable-pnm or --disable-pnm was given.
+if test "${enable_pnm+set}" = set; then
+  enableval="$enable_pnm"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_pnm='wxUSE_XPM=yes'
+                          else
+                            ac_cv_use_pnm='wxUSE_XPM=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_XPM" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_pnm='wxUSE_XPM='$DEFAULT_wxUSE_XPM
+                        
+fi
+
+
+          eval "$ac_cv_use_pnm"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_pnm >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_XPM" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+fi
+
+
+          echo "saving argument cache $wx_arg_cache_file"
+          mv ${wx_arg_cache_file}.tmp ${wx_arg_cache_file}
+        
+
+
+echo $ac_n "checking for toolkit""... $ac_c" 1>&6
+echo "configure:7729: checking for toolkit" >&5
+
+if test "$wxUSE_GUI" = "yes"; then
+
+if test "$USE_BEOS" = 1; then
+    { echo "configure: error: BeOS GUI is not supported yet, use --disable-gui" 1>&2; exit 1; }
+fi
+
+if test "$TOOLKIT_GIVEN" = 1; then
+    for toolkit in `echo $ALL_TOOLKITS`; do
+    var=wxUSE_$toolkit
+    eval "value=\$${var}"
+    eval "$var=`echo \$value | sed -e "s/yes/1/" -e "s/no/0/"`"
+  done
+else
+    for toolkit in `echo $ALL_TOOLKITS`; do
+    if test "$has_toolkit_in_cache" != 1; then
+      var=DEFAULT_DEFAULT_wxUSE_$toolkit
+    else
+      var=DEFAULT_wxUSE_$toolkit
+    fi
+    eval "wxUSE_$toolkit=\$${var}"
+  done
+fi
+
+NUM_TOOLKITS=`expr ${wxUSE_GTK:-0} + ${wxUSE_MOTIF:-0} + ${wxUSE_MAC:-0} + ${wxUSE_WINE:-0} + ${wxUSE_MINGW:-0} + ${wxUSE_CYGWIN:-0} + ${wxUSE_MGL:-0}`
+
+case "${host}" in
+  *-pc-os2_emx )
+    NUM_TOOLKITS=`expr ${NUM_TOOLKITS} + ${wxUSE_PM:-0}`
+    # PATH_IFS is autodetected by OS/2's configure (usually ';')
+    LEX_STEM="lexyy"
+  ;;
+  *)
+    PATH_IFS=':'
+    LEX_STEM="lex.yy"
+  ;;
+esac
+
+case "$NUM_TOOLKITS" in
+  1)
+  ;;
+  0)
+    { echo "configure: error: Please specify a toolkit - cannot determine the default for ${host}" 1>&2; exit 1; }
+  ;;
+  *)
+    { echo "configure: error: Please specify at most one toolkit (may be some are cached?)" 1>&2; exit 1; }
+esac
+
+for toolkit in `echo $ALL_TOOLKITS`; do
+  var=wxUSE_$toolkit
+  eval "value=\$${var}"
+  if test "x$value" != x; then
+    cache_var=CACHE_$toolkit
+    eval "cache=\$${cache_var}"
+    if test "$cache" = 1; then
+      echo "$var=$value" >> ${wx_arg_cache_file}
+    fi
+    if test "$value" = 1; then
+      toolkit_echo=`echo $toolkit | tr [A-Z] [a-z]`
+      echo "$ac_t""$toolkit_echo" 1>&6
+    fi
+  fi
+done
+
+else
+    PATH_IFS=':'
+    echo "$ac_t""base only" 1>&6
+fi
+
+
+cat > confcache <<\EOF
+# This file is a shell script that caches the results of configure
+# tests run on this system so they can be shared between configure
+# scripts and configure runs.  It is not useful on other systems.
+# If it contains results you don't want to keep, you may remove or edit it.
+#
+# By default, configure uses ./config.cache as the cache file,
+# creating it if it does not exist already.  You can give configure
+# the --cache-file=FILE option to use a different cache file; that is
+# what configure does when it calls configure scripts in
+# subdirectories, so they share the cache.
+# Giving --cache-file=/dev/null disables caching, for debugging configure.
+# config.status only pays attention to the cache file if you give it the
+# --recheck option to rerun configure.
+#
+EOF
+# The following way of writing the cache mishandles newlines in values,
+# but we know of no workaround that is simple, portable, and efficient.
+# So, don't put newlines in cache variables' values.
+# Ultrix sh set writes to stderr and can't be redirected directly,
+# and sets the high bit in the cache file unless we assign to the vars.
+(set) 2>&1 |
+  case `(ac_space=' '; set | grep ac_space) 2>&1` in
+  *ac_space=\ *)
+    # `set' does not quote correctly, so add quotes (double-quote substitution
+    # turns \\\\ into \\, and sed turns \\ into \).
+    sed -n \
+      -e "s/'/'\\\\''/g" \
+      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
+    ;;
+  *)
+    # `set' quotes correctly as required by POSIX, so do not add quotes.
+    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
+    ;;
+  esac >> confcache
+if cmp -s $cache_file confcache; then
+  :
+else
+  if test -w $cache_file; then
+    echo "updating cache $cache_file"
+    cat confcache > $cache_file
+  else
+    echo "not updating unwritable cache $cache_file"
+  fi
+fi
+rm -f confcache
+
+
+if test "$build" != "$host" ; then
+    CC=$host_alias-gcc
+    CXX=$host_alias-c++
+    AR=$host_alias-ar
+    RANLIB=$host_alias-ranlib
+    DLLTOOL=$host_alias-dlltool
+    RESCOMP=$host_alias-windres
+    LD=$host_alias-ld
+    NM=$host_alias-nm
+    STRIP=$host_alias-strip
+fi
+
+# Extract the first word of "gcc", so it can be a program name with args.
+set dummy gcc; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:7863: 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 test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_CC="gcc"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+fi
+fi
+CC="$ac_cv_prog_CC"
+if test -n "$CC"; then
+  echo "$ac_t""$CC" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+if test -z "$CC"; then
+  # Extract the first word of "cc", so it can be a program name with args.
+set dummy cc; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:7893: 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 test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS=":"
+  ac_prog_rejected=no
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
+        ac_prog_rejected=yes
+       continue
+      fi
+      ac_cv_prog_CC="cc"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+if test $ac_prog_rejected = yes; then
+  # We found a bogon in the path, so make sure we never use it.
+  set dummy $ac_cv_prog_CC
+  shift
+  if test $# -gt 0; then
+    # We chose a different compiler from the bogus one.
+    # However, it has the same basename, so the bogon will be chosen
+    # first if we set CC to just the basename; use the full file name.
+    shift
+    set dummy "$ac_dir/$ac_word" "$@"
+    shift
+    ac_cv_prog_CC="$@"
+  fi
+fi
+fi
+fi
+CC="$ac_cv_prog_CC"
+if test -n "$CC"; then
+  echo "$ac_t""$CC" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+  if test -z "$CC"; then
+    case "`uname -s`" in
+    *win32* | *WIN32*)
+      # 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:7944: 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 test -n "$CC"; then
+  ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_CC="cl"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+fi
+fi
+CC="$ac_cv_prog_CC"
+if test -n "$CC"; then
+  echo "$ac_t""$CC" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+ ;;
+    esac
+  fi
+  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
+fi
+
+echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
+echo "configure:7976: 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_cpp='$CPP $CPPFLAGS'
+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cc_cross
+
+cat > conftest.$ac_ext << EOF
+
+#line 7987 "configure"
+#include "confdefs.h"
+
+main(){return(0);}
+EOF
+if { (eval echo configure:7992: \"$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_cross=no
+  else
+    ac_cv_prog_cc_cross=yes
+  fi
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  ac_cv_prog_cc_works=no
+fi
+rm -fr conftest*
+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_t""$ac_cv_prog_cc_works" 1>&6
+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:8018: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
+cross_compiling=$ac_cv_prog_cc_cross
+
+echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
+echo "configure:8023: 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
+  cat > conftest.c <<EOF
+#ifdef __GNUC__
+  yes;
+#endif
+EOF
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:8032: \"$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
+fi
+fi
+
+echo "$ac_t""$ac_cv_prog_gcc" 1>&6
+
+if test $ac_cv_prog_gcc = yes; then
+  GCC=yes
+else
+  GCC=
+fi
+
+ac_test_CFLAGS="${CFLAGS+set}"
+ac_save_CFLAGS="$CFLAGS"
+CFLAGS=
+echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
+echo "configure:8051: 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
+  echo 'void f(){}' > conftest.c
+if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
+  ac_cv_prog_cc_g=yes
+else
+  ac_cv_prog_cc_g=no
+fi
+rm -f conftest*
+
+fi
+
+echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
+if test "$ac_test_CFLAGS" = set; then
+  CFLAGS="$ac_save_CFLAGS"
+elif test $ac_cv_prog_cc_g = yes; then
+  if test "$GCC" = yes; then
+    CFLAGS="-g -O2"
+  else
+    CFLAGS="-g"
+  fi
+else
+  if test "$GCC" = yes; then
+    CFLAGS="-O2"
+  else
+    CFLAGS=
+  fi
+fi
+
+
+CFLAGS=`echo "$CFLAGS" | sed 's/-g//g'`
+
+echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
+echo "configure:8086: checking how to run the C preprocessor" >&5
+# On Suns, sometimes $CPP names a directory.
+if test -n "$CPP" && test -d "$CPP"; then
+  CPP=
+fi
+if test -z "$CPP"; then
+if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+    # This must be in double quotes, not single quotes, because CPP may get
+  # substituted into the Makefile and "${CC-cc}" will confuse make.
+  CPP="${CC-cc} -E"
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp.
+  cat > conftest.$ac_ext <<EOF
+#line 8101 "configure"
+#include "confdefs.h"
+#include <assert.h>
+Syntax Error
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:8107: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+  :
+else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  CPP="${CC-cc} -E -traditional-cpp"
+  cat > conftest.$ac_ext <<EOF
+#line 8118 "configure"
+#include "confdefs.h"
+#include <assert.h>
+Syntax Error
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:8124: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+  :
+else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  CPP="${CC-cc} -nologo -E"
+  cat > conftest.$ac_ext <<EOF
+#line 8135 "configure"
+#include "confdefs.h"
+#include <assert.h>
+Syntax Error
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:8141: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+  :
+else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  CPP=/lib/cpp
+fi
+rm -f conftest*
+fi
+rm -f conftest*
+fi
+rm -f conftest*
+  ac_cv_prog_CPP="$CPP"
+fi
+  CPP="$ac_cv_prog_CPP"
+else
+  ac_cv_prog_CPP="$CPP"
+fi
+echo "$ac_t""$CPP" 1>&6
+
+
+if test $ac_cv_prog_gcc = yes; then
+    echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6
+echo "configure:8168: checking whether ${CC-cc} needs -traditional" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+    ac_pattern="Autoconf.*'x'"
+  cat > conftest.$ac_ext <<EOF
+#line 8174 "configure"
+#include "confdefs.h"
+#include <sgtty.h>
+Autoconf TIOCGETP
+EOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  egrep "$ac_pattern" >/dev/null 2>&1; then
+  rm -rf conftest*
+  ac_cv_prog_gcc_traditional=yes
+else
+  rm -rf conftest*
+  ac_cv_prog_gcc_traditional=no
+fi
+rm -f conftest*
+
+
+  if test $ac_cv_prog_gcc_traditional = no; then
+    cat > conftest.$ac_ext <<EOF
+#line 8192 "configure"
+#include "confdefs.h"
+#include <termio.h>
+Autoconf TCGETA
+EOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  egrep "$ac_pattern" >/dev/null 2>&1; then
+  rm -rf conftest*
+  ac_cv_prog_gcc_traditional=yes
+fi
+rm -f conftest*
+
+  fi
+fi
+
+echo "$ac_t""$ac_cv_prog_gcc_traditional" 1>&6
+  if test $ac_cv_prog_gcc_traditional = yes; then
+    CC="$CC -traditional"
+  fi
+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
+
+
+for ac_prog in $CCC c++ g++ gcc CC cxx cc++ cl
+do
+# Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:8228: 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 test -n "$CXX"; then
+  ac_cv_prog_CXX="$CXX" # Let the user override the test.
+else
+  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_CXX="$ac_prog"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+fi
+fi
+CXX="$ac_cv_prog_CXX"
+if test -n "$CXX"; then
+  echo "$ac_t""$CXX" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+test -n "$CXX" && break
+done
+test -n "$CXX" || CXX="gcc"
+
+
+echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
+echo "configure:8260: 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_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cxx_cross
+
+cat > conftest.$ac_ext << EOF
+
+#line 8271 "configure"
+#include "confdefs.h"
+
+int main(){return(0);}
+EOF
+if { (eval echo configure:8276: \"$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_cross=no
+  else
+    ac_cv_prog_cxx_cross=yes
+  fi
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  ac_cv_prog_cxx_works=no
+fi
+rm -fr conftest*
+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_t""$ac_cv_prog_cxx_works" 1>&6
+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:8302: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
+cross_compiling=$ac_cv_prog_cxx_cross
+
+echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
+echo "configure:8307: 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
+  cat > conftest.C <<EOF
+#ifdef __GNUC__
+  yes;
+#endif
+EOF
+if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:8316: \"$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
+fi
+fi
+
+echo "$ac_t""$ac_cv_prog_gxx" 1>&6
+
+if test $ac_cv_prog_gxx = yes; then
+  GXX=yes
+else
+  GXX=
+fi
+
+ac_test_CXXFLAGS="${CXXFLAGS+set}"
+ac_save_CXXFLAGS="$CXXFLAGS"
+CXXFLAGS=
+echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
+echo "configure:8335: 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
+  echo 'void f(){}' > conftest.cc
+if test -z "`${CXX-g++} -g -c conftest.cc 2>&1`"; then
+  ac_cv_prog_cxx_g=yes
+else
+  ac_cv_prog_cxx_g=no
+fi
+rm -f conftest*
+
+fi
+
+echo "$ac_t""$ac_cv_prog_cxx_g" 1>&6
+if test "$ac_test_CXXFLAGS" = set; then
+  CXXFLAGS="$ac_save_CXXFLAGS"
+elif test $ac_cv_prog_cxx_g = yes; then
+  if test "$GXX" = yes; then
+    CXXFLAGS="-g -O2"
+  else
+    CXXFLAGS="-g"
+  fi
+else
+  if test "$GXX" = yes; then
+    CXXFLAGS="-O2"
+  else
+    CXXFLAGS=
+  fi
+fi
+
+
+echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6
+echo "configure:8368: checking how to run the C++ preprocessor" >&5
+if test -z "$CXXCPP"; then
+if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_ext=C
+# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cxx_cross
+  CXXCPP="${CXX-g++} -E"
+  cat > conftest.$ac_ext <<EOF
+#line 8381 "configure"
+#include "confdefs.h"
+#include <stdlib.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:8386: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+  :
+else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  CXXCPP=/lib/cpp
+fi
+rm -f conftest*
+  ac_cv_prog_CXXCPP="$CXXCPP"
+ac_ext=C
+# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cxx_cross
+fi
+fi
+CXXCPP="$ac_cv_prog_CXXCPP"
+echo "$ac_t""$CXXCPP" 1>&6
+
+
+CXXFLAGS=`echo "$CXXFLAGS" | sed 's/-g//g'`
+
+ac_ext=c
+# 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
+
+
+# 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:8424: 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 test -n "$RANLIB"; then
+  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+else
+  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_RANLIB="ranlib"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
+fi
+fi
+RANLIB="$ac_cv_prog_RANLIB"
+if test -n "$RANLIB"; then
+  echo "$ac_t""$RANLIB" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+
+# Extract the first word of "ar", so it can be a program name with args.
+set dummy ar; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:8455: 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 test -n "$AR"; then
+  ac_cv_prog_AR="$AR" # Let the user override the test.
+else
+  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_AR="ar"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+  test -z "$ac_cv_prog_AR" && ac_cv_prog_AR="ar"
+fi
+fi
+AR="$ac_cv_prog_AR"
+if test -n "$AR"; then
+  echo "$ac_t""$AR" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+
+# Find a good install program.  We prefer a C program (faster),
+# so one script is as good as another.  But avoid the broken or
+# incompatible versions:
+# SysV /etc/install, /usr/sbin/install
+# SunOS /usr/etc/install
+# IRIX /sbin/install
+# AIX /bin/install
+# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
+# AFS /usr/afsws/bin/install, which mishandles nonexistent args
+# 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:8495: 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
+else
+    IFS="${IFS=        }"; ac_save_IFS="$IFS"; IFS=":"
+  for ac_dir in $PATH; do
+    # Account for people who put trailing slashes in PATH elements.
+    case "$ac_dir/" in
+    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
+    *)
+      # OSF1 and SCO ODT 3.0 have their own names for install.
+      # Don't use installbsd from OSF since it installs stuff as root
+      # by default.
+      for ac_prog in ginstall scoinst install; do
+        if test -f $ac_dir/$ac_prog; then
+         if test $ac_prog = install &&
+            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
+           # AIX install.  It has an incompatible calling convention.
+           :
+         else
+           ac_cv_path_install="$ac_dir/$ac_prog -c"
+           break 2
+         fi
+       fi
+      done
+      ;;
+    esac
+  done
+  IFS="$ac_save_IFS"
+
+fi
+  if test "${ac_cv_path_install+set}" = set; then
+    INSTALL="$ac_cv_path_install"
+  else
+    # As a last resort, use the slow shell script.  We don't cache a
+    # path for INSTALL within a source directory, because that will
+    # break other packages using the cache if that directory is
+    # removed, or if the path is relative.
+    INSTALL="$ac_install_sh"
+  fi
+fi
+echo "$ac_t""$INSTALL" 1>&6
+
+# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+# It thinks the first close brace ends the variable substitution.
+test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
+
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
+
+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
+echo "configure:8551: 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 test -n "$STRIP"; then
+  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+else
+  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_STRIP="strip"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+  test -z "$ac_cv_prog_STRIP" && ac_cv_prog_STRIP="true"
+fi
+fi
+STRIP="$ac_cv_prog_STRIP"
+if test -n "$STRIP"; then
+  echo "$ac_t""$STRIP" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+
+echo $ac_n "checking make for VPATH support""... $ac_c" 1>&6
+echo "configure:8580: checking make for VPATH support" >&5
+cat - << EOF > confMake
+check : file
+       cp \$? \$@
+       cp \$? final_file
+EOF
+
+if test ! -d sub ; then
+  mkdir sub
+fi
+echo dummy > sub/file
+${MAKE-make} -f confMake VPATH=sub 2>&5 > /dev/null
+RESULT=$?
+rm -f sub/file check final_file confMake
+rmdir sub
+if test "$RESULT" = 0; then
+  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
+VPATH correctly.
+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
+do
+# Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:8617: 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 test -n "$YACC"; then
+  ac_cv_prog_YACC="$YACC" # Let the user override the test.
+else
+  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_YACC="$ac_prog"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+fi
+fi
+YACC="$ac_cv_prog_YACC"
+if test -n "$YACC"; then
+  echo "$ac_t""$YACC" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+test -n "$YACC" && break
+done
+test -n "$YACC" || YACC="yacc"
+
+
+# Extract the first word of "flex", so it can be a program name with args.
+set dummy flex; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:8651: 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 test -n "$LEX"; then
+  ac_cv_prog_LEX="$LEX" # Let the user override the test.
+else
+  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_LEX="flex"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+  test -z "$ac_cv_prog_LEX" && ac_cv_prog_LEX="lex"
+fi
+fi
+LEX="$ac_cv_prog_LEX"
+if test -n "$LEX"; then
+  echo "$ac_t""$LEX" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+if test -z "$LEXLIB"
+then
+  case "$LEX" in
+  flex*) ac_lib=fl ;;
+  *) ac_lib=l ;;
+  esac
+  echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6
+echo "configure:8685: 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
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-l$ac_lib  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 8693 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char yywrap();
+
+int main() {
+yywrap()
+; return 0; }
+EOF
+if { (eval echo configure:8704: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  LEXLIB="-l$ac_lib"
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+fi
+
+
+echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
+echo "configure:8728: 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
+  rm -f conftestdata
+if ln -s X conftestdata 2>/dev/null
+then
+  rm -f conftestdata
+  ac_cv_prog_LN_S="ln -s"
+else
+  ac_cv_prog_LN_S=ln
+fi
+fi
+LN_S="$ac_cv_prog_LN_S"
+if test "$ac_cv_prog_LN_S" = "ln -s"; then
+  echo "$ac_t""yes" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
 
 
 
 SEARCH_INCLUDE="\
+    /usr/local/include        \
+                              \
     /usr/Motif-1.2/include    \
     /usr/Motif-2.1/include    \
                               \
     /usr/include/Motif1.2     \
     /opt/xpm/include/X11      \
+    /opt/GBxpm/include/       \
+    /opt/GBxpm/X11/include/   \
                               \
     /usr/Motif1.2/include     \
     /usr/dt/include           \
+    /usr/openwin/include      \
+                              \
     /usr/include/Xm           \
                               \
     /usr/X11R6/include        \
+    /usr/X11R6.4/include      \
+    /usr/X11R5/include        \
+    /usr/X11R4/include        \
+                              \
+    /usr/include/X11R6        \
+    /usr/include/X11R5        \
+    /usr/include/X11R4        \
+                              \
+    /usr/local/X11R6/include  \
+    /usr/local/X11R5/include  \
+    /usr/local/X11R4/include  \
+                              \
+    /usr/local/include/X11R6  \
+    /usr/local/include/X11R5  \
+    /usr/local/include/X11R4  \
+                              \
+    /usr/X11/include          \
+    /usr/include/X11          \
+    /usr/local/X11/include    \
+    /usr/local/include/X11    \
+                              \
+    /usr/X386/include         \
+    /usr/x386/include         \
+    /usr/XFree86/include/X11  \
+                              \
+    X:/XFree86/include        \
+    X:/XFree86/include/X11    \
+                              \
+    /usr/include/gtk          \
+    /usr/local/include/gtk    \
+    /usr/include/glib         \
+    /usr/local/include/glib   \
+                              \
+    /usr/include/qt           \
+    /usr/local/include/qt     \
+                              \
+    /usr/include/windows      \
+    /usr/include/wine         \
+    /usr/local/include/wine   \
+                              \
+    /usr/unsupported/include  \
+    /usr/athena/include       \
+    /usr/local/x11r5/include  \
+    /usr/lpp/Xamples/include  \
+                              \
+    /usr/openwin/share/include \
+                               \
+    /usr/include"
+
+SEARCH_LIB="`echo "$SEARCH_INCLUDE" | sed s/include/lib/g` "
+
+
+cat > confcache <<\EOF
+# This file is a shell script that caches the results of configure
+# tests run on this system so they can be shared between configure
+# scripts and configure runs.  It is not useful on other systems.
+# If it contains results you don't want to keep, you may remove or edit it.
+#
+# By default, configure uses ./config.cache as the cache file,
+# creating it if it does not exist already.  You can give configure
+# the --cache-file=FILE option to use a different cache file; that is
+# what configure does when it calls configure scripts in
+# subdirectories, so they share the cache.
+# Giving --cache-file=/dev/null disables caching, for debugging configure.
+# config.status only pays attention to the cache file if you give it the
+# --recheck option to rerun configure.
+#
+EOF
+# The following way of writing the cache mishandles newlines in values,
+# but we know of no workaround that is simple, portable, and efficient.
+# So, don't put newlines in cache variables' values.
+# Ultrix sh set writes to stderr and can't be redirected directly,
+# and sets the high bit in the cache file unless we assign to the vars.
+(set) 2>&1 |
+  case `(ac_space=' '; set | grep ac_space) 2>&1` in
+  *ac_space=\ *)
+    # `set' does not quote correctly, so add quotes (double-quote substitution
+    # turns \\\\ into \\, and sed turns \\ into \).
+    sed -n \
+      -e "s/'/'\\\\''/g" \
+      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
+    ;;
+  *)
+    # `set' quotes correctly as required by POSIX, so do not add quotes.
+    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
+    ;;
+  esac >> confcache
+if cmp -s $cache_file confcache; then
+  :
+else
+  if test -w $cache_file; then
+    echo "updating cache $cache_file"
+    cat confcache > $cache_file
+  else
+    echo "not updating unwritable cache $cache_file"
+  fi
+fi
+rm -f confcache
+
+
+
+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:8873: 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 8878 "configure"
+#include "confdefs.h"
+#include <regex.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:8883: \"$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:8902: 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 8907 "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:8930: \"$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
+
+
+AFMINSTALL=
+
+if test "$wxUSE_GUI" = "yes"; then
+    USE_GUI=1
+
+    TOOLKIT=
+    TOOLKIT_INCLUDE=
+
+    GUI_TK_LIBRARY=
+    GUI_TK_LINK=
+
+    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:8994: 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 8999 "configure"
+#include "confdefs.h"
+#include <windows.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:9004: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=yes"
+else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"
+fi
+rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  :
+else
+  echo "$ac_t""no" 1>&6
+
+            { echo "configure: error: please set CFLAGS to contain the location of windows.h" 1>&2; exit 1; }
+        
+fi
+
+
+        INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS msw"
+
+                        LIBS="$LIBS -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lctl3d32 -ladvapi32 -lwsock32"
+
+                if test "$wxUSE_ODBC" = "yes" ; then
+            LIBS="$LIBS -lodbc32 -lole32 -loleaut32"
+        fi
+
+                if test "$wxUSE_MINGW" = 1; then
+            LDFLAGS="$LDFLAGS -mwindows"
+        fi
+
+        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__"
+
+                RESPROGRAM="\$(RES_PROGRAM)"
+    fi
+
+    if test "$wxUSE_GTK" = 1; then
+        echo $ac_n "checking for GTK+ version""... $ac_c" 1>&6
+echo "configure:9056: checking for GTK+ version" >&5
+
+        gtk_version_cached=1
+        if eval "test \"`echo '$''{'wx_cv_lib_gtk'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  
+                                                gtk_version_cached=0
+                echo "$ac_t""""" 1>&6
+
+                wx_cv_lib_gtk=
+                if test "x$wxUSE_GTK2" = "xyes"; then
+                    # Check whether --with-gtk-prefix or --without-gtk-prefix was given.
+if test "${with_gtk_prefix+set}" = set; then
+  withval="$with_gtk_prefix"
+  gtk_config_prefix="$withval"
+else
+  gtk_config_prefix=""
+fi
+
+# Check whether --with-gtk-exec-prefix or --without-gtk-exec-prefix was given.
+if test "${with_gtk_exec_prefix+set}" = set; then
+  withval="$with_gtk_exec_prefix"
+  gtk_config_exec_prefix="$withval"
+else
+  gtk_config_exec_prefix=""
+fi
+
+# Check whether --enable-gtktest or --disable-gtktest was given.
+if test "${enable_gtktest+set}" = set; then
+  enableval="$enable_gtktest"
+  :
+else
+  enable_gtktest=yes
+fi
+
+
+  for module in . 
+  do
+      case "$module" in
+         gthread)
+             gtk_config_args="$gtk_config_args gthread"
+         ;;
+      esac
+  done
+
+  if test x$gtk_config_exec_prefix != x ; then
+     gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix"
+     if test x${GTK_CONFIG_2_0+set} != xset ; then
+        GTK_CONFIG_2_0=$gtk_config_exec_prefix/bin/gtk-config-2.0
+     fi
+  fi
+  if test x$gtk_config_prefix != x ; then
+     gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix"
+     if test x${GTK_CONFIG_2_0+set} != xset ; then
+        GTK_CONFIG_2_0=$gtk_config_prefix/bin/gtk-config-2.0
+     fi
+  fi
+
+  # Extract the first word of "gtk-config-2.0", so it can be a program name with args.
+set dummy gtk-config-2.0; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:9118: 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
+  case "$GTK_CONFIG_2_0" in
+  /*)
+  ac_cv_path_GTK_CONFIG_2_0="$GTK_CONFIG_2_0" # Let the user override the test with a path.
+  ;;
+  ?:/*)                         
+  ac_cv_path_GTK_CONFIG_2_0="$GTK_CONFIG_2_0" # Let the user override the test with a dos path.
+  ;;
+  *)
+  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do 
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_path_GTK_CONFIG_2_0="$ac_dir/$ac_word"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+  test -z "$ac_cv_path_GTK_CONFIG_2_0" && ac_cv_path_GTK_CONFIG_2_0="no"
+  ;;
+esac
+fi
+GTK_CONFIG_2_0="$ac_cv_path_GTK_CONFIG_2_0"
+if test -n "$GTK_CONFIG_2_0"; then
+  echo "$ac_t""$GTK_CONFIG_2_0" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+  min_gtk_version=1.3.1
+  echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6
+echo "configure:9153: checking for GTK - version >= $min_gtk_version" >&5
+  no_gtk=""
+  if test "$GTK_CONFIG_2_0" = "no" ; then
+    no_gtk=yes
+  else
+    GTK_CFLAGS=`$GTK_CONFIG_2_0 $gtk_config_args --cflags`
+    GTK_LIBS=`$GTK_CONFIG_2_0 $gtk_config_args --libs`
+    gtk_config_major_version=`$GTK_CONFIG_2_0 $gtk_config_args --version | \
+           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
+    gtk_config_minor_version=`$GTK_CONFIG_2_0 $gtk_config_args --version | \
+           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
+    gtk_config_micro_version=`$GTK_CONFIG_2_0 $gtk_config_args --version | \
+           sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
+    if test "x$enable_gtktest" = "xyes" ; then
+      ac_save_CFLAGS="$CFLAGS"
+      ac_save_LIBS="$LIBS"
+      CFLAGS="$CFLAGS $GTK_CFLAGS"
+      LIBS="$GTK_LIBS $LIBS"
+      rm -f conf.gtktest
+      if test "$cross_compiling" = yes; then
+  echo $ac_n "cross compiling; assumed OK... $ac_c"
+else
+  cat > conftest.$ac_ext <<EOF
+#line 9176 "configure"
+#include "confdefs.h"
+
+#include <gtk/gtk.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+int
+main ()
+{
+  int major, minor, micro;
+  char *tmp_version;
+
+  system ("touch conf.gtktest");
+
+  /* HP/UX 9 (%@#!) writes to sscanf strings */
+  tmp_version = g_strdup("$min_gtk_version");
+  if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
+     printf("%s, bad version string\n", "$min_gtk_version");
+     exit(1);
+   }
+
+  if ((gtk_major_version != $gtk_config_major_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",
+             $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");
+      printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
+      printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
+      printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
+      printf("*** required on your system.\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) ||
+           (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_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
+      printf("*** library (version %d.%d.%d)\n",
+             gtk_major_version, gtk_minor_version, gtk_micro_version);
+    }
+#endif /* defined (GTK_MAJOR_VERSION) ... */
+  else
+    {
+      if ((gtk_major_version > major) ||
+        ((gtk_major_version == major) && (gtk_minor_version > minor)) ||
+        ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)))
+      {
+        return 0;
+       }
+     else
+      {
+        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);
+        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("*** probably means that the wrong copy of the gtk-config-2.0 shell script is\n");
+        printf("*** being found. The easiest way to fix this is to remove the old version\n");
+        printf("*** of GTK+, but you can also set the GTK_CONFIG_2_0 environment to point to the\n");
+        printf("*** correct copy of gtk-config-2.0. (In this case, you will have to\n");
+        printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
+        printf("*** so that the correct libraries are found at run-time))\n");
+      }
+    }
+  return 1;
+}
+
+EOF
+if { (eval echo configure:9254: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  :
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  no_gtk=yes
+fi
+rm -fr conftest*
+fi
+
+       CFLAGS="$ac_save_CFLAGS"
+       LIBS="$ac_save_LIBS"
+     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
+     wx_cv_lib_gtk=2.0
+  else
+     echo "$ac_t""no" 1>&6
+     if test "$GTK_CONFIG_2_0" = "no" ; then
+       echo "*** The gtk-config-2.0 script installed by GTK could not be found"
+       echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in"
+       echo "*** your path, or set the GTK_CONFIG_2_0 environment variable to the"
+       echo "*** full path to gtk-config-2.0."
+     else
+       if test -f conf.gtktest ; then
+        :
+       else
+          echo "*** Could not run GTK test program, checking why..."
+          CFLAGS="$CFLAGS $GTK_CFLAGS"
+          LIBS="$LIBS $GTK_LIBS"
+          cat > conftest.$ac_ext <<EOF
+#line 9288 "configure"
+#include "confdefs.h"
+
+#include <gtk/gtk.h>
+#include <stdio.h>
+
+int main() {
+ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); 
+; return 0; }
+EOF
+if { (eval echo configure:9298: \"$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"
+          echo "*** version of GTK. If it is not finding GTK, you'll need to set your"
+          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 "*** 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 a RedHat 5.0 system, you should remove the GTK package that"
+          echo "*** came with the system with the command"
+          echo "***"
+          echo "***    rpm --erase --nodeps gtk gtk-devel" 
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+   echo "*** The test program failed to compile or link. See the file config.log for the"
+          echo "*** exact error that occured. This usually means GTK was incorrectly installed"
+          echo "*** or that you have moved GTK since it was installed. In the latter case, you"
+          echo "*** may want to edit the gtk-config-2.0 script: $GTK_CONFIG_2_0" 
+fi
+rm -f conftest*
+          CFLAGS="$ac_save_CFLAGS"
+          LIBS="$ac_save_LIBS"
+       fi
+     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
+        GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config
+     fi
+  fi
+  if test x$gtk_config_prefix != x ; then
+     gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix"
+     if test x${GTK_CONFIG+set} != xset ; then
+        GTK_CONFIG=$gtk_config_prefix/bin/gtk-config
+     fi
+  fi
+
+  # Extract the first word of "gtk-config", so it can be a program name with args.
+set dummy gtk-config; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:9356: 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
+  case "$GTK_CONFIG" in
+  /*)
+  ac_cv_path_GTK_CONFIG="$GTK_CONFIG" # Let the user override the test with a path.
+  ;;
+  ?:/*)                         
+  ac_cv_path_GTK_CONFIG="$GTK_CONFIG" # Let the user override the test with a dos path.
+  ;;
+  *)
+  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do 
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_path_GTK_CONFIG="$ac_dir/$ac_word"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+  test -z "$ac_cv_path_GTK_CONFIG" && ac_cv_path_GTK_CONFIG="no"
+  ;;
+esac
+fi
+GTK_CONFIG="$ac_cv_path_GTK_CONFIG"
+if test -n "$GTK_CONFIG"; then
+  echo "$ac_t""$GTK_CONFIG" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+  min_gtk_version=1.2.7
+  echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6
+echo "configure:9391: checking for GTK - version >= $min_gtk_version" >&5
+  no_gtk=""
+  if test "$GTK_CONFIG" != "no" ; then
+    GTK_CFLAGS=`$GTK_CONFIG --cflags`
+    GTK_LIBS=`$GTK_CONFIG --libs gthread`
+    ac_save_CFLAGS="$CFLAGS"
+    ac_save_LIBS="$LIBS"
+    CFLAGS="$CFLAGS $GTK_CFLAGS"
+    LIBS="$LIBS $GTK_LIBS"
+    if test "$cross_compiling" = yes; then
+  echo $ac_n "cross compiling; assumed OK... $ac_c"
+else
+  cat > conftest.$ac_ext <<EOF
+#line 9404 "configure"
+#include "confdefs.h"
+
+#include <gtk/gtk.h>
+#include <gtk/gtkfeatures.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+int
+main ()
+{
+  int major, minor, micro;
+
+  if (sscanf("$min_gtk_version", "%d.%d.%d", &major, &minor, &micro) != 3) {
+     printf("%s, bad version string\n", "$min_gtk_version");
+     exit(1);
+   }
+
+   if ((GTK_MAJOR_VERSION != gtk_major_version) ||
+       (GTK_MINOR_VERSION != gtk_minor_version) ||
+       (GTK_MICRO_VERSION != gtk_micro_version)) {
+     printf("Headers vs. library version mismatch!\n");
+     exit(1);
+   }
+
+   if (gtk_minor_version == 1) return FALSE;
+
+   return !((gtk_major_version > major) ||
+    ((gtk_major_version == major) && (gtk_minor_version > minor)) ||
+    ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)));
+}
+
+EOF
+if { (eval echo configure:9437: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  :
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  no_gtk=yes
+fi
+rm -fr conftest*
+fi
+
+     CFLAGS="$ac_save_CFLAGS"
+     LIBS="$ac_save_LIBS"
+  else
+     no_gtk=yes
+  fi
+  if test "x$no_gtk" = x ; then
+     echo "$ac_t""yes" 1>&6
+     wx_cv_lib_gtk=1.2.7
+  else
+     echo "$ac_t""no" 1>&6
+     GTK_CFLAGS=""
+     GTK_LIBS=""
+     :
+  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
+        GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config
+     fi
+  fi
+  if test x$gtk_config_prefix != x ; then
+     gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix"
+     if test x${GTK_CONFIG+set} != xset ; then
+        GTK_CONFIG=$gtk_config_prefix/bin/gtk-config
+     fi
+  fi
+
+  # Extract the first word of "gtk-config", so it can be a program name with args.
+set dummy gtk-config; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:9486: 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
+  case "$GTK_CONFIG" in
+  /*)
+  ac_cv_path_GTK_CONFIG="$GTK_CONFIG" # Let the user override the test with a path.
+  ;;
+  ?:/*)                         
+  ac_cv_path_GTK_CONFIG="$GTK_CONFIG" # Let the user override the test with a dos path.
+  ;;
+  *)
+  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do 
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_path_GTK_CONFIG="$ac_dir/$ac_word"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+  test -z "$ac_cv_path_GTK_CONFIG" && ac_cv_path_GTK_CONFIG="no"
+  ;;
+esac
+fi
+GTK_CONFIG="$ac_cv_path_GTK_CONFIG"
+if test -n "$GTK_CONFIG"; then
+  echo "$ac_t""$GTK_CONFIG" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+  min_gtk_version=1.2.3
+  echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6
+echo "configure:9521: checking for GTK - version >= $min_gtk_version" >&5
+  no_gtk=""
+  if test "$GTK_CONFIG" != "no" ; then
+    GTK_CFLAGS=`$GTK_CONFIG --cflags`
+    GTK_LIBS=`$GTK_CONFIG --libs gthread`
+    ac_save_CFLAGS="$CFLAGS"
+    ac_save_LIBS="$LIBS"
+    CFLAGS="$CFLAGS $GTK_CFLAGS"
+    LIBS="$LIBS $GTK_LIBS"
+    if test "$cross_compiling" = yes; then
+  echo $ac_n "cross compiling; assumed OK... $ac_c"
+else
+  cat > conftest.$ac_ext <<EOF
+#line 9534 "configure"
+#include "confdefs.h"
+
+#include <gtk/gtk.h>
+#include <gtk/gtkfeatures.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+int
+main ()
+{
+  int major, minor, micro;
+
+  if (sscanf("$min_gtk_version", "%d.%d.%d", &major, &minor, &micro) != 3) {
+     printf("%s, bad version string\n", "$min_gtk_version");
+     exit(1);
+   }
+
+   if ((GTK_MAJOR_VERSION != gtk_major_version) ||
+       (GTK_MINOR_VERSION != gtk_minor_version) ||
+       (GTK_MICRO_VERSION != gtk_micro_version)) {
+     printf("Headers vs. library version mismatch!\n");
+     exit(1);
+   }
+
+   if (gtk_minor_version == 1) return FALSE;
+
+   return !((gtk_major_version > major) ||
+    ((gtk_major_version == major) && (gtk_minor_version > minor)) ||
+    ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)));
+}
+
+EOF
+if { (eval echo configure:9567: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  :
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  no_gtk=yes
+fi
+rm -fr conftest*
+fi
+
+     CFLAGS="$ac_save_CFLAGS"
+     LIBS="$ac_save_LIBS"
+  else
+     no_gtk=yes
+  fi
+  if test "x$no_gtk" = x ; then
+     echo "$ac_t""yes" 1>&6
+     wx_cv_lib_gtk=1.2.3
+  else
+     echo "$ac_t""no" 1>&6
+     GTK_CFLAGS=""
+     GTK_LIBS=""
+     :
+  fi
+  
+  
+
+                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
+
+
+                        if test "$gtk_version_cached" = 1; then
+            echo "$ac_t""$wx_cv_lib_gtk" 1>&6
+        fi
+
+        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
+
+                echo $ac_n "checking for gdk_im_open in -lgdk""... $ac_c" 1>&6
+echo "configure:9638: 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
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-lgdk  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 9646 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char gdk_im_open();
+
+int main() {
+gdk_im_open()
+; return 0; }
+EOF
+if { (eval echo configure:9657: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  cat >> confdefs.h <<\EOF
+#define HAVE_XIM 1
+EOF
+
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+    fi
+
+    if test "$wxUSE_MGL" = 1; then
+        
+        echo $ac_n "checking for SciTech MGL library""... $ac_c" 1>&6
+echo "configure:9685: 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:9719: checking for WINE includes" >&5
+        
+ac_find_includes=
+for ac_dir in $SEARCH_INCLUDE;
+  do
+    if test -f "$ac_dir/windows.h"; then
+      ac_find_includes=$ac_dir
+      break
+    fi
+  done
+
+        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:9740: checking for Xpm library" >&5
+        
+ac_find_libraries=
+for ac_dir in $SEARCH_LIB;
+  do
+    for ac_extension in a so sl dylib; do
+      if test -f "$ac_dir/libXpm.$ac_extension"; then
+        ac_find_libraries=$ac_dir
+        break 2
+      fi
+    done
+  done
+
+        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
+
+            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:9768: checking for Mesa library" >&5
+        
+ac_find_libraries=
+for ac_dir in $SEARCH_LIB;
+  do
+    for ac_extension in a so sl dylib; do
+      if test -f "$ac_dir/libMesaGL.$ac_extension"; then
+        ac_find_libraries=$ac_dir
+        break 2
+      fi
+    done
+  done
+
+        if test "$ac_find_libraries" != "" ; then
+            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
+# 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:9802: checking for X" >&5
+
+# Check whether --with-x or --without-x was given.
+if test "${with_x+set}" = set; then
+  withval="$with_x"
+  :
+fi
+
+# $have_x is `yes', `no', `disabled', or empty when we do not yet know.
+if test "x$with_x" = xno; then
+  # The user explicitly disabled X.
+  have_x=disabled
+else
+  if test "x$x_includes" != xNONE && test "x$x_libraries" != xNONE; then
+    # Both variables are already set.
+    have_x=yes
+  else
+if eval "test \"`echo '$''{'ac_cv_have_x'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  # One or both of the vars are not set, and there is no cached value.
+ac_x_includes=NO ac_x_libraries=NO
+rm -fr conftestdir
+if mkdir conftestdir; then
+  cd conftestdir
+  # Make sure to not put "make" in the Imakefile rules, since we grep it out.
+  cat > Imakefile <<'EOF'
+acfindx:
+       @echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"'
+EOF
+  if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then
+    # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+    eval `${MAKE-make} acfindx 2>/dev/null | grep -v make`
+    # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
+    for ac_extension in a so sl; do
+      if test ! -f $ac_im_usrlibdir/libX11.$ac_extension &&
+        test -f $ac_im_libdir/libX11.$ac_extension; then
+        ac_im_usrlibdir=$ac_im_libdir; break
+      fi
+    done
+    # Screen out bogus values from the imake configuration.  They are
+    # bogus both because they are the default anyway, and because
+    # using them would break gcc on systems where it needs fixed includes.
+    case "$ac_im_incroot" in
+       /usr/include) ;;
+       *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes="$ac_im_incroot" ;;
+    esac
+    case "$ac_im_usrlibdir" in
+       /usr/lib | /lib) ;;
+       *) test -d "$ac_im_usrlibdir" && ac_x_libraries="$ac_im_usrlibdir" ;;
+    esac
+  fi
+  cd ..
+  rm -fr conftestdir
+fi
+
+if test "$ac_x_includes" = NO; then
+  # Guess where to find include files, by looking for this one X11 .h file.
+  test -z "$x_direct_test_include" && x_direct_test_include=X11/Intrinsic.h
+
+  # First, try using that file with no special directory specified.
+cat > conftest.$ac_ext <<EOF
+#line 9864 "configure"
+#include "confdefs.h"
+#include <$x_direct_test_include>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:9869: \"$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*
+  # We can compile using X headers with no special include directory.
+ac_x_includes=
+else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  # Look for the header file in a standard set of common directories.
+# Check X11 before X11Rn because it is often a symlink to the current release.
+  for ac_dir in               \
+    /usr/X11/include          \
+    /usr/X11R6/include        \
     /usr/X11R5/include        \
     /usr/X11R4/include        \
                               \
-    /usr/X11R6/lib            \
-    /usr/X11R5/lib            \
-    /usr/X11R4/lib            \
-                              \
+    /usr/include/X11          \
     /usr/include/X11R6        \
     /usr/include/X11R5        \
     /usr/include/X11R4        \
                               \
+    /usr/local/X11/include    \
     /usr/local/X11R6/include  \
     /usr/local/X11R5/include  \
     /usr/local/X11R4/include  \
                               \
+    /usr/local/include/X11    \
     /usr/local/include/X11R6  \
     /usr/local/include/X11R5  \
     /usr/local/include/X11R4  \
                               \
-    /usr/X11/include          \
-    /usr/include/X11          \
-    /usr/local/X11/include    \
-    /usr/local/include/X11    \
-                              \
     /usr/X386/include         \
     /usr/x386/include         \
     /usr/XFree86/include/X11  \
                               \
     /usr/include              \
-    /usr/include/gtk          \
-    /usr/include/gdk          \
-    /usr/include/glib         \
     /usr/local/include        \
     /usr/unsupported/include  \
     /usr/athena/include       \
     /usr/local/x11r5/include  \
     /usr/lpp/Xamples/include  \
                               \
-    /usr/local/include/gtk    \
-    /usr/local/include/qt     \
-    /usr/include/qt           \
-                              \
     /usr/openwin/include      \
     /usr/openwin/share/include \
-    "
+    ; \
+  do
+    if test -r "$ac_dir/$x_direct_test_include"; then
+      ac_x_includes=$ac_dir
+      break
+    fi
+  done
+fi
+rm -f conftest*
+fi # $ac_x_includes = NO
+
+if test "$ac_x_libraries" = NO; then
+  # Check for the libraries.
+
+  test -z "$x_direct_test_library" && x_direct_test_library=Xt
+  test -z "$x_direct_test_function" && x_direct_test_function=XtMalloc
+
+  # See if we find them without any special options.
+  # Don't add to $LIBS permanently.
+  ac_save_LIBS="$LIBS"
+  LIBS="-l$x_direct_test_library $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 9938 "configure"
+#include "confdefs.h"
+
+int main() {
+${x_direct_test_function}()
+; return 0; }
+EOF
+if { (eval echo configure:9945: \"$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.
+ac_x_libraries=
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  LIBS="$ac_save_LIBS"
+# First see if replacing the include by lib works.
+# Check X11 before X11Rn because it is often a symlink to the current release.
+for ac_dir in `echo "$ac_x_includes" | sed s/include/lib/` \
+    /usr/X11/lib          \
+    /usr/X11R6/lib        \
+    /usr/X11R5/lib        \
+    /usr/X11R4/lib        \
+                          \
+    /usr/lib/X11          \
+    /usr/lib/X11R6        \
+    /usr/lib/X11R5        \
+    /usr/lib/X11R4        \
+                          \
+    /usr/local/X11/lib    \
+    /usr/local/X11R6/lib  \
+    /usr/local/X11R5/lib  \
+    /usr/local/X11R4/lib  \
+                          \
+    /usr/local/lib/X11    \
+    /usr/local/lib/X11R6  \
+    /usr/local/lib/X11R5  \
+    /usr/local/lib/X11R4  \
+                          \
+    /usr/X386/lib         \
+    /usr/x386/lib         \
+    /usr/XFree86/lib/X11  \
+                          \
+    /usr/lib              \
+    /usr/local/lib        \
+    /usr/unsupported/lib  \
+    /usr/athena/lib       \
+    /usr/local/x11r5/lib  \
+    /usr/lpp/Xamples/lib  \
+    /lib/usr/lib/X11     \
+                          \
+    /usr/openwin/lib      \
+    /usr/openwin/share/lib \
+    ; \
+do
+  for ac_extension in a so sl; do
+    if test -r $ac_dir/lib${x_direct_test_library}.$ac_extension; then
+      ac_x_libraries=$ac_dir
+      break 2
+    fi
+  done
+done
+fi
+rm -f conftest*
+fi # $ac_x_libraries = NO
+
+if test "$ac_x_includes" = NO || test "$ac_x_libraries" = NO; then
+  # Didn't find X anywhere.  Cache the known absence of X.
+  ac_cv_have_x="have_x=no"
+else
+  # Record where we found X for the cache.
+  ac_cv_have_x="have_x=yes \
+               ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries"
+fi
+fi
+  fi
+  eval "$ac_cv_have_x"
+fi # $with_x != no
+
+if test "$have_x" != yes; then
+  echo "$ac_t""$have_x" 1>&6
+  no_x=yes
+else
+  # If each of the values was on the command line, it overrides each guess.
+  test "x$x_includes" = xNONE && x_includes=$ac_x_includes
+  test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries
+  # Update the cache value to reflect the command line values.
+  ac_cv_have_x="have_x=yes \
+               ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
+  echo "$ac_t""libraries $x_libraries, headers $x_includes" 1>&6
+fi
+
+if test "$no_x" = yes; then
+  # Not all programs may use this symbol, but it does not hurt to define it.
+  cat >> confdefs.h <<\EOF
+#define X_DISPLAY_MISSING 1
+EOF
+
+  X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS=
+else
+  if test -n "$x_includes"; then
+    X_CFLAGS="$X_CFLAGS -I$x_includes"
+  fi
+
+  # It would also be nice to do this for all -L options, not just this one.
+  if test -n "$x_libraries"; then
+    X_LIBS="$X_LIBS -L$x_libraries"
+    # For Solaris; some versions of Sun CC require a space after -R and
+    # others require no space.  Words are not sufficient . . . .
+    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:10051: checking whether -R must be followed by a space" >&5
+      ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries"
+      cat > conftest.$ac_ext <<EOF
+#line 10054 "configure"
+#include "confdefs.h"
+
+int main() {
+
+; return 0; }
+EOF
+if { (eval echo configure:10061: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  ac_R_nospace=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_R_nospace=no
+fi
+rm -f conftest*
+      if test $ac_R_nospace = yes; then
+       echo "$ac_t""no" 1>&6
+       X_LIBS="$X_LIBS -R$x_libraries"
+      else
+       LIBS="$ac_xsave_LIBS -R $x_libraries"
+       cat > conftest.$ac_ext <<EOF
+#line 10077 "configure"
+#include "confdefs.h"
+
+int main() {
+
+; return 0; }
+EOF
+if { (eval echo configure:10084: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  ac_R_space=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_R_space=no
+fi
+rm -f conftest*
+       if test $ac_R_space = yes; then
+         echo "$ac_t""yes" 1>&6
+         X_LIBS="$X_LIBS -R $x_libraries"
+       else
+         echo "$ac_t""neither works" 1>&6
+       fi
+      fi
+      LIBS="$ac_xsave_LIBS"
+    esac
+  fi
+
+  # Check for system-dependent libraries X programs must link with.
+  # Do this before checking for the system-independent R6 libraries
+  # (-lICE), since we may need -lsocket or whatever for X linking.
+
+  if test "$ISC" = yes; then
+    X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl_s -linet"
+  else
+    # Martyn.Johnson@cl.cam.ac.uk says this is needed for Ultrix, if the X
+    # 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:10116: 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
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-ldnet  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 10124 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char dnet_ntoa();
+
+int main() {
+dnet_ntoa()
+; return 0; }
+EOF
+if { (eval echo configure:10135: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+    if test $ac_cv_lib_dnet_dnet_ntoa = no; then
+      echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6
+echo "configure:10157: 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
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-ldnet_stub  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 10165 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char dnet_ntoa();
+
+int main() {
+dnet_ntoa()
+; return 0; }
+EOF
+if { (eval echo configure:10176: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+    fi
+
+    # msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,
+    # to get the SysV transport functions.
+    # chad@anasazi.com says the Pyramis MIS-ES running DC/OSx (SVR4)
+    # needs -lnsl.
+    # 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:10205: checking for gethostbyname" >&5
+if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 10210 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char gethostbyname(); 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 gethostbyname();
+
+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_gethostbyname) || defined (__stub___gethostbyname)
+choke me
+#else
+gethostbyname();
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:10233: \"$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
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_gethostbyname=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$ac_cv_func_'gethostbyname`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  :
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+    if test $ac_cv_func_gethostbyname = no; then
+      echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
+echo "configure:10254: 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
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-lnsl  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 10262 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char gethostbyname();
+
+int main() {
+gethostbyname()
+; return 0; }
+EOF
+if { (eval echo configure:10273: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+    fi
+
+    # lieder@skyler.mavd.honeywell.com says without -lsocket,
+    # socket/setsockopt and other routines are undefined under SCO ODT
+    # 2.0.  But -lsocket is broken on IRIX 5.2 (and is not necessary
+    # on later versions), says simon@lia.di.epfl.ch: it contains
+    # gethostby* variants that don't use the nameserver (or something).
+    # -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:10303: checking for connect" >&5
+if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 10308 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char connect(); 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 connect();
+
+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_connect) || defined (__stub___connect)
+choke me
+#else
+connect();
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:10331: \"$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
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_connect=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$ac_cv_func_'connect`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  :
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+    if test $ac_cv_func_connect = no; then
+      echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
+echo "configure:10352: 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
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 10360 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char connect();
+
+int main() {
+connect()
+; return 0; }
+EOF
+if { (eval echo configure:10371: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+    fi
+
+    # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX.
+    echo $ac_n "checking for remove""... $ac_c" 1>&6
+echo "configure:10395: checking for remove" >&5
+if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 10400 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char remove(); 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 remove();
+
+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_remove) || defined (__stub___remove)
+choke me
+#else
+remove();
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:10423: \"$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
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_remove=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$ac_cv_func_'remove`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  :
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+    if test $ac_cv_func_remove = no; then
+      echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
+echo "configure:10444: 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
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-lposix  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 10452 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char remove();
+
+int main() {
+remove()
+; return 0; }
+EOF
+if { (eval echo configure:10463: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+    fi
+
+    # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
+    echo $ac_n "checking for shmat""... $ac_c" 1>&6
+echo "configure:10487: checking for shmat" >&5
+if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 10492 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char shmat(); 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 shmat();
+
+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_shmat) || defined (__stub___shmat)
+choke me
+#else
+shmat();
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:10515: \"$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
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_shmat=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$ac_cv_func_'shmat`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  :
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+    if test $ac_cv_func_shmat = no; then
+      echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
+echo "configure:10536: 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
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-lipc  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 10544 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char shmat();
+
+int main() {
+shmat()
+; return 0; }
+EOF
+if { (eval echo configure:10555: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+    fi
+  fi
+
+  # Check for libraries that X11R6 Xt/Xaw programs need.
+  ac_save_LDFLAGS="$LDFLAGS"
+  test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries"
+  # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to
+  # check for ICE first), but we must link in the order -lSM -lICE or
+  # we get undefined symbols.  So assume we have SM if we have ICE.
+  # These have to be linked with before -lX11, unlike the other
+  # 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:10588: 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
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-lICE $X_EXTRA_LIBS $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 10596 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char IceConnectionNumber();
+
+int main() {
+IceConnectionNumber()
+; return 0; }
+EOF
+if { (eval echo configure:10607: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+  LDFLAGS="$ac_save_LDFLAGS"
+
+fi
+
+    CPPFLAGS="$CPPFLAGS $X_CFLAGS"
+    LDFLAGS="$LDFLAGS $X_LIBS"
+
+    if test "$wxUSE_MOTIF" = 1; then
+        if test "$no_x" = "yes"; then
+          { echo "configure: error: X11 not found" 1>&2; exit 1; }
+        fi
+
+        GUI_TK_LIBRARY="$X_LIBS"
+        TOOLKIT_INCLUDE="$X_CFLAGS"
+
+        AFMINSTALL=afminstall
+
+                                                                                                                                                                                                
+        COMPILED_X_PROGRAM=0
+
+        echo $ac_n "checking for Motif/Lesstif headers""... $ac_c" 1>&6
+echo "configure:10648: checking for Motif/Lesstif headers" >&5
+        
+ac_find_includes=
+for ac_dir in $SEARCH_INCLUDE;
+  do
+    if test -f "$ac_dir/Xm/Xm.h"; then
+      ac_find_includes=$ac_dir
+      break
+    fi
+  done
+
+        if test "$ac_find_includes" != "" ; then
+            echo "$ac_t""found $ac_find_includes" 1>&6
+        else
+            cat > conftest.$ac_ext <<EOF
+#line 10663 "configure"
+#include "confdefs.h"
+
+                    #include <Xm/Xm.h>
+                
+int main() {
+
+                    int version;
+
+                    version = xmUseVersion;
+                
+; return 0; }
+EOF
+if { (eval echo configure:10676: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  
+                    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*
+  
+                    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
+
+        if test "$COMPILED_X_PROGRAM" = 0; then
+            echo $ac_n "checking for Motif/Lesstif library""... $ac_c" 1>&6
+echo "configure:10697: checking for Motif/Lesstif library" >&5
+            
+ac_find_libraries=
+for ac_dir in $SEARCH_LIB;
+  do
+    for ac_extension in a so sl dylib; do
+      if test -f "$ac_dir/libXm.$ac_extension"; then
+        ac_find_libraries=$ac_dir
+        break 2
+      fi
+    done
+  done
+
+            if test "$ac_find_libraries" != "" ; then
+                
+  ac_path_to_include=$ac_find_includes
+  echo "$TOOLKIT_INCLUDE" | grep "\-I$ac_find_includes" > /dev/null
+  result=$?
+  if test $result = 0; then
+    ac_path_to_include=""
+  else
+    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
+    ac_path_to_link=""
+  else
+    ac_path_to_link="-L$ac_find_libraries"
+  fi
+
+
+                GUI_TK_LIBRARY="$GUI_TK_LIBRARY $ac_path_to_link"
+                TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE $ac_path_to_include"
+                echo "$ac_t""found at $ac_find_libraries" 1>&6
+            else
+                                                                cat > conftest.$ac_ext <<EOF
+#line 10736 "configure"
+#include "confdefs.h"
+
+                        #include <Xm/Xm.h>
+                    
+int main() {
+
+                        int version;
+
+                        version = xmUseVersion;
+                    
+; return 0; }
+EOF
+if { (eval echo configure:10749: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  
+                        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*
+  
+                        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
+        fi
+
+                                                                                                                                                                                                                                                        
+        XPM_LINK=""
+        echo $ac_n "checking for Xpm library""... $ac_c" 1>&6
+echo "configure:10772: checking for Xpm library" >&5
+        
+ac_find_libraries=
+for ac_dir in $SEARCH_LIB;
+  do
+    for ac_extension in a so sl dylib; do
+      if test -f "$ac_dir/libXpm.$ac_extension"; then
+        ac_find_libraries=$ac_dir
+        break 2
+      fi
+    done
+  done
+
+        if test "$ac_find_libraries" != "" ; then
+            
+  echo "$GUI_TK_LIBRARY" | grep "\-L$ac_find_libraries" > /dev/null
+  result=$?
+  if test $result = 0; then
+    ac_path_to_link=""
+  else
+    ac_path_to_link="-L$ac_find_libraries"
+  fi
+
+            GUI_TK_LIBRARY="$GUI_TK_LIBRARY $ac_path_to_link"
+            XPM_LINK="-lXpm "
+            cat >> confdefs.h <<\EOF
+#define wxHAVE_LIB_XPM 1
+EOF
+
+            echo "$ac_t""found at $ac_find_libraries" 1>&6
+        else
+            cat > conftest.$ac_ext <<EOF
+#line 10804 "configure"
+#include "confdefs.h"
+
+                    #include <X11/xpm.h>
+                
+int main() {
+
+                    int version;
+
+                    version = XpmLibraryVersion();
+                
+; return 0; }
+EOF
+if { (eval echo configure:10817: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  
+                XPM_LINK="-lXpm "
+                cat >> confdefs.h <<\EOF
+#define wxHAVE_LIB_XPM 1
+EOF
+
+                    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*
+  
+                    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
+
+        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_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
+
+        TOOLKIT_NAME="${TOOLKIT_DIR}"
+
+        TOOLKIT_VPATH="\${top_srcdir}/src/${TOOLKIT_DIR}"
+
+        if test "$TOOLKIT_NAME" = "motif"; then
+        TOOLKIT_VPATH="${TOOLKIT_VPATH}${PATH_IFS}\${top_srcdir}/src/motif/xmcombo"
+    fi
+
+        if test "$wxUSE_UNIVERSAL" = "yes"; then
+        TOOLKIT_NAME="${TOOLKIT_NAME}univ"
+        UNIV_VPATH="\${top_srcdir}/src/univ${PATH_IFS}\${top_srcdir}/src/univ/themes"
+        TOOLKIT_VPATH="${UNIV_VPATH}${PATH_IFS}${TOOLKIT_VPATH}"
+        SETUPH_DIR="univ"
+    else
+        SETUPH_DIR="${TOOLKIT_DIR}"
+    fi
+
+        if test "$wxUSE_DEBUG_FLAG" = "yes"; then
+        TOOLKIT_NAME="${TOOLKIT_NAME}d"
+    fi
+
+        TOOLKIT_DEF="-D__WX${TOOLKIT}__"
+    if test "$wxUSE_UNIVERSAL" = "yes"; then
+        TOOLKIT_DEF="${TOOLKIT_DEF} -D__WXUNIVERSAL__"
+    fi
+
+        WX_LIBRARY="wx_${TOOLKIT_NAME}"
+
+        if test "$wxUSE_UNIVERSAL" = "yes"; then
+        ALL_OBJECTS="\$(GUI_LOWLEVEL_OBJS) \${UNIVOBJS}"
+    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 "x$REGEX_INCLUDE" != "x" ; then
+        ALL_OBJECTS="${ALL_OBJECTS} \$(REGEXOBJS)"
+    fi
+
+    if test "$wxUSE_LIBJPEG" = "yes" ; then
+        ALL_OBJECTS="${ALL_OBJECTS} \$(JPEGOBJS)"
+    fi
+    if test "$wxUSE_LIBTIFF" = "yes" ; then
+        ALL_OBJECTS="${ALL_OBJECTS} \$(TIFFOBJS)"
+    fi
+    if test "$wxUSE_LIBPNG" = "yes" ; then
+        ALL_OBJECTS="${ALL_OBJECTS} \$(PNGOBJS)"
+    fi
+    if test "$wxUSE_ZLIB" = "yes" ; then
+        ALL_OBJECTS="${ALL_OBJECTS} \$(ZLIBOBJS)"
+    fi
+    if test "$wxUSE_FREETYPE" = "yes" ; then
+        ALL_OBJECTS="${ALL_OBJECTS} \$(FREETYPEOBJS)"
+    fi
+
+        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"
+
+        GUIDIST="${GUIDIST} SAMPLES_DIST DEMOS_DIST UTILS_DIST MISC_DIST"
+    DISTDIR="wx\$(TOOLKIT)"
+else
+    USE_GUI=0
+
+        TOOLKIT_DIR="base"
+
+        TOOLKIT_VPATH="."
+
+        if test "$wxUSE_DEBUG_FLAG" = "yes"; then
+        TOOLKIT_NAME="${TOOLKIT_DIR}d"
+    else
+        TOOLKIT_NAME="${TOOLKIT_DIR}"
+    fi
+
+    TOOLKIT_DEF="-D__WXBASE__"
+
+        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}"
+
+    PORT_FILES="\${top_srcdir}/src/files.lst"
+    RPM_FILES="src/rpmfiles.lst"
+    RPM_SPEC="wxBase.spec"
+
+        GUIDIST="BASE_DIST"
+    DISTDIR="wxBase"
+fi
+
+WX_LIBRARY_NAME="lib${WX_LIBRARY}.la"
+WX_LIBRARY_NAME_GL="lib${WX_LIBRARY}_gl.la"
+
+WX_LIBRARY_NAME_STATIC="lib${WX_LIBRARY}.a"
+WX_LIBRARY_NAME_STATIC_GL="lib${WX_LIBRARY}_gl.a"
+
+case "${host}" in
+  *-*-mingw32* )
+    WX_LIBRARY_NAME_SHARED="wx${WX_MAJOR_VERSION_NUMBER}${WX_MINOR_VERSION_NUMBER}_${WX_RELEASE_NUMBER}.dll"
+  ;;
+  * )
+    WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}-${WX_RELEASE}.so.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}"
+    WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.so.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}"
+  ;;
+esac
+
+WX_LIBRARY_LINK1="lib${WX_LIBRARY}-${WX_RELEASE}.so.${WX_CURRENT}"
+WX_LIBRARY_LINK2="lib${WX_LIBRARY}-${WX_RELEASE}.so"
+WX_LIBRARY_LINK3="lib${WX_LIBRARY}.so"
+WX_LIBRARY_LINK1_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.so.${WX_CURRENT}"
+WX_LIBRARY_LINK2_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.so"
+WX_LIBRARY_LINK3_GL="lib${WX_LIBRARY}_gl.so"
+
+SHARED_LD=
+PIC_FLAG=
+WX_ALL=
+WX_ALL_INSTALLED=
+BURNT_LIBRARY_NAME=
+WX_TARGET_LIBRARY_SONAME=
+
+
+if test "$wxUSE_SHARED" = "yes"; then
+    case "${host}" in
+      *-hp-hpux* )
+        if test "$GCC" = yes ; then
+            SHARED_LD="${CXX} -shared -fPIC -o"
+            PIC_FLAG="-fPIC"
+        else
+                        LDFLAGS="-L/usr/lib"
+
+            SHARED_LD="${CXX} -b -o"
+            PIC_FLAG="+Z"
+        fi
+        WX_LIBRARY_NAME_SHARED="libwx_${TOOLKIT_NAME}.sl"
+        WX_LIBRARY_NAME_SHARED_GL="libwx_${TOOLKIT_NAME}_gl.sl"
+        if test "$wxUSE_OPENGL" = "yes"; then
+            WX_ALL_INSTALLED="preinstall_gl"
+            WX_ALL="${WX_LIBRARY_NAME_SHARED} ${WX_LIBRARY_NAME_SHARED_GL}"
+        else
+            WX_ALL="${WX_LIBRARY_NAME_SHARED}"
+        fi
+      ;;
+
+            *-*-linux* )
+        SHARED_LD="${CXX} -shared -o"
+        PIC_FLAG="-fPIC"
+        if test "$wxUSE_BURNT_NAME" = "yes" ; then
+            BURNT_LIBRARY_NAME="-Wl,-soname,${WX_LIBRARY_LINK1}"
+            BURNT_LIBRARY_NAME_GL="-Wl,-soname,${WX_LIBRARY_LINK1_GL}"
+                        WX_TARGET_LIBRARY_SONAME="-Wl,-soname,\$(TARGETLIB_LINK1)"
+        fi
+        if test "$wxUSE_OPENGL" = "yes"; then
+            WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS CREATE_INSTALLED_LINKS_GL"
+            WX_ALL="CREATE_LINKS CREATE_LINKS_GL"
+        else
+            WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
+            WX_ALL="CREATE_LINKS"
+        fi
+      ;;
+      *-*-irix5* | *-*-irix6* )
+        if test "$GCC" = yes ; then
+           SHARED_LD="${CXX} -shared -o"
+           PIC_FLAG="-fPIC"
+        else
+           SHARED_LD="${CXX} -shared -o"
+        fi
+        if test "$wxUSE_OPENGL" = "yes"; then
+            WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS CREATE_INSTALLED_LINKS_GL"
+            WX_ALL="CREATE_LINKS CREATE_LINKS_GL"
+        else
+            WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
+            WX_ALL="CREATE_LINKS"
+        fi
+      ;;
+      *-*-solaris2* )
+        if test "$GCC" = yes ; then
+            SHARED_LD="${CXX} -shared -o"
+            PIC_FLAG="-fPIC"
+
+                                    CPPFLAGS="$CPPFLAGS -isystem /usr/openwin/include"
+        else
+            SHARED_LD="${CXX} -G -o"
+            PIC_FLAG="-KPIC"
+        fi
+        if test "$wxUSE_OPENGL" = "yes"; then
+            WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS CREATE_INSTALLED_LINKS_GL"
+            WX_ALL="CREATE_LINKS CREATE_LINKS_GL"
+        else
+            WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
+            WX_ALL="CREATE_LINKS"
+        fi
+      ;;
+      *-*-sunos4* )
+        SHARED_LD="${CXX} -shared -o"
+        PIC_FLAG="-fPIC"
+        WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
+        WX_ALL="CREATE_LINKS"
+      ;;
+      *-*-freebsd* | *-*-openbsd* | *-*-netbsd* )
+        SHARED_LD="${CXX} -shared -o"
+        PIC_FLAG="-fPIC"
+        if test "$wxUSE_OPENGL" = "yes"; then
+            WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS CREATE_INSTALLED_LINKS_GL"
+            WX_ALL="CREATE_LINKS CREATE_LINKS_GL"
+        else
+            WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
+            WX_ALL="CREATE_LINKS"
+        fi
+      ;;
+      *-*-darwin* )
+        TOOLKIT_DEF="${TOOLKIT_DEF} -D__UNIX__ -D__DARWIN__ -D__POWERPC__"
+        CPPFLAGS="${CPPFLAGS} -fno-common"
+        SHARED_LD="${CXX} -dynamiclib -o"
+        PIC_FLAG="-dynamic -fPIC"
+        if test "$wxUSE_OPENGL" = "yes"; then
+            WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS CREATE_INSTALLED_LINKS_GL"
+            WX_ALL="CREATE_LINKS CREATE_LINKS_GL"
+        else
+            WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
+            WX_ALL="CREATE_LINKS"
+        fi
+                if test "$wxUSE_MAC" = 1 ; then
+                WX_ALL="${WX_ALL} ./lib/lib${WX_LIBRARY}-${WX_RELEASE}.r"
+        fi
+                WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}-${WX_RELEASE}.dylib.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}"
+        WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.dylib.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}"
+                WX_LIBRARY_LINK1="lib${WX_LIBRARY}-${WX_RELEASE}.dylib.${WX_CURRENT}"
+        WX_LIBRARY_LINK2="lib${WX_LIBRARY}-${WX_RELEASE}.dylib"
+        WX_LIBRARY_LINK3="lib${WX_LIBRARY}.dylib"
+        WX_LIBRARY_LINK1_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.dylib.${WX_CURRENT}"
+        WX_LIBRARY_LINK2_GL="lib${WX_LIBRARY}_gl-${WX_RELEASE}.dylib"
+        WX_LIBRARY_LINK3_GL="lib${WX_LIBRARY}_gl.dylib"
+      ;;
+      *-*-osf* )
+        SHARED_LD="${CXX} -shared -o"
+        PIC_FLAG="-fPIC"
+        WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
+        WX_ALL="CREATE_LINKS"
+      ;;
+      *-*-dgux5* )
+        SHARED_LD="${CXX} -shared -o"
+        PIC_FLAG="-fPIC"
+        WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
+        WX_ALL="CREATE_LINKS"
+      ;;
+      *-*-sysv5* )
+        SHARED_LD="${CXX} -shared -o"
+        PIC_FLAG="-fPIC"
+        WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
+        WX_ALL="CREATE_LINKS"
+      ;;
+      *-*-aix* )
+        SHARED_LD="/usr/lpp/xlC/bin/makeC++SharedLib -p 0 -o"
+        WX_ALL=${WX_LIBRARY_NAME_SHARED}
+      ;;
+      *-*-cygwin* )
+                WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}"
+        WX_TARGET_LIBRARY_GL="${WX_LIBRARY_NAME_STATIC_GL}"
+        if test "$wxUSE_OPENGL" = "yes"; then
+            WX_ALL_INSTALLED="preinstall_gl"
+            WX_ALL="${WX_LIBRARY_NAME_STATIC} ${WX_LIBRARY_NAME_STATIC_GL}"
+        else
+            WX_ALL="${WX_LIBRARY_NAME_STATIC}"
+        fi
+      ;;
+      *-*-mingw32* )
+        WX_LIBRARY_NAME_STATIC="lib/libwx${WX_MAJOR_VERSION_NUMBER}${WX_MINOR_VERSION_NUMBER}_${WX_RELEASE_NUMBER}.a"
+        SHARED_LD="${CC} -shared -Wl,--out-implib,${WX_LIBRARY_NAME_STATIC} -o"
+        TOOLKIT_DEF="${TOOLKIT_DEF} -DWXUSINGDLL=1"
+        WXMSW_DLL_DEFINES="-UWXUSINGDLL -DWXMAKINGDLL=1 -D_DLL=1 -D_WINDLL=1"
+        WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_SHARED}"
+        WX_TARGET_LIBRARY_GL="${WX_LIBRARY_NAME_SHARED_GL}"
+        if test "$wxUSE_OPENGL" = "yes"; then
+            WX_ALL_INSTALLED="preinstall_gl"
+            WX_ALL="${WX_LIBRARY_NAME_SHARED} ${WX_LIBRARY_NAME_SHARED_GL}"
+        else
+            WX_ALL="${WX_LIBRARY_NAME_SHARED}"
+        fi
+      ;;
+      *-pc-os2_emx )
+                WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}"
+        WX_ALL="${WX_LIBRARY_NAME_STATIC}"
+      ;;
+      *-*-beos* )
+                        SHARED_LD="${LD} -shared -o"
+        PIC_FLAG="-fPIC"
+        WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
+        WX_ALL="CREATE_LINKS"
+      ;;
+      *)
+        { echo "configure: error: unknown system type ${host}." 1>&2; exit 1; }
+    esac
+
+        if test "x$WX_TARGET_LIBRARY" = "x"; then
+        WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_SHARED}"
+        WX_TARGET_LIBRARY_GL="${WX_LIBRARY_NAME_SHARED_GL}"
+    fi
+        WX_TARGET_LIBRARY_TYPE="so"
+else
+        WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}"
+    WX_TARGET_LIBRARY_GL="${WX_LIBRARY_NAME_STATIC_GL}"
+
+    if test "$wxUSE_OPENGL" = "yes"; then
+        WX_ALL_INSTALLED="preinstall_gl"
+        WX_ALL="${WX_LIBRARY_NAME_STATIC} ${WX_LIBRARY_NAME_STATIC_GL}"
+    else
+        WX_ALL="${WX_LIBRARY_NAME_STATIC}"
+    fi
+
+        if test "$wxUSE_GUI" = "no"; then
+                WX_ALL_INSTALLED="${WX_ALL_INSTALLED} preinstall"
+    fi
+
+    WX_TARGET_LIBRARY_TYPE="a"
+fi
+
+
+for ac_hdr in strings.h
+do
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:11225: 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 11230 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:11235: \"$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
+
+for ac_hdr in stdlib.h
+do
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:11265: 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 11270 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:11275: \"$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
+
+for ac_hdr in unistd.h
+do
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:11305: 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 11310 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:11315: \"$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
+
+for ac_hdr in wchar.h
+do
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure: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
+
+for ac_hdr in wcstr.h
+do
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:11385: 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 11390 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:11395: \"$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
+
+for ac_hdr in fnmatch.h
+do
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:11425: 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 11430 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:11435: \"$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
+
+for ac_hdr in iconv.h
+do
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:11465: 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 11470 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:11475: \"$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
+
+for ac_hdr in langinfo.h
+do
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:11505: 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 11510 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:11515: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=yes"
+else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"
+fi
+rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_hdr 1
+EOF
+else
+  echo "$ac_t""no" 1>&6
+fi
+done
+
+
+if test "$wxUSE_GUI" = "yes"; then
+    if test "$wxUSE_UNIX" = "yes"; then
+                for ac_hdr in X11/XKBlib.h
+do
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:11548: 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 11553 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:11558: \"$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
+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:11592: 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 11597 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:11602: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=yes"
+else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"
+fi
+rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_hdr 1
+EOF
+else
+  echo "$ac_t""no" 1>&6
+fi
+done
+
+fi
+
+
+echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
+echo "configure:11632: checking for ANSI C header files" >&5
+if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 11637 "configure"
+#include "confdefs.h"
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <float.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:11645: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+  rm -rf conftest*
+  ac_cv_header_stdc=yes
+else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+if test $ac_cv_header_stdc = yes; then
+  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+cat > conftest.$ac_ext <<EOF
+#line 11662 "configure"
+#include "confdefs.h"
+#include <string.h>
+EOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  egrep "memchr" >/dev/null 2>&1; then
+  :
+else
+  rm -rf conftest*
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+cat > conftest.$ac_ext <<EOF
+#line 11680 "configure"
+#include "confdefs.h"
+#include <stdlib.h>
+EOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  egrep "free" >/dev/null 2>&1; then
+  :
+else
+  rm -rf conftest*
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*
+
+fi
+
+if test $ac_cv_header_stdc = yes; then
+  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
+if test "$cross_compiling" = yes; then
+  :
+else
+  cat > conftest.$ac_ext <<EOF
+#line 11701 "configure"
+#include "confdefs.h"
+#include <ctype.h>
+#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+#define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
+int main () { int i; for (i = 0; i < 256; i++)
+if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
+exit (0); }
+
+EOF
+if { (eval echo configure:11712: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  :
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  ac_cv_header_stdc=no
+fi
+rm -fr conftest*
+fi
+
+fi
+fi
+
+echo "$ac_t""$ac_cv_header_stdc" 1>&6
+if test $ac_cv_header_stdc = yes; then
+  cat >> confdefs.h <<\EOF
+#define STDC_HEADERS 1
+EOF
+
+fi
+
+echo $ac_n "checking for mode_t""... $ac_c" 1>&6
+echo "configure:11736: checking for mode_t" >&5
+if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 11741 "configure"
+#include "confdefs.h"
+#include <sys/types.h>
+#if STDC_HEADERS
+#include <stdlib.h>
+#include <stddef.h>
+#endif
+EOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  egrep "(^|[^a-zA-Z_0-9])mode_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
+  rm -rf conftest*
+  ac_cv_type_mode_t=yes
+else
+  rm -rf conftest*
+  ac_cv_type_mode_t=no
+fi
+rm -f conftest*
+
+fi
+echo "$ac_t""$ac_cv_type_mode_t" 1>&6
+if test $ac_cv_type_mode_t = no; then
+  cat >> confdefs.h <<\EOF
+#define mode_t int
+EOF
+
+fi
+
+echo $ac_n "checking for off_t""... $ac_c" 1>&6
+echo "configure:11769: checking for off_t" >&5
+if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 11774 "configure"
+#include "confdefs.h"
+#include <sys/types.h>
+#if STDC_HEADERS
+#include <stdlib.h>
+#include <stddef.h>
+#endif
+EOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  egrep "(^|[^a-zA-Z_0-9])off_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
+  rm -rf conftest*
+  ac_cv_type_off_t=yes
+else
+  rm -rf conftest*
+  ac_cv_type_off_t=no
+fi
+rm -f conftest*
+
+fi
+echo "$ac_t""$ac_cv_type_off_t" 1>&6
+if test $ac_cv_type_off_t = no; then
+  cat >> confdefs.h <<\EOF
+#define off_t long
+EOF
+
+fi
+
+echo $ac_n "checking for pid_t""... $ac_c" 1>&6
+echo "configure:11802: 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
+#line 11807 "configure"
+#include "confdefs.h"
+#include <sys/types.h>
+#if STDC_HEADERS
+#include <stdlib.h>
+#include <stddef.h>
+#endif
+EOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  egrep "(^|[^a-zA-Z_0-9])pid_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
+  rm -rf conftest*
+  ac_cv_type_pid_t=yes
+else
+  rm -rf conftest*
+  ac_cv_type_pid_t=no
+fi
+rm -f conftest*
+
+fi
+echo "$ac_t""$ac_cv_type_pid_t" 1>&6
+if test $ac_cv_type_pid_t = no; then
+  cat >> confdefs.h <<\EOF
+#define pid_t int
+EOF
+
+fi
+
+echo $ac_n "checking for size_t""... $ac_c" 1>&6
+echo "configure:11835: 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
+#line 11840 "configure"
+#include "confdefs.h"
+#include <sys/types.h>
+#if STDC_HEADERS
+#include <stdlib.h>
+#include <stddef.h>
+#endif
+EOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  egrep "(^|[^a-zA-Z_0-9])size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
+  rm -rf conftest*
+  ac_cv_type_size_t=yes
+else
+  rm -rf conftest*
+  ac_cv_type_size_t=no
+fi
+rm -f conftest*
+
+fi
+echo "$ac_t""$ac_cv_type_size_t" 1>&6
+if test $ac_cv_type_size_t = no; then
+  cat >> confdefs.h <<\EOF
+#define size_t unsigned
+EOF
+
+fi
+
+echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
+echo "configure:11868: 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
+#line 11873 "configure"
+#include "confdefs.h"
+#include <sys/types.h>
+EOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  egrep "uid_t" >/dev/null 2>&1; then
+  rm -rf conftest*
+  ac_cv_type_uid_t=yes
+else
+  rm -rf conftest*
+  ac_cv_type_uid_t=no
+fi
+rm -f conftest*
+
+fi
+
+echo "$ac_t""$ac_cv_type_uid_t" 1>&6
+if test $ac_cv_type_uid_t = no; then
+  cat >> confdefs.h <<\EOF
+#define uid_t int
+EOF
+
+  cat >> confdefs.h <<\EOF
+#define gid_t int
+EOF
+
+fi
+
+
+echo $ac_n "checking for wchar_t""... $ac_c" 1>&6
+echo "configure:11903: 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 11909 "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:11920: \"$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 11928 "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:11939: \"$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:11973: 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
+                          cat > conftest.$ac_ext <<EOF
+#line 11978 "configure"
+#include "confdefs.h"
+#include <stddef.h>
+int main() {
+
+            return 0; }
+
+            struct Foo { void foo(size_t); void foo(unsigned int); };
+
+            int bar() {
+        
+; return 0; }
+EOF
+if { (eval echo configure:11991: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  wx_cv_size_t_is_uint=no
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -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:12014: checking if size_t is unsigned long" >&5
+if eval "test \"`echo '$''{'wx_cv_size_t_is_ulong'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 12019 "configure"
+#include "confdefs.h"
+#include <stddef.h>
+int main() {
+
+                return 0; }
+
+                struct Foo { void foo(size_t); void foo(unsigned long); };
+
+                int bar() {
+            
+; return 0; }
+EOF
+if { (eval echo configure:12032: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  wx_cv_size_t_is_ulong=no
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  wx_cv_size_t_is_ulong=yes
+        
+fi
+rm -f conftest*
+    
+fi
+
+echo "$ac_t""$wx_cv_size_t_is_ulong" 1>&6
+
+    if test "$wx_cv_size_t_is_ulong" = "yes"; then
+        cat >> confdefs.h <<\EOF
+#define wxSIZE_T_IS_ULONG 1
+EOF
+
+    fi
+fi
+
+ac_ext=c
+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cc_cross
+
+
+
+echo $ac_n "checking for pw_gecos in struct passwd""... $ac_c" 1>&6
+echo "configure:12066: 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
+#line 12072 "configure"
+#include "confdefs.h"
+#include <pwd.h>
+int main() {
+
+                char *p;
+                struct passwd *pw;
+                p = pw->pw_gecos;
+             
+; return 0; }
+EOF
+if { (eval echo configure:12083: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  
+                wx_cv_struct_pw_gecos=yes
+             
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  
+                wx_cv_struct_pw_gecos=no
+             
+        
+fi
+rm -f conftest*
+    
+
+fi
+
+echo "$ac_t""$wx_cv_struct_pw_gecos" 1>&6
+
+if test "$wx_cv_struct_pw_gecos" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define HAVE_PW_GECOS 1
+EOF
+
+fi
+
+
+echo $ac_n "checking for working const""... $ac_c" 1>&6
+echo "configure:12113: checking for working const" >&5
+if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 12118 "configure"
+#include "confdefs.h"
+
+int main() {
+
+/* Ultrix mips cc rejects this.  */
+typedef int charset[2]; const charset x;
+/* SunOS 4.1.1 cc rejects this.  */
+char const *const *ccp;
+char **p;
+/* NEC SVR4.0.2 mips cc rejects this.  */
+struct point {int x, y;};
+static struct point const zero = {0,0};
+/* AIX XL C 1.02.0.0 rejects this.
+   It does not let you subtract one const X* pointer from another in an arm
+   of an if-expression whose if-part is not a constant expression */
+const char *g = "string";
+ccp = &g + (g ? g-g : 0);
+/* HPUX 7.0 cc rejects these. */
+++ccp;
+p = (char**) ccp;
+ccp = (char const *const *) p;
+{ /* SCO 3.2v4 cc rejects this.  */
+  char *t;
+  char const *s = 0 ? (char *) 0 : (char const *) 0;
+
+  *t++ = 0;
+}
+{ /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
+  int x[] = {25, 17};
+  const int *foo = &x[0];
+  ++foo;
+}
+{ /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
+  typedef const int *iptr;
+  iptr p = 0;
+  ++p;
+}
+{ /* AIX XL C 1.02.0.0 rejects this saying
+     "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
+  struct s { int j; const int *ap[3]; };
+  struct s *b; b->j = 5;
+}
+{ /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
+  const int foo = 10;
+}
+
+; return 0; }
+EOF
+if { (eval echo configure:12167: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  ac_cv_c_const=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_c_const=no
+fi
+rm -f conftest*
+fi
+
+echo "$ac_t""$ac_cv_c_const" 1>&6
+if test $ac_cv_c_const = no; then
+  cat >> confdefs.h <<\EOF
+#define const 
+EOF
+
+fi
+
+echo $ac_n "checking for inline""... $ac_c" 1>&6
+echo "configure:12188: 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
+#line 12195 "configure"
+#include "confdefs.h"
+
+int main() {
+} $ac_kw foo() {
+; return 0; }
+EOF
+if { (eval echo configure:12202: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  ac_cv_c_inline=$ac_kw; break
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+fi
+rm -f conftest*
+done
+
+fi
+
+echo "$ac_t""$ac_cv_c_inline" 1>&6
+case "$ac_cv_c_inline" in
+  inline | yes) ;;
+  no) cat >> confdefs.h <<\EOF
+#define inline 
+EOF
+ ;;
+  *)  cat >> confdefs.h <<EOF
+#define inline $ac_cv_c_inline
+EOF
+ ;;
+esac
+
+
+echo $ac_n "checking size of char""... $ac_c" 1>&6
+echo "configure:12229: checking size of char" >&5
+if eval "test \"`echo '$''{'ac_cv_sizeof_char'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test "$cross_compiling" = yes; then
+  ac_cv_sizeof_char=1
+else
+  cat > conftest.$ac_ext <<EOF
+#line 12237 "configure"
+#include "confdefs.h"
+#include <stdio.h>
+main()
+{
+  FILE *f=fopen("conftestval", "w");
+  if (!f) exit(1);
+  fprintf(f, "%d\n", sizeof(char));
+  exit(0);
+}
+EOF
+if { (eval echo configure:12248: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  ac_cv_sizeof_char=`cat conftestval`
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  ac_cv_sizeof_char=0
+fi
+rm -fr conftest*
+fi
+
+fi
+echo "$ac_t""$ac_cv_sizeof_char" 1>&6
+cat >> confdefs.h <<EOF
+#define SIZEOF_CHAR $ac_cv_sizeof_char
+EOF
+
+
+echo $ac_n "checking size of short""... $ac_c" 1>&6
+echo "configure:12268: 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 test "$cross_compiling" = yes; then
+  ac_cv_sizeof_short=2
+else
+  cat > conftest.$ac_ext <<EOF
+#line 12276 "configure"
+#include "confdefs.h"
+#include <stdio.h>
+main()
+{
+  FILE *f=fopen("conftestval", "w");
+  if (!f) exit(1);
+  fprintf(f, "%d\n", sizeof(short));
+  exit(0);
+}
+EOF
+if { (eval echo configure:12287: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  ac_cv_sizeof_short=`cat conftestval`
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  ac_cv_sizeof_short=0
+fi
+rm -fr conftest*
+fi
+
+fi
+echo "$ac_t""$ac_cv_sizeof_short" 1>&6
+cat >> confdefs.h <<EOF
+#define SIZEOF_SHORT $ac_cv_sizeof_short
+EOF
+
+
+echo $ac_n "checking size of int *""... $ac_c" 1>&6
+echo "configure:12307: 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 test "$cross_compiling" = yes; then
+  ac_cv_sizeof_int_p=4
+else
+  cat > conftest.$ac_ext <<EOF
+#line 12315 "configure"
+#include "confdefs.h"
+#include <stdio.h>
+main()
+{
+  FILE *f=fopen("conftestval", "w");
+  if (!f) exit(1);
+  fprintf(f, "%d\n", sizeof(int *));
+  exit(0);
+}
+EOF
+if { (eval echo configure:12326: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  ac_cv_sizeof_int_p=`cat conftestval`
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  ac_cv_sizeof_int_p=0
+fi
+rm -fr conftest*
+fi
+
+fi
+echo "$ac_t""$ac_cv_sizeof_int_p" 1>&6
+cat >> confdefs.h <<EOF
+#define SIZEOF_INT_P $ac_cv_sizeof_int_p
+EOF
+
+
+echo $ac_n "checking size of int""... $ac_c" 1>&6
+echo "configure:12346: checking size of int" >&5
+if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test "$cross_compiling" = yes; then
+  ac_cv_sizeof_int=4
+else
+  cat > conftest.$ac_ext <<EOF
+#line 12354 "configure"
+#include "confdefs.h"
+#include <stdio.h>
+main()
+{
+  FILE *f=fopen("conftestval", "w");
+  if (!f) exit(1);
+  fprintf(f, "%d\n", sizeof(int));
+  exit(0);
+}
+EOF
+if { (eval echo configure:12365: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  ac_cv_sizeof_int=`cat conftestval`
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  ac_cv_sizeof_int=0
+fi
+rm -fr conftest*
+fi
+
+fi
+echo "$ac_t""$ac_cv_sizeof_int" 1>&6
+cat >> confdefs.h <<EOF
+#define SIZEOF_INT $ac_cv_sizeof_int
+EOF
+
+
+echo $ac_n "checking size of long""... $ac_c" 1>&6
+echo "configure:12385: checking size of long" >&5
+if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test "$cross_compiling" = yes; then
+  ac_cv_sizeof_long=4
+else
+  cat > conftest.$ac_ext <<EOF
+#line 12393 "configure"
+#include "confdefs.h"
+#include <stdio.h>
+main()
+{
+  FILE *f=fopen("conftestval", "w");
+  if (!f) exit(1);
+  fprintf(f, "%d\n", sizeof(long));
+  exit(0);
+}
+EOF
+if { (eval echo configure:12404: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  ac_cv_sizeof_long=`cat conftestval`
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  ac_cv_sizeof_long=0
+fi
+rm -fr conftest*
+fi
+
+fi
+echo "$ac_t""$ac_cv_sizeof_long" 1>&6
+cat >> confdefs.h <<EOF
+#define SIZEOF_LONG $ac_cv_sizeof_long
+EOF
+
+
+echo $ac_n "checking size of long long""... $ac_c" 1>&6
+echo "configure:12424: checking size of long long" >&5
+if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test "$cross_compiling" = yes; then
+  ac_cv_sizeof_long_long=0
+else
+  cat > conftest.$ac_ext <<EOF
+#line 12432 "configure"
+#include "confdefs.h"
+#include <stdio.h>
+main()
+{
+  FILE *f=fopen("conftestval", "w");
+  if (!f) exit(1);
+  fprintf(f, "%d\n", sizeof(long long));
+  exit(0);
+}
+EOF
+if { (eval echo configure:12443: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  ac_cv_sizeof_long_long=`cat conftestval`
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  ac_cv_sizeof_long_long=0
+fi
+rm -fr conftest*
+fi
+
+fi
+echo "$ac_t""$ac_cv_sizeof_long_long" 1>&6
+cat >> confdefs.h <<EOF
+#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long
+EOF
+
+
+
+echo $ac_n "checking size of wchar_t""... $ac_c" 1>&6
+echo "configure:12464: 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
+    
+else
+  cat > conftest.$ac_ext <<EOF
+#line 12474 "configure"
+#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);
+            }
+        
+EOF
+if { (eval echo configure:12493: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  wx_cv_sizeof_wchar_t=`cat conftestval`
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  wx_cv_sizeof_wchar_t=0
+fi
+rm -fr conftest*
+fi
+
+
+fi
+
+echo "$ac_t""$wx_cv_sizeof_wchar_t" 1>&6
+
+cat >> confdefs.h <<EOF
+#define SIZEOF_WCHAR_T $wx_cv_sizeof_wchar_t
+EOF
+
+
+echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
+echo "configure:12516: 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
+#line 12523 "configure"
+#include "confdefs.h"
+#include <sys/types.h>
+#include <sys/param.h>
+int main() {
+
+#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN
+ bogus endian macros
+#endif
+; return 0; }
+EOF
+if { (eval echo configure:12534: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  # It does; now see whether it defined to BIG_ENDIAN or not.
+cat > conftest.$ac_ext <<EOF
+#line 12538 "configure"
+#include "confdefs.h"
+#include <sys/types.h>
+#include <sys/param.h>
+int main() {
+
+#if BYTE_ORDER != BIG_ENDIAN
+ not big endian
+#endif
+; return 0; }
+EOF
+if { (eval echo configure:12549: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  ac_cv_c_bigendian=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_c_bigendian=no
+fi
+rm -f conftest*
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+fi
+rm -f conftest*
+if test $ac_cv_c_bigendian = unknown; then
+if test "$cross_compiling" = yes; then
+  ac_cv_c_bigendian=unknown
+else
+  cat > conftest.$ac_ext <<EOF
+#line 12569 "configure"
+#include "confdefs.h"
+main () {
+  /* Are we little or big endian?  From Harbison&Steele.  */
+  union
+  {
+    long l;
+    char c[sizeof (long)];
+  } u;
+  u.l = 1;
+  exit (u.c[sizeof (long) - 1] == 1);
+}
+EOF
+if { (eval echo configure:12582: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  ac_cv_c_bigendian=no
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  ac_cv_c_bigendian=yes
+fi
+rm -fr conftest*
+fi
+
+fi
+fi
+
+echo "$ac_t""$ac_cv_c_bigendian" 1>&6
+if test $ac_cv_c_bigendian = unknown; then
+  echo "configure: warning: Assuming little-endian target machine - this may be overriden by adding the line "ac_cv_c_bigendian=${ac_cv_c_bigendian='yes'}" to config.cache file" 1>&2
+fi
+if test $ac_cv_c_bigendian = yes; then
+  cat >> confdefs.h <<\EOF
+#define WORDS_BIGENDIAN 1
+EOF
+
+fi
+
+
+
+  if test "$cross_compiling" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_IOSTREAMH 1
+EOF
+
+  else
+    
+    ac_ext=C
+# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cxx_cross
+
+
+    for ac_hdr in iostream
+do
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:12629: 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 12634 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:12639: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=yes"
+else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"
+fi
+rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_hdr 1
+EOF
+else
+  echo "$ac_t""no" 1>&6
+fi
+done
+
+
+    if test "$ac_cv_header_iostream" = "yes" ; then
+      :
+    else
+      cat >> confdefs.h <<\EOF
+#define wxUSE_IOSTREAMH 1
+EOF
+
+    fi
+
+    ac_ext=c
+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cc_cross
+
+  fi
+
+
+
+  echo $ac_n "checking if C++ compiler supports bool""... $ac_c" 1>&6
+echo "configure:12687: checking if C++ compiler supports bool" >&5
+if eval "test \"`echo '$''{'wx_cv_cpp_bool'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  
+    
+    ac_ext=C
+# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cxx_cross
+
+
+    cat > conftest.$ac_ext <<EOF
+#line 12702 "configure"
+#include "confdefs.h"
+
+      
+int main() {
+
+        bool b = true;
+
+        return 0;
+      
+; return 0; }
+EOF
+if { (eval echo configure:12714: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  
+        wx_cv_cpp_bool=yes
+      
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  
+        wx_cv_cpp_bool=no
+      
+    
+fi
+rm -f conftest*
+
+    ac_ext=c
+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cc_cross
+
+  
+fi
+
+echo "$ac_t""$wx_cv_cpp_bool" 1>&6
+
+  if test "$wx_cv_cpp_bool" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define HAVE_BOOL 1
+EOF
+
+  fi
+
+
+
+echo $ac_n "checking for wcslen in -lc""... $ac_c" 1>&6
+echo "configure:12752: checking for wcslen in -lc" >&5
+ac_lib_var=`echo c'_'wcslen | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-lc  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 12760 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char wcslen();
+
+int main() {
+wcslen()
+; return 0; }
+EOF
+if { (eval echo configure:12771: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  
+            cat >> confdefs.h <<\EOF
+#define HAVE_WCSLEN 1
+EOF
+
+            WCHAR_LINK=""
+        
+else
+  echo "$ac_t""no" 1>&6
+
+            echo $ac_n "checking for wcslen in -lw""... $ac_c" 1>&6
+echo "configure:12797: checking for wcslen in -lw" >&5
+ac_lib_var=`echo w'_'wcslen | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-lw  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 12805 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char wcslen();
+
+int main() {
+wcslen()
+; return 0; }
+EOF
+if { (eval echo configure:12816: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  
+                cat >> confdefs.h <<\EOF
+#define HAVE_WCSLEN 1
+EOF
+
+                WCHAR_LINK="-lw"
+            
+else
+  echo "$ac_t""no" 1>&6
+
+                echo $ac_n "checking for wcslen in -lmsvcrt""... $ac_c" 1>&6
+echo "configure:12842: checking for wcslen in -lmsvcrt" >&5
+ac_lib_var=`echo msvcrt'_'wcslen | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-lmsvcrt  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 12850 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char wcslen();
+
+int main() {
+wcslen()
+; return 0; }
+EOF
+if { (eval echo configure:12861: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
 
-SEARCH_LIB="`echo "$SEARCH_INCLUDE" | sed s/include/lib/g` "
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  
+                    cat >> confdefs.h <<\EOF
+#define HAVE_WCSLEN 1
+EOF
 
+                    WCHAR_LINK=""
+                
+else
+  echo "$ac_t""no" 1>&6
+fi
 
-cat > confcache <<\EOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs.  It is not useful on other systems.
-# If it contains results you don't want to keep, you may remove or edit it.
-#
-# By default, configure uses ./config.cache as the cache file,
-# creating it if it does not exist already.  You can give configure
-# the --cache-file=FILE option to use a different cache file; that is
-# what configure does when it calls configure scripts in
-# subdirectories, so they share the cache.
-# Giving --cache-file=/dev/null disables caching, for debugging configure.
-# config.status only pays attention to the cache file if you give it the
-# --recheck option to rerun configure.
-#
+            
+fi
+
+        
+fi
+
+
+echo $ac_n "checking for vprintf""... $ac_c" 1>&6
+echo "configure:12895: checking for vprintf" >&5
+if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 12900 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char vprintf(); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char vprintf();
+
+int main() {
+
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_vprintf) || defined (__stub___vprintf)
+choke me
+#else
+vprintf();
+#endif
+
+; return 0; }
 EOF
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(set) 2>&1 |
-  case `(ac_space=' '; set | grep ac_space) 2>&1` in
-  *ac_space=\ *)
-    # `set' does not quote correctly, so add quotes (double-quote substitution
-    # turns \\\\ into \\, and sed turns \\ into \).
-    sed -n \
-      -e "s/'/'\\\\''/g" \
-      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
-    ;;
-  *)
-    # `set' quotes correctly as required by POSIX, so do not add quotes.
-    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
-    ;;
-  esac >> confcache
-if cmp -s $cache_file confcache; then
-  :
+if { (eval echo configure:12923: \"$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
-  if test -w $cache_file; then
-    echo "updating cache $cache_file"
-    cat confcache > $cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_vprintf=no"
+fi
+rm -f conftest*
 fi
-rm -f confcache
 
+if eval "test \"`echo '$ac_cv_func_'vprintf`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  cat >> confdefs.h <<\EOF
+#define HAVE_VPRINTF 1
+EOF
 
-# If we find X, set shell vars x_includes and x_libraries to the
-# paths, otherwise set no_x=yes.
-# Uses ac_ vars as temps to allow command line to override cache and checks.
-# --without-x overrides everything else, but does not touch the cache.
-echo $ac_n "checking for X""... $ac_c" 1>&6
-echo "configure:4104: checking for X" >&5
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+if test "$ac_cv_func_vprintf" != yes; then
+echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
+echo "configure:12947: checking for _doprnt" >&5
+if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 12952 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char _doprnt(); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char _doprnt();
+
+int main() {
+
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub__doprnt) || defined (__stub____doprnt)
+choke me
+#else
+_doprnt();
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:12975: \"$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
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func__doprnt=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$ac_cv_func_'_doprnt`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  cat >> confdefs.h <<\EOF
+#define HAVE_DOPRNT 1
+EOF
+
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+fi
+
+
+
+
+
+
+
+echo $ac_n "checking for vsnprintf""... $ac_c" 1>&6
+echo "configure:13006: checking for vsnprintf" >&5
+if eval "test \"`echo '$''{'wx_cv_func_vsnprintf'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  
+  cat > conftest.$ac_ext <<EOF
+#line 13012 "configure"
+#include "confdefs.h"
+
+                    #include <stdio.h>
+                    #include <stdarg.h>
+                 
+int main() {
+
+                    int wx_test_vsnprintf(const char *, ...);
+
+                    wx_test_vsnprintf("%s");
+                    return 0;
+                 }
+
+                 int wx_test_vsnprintf(const char *fmt, ...)
+                 {
+                    char *s;
+
+                    va_list argp;
+                    va_start(argp, fmt);
+                    vsnprintf(s, 42, fmt, argp);
+                    va_end(argp);
+                 
+; return 0; }
+EOF
+if { (eval echo configure:13037: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  
+                    wx_cv_func_vsnprintf=yes
+                 
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  
+                    cat > conftest.$ac_ext <<EOF
+#line 13048 "configure"
+#include "confdefs.h"
+
+                                      #include <stdio.h>
+                                      #include <stdarg.h>
+                                   
+int main() {
+
+                                      int wx_test_vsnprintf(const char *, ...);
+
+                                      wx_test_vsnprintf("%s");
+                                      return 0;
+                                   }
+
+                                   int wx_test_vsnprintf(const char *fmt, ...)
+                                   {
+                                      char *s;
+
+                                      va_list argp;
+                                      va_start(argp, fmt);
+                                      _vsnprintf(s, 42, fmt, argp);
+                                      va_end(argp);
+                                   
+; return 0; }
+EOF
+if { (eval echo configure:13073: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  
+                                      wx_cv_func_vsnprintf=yes
+                                   
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  
+                                      wx_cv_func_vsnprintf=no
+                                   
+fi
+rm -f conftest*
+                 
+fi
+rm -f conftest*
+
+fi
+
+echo "$ac_t""$wx_cv_func_vsnprintf" 1>&6
+
+if test "$wx_cv_func_vsnprintf" = yes; then
+    cat >> confdefs.h <<\EOF
+#define HAVE_VSNPRINTF 1
+EOF
+
+else
+    echo "configure: warning: unsafe function sprintf will be used instead of snprintf" 1>&2
+fi
+
+echo $ac_n "checking for vsscanf""... $ac_c" 1>&6
+echo "configure:13105: checking for vsscanf" >&5
+if eval "test \"`echo '$''{'wx_cv_func_vsscanf'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  
+  cat > conftest.$ac_ext <<EOF
+#line 13111 "configure"
+#include "confdefs.h"
+
+                    #include <stdio.h>
+                    #include <stdarg.h>
+                
+int main() {
+
+                    int wx_test_vsscanf(const char *, ...);
+
+                    wx_test_vsscanf("%d");
+                    return 0;
+                }
+
+                int wx_test_vsscanf(const char *fmt, ...)
+                {
+                    va_list argp;
+                    va_start(argp, fmt);
+                    vsscanf("42", fmt, argp);
+                    va_end(argp);
+                
+; return 0; }
+EOF
+if { (eval echo configure:13134: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  
+                    wx_cv_func_vsscanf=yes
+                
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  
+                    wx_cv_func_vsscanf=no
+                
+fi
+rm -f conftest*
 
-# Check whether --with-x or --without-x was given.
-if test "${with_x+set}" = set; then
-  withval="$with_x"
-  :
 fi
 
-# $have_x is `yes', `no', `disabled', or empty when we do not yet know.
-if test "x$with_x" = xno; then
-  # The user explicitly disabled X.
-  have_x=disabled
-else
-  if test "x$x_includes" != xNONE && test "x$x_libraries" != xNONE; then
-    # Both variables are already set.
-    have_x=yes
-  else
-if eval "test \"`echo '$''{'ac_cv_have_x'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  # One or both of the vars are not set, and there is no cached value.
-ac_x_includes=NO ac_x_libraries=NO
-rm -fr conftestdir
-if mkdir conftestdir; then
-  cd conftestdir
-  # Make sure to not put "make" in the Imakefile rules, since we grep it out.
-  cat > Imakefile <<'EOF'
-acfindx:
-       @echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"'
+echo "$ac_t""$wx_cv_func_vsscanf" 1>&6
+
+if test "$wx_cv_func_vsscanf" = yes; then
+    cat >> confdefs.h <<\EOF
+#define HAVE_VSSCANF 1
 EOF
-  if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then
-    # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-    eval `${MAKE-make} acfindx 2>/dev/null | grep -v make`
-    # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
-    for ac_extension in a so sl; do
-      if test ! -f $ac_im_usrlibdir/libX11.$ac_extension &&
-        test -f $ac_im_libdir/libX11.$ac_extension; then
-        ac_im_usrlibdir=$ac_im_libdir; break
-      fi
-    done
-    # Screen out bogus values from the imake configuration.  They are
-    # bogus both because they are the default anyway, and because
-    # using them would break gcc on systems where it needs fixed includes.
-    case "$ac_im_incroot" in
-       /usr/include) ;;
-       *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes="$ac_im_incroot" ;;
-    esac
-    case "$ac_im_usrlibdir" in
-       /usr/lib | /lib) ;;
-       *) test -d "$ac_im_usrlibdir" && ac_x_libraries="$ac_im_usrlibdir" ;;
-    esac
-  fi
-  cd ..
-  rm -fr conftestdir
+
 fi
 
-if test "$ac_x_includes" = NO; then
-  # Guess where to find include files, by looking for this one X11 .h file.
-  test -z "$x_direct_test_include" && x_direct_test_include=X11/Intrinsic.h
+if test "$TOOLKIT" != "MSW"; then
 
-  # First, try using that file with no special directory specified.
-cat > conftest.$ac_ext <<EOF
-#line 4166 "configure"
+
+
+ac_ext=C
+# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cxx_cross
+
+echo $ac_n "checking if iconv() takes char**""... $ac_c" 1>&6
+echo "configure:13172: checking if iconv() takes char**" >&5
+if eval "test \"`echo '$''{'wx_cv_iconv_takes_char'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  
+    cat > conftest.$ac_ext <<EOF
+#line 13178 "configure"
 #include "confdefs.h"
-#include <$x_direct_test_include>
+#include <iconv.h>
+int main() {
+
+        char **inbuf, **outbuf;
+        iconv_t cd;
+        size_t insz, outsz;
+        iconv(cd, inbuf, &insz, outbuf, &outsz);
+    
+; return 0; }
 EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4171: \"$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:13190: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  # We can compile using X headers with no special include directory.
-ac_x_includes=
+  wx_cv_iconv_takes_char=yes
 else
-  echo "$ac_err" >&5
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  # Look for the header file in a standard set of common directories.
-# Check X11 before X11Rn because it is often a symlink to the current release.
-  for ac_dir in               \
-    /usr/X11/include          \
-    /usr/X11R6/include        \
-    /usr/X11R5/include        \
-    /usr/X11R4/include        \
-                              \
-    /usr/include/X11          \
-    /usr/include/X11R6        \
-    /usr/include/X11R5        \
-    /usr/include/X11R4        \
-                              \
-    /usr/local/X11/include    \
-    /usr/local/X11R6/include  \
-    /usr/local/X11R5/include  \
-    /usr/local/X11R4/include  \
-                              \
-    /usr/local/include/X11    \
-    /usr/local/include/X11R6  \
-    /usr/local/include/X11R5  \
-    /usr/local/include/X11R4  \
-                              \
-    /usr/X386/include         \
-    /usr/x386/include         \
-    /usr/XFree86/include/X11  \
-                              \
-    /usr/include              \
-    /usr/local/include        \
-    /usr/unsupported/include  \
-    /usr/athena/include       \
-    /usr/local/x11r5/include  \
-    /usr/lpp/Xamples/include  \
-                              \
-    /usr/openwin/include      \
-    /usr/openwin/share/include \
-    ; \
-  do
-    if test -r "$ac_dir/$x_direct_test_include"; then
-      ac_x_includes=$ac_dir
-      break
-    fi
-  done
+  wx_cv_iconv_takes_char=no
 fi
 rm -f conftest*
-fi # $ac_x_includes = NO
 
-if test "$ac_x_libraries" = NO; then
-  # Check for the libraries.
+fi
 
-  test -z "$x_direct_test_library" && x_direct_test_library=Xt
-  test -z "$x_direct_test_function" && x_direct_test_function=XtMalloc
+echo "$ac_t""$wx_cv_iconv_takes_char" 1>&6
+ac_ext=c
+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cc_cross
 
-  # See if we find them without any special options.
-  # Don't add to $LIBS permanently.
-  ac_save_LIBS="$LIBS"
-  LIBS="-l$x_direct_test_library $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 4240 "configure"
+if test "$wx_cv_iconv_takes_char" = yes ; then
+    cat >> confdefs.h <<\EOF
+#define WX_ICONV_TAKES_CHAR 1
+EOF
+
+fi
+
+
+if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes" -a "$wxUSE_UNIX" = "yes"; then
+    for ac_func in sigaction
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:13223: 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 13228 "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() {
-${x_direct_test_function}()
+
+/* 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:4247: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13251: \"$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.
-ac_x_libraries=
+  eval "ac_cv_func_$ac_func=yes"
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  LIBS="$ac_save_LIBS"
-# First see if replacing the include by lib works.
-# Check X11 before X11Rn because it is often a symlink to the current release.
-for ac_dir in `echo "$ac_x_includes" | sed s/include/lib/` \
-    /usr/X11/lib          \
-    /usr/X11R6/lib        \
-    /usr/X11R5/lib        \
-    /usr/X11R4/lib        \
-                          \
-    /usr/lib/X11          \
-    /usr/lib/X11R6        \
-    /usr/lib/X11R5        \
-    /usr/lib/X11R4        \
-                          \
-    /usr/local/X11/lib    \
-    /usr/local/X11R6/lib  \
-    /usr/local/X11R5/lib  \
-    /usr/local/X11R4/lib  \
-                          \
-    /usr/local/lib/X11    \
-    /usr/local/lib/X11R6  \
-    /usr/local/lib/X11R5  \
-    /usr/local/lib/X11R4  \
-                          \
-    /usr/X386/lib         \
-    /usr/x386/lib         \
-    /usr/XFree86/lib/X11  \
-                          \
-    /usr/lib              \
-    /usr/local/lib        \
-    /usr/unsupported/lib  \
-    /usr/athena/lib       \
-    /usr/local/x11r5/lib  \
-    /usr/lpp/Xamples/lib  \
-    /lib/usr/lib/X11     \
-                          \
-    /usr/openwin/lib      \
-    /usr/openwin/share/lib \
-    ; \
-do
-  for ac_extension in a so sl; do
-    if test -r $ac_dir/lib${x_direct_test_library}.$ac_extension; then
-      ac_x_libraries=$ac_dir
-      break 2
-    fi
-  done
-done
+  eval "ac_cv_func_$ac_func=no"
 fi
 rm -f conftest*
-fi # $ac_x_libraries = NO
+fi
 
-if test "$ac_x_includes" = NO || test "$ac_x_libraries" = NO; then
-  # Didn't find X anywhere.  Cache the known absence of X.
-  ac_cv_have_x="have_x=no"
+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
+
+
+    if test "$ac_cv_func_sigaction" = "no"; then
+        echo "configure: warning: No POSIX signal functions on this system, wxApp::OnFatalException will not be called" 1>&2
+        wxUSE_ON_FATAL_EXCEPTION=no
+    fi
+
+    if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes"; then
+      
+      ac_ext=C
+# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cxx_cross
+
+
+      echo $ac_n "checking for sa_handler type""... $ac_c" 1>&6
+echo "configure:13292: checking for sa_handler type" >&5
+if eval "test \"`echo '$''{'wx_cv_type_sa_handler'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  
+        cat > conftest.$ac_ext <<EOF
+#line 13298 "configure"
+#include "confdefs.h"
+#include <signal.h>
+int main() {
+
+                        extern void testSigHandler(int);
+
+                        struct sigaction sa;
+                        sa.sa_handler = testSigHandler;
+                     
+; return 0; }
+EOF
+if { (eval echo configure:13310: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  
+                        wx_cv_type_sa_handler=int
+                     
 else
-  # Record where we found X for the cache.
-  ac_cv_have_x="have_x=yes \
-               ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries"
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  
+                        wx_cv_type_sa_handler=void
+                     
 fi
+rm -f conftest*
+      
 fi
-  fi
-  eval "$ac_cv_have_x"
-fi # $with_x != no
 
-if test "$have_x" != yes; then
-  echo "$ac_t""$have_x" 1>&6
-  no_x=yes
-else
-  # If each of the values was on the command line, it overrides each guess.
-  test "x$x_includes" = xNONE && x_includes=$ac_x_includes
-  test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries
-  # Update the cache value to reflect the command line values.
-  ac_cv_have_x="have_x=yes \
-               ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
-  echo "$ac_t""libraries $x_libraries, headers $x_includes" 1>&6
-fi
+echo "$ac_t""$wx_cv_type_sa_handler" 1>&6
 
-if test "$no_x" = yes; then
-  # Not all programs may use this symbol, but it does not hurt to define it.
-  cat >> confdefs.h <<\EOF
-#define X_DISPLAY_MISSING 1
+      ac_ext=c
+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cc_cross
+
+
+      cat >> confdefs.h <<EOF
+#define wxTYPE_SA_HANDLER $wx_cv_type_sa_handler
 EOF
 
-  X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS=
-else
-  if test -n "$x_includes"; then
-    X_CFLAGS="$X_CFLAGS -I$x_includes"
-  fi
+    fi
+fi
 
-  # It would also be nice to do this for all -L options, not just this one.
-  if test -n "$x_libraries"; then
-    X_LIBS="$X_LIBS -L$x_libraries"
-    # For Solaris; some versions of Sun CC require a space after -R and
-    # others require no space.  Words are not sufficient . . . .
-    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:4353: checking whether -R must be followed by a space" >&5
-      ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries"
-      cat > conftest.$ac_ext <<EOF
-#line 4356 "configure"
+for ac_func in vfork
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:13347: 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 13352 "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:4363: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13375: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  ac_R_nospace=yes
+  eval "ac_cv_func_$ac_func=yes"
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  ac_R_nospace=no
+  eval "ac_cv_func_$ac_func=no"
 fi
 rm -f conftest*
-      if test $ac_R_nospace = yes; then
-       echo "$ac_t""no" 1>&6
-       X_LIBS="$X_LIBS -R$x_libraries"
-      else
-       LIBS="$ac_xsave_LIBS -R $x_libraries"
-       cat > conftest.$ac_ext <<EOF
-#line 4379 "configure"
+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
+
+
+if test "$wxUSE_SNGLINST_CHECKER" = "yes"; then
+    for ac_func in fcntl flock
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:13404: 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 13409 "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:4386: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13432: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  ac_R_space=yes
+  eval "ac_cv_func_$ac_func=yes"
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  ac_R_space=no
+  eval "ac_cv_func_$ac_func=no"
 fi
 rm -f conftest*
-       if test $ac_R_space = yes; then
-         echo "$ac_t""yes" 1>&6
-         X_LIBS="$X_LIBS -R $x_libraries"
-       else
-         echo "$ac_t""neither works" 1>&6
-       fi
-      fi
-      LIBS="$ac_xsave_LIBS"
-    esac
-  fi
+fi
 
-  # Check for system-dependent libraries X programs must link with.
-  # Do this before checking for the system-independent R6 libraries
-  # (-lICE), since we may need -lsocket or whatever for X linking.
+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
+ break
+else
+  echo "$ac_t""no" 1>&6
+fi
+done
 
-  if test "$ISC" = yes; then
-    X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl_s -linet"
-  else
-    # Martyn.Johnson@cl.cam.ac.uk says this is needed for Ultrix, if the X
-    # 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:4418: 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
+
+    if test "$ac_cv_func_fcntl" != "yes" -a "$ac_cv_func_flock" != "yes"; then
+        echo "configure: warning: wxSingleInstanceChecker not available" 1>&2
+        wxUSE_SNGLINST_CHECKER=no
+    fi
+fi
+
+for ac_func in timegm
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:13466: checking for $ac_func" >&5
+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  ac_save_LIBS="$LIBS"
-LIBS="-ldnet  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 4426 "configure"
+  cat > conftest.$ac_ext <<EOF
+#line 13471 "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 dnet_ntoa();
+char $ac_func();
 
 int main() {
-dnet_ntoa()
+
+/* 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:4437: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13494: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
+  eval "ac_cv_func_$ac_func=yes"
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
+  eval "ac_cv_func_$ac_func=no"
 fi
 rm -f conftest*
-LIBS="$ac_save_LIBS"
-
 fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-  X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
+    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
 
-    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:4459: 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
+
+for ac_func in putenv setenv
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:13522: checking for $ac_func" >&5
+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  ac_save_LIBS="$LIBS"
-LIBS="-ldnet_stub  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 4467 "configure"
+  cat > conftest.$ac_ext <<EOF
+#line 13527 "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 dnet_ntoa();
+char $ac_func();
 
 int main() {
-dnet_ntoa()
+
+/* 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:4478: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13550: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
+  eval "ac_cv_func_$ac_func=yes"
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
+  eval "ac_cv_func_$ac_func=no"
 fi
 rm -f conftest*
-LIBS="$ac_save_LIBS"
-
 fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-  X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
+    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+ break
 else
   echo "$ac_t""no" 1>&6
 fi
+done
+
+
+HAVE_SOME_SLEEP_FUNC=0
+if test "$USE_BEOS" = 1; then
+            cat >> confdefs.h <<\EOF
+#define HAVE_SLEEP 1
+EOF
+
+    HAVE_SOME_SLEEP_FUNC=1
+fi
 
-    fi
+if test "$USE_DARWIN" = 1; then
+            cat >> confdefs.h <<\EOF
+#define HAVE_USLEEP 1
+EOF
 
-    # msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,
-    # to get the SysV transport functions.
-    # chad@anasazi.com says the Pyramis MIS-ES running DC/OSx (SVR4)
-    # needs -lnsl.
-    # 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:4507: checking for gethostbyname" >&5
-if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
+    HAVE_SOME_SLEEP_FUNC=1
+fi
+
+if test "$HAVE_SOME_SLEEP_FUNC" != 1; then
+        POSIX4_LINK=
+    for ac_func in nanosleep
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:13597: 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 4512 "configure"
+#line 13602 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char gethostbyname(); below.  */
+    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 gethostbyname();
+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_gethostbyname) || defined (__stub___gethostbyname)
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
-gethostbyname();
+$ac_func();
 #endif
 
 ; return 0; }
 EOF
-if { (eval echo configure:4535: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13625: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  eval "ac_cv_func_gethostbyname=yes"
+  eval "ac_cv_func_$ac_func=yes"
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  eval "ac_cv_func_gethostbyname=no"
+  eval "ac_cv_func_$ac_func=no"
 fi
 rm -f conftest*
 fi
 
-if eval "test \"`echo '$ac_cv_func_'gethostbyname`\" = yes"; then
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-  :
+    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+ cat >> confdefs.h <<\EOF
+#define HAVE_NANOSLEEP 1
+EOF
+
 else
   echo "$ac_t""no" 1>&6
-fi
-
-    if test $ac_cv_func_gethostbyname = no; then
-      echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:4556: checking for gethostbyname in -lnsl" >&5
-ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for nanosleep in -lposix4""... $ac_c" 1>&6
+echo "configure:13650: checking for nanosleep in -lposix4" >&5
+ac_lib_var=`echo posix4'_'nanosleep | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
-LIBS="-lnsl  $LIBS"
+LIBS="-lposix4  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4564 "configure"
+#line 13658 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
-char gethostbyname();
+char nanosleep();
 
 int main() {
-gethostbyname()
+nanosleep()
 ; return 0; }
 EOF
-if { (eval echo configure:4575: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13669: \"$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
@@ -4586,274 +13680,296 @@ LIBS="$ac_save_LIBS"
 fi
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-  X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
+  
+                    cat >> confdefs.h <<\EOF
+#define HAVE_NANOSLEEP 1
+EOF
+
+                    POSIX4_LINK="-lposix4"
+                
 else
   echo "$ac_t""no" 1>&6
-fi
-
-    fi
 
-    # lieder@skyler.mavd.honeywell.com says without -lsocket,
-    # socket/setsockopt and other routines are undefined under SCO ODT
-    # 2.0.  But -lsocket is broken on IRIX 5.2 (and is not necessary
-    # on later versions), says simon@lia.di.epfl.ch: it contains
-    # gethostby* variants that don't use the nameserver (or something).
-    # -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:4605: checking for connect" >&5
-if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then
+                    for ac_func in usleep
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:13697: 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 4610 "configure"
+#line 13702 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char connect(); below.  */
+    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 connect();
+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_connect) || defined (__stub___connect)
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
-connect();
+$ac_func();
 #endif
 
 ; return 0; }
 EOF
-if { (eval echo configure:4633: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13725: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  eval "ac_cv_func_connect=yes"
+  eval "ac_cv_func_$ac_func=yes"
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  eval "ac_cv_func_connect=no"
+  eval "ac_cv_func_$ac_func=no"
 fi
 rm -f conftest*
 fi
 
-if eval "test \"`echo '$ac_cv_func_'connect`\" = yes"; then
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-  :
+    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+ cat >> confdefs.h <<\EOF
+#define HAVE_USLEEP 1
+EOF
+
 else
   echo "$ac_t""no" 1>&6
+echo "configure: warning: wxSleep() function will not work" 1>&2
+                    
 fi
+done
 
-    if test $ac_cv_func_connect = no; then
-      echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
-echo "configure:4654: 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
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 4662 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char connect();
-
-int main() {
-connect()
-; return 0; }
-EOF
-if { (eval echo configure:4673: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
+                
+            
 fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
 
+        
+    
 fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
-else
-  echo "$ac_t""no" 1>&6
-fi
+done
 
-    fi
+fi
 
-    # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX.
-    echo $ac_n "checking for remove""... $ac_c" 1>&6
-echo "configure:4697: checking for remove" >&5
-if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then
+for ac_func in uname gethostname
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:13768: 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 4702 "configure"
+#line 13773 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char remove(); below.  */
+    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 remove();
+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_remove) || defined (__stub___remove)
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
-remove();
+$ac_func();
 #endif
 
 ; return 0; }
 EOF
-if { (eval echo configure:4725: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13796: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  eval "ac_cv_func_remove=yes"
+  eval "ac_cv_func_$ac_func=yes"
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  eval "ac_cv_func_remove=no"
+  eval "ac_cv_func_$ac_func=no"
 fi
 rm -f conftest*
 fi
 
-if eval "test \"`echo '$ac_cv_func_'remove`\" = yes"; then
+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
+ break
 else
   echo "$ac_t""no" 1>&6
 fi
+done
 
-    if test $ac_cv_func_remove = no; then
-      echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
-echo "configure:4746: 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
+
+
+ac_ext=C
+# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cxx_cross
+
+
+for ac_func in strtok_r
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:13833: checking for $ac_func" >&5
+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  ac_save_LIBS="$LIBS"
-LIBS="-lposix  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 4754 "configure"
+  cat > conftest.$ac_ext <<EOF
+#line 13838 "configure"
 #include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func(); below.  */
+#include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
-char remove();
+char $ac_func();
 
 int main() {
-remove()
+
+/* 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:4765: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13864: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
+  eval "ac_cv_func_$ac_func=yes"
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
+  eval "ac_cv_func_$ac_func=no"
 fi
 rm -f conftest*
-LIBS="$ac_save_LIBS"
-
 fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-  X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
+    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
 else
   echo "$ac_t""no" 1>&6
 fi
+done
 
-    fi
 
-    # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-    echo $ac_n "checking for shmat""... $ac_c" 1>&6
-echo "configure:4789: checking for shmat" >&5
-if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then
+ac_ext=c
+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cc_cross
+
+
+INET_LINK=
+for ac_func in inet_addr
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:13901: 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 4794 "configure"
+#line 13906 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char shmat(); below.  */
+    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 shmat();
+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_shmat) || defined (__stub___shmat)
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
-shmat();
+$ac_func();
 #endif
 
 ; return 0; }
 EOF
-if { (eval echo configure:4817: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13929: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  eval "ac_cv_func_shmat=yes"
+  eval "ac_cv_func_$ac_func=yes"
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  eval "ac_cv_func_shmat=no"
+  eval "ac_cv_func_$ac_func=no"
 fi
 rm -f conftest*
 fi
 
-if eval "test \"`echo '$ac_cv_func_'shmat`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  :
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+ cat >> confdefs.h <<\EOF
+#define HAVE_INET_ADDR 1
+EOF
+
 else
   echo "$ac_t""no" 1>&6
-fi
-
-    if test $ac_cv_func_shmat = no; then
-      echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
-echo "configure:4838: checking for shmat in -lipc" >&5
-ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for inet_addr in -lnsl""... $ac_c" 1>&6
+echo "configure:13954: checking for inet_addr in -lnsl" >&5
+ac_lib_var=`echo nsl'_'inet_addr | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
-LIBS="-lipc  $LIBS"
+LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4846 "configure"
+#line 13962 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
-char shmat();
+char inet_addr();
 
 int main() {
-shmat()
+inet_addr()
 ; return 0; }
 EOF
-if { (eval echo configure:4857: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13973: \"$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
@@ -4868,44 +13984,30 @@ LIBS="$ac_save_LIBS"
 fi
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-  X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
+  INET_LINK="nsl"
 else
   echo "$ac_t""no" 1>&6
-fi
-
-    fi
-  fi
-
-  # Check for libraries that X11R6 Xt/Xaw programs need.
-  ac_save_LDFLAGS="$LDFLAGS"
-  test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries"
-  # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to
-  # check for ICE first), but we must link in the order -lSM -lICE or
-  # we get undefined symbols.  So assume we have SM if we have ICE.
-  # These have to be linked with before -lX11, unlike the other
-  # 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:4890: checking for IceConnectionNumber in -lICE" >&5
-ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for inet_addr in -lresolv""... $ac_c" 1>&6
+echo "configure:13992: checking for inet_addr in -lresolv" >&5
+ac_lib_var=`echo resolv'_'inet_addr | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
-LIBS="-lICE $X_EXTRA_LIBS $LIBS"
+LIBS="-lresolv  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4898 "configure"
+#line 14000 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
-char IceConnectionNumber();
+char inet_addr();
 
 int main() {
-IceConnectionNumber()
+inet_addr()
 ; return 0; }
 EOF
-if { (eval echo configure:4909: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14011: \"$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
@@ -4920,471 +14022,413 @@ LIBS="$ac_save_LIBS"
 fi
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-  X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
+  INET_LINK="resolv"
+            
 else
   echo "$ac_t""no" 1>&6
 fi
 
-  LDFLAGS="$ac_save_LDFLAGS"
-
-fi
-
-
-if test "$no_x" = "yes"; then
-  { echo "configure: error: X11 libraries not found" 1>&2; exit 1; }
+        
 fi
 
-CHECK_INCLUDE="-I/usr/include $X_CFLAGS"
-CHECK_LIB="-L/lib -L/usr/lib $X_LIBS"
-
-
-TOOLKIT=
-TOOLKIT_DEF=
-TOOLKIT_DIR=
-TOOLKIT_INCLUDE=
-
-GUI_TK_LIBRARY=
-GUI_TK_LINK=
-
-WXGTK12=
-
-if test "$wxUSE_GTK" = 1; then
-      # Check whether --with-gtk-prefix or --without-gtk-prefix was given.
-if test "${with_gtk_prefix+set}" = set; then
-  withval="$with_gtk_prefix"
-  gtk_config_prefix="$withval"
-else
-  gtk_config_prefix=""
-fi
+    
 
-# Check whether --with-gtk-exec-prefix or --without-gtk-exec-prefix was given.
-if test "${with_gtk_exec_prefix+set}" = set; then
-  withval="$with_gtk_exec_prefix"
-  gtk_config_exec_prefix="$withval"
-else
-  gtk_config_exec_prefix=""
 fi
+done
 
 
-  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
-        GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config
-     fi
-  fi
-  if test x$gtk_config_prefix != x ; then
-     gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix"
-     if test x${GTK_CONFIG+set} != xset ; then
-        GTK_CONFIG=$gtk_config_prefix/bin/gtk-config
-     fi
-  fi
-
-  # Extract the first word of "gtk-config", so it can be a program name with args.
-set dummy gtk-config; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4986: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then
+for ac_func in inet_aton
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:14044: 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
-  case "$GTK_CONFIG" in
-  /*)
-  ac_cv_path_GTK_CONFIG="$GTK_CONFIG" # Let the user override the test with a path.
-  ;;
-  ?:/*)                         
-  ac_cv_path_GTK_CONFIG="$GTK_CONFIG" # Let the user override the test with a dos path.
-  ;;
-  *)
-  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do 
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_path_GTK_CONFIG="$ac_dir/$ac_word"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_path_GTK_CONFIG" && ac_cv_path_GTK_CONFIG="no"
-  ;;
-esac
-fi
-GTK_CONFIG="$ac_cv_path_GTK_CONFIG"
-if test -n "$GTK_CONFIG"; then
-  echo "$ac_t""$GTK_CONFIG" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  min_gtk_version=1.2.0
-  echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6
-echo "configure:5021: checking for GTK - version >= $min_gtk_version" >&5
-  no_gtk=""
-  if test "$GTK_CONFIG" != "no" ; then
-    GTK_CFLAGS=`$GTK_CONFIG --cflags`
-    GTK_LIBS=`$GTK_CONFIG --libs`
-    ac_save_CFLAGS="$CFLAGS"
-    ac_save_LIBS="$LIBS"
-    CFLAGS="$CFLAGS $GTK_CFLAGS"
-    LIBS="$LIBS $GTK_LIBS"
-    if test "$cross_compiling" = yes; then
-  echo $ac_n "cross compiling; assumed OK... $ac_c"
 else
   cat > conftest.$ac_ext <<EOF
-#line 5034 "configure"
+#line 14049 "configure"
 #include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func(); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char $ac_func();
 
-#include <gtk/gtk.h>
-#include <stdio.h>
-
-int
-main ()
-{
-  int major, minor, micro;
-
-  if (sscanf("$min_gtk_version", "%d.%d.%d", &major, &minor, &micro) != 3) {
-     printf("%s, bad version string\n", "$min_gtk_version");
-     exit(1);
-   }
-
-   if (gtk_minor_version == 1) return FALSE;
+int main() {
 
-   return !((gtk_major_version > major) ||
-           ((gtk_major_version == major) && (gtk_minor_version > minor)) ||
-           ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)));
-}
+/* 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:5058: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
-  :
+if { (eval echo configure:14072: \"$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 -fr conftest*
-  no_gtk=yes
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=no"
 fi
-rm -fr conftest*
+rm -f conftest*
 fi
 
-     CFLAGS="$ac_save_CFLAGS"
-     LIBS="$ac_save_LIBS"
-  else
-     no_gtk=yes
-  fi
-  if test "x$no_gtk" = x ; then
-     echo "$ac_t""yes" 1>&6
-     WXGTK12=1
-  else
-     echo "$ac_t""no" 1>&6
-     GTK_CFLAGS=""
-     GTK_LIBS=""
-     :
-  fi
-  
-  
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+ cat >> confdefs.h <<\EOF
+#define HAVE_INET_ATON 1
+EOF
 
-  if test "$WXGTK12" != 1; then
-    # Check whether --with-gtk-prefix or --without-gtk-prefix was given.
-if test "${with_gtk_prefix+set}" = set; then
-  withval="$with_gtk_prefix"
-  gtk_config_prefix="$withval"
 else
-  gtk_config_prefix=""
-fi
-
-# Check whether --with-gtk-exec-prefix or --without-gtk-exec-prefix was given.
-if test "${with_gtk_exec_prefix+set}" = set; then
-  withval="$with_gtk_exec_prefix"
-  gtk_config_exec_prefix="$withval"
+  echo "$ac_t""no" 1>&6
+            echo $ac_n "checking for inet_aton in -l$INET_LINK""... $ac_c" 1>&6
+echo "configure:14097: checking for inet_aton in -l$INET_LINK" >&5
+ac_lib_var=`echo $INET_LINK'_'inet_aton | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
 else
-  gtk_config_exec_prefix=""
-fi
-
-
-  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
-        GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config
-     fi
-  fi
-  if test x$gtk_config_prefix != x ; then
-     gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix"
-     if test x${GTK_CONFIG+set} != xset ; then
-        GTK_CONFIG=$gtk_config_prefix/bin/gtk-config
-     fi
-  fi
+  ac_save_LIBS="$LIBS"
+LIBS="-l$INET_LINK  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 14105 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char inet_aton();
 
-  # 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:5121: 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
+int main() {
+inet_aton()
+; return 0; }
+EOF
+if { (eval echo configure:14116: \"$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
-  case "$GTK_CONFIG" in
-  /*)
-  ac_cv_path_GTK_CONFIG="$GTK_CONFIG" # Let the user override the test with a path.
-  ;;
-  ?:/*)                         
-  ac_cv_path_GTK_CONFIG="$GTK_CONFIG" # Let the user override the test with a dos path.
-  ;;
-  *)
-  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do 
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_path_GTK_CONFIG="$ac_dir/$ac_word"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_path_GTK_CONFIG" && ac_cv_path_GTK_CONFIG="no"
-  ;;
-esac
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
 fi
-GTK_CONFIG="$ac_cv_path_GTK_CONFIG"
-if test -n "$GTK_CONFIG"; then
-  echo "$ac_t""$GTK_CONFIG" 1>&6
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  cat >> confdefs.h <<\EOF
+#define HAVE_INET_ATON 1
+EOF
+
 else
   echo "$ac_t""no" 1>&6
 fi
 
-  min_gtk_version=1.0.0
-  echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6
-echo "configure:5156: checking for GTK - version >= $min_gtk_version" >&5
-  no_gtk=""
-  if test "$GTK_CONFIG" != "no" ; then
-    GTK_CFLAGS=`$GTK_CONFIG --cflags`
-    GTK_LIBS=`$GTK_CONFIG --libs`
-    ac_save_CFLAGS="$CFLAGS"
-    ac_save_LIBS="$LIBS"
-    CFLAGS="$CFLAGS $GTK_CFLAGS"
-    LIBS="$LIBS $GTK_LIBS"
-    if test "$cross_compiling" = yes; then
-  echo $ac_n "cross compiling; assumed OK... $ac_c"
-else
-  cat > conftest.$ac_ext <<EOF
-#line 5169 "configure"
-#include "confdefs.h"
+        
+fi
+done
 
-#include <gtk/gtk.h>
-#include <stdio.h>
 
-int
-main ()
-{
-  int major, minor, micro;
+if test "x$INET_LINK" != "x"; then
+    cat >> confdefs.h <<\EOF
+#define HAVE_INET_ADDR 1
+EOF
 
-  if (sscanf("$min_gtk_version", "%d.%d.%d", &major, &minor, &micro) != 3) {
-     printf("%s, bad version string\n", "$min_gtk_version");
-     exit(1);
-   }
+    INET_LINK="-l$INET_LINK"
+fi
 
-   if (gtk_minor_version == 1) return FALSE;
+fi
 
-   return !((gtk_major_version > major) ||
-           ((gtk_major_version == major) && (gtk_minor_version > minor)) ||
-           ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)));
-}
 
+cat > confcache <<\EOF
+# This file is a shell script that caches the results of configure
+# tests run on this system so they can be shared between configure
+# scripts and configure runs.  It is not useful on other systems.
+# If it contains results you don't want to keep, you may remove or edit it.
+#
+# By default, configure uses ./config.cache as the cache file,
+# creating it if it does not exist already.  You can give configure
+# the --cache-file=FILE option to use a different cache file; that is
+# what configure does when it calls configure scripts in
+# subdirectories, so they share the cache.
+# Giving --cache-file=/dev/null disables caching, for debugging configure.
+# config.status only pays attention to the cache file if you give it the
+# --recheck option to rerun configure.
+#
 EOF
-if { (eval echo configure:5193: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
+# The following way of writing the cache mishandles newlines in values,
+# but we know of no workaround that is simple, portable, and efficient.
+# So, don't put newlines in cache variables' values.
+# Ultrix sh set writes to stderr and can't be redirected directly,
+# and sets the high bit in the cache file unless we assign to the vars.
+(set) 2>&1 |
+  case `(ac_space=' '; set | grep ac_space) 2>&1` in
+  *ac_space=\ *)
+    # `set' does not quote correctly, so add quotes (double-quote substitution
+    # turns \\\\ into \\, and sed turns \\ into \).
+    sed -n \
+      -e "s/'/'\\\\''/g" \
+      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
+    ;;
+  *)
+    # `set' quotes correctly as required by POSIX, so do not add quotes.
+    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
+    ;;
+  esac >> confcache
+if cmp -s $cache_file confcache; then
   :
 else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  no_gtk=yes
-fi
-rm -fr conftest*
-fi
-
-     CFLAGS="$ac_save_CFLAGS"
-     LIBS="$ac_save_LIBS"
-  else
-     no_gtk=yes
-  fi
-  if test "x$no_gtk" = x ; then
-     echo "$ac_t""yes" 1>&6
-     :
+  if test -w $cache_file; then
+    echo "updating cache $cache_file"
+    cat confcache > $cache_file
   else
-     echo "$ac_t""no" 1>&6
-     GTK_CFLAGS=""
-     GTK_LIBS=""
-     { echo "configure: error: Is gtk-config in path and GTK+ is version 1.2.X or 1.0.X?" 1>&2; exit 1; }
+    echo "not updating unwritable cache $cache_file"
   fi
-  
-  
+fi
+rm -f confcache
 
-  fi
 
-  TOOLKIT_INCLUDE="$GTK_CFLAGS"
-  GUI_TK_LIBRARY="$GTK_LIBS"
 
-  TOOLKIT=GTK
-  LTLIBOBJS="$LTLIBOBJS image.lo utilsgtk.lo win_gtk.lo"
-fi
+if test "$TOOLKIT" != "MSW"; then
 
-if test "$wxUSE_MOTIF" = 1; then
-    echo $ac_n "checking for Motif/Lesstif includes""... $ac_c" 1>&6
-echo "configure:5233: checking for Motif/Lesstif includes" >&5
-    
-ac_find_includes=
-for ac_dir in $SEARCH_INCLUDE;
-  do
-    if test -f "$ac_dir/Xm/Xm.h"; then
-      ac_find_includes=$ac_dir
-      break
+
+THREADS_LINK=""
+THREADS_OBJ=""
+
+if test "$wxUSE_THREADS" = "yes" ; then
+    if test "$wxUSE_WINE" = 1 ; then
+        echo "configure: warning: Threads are not supported under WINE" 1>&2
+        wxUSE_THREADS="no"
+    elif test "$USE_BEOS" = 1; then
+        echo "configure: warning: BeOS threads are not yet supported" 1>&2
+        wxUSE_THREADS="no"
     fi
-  done
+fi
 
-    if test "$ac_find_includes" != "" ; then
-        echo "$ac_t""found $ac_find_includes" 1>&6
+if test "$wxUSE_THREADS" = "yes" ; then
+    
+        if test "$USE_AIX" = 1; then
+        THREADS_LIB=pthreads
     else
-        echo "$ac_t""no" 1>&6
-        { echo "configure: error: please set CFLAGS to contain the location of Xm/Xm.h" 1>&2; exit 1; }
+        THREADS_LIB=pthread
     fi
 
-    echo $ac_n "checking for Motif/Lesstif library""... $ac_c" 1>&6
-echo "configure:5252: checking for Motif/Lesstif library" >&5
-    
-ac_find_libraries=
-for ac_dir in $SEARCH_LIB;
-  do
-    for ac_extension in a so sl; do
-      if test -f "$ac_dir/libXm.$ac_extension"; then
-        ac_find_libraries=$ac_dir
-        break 2
-      fi
-    done
-  done
+                echo $ac_n "checking for pthread_create in -l$THREADS_LIB""... $ac_c" 1>&6
+echo "configure:14229: checking for pthread_create in -l$THREADS_LIB" >&5
+ac_lib_var=`echo $THREADS_LIB'_'pthread_create | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-l$THREADS_LIB  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 14237 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char pthread_create();
 
-    if test "$ac_find_libraries" != "" ; then
-        
-  ac_path_to_include=$ac_find_includes
-  echo "$CHECK_INCLUDE" | grep "\-I$ac_find_includes" > /dev/null
-  result=$?
-  if test $result = 0; then
-    ac_path_to_include=""
-  else
-    ac_path_to_include="-I$ac_find_includes"
-  fi
+int main() {
+pthread_create()
+; return 0; }
+EOF
+if { (eval echo configure:14248: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
 
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  
+            THREADS_OBJ="threadpsx.lo"
+            THREADS_LINK=$THREADS_LIB
         
-  echo "$CHECK_LIB" | grep "\-L$ac_find_libraries" > /dev/null
-  result=$?
-  if test $result = 0; then
-    ac_path_to_link=""
-  else
-    ac_path_to_link="-L$ac_find_libraries"
-  fi
+else
+  echo "$ac_t""no" 1>&6
+
+                        echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6
+echo "configure:14271: checking for pthread_create in -lc_r" >&5
+ac_lib_var=`echo c_r'_'pthread_create | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-lc_r  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 14279 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char pthread_create();
 
+int main() {
+pthread_create()
+; return 0; }
+EOF
+if { (eval echo configure:14290: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
 
-        CHECK_LINK="$CHECK_LIB $ac_path_to_link"
-        CHECK_INCLUDE="$CHECK_INCLUDE $ac_path_to_include"
-        echo "$ac_t""found at $ac_find_libraries" 1>&6
-    else
-        echo "$ac_t""no" 1>&6
-        { echo "configure: error: please set LDFLAGS to contain the location of libXm" 1>&2; exit 1; }
-    fi
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  
+                THREADS_OBJ="threadpsx.lo"
+                THREADS_LINK="c_r"
+            
+else
+  echo "$ac_t""no" 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:14314: checking for sys/prctl.h" >&5
+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 14319 "configure"
+#include "confdefs.h"
+#include <sys/prctl.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:14324: \"$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
+  
+                    THREADS_OBJ="threadsgi.lo"
+                
+else
+  echo "$ac_t""no" 1>&6
+fi
 
-    echo $ac_n "checking for Xt library""... $ac_c" 1>&6
-echo "configure:5295: checking for Xt library" >&5
-    
-ac_find_libraries=
-for ac_dir in $SEARCH_LIB;
-  do
-    for ac_extension in a so sl; do
-      if test -f "$ac_dir/libXt.$ac_extension"; then
-        ac_find_libraries=$ac_dir
-        break 2
-      fi
-    done
-  done
+            
+fi
 
-    if test "$ac_find_libraries" != "" ; then
         
-  echo "$CHECK_LIB" | grep "\-L$ac_find_libraries" > /dev/null
-  result=$?
-  if test $result = 0; then
-    ac_path_to_link=""
-  else
-    ac_path_to_link="-L$ac_find_libraries"
-  fi
+fi
 
-        CHECK_LINK="$CHECK_LIB $ac_path_to_link"
-        echo "$ac_t""found at $ac_find_libraries" 1>&6
-    else
-        echo "$ac_t""no" 1>&6
-        { echo "configure: error: please set LDFLAGS to contain the location of libXt" 1>&2; exit 1; }
-    fi
 
-    XPM_LINK=""
-    echo $ac_n "checking for Xpm library""... $ac_c" 1>&6
-echo "configure:5327: checking for Xpm library" >&5
-    
-ac_find_libraries=
-for ac_dir in $SEARCH_LIB;
-  do
-    for ac_extension in a so sl; do
-      if test -f "$ac_dir/libXpm.$ac_extension"; then
-        ac_find_libraries=$ac_dir
-        break 2
-      fi
-    done
-  done
+    if test -z "$THREADS_OBJ" ; then
+        wxUSE_THREADS=no
+        echo "configure: warning: No thread support on this system" 1>&2
+    fi
+fi
 
-    if test "$ac_find_libraries" != "" ; then
-        
-  echo "$CHECK_LIB" | grep "\-L$ac_find_libraries" > /dev/null
-  result=$?
-  if test $result = 0; then
-    ac_path_to_link=""
-  else
-    ac_path_to_link="-L$ac_find_libraries"
-  fi
+if test "$wxUSE_THREADS" = "yes" ; then
+  for ac_func in thr_setconcurrency
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:14364: 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 14369 "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();
 
-        CHECK_LINK="$CHECK_LIB $ac_path_to_link"
-        XPM_LINK="-lXpm "
-        cat >> confdefs.h <<\EOF
-#define wxHAVE_LIB_XPM 1
-EOF
+int main() {
 
-        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
+/* 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
 
-    GUI_TK_LINK="-lXm $(XPM_LINK)-lXmu -lXt -lX11 -lm"
-    GUI_TK_LIBRARY="$CHECK_LIB $GUI_TK_LINK"
-    TOOLKIT=MOTIF
+; return 0; }
+EOF
+if { (eval echo configure:14392: \"$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
 
-TOOLKIT_DIR=`echo ${TOOLKIT} | tr "A-Z" "a-z"`
-
-TOOLKIT_DEF=-D__WX${TOOLKIT}__
-
-WX_LIBRARY=${TOOLKIT_DIR}2
+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
 
 
-for ac_hdr in strings.h
+                            
+  for ac_hdr in sched.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5378: checking for $ac_hdr" >&5
+echo "configure:14422: 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 5383 "configure"
+#line 14427 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5388: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14432: \"$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*
@@ -5410,745 +14454,992 @@ else
 fi
 done
 
-for ac_hdr in unistd.h
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5418: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+
+  echo $ac_n "checking for sched_yield in -l$THREADS_LINK""... $ac_c" 1>&6
+echo "configure:14460: checking for sched_yield in -l$THREADS_LINK" >&5
+ac_lib_var=`echo $THREADS_LINK'_'sched_yield | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  cat > conftest.$ac_ext <<EOF
-#line 5423 "configure"
+  ac_save_LIBS="$LIBS"
+LIBS="-l$THREADS_LINK  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 14468 "configure"
 #include "confdefs.h"
-#include <$ac_hdr>
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char sched_yield();
+
+int main() {
+sched_yield()
+; return 0; }
+EOF
+if { (eval echo configure:14479: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  cat >> confdefs.h <<\EOF
+#define HAVE_SCHED_YIELD 1
+EOF
+
+else
+  echo "$ac_t""no" 1>&6
+echo $ac_n "checking for sched_yield in -lposix4""... $ac_c" 1>&6
+echo "configure:14501: checking for sched_yield in -lposix4" >&5
+ac_lib_var=`echo posix4'_'sched_yield | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-lposix4  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 14509 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char sched_yield();
+
+int main() {
+sched_yield()
+; return 0; }
+EOF
+if { (eval echo configure:14520: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  cat >> confdefs.h <<\EOF
+#define HAVE_SCHED_YIELD 1
+EOF
+ POSIX4_LINK="-lposix4"
+else
+  echo "$ac_t""no" 1>&6
+echo "configure: warning: wxThread::Yield will not work properly" 1>&2
+                
+fi
+
+               
+fi
+
+
+              HAVE_PRIOR_FUNCS=0
+  echo $ac_n "checking for pthread_attr_getschedpolicy in -l$THREADS_LINK""... $ac_c" 1>&6
+echo "configure:14551: checking for pthread_attr_getschedpolicy in -l$THREADS_LINK" >&5
+ac_lib_var=`echo $THREADS_LINK'_'pthread_attr_getschedpolicy | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-l$THREADS_LINK  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 14559 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char pthread_attr_getschedpolicy();
+
+int main() {
+pthread_attr_getschedpolicy()
+; return 0; }
+EOF
+if { (eval echo configure:14570: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  echo $ac_n "checking for pthread_attr_setschedparam in -l$THREADS_LINK""... $ac_c" 1>&6
+echo "configure:14586: checking for pthread_attr_setschedparam in -l$THREADS_LINK" >&5
+ac_lib_var=`echo $THREADS_LINK'_'pthread_attr_setschedparam | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-l$THREADS_LINK  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 14594 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char pthread_attr_setschedparam();
+
+int main() {
+pthread_attr_setschedparam()
+; return 0; }
+EOF
+if { (eval echo configure:14605: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  echo $ac_n "checking for sched_get_priority_max in -l$THREADS_LINK""... $ac_c" 1>&6
+echo "configure:14621: checking for sched_get_priority_max in -l$THREADS_LINK" >&5
+ac_lib_var=`echo $THREADS_LINK'_'sched_get_priority_max | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-l$THREADS_LINK  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 14629 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char sched_get_priority_max();
+
+int main() {
+sched_get_priority_max()
+; return 0; }
 EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5428: \"$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:14640: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
+  eval "ac_cv_lib_$ac_lib_var=yes"
 else
-  echo "$ac_err" >&5
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
+  eval "ac_cv_lib_$ac_lib_var=no"
 fi
 rm -f conftest*
+LIBS="$ac_save_LIBS"
+
 fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
-EOF
+  HAVE_PRIOR_FUNCS=1
 else
   echo "$ac_t""no" 1>&6
-fi
-done
-
-for ac_hdr in wchar.h
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5458: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+echo $ac_n "checking for sched_get_priority_max in -lposix4""... $ac_c" 1>&6
+echo "configure:14659: 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
-  cat > conftest.$ac_ext <<EOF
-#line 5463 "configure"
+  ac_save_LIBS="$LIBS"
+LIBS="-lposix4  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 14667 "configure"
 #include "confdefs.h"
-#include <$ac_hdr>
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char sched_get_priority_max();
+
+int main() {
+sched_get_priority_max()
+; return 0; }
 EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5468: \"$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:14678: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
+  eval "ac_cv_lib_$ac_lib_var=yes"
 else
-  echo "$ac_err" >&5
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
+  eval "ac_cv_lib_$ac_lib_var=no"
 fi
 rm -f conftest*
+LIBS="$ac_save_LIBS"
+
 fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
-EOF
+  
+                            HAVE_PRIOR_FUNCS=1
+                            POSIX4_LINK="-lposix4"
+                         
 else
   echo "$ac_t""no" 1>&6
 fi
-done
 
-for ac_hdr in wcstr.h
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5498: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+                   
+fi
+
+                 
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+               
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+
+  if test "$HAVE_PRIOR_FUNCS" = 1; then
+    cat >> confdefs.h <<\EOF
+#define HAVE_THREAD_PRIORITY_FUNCTIONS 1
+EOF
+
+  else
+    echo "configure: warning: Setting thread priority will not work" 1>&2
+  fi
+
+  echo $ac_n "checking for pthread_cancel in -l$THREADS_LINK""... $ac_c" 1>&6
+echo "configure:14725: checking for pthread_cancel in -l$THREADS_LINK" >&5
+ac_lib_var=`echo $THREADS_LINK'_'pthread_cancel | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  cat > conftest.$ac_ext <<EOF
-#line 5503 "configure"
+  ac_save_LIBS="$LIBS"
+LIBS="-l$THREADS_LINK  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 14733 "configure"
 #include "confdefs.h"
-#include <$ac_hdr>
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char pthread_cancel();
+
+int main() {
+pthread_cancel()
+; return 0; }
 EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5508: \"$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:14744: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
+  eval "ac_cv_lib_$ac_lib_var=yes"
 else
-  echo "$ac_err" >&5
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
+  eval "ac_cv_lib_$ac_lib_var=no"
 fi
 rm -f conftest*
+LIBS="$ac_save_LIBS"
+
 fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
+  cat >> confdefs.h <<\EOF
+#define HAVE_PTHREAD_CANCEL 1
 EOF
+
 else
   echo "$ac_t""no" 1>&6
+echo "configure: warning: wxThread::Kill() will not work properly" 1>&2
 fi
-done
 
-for ac_hdr in fnmatch.h
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5538: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+
+  echo $ac_n "checking for pthread_cleanup_push/pop""... $ac_c" 1>&6
+echo "configure:14770: 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
-#line 5543 "configure"
+  
+    cat > conftest.$ac_ext <<EOF
+#line 14776 "configure"
 #include "confdefs.h"
-#include <$ac_hdr>
+#include <pthread.h>
+int main() {
+
+                    pthread_cleanup_push(NULL, NULL);
+                    pthread_cleanup_pop(0);
+                 
+; return 0; }
 EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5548: \"$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:14786: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
+  
+                    wx_cv_func_pthread_cleanup_push=yes
+                 
 else
-  echo "$ac_err" >&5
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
+  
+                    wx_cv_func_pthread_cleanup_push=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
+
+echo "$ac_t""$wx_cv_func_pthread_cleanup_push" 1>&6
+
+  if test "$wx_cv_func_pthread_cleanup_push" = "yes"; then
+      cat >> confdefs.h <<\EOF
+#define HAVE_THREAD_CLEANUP_FUNCTIONS 1
 EOF
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
 
+  fi
 
+                
+          if test "x$wx_lib_glibc21" = "xyes"; then
+      CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
+  fi
 
-echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:5577: checking for ANSI C header files" >&5
-if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
+  echo $ac_n "checking for pthread_mutexattr_t""... $ac_c" 1>&6
+echo "configure:14818: checking for pthread_mutexattr_t" >&5
+if eval "test \"`echo '$''{'wx_cv_type_pthread_mutexattr_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  cat > conftest.$ac_ext <<EOF
-#line 5582 "configure"
+  
+    cat > conftest.$ac_ext <<EOF
+#line 14824 "configure"
 #include "confdefs.h"
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
+#include <pthread.h>
+int main() {
+
+           pthread_mutexattr_t attr;
+           pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
+        
+; return 0; }
 EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5590: \"$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:14834: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  ac_cv_header_stdc=yes
+  
+           wx_cv_type_pthread_mutexattr_t=yes
+        
 else
-  echo "$ac_err" >&5
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  ac_cv_header_stdc=no
+  
+           wx_cv_type_pthread_mutexattr_t=no
+        
+    
 fi
 rm -f conftest*
-
-if test $ac_cv_header_stdc = yes; then
-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-cat > conftest.$ac_ext <<EOF
-#line 5607 "configure"
-#include "confdefs.h"
-#include <string.h>
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "memchr" >/dev/null 2>&1; then
-  :
-else
-  rm -rf conftest*
-  ac_cv_header_stdc=no
+  
 fi
-rm -f conftest*
 
-fi
+echo "$ac_t""$wx_cv_type_pthread_mutexattr_t" 1>&6
 
-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 5625 "configure"
-#include "confdefs.h"
-#include <stdlib.h>
+  if test "$wx_cv_type_pthread_mutexattr_t" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define HAVE_PTHREAD_MUTEXATTR_T 1
 EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "free" >/dev/null 2>&1; then
-  :
-else
-  rm -rf conftest*
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
 
-if test $ac_cv_header_stdc = yes; then
-  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-if test "$cross_compiling" = yes; then
-  :
+  else
+        echo $ac_n "checking for PTHREAD_RECURSIVE_MUTEX_INITIALIZER""... $ac_c" 1>&6
+echo "configure:14861: 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
-#line 5646 "configure"
+  
+        cat > conftest.$ac_ext <<EOF
+#line 14867 "configure"
 #include "confdefs.h"
-#include <ctype.h>
-#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-#define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int main () { int i; for (i = 0; i < 256; i++)
-if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
-exit (0); }
+#include <pthread.h>
+int main() {
 
+                pthread_mutex_t attr = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
+            
+; return 0; }
 EOF
-if { (eval echo configure:5657: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
-  :
+if { (eval echo configure:14876: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  
+                wx_cv_type_pthread_rec_mutex_init=yes
+            
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  ac_cv_header_stdc=no
+  rm -rf conftest*
+  
+                wx_cv_type_pthread_rec_mutex_init=no
+            
+        
 fi
-rm -fr conftest*
+rm -f conftest*
+    
 fi
 
+echo "$ac_t""$wx_cv_type_pthread_rec_mutex_init" 1>&6
+    if test "$wx_cv_type_pthread_rec_mutex_init" = "yes"; then
+      cat >> confdefs.h <<\EOF
+#define HAVE_PTHREAD_RECURSIVE_MUTEX_INITIALIZER 1
+EOF
+
+    else
+            echo "configure: warning: wxMutex won't be recursive on this platform" 1>&2
+    fi
+  fi
+
+  THREADS_LINK="-l$THREADS_LINK"
+
+      if test "$USE_SOLARIS" = "yes" -a "$GCC" != "yes"; then
+      CPPFLAGS="${CFLAGS} -mt"
+      CXXFLAGS="${CXXFLAGS} -mt"
+      LDFLAGS="${LDFLAGS} -mt"
+  fi
 fi
+
 fi
 
-echo "$ac_t""$ac_cv_header_stdc" 1>&6
-if test $ac_cv_header_stdc = yes; then
+if test "$wxUSE_THREADS" = "yes"; then
   cat >> confdefs.h <<\EOF
-#define STDC_HEADERS 1
+#define wxUSE_THREADS 1
 EOF
 
-fi
 
-echo $ac_n "checking for mode_t""... $ac_c" 1>&6
-echo "configure:5681: checking for mode_t" >&5
-if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 5686 "configure"
-#include "confdefs.h"
-#include <sys/types.h>
-#if STDC_HEADERS
-#include <stdlib.h>
-#include <stddef.h>
-#endif
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "(^|[^a-zA-Z_0-9])mode_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
-  rm -rf conftest*
-  ac_cv_type_mode_t=yes
+    if test "$USE_DARWIN" != 1; then
+    CPPFLAGS="${CPPFLAGS} -D_REENTRANT"
+  fi
+
+  SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS thread"
 else
-  rm -rf conftest*
-  ac_cv_type_mode_t=no
+      if test "$ac_cv_func_strtok_r" = "yes"; then
+    echo $ac_n "checking if -D_REENTRANT is needed""... $ac_c" 1>&6
+echo "configure:14930: checking if -D_REENTRANT is needed" >&5
+    if test "$NEEDS_D_REENTRANT_FOR_R_FUNCS" = 1; then
+        CPPFLAGS="${CPPFLAGS} -D_REENTRANT"
+        echo "$ac_t""yes" 1>&6
+    else
+        echo "$ac_t""no" 1>&6
+    fi
+  fi
 fi
-rm -f conftest*
 
-fi
-echo "$ac_t""$ac_cv_type_mode_t" 1>&6
-if test $ac_cv_type_mode_t = no; then
-  cat >> confdefs.h <<\EOF
-#define mode_t int
+if test "$WXGTK20" = 1 ; then
+  cat >> confdefs.h <<EOF
+#define __WXGTK20__ $WXGTK20
 EOF
 
+  WXGTK12=1
 fi
 
-echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:5714: checking for off_t" >&5
-if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 5719 "configure"
-#include "confdefs.h"
-#include <sys/types.h>
-#if STDC_HEADERS
-#include <stdlib.h>
-#include <stddef.h>
-#endif
+if test "$WXGTK12" = 1 ; then
+  cat >> confdefs.h <<EOF
+#define __WXGTK12__ $WXGTK12
 EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "(^|[^a-zA-Z_0-9])off_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
-  rm -rf conftest*
-  ac_cv_type_off_t=yes
-else
-  rm -rf conftest*
-  ac_cv_type_off_t=no
-fi
-rm -f conftest*
 
 fi
-echo "$ac_t""$ac_cv_type_off_t" 1>&6
-if test $ac_cv_type_off_t = no; then
-  cat >> confdefs.h <<\EOF
-#define off_t long
+
+if test "$WXGTK127" = 1 ; then
+  cat >> confdefs.h <<EOF
+#define __WXGTK127__ $WXGTK127
 EOF
 
 fi
 
-echo $ac_n "checking for pid_t""... $ac_c" 1>&6
-echo "configure:5747: checking for pid_t" >&5
-if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then
+if test "$WXWINE" = 1 ; then
+  TOOLKIT_DEF="${TOOLKIT_DEF} -D__WXWINE__"
+fi
+
+if test "$wxUSE_MAC" = 1 ; then
+  TOOLKIT_DEF="${TOOLKIT_DEF} -DTARGET_CARBON"
+  CPPFLAGS="${CPPFLAGS} -fpascal-strings"
+  CXXFLAGS="${CXXFLAGS} -cpp-precomp"
+  # 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:14973: 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
-  cat > conftest.$ac_ext <<EOF
-#line 5752 "configure"
-#include "confdefs.h"
-#include <sys/types.h>
-#if STDC_HEADERS
-#include <stdlib.h>
-#include <stddef.h>
-#endif
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "(^|[^a-zA-Z_0-9])pid_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
-  rm -rf conftest*
-  ac_cv_type_pid_t=yes
+  if test -n "$REZ"; then
+  ac_cv_prog_REZ="$REZ" # Let the user override the test.
 else
-  rm -rf conftest*
-  ac_cv_type_pid_t=no
+  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_REZ="Rez"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+  test -z "$ac_cv_prog_REZ" && ac_cv_prog_REZ="/Developer/Tools/Rez"
 fi
-rm -f conftest*
-
 fi
-echo "$ac_t""$ac_cv_type_pid_t" 1>&6
-if test $ac_cv_type_pid_t = no; then
-  cat >> confdefs.h <<\EOF
-#define pid_t int
-EOF
-
+REZ="$ac_cv_prog_REZ"
+if test -n "$REZ"; then
+  echo "$ac_t""$REZ" 1>&6
+else
+  echo "$ac_t""no" 1>&6
 fi
 
-echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:5780: checking for size_t" >&5
-if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
+  # Extract the first word of "Derez", so it can be a program name with args.
+set dummy Derez; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:15003: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_DEREZ'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  cat > conftest.$ac_ext <<EOF
-#line 5785 "configure"
-#include "confdefs.h"
-#include <sys/types.h>
-#if STDC_HEADERS
-#include <stdlib.h>
-#include <stddef.h>
-#endif
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "(^|[^a-zA-Z_0-9])size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
-  rm -rf conftest*
-  ac_cv_type_size_t=yes
+  if test -n "$DEREZ"; then
+  ac_cv_prog_DEREZ="$DEREZ" # Let the user override the test.
 else
-  rm -rf conftest*
-  ac_cv_type_size_t=no
+  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_DEREZ="Derez"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+  test -z "$ac_cv_prog_DEREZ" && ac_cv_prog_DEREZ="/Developer/Tools/Derez"
+fi
+fi
+DEREZ="$ac_cv_prog_DEREZ"
+if test -n "$DEREZ"; then
+  echo "$ac_t""$DEREZ" 1>&6
+else
+  echo "$ac_t""no" 1>&6
 fi
-rm -f conftest*
 
+  RESCOMP=${REZ}
+  REZFLAGS="-d __UNIX__ -useDF"
+  DEREZFLAGS="Carbon.r -useDF"
+  RESFLAGS="Carbon.r -t APPL"
+  LIBWXMACRES="\$(LIBWX_MACRES)"
+  LIBWXMACRESCOMP="\$(LIBWX_MACRESCOMP)"
 fi
-echo "$ac_t""$ac_cv_type_size_t" 1>&6
-if test $ac_cv_type_size_t = no; then
-  cat >> confdefs.h <<\EOF
-#define size_t unsigned
-EOF
 
+if test "$wxUSE_CYGWIN" = 1 ; then
+  TOOLKIT_DEF="${TOOLKIT_DEF} -D__WIN95__"
 fi
 
-echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:5813: 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
-#line 5818 "configure"
-#include "confdefs.h"
-#include <sys/types.h>
+WXDEBUG=
+
+if test "$wxUSE_DEBUG_INFO" = "yes" ; then
+    WXDEBUG="-g"
+    wxUSE_OPTIMISE=no
+fi
+
+if test "$wxUSE_DEBUG_GDB" = "yes" ; then
+    wxUSE_DEBUG_INFO=yes
+    WXDEBUG="-ggdb"
+fi
+
+if test "$wxUSE_DEBUG_FLAG" = "yes" ; then
+    cat >> confdefs.h <<\EOF
+#define WXDEBUG 1
 EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "uid_t" >/dev/null 2>&1; then
-  rm -rf conftest*
-  ac_cv_type_uid_t=yes
+
+    WXDEBUG_DEFINE="-D__WXDEBUG__"
 else
-  rm -rf conftest*
-  ac_cv_type_uid_t=no
+    if test "$wxUSE_GTK" = 1 ; then
+        WXDEBUG_DEFINE="-DGTK_NO_CHECK_CASTS"
+    fi
 fi
-rm -f conftest*
 
-fi
+if test "$wxUSE_MEM_TRACING" = "yes" ; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_MEMORY_TRACING 1
+EOF
 
-echo "$ac_t""$ac_cv_type_uid_t" 1>&6
-if test $ac_cv_type_uid_t = no; then
-  cat >> confdefs.h <<\EOF
-#define uid_t int
+    cat >> confdefs.h <<\EOF
+#define wxUSE_GLOBAL_MEMORY_OPERATORS 1
 EOF
 
-  cat >> confdefs.h <<\EOF
-#define gid_t int
+    cat >> confdefs.h <<\EOF
+#define wxUSE_DEBUG_NEW_ALWAYS 1
 EOF
 
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS memcheck"
 fi
 
+if test "$wxUSE_DMALLOC" = "yes" ; then
+    DMALLOC_LINK="-ldmalloc"
+fi
 
+PROFILE=
+if test "$wxUSE_PROFILE" = "yes" ; then
+    PROFILE="-pg"
+fi
 
+DEP_INFO_FLAGS=
+CODE_GEN_FLAGS=
+CODE_GEN_FLAGS_CXX=
+if test "$GCC" = yes ; then
+    if test "$wxUSE_NO_RTTI" = "yes" ; then
+        CODE_GEN_FLAGS_CXX="$CODE_GEN_FLAGS -fno-rtti"
+    fi
+    if test "$wxUSE_NO_EXCEPTIONS" = "yes" ; then
+        CODE_GEN_FLAGS_CXX="$CODE_GEN_FLAGS -fno-exceptions"
+    fi
+    if test "$wxUSE_PERMISSIVE" = "yes" ; then
+       CODE_GEN_FLAGS="$CODE_GEN_FLAGS -fpermissive"
+    fi
+    if test "$wxUSE_NO_DEPS" = "no" ; then
+        DEP_INFO_FLAGS="-MMD"
+    fi
+fi
 
-echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:5850: checking for working const" >&5
-if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 5855 "configure"
-#include "confdefs.h"
 
-int main() {
+CXXFLAGS=`echo "${CXXFLAGS}" | sed "s/\-O.//g" `
+CFLAGS=`echo "${CFLAGS}" | sed "s/\-O.//g" `
+if test "$wxUSE_OPTIMISE" = "no" ; then
+    OPTIMISE=
+else
+    if test "$GCC" = yes ; then
+        OPTIMISE="-O2"
+        case "${host}" in
+            i586-*-*|i686-*-* )
+            OPTIMISE="${OPTIMISE} "
+        ;;
+        esac
+    else
+        OPTIMISE="-O"
+    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
 
-/* Ultrix mips cc rejects this.  */
-typedef int charset[2]; const charset x;
-/* SunOS 4.1.1 cc rejects this.  */
-char const *const *ccp;
-char **p;
-/* NEC SVR4.0.2 mips cc rejects this.  */
-struct point {int x, y;};
-static struct point const zero = {0,0};
-/* AIX XL C 1.02.0.0 rejects this.
-   It does not let you subtract one const X* pointer from another in an arm
-   of an if-expression whose if-part is not a constant expression */
-const char *g = "string";
-ccp = &g + (g ? g-g : 0);
-/* HPUX 7.0 cc rejects these. */
-++ccp;
-p = (char**) ccp;
-ccp = (char const *const *) p;
-{ /* SCO 3.2v4 cc rejects this.  */
-  char *t;
-  char const *s = 0 ? (char *) 0 : (char const *) 0;
 
-  *t++ = 0;
-}
-{ /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
-  int x[] = {25, 17};
-  const int *foo = &x[0];
-  ++foo;
-}
-{ /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
-  typedef const int *iptr;
-  iptr p = 0;
-  ++p;
-}
-{ /* AIX XL C 1.02.0.0 rejects this saying
-     "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
-  struct s { int j; const int *ap[3]; };
-  struct s *b; b->j = 5;
-}
-{ /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
-  const int foo = 10;
-}
+ZLIB_INCLUDE=
+if test "$wxUSE_ZLIB" = "yes" -o "$wxUSE_ZLIB" = "sys" ; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_ZLIB 1
+EOF
 
-; return 0; }
+  if test "$wxUSE_ZLIB" = "yes" ; then
+    ZLIB_INCLUDE="-I\${top_srcdir}/src/zlib"
+  else
+    ZLIB_LINK=
+    ac_safe=`echo "zlib.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for zlib.h""... $ac_c" 1>&6
+echo "configure:15156: checking for zlib.h" >&5
+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 15161 "configure"
+#include "confdefs.h"
+#include <zlib.h>
 EOF
-if { (eval echo configure:5904: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:15166: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
   rm -rf conftest*
-  ac_cv_c_const=yes
+  eval "ac_cv_header_$ac_safe=yes"
 else
+  echo "$ac_err" >&5
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  ac_cv_c_const=no
+  eval "ac_cv_header_$ac_safe=no"
 fi
 rm -f conftest*
 fi
-
-echo "$ac_t""$ac_cv_c_const" 1>&6
-if test $ac_cv_c_const = no; then
-  cat >> confdefs.h <<\EOF
-#define const 
-EOF
-
-fi
-
-echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:5925: checking for inline" >&5
-if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
+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:15183: checking for deflate in -lz" >&5
+ac_lib_var=`echo z'_'deflate | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  ac_cv_c_inline=no
-for ac_kw in inline __inline__ __inline; do
-  cat > conftest.$ac_ext <<EOF
-#line 5932 "configure"
+  ac_save_LIBS="$LIBS"
+LIBS="-lz  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 15191 "configure"
 #include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char deflate();
 
 int main() {
-} $ac_kw foo() {
+deflate()
 ; return 0; }
 EOF
-if { (eval echo configure:5939: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:15202: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  ac_cv_c_inline=$ac_kw; break
+  eval "ac_cv_lib_$ac_lib_var=yes"
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
 fi
 rm -f conftest*
-done
+LIBS="$ac_save_LIBS"
 
 fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  ZLIB_LINK="-lz"
+else
+  echo "$ac_t""no" 1>&6
+fi
 
-echo "$ac_t""$ac_cv_c_inline" 1>&6
-case "$ac_cv_c_inline" in
-  inline | yes) ;;
-  no) cat >> confdefs.h <<\EOF
-#define inline 
-EOF
- ;;
-  *)  cat >> confdefs.h <<EOF
-#define inline $ac_cv_c_inline
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+    if test "x$ZLIB_LINK" = "x" ; then
+        { echo "configure: error: system zlib compression library not found! Use --with-zlib=yes to use built-in zlib" 1>&2; exit 1; }
+    fi
+  fi
+fi
+
+PNG_INCLUDE=
+if test "$wxUSE_LIBPNG" = "yes" -o "$wxUSE_LIBPNG" = "sys" ; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_LIBPNG 1
 EOF
- ;;
-esac
 
+      if test "$wxUSE_LIBPNG" = "sys" -a "$wxUSE_ZLIB" != "sys" ; then
+    echo "configure: warning: --with-libpng=sys doesn't work without --with-zlib=sys, will compile the built-in libpng instead" 1>&2
+    wxUSE_LIBPNG=yes
+  fi
 
-echo $ac_n "checking size of int *""... $ac_c" 1>&6
-echo "configure:5966: checking size of int *" >&5
-if eval "test \"`echo '$''{'ac_cv_sizeof_int_p'+set}'`\" = set"; then
+  if test "$wxUSE_LIBPNG" = "yes" ; then
+    PNG_INCLUDE="-I\${top_srcdir}/src/png"
+  else
+    PNG_LINK=
+    ac_safe=`echo "png.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for png.h""... $ac_c" 1>&6
+echo "configure:15249: 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
-  if test "$cross_compiling" = yes; then
-  ac_cv_sizeof_int_p=4
 else
   cat > conftest.$ac_ext <<EOF
-#line 5974 "configure"
+#line 15254 "configure"
 #include "confdefs.h"
-#include <stdio.h>
-main()
-{
-  FILE *f=fopen("conftestval", "w");
-  if (!f) exit(1);
-  fprintf(f, "%d\n", sizeof(int *));
-  exit(0);
-}
+#include <png.h>
 EOF
-if { (eval echo configure:5985: \"$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`
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:15259: \"$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 -fr conftest*
-  ac_cv_sizeof_int_p=0
-fi
-rm -fr conftest*
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"
 fi
-
+rm -f conftest*
 fi
-echo "$ac_t""$ac_cv_sizeof_int_p" 1>&6
-cat >> confdefs.h <<EOF
-#define SIZEOF_INT_P $ac_cv_sizeof_int_p
-EOF
-
-
-echo $ac_n "checking size of int""... $ac_c" 1>&6
-echo "configure:6005: checking size of int" >&5
-if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
+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:15276: checking for png_check_sig in -lpng" >&5
+ac_lib_var=`echo png'_'png_check_sig | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  if test "$cross_compiling" = yes; then
-  ac_cv_sizeof_int=4
-else
-  cat > conftest.$ac_ext <<EOF
-#line 6013 "configure"
+  ac_save_LIBS="$LIBS"
+LIBS="-lpng -lz -lm $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 15284 "configure"
 #include "confdefs.h"
-#include <stdio.h>
-main()
-{
-  FILE *f=fopen("conftestval", "w");
-  if (!f) exit(1);
-  fprintf(f, "%d\n", sizeof(int));
-  exit(0);
-}
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char png_check_sig();
+
+int main() {
+png_check_sig()
+; return 0; }
 EOF
-if { (eval echo configure:6024: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
-  ac_cv_sizeof_int=`cat conftestval`
+if { (eval echo configure:15295: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  ac_cv_sizeof_int=0
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
 fi
-rm -fr conftest*
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  PNG_LINK="-lpng"
+else
+  echo "$ac_t""no" 1>&6
 fi
 
+                   
+else
+  echo "$ac_t""no" 1>&6
 fi
-echo "$ac_t""$ac_cv_sizeof_int" 1>&6
-cat >> confdefs.h <<EOF
-#define SIZEOF_INT $ac_cv_sizeof_int
-EOF
 
+    if test "x$PNG_LINK" = "x" ; then
+        { echo "configure: error: system png library not found! Use --with-libpng=yes to use the built-in libpng" 1>&2; exit 1; }
+    fi
+  fi
 
-echo $ac_n "checking size of long""... $ac_c" 1>&6
-echo "configure:6044: checking size of long" >&5
-if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
+  SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS png"
+fi
+
+JPEG_INCLUDE=
+if test "$wxUSE_LIBJPEG" = "yes" -o "$wxUSE_LIBJPEG" = "sys" ; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_LIBJPEG 1
+EOF
+
+  if test "$wxUSE_LIBJPEG" = "yes" ; then
+    JPEG_INCLUDE="-I\${top_srcdir}/src/jpeg"
+  else
+    JPEG_LINK=
+                echo $ac_n "checking for jpeglib.h""... $ac_c" 1>&6
+echo "configure:15339: 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
-  if test "$cross_compiling" = yes; then
-  ac_cv_sizeof_long=4
 else
   cat > conftest.$ac_ext <<EOF
-#line 6052 "configure"
+#line 15344 "configure"
 #include "confdefs.h"
-#include <stdio.h>
-main()
-{
-  FILE *f=fopen("conftestval", "w");
-  if (!f) exit(1);
-  fprintf(f, "%d\n", sizeof(long));
-  exit(0);
-}
+
+                #undef HAVE_STDLIB_H
+                #include <stdio.h>
+                #include <jpeglib.h>
+            
+int main() {
+
+            
+; return 0; }
 EOF
-if { (eval echo configure:6063: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
-  ac_cv_sizeof_long=`cat conftestval`
+if { (eval echo configure:15356: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  ac_cv_header_jpeglib_h=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  ac_cv_sizeof_long=0
-fi
-rm -fr conftest*
+  rm -rf conftest*
+  ac_cv_header_jpeglib_h=no
+        
 fi
-
+rm -f conftest*
+    
 fi
-echo "$ac_t""$ac_cv_sizeof_long" 1>&6
-cat >> confdefs.h <<EOF
-#define SIZEOF_LONG $ac_cv_sizeof_long
-EOF
 
+    echo "$ac_t""$ac_cv_header_jpeglib_h" 1>&6
 
-echo $ac_n "checking size of long long""... $ac_c" 1>&6
-echo "configure:6083: checking size of long long" >&5
-if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then
+    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:15374: checking for jpeg_read_header in -ljpeg" >&5
+ac_lib_var=`echo jpeg'_'jpeg_read_header | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  if test "$cross_compiling" = yes; then
-  ac_cv_sizeof_long_long=0
-else
-  cat > conftest.$ac_ext <<EOF
-#line 6091 "configure"
+  ac_save_LIBS="$LIBS"
+LIBS="-ljpeg  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 15382 "configure"
 #include "confdefs.h"
-#include <stdio.h>
-main()
-{
-  FILE *f=fopen("conftestval", "w");
-  if (!f) exit(1);
-  fprintf(f, "%d\n", sizeof(long long));
-  exit(0);
-}
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char jpeg_read_header();
+
+int main() {
+jpeg_read_header()
+; return 0; }
 EOF
-if { (eval echo configure:6102: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
-  ac_cv_sizeof_long_long=`cat conftestval`
+if { (eval echo configure:15393: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
 else
   echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  ac_cv_sizeof_long_long=0
-fi
-rm -fr conftest*
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
 fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
 
 fi
-echo "$ac_t""$ac_cv_sizeof_long_long" 1>&6
-cat >> confdefs.h <<EOF
-#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long
-EOF
-
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  JPEG_LINK="-ljpeg"
+else
+  echo "$ac_t""no" 1>&6
+fi
 
+    fi
 
+    if test "x$JPEG_LINK" = "x" ; then
+        { echo "configure: error: system jpeg library not found! Use --with-libjpeg=yes to use the built-in one" 1>&2; exit 1; }
+    fi
+  fi
+fi
 
-  if test "$cross_compiling" = "yes"; then
-    cat >> confdefs.h <<\EOF
-#define wxUSE_IOSTREAMH 1
+TIFF_INCLUDE=
+if test "$wxUSE_LIBTIFF" = "yes" -o "$wxUSE_LIBTIFF" = "sys" ; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_LIBTIFF 1
 EOF
 
+  if test "$wxUSE_LIBTIFF" = "yes" ; then
+    TIFF_INCLUDE="-I\${top_srcdir}/src/tiff"
   else
-    
-    ac_ext=C
-# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cxx_cross
-
-
-    for ac_hdr in iostream
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6142: checking for $ac_hdr" >&5
+    TIFF_LINK=
+    ac_safe=`echo "tiffio.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for tiffio.h""... $ac_c" 1>&6
+echo "configure:15433: checking for tiffio.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6147 "configure"
+#line 15438 "configure"
 #include "confdefs.h"
-#include <$ac_hdr>
+#include <tiffio.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6152: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:15443: \"$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*
@@ -6164,212 +15455,217 @@ 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
+  echo $ac_n "checking for TIFFError in -ltiff""... $ac_c" 1>&6
+echo "configure:15460: checking for TIFFError in -ltiff" >&5
+ac_lib_var=`echo tiff'_'TIFFError | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-ltiff -lm $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 15468 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char TIFFError();
+
+int main() {
+TIFFError()
+; return 0; }
 EOF
+if { (eval echo configure:15479: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
 else
-  echo "$ac_t""no" 1>&6
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
 fi
-done
+rm -f conftest*
+LIBS="$ac_save_LIBS"
 
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  TIFF_LINK="-ltiff"
+else
+  echo "$ac_t""no" 1>&6
+fi
 
-    if test "x$HAVE_IOSTREAM" = x ; then
-      cat >> confdefs.h <<\EOF
-#define wxUSE_IOSTREAMH 1
-EOF
+else
+  echo "$ac_t""no" 1>&6
+fi
 
-    else
-      :
+    if test "x$TIFF_LINK" = "x" ; then
+        { echo "configure: error: system tiff library not found! Use --with-libtiff=yes to use the built-in one" 1>&2; exit 1; }
     fi
-
-    ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
   fi
+fi
 
+FREETYPE_INCLUDE=
+if test "$wxUSE_FREETYPE" = "yes" -o "$wxUSE_FREETYPE" = "sys" ; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_FREETYPE 1
+EOF
 
-
-  echo $ac_n "checking if C++ compiler supports bool""... $ac_c" 1>&6
-echo "configure:6200: checking if C++ compiler supports bool" >&5
-if eval "test \"`echo '$''{'wx_cv_cpp_bool'+set}'`\" = set"; then
+  if test "$wxUSE_FREETYPE" = "yes" ; then
+    FREETYPE_INCLUDE="-I\${top_srcdir}/src/freetype"
+  else
+    FREETYPE_LINK=
+    ac_safe=`echo "freetype.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for freetype.h""... $ac_c" 1>&6
+echo "configure:15521: 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
-  
-    
-    ac_ext=C
-# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cxx_cross
-
-
-    if test "$cross_compiling" = yes; then
-  wx_cv_cpp_bool=no
-    
 else
   cat > conftest.$ac_ext <<EOF
-#line 6219 "configure"
+#line 15526 "configure"
 #include "confdefs.h"
-#ifdef __cplusplus
-extern "C" void exit(int);
-#endif
-
-        int main()
-        {
-            bool b = true;
-
-            return 0;
-        }
-      
-EOF
-if { (eval echo configure:6233: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
-  
-        cat >> confdefs.h <<\EOF
-#define HAVE_BOOL 1
+#include <freetype.h>
 EOF
-
-        wx_cv_cpp_bool=yes
-      
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:15531: \"$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 -fr conftest*
-  wx_cv_cpp_bool=no
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"
 fi
-rm -fr conftest*
+rm -f conftest*
 fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  echo $ac_n "checking for FT_Render_Glyph in -lfreetype""... $ac_c" 1>&6
+echo "configure:15548: checking for FT_Render_Glyph in -lfreetype" >&5
+ac_lib_var=`echo freetype'_'FT_Render_Glyph | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-lfreetype -lm $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 15556 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char FT_Render_Glyph();
 
+int main() {
+FT_Render_Glyph()
+; return 0; }
+EOF
+if { (eval echo configure:15567: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
 
-    ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  FREETYPE_LINK="-lfreetype"
+else
+  echo "$ac_t""no" 1>&6
+fi
 
-  
+                   
+else
+  echo "$ac_t""no" 1>&6
 fi
 
-echo "$ac_t""$wx_cv_cpp_bool" 1>&6
+    if test "x$FREETYPE_LINK" = "x" ; then
+        { echo "configure: error: system freetype library not found! Use --with-freetype=yes to use the built-in freetype" 1>&2; exit 1; }
+    fi
+  fi
+fi
 
-  if test "$wx_cv_cpp_bool" = "yes"; then
+if test "$wxUSE_OPENGL" = "yes"; then
+  if test "$wxUSE_MAC" = 1; then
     cat >> confdefs.h <<\EOF
-#define HAVE_BOOL 1
+#define wxUSE_OPENGL 1
 EOF
 
-  fi
-
-
+    cat >> confdefs.h <<\EOF
+#define wxUSE_GLCANVAS 1
+EOF
 
-  echo $ac_n "checking if size_t and int are different types""... $ac_c" 1>&6
-echo "configure:6274: checking if size_t and int are different types" >&5
-if eval "test \"`echo '$''{'wx_cv_cpp_sizet_not_int'+set}'`\" = set"; then
+    OPENGL_LINK="-framework OpenGL -framework AGL"
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS opengl"
+  else
+    ac_safe=`echo "GL/gl.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for GL/gl.h""... $ac_c" 1>&6
+echo "configure:15613: 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
-  
-    
-    ac_ext=C
-# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cxx_cross
-
-
-    if test "$cross_compiling" = yes; then
-  wx_cv_cpp_sizet_not_int=no
-    
 else
   cat > conftest.$ac_ext <<EOF
-#line 6293 "configure"
+#line 15618 "configure"
 #include "confdefs.h"
-#ifdef __cplusplus
-extern "C" void exit(int);
-#endif
-
-        #include <stdlib.h>
-
-        class S
-        {
-        public:
-          S(char *s) { m_s = s; }
-
-          char operator[](size_t n) const { return m_s[n]; }
-          char operator[](int n) const { return m_s[n]; }
-
-        private:
-          char *m_s;
-        };
-
-        int main()
-        {
-            S s("dummy");
-            size_t n1 = 2;
-            int n2 = 3;
-
-            return s[n1] == s[n2];
-        }
-      
-EOF
-if { (eval echo configure:6323: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
-  cat >> confdefs.h <<\EOF
-#define wxUSE_SIZE_T_STRING_OPERATOR 1
+#include <GL/gl.h>
 EOF
- wx_cv_cpp_sizet_not_int=yes
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:15623: \"$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 -fr conftest*
-  wx_cv_cpp_sizet_not_int=no
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"
 fi
-rm -fr conftest*
+rm -f conftest*
 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
-
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
   
-fi
-
-echo "$ac_t""$wx_cv_cpp_sizet_not_int" 1>&6
-
+      cat >> confdefs.h <<\EOF
+#define wxUSE_OPENGL 1
+EOF
 
+      cat >> confdefs.h <<\EOF
+#define wxUSE_GLCANVAS 1
+EOF
 
-echo $ac_n "checking for wcslen in -lc""... $ac_c" 1>&6
-echo "configure:6354: checking for wcslen in -lc" >&5
-ac_lib_var=`echo c'_'wcslen | sed 'y%./+-%__p_%'`
+      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS opengl"
+      echo $ac_n "checking for glFlush in -lGL""... $ac_c" 1>&6
+echo "configure:15650: 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
 else
   ac_save_LIBS="$LIBS"
-LIBS="-lc  $LIBS"
+LIBS="-lGL  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6362 "configure"
+#line 15658 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
-char wcslen();
+char glFlush();
 
 int main() {
-wcslen()
+glFlush()
 ; return 0; }
 EOF
-if { (eval echo configure:6373: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15669: \"$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
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   
-            cat >> confdefs.h <<\EOF
-#define HAVE_WCSLEN 1
-EOF
-
-            WCHAR_LINK=""
-        
+        OPENGL_LINK="-lGL -lGLU"
+      
 else
   echo "$ac_t""no" 1>&6
-
-            echo $ac_n "checking for wcslen in -lw""... $ac_c" 1>&6
-echo "configure:6399: checking for wcslen in -lw" >&5
-ac_lib_var=`echo w'_'wcslen | sed 'y%./+-%__p_%'`
+
+          echo $ac_n "checking for glFlush in -lMesaGL""... $ac_c" 1>&6
+echo "configure:15691: 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
 else
   ac_save_LIBS="$LIBS"
-LIBS="-lw  $LIBS"
+LIBS="-lMesaGL  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6407 "configure"
+#line 15699 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
-char wcslen();
+char glFlush();
 
 int main() {
-wcslen()
+glFlush()
 ; return 0; }
 EOF
-if { (eval echo configure:6418: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15710: \"$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
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   
-                cat >> confdefs.h <<\EOF
-#define HAVE_WCSLEN 1
-EOF
+          OPENGL_LINK="-lMesaGL -lMesaGLU"
+        
+else
+  echo "$ac_t""no" 1>&6
+fi
 
-                WCHAR_LINK="-lw"
-            
+       
+fi
+
+      
 else
   echo "$ac_t""no" 1>&6
+wxUSE_OPENGL=0
 fi
 
-        
+  fi
 fi
 
 
-echo $ac_n "checking for vprintf""... $ac_c" 1>&6
-echo "configure:6449: checking for vprintf" >&5
-if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 6454 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char vprintf(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char vprintf();
+if test "$wxUSE_GUI" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_GUI 1
+EOF
 
-int main() {
 
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_vprintf) || defined (__stub___vprintf)
-choke me
-#else
-vprintf();
-#endif
+                      else
+  cat >> confdefs.h <<\EOF
+#define wxUSE_NOGUI 1
+EOF
 
-; return 0; }
+fi
+
+
+if test "$wxUSE_UNIX" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_UNIX 1
 EOF
-if { (eval echo configure:6477: \"$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
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_vprintf=no"
+
 fi
-rm -f conftest*
+
+
+if test "$wxUSE_APPLE_IEEE" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_APPLE_IEEE 1
+EOF
+
 fi
 
-if eval "test \"`echo '$ac_cv_func_'vprintf`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
+if test "$wxUSE_TIMER" = "yes"; then
   cat >> confdefs.h <<\EOF
-#define HAVE_VPRINTF 1
+#define wxUSE_TIMER 1
 EOF
 
-else
-  echo "$ac_t""no" 1>&6
 fi
 
-if test "$ac_cv_func_vprintf" != yes; then
-echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
-echo "configure:6501: checking for _doprnt" >&5
-if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 6506 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char _doprnt(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char _doprnt();
+if test "$wxUSE_WAVE" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_WAVE 1
+EOF
 
-int main() {
+fi
 
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub__doprnt) || defined (__stub____doprnt)
-choke me
-#else
-_doprnt();
-#endif
+if test "$wxUSE_CMDLINE_PARSER" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_CMDLINE_PARSER 1
+EOF
 
-; return 0; }
+fi
+
+if test "$wxUSE_STOPWATCH" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_STOPWATCH 1
 EOF
-if { (eval echo configure:6529: \"$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
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func__doprnt=no"
+
 fi
-rm -f conftest*
+
+if test "$wxUSE_DATETIME" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_DATETIME 1
+EOF
+
 fi
 
-if eval "test \"`echo '$ac_cv_func_'_doprnt`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
+if test "$wxUSE_TIMEDATE" = "yes"; then
   cat >> confdefs.h <<\EOF
-#define HAVE_DOPRNT 1
+#define wxUSE_TIMEDATE 1
 EOF
 
-else
-  echo "$ac_t""no" 1>&6
 fi
 
+if test "$wxUSE_FILE" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_FILE 1
+EOF
+
 fi
 
+if test "$wxUSE_FFILE" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_FFILE 1
+EOF
 
-for ac_func in vsnprintf
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:6557: 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 6562 "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();
+fi
 
-int main() {
+if test "$wxUSE_FILESYSTEM" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_FILESYSTEM 1
+EOF
 
-/* 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
+fi
 
-; return 0; }
+if test "$wxUSE_FS_INET" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_FS_INET 1
 EOF
-if { (eval echo configure:6585: \"$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
+
+if test "$wxUSE_FS_ZIP" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_FS_ZIP 1
+EOF
+
+fi
+
+if test "$wxUSE_ZIPSTREAM" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_ZIPSTREAM 1
+EOF
+
+fi
+
+if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_ON_FATAL_EXCEPTION 1
+EOF
+
+fi
+
+if test "$wxUSE_SNGLINST_CHECKER" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_SNGLINST_CHECKER 1
+EOF
+
+fi
+
+if test "$wxUSE_BUSYINFO" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_BUSYINFO 1
+EOF
+
+fi
+
+if test "$wxUSE_STD_IOSTREAM" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_STD_IOSTREAM 1
+EOF
+
+fi
+
+if test "$wxUSE_TEXTFILE" = "yes"; then
+  if test "$wxUSE_FILE" != "yes"; then
+    echo "configure: warning: wxTextFile requires wxFile and it won't be compiled without it" 1>&2
+  else
+    cat >> confdefs.h <<\EOF
+#define wxUSE_TEXTFILE 1
+EOF
+
+  fi
+fi
+
+if test "$wxUSE_CONFIG" = "yes" ; then
+  if test "$wxUSE_TEXTFILE" != "yes"; then
+    echo "configure: warning: wxConfig requires wxTextFile and it won't be compiled without it" 1>&2
+  else
+    cat >> confdefs.h <<\EOF
+#define wxUSE_CONFIG 1
+EOF
+
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS config"
+  fi
+fi
+
+if test "$wxUSE_INTL" = "yes" ; then
+  if test "$wxUSE_FILE" != "yes"; then
+    echo "configure: warning: I18n code requires wxFile and it won't be compiled without it" 1>&2
+  else
+    cat >> confdefs.h <<\EOF
+#define wxUSE_INTL 1
+EOF
+
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS internat"
+    GUIDIST="$GUIDIST INTL_DIST"
+  fi
+fi
+
+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
+
+    fi
+fi
+
+if test "$wxUSE_LONGLONG" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_LONGLONG 1
+EOF
+
 fi
-rm -f conftest*
+
+if test "$wxUSE_GEOMETRY" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_GEOMETRY 1
+EOF
+
 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
+if test "$wxUSE_DIALUP_MANAGER" = "yes" ; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_DIALUP_MANAGER 1
 EOF
- cat >> confdefs.h <<\EOF
-#define HAVE_VSNPRINTF 1
+
+  SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dialup"
+fi
+
+if test "$wxUSE_STREAMS" = "yes" ; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_STREAMS 1
 EOF
 
-else
-  echo "$ac_t""no" 1>&6
-echo "configure: warning: unsafe function sprintf will be used instead of snprintf" 1>&2
-              
 fi
-done
 
 
-for ac_func in vfork
+if test "$wxUSE_DATETIME" = "yes"; then
+        for ac_func in strptime
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:6618: checking for $ac_func" >&5
+echo "configure:15977: 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 6623 "configure"
+#line 15982 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -6642,7 +16001,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:6646: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16005: \"$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
 done
 
 
-POSIX4_LINK=
-for ac_func in nanosleep
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:6675: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+        echo $ac_n "checking for timezone variable in <time.h>""... $ac_c" 1>&6
+echo "configure:16031: checking for timezone variable in <time.h>" >&5
+if eval "test \"`echo '$''{'wx_cv_var_timezone'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  cat > conftest.$ac_ext <<EOF
-#line 6680 "configure"
+  
+                        cat > conftest.$ac_ext <<EOF
+#line 16037 "configure"
 #include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char $ac_func();
 
+                                #include <time.h>
+                            
 int main() {
 
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-$ac_func();
-#endif
-
+                                int tz;
+                                tz = timezone;
+                            
 ; return 0; }
 EOF
-if { (eval echo configure:6703: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16049: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
+  
+                                wx_cv_var_timezone=timezone
+                            
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  eval "ac_cv_func_$ac_func=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
- cat >> confdefs.h <<\EOF
-#define HAVE_NANOSLEEP 1
-EOF
-
-else
-  echo "$ac_t""no" 1>&6
-echo $ac_n "checking for nanosleep in -lposix4""... $ac_c" 1>&6
-echo "configure:6728: checking for nanosleep in -lposix4" >&5
-ac_lib_var=`echo posix4'_'nanosleep | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-lposix4  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 6736 "configure"
+  
+                                cat > conftest.$ac_ext <<EOF
+#line 16060 "configure"
 #include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char nanosleep();
 
+                                        #include <time.h>
+                                    
 int main() {
-nanosleep()
+
+                                        int tz;
+                                        tz = _timezone;
+                                    
 ; return 0; }
 EOF
-if { (eval echo configure:6747: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16072: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
+  
+                                        wx_cv_var_timezone=_timezone
+                                    
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
   
-      cat >> confdefs.h <<\EOF
-#define HAVE_NANOSLEEP 1
-EOF
-
-      POSIX4_LINK="-lposix4"
-    
-else
-  echo "$ac_t""no" 1>&6
-
-    for ac_func in usleep
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:6775: 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 6780 "configure"
+                                        cat > conftest.$ac_ext <<EOF
+#line 16083 "configure"
 #include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char $ac_func();
 
+                                                #include <time.h>
+                                            
 int main() {
 
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-$ac_func();
-#endif
-
+                                                int tz;
+                                                tz = __timezone;
+                                            
 ; return 0; }
 EOF
-if { (eval echo configure:6803: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16095: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
+  
+                                                wx_cv_var_timezone=__timezone
+                                            
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  eval "ac_cv_func_$ac_func=no"
+  { echo "configure: error: no timezone variable" 1>&2; exit 1; }
+                                        
 fi
 rm -f conftest*
+                                    
+                                
 fi
-
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
- cat >> confdefs.h <<\EOF
-#define HAVE_USLEEP 1
-EOF
-
-else
-  echo "$ac_t""no" 1>&6
-echo "configure: warning: wxSleep() function will not work" 1>&2
+rm -f conftest*
+                            
+                        
 fi
-done
-
+rm -f conftest*
+                   
     
 fi
 
+echo "$ac_t""$wx_cv_var_timezone" 1>&6
 
-fi
-done
+        cat >> confdefs.h <<EOF
+#define WX_TIMEZONE $wx_cv_var_timezone
+EOF
 
 
-for ac_func in uname gethostname
+        for ac_func in localtime
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:6842: checking for $ac_func" >&5
+echo "configure:16130: 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 6847 "configure"
+#line 16135 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -6866,7 +16154,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:6870: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16158: \"$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
@@ -6884,278 +16172,281 @@ if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
   cat >> confdefs.h <<EOF
 #define $ac_tr_func 1
 EOF
- break
 else
   echo "$ac_t""no" 1>&6
 fi
 done
 
 
-
-cat > confcache <<\EOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs.  It is not useful on other systems.
-# If it contains results you don't want to keep, you may remove or edit it.
-#
-# By default, configure uses ./config.cache as the cache file,
-# creating it if it does not exist already.  You can give configure
-# the --cache-file=FILE option to use a different cache file; that is
-# what configure does when it calls configure scripts in
-# subdirectories, so they share the cache.
-# Giving --cache-file=/dev/null disables caching, for debugging configure.
-# config.status only pays attention to the cache file if you give it the
-# --recheck option to rerun configure.
-#
-EOF
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(set) 2>&1 |
-  case `(ac_space=' '; set | grep ac_space) 2>&1` in
-  *ac_space=\ *)
-    # `set' does not quote correctly, so add quotes (double-quote substitution
-    # turns \\\\ into \\, and sed turns \\ into \).
-    sed -n \
-      -e "s/'/'\\\\''/g" \
-      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
-    ;;
-  *)
-    # `set' quotes correctly as required by POSIX, so do not add quotes.
-    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
-    ;;
-  esac >> confcache
-if cmp -s $cache_file confcache; then
-  :
-else
-  if test -w $cache_file; then
-    echo "updating cache $cache_file"
-    cat confcache > $cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-
-
-
-
-THREADS_LINK=""
-THREADS_OBJ=""
-
-if test "$wxUSE_THREADS" = "yes"; then
-    
-                echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
-echo "configure:6952: checking for pthread_create in -lpthread" >&5
-ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+    if test "$ac_cv_func_localtime" = "yes"; then
+        echo $ac_n "checking for tm_gmtoff in struct tm""... $ac_c" 1>&6
+echo "configure:16185: 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
-  ac_save_LIBS="$LIBS"
-LIBS="-lpthread  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 6960 "configure"
+  
+            cat > conftest.$ac_ext <<EOF
+#line 16191 "configure"
 #include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char pthread_create();
 
+                    #include <time.h>
+                
 int main() {
-pthread_create()
+
+                    struct tm tm;
+                    tm.tm_gmtoff++;
+                
 ; return 0; }
 EOF
-if { (eval echo configure:6971: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16203: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
+  
+                    wx_cv_struct_tm_has_gmtoff=yes
+                
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
+  wx_cv_struct_tm_has_gmtoff=no
+            
 fi
 rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  
-            THREADS_OBJ="threadpsx.lo"
-            THREADS_LINK="pthread"
         
-else
-  echo "$ac_t""no" 1>&6
+fi
 
-                        echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6
-echo "configure:6994: 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_t""$wx_cv_struct_tm_has_gmtoff" 1>&6
+    fi
+
+    if test "$wx_cv_struct_tm_has_gmtoff" = "yes"; then
+        cat >> confdefs.h <<\EOF
+#define WX_GMTOFF_IN_TM 1
+EOF
+
+    fi
+
+            for ac_func in gettimeofday ftime
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:16232: checking for $ac_func" >&5
+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  ac_save_LIBS="$LIBS"
-LIBS="-lc_r  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 7002 "configure"
+  cat > conftest.$ac_ext <<EOF
+#line 16237 "configure"
 #include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func(); below.  */
+#include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
-char pthread_create();
+char $ac_func();
 
 int main() {
-pthread_create()
+
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+$ac_func();
+#endif
+
 ; return 0; }
 EOF
-if { (eval echo configure:7013: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16260: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
+  eval "ac_cv_func_$ac_func=yes"
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
+  eval "ac_cv_func_$ac_func=no"
 fi
 rm -f conftest*
-LIBS="$ac_save_LIBS"
-
 fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-  
-                THREADS_OBJ="threadpsx.lo"
-                THREADS_LINK="c_r"
-            
+    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+ break
 else
   echo "$ac_t""no" 1>&6
+fi
+done
 
-                                ac_safe=`echo "sys/prctl.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for sys/prctl.h""... $ac_c" 1>&6
-echo "configure:7037: checking for sys/prctl.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+
+    if test "$ac_cv_func_gettimeofday" = "yes"; then
+        echo $ac_n "checking whether gettimeofday takes two arguments""... $ac_c" 1>&6
+echo "configure:16287: 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
+  
+                        
+            ac_ext=C
+# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cxx_cross
+
+
+            cat > conftest.$ac_ext <<EOF
+#line 16302 "configure"
+#include "confdefs.h"
+
+                    #include <sys/time.h>
+                    #include <unistd.h>
+                
+int main() {
+
+                    struct timeval tv;
+                    gettimeofday(&tv, NULL);
+                
+; return 0; }
+EOF
+if { (eval echo configure:16315: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  wx_cv_func_gettimeofday_has_2_args=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
   cat > conftest.$ac_ext <<EOF
-#line 7042 "configure"
+#line 16323 "configure"
 #include "confdefs.h"
-#include <sys/prctl.h>
+
+                        #include <sys/time.h>
+                        #include <unistd.h>
+                    
+int main() {
+
+                        struct timeval tv;
+                        gettimeofday(&tv);
+                    
+; return 0; }
 EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7047: \"$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:16336: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
+  wx_cv_func_gettimeofday_has_2_args=no
 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
   
-                    THREADS_OBJ="threadsgi.lo"
+                        echo "configure: warning: failed to determine number of gettimeofday() arguments" 1>&2
+                        wx_cv_func_gettimeofday_has_2_args=unknown
+                    
                 
-else
-  echo "$ac_t""no" 1>&6
 fi
-
+rm -f conftest*
             
 fi
+rm -f conftest*
+            ac_ext=c
+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cc_cross
 
         
 fi
 
-    if test "$THREADS_LINK" != ""; then
-        cat >> confdefs.h <<\EOF
-#define wxUSE_THREADS 1
+echo "$ac_t""$wx_cv_func_gettimeofday_has_2_args" 1>&6
+
+        if test "$wx_cv_func_gettimeofday_has_2_args" != "yes"; then
+            cat >> confdefs.h <<\EOF
+#define WX_GETTIMEOFDAY_NO_TZ 1
 EOF
 
-    else
-        echo "configure: warning: No thread support on this system" 1>&2
+        fi
     fi
-fi
 
-if test -z "$THREADS_OBJ"; then
-  wxUSE_THREADS=no
+    cat >> confdefs.h <<\EOF
+#define wxUSE_TIMEDATE 1
+EOF
+
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS typetest"
 fi
 
-if test "$wxUSE_THREADS" = "yes"; then
-    CFLAGS="${CFLAGS} -D_REENTRANT"
-  CXXFLAGS="${CXXFLAGS} -D_REENTRANT"
 
-  SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS thread"
-  LTLIBOBJS="$LTLIBOBJS $THREADS_OBJ"
+if test "$TOOLKIT" != "MSW"; then
 
-                            
-  for ac_hdr in sched.h
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:7102: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+if test "$wxUSE_SOCKETS" = "yes"; then
+        echo $ac_n "checking for socket""... $ac_c" 1>&6
+echo "configure:16385: checking for socket" >&5
+if eval "test \"`echo '$''{'ac_cv_func_socket'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 7107 "configure"
+#line 16390 "configure"
 #include "confdefs.h"
-#include <$ac_hdr>
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char socket(); 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 socket();
+
+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_socket) || defined (__stub___socket)
+choke me
+#else
+socket();
+#endif
+
+; return 0; }
 EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7112: \"$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:16413: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
+  eval "ac_cv_func_socket=yes"
 else
-  echo "$ac_err" >&5
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
+  eval "ac_cv_func_socket=no"
 fi
 rm -f conftest*
 fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+
+if eval "test \"`echo '$ac_cv_func_'socket`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
-EOF
+  :
 else
   echo "$ac_t""no" 1>&6
-fi
-done
-
-
-  echo $ac_n "checking for sched_yield in -l$THREADS_LINK""... $ac_c" 1>&6
-echo "configure:7140: checking for sched_yield in -l$THREADS_LINK" >&5
-ac_lib_var=`echo $THREADS_LINK'_'sched_yield | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
+echo "configure:16431: 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
 else
   ac_save_LIBS="$LIBS"
-LIBS="-l$THREADS_LINK  $LIBS"
+LIBS="-lsocket  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7148 "configure"
+#line 16439 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
-char sched_yield();
+char socket();
 
 int main() {
-sched_yield()
+socket()
 ; return 0; }
 EOF
-if { (eval echo configure:7159: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16450: \"$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
@@ -7170,172 +16461,298 @@ LIBS="$ac_save_LIBS"
 fi
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-  cat >> confdefs.h <<\EOF
-#define HAVE_SCHED_YIELD 1
-EOF
-
+  INET_LINK="$INET_LINK -lsocket"
 else
   echo "$ac_t""no" 1>&6
-echo $ac_n "checking for sched_yield in -l"posix4"""... $ac_c" 1>&6
-echo "configure:7181: checking for sched_yield in -l"posix4"" >&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 "configure: warning: socket library not found - sockets will be disabled" 1>&2
+                wxUSE_SOCKETS=no
+            
+        
+fi
+
+    
+fi
+
+fi
+
+
+if test "$wxUSE_SOCKETS" = "yes" ; then
+        echo $ac_n "checking what is the type of the third argument of getsockname""... $ac_c" 1>&6
+echo "configure:16483: checking what is the type of the third argument of getsockname" >&5
+if eval "test \"`echo '$''{'wx_cv_type_getsockname3'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  ac_save_LIBS="$LIBS"
-LIBS="-l"posix4"  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 7189 "configure"
+  
+            
+            ac_ext=C
+# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cxx_cross
+
+
+            cat > conftest.$ac_ext <<EOF
+#line 16498 "configure"
 #include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char sched_yield();
 
+                    #include <sys/types.h>
+                    #include <sys/socket.h>
+                
 int main() {
-sched_yield()
+
+                    socklen_t len;
+                    getsockname(0, 0, &len);
+                
 ; return 0; }
 EOF
-if { (eval echo configure:7200: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16511: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
+  wx_cv_type_getsockname3=socklen_t
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
+  cat > conftest.$ac_ext <<EOF
+#line 16519 "configure"
+#include "confdefs.h"
+
+                        #include <sys/types.h>
+                        #include <sys/socket.h>
+                    
+int main() {
+
+                        size_t len;
+                        getsockname(0, 0, &len);
+                    
+; return 0; }
+EOF
+if { (eval echo configure:16532: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  wx_cv_type_getsockname3=size_t
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  cat > conftest.$ac_ext <<EOF
+#line 16540 "configure"
+#include "confdefs.h"
+
+                            #include <sys/types.h>
+                            #include <sys/socket.h>
+                        
+int main() {
+
+                            int len;
+                            getsockname(0, 0, &len);
+                        
+; return 0; }
+EOF
+if { (eval echo configure:16553: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  wx_cv_type_getsockname3=int
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  wx_cv_type_getsockname3=unknown
+                    
 fi
 rm -f conftest*
-LIBS="$ac_save_LIBS"
+                
+fi
+rm -f conftest*
+            
+fi
+rm -f conftest*
+
+            ac_ext=c
+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cc_cross
 
+        
 fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  cat >> confdefs.h <<\EOF
-#define HAVE_SCHED_YIELD 1
+
+echo "$ac_t""$wx_cv_type_getsockname3" 1>&6
+
+    if test "$wx_cv_type_getsockname3" = "unknown"; then
+        wxUSE_SOCKETS=no
+        echo "configure: warning: Couldn't find socklen_t synonym for this system" 1>&2
+    else
+        cat >> confdefs.h <<EOF
+#define SOCKLEN_T $wx_cv_type_getsockname3
 EOF
- POSIX4_LINK="-lposix4"
-else
-  echo "$ac_t""no" 1>&6
-echo "configure: warning: wxThread::Yield will not work properly" 1>&2
-                
+
+    fi
 fi
 
-               
+fi
+
+if test "$wxUSE_SOCKETS" = "yes" ; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_SOCKETS 1
+EOF
+
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS sockets"
+    INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS protocol"
 fi
 
 
-                echo $ac_n "checking for pthread_attr_getschedpolicy in -l$THREADS_LINK""... $ac_c" 1>&6
-echo "configure:7230: 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
+if test "$wxUSE_GUI" = "yes"; then
+
+if test "$TOOLKIT" != "MSW"; then
+
+if test "$wxUSE_JOYSTICK" = "yes"; then
+    for ac_hdr in linux/joystick.h
+do
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:16615: 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
-  ac_save_LIBS="$LIBS"
-LIBS="-l$THREADS_LINK  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 7238 "configure"
+  cat > conftest.$ac_ext <<EOF
+#line 16620 "configure"
 #include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char pthread_attr_getschedpolicy();
-
-int main() {
-pthread_attr_getschedpolicy()
-; return 0; }
+#include <$ac_hdr>
 EOF
-if { (eval echo configure:7249: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:16625: \"$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_lib_$ac_lib_var=yes"
+  eval "ac_cv_header_$ac_safe=yes"
 else
+  echo "$ac_err" >&5
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
+  eval "ac_cv_header_$ac_safe=no"
 fi
 rm -f conftest*
-LIBS="$ac_save_LIBS"
-
 fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-  cat >> confdefs.h <<\EOF
-#define HAVE_THREAD_PRIORITY_FUNCTIONS 1
+    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
-echo $ac_n "checking for pthread_attr_getschedpolicy in -l"posix4"""... $ac_c" 1>&6
-echo "configure:7271: checking for pthread_attr_getschedpolicy in -l"posix4"" >&5
-ac_lib_var=`echo "posix4"'_'pthread_attr_getschedpolicy | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+fi
+done
+
+  if test "$ac_cv_header_linux_joystick_h" != "yes"; then
+    wxUSE_JOYSTICK=no
+    echo "configure: warning: Joystick not supported by this system" 1>&2
+  fi
+fi
+
+fi
+
+if test "$wxUSE_JOYSTICK" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_JOYSTICK 1
+EOF
+
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS joytest"
+fi
+
+fi
+
+
+if test "$TOOLKIT" != "MSW"; then
+
+HAVE_DL_FUNCS=0
+HAVE_SHL_FUNCS=0
+if test "$wxUSE_DYNLIB_CLASS" = "yes"; then
+    if test "$USE_DARWIN" = 1; then
+                HAVE_DL_FUNCS=1
+    else
+                                for ac_func in dlopen
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:16681: checking for $ac_func" >&5
+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  ac_save_LIBS="$LIBS"
-LIBS="-l"posix4"  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 7279 "configure"
+  cat > conftest.$ac_ext <<EOF
+#line 16686 "configure"
 #include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func(); below.  */
+#include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
-char pthread_attr_getschedpolicy();
+char $ac_func();
 
 int main() {
-pthread_attr_getschedpolicy()
+
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+$ac_func();
+#endif
+
 ; return 0; }
 EOF
-if { (eval echo configure:7290: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16709: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
+  eval "ac_cv_func_$ac_func=yes"
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
+  eval "ac_cv_func_$ac_func=no"
 fi
 rm -f conftest*
-LIBS="$ac_save_LIBS"
-
 fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-  cat >> confdefs.h <<\EOF
-#define HAVE_THREAD_PRIORITY_FUNCTIONS 1
+    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
 EOF
- POSIX4_LINK="-lposix4"
+            cat >> confdefs.h <<\EOF
+#define HAVE_DLOPEN 1
+EOF
+
+            HAVE_DL_FUNCS=1
+        
 else
   echo "$ac_t""no" 1>&6
-echo "configure: warning: Setting thread priority will not work" 1>&2
-                
-fi
-
-               
-fi
-
-
-  echo $ac_n "checking for pthread_cancel in -l$THREADS_LINK""... $ac_c" 1>&6
-echo "configure:7320: checking for pthread_cancel in -l$THREADS_LINK" >&5
-ac_lib_var=`echo $THREADS_LINK'_'pthread_cancel | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
+echo "configure:16737: 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
 else
   ac_save_LIBS="$LIBS"
-LIBS="-l$THREADS_LINK  $LIBS"
+LIBS="-ldl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7328 "configure"
+#line 16745 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
-char pthread_cancel();
+char dlopen();
 
 int main() {
-pthread_cancel()
+dlopen()
 ; return 0; }
 EOF
-if { (eval echo configure:7339: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16756: \"$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
@@ -7350,226 +16767,96 @@ LIBS="$ac_save_LIBS"
 fi
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-  cat >> confdefs.h <<\EOF
-#define HAVE_PTHREAD_CANCEL 1
+  
+                            cat >> confdefs.h <<\EOF
+#define HAVE_DLOPEN 1
 EOF
 
+                            HAVE_DL_FUNCS=1
+                            LIBS="$LIBS -ldl"
+                        
 else
   echo "$ac_t""no" 1>&6
-echo "configure: warning: wxThread::Kill() will not work properly" 1>&2
-fi
 
-
-  echo $ac_n "checking for pthread_cleanup_push/pop""... $ac_c" 1>&6
-echo "configure:7365: checking for pthread_cleanup_push/pop" >&5
-if eval "test \"`echo '$''{'wx_cv_func_pthread_cleanup_push'+set}'`\" = set"; then
+                            for ac_func in shl_load
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:16785: 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 7371 "configure"
+  cat > conftest.$ac_ext <<EOF
+#line 16790 "configure"
 #include "confdefs.h"
-#include <pthread.h>
-int main() {
-
-                    pthread_cleanup_push(NULL, NULL);
-                    pthread_cleanup_pop(0);
-                 
-; return 0; }
-EOF
-if { (eval echo configure:7381: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  
-                    wx_cv_func_pthread_cleanup_push=yes
-                    cat >> confdefs.h <<\EOF
-#define HAVE_THREAD_CLEANUP_FUNCTIONS 1
-EOF
-
-                 
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-                    wx_cv_func_pthread_cleanup_push=no
-                 
-fi
-rm -f conftest*
-  
-fi
-
-echo "$ac_t""$wx_cv_func_pthread_cleanup_push" 1>&6
-
-  THREADS_LINK="-l$THREADS_LINK"
-fi
-
-if test "$WXGTK12" = 1 ; then
-  cat >> confdefs.h <<EOF
-#define __WXGTK12__ $WXGTK12
-EOF
-
-fi
-
-WXDEBUG=
-if test "$wxUSE_DEBUG_GDB" = "yes" ; then
-    wxUSE_DEBUG_INFO=yes
-    WXDEBUG="-ggdb"
-fi
-
-if test "$wxUSE_DEBUG_INFO" = "yes" ; then
-    WXDEBUG="-g"
-    wxUSE_OPTIMISE=no
-fi
-
-if test "$wxUSE_DEBUG_FLAG" = "yes" ; then
-  cat >> confdefs.h <<\EOF
-#define WXDEBUG 1
-EOF
-
-  WXDEBUG_DEFINE="-D__WXDEBUG__"
-else
-  WXDEBUG_DEFINE="-DGTK_NO_CHECK_CASTS"
-fi
-
-if test "$wxUSE_MEM_TRACING" = "yes" ; then
-  cat >> confdefs.h <<\EOF
-#define wxUSE_MEMORY_TRACING 1
-EOF
-
-  cat >> confdefs.h <<\EOF
-#define wxUSE_GLOBAL_MEMORY_OPERATORS 1
-EOF
-
-  SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS memcheck"
-fi
-
-if test "$wxUSE_DMALLOC" = "yes" ; then
-  DMALLOC_LINK="-ldmalloc"
-fi
-
-PROFILE=
-if test "$wxUSE_PROFILE" = "yes" ; then
-  PROFILE="-pg"
-fi
-
-CXXFLAGS=`echo "${CXXFLAGS}" | sed "s/\-O.//g" `
-CFLAGS=`echo "${CFLAGS}" | sed "s/\-O.//g" `
-if test "$wxUSE_OPTIMISE" = "no" ; then
-  OPTIMISE=
-else
-  if test "$GCC" = yes ; then
-    OPTIMISE="-O2"
-    case "${host}" in
-      i586-*-*|i686-*-* )
-        OPTIMISE="${OPTIMISE} "
-    ;;
-    esac
-  else
-    OPTIMISE="-O"
-  fi
-fi
-
-
-if test "$wxUSE_ZLIB" = "yes" ; then
-  cat >> confdefs.h <<\EOF
-#define wxUSE_ZLIB 1
-EOF
-
-  EXTRA_VPATH="$EXTRA_VPATH:\$(srcdir)/zlib"
-  LTLIBOBJS="$LTLIBOBJS adler32.lo compress.lo crc32.lo gzio.lo uncompr.lo deflate.lo trees.lo zutil.lo inflate.lo infblock.lo inftrees.lo infcodes.lo infutil.lo inffast.lo"
-  if eval "test x$wxUSE_STREAMS = x1"; then
-    LTLIBOBJS="$LTLIBOBJS zstream.lo"
-  fi
-fi
-
-if test "$wxUSE_LIBPNG" = "yes" ; then
-  cat >> confdefs.h <<\EOF
-#define wxUSE_LIBPNG 1
-EOF
-
-  LTLIBOBJS="$LTLIBOBJS imagpng.lo png.lo pngset.lo pngget.lo pngrutil.lo pngtrans.lo pngwutil.lo pngread.lo pngrio.lo pngwio.lo pngwrite.lo pngrtran.lo pngwtran.lo pngmem.lo pngerror.lo pngpread.lo"
-  EXTRA_VPATH="$EXTRA_VPATH:\$(srcdir)/png"
-  SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS png"
-fi
-
-if test "$wxUSE_LIBGIF" = "yes" ; then
-  cat >> confdefs.h <<\EOF
-#define wxUSE_LIBGIF 1
-EOF
-
-  LTLIBOBJS="$LTLIBOBJS imaggif.lo"
-fi
+/* 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();
 
-if test "$wxUSE_LIBJPEG" = "yes" ; then
-  cat >> confdefs.h <<\EOF
-#define wxUSE_LIBJPEG 1
-EOF
+int main() {
 
-  EXTRA_VPATH="$EXTRA_VPATH:\${srcdir}/jpeg"
-  LTLIBOBJS="$LTLIBOBJS imagjpeg.lo \
-             jcomapi.lo jutils.lo jerror.lo jmemmgr.lo jmemnobs.lo \
-             jcapimin.lo jcapistd.lo jctrans.lo jcparam.lo jdatadst.lo \
-             jcinit.lo jcmaster.lo jcmarker.lo jcmainct.lo jcprepct.lo \
-             jccoefct.lo jccolor.lo jcsample.lo jchuff.lo jcphuff.lo \
-             jcdctmgr.lo jfdctfst.lo jfdctflt.lo jfdctint.lo \
-             jdapimin.lo jdapistd.lo jdtrans.lo jdatasrc.lo \
-             jdmaster.lo jdinput.lo jdmarker.lo jdhuff.lo jdphuff.lo \
-             jdmainct.lo jdcoefct.lo jdpostct.lo jddctmgr.lo jidctfst.lo \
-             jidctflt.lo jidctint.lo jidctred.lo jdsample.lo jdcolor.lo \
-             jquant1.lo jquant2.lo jdmerge.lo"
-fi
+/* 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
 
-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:7526: checking for GL/gl.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 7531 "configure"
-#include "confdefs.h"
-#include <GL/gl.h>
+; return 0; }
 EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7536: \"$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:16813: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
+  eval "ac_cv_func_$ac_func=yes"
 else
-  echo "$ac_err" >&5
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
+  eval "ac_cv_func_$ac_func=no"
 fi
 rm -f conftest*
 fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-  
-    echo $ac_n "checking for glInitNames in -lGL""... $ac_c" 1>&6
-echo "configure:7554: checking for glInitNames in -lGL" >&5
-ac_lib_var=`echo GL'_'glInitNames | sed 'y%./+-%__p_%'`
+    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+                                            cat >> confdefs.h <<\EOF
+#define HAVE_SHL_LOAD 1
+EOF
+
+                                            HAVE_SHL_FUNCS=1
+                                          
+else
+  echo "$ac_t""no" 1>&6
+echo $ac_n "checking for dld in -lshl_load""... $ac_c" 1>&6
+echo "configure:16841: 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
 else
   ac_save_LIBS="$LIBS"
-LIBS="-lGL wxUSE_OPENGL=0 $LIBS"
+LIBS="-lshl_load  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7562 "configure"
+#line 16849 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
-char glInitNames();
+char dld();
 
 int main() {
-glInitNames()
+dld()
 ; return 0; }
 EOF
-if { (eval echo configure:7573: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16860: \"$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
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   
-      OPENGL_LINK="-lGL"
-      cat >> confdefs.h <<\EOF
-#define wxUSE_OPENGL 1
+                                                            HAVE_SHL_FUNCS=1
+                                                            LIBS="$LIBS -ldld"
+                                                         
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+                                          
+fi
+done
+
+                        
+fi
+
+        
+fi
+done
+
+
+        if test "$HAVE_DL_FUNCS" = 1; then
+        for ac_func in dlerror
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:16899: 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 16904 "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:16927: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+ cat >> confdefs.h <<\EOF
+#define HAVE_DLERROR 1
 EOF
 
-      UTILS_SUBDIRS="$UTILS_SUBDIRS glcanvas/src"
-    
 else
   echo "$ac_t""no" 1>&6
-
-        echo $ac_n "checking for glInitNames in -lMesaGL""... $ac_c" 1>&6
-echo "configure:7600: checking for glInitNames in -lMesaGL" >&5
-ac_lib_var=`echo MesaGL'_'glInitNames | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for dlerror in -ldl""... $ac_c" 1>&6
+echo "configure:16952: 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
 else
   ac_save_LIBS="$LIBS"
-LIBS="-lMesaGL  $LIBS"
+LIBS="-ldl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7608 "configure"
+#line 16960 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
-char glInitNames();
+char dlerror();
 
 int main() {
-glInitNames()
+dlerror()
 ; return 0; }
 EOF
-if { (eval echo configure:7619: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16971: \"$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
@@ -7630,275 +16982,297 @@ LIBS="$ac_save_LIBS"
 fi
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-  
-        OPENGL_LINK="-lMesaGL"
-        cat >> confdefs.h <<\EOF
-#define wxUSE_OPENGL 1
+  cat >> confdefs.h <<\EOF
+#define HAVE_DLERROR 1
 EOF
 
-        UTILS_SUBDIRS="$UTILS_SUBDIRS glcanvas/src"
-      
 else
   echo "$ac_t""no" 1>&6
-wxUSE_OPENGL=0
 fi
 
-     
 fi
+done
 
-    
-else
-  echo "$ac_t""no" 1>&6
-wxUSE_OPENGL=0
+    fi
+    fi
+
+    if test "$HAVE_DL_FUNCS" = 0; then
+        if test "$HAVE_SHL_FUNCS" = 0; then
+          if test "$USE_UNIX" = 1; then
+              echo "configure: warning: Missing dynamic loading support, several features will be disabled" 1>&2
+              wxUSE_DYNLIB_CLASS=no
+          else
+              echo "configure: warning: Assuming wxLibrary class works on this platform" 1>&2
+          fi
+        fi
+    fi
 fi
 
 fi
 
+if test "$wxUSE_DYNLIB_CLASS" = "yes" ; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_DYNLIB_CLASS 1
+EOF
+
+else
+    wxUSE_ODBC=no
+    wxUSE_SERIAL=no
+fi
+
 
-if test "$wxUSE_GUI" = "yes"; then
+if test "$wxUSE_FONTMAP" = "yes" ; then
   cat >> confdefs.h <<\EOF
-#define wxUSE_GUI 1
+#define wxUSE_FONTMAP 1
 EOF
 
+fi
 
-                        LTLIBOBJS="$LTLIBOBJS \
-main.lo app.lo event.lo wincmn.lo window.lo control.lo framecmn.lo frame.lo dialog.lo panelg.lo \
-button.lo stattext.lo textctrl.lo \
-bitmap.lo brush.lo colour.lo cursor.lo data.lo dc.lo dcbase.lo dcclient.lo \
-dcmemory.lo dcscreen.lo font.lo gdicmn.lo gdiobj.lo icon.lo palette.lo pen.lo region.lo \
-menu.lo \
-settings.lo timer.lo msgdlgg.lo"
-else
+if test "$wxUSE_UNICODE" = "yes" ; then
   cat >> confdefs.h <<\EOF
-#define wxUSE_NOGUI 1
+#define wxUSE_UNICODE 1
 EOF
 
 fi
 
+if test "$wxUSE_WCSRTOMBS" = "yes" ; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_WCSRTOMBS 1
+EOF
 
-if test "$wxUSE_UNIX" = "yes"; then
+fi
+
+if test "$wxUSE_wxUSE_EXPERIMENTAL_PRINTF" = "yes"; then
   cat >> confdefs.h <<\EOF
-#define wxUSE_UNIX 1
+#define wxUSE_EXPERIMENTAL_PRINTF 1
 EOF
 
-  LTLIBOBJS="$LTLIBOBJS utilsunx.lo"
 fi
 
 
-if test "$wxUSE_APPLE_IEEE" = "yes"; then
-  cat >> confdefs.h <<\EOF
-#define wxUSE_APPLE_IEEE 1
+if test "$wxUSE_SERIAL" = "yes" ; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_SERIAL 1
 EOF
 
-  LTLIBOBJS="$LTLIBOBJS extended.lo"
 fi
 
-if test "$wxUSE_TIMEDATE" = "yes"; then
-  cat >> confdefs.h <<\EOF
-#define wxUSE_TIMEDATE 1
+
+IODBC_C_SRC=""
+if test "$wxUSE_ODBC" = "yes" ; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_ODBC 1
 EOF
 
-  LTLIBOBJS="$LTLIBOBJS date.lo time.lo"
-  SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS typetest"
+    WXODBCFLAG="-D_IODBC_"
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS db"
 fi
 
-if test "$wxUSE_FILE" = "yes"; then
+
+if test "$wxUSE_POSTSCRIPT" = "yes" ; then
   cat >> confdefs.h <<\EOF
-#define wxUSE_FILE 1
+#define wxUSE_POSTSCRIPT 1
 EOF
 
-  LTLIBOBJS="$LTLIBOBJS file.lo"
 fi
 
-if test "$wxUSE_TEXTFILE" = "yes"; then
-  if test "$wxUSE_FILE" != "yes"; then
-    echo "configure: warning: wxTextFile requires wxFile and it won't be compiled without it" 1>&2
-  else
+cat >> confdefs.h <<\EOF
+#define wxUSE_AFM_FOR_POSTSCRIPT 1
+EOF
+
+
+cat >> confdefs.h <<\EOF
+#define wxUSE_NORMALIZED_PS_FONTS 1
+EOF
+
+
+
+if test "$wxUSE_CONSTRAINTS" = "yes"; then
     cat >> confdefs.h <<\EOF
-#define wxUSE_TEXTFILE 1
+#define wxUSE_CONSTRAINTS 1
 EOF
 
-    LTLIBOBJS="$LTLIBOBJS textfile.lo"
-  fi
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS layout"
 fi
 
-if test "$wxUSE_CONFIG" = "yes" ; then
-  if test "$wxUSE_TEXTFILE" != "yes"; then
-    echo "configure: warning: wxConfig requires wxTextFile and it won't be compiled without it" 1>&2
-  else
+if test "$wxUSE_MDI_ARCHITECTURE" = "yes"; then
     cat >> confdefs.h <<\EOF
-#define wxUSE_CONFIG 1
+#define wxUSE_MDI_ARCHITECTURE 1
 EOF
 
-    LTLIBOBJS="$LTLIBOBJS config.lo fileconf.lo"
-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS config"
-  fi
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS mdi"
 fi
 
-if test "$wxUSE_INTL" = "yes" ; then
-  if test "$wxUSE_FILE" != "yes"; then
-    echo "configure: warning: I18n code requires wxFile and it won't be compiled without it" 1>&2
-  else
+if test "$wxUSE_DOC_VIEW_ARCHITECTURE" = "yes" ; then
     cat >> confdefs.h <<\EOF
-#define wxUSE_INTL 1
+#define wxUSE_DOC_VIEW_ARCHITECTURE 1
 EOF
 
-    LTLIBOBJS="$LTLIBOBJS intl.lo"
-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS internat"
-  fi
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS docview"
+    if test "$wxUSE_MDI_ARCHITECTURE" = "yes"; then
+        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS docvwmdi"
+    fi
 fi
 
-if test "$wxUSE_LOG" = "yes"; then
-  cat >> confdefs.h <<\EOF
-#define wxUSE_LOG 1
+if test "$wxUSE_HELP" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_HELP 1
 EOF
 
-  LTLIBOBJS="$LTLIBOBJS log.lo"
-fi
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS help"
 
-if test "$wxUSE_LONGLONG" = "yes"; then
-  cat >> confdefs.h <<\EOF
-#define wxUSE_LONGLONG 1
+    if test "$USE_WIN32" = 1; then
+      if test "$wxUSE_MS_HTML_HELP" = "yes"; then
+        ac_safe=`echo "htmlhelp.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for htmlhelp.h""... $ac_c" 1>&6
+echo "configure:17129: 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 17134 "configure"
+#include "confdefs.h"
+#include <htmlhelp.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:17139: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+  rm -rf conftest*
+  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
 
-  LTLIBOBJS="$LTLIBOBJS longlong.lo"
+            
+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
 
-if test "$wxUSE_SOCKETS" = "yes" ; then
-    if test "$wxUSE_THREADS" = "yes" ; then
+      fi
+    fi
+
+    if test "$wxUSE_WXHTML_HELP" = "yes"; then
+      if test "$wxUSE_HTML" = "yes"; then
         cat >> confdefs.h <<\EOF
-#define wxUSE_SOCKETS 1
+#define wxUSE_WXHTML_HELP 1
 EOF
 
-        LTLIBOBJS="$LTLIBOBJS sckint.lo socket.lo sckaddr.lo protocol.lo http.lo ftp.lo url.lo"
-        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS wxsocket"
-        INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS protocol"
+      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
+    if test "$wxUSE_CONSTRAINTS" != "yes"; then
+        echo "configure: warning: Printing support cannot be used without constraints so it won't be compiled without it" 1>&2
     else
-        echo "configure: warning: socket classes require --with-threads and won't be compiled without it" 1>&2
-        wxUSE_SOCKETS=0
+        cat >> confdefs.h <<\EOF
+#define wxUSE_PRINTING_ARCHITECTURE 1
+EOF
+
     fi
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS printing"
+fi
+
+if test "$wxUSE_PROLOGIO" = "yes" ; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_PROLOGIO 1
+EOF
+
 fi
 
-if test "$wxUSE_STREAMS" = "yes" ; then
-  cat >> confdefs.h <<\EOF
-#define wxUSE_STREAMS 1
+if test "$wxUSE_RESOURCES" = "yes" ; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_RESOURCES 1
 EOF
 
-  LTLIBOBJS="$LTLIBOBJS stream.lo wfstream.lo datstrm.lo mstream.lo objstrm.lo"
-  if test "$wxUSE_SOCKETS" = "yes" ; then
-    LTLIBOBJS="$LTLIBOBJS sckstrm.lo"
-  fi
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS resource"
 fi
 
-if test "$wxUSE_SERIAL" = "yes" ; then
-  cat >> confdefs.h <<\EOF
-#define wxUSE_SERIAL 1
+if test "$wxUSE_X_RESOURCES" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_X_RESOURCES 1
 EOF
 
 fi
 
 
-if test "$wxUSE_SOCKETS" = "yes"; then
-    
-    ac_ext=C
-# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cxx_cross
+if test "$wxUSE_IPC" = "yes"; then
+    if test "$wxUSE_SOCKETS" != "yes"; then
+        echo "configure: warning: wxWindows IPC classes require sockets" 1>&2
+    fi
 
-        echo $ac_n "checking the type of the third argument of getsockname""... $ac_c" 1>&6
-echo "configure:7812: checking the type of the third argument of getsockname" >&5
-    cat > conftest.$ac_ext <<EOF
-#line 7814 "configure"
-#include "confdefs.h"
-#include <sys/socket.h>
-int main() {
-socklen_t len; getsockname(0, NULL, &len);
-; return 0; }
-EOF
-if { (eval echo configure:7821: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  cat >> confdefs.h <<\EOF
-#define SOCKLEN_T socklen_t
-EOF
- echo "$ac_t""socklen_t" 1>&6
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  cat > conftest.$ac_ext <<EOF
-#line 7832 "configure"
-#include "confdefs.h"
-#include <sys/socket.h>
-int main() {
-size_t len; getsockname(0, NULL, &len);
-; return 0; }
-EOF
-if { (eval echo configure:7839: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  cat >> confdefs.h <<\EOF
-#define SOCKLEN_T size_t
+    cat >> confdefs.h <<\EOF
+#define wxUSE_IPC 1
 EOF
- echo "$ac_t""size_t" 1>&6
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  cat > conftest.$ac_ext <<EOF
-#line 7850 "configure"
-#include "confdefs.h"
-#include <sys/socket.h>
-int main() {
-int len; getsockname(0, NULL, &len);
-; return 0; }
+
+fi
+
+if test "$wxUSE_CLIPBOARD" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_CLIPBOARD 1
 EOF
-if { (eval echo configure:7857: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  cat >> confdefs.h <<\EOF
-#define SOCKLEN_T int
+
+    cat >> confdefs.h <<\EOF
+#define wxUSE_DATAOBJ 1
 EOF
- echo "$ac_t""int" 1>&6
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  echo "$ac_t""unknown" 1>&6
-        
-fi
-rm -f conftest*
-        
-fi
-rm -f conftest*
-    
-fi
-rm -f conftest*
-    ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
 
 fi
 
+if test "$wxUSE_DRAG_AND_DROP" = "yes" ; then
+    if test "$wxUSE_GTK" = 1; then
+        if test "$WXGTK12" != 1; then
+            echo "configure: warning: Drag and drop is only supported under GTK+ 1.2" 1>&2
+            wxUSE_DRAG_AND_DROP=no
+        fi
+    fi
 
-if test "$wxUSE_JOYSTICK" = 1; then
-    for ac_hdr in linux/joystick.h
+    if test "$wxUSE_MOTIF" = 1; then
+        echo "configure: warning: Drag and drop is not yet supported under Motif" 1>&2
+        wxUSE_DRAG_AND_DROP=no
+    fi
+
+    if test "$wxUSE_MAC" = 1; then
+        echo "configure: warning: Drag and drop is not yet supported under Mac OS X" 1>&2
+        wxUSE_DRAG_AND_DROP=no
+    fi
+
+    if test "$USE_WIN32" = 1; then
+                
+        for ac_hdr in ole2.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:7892: checking for $ac_hdr" >&5
+echo "configure:17266: 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 7897 "configure"
+#line 17271 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7902: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:17276: \"$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*
@@ -7924,694 +17298,786 @@ else
 fi
 done
 
-  if test "$ac_cv_header_linux_joystick_h" = "yes"; then
-    cat >> confdefs.h <<\EOF
-#define wxUSE_JOYSTICK 1
-EOF
 
-    LTLIBOBJS="$LTLIBOBJS joystick.lo"
-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS joytest"
-  fi
-fi
+        if test "$ac_cv_header_ole2_h" = "yes" ; then
+            if test "$GCC" = yes ; then
+                ALL_OBJECTS="$ALL_OBJECTS \$(OLEOBJS)"
+                ALL_DEPFILES="$ALL_DEPFILES \$(OLEDEPS)"
+                CODE_GEN_FLAGS_CXX="$CODE_GEN_FLAGS_CXX -fvtable-thunks"
+                LIBS="$LIBS -lrpcrt4 -loleaut32 -lole32 -luuid"
+                cat >> confdefs.h <<\EOF
+#define wxUSE_OLE 1
+EOF
 
 
-HAVE_DL_FUNCS=0
-HAVE_SHL_FUNCS=0
-if test "$wxUSE_DYNLIB_CLASS" = "yes"; then
-            for ac_func in dlopen
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:7945: 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 7950 "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();
+                                                if test "$wxUSE_METAFILE" = "yes"; then
+                    cat >> confdefs.h <<\EOF
+#define wxUSE_METAFILE 1
+EOF
 
-int main() {
+                                        cat >> confdefs.h <<\EOF
+#define wxUSE_ENH_METAFILE 1
+EOF
 
-/* 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
+                fi
+            fi
+        else
+            echo "configure: warning: Drag and drop disabled because OLE headers not found" 1>&2
+            wxUSE_DRAG_AND_DROP=no
+        fi
+    fi
 
-; return 0; }
+    if test "$wxUSE_DRAG_AND_DROP" = "yes"; then
+        cat >> confdefs.h <<\EOF
+#define wxUSE_DRAG_AND_DROP 1
 EOF
-if { (eval echo configure:7973: \"$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*
+
+        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dnd"
+    fi
+
 fi
 
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
- cat >> confdefs.h <<\EOF
-#define HAVE_DLOPEN 1
+if test "$wxUSE_SPLINES" = "yes" ; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_SPLINES 1
 EOF
- HAVE_DL_FUNCS=1
-else
-  echo "$ac_t""no" 1>&6
-echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:7998: 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
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-ldl  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 8006 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char dlopen();
 
-int main() {
-dlopen()
-; return 0; }
-EOF
-if { (eval echo configure:8017: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
 fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
 
+
+USES_CONTROLS=0
+if test "$wxUSE_CONTROLS" = "yes"; then
+  USES_CONTROLS=1
 fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
+
+if test "$wxUSE_ACCEL" = "yes"; then
   cat >> confdefs.h <<\EOF
-#define HAVE_DLOPEN 1
+#define wxUSE_ACCEL 1
 EOF
- HAVE_DL_FUNCS=1
-else
-  echo "$ac_t""no" 1>&6
-fi
 
+  USES_CONTROLS=1
 fi
-done
 
-    for ac_func in shl_load
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:8046: 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 8051 "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();
+if test "$wxUSE_BUTTON" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_BUTTON 1
+EOF
 
-int main() {
+  USES_CONTROLS=1
+fi
 
-/* 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
+if test "$wxUSE_BMPBUTTON" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_BMPBUTTON 1
+EOF
 
-; return 0; }
+  USES_CONTROLS=1
+fi
+
+if test "$wxUSE_CALCTRL" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_CALENDARCTRL 1
 EOF
-if { (eval echo configure:8074: \"$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"
+
+  USES_CONTROLS=1
+  SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS calendar"
 fi
-rm -f conftest*
+
+if test "$wxUSE_CARET" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_CARET 1
+EOF
+
+  USES_CONTROLS=1
+  SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS caret"
 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
+if test "$wxUSE_COMBOBOX" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_COMBOBOX 1
 EOF
- cat >> confdefs.h <<\EOF
-#define HAVE_SHL_LOAD 1
+
+  USES_CONTROLS=1
+fi
+
+if test "$wxUSE_CHOICE" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_CHOICE 1
 EOF
- HAVE_DL_FUNCS=1 HAVE_SHL_FUNCS=1
-else
-  echo "$ac_t""no" 1>&6
+
+  USES_CONTROLS=1
 fi
-done
 
+if test "$wxUSE_CHECKBOX" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_CHECKBOX 1
+EOF
 
-    if test "$HAVE_DL_FUNCS" = 0; then
-        echo "configure: warning: "--with-dynlib and --with-odbc will be disabled due to missing shared library support"" 1>&2
-        wxUSE_ODBC=no
-        wxUSE_DYNLIB_CLASS=no
-    fi
+  USES_CONTROLS=1
 fi
 
-if test "$wxUSE_DYNLIB_CLASS" = "yes" ; then
+if test "$wxUSE_CHECKLST" = "yes"; then
   cat >> confdefs.h <<\EOF
-#define wxUSE_DYNLIB_CLASS 1
+#define wxUSE_CHECKLISTBOX 1
 EOF
 
-  LTLIBOBJS="$LTLIBOBJS dynlib.lo"
+  USES_CONTROLS=1
+  SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS checklst"
 fi
 
+if test "$wxUSE_GAUGE" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_GAUGE 1
+EOF
+
+  USES_CONTROLS=1
+fi
 
-if test "$wxUSE_UNICODE" = "yes" ; then
+if test "$wxUSE_NEW_GRID" = "yes"; then
+  wxUSE_GRID="yes"
   cat >> confdefs.h <<\EOF
-#define wxUSE_UNICODE 1
+#define wxUSE_NEW_GRID 1
 EOF
 
+  USES_CONTROLS=1
+  SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS newgrid"
 fi
 
-if test "$wxUSE_WCSRTOMBS" = "yes" ; then
+if test "$wxUSE_GRID" = "yes"; then
   cat >> confdefs.h <<\EOF
-#define wxUSE_WCSRTOMBS 1
+#define wxUSE_GRID 1
 EOF
 
+  USES_CONTROLS=1
+  SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS grid"
 fi
 
+if test "$wxUSE_IMAGLIST" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_IMAGLIST 1
+EOF
 
-IODBC_C_SRC=""
-if test "$wxUSE_ODBC" = "yes" ; then
-  cat >> confdefs.h <<\EOF
-#define wxUSE_ODBC 1
+fi
+
+if test "$wxUSE_LISTBOX" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_LISTBOX 1
 EOF
 
-  EXTRA_VPATH="$EXTRA_VPATH:\$(srcdir)/iodbc"
-  LTLIBOBJS="$LTLIBOBJS catalog.lo connect.lo dlf.lo dlproc.lo execute.lo fetch.lo hdbc.lo henv.lo herr.lo hstmt.lo info.lo itrace.lo misc.lo prepare.lo result.lo"
-  SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS db"
+    USES_CONTROLS=1
 fi
 
+if test "$wxUSE_LISTCTRL" = "yes"; then
+    if test "$wxUSE_IMAGLIST" = "yes"; then
+        cat >> confdefs.h <<\EOF
+#define wxUSE_LISTCTRL 1
+EOF
 
-if test "$wxUSE_POSTSCRIPT" = "yes" ; then
-  cat >> confdefs.h <<\EOF
-#define wxUSE_POSTSCRIPT 1
+        USES_CONTROLS=1
+        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS listctrl"
+    else
+        echo "configure: warning: wxListCtrl requires wxImageList and won't be compiled without it" 1>&2
+    fi
+fi
+
+if test "$wxUSE_NOTEBOOK" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_NOTEBOOK 1
 EOF
 
-  LTLIBOBJS="$LTLIBOBJS printps.lo dcpsg.lo"
+    USES_CONTROLS=1
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS notebook"
 fi
 
-cat >> confdefs.h <<\EOF
-#define wxUSE_AFM_FOR_POSTSCRIPT 1
+if test "$wxUSE_PROPSHEET" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_PROPSHEET 1
 EOF
 
+    USES_CONTROLS=1
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS proplist"
+fi
 
-cat >> confdefs.h <<\EOF
-#define wxUSE_NORMALIZED_PS_FONTS 1
+if test "$wxUSE_RADIOBOX" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_RADIOBOX 1
 EOF
 
+    USES_CONTROLS=1
+fi
 
+if test "$wxUSE_RADIOBTN" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_RADIOBTN 1
+EOF
 
-if test "$wxUSE_CONSTRAINTS" = "yes"; then
-  cat >> confdefs.h <<\EOF
-#define wxUSE_CONSTRAINTS 1
+    USES_CONTROLS=1
+fi
+
+if test "$wxUSE_SASH" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_SASH 1
 EOF
 
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS sashtest"
+fi
+
+if test "$wxUSE_SCROLLBAR" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_SCROLLBAR 1
+EOF
 
-  LTLIBOBJS="$LTLIBOBJS layout.lo laywin.lo"
-  SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS layout"
+    USES_CONTROLS=1
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS scroll scrollsub"
 fi
 
-if test "$wxUSE_MDI_ARCHITECTURE" = "yes"; then
-  cat >> confdefs.h <<\EOF
-#define wxUSE_MDI_ARCHITECTURE 1
+if test "$wxUSE_SLIDER" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_SLIDER 1
 EOF
 
-  LTLIBOBJS="$LTLIBOBJS mdi.lo"
-  SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS mdi"
+    USES_CONTROLS=1
 fi
 
-if test "$wxUSE_DOC_VIEW_ARCHITECTURE" = "yes" ; then
-  cat >> confdefs.h <<\EOF
-#define wxUSE_DOC_VIEW_ARCHITECTURE 1
+if test "$wxUSE_SPINBTN" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_SPINBTN 1
 EOF
 
-  LTLIBOBJS="$LTLIBOBJS docview.lo"
-  SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS docview"
-  if test "$wxUSE_MDI_ARCHITECTURE" = "yes"; then
-    LTLIBOBJS="$LTLIBOBJS docmdi.lo"
-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS docvwmdi"
-  fi
+    USES_CONTROLS=1
 fi
 
-if test "$wxUSE_HELP" = "yes"; then
-  cat >> confdefs.h <<\EOF
-#define wxUSE_HELP 1
+if test "$wxUSE_SPINCTRL" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_SPINCTRL 1
 EOF
 
-  LTLIBOBJS="$LTLIBOBJS helpext.lo helphtml.lo helpbase.lo"
-  SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS help"
+    USES_CONTROLS=1
 fi
 
-if test "$wxUSE_PRINTING_ARCHITECTURE" = "yes" ; then
-  cat >> confdefs.h <<\EOF
-#define wxUSE_PRINTING_ARCHITECTURE 1
+if test "$wxUSE_SPLITTER" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_SPLITTER 1
 EOF
 
-  LTLIBOBJS="$LTLIBOBJS prntbase.lo paper.lo"
-  SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS printing"
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS splitter"
 fi
 
-if test "$wxUSE_PROLOGIO" = "yes" ; then
-  cat >> confdefs.h <<\EOF
-#define wxUSE_PROLOGIO 1
+if test "$wxUSE_STATBMP" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_STATBMP 1
 EOF
 
-  LTLIBOBJS="$LTLIBOBJS wxexpr.lo parser.lo"
+    USES_CONTROLS=1
 fi
 
-if test "$wxUSE_RESOURCES" = "yes" ; then
-  if test "$wxUSE_PROLOGIO" = "yes" ; then
+if test "$wxUSE_STATBOX" = "yes"; then
     cat >> confdefs.h <<\EOF
-#define wxUSE_RESOURCES 1
+#define wxUSE_STATBOX 1
 EOF
 
-    LTLIBOBJS="$LTLIBOBJS resource.lo"
-    if test "$wxUSE_GTK" = 1; then
-      LTLIBOBJS="$LTLIBOBJS utilsres.lo"
-    fi
-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS resource"
-  else
-    echo "configure: warning: wxWindows ressource system requires PrologIO and can't be compiled without it." 1>&2
-  fi
+    USES_CONTROLS=1
 fi
 
-if test "$wxUSE_X_RESOURCES" = "yes"; then
-  cat >> confdefs.h <<\EOF
-#define wxUSE_X_RESOURCES 1
+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
+    if test "$wxUSE_WINE" = 1 ; then
+        echo "configure: warning: wxStaticLine is not supported under WINE" 1>&2
+    else
+        cat >> confdefs.h <<\EOF
+#define wxUSE_STATLINE 1
+EOF
+
+        USES_CONTROLS=1
+    fi
+fi
 
-if test "$wxUSE_IPC" = "yes"; then
-  cat >> confdefs.h <<\EOF
-#define wxUSE_IPC 1
+if test "$wxUSE_STATUSBAR" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_STATUSBAR 1
 EOF
 
-  LTLIBOBJS="$LTLIBOBJS ipcbase.lo sckipc.lo"
+    USES_CONTROLS=1
+
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS statbar"
 fi
 
-if test "$wxUSE_CLIPBOARD" = "yes"; then
-  cat >> confdefs.h <<\EOF
-#define wxUSE_CLIPBOARD 1
+if test "$wxUSE_TABDIALOG" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_TAB_DIALOG 1
 EOF
 
-  LTLIBOBJS="$LTLIBOBJS clipbrd.lo dataobj.lo"
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS tab"
 fi
 
-if test "$wxUSE_DRAG_AND_DROP" = "yes"; then
-  if test "$WXGTK12" = 1 ; then
+if test "$wxUSE_TEXTCTRL" = "yes"; then
     cat >> confdefs.h <<\EOF
-#define wxUSE_DRAG_AND_DROP 1
+#define wxUSE_TEXTCTRL 1
 EOF
 
-    LTLIBOBJS="$LTLIBOBJS dnd.lo"
-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dnd"
-    if test "$wxUSE_CLIPBOARD" != "yes"; then
-      LTLIBOBJS="$LTLIBOBJS dataobj.lo"
+    USES_CONTROLS=1
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS text"
+fi
+
+if test "$wxUSE_TOGGLEBTN" = "yes"; then
+    if test "$wxUSE_MAC" = 1; then
+        echo "configure: warning: Toggle button is not yet supported under Mac OS X" 1>&2
+        wxUSE_TOGGLEBTN=no
+    fi
+
+    if test "$wxUSE_TOGGLEBTN" = "yes"; then
+        cat >> confdefs.h <<\EOF
+#define wxUSE_TOGGLEBTN 1
+EOF
+
+        USES_CONTROLS=1
     fi
-  else
-    echo "configure: warning: drag and drop is only supported under GTK 1.2" 1>&2
-  fi
 fi
 
-if test "$wxUSE_SPLINES" = "yes" ; then
-  cat >> confdefs.h <<\EOF
-#define wxUSE_SPLINES 1
+if test "$wxUSE_TOOLBAR_SIMPLE" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_TOOLBAR_SIMPLE 1
 EOF
 
+    wxUSE_TOOLBAR="yes"
+    USES_CONTROLS=1
 fi
 
+if test "$wxUSE_TOOLBAR" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_TOOLBAR 1
+EOF
+
+    USES_CONTROLS=1
 
-if test "$wxUSE_ACCEL" = "yes"; then
-  cat >> confdefs.h <<\EOF
-#define wxUSE_ACCEL 1
+        if test "$wxUSE_TOOLBAR_SIMPLE" != "yes"; then
+        wxUSE_TOOLBAR_NATIVE="yes"
+    fi
+
+    if test "$wxUSE_TOOLBAR_NATIVE" = "yes"; then
+        cat >> confdefs.h <<\EOF
+#define wxUSE_TOOLBAR_NATIVE 1
 EOF
 
-  LTLIBOBJS="$LTLIBOBJS accel.lo"
+        USES_CONTROLS=1
+    fi
+
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS toolbar"
 fi
 
-if test "$wxUSE_CARET" = "yes"; then
-  cat >> confdefs.h <<\EOF
-#define wxUSE_CARET 1
+if test "$wxUSE_TOOLTIPS" = "yes"; then
+    if test "$wxUSE_MOTIF" = 1; then
+        echo "configure: warning: wxTooltip not supported yet under Motif" 1>&2
+    else
+        if test "$wxUSE_WINE" = 1; then
+            echo "configure: warning: wxTooltip not supported under WINE" 1>&2
+        else
+            cat >> confdefs.h <<\EOF
+#define wxUSE_TOOLTIPS 1
 EOF
 
-  LTLIBOBJS="$LTLIBOBJS caret.lo"
-  SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS caret"
+        fi
+    fi
 fi
 
-if test "$wxUSE_COMBOBOX" = "yes"; then
-  cat >> confdefs.h <<\EOF
-#define wxUSE_COMBOBOX 1
+if test "$wxUSE_TREECTRL" = "yes"; then
+    if test "$wxUSE_IMAGLIST" = "yes"; then
+        cat >> confdefs.h <<\EOF
+#define wxUSE_TREECTRL 1
 EOF
 
-  LTLIBOBJS="$LTLIBOBJS choice.lo combobox.lo"
+        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
 
-if test "$wxUSE_BMPBUTTON" = "yes"; then
-  cat >> confdefs.h <<\EOF
-#define wxUSE_BMPBUTTON 1
+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
+        cat >> confdefs.h <<\EOF
+#define wxUSE_POPUPWIN 1
 EOF
 
-  LTLIBOBJS="$LTLIBOBJS bmpbuttn.lo"
+        USES_CONTROLS=1
+    fi
 fi
 
-if test "$wxUSE_CHECKBOX" = "yes"; then
-  cat >> confdefs.h <<\EOF
-#define wxUSE_CHECKBOX 1
+if test "$USES_CONTROLS" = 1; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_CONTROLS 1
 EOF
 
-  LTLIBOBJS="$LTLIBOBJS checkbox.lo"
 fi
 
-if test "$wxUSE_CHECKLST" = "yes"; then
-  cat >> confdefs.h <<\EOF
-#define wxUSE_CHECKLISTBOX 1
+
+if test "$wxUSE_TREELAYOUT" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_TREELAYOUT 1
 EOF
 
-  LTLIBOBJS="$LTLIBOBJS checklst.lo"
-  SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS checklst"
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS treelay"
 fi
 
-if test "$wxUSE_GAUGE" = "yes"; then
-  cat >> confdefs.h <<\EOF
-#define wxUSE_GAUGE 1
+if test "$wxUSE_DRAGIMAGE" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_DRAGIMAGE 1
 EOF
 
-  LTLIBOBJS="$LTLIBOBJS gauge.lo"
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dragimag"
 fi
 
-if test "$wxUSE_GRID" = "yes"; then
-  cat >> confdefs.h <<\EOF
-#define wxUSE_GRID 1
+if test "$wxUSE_MENUS" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_MENUS 1
 EOF
 
-  LTLIBOBJS="$LTLIBOBJS gridg.lo"
-  SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS grid"
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS menu"
 fi
 
-if test "$wxUSE_IMAGLIST" = "yes"; then
-  cat >> confdefs.h <<\EOF
-#define wxUSE_IMAGLIST 1
+if test "$wxUSE_METAFILE" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_METAFILE 1
 EOF
 
-  LTLIBOBJS="$LTLIBOBJS imaglist.lo"
 fi
 
-if test "$wxUSE_LISTBOX" = "yes"; then
-  cat >> confdefs.h <<\EOF
-#define wxUSE_LISTBOX 1
+if test "$wxUSE_MIMETYPE" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_MIMETYPE 1
 EOF
 
-  LTLIBOBJS="$LTLIBOBJS listbox.lo"
 fi
 
-if test "$wxUSE_LISTCTRL" = "yes"; then
-  if test "$wxUSE_IMAGLIST" = "yes"; then
+if test "$wxUSE_SYSTEM_OPTIONS" = "yes"; then
     cat >> confdefs.h <<\EOF
-#define wxUSE_LISTCTRL 1
+#define wxUSE_SYSTEM_OPTIONS 1
 EOF
 
-    LTLIBOBJS="$LTLIBOBJS listctrl.lo"
-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS listctrl"
-  else
-    echo "configure: warning: wxListCtrl requires wxImageList and won't be compiled without it" 1>&2
-  fi
 fi
 
-if test "$wxUSE_NOTEBOOK" = "yes"; then
-  cat >> confdefs.h <<\EOF
-#define wxUSE_NOTEBOOK 1
+if test "$wxUSE_MINIFRAME" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_MINIFRAME 1
 EOF
 
-  LTLIBOBJS="$LTLIBOBJS notebook.lo"
-  SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS notebook"
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS minifram"
 fi
 
-if test "$wxUSE_RADIOBOX" = "yes"; then
+if test "$wxUSE_HTML" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_HTML 1
+EOF
+
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS html"
+    INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS html"
+fi
+
+if test "$wxUSE_VALIDATORS" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_VALIDATORS 1
+EOF
+
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS validate"
+fi
+
+if test "$wxUSE_IMAGE" = "yes" ; then
   cat >> confdefs.h <<\EOF
-#define wxUSE_RADIOBOX 1
+#define wxUSE_IMAGE 1
 EOF
 
-  LTLIBOBJS="$LTLIBOBJS radiobox.lo"
 fi
 
-if test "$wxUSE_RADIOBTN" = "yes"; then
+if test "$wxUSE_GIF" = "yes" ; then
   cat >> confdefs.h <<\EOF
-#define wxUSE_RADIOBTN 1
+#define wxUSE_GIF 1
 EOF
 
-  LTLIBOBJS="$LTLIBOBJS radiobut.lo"
 fi
 
-if test "wxUSE_SASH" = 1; then
+if test "$wxUSE_PCX" = "yes" ; then
   cat >> confdefs.h <<\EOF
-#define wxUSE_SASH 1
+#define wxUSE_PCX 1
 EOF
 
-  LTLIBOBJS="$LTLIBOBJS sashwin.lo"
-  SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS sashtest"
 fi
 
-if test "$wxUSE_SCROLLBAR" = "yes"; then
+if test "$wxUSE_PNM" = "yes" ; then
   cat >> confdefs.h <<\EOF
-#define wxUSE_SCROLLBAR 1
+#define wxUSE_PNM 1
 EOF
 
-  LTLIBOBJS="$LTLIBOBJS scrolbar.lo scrolwin.lo"
-  SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS scroll"
 fi
 
-if test "$wxUSE_SLIDER" = "yes"; then
+if test "$wxUSE_XPM" = "yes" ; then
   cat >> confdefs.h <<\EOF
-#define wxUSE_SLIDER 1
+#define wxUSE_XPM 1
 EOF
 
-  LTLIBOBJS="$LTLIBOBJS slider.lo"
 fi
 
-if test "$wxUSE_SPINBTN" = "yes"; then
-  cat >> confdefs.h <<\EOF
-#define wxUSE_SPINBTN 1
+
+if test "$wxUSE_CHOICEDLG" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_CHOICEDLG 1
 EOF
 
-  LTLIBOBJS="$LTLIBOBJS spinbutt.lo"
 fi
 
-if test "$wxUSE_SPLITTER" = "yes"; then
-  cat >> confdefs.h <<\EOF
-#define wxUSE_SPLITTER 1
+if test "$wxUSE_COLOURDLG" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_COLOURDLG 1
 EOF
 
-  LTLIBOBJS="$LTLIBOBJS splitter.lo"
-  SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS splitter"
 fi
 
-if test "$wxUSE_STATBMP" = "yes"; then
-  cat >> confdefs.h <<\EOF
-#define wxUSE_STATBMP 1
+if test "$wxUSE_FILEDLG" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_FILEDLG 1
 EOF
 
-  LTLIBOBJS="$LTLIBOBJS statbmp.lo"
 fi
 
-if test "$wxUSE_STATBOX" = "yes"; then
-  cat >> confdefs.h <<\EOF
-#define wxUSE_STATBOX 1
+if test "$wxUSE_FINDREPLDLG" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_FINDREPLDLG 1
 EOF
 
-  LTLIBOBJS="$LTLIBOBJS statbox.lo"
 fi
 
-if test "$wxUSE_STATLINE" = "yes"; then
-  cat >> confdefs.h <<\EOF
-#define wxUSE_STATLINE 1
+if test "$wxUSE_FONTDLG" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_FONTDLG 1
 EOF
 
-  LTLIBOBJS="$LTLIBOBJS statline.lo"
 fi
 
-if test "$wxUSE_STATUSBAR" = "yes"; then
-  cat >> confdefs.h <<\EOF
-#define wxUSE_STATUSBAR 1
+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
 
-  LTLIBOBJS="$LTLIBOBJS statusbr.lo"
+        fi
+    fi
 fi
 
-if test "$wxUSE_TABDIALOG" = "yes"; then
-  cat >> confdefs.h <<\EOF
-#define wxUSE_TAB_DIALOG 1
+if test "$wxUSE_MSGDLG" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_MSGDLG 1
 EOF
 
-  LTLIBOBJS="$LTLIBOBJS tabg.lo"
-  SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS tab"
 fi
 
-if test "$wxUSE_TOOLBAR" = "yes"; then
-  cat >> confdefs.h <<\EOF
-#define wxUSE_TOOLBAR 1
+if test "$wxUSE_NUMBERDLG" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_NUMBERDLG 1
 EOF
 
-  LTLIBOBJS="$LTLIBOBJS tbarbase.lo tbargtk.lo"
-  SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS toolbar"
 fi
 
-if test "$wxUSE_TOOLTIPS" = "yes" ; then
-    if test "$wxUSE_MOTIF" = "yes"; then
-      echo "configure: warning: tooltips are not supported yet under Motif" 1>&2
+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_TOOLTIPS 1
+        cat >> confdefs.h <<\EOF
+#define wxUSE_PROGRESSDLG 1
 EOF
 
-      LTLIBOBJS="$LTLIBOBJS tooltip.lo"
     fi
 fi
 
-if test "$wxUSE_TREECTRL" = "yes"; then
-  if test "$wxUSE_IMAGLIST" = "yes"; then
+if test "$wxUSE_SPLASH" = "yes"; then
     cat >> confdefs.h <<\EOF
-#define wxUSE_TREECTRL 1
+#define wxUSE_SPLASH 1
 EOF
 
-    LTLIBOBJS="$LTLIBOBJS treectrl.lo"
-    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_METAFILE" = "yes"; then
-  cat >> confdefs.h <<\EOF
-#define wxUSE_METAFILE 1
+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
 
-  LTLIBOBJS="$LTLIBOBJS metafile.lo"
+    fi
 fi
 
-if test "$wxUSE_COMMONDLGS" = "yes"; then
-    LTLIBOBJS="$LTLIBOBJS progdlgg.lo filedlg.lo fontdlgg.lo"
-
-  if test "$wxUSE_CONSTRAINTS" != "yes"; then
-    echo "configure: warning: many common dialogs cannot be used without constraints so they won't be compiled without them" 1>&2
-  else
-    cat >> confdefs.h <<\EOF
-#define wxUSE_CONSTRAINTS 1
-EOF
-
+if test "$wxUSE_TEXTDLG" = "yes"; then
     cat >> confdefs.h <<\EOF
 #define wxUSE_TEXTDLG 1
 EOF
 
-    LTLIBOBJS="$LTLIBOBJS colrdlgg.lo textdlgg.lo choicdgg.lo"
+fi
 
-    if test "$wxUSE_TREECTRL" != "yes"; then
-      echo "configure: warning: wxDirDialog cannot be used without wxTreeCtrl and it won't be compiled without it" 1>&2
-    else
-      cat >> confdefs.h <<\EOF
-#define wxUSE_DIRDLG 1
+if test "$wxUSE_WIZARDDLG" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_WIZARDDLG 1
 EOF
 
-      LTLIBOBJS="$LTLIBOBJS dirdlgg.lo"
-    fi
-  fi
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS wizard"
+fi
 
-  if test "$wxUSE_PRINTING_ARCHITECTURE" = "yes"; then
-    LTLIBOBJS="$LTLIBOBJS prntdlgg.lo"
-  else
-    echo "configure: warning: wxPrintDialog class won't be compiled without printing support" 1>&2
-  fi
+
+if test "$cross_compiling" = "yes"; then
+        OSINFO="\"$host\""
+else
+        OSINFO=`uname -s -r -m`
+    OSINFO="\"$OSINFO\""
 fi
 
-if test "$wxUSE_MINIFRAME" = "yes"; then
-  cat >> confdefs.h <<\EOF
-#define wxUSE_MINIFRAME 1
+cat >> confdefs.h <<EOF
+#define WXWIN_OS_DESCRIPTION $OSINFO
 EOF
 
-  LTLIBOBJS="$LTLIBOBJS minifram.lo"
-  SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS minifram"
+
+
+if test "x$prefix" != "xNONE"; then
+    wxPREFIX=$prefix
+else
+    wxPREFIX=$ac_default_prefix
 fi
 
-if test "$wxUSE_VALIDATORS" = "yes"; then
-  cat >> confdefs.h <<\EOF
-#define wxUSE_VALIDATORS 1
+cat >> confdefs.h <<EOF
+#define wxINSTALL_PREFIX "$wxPREFIX"
 EOF
 
-  LTLIBOBJS="$LTLIBOBJS valgen.lo validate.lo valtext.lo"
-  SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS validate"
-fi
 
 
-GUILIBS="$GUI_TK_LIBRARY $OPENGL_LINK $LIBPNG_LINK $ZLIB_LINK $TOOLKIT_LINK"
+GUILIBS="$GUI_TK_LIBRARY $TOOLKIT_LINK"
+OPENGL_LIBS="$OPENGL_LINK"
 
-EXTRA_LIBS="$LIBS $POSIX4_LINK $WCHAR_LINK $THREADS_LINK $DMALLOC_LINK $GUILIBS"
+EXTRA_LIBS="$LIBS $POSIX4_LINK $INET_LINK $WCHAR_LINK $THREADS_LINK $DMALLOC_LINK $DL_LINK $ZLIB_LINK -lm"
+if test "$wxUSE_MAC" = 1 ; then
+    EXTRA_LIBS="$EXTRA_LIBS -framework Carbon -framework System"
+fi
+if test "$wxUSE_GUI" = "yes"; then
+    EXTRA_LIBS="$GUILIBS $PNG_LINK $JPEG_LINK $TIFF_LINK $FREETYPE_LINK $EXTRA_LIBS"
+fi
 
-LIBS="\${top_builddir}/src/libwx_${WX_LIBRARY}.la $EXTRA_LIBS"
+LD_LIBS="\${top_builddir}/lib/${WX_LIBRARY_NAME_STATIC} $EXTRA_LIBS"
 
-INCLUDES="$TOOLKIT_INCLUDE $ZLIB_INCLUDE $LIBPNG_INCLUDE -I. -I\${top_builddir}/include -I\${top_srcdir}/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 "$ac_cv_prog_gcc" = "yes"; then
-    CXXWARNINGS="-Wall"
-      fi
-EXTRA_CFLAGS="$WXDEBUG $PROFILE $OPTIMISE $INCLUDES"
+if test "$wxUSE_GTK" = 1; then
+    WXCONFIG_INCLUDE=""
+else
+    WXCONFIG_INCLUDE="$TOOLKIT_INCLUDE"
+fi
+
+if test "$GXX" = yes ; then
+        CXXWARNINGS="-Wall"
+        fi
+EXTRA_CFLAGS="$WXDEBUG $WXODBCFLAG $PROFILE $OPTIMISE $INCLUDES"
+
+CFLAGS=`echo $CFLAGS $EXTRA_CFLAGS $CXXWARNINGS | sed 's/ \\+/ /g'`
+CXXFLAGS=`echo $CXXFLAGS $EXTRA_CFLAGS $CXXWARNINGS | sed 's/ \+/ /g'`
 
-CFLAGS="$CFLAGS $EXTRA_CFLAGS"
-CXXFLAGS="$CXXFLAGS $EXTRA_CFLAGS $CXXWARNINGS"
+LDFLAGS="$LDFLAGS $PROFILE"
 
 if test "$wxUSE_GUI" = "yes"; then
-    
-      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS bombs controls dialogs drawing dynamic \
-                   forty fractal image wxpoem"
+        
+            SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS controls dialogs \
+                     drawing dynamic erase event exec font image \
+                     minimal richedit rotate widgets"
+
+    if test "$wxUSE_UNIVERSAL" = "yes" ; then
+        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS univ"
+    fi
+
+        CPPFLAGS="$CPPFLAGS \$(EXTRADEFS) \$(APPEXTRADEFS)"
+else
+    SAMPLES_SUBDIRS="console"
 fi
 
+SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq | tr '\n' ' '| tr -d '\r'`"
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
 
 
-LIBTOOL="$LIBTOOL --silent"
 
 
 
@@ -8633,14 +18099,13 @@ LIBTOOL="$LIBTOOL --silent"
 
 
 
-SETUPH_DIR=include/wx/${TOOLKIT_DIR}
 
 
 
 
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:8644: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:18109: 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
@@ -8667,6 +18132,31 @@ else
 fi
 
 
+if test -d include; then
+    if test -d include/wx; then
+        if test -d include/wx/${SETUPH_DIR}; then
+            if test -f include/wx/${SETUPH_DIR}/setup.h; then
+                mv -f include/wx/${SETUPH_DIR}/setup.h setup.h
+            fi
+        fi
+    fi
+fi
+
+
+
+if test "$wxUSE_GUI" = "yes"; then
+            wx_cv_path_samplesubdirs=$SAMPLES_SUBDIRS
+    wx_cv_path_ifs=$PATH_IFS
+    wx_cv_program_ext=$PROGRAM_EXT
+    wx_cv_target_library=$WX_TARGET_LIBRARY
+    wx_cv_target_library_gl=$WX_TARGET_LIBRARY_GL
+    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_library_gl wx_cv_target_libtype
+    subdirs="demos samples utils contrib"
+
+fi
+
 trap '' 1 2 15
 cat > confcache <<\EOF
 # This file is a shell script that caches the results of configure
@@ -8770,64 +18260,11 @@ ac_given_INSTALL="$INSTALL"
 
 trap 'rm -fr `echo "
             wx-config
-            Makefile src/Makefile
-            include/Makefile
-            include/wx/Makefile
-            include/wx/generic/Makefile
-            include/wx/gtk/Makefile
-            include/wx/motif/Makefile
-            include/wx/msw/Makefile
-            include/wx/protocol/Makefile
-            include/wx/unix/Makefile
-            samples/Makefile
-            samples/bombs/Makefile
-            samples/caret/Makefile
-            samples/checklst/Makefile
-            samples/config/Makefile
-            samples/controls/Makefile
-            samples/db/Makefile
-            samples/dialogs/Makefile
-            samples/dnd/Makefile
-            samples/docview/Makefile
-            samples/docvwmdi/Makefile
-            samples/drawing/Makefile
-            samples/dynamic/Makefile
-            samples/forty/Makefile
-            samples/fractal/Makefile
-            samples/grid/Makefile
-            samples/help/Makefile
-            samples/image/Makefile
-            samples/internat/Makefile
-            samples/joytest/Makefile
-            samples/layout/Makefile
-            samples/listctrl/Makefile
-            samples/mdi/Makefile
-            samples/memcheck/Makefile
-            samples/mfc/Makefile
-            samples/minifram/Makefile
-            samples/minimal/Makefile
-            samples/nativdlg/Makefile
-            samples/notebook/Makefile
-            samples/oleauto/Makefile
-            samples/ownerdrw/Makefile
-            samples/png/Makefile
-            samples/printing/Makefile
-            samples/proplist/Makefile
-            samples/regtest/Makefile
-            samples/resource/Makefile
-            samples/sashtest/Makefile
-            samples/scroll/Makefile
-            samples/splitter/Makefile
-            samples/tab/Makefile
-            samples/taskbar/Makefile
-            samples/thread/Makefile
-            samples/toolbar/Makefile
-            samples/treectrl/Makefile
-            samples/typetest/Makefile
-            samples/validate/Makefile
-            samples/wxpoem/Makefile
-            samples/wxsocket/Makefile
-           ${SETUPH_DIR}/setup.h:include/wx/unix/setup.h.in" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+            src/make.env
+            src/makeprog.env
+            src/makelib.env
+            Makefile
+           setup.h:setup.h.in" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
 cat >> $CONFIG_STATUS <<EOF
 
@@ -8864,64 +18301,118 @@ s%@host_alias@%$host_alias%g
 s%@host_cpu@%$host_cpu%g
 s%@host_vendor@%$host_vendor%g
 s%@host_os@%$host_os%g
-s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
-s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
-s%@INSTALL_DATA@%$INSTALL_DATA%g
-s%@PACKAGE@%$PACKAGE%g
-s%@VERSION@%$VERSION%g
-s%@ACLOCAL@%$ACLOCAL%g
-s%@AUTOCONF@%$AUTOCONF%g
-s%@AUTOMAKE@%$AUTOMAKE%g
-s%@AUTOHEADER@%$AUTOHEADER%g
-s%@MAKEINFO@%$MAKEINFO%g
-s%@SET_MAKE@%$SET_MAKE%g
+s%@target@%$target%g
+s%@target_alias@%$target_alias%g
+s%@target_cpu@%$target_cpu%g
+s%@target_vendor@%$target_vendor%g
+s%@target_os@%$target_os%g
+s%@build@%$build%g
+s%@build_alias@%$build_alias%g
+s%@build_cpu@%$build_cpu%g
+s%@build_vendor@%$build_vendor%g
+s%@build_os@%$build_os%g
 s%@CC@%$CC%g
 s%@CPP@%$CPP%g
 s%@CXX@%$CXX%g
 s%@CXXCPP@%$CXXCPP%g
 s%@RANLIB@%$RANLIB%g
 s%@AR@%$AR%g
-s%@LN_S@%$LN_S%g
+s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
+s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
+s%@INSTALL_DATA@%$INSTALL_DATA%g
 s%@STRIP@%$STRIP%g
 s%@YACC@%$YACC%g
 s%@LEX@%$LEX%g
 s%@LEXLIB@%$LEXLIB%g
-s%@LEX_OUTPUT_ROOT@%$LEX_OUTPUT_ROOT%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
-s%@LD@%$LD%g
-s%@NM@%$NM%g
-s%@LIBTOOL@%$LIBTOOL%g
-s%@DLLTOOL@%$DLLTOOL%g
-s%@AS@%$AS%g
+s%@LN_S@%$LN_S%g
+s%@GTK_CONFIG_2_0@%$GTK_CONFIG_2_0%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_EXTRA_LIBS@%$X_EXTRA_LIBS%g
-s%@GTK_CONFIG@%$GTK_CONFIG%g
-s%@GTK_CFLAGS@%$GTK_CFLAGS%g
-s%@GTK_LIBS@%$GTK_LIBS%g
+s%@REZ@%$REZ%g
+s%@DEREZ@%$DEREZ%g
+s%@LEX_STEM@%$LEX_STEM%g
+s%@PATH_IFS@%$PATH_IFS%g
 s%@WX_MAJOR_VERSION_NUMBER@%$WX_MAJOR_VERSION_NUMBER%g
 s%@WX_MINOR_VERSION_NUMBER@%$WX_MINOR_VERSION_NUMBER%g
 s%@WX_RELEASE_NUMBER@%$WX_RELEASE_NUMBER%g
+s%@WX_LIBRARY_NAME@%$WX_LIBRARY_NAME%g
+s%@WX_LIBRARY_NAME_STATIC@%$WX_LIBRARY_NAME_STATIC%g
+s%@WX_LIBRARY_NAME_SHARED@%$WX_LIBRARY_NAME_SHARED%g
 s%@WX_LIBRARY@%$WX_LIBRARY%g
+s%@WX_TARGET_LIBRARY@%$WX_TARGET_LIBRARY%g
+s%@WX_LIBRARY_LINK1@%$WX_LIBRARY_LINK1%g
+s%@WX_LIBRARY_LINK2@%$WX_LIBRARY_LINK2%g
+s%@WX_LIBRARY_LINK3@%$WX_LIBRARY_LINK3%g
+s%@PROGRAM_EXT@%$PROGRAM_EXT%g
+s%@WX_LIBRARY_NAME_GL@%$WX_LIBRARY_NAME_GL%g
+s%@WX_LIBRARY_NAME_STATIC_GL@%$WX_LIBRARY_NAME_STATIC_GL%g
+s%@WX_LIBRARY_NAME_SHARED_GL@%$WX_LIBRARY_NAME_SHARED_GL%g
+s%@WX_LIBRARY_GL@%$WX_LIBRARY_GL%g
+s%@WX_TARGET_LIBRARY_GL@%$WX_TARGET_LIBRARY_GL%g
+s%@WX_LIBRARY_LINK1_GL@%$WX_LIBRARY_LINK1_GL%g
+s%@WX_LIBRARY_LINK2_GL@%$WX_LIBRARY_LINK2_GL%g
+s%@WX_LIBRARY_LINK3_GL@%$WX_LIBRARY_LINK3_GL%g
+s%@WX_ALL@%$WX_ALL%g
+s%@WX_ALL_INSTALLED@%$WX_ALL_INSTALLED%g
+s%@SHARED_LD@%$SHARED_LD%g
+s%@PIC_FLAG@%$PIC_FLAG%g
+s%@DEP_INFO_FLAGS@%$DEP_INFO_FLAGS%g
+s%@CODE_GEN_FLAGS@%$CODE_GEN_FLAGS%g
+s%@CODE_GEN_FLAGS_CXX@%$CODE_GEN_FLAGS_CXX%g
+s%@BURNT_LIBRARY_NAME@%$BURNT_LIBRARY_NAME%g
+s%@BURNT_LIBRARY_NAME_GL@%$BURNT_LIBRARY_NAME_GL%g
+s%@WX_TARGET_LIBRARY_SONAME@%$WX_TARGET_LIBRARY_SONAME%g
+s%@WX_TARGET_LIBRARY_TYPE@%$WX_TARGET_LIBRARY_TYPE%g
 s%@WXDEBUG_DEFINE@%$WXDEBUG_DEFINE%g
+s%@USE_GUI@%$USE_GUI%g
+s%@AFMINSTALL@%$AFMINSTALL%g
+s%@SETUPH_DIR@%$SETUPH_DIR%g
 s%@TOOLKIT@%$TOOLKIT%g
 s%@TOOLKIT_DEF@%$TOOLKIT_DEF%g
 s%@TOOLKIT_DIR@%$TOOLKIT_DIR%g
+s%@TOOLKIT_NAME@%$TOOLKIT_NAME%g
 s%@TOOLKIT_INCLUDE@%$TOOLKIT_INCLUDE%g
-s%@EXTRA_VPATH@%$EXTRA_VPATH%g
-s%@LTLIBOBJS@%$LTLIBOBJS%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%@GUIDIST@%$GUIDIST%g
+s%@PORT_FILES@%$PORT_FILES%g
+s%@DISTDIR@%$DISTDIR%g
+s%@RPM_SPEC@%$RPM_SPEC%g
+s%@RPM_FILES@%$RPM_FILES%g
+s%@SRC_SUBDIRS@%$SRC_SUBDIRS%g
 s%@INCLUDE_SUBDIRS@%$INCLUDE_SUBDIRS%g
 s%@UTILS_SUBDIRS@%$UTILS_SUBDIRS%g
 s%@DOCS_SUBDIRS@%$DOCS_SUBDIRS%g
 s%@SAMPLES_SUBDIRS@%$SAMPLES_SUBDIRS%g
 s%@USER_SUBDIRS@%$USER_SUBDIRS%g
 s%@EXTRA_LIBS@%$EXTRA_LIBS%g
-s%@SETUPH_DIR@%$SETUPH_DIR%g
+s%@OPENGL_LIBS@%$OPENGL_LIBS%g
+s%@EXTRADEFS@%$EXTRADEFS%g
+s%@LD_LIBS@%$LD_LIBS%g
+s%@WXMSW_DLL_DEFINES@%$WXMSW_DLL_DEFINES%g
+s%@RCINPUTSWITCH@%$RCINPUTSWITCH%g
+s%@RCOUTPUTSWITCH@%$RCOUTPUTSWITCH%g
+s%@RESPROGRAM@%$RESPROGRAM%g
+s%@RESCOMP@%$RESCOMP%g
+s%@RESFLAGS@%$RESFLAGS%g
+s%@REZFLAGS@%$REZFLAGS%g
+s%@DEREZFLAGS@%$DEREZFLAGS%g
+s%@LIBWXMACRES@%$LIBWXMACRES%g
+s%@LIBWXMACRESCOMP@%$LIBWXMACRESCOMP%g
+s%@DLLTOOL@%$DLLTOOL%g
+s%@AS@%$AS%g
+s%@NM@%$NM%g
+s%@LD@%$LD%g
+s%@MAKEINFO@%$MAKEINFO%g
+s%@SET_MAKE@%$SET_MAKE%g
+s%@subdirs@%$subdirs%g
 
 CEOF
 EOF
@@ -8964,63 +18455,10 @@ EOF
 cat >> $CONFIG_STATUS <<EOF
 
 CONFIG_FILES=\${CONFIG_FILES-"wx-config
-            Makefile src/Makefile
-            include/Makefile
-            include/wx/Makefile
-            include/wx/generic/Makefile
-            include/wx/gtk/Makefile
-            include/wx/motif/Makefile
-            include/wx/msw/Makefile
-            include/wx/protocol/Makefile
-            include/wx/unix/Makefile
-            samples/Makefile
-            samples/bombs/Makefile
-            samples/caret/Makefile
-            samples/checklst/Makefile
-            samples/config/Makefile
-            samples/controls/Makefile
-            samples/db/Makefile
-            samples/dialogs/Makefile
-            samples/dnd/Makefile
-            samples/docview/Makefile
-            samples/docvwmdi/Makefile
-            samples/drawing/Makefile
-            samples/dynamic/Makefile
-            samples/forty/Makefile
-            samples/fractal/Makefile
-            samples/grid/Makefile
-            samples/help/Makefile
-            samples/image/Makefile
-            samples/internat/Makefile
-            samples/joytest/Makefile
-            samples/layout/Makefile
-            samples/listctrl/Makefile
-            samples/mdi/Makefile
-            samples/memcheck/Makefile
-            samples/mfc/Makefile
-            samples/minifram/Makefile
-            samples/minimal/Makefile
-            samples/nativdlg/Makefile
-            samples/notebook/Makefile
-            samples/oleauto/Makefile
-            samples/ownerdrw/Makefile
-            samples/png/Makefile
-            samples/printing/Makefile
-            samples/proplist/Makefile
-            samples/regtest/Makefile
-            samples/resource/Makefile
-            samples/sashtest/Makefile
-            samples/scroll/Makefile
-            samples/splitter/Makefile
-            samples/tab/Makefile
-            samples/taskbar/Makefile
-            samples/thread/Makefile
-            samples/toolbar/Makefile
-            samples/treectrl/Makefile
-            samples/typetest/Makefile
-            samples/validate/Makefile
-            samples/wxpoem/Makefile
-            samples/wxsocket/Makefile
+            src/make.env
+            src/makeprog.env
+            src/makelib.env
+            Makefile
           "}
 EOF
 cat >> $CONFIG_STATUS <<\EOF
@@ -9102,7 +18540,7 @@ ac_eD='%g'
 if test "${CONFIG_HEADERS+set}" != set; then
 EOF
 cat >> $CONFIG_STATUS <<EOF
-  CONFIG_HEADERS="${SETUPH_DIR}/setup.h:include/wx/unix/setup.h.in"
+  CONFIG_HEADERS="setup.h:setup.h.in"
 EOF
 cat >> $CONFIG_STATUS <<\EOF
 fi
@@ -9190,15 +18628,54 @@ fi; done
 EOF
 cat >> $CONFIG_STATUS <<EOF
 
-
-            SETUPH_DIR=${SETUPH_DIR}
+            SETUPH_DIR="${SETUPH_DIR}"
+            TOOLKIT_NAME="${TOOLKIT_NAME}"
+            LN_S="${LN_S}"
           
          
 EOF
 cat >> $CONFIG_STATUS <<\EOF
-test -z "$CONFIG_HEADERS" || echo timestamp > ${SETUPH_DIR}/stamp-h
 
-            chmod +x 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
+              mkdir lib
+            fi
+            if test ! -d lib/wx; then
+              mkdir lib/wx
+            fi
+            if test ! -d lib/wx/include; then
+              mkdir lib/wx/include
+            fi
+            if test ! -d lib/wx/include/wx; then
+              mkdir lib/wx/include/wx
+            fi
+            if test ! -d lib/wx/include/wx/${TOOLKIT_NAME}; then
+              mkdir lib/wx/include/wx/${TOOLKIT_NAME}
+            fi
+            if test -f setup.h; then
+                cp -fp setup.h lib/wx/include/wx/${TOOLKIT_NAME}/setup.h
+            fi
+
+            
+            if test ! -d include; then
+              mkdir include
+            fi
+            if test ! -d include/wx; then
+              mkdir include/wx
+            fi
+            if test ! -d include/wx/${SETUPH_DIR}; then
+              mkdir include/wx/${SETUPH_DIR}
+            fi
+            if test -f setup.h; then
+                cp -fp setup.h include/wx/${SETUPH_DIR}/setup.h
+            fi
+
           
 exit 0
 EOF
@@ -9206,4 +18683,101 @@ chmod +x $CONFIG_STATUS
 rm -fr confdefs* $ac_clean_files
 test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
 
+if test "$no_recursion" != yes; then
+
+  # Remove --cache-file and --srcdir arguments so they do not pile up.
+  ac_sub_configure_args=
+  ac_prev=
+  for ac_arg in $ac_configure_args; do
+    if test -n "$ac_prev"; then
+      ac_prev=
+      continue
+    fi
+    case "$ac_arg" in
+    -cache-file | --cache-file | --cache-fil | --cache-fi \
+    | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
+      ac_prev=cache_file ;;
+    -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
+    | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
+      ;;
+    -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
+      ac_prev=srcdir ;;
+    -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
+      ;;
+    *) ac_sub_configure_args="$ac_sub_configure_args $ac_arg" ;;
+    esac
+  done
+
+  for ac_config_dir in demos samples utils contrib; do
+
+    # Do not complain, so a configure script can configure whichever
+    # parts of a large source tree are present.
+    if test ! -d $srcdir/$ac_config_dir; then
+      continue
+    fi
+
+    echo configuring in $ac_config_dir
+
+    case "$srcdir" in
+    .) ;;
+    *)
+      if test -d ./$ac_config_dir || mkdir ./$ac_config_dir; then :;
+      else
+        { echo "configure: error: can not create `pwd`/$ac_config_dir" 1>&2; exit 1; }
+      fi
+      ;;
+    esac
+
+    ac_popdir=`pwd`
+    cd $ac_config_dir
+
+      # A "../" for each directory in /$ac_config_dir.
+      ac_dots=`echo $ac_config_dir|sed -e 's%^\./%%' -e 's%[^/]$%&/%' -e 's%[^/]*/%../%g'`
+
+    case "$srcdir" in
+    .) # No --srcdir option.  We are building in place.
+      ac_sub_srcdir=$srcdir ;;
+    /*) # Absolute path.
+      ac_sub_srcdir=$srcdir/$ac_config_dir ;;
+    *) # Relative path.
+      ac_sub_srcdir=$ac_dots$srcdir/$ac_config_dir ;;
+    esac
+
+    # Check for guested configure; otherwise get Cygnus style configure.
+    if test -f $ac_sub_srcdir/configure; then
+      ac_sub_configure=$ac_sub_srcdir/configure
+    elif test -f $ac_sub_srcdir/configure.in; then
+      ac_sub_configure=$ac_configure
+    else
+      echo "configure: warning: no configuration information is in $ac_config_dir" 1>&2
+      ac_sub_configure=
+    fi
+
+    # The recursion is here.
+    if test -n "$ac_sub_configure"; then
+
+      # Make the cache file name correct relative to the subdirectory.
+      case "$cache_file" in
+      /*) ac_sub_cache_file=$cache_file ;;
+      *) # Relative path.
+        ac_sub_cache_file="$ac_dots$cache_file" ;;
+      esac
+  case "$ac_given_INSTALL" in
+        [/$]*) INSTALL="$ac_given_INSTALL" ;;
+        *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
+        esac
+
+      echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir"
+      # The eval makes quoting arguments work.
+      if eval ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir
+      then :
+      else
+        { echo "configure: error: $ac_sub_configure failed for $ac_config_dir" 1>&2; exit 1; }
+      fi
+    fi
+
+    cd $ac_popdir
+  done
+fi
+