]> git.saurik.com Git - wxWidgets.git/blobdiff - configure
VisualAge C++ V4.0 fixups, can't differentiate between time_t and double???
[wxWidgets.git] / configure
index 28c5f5d091219518ba6e69c8716b135020cbdba5..7077f949cdcc291752a9d41e7fac2f69f009e6f4 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,7 +1,44 @@
 #! /bin/sh
+
+# From configure.in Id: configure.in
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 # Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.12 
+# Generated automatically using autoconf version 2.14 
 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
 #
 # This configure script is free software; the Free Software Foundation
@@ -12,93 +49,231 @@ ac_help=
 ac_default_prefix=/usr/local
 # Any additions from configure.in:
 ac_help="$ac_help
-  --with-x                use the X Window System"
+--enable-gui            use GUI classes"
+ac_help="$ac_help
+  --with-gtk              use GTK+"
+ac_help="$ac_help
+  --with-motif            use Motif/Lesstif"
+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-pm               use OS/2 Presentation Manager"
+ac_help="$ac_help
+  --with-gtk-prefix=PFX   Prefix where GTK is installed"
+ac_help="$ac_help
+  --with-gtk-exec-prefix=PFX  Exec prefix where GTK is installed"
+ac_help="$ac_help
+--with-libpng           use libpng (PNG image format)"
+ac_help="$ac_help
+--with-libjpeg          use libjpeg (JPEG file format)"
+ac_help="$ac_help
+--with-libtiff          use libtiff (TIFF file format)"
+ac_help="$ac_help
+--with-opengl           use OpenGL (or Mesa)"
+ac_help="$ac_help
+--with-dmalloc          use dmalloc library (www.letters.com/dmalloc)"
+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-optimise       create optimised code"
+ac_help="$ac_help
+--enable-debug          same as debug_flag and debug_info"
+ac_help="$ac_help
+--enable-debug_flag     set __WXDEBUG__ flag (recommended for developers!)"
+ac_help="$ac_help
+--enable-debug_info     create code with debugging information"
+ac_help="$ac_help
+--enable-debug_gdb      create code with extra GDB debugging information"
+ac_help="$ac_help
+--enable-debug_cntxt    use wxDebugContext"
+ac_help="$ac_help
+--enable-mem_tracing    create code with memory tracing"
+ac_help="$ac_help
+--enable-profile        create code with profiling information"
+ac_help="$ac_help
+--enable-no_rtti        create code without RTTI information"
+ac_help="$ac_help
+--enable-no_exceptions  create code without exceptions information"
+ac_help="$ac_help
+--enable-permissive     compile code disregarding strict ANSI"
 ac_help="$ac_help
-**--with-gtk              use GTK"
+--enable-no_deps        create code without dependency information"
 ac_help="$ac_help
-**--with-qt               use Qt"
+--enable-intl           use internationalization system"
 ac_help="$ac_help
-**--with-motif            use Motif/Lesstif"
+--enable-config         use wxConfig (and derived) classes"
 ac_help="$ac_help
-**--with-shared           create shared libraries"
+--enable-sockets        use socket/network classes"
 ac_help="$ac_help
-**--with-optimise         create optimised code"
+--enable-dialupman      use dialup network classes"
 ac_help="$ac_help
-**--with-debug_flag       create code with WXDEBUG define set to 1"
+--enable-ipc            use interprocess communication (wxSocket etc.)"
 ac_help="$ac_help
-**--with-debug_info       create code with debuging information"
+--enable-apple_ieee     use the Apple IEEE codec"
 ac_help="$ac_help
-**--with-debug_gdb        create code with extra GDB debuging information"
+--enable-timedate       use date/time classes"
 ac_help="$ac_help
-**--with-mem_traing       create code with memory tracing"
+--enable-wave           use wxWave class"
 ac_help="$ac_help
-**--with-dmalloc          use dmalloc memory debug library (www.letters.com/dmalloc/)"
+--enable-fraction       use wxFraction class"
 ac_help="$ac_help
-**--with-profile          create code with profiling information"
+--enable-dynlib         use wxLibrary class for DLL loading"
 ac_help="$ac_help
-**--with_apple_ieee      use the Apple IEEE codec"
+--enable-longlong       use wxLongLong class"
 ac_help="$ac_help
-**--with-threads          for enabling threads"
+--enable-log            use logging system"
 ac_help="$ac_help
-**--with-dynlib           to compile wxLibrary class"
+--enable-streams        use wxStream etc classes"
 ac_help="$ac_help
-**--with-zlib             use zlib for LZW comression"
+--enable-file           use wxFile classes"
 ac_help="$ac_help
-**--with-libpng           use libpng (PNG image format)"
+--enable-textfile       use wxTextFile classes"
 ac_help="$ac_help
-**--with-libjpeg          use libjpeg (JPEG image format)"
+--enable-unicode        compile wxString with Unicode support"
 ac_help="$ac_help
-**--with-odbc             use iODBC and wxODBC classes"
+--enable-wcsrtombs      use wcsrtombs instead of buggy (GNU libc1/Linux libc5) wcstombs"
 ac_help="$ac_help
-**--with-timedate         use wxTime and wxDate classes"
+--enable-wxprintfv      use wxWindows implementation of vprintf()"
 ac_help="$ac_help
-**--with-intl             use internationalization system"
+--enable-joystick       compile in joystick support (Linux only)"
 ac_help="$ac_help
-**--with-config           use wxConfig class"
+--enable-std_iostreams  use standard C++ stream classes"
 ac_help="$ac_help
-**--with-streams          use wxStream etc classes"
+--enable-fs_inet        use virtual HTTP/FTP filesystems"
 ac_help="$ac_help
-**--with-serial           use class serialization"
+--enable-fs_zip         use virtual ZIP filesystems"
 ac_help="$ac_help
-**--with-sockets         use wxSocket etc classes"
+--enable-zipstream      use wxZipInputStream"
 ac_help="$ac_help
-**--with-afmfonts         use Adobe Font Metric Font table"
+--enable-threads        use threads"
 ac_help="$ac_help
-**--with-PS-normalized    use normalized PS fonts"
+--enable-serial         use class serialization"
 ac_help="$ac_help
-**--with-postscript       use wxPostscriptDC device context"
+--enable-docview        use document view architecture"
 ac_help="$ac_help
-**--with-unicode          compile wxString with Unicode support"
+--enable-help           use help (using external browser at present)"
 ac_help="$ac_help
-**--with-wcsrtombs        use wcsrtombs instead of (buggy in GNU libc5) wcstombs"
+--enable-constraints    use layout-constraints system"
 ac_help="$ac_help
-**--with-wxresources      use wxWindows's resources"
+--enable-printarch      use printing architecture"
 ac_help="$ac_help
-**--with-prologio         use Prolog IO library"
+--enable-mdi            use multiple document interface architecture"
 ac_help="$ac_help
-**--with-rpc              use Prolog's remote procedure calls"
+--enable-postscript     use wxPostscriptDC device context (default for gtk+)"
 ac_help="$ac_help
-**--with-ipc              use interprocess communication (wxSocket etc.)"
+--enable-prologio       use Prolog IO library"
 ac_help="$ac_help
-**--with-resources        use X resources for saving information"
+--enable-resources      use wxWindows resources"
 ac_help="$ac_help
-**--with-clipboard        use wxClipboard classes"
+--enable-xresources     use X resources for save (default for gtk+)"
 ac_help="$ac_help
-**--with-tooltips         use tooltips"
+--enable-clipboard      use wxClipboard classes"
 ac_help="$ac_help
-**--with-dnd              use Drag'n'Drop classes"
+--enable-dnd            use Drag'n'Drop classes"
 ac_help="$ac_help
-**--with-mdi              use multiple document interface architecture"
+--enable-wxtree         make wxTree library"
 ac_help="$ac_help
-**--with-docview          use document view architecture"
+--enable-controls       use all usual controls"
 ac_help="$ac_help
-**--with-printarch        use printing architecture"
+--enable-accel          use accelerators"
 ac_help="$ac_help
-**--with-help             use help (using external browser at present)"
+--enable-caret          use wxCaret class"
 ac_help="$ac_help
-**--with-gtk-prefix=PFX       Prefix where GTK is installed"
+--enable-bmpbutton      use wxBitmapButton class"
 ac_help="$ac_help
-**--with-gtk-exec-prefix=PFX  Exec prefix where GTK is installed"
+--enable-checkbox       use wxCheckBox class"
+ac_help="$ac_help
+--enable-checklst       use wxCheckListBox (listbox with checkboxes) class"
+ac_help="$ac_help
+--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
+--enable-listbox        use wxListBox class"
+ac_help="$ac_help
+--enable-listctrl       use wxListCtrl class"
+ac_help="$ac_help
+--enable-notebook       use wxNotebook class"
+ac_help="$ac_help
+--enable-radiobox       use wxRadioBox class"
+ac_help="$ac_help
+--enable-radiobtn       use wxRadioButton class"
+ac_help="$ac_help
+--enable-sash           use wxSashWindow class"
+ac_help="$ac_help
+--enable-scrollbar      use wxScrollBar class and scrollable windows"
+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"
+ac_help="$ac_help
+--enable-statbox        use wxStaticBox class"
+ac_help="$ac_help
+--enable-statline       use wxStaticLine class"
+ac_help="$ac_help
+--enable-statusbar      use wxStatusBar class"
+ac_help="$ac_help
+--enable-tabdialog      use wxTabControl class"
+ac_help="$ac_help
+--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-commondlg      use common dialogs (wxDirDialog, wxProgressDialog, wxTextDialog, ...)"
+ac_help="$ac_help
+--enable-dirdlg         use wxDirDialog"
+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-miniframe      use wxMiniFrame class"
+ac_help="$ac_help
+--enable-html           use wxHTML sub-library"
+ac_help="$ac_help
+--enable-tooltips       use wxToolTip class"
+ac_help="$ac_help
+--enable-splines        use spline drawing code"
+ac_help="$ac_help
+--enable-validators     use wxValidator and derived classes"
+ac_help="$ac_help
+--enable-busyinfo       use wxBusyInfo"
+ac_help="$ac_help
+--enable-gif            use gif images (GIF file format)"
+ac_help="$ac_help
+--enable-pcx            use pcx images (PCX file format)"
+ac_help="$ac_help
+--enable-pnm            use pnm images (PNM file format)"
+ac_help="$ac_help
+  --with-x                use the X Window System"
 
 # Initialize some variables set by options.
 # The variables have the same names as the options, with
@@ -137,6 +312,7 @@ mandir='${prefix}/man'
 # Initialize some other variables.
 subdirs=
 MFLAGS= MAKEFLAGS=
+SHELL=${CONFIG_SHELL-/bin/sh}
 # Maximum number of lines to put in a shell here document.
 ac_max_here_lines=12
 
@@ -420,7 +596,7 @@ EOF
     verbose=yes ;;
 
   -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.12"
+    echo "configure generated by autoconf version 2.14"
     exit 0 ;;
 
   -with-* | --with-*)
@@ -538,7 +714,7 @@ echo > confdefs.h
 
 # A filename unique to this package, relative to the directory that
 # configure is in, which we can look for to find out if srcdir is correct.
-ac_unique_file=configure.in
+ac_unique_file=wx-config.in
 
 # Find the source files, if location was not specified.
 if test -z "$srcdir"; then
@@ -590,9 +766,11 @@ 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 $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 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
 
+ac_exeext=
+ac_objext=o
 if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
   # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
   if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
 
 
 
+ac_aux_dir=
+for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
+  if test -f $ac_dir/install-sh; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install-sh -c"
+    break
+  elif test -f $ac_dir/install.sh; then
+    ac_aux_dir=$ac_dir
+    ac_install_sh="$ac_aux_dir/install.sh -c"
+    break
+  fi
+done
+if test -z "$ac_aux_dir"; then
+  { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; }
+fi
+ac_config_guess=$ac_aux_dir/config.guess
+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
 
-OS="${OSTYPE}"
 
-if test "x$OS" = "x"; then
-  UNAME=`uname`
-  { echo "configure: error: "The system variable OS has not been set"
-               "please set is everytime befor compiling on this system"
-               "A good example for this system would be:"
-               "setenv OSTYPE $UNAME        for csh as a SHELL"
-               "EXPORT OSTYPE=$UNAME        for sh as SHELL"
-               "please set this and restart again."
-              " 1>&2; exit 1; }
+# 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:836: checking host system type" >&5
 
-WXBASEDIR=`pwd`
+host_alias=$host
+case "$host_alias" in
+NONE)
+  case $nonopt in
+  NONE)
+    if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
+    else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
+    fi ;;
+  *) host_alias=$nonopt ;;
+  esac ;;
+esac
 
+host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
+host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+echo "$ac_t""$host" 1>&6
 
+echo $ac_n "checking target system type""... $ac_c" 1>&6
+echo "configure:857: checking target system type" >&5
 
-SEARCH_INCLUDE="\
-    /usr/Motif-1.2/include    \
-    /usr/Motif-2.1/include    \
-                              \
-    /usr/include/Motif1.2     \
-    /opt/xpm/include/X11      \
-                              \
-    /usr/Motif1.2/include     \
-    /usr/dt/include           \
-    /usr/include/Xm           \
-                                         \
-    /usr/X11R6/include        \
-    /usr/X11R5/include        \
-    /usr/X11R4/include        \
-                              \
-    /usr/X11R6/lib            \
-    /usr/X11R5/lib            \
-    /usr/X11R4/lib            \
-                              \
-    /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  \
-                              \
-    /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 \
-    "
+target_alias=$target
+case "$target_alias" in
+NONE)
+  case $nonopt in
+  NONE) target_alias=$host_alias ;;
+  *) target_alias=$nonopt ;;
+  esac ;;
+esac
 
-SEARCH_LIB="`echo "$SEARCH_INCLUDE" | sed s/include/lib/g` "
+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:875: 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
 
-# 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:695: 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="${IFS}:"
-  for ac_dir in $PATH; 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
+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 -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:724: 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="${IFS}:"
-  ac_prog_rejected=no
-  for ac_dir in $PATH; 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.
+test "$host_alias" != "$target_alias" &&
+  test "$program_prefix$program_suffix$program_transform_name" = \
+    NONENONEs,x,x, &&
+  program_prefix=${target_alias}-
+
+
+
+WX_MAJOR_VERSION_NUMBER=2
+WX_MINOR_VERSION_NUMBER=1
+WX_RELEASE_NUMBER=12
+
+WX_INTERFACE_AGE=0
+WX_BINARY_AGE=0
+
+WX_VERSION=$WX_MAJOR_VERSION_NUMBER.$WX_MINOR_VERSION_NUMBER.$WX_RELEASE_NUMBER
+
+WX_RELEASE=$WX_MAJOR_VERSION_NUMBER.$WX_MINOR_VERSION_NUMBER
+WX_CURRENT=`expr $WX_RELEASE_NUMBER - $WX_INTERFACE_AGE`
+WX_REVISION=$WX_INTERFACE_AGE
+WX_AGE=`expr $WX_BINARY_AGE - $WX_INTERFACE_AGE`
+
+
+USE_UNIX=1
+USE_WIN32=0
+USE_BEOS=0
+
+USE_LINUX=
+USE_SGI=
+USE_HPUX=
+USE_SYSV=
+USE_SVR4=
+USE_AIX=
+USE_SUN=
+USE_SOLARIS=
+USE_SUNOS=
+USE_ALPHA=
+USE_OSF=
+USE_BSD=
+USE_FREEBSD=
+USE_VMS=
+USE_ULTRIX=
+USE_CYGWIN=
+USE_MINGW=
+USE_DATA_GENERAL=
+
+NEEDS_D_REENTRANT_FOR_R_FUNCS=0
+
+ALL_TOOLKITS="CYGWIN GTK MINGW MOTIF WINE PM"
+
+DEFAULT_wxUSE_GTK=0
+DEFAULT_wxUSE_MOTIF=0
+DEFAULT_wxUSE_MSW=0
+DEFAULT_wxUSE_WINE=0
+DEFAULT_wxUSE_PM=0
+
+DEFAULT_DEFAULT_wxUSE_GTK=0
+DEFAULT_DEFAULT_wxUSE_MOTIF=0
+DEFAULT_DEFAULT_wxUSE_MSW=0
+DEFAULT_DEFAULT_wxUSE_WINE=0
+DEFAULT_DEFAULT_wxUSE_PM=0
+
+case "${host}" in
+  *-hp-hpux* )
+    USE_HPUX=1
+    DEFAULT_DEFAULT_wxUSE_MOTIF=1
+    NEEDS_D_REENTRANT_FOR_R_FUNCS=1
+    cat >> confdefs.h <<\EOF
+#define __HPUX__ 1
+EOF
+
+  ;;
+  *-*-linux* )
+    USE_LINUX=1
+    cat >> confdefs.h <<\EOF
+#define __LINUX__ 1
+EOF
+
+    TMP=`uname -m`
+    if test "x$TMP" = "xalpha"; then
+      USE_ALPHA=1
+      cat >> confdefs.h <<\EOF
+#define __ALPHA__ 1
+EOF
+
+    fi
+    DEFAULT_DEFAULT_wxUSE_GTK=1
+  ;;
+  *-*-irix5* | *-*-irix6* )
+    USE_SGI=1
+    USE_SVR4=1
+    cat >> confdefs.h <<\EOF
+#define __SGI__ 1
+EOF
+
+    cat >> confdefs.h <<\EOF
+#define __SVR4__ 1
+EOF
+
+    DEFAULT_DEFAULT_wxUSE_MOTIF=1
+  ;;
+  *-*-solaris2* )
+    USE_SUN=1
+    USE_SOLARIS=1
+    USE_SVR4=1
+    cat >> confdefs.h <<\EOF
+#define __SUN__ 1
+EOF
+
+    cat >> confdefs.h <<\EOF
+#define __SOLARIS__ 1
+EOF
+
+    cat >> confdefs.h <<\EOF
+#define __SVR4__ 1
+EOF
+
+    DEFAULT_DEFAULT_wxUSE_MOTIF=1
+    NEEDS_D_REENTRANT_FOR_R_FUNCS=1
+  ;;
+  *-*-sunos4* )
+    USE_SUN=1
+    USE_SUNOS=1
+    USE_BSD=1
+    cat >> confdefs.h <<\EOF
+#define __SUN__ 1
+EOF
+
+    cat >> confdefs.h <<\EOF
+#define __SUNOS__ 1
+EOF
+
+    cat >> confdefs.h <<\EOF
+#define __BSD__ 1
+EOF
+
+    DEFAULT_DEFAULT_wxUSE_MOTIF=1
+  ;;
+  *-*-freebsd* | *-*-netbsd*)
+    USE_BSD=1
+    USE_FREEBSD=1
+    cat >> confdefs.h <<\EOF
+#define __FREEBSD__ 1
+EOF
+
+    cat >> confdefs.h <<\EOF
+#define __BSD__ 1
+EOF
+
+    DEFAULT_DEFAULT_wxUSE_GTK=1
+  ;;
+  *-*-osf* )
+    USE_ALPHA=1
+    USE_OSF=1
+    cat >> confdefs.h <<\EOF
+#define __ALPHA__ 1
+EOF
+
+    cat >> confdefs.h <<\EOF
+#define __OSF__ 1
+EOF
+
+    DEFAULT_DEFAULT_wxUSE_MOTIF=1
+  ;;
+  *-*-dgux5* )
+    USE_ALPHA=1
+    USE_SVR4=1
+    cat >> confdefs.h <<\EOF
+#define __ALPHA__ 1
+EOF
+
+    cat >> confdefs.h <<\EOF
+#define __SVR4__ 1
+EOF
+
+    DEFAULT_DEFAULT_wxUSE_MOTIF=1
+  ;;
+  *-*-sysv5* )
+    USE_SYSV=1
+    USE_SVR4=1
+    cat >> confdefs.h <<\EOF
+#define __SYSV__ 1
+EOF
+
+    cat >> confdefs.h <<\EOF
+#define __SVR4__ 1
+EOF
+
+    DEFAULT_DEFAULT_wxUSE_MOTIF=1
+  ;;
+  *-*-aix* )
+    USE_AIX=1
+    USE_SYSV=1
+    USE_SVR4=1
+    cat >> confdefs.h <<\EOF
+#define __AIX__ 1
+EOF
+
+    cat >> confdefs.h <<\EOF
+#define __SYSV__ 1
+EOF
+
+    cat >> confdefs.h <<\EOF
+#define __SVR4__ 1
+EOF
+
+    DEFAULT_DEFAULT_wxUSE_MOTIF=1
+  ;;
+
+  *-*-cygwin32* | *-*-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
+
+    DEFAULT_DEFAULT_wxUSE_MSW=1
+  ;;
+
+  *-pc-os2_emx )
+    cat >> confdefs.h <<\EOF
+#define __EMX__ 1
+EOF
+
+    DEFAULT_DEFAULT_wxUSE_PM=1
+  ;;
+
+  *-*-beos* )
+        USE_BEOS=1
+    cat >> confdefs.h <<\EOF
+#define __BEOS__ 1
+EOF
+
+  ;;
+
+  *)
+    { 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
+#define __UNIX__ 1
+EOF
+
+
+    SRC_SUBDIRS="$SRC_SUBDIRS unix"
+    INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS unix"
+fi
+
+if test "$USE_BEOS" = 1; then
+    SRC_SUBDIRS="$SRC_SUBDIRS be"
+    INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS be"
+fi
+
+if test "$USE_LINUX" = 1; then
+  echo $ac_n "checking for gettext in -lc""... $ac_c" 1>&6
+echo "configure:1168: checking for gettext in -lc" >&5
+ac_lib_var=`echo c'_'gettext | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-lc  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 1176 "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();
+
+int main() {
+gettext()
+; return 0; }
+EOF
+if { (eval echo configure:1187: \"$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 wxHAVE_GLIBC2 1
+EOF
+
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+fi
+
+
+
+
+          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_THREADS=yes
+
+  DEFAULT_wxUSE_SHARED=yes
+  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=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_GUI=yes
+
+  DEFAULT_wxUSE_ZLIB=no
+  DEFAULT_wxUSE_LIBPNG=no
+  DEFAULT_wxUSE_LIBJPEG=no
+  DEFAULT_wxUSE_LIBTIFF=no
+  DEFAULT_wxUSE_ODBC=no
+
+  DEFAULT_wxUSE_STD_IOSTREAM=no
+  DEFAULT_wxUSE_FILE=no
+  DEFAULT_wxUSE_TEXTFILE=no
+  DEFAULT_wxUSE_TIMEDATE=no
+  DEFAULT_wxUSE_WAVE=no
+  DEFAULT_wxUSE_INTL=no
+  DEFAULT_wxUSE_CONFIG=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_AFM_FOR_POSTSCRIPT=no
+  DEFAULT_wxUSE_NORMALIZED_PS_FONTS=no
+  DEFAULT_wxUSE_POSTSCRIPT=no
+
+  DEFAULT_wxUSE_X_RESOURCES=no
+  DEFAULT_wxUSE_CLIPBOARD=no
+  DEFAULT_wxUSE_TOOLTIPS=no
+  DEFAULT_wxUSE_DRAG_AND_DROP=no
+  DEFAULT_wxUSE_SPLINES=no
+
+  DEFAULT_wxUSE_MDI_ARCHITECTURE=no
+  DEFAULT_wxUSE_DOC_VIEW_ARCHITECTURE=no
+  DEFAULT_wxUSE_PRINTING_ARCHITECTURE=no
+
+  DEFAULT_wxUSE_PROLOGIO=no
+  DEFAULT_wxUSE_RESOURCES=no
+  DEFAULT_wxUSE_CONSTRAINTS=no
+  DEFAULT_wxUSE_IPC=no
+  DEFAULT_wxUSE_HELP=no
+  DEFAULT_wxUSE_WXTREE=no
+  DEFAULT_wxUSE_METAFILE=no
+
+  DEFAULT_wxUSE_COMMONDLGS=no
+  DEFAULT_wxUSE_DIRDLG=no
+  DEFAULT_wxUSE_TEXTDLG=no
+  DEFAULT_wxUSE_STARTUP_TIPS=no
+  DEFAULT_wxUSE_PROGRESSDLG=no
+  DEFAULT_wxUSE_MINIFRAME=no
+  DEFAULT_wxUSE_HTML=no
+  DEFAULT_wxUSE_FS_INET=no
+  DEFAULT_wxUSE_FS_ZIP=no
+  DEFAULT_wxUSE_BUSYINFO=no
+  DEFAULT_wxUSE_ZIPSTREAM=no
+  DEFAULT_wxUSE_VALIDATORS=yes
+
+  DEFAULT_wxUSE_ACCEL=no
+  DEFAULT_wxUSE_CARET=no
+  DEFAULT_wxUSE_BMPBUTTON=no
+  DEFAULT_wxUSE_CHECKBOX=no
+  DEFAULT_wxUSE_CHECKLST=no
+  DEFAULT_wxUSE_CHOICE=yes
+  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_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=yes
+  DEFAULT_wxUSE_TABDIALOG=no
+  DEFAULT_wxUSE_TOOLBAR=no
+  DEFAULT_wxUSE_TOOLBAR_NATIVE=no
+  DEFAULT_wxUSE_TOOLBAR_SIMPLE=no
+  DEFAULT_wxUSE_TREECTRL=no
+
+  DEFAULT_wxUSE_UNICODE=no
+  DEFAULT_wxUSE_WCSRTOMBS=no
+
+  DEFAULT_wxUSE_GIF=no
+  DEFAULT_wxUSE_PCX=no
+  DEFAULT_wxUSE_PNM=no
+else
+  DEFAULT_wxUSE_THREADS=yes
+
+  DEFAULT_wxUSE_SHARED=yes
+  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_GUI=yes
+
+  DEFAULT_wxUSE_ZLIB=yes
+  DEFAULT_wxUSE_LIBPNG=yes
+  DEFAULT_wxUSE_LIBJPEG=yes
+  DEFAULT_wxUSE_LIBTIFF=yes
+  DEFAULT_wxUSE_ODBC=yes
+
+  DEFAULT_wxUSE_STD_IOSTREAM=no
+  DEFAULT_wxUSE_FILE=yes
+  DEFAULT_wxUSE_TEXTFILE=yes
+  DEFAULT_wxUSE_TIMEDATE=yes
+  DEFAULT_wxUSE_WAVE=no
+  DEFAULT_wxUSE_INTL=yes
+  DEFAULT_wxUSE_CONFIG=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=yes
+
+  DEFAULT_wxUSE_AFM_FOR_POSTSCRIPT=yes
+  DEFAULT_wxUSE_NORMALIZED_PS_FONTS=yes
+  DEFAULT_wxUSE_POSTSCRIPT=yes
+
+  DEFAULT_wxUSE_X_RESOURCES=no
+  DEFAULT_wxUSE_CLIPBOARD=yes
+  DEFAULT_wxUSE_TOOLTIPS=yes
+  DEFAULT_wxUSE_DRAG_AND_DROP=yes
+  DEFAULT_wxUSE_SPLINES=yes
+
+  DEFAULT_wxUSE_MDI_ARCHITECTURE=yes
+  DEFAULT_wxUSE_DOC_VIEW_ARCHITECTURE=yes
+  DEFAULT_wxUSE_PRINTING_ARCHITECTURE=yes
+
+  DEFAULT_wxUSE_PROLOGIO=yes
+  DEFAULT_wxUSE_RESOURCES=yes
+  DEFAULT_wxUSE_CONSTRAINTS=yes
+  DEFAULT_wxUSE_IPC=yes
+  DEFAULT_wxUSE_HELP=yes
+  DEFAULT_wxUSE_WXTREE=yes
+  DEFAULT_wxUSE_METAFILE=yes
+
+  DEFAULT_wxUSE_COMMONDLGS=yes
+  DEFAULT_wxUSE_DIRDLG=yes
+  DEFAULT_wxUSE_TEXTDLG=yes
+  DEFAULT_wxUSE_STARTUP_TIPS=yes
+  DEFAULT_wxUSE_PROGRESSDLG=yes
+  DEFAULT_wxUSE_MINIFRAME=yes
+  DEFAULT_wxUSE_HTML=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_BMPBUTTON=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=no
+  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_SPINCTRL=yes
+  DEFAULT_wxUSE_SPLITTER=yes
+  DEFAULT_wxUSE_STATBMP=yes
+  DEFAULT_wxUSE_STATBOX=yes
+  DEFAULT_wxUSE_STATLINE=yes
+  DEFAULT_wxUSE_STATUSBAR=yes
+  DEFAULT_wxUSE_TABDIALOG=no
+  DEFAULT_wxUSE_TOOLBAR=yes
+  DEFAULT_wxUSE_TOOLBAR_NATIVE=yes
+  DEFAULT_wxUSE_TOOLBAR_SIMPLE=yes
+  DEFAULT_wxUSE_TREECTRL=yes
+
+  DEFAULT_wxUSE_UNICODE=no
+  DEFAULT_wxUSE_WCSRTOMBS=no
+
+  DEFAULT_wxUSE_GIF=yes
+  DEFAULT_wxUSE_PCX=yes
+  DEFAULT_wxUSE_PNM=yes
+fi
+
+
+
+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:1471: 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
+  
+                          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
+
+
+          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
+
+# Check whether --with-gtk or --without-gtk was given.
+if test "${with_gtk+set}" = set; then
+  withval="$with_gtk"
+  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" CACHE_MOTIF=1 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" CACHE_CYGWIN=1 TOOLKIT_GIVEN=1
+fi
+
+# Check whether --with-mingw or --without-mingw was given.
+if test "${with_mingw+set}" = set; then
+  withval="$with_mingw"
+  wxUSE_MINGW="$withval" CACHE_MINGW=1 TOOLKIT_GIVEN=1
+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-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
+
+
+
+          echo $ac_n "checking "for --with-libpng"""... $ac_c" 1>&6
+echo "configure:1567: 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"
+  
+                        if test "$withval" = yes; then
+                          ac_cv_use_libpng='wxUSE_LIBPNG=yes'
+                        else
+                          ac_cv_use_libpng='wxUSE_LIBPNG=no'
+                        fi
+                      
+else
+  
+                        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
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking "for --with-libjpeg"""... $ac_c" 1>&6
+echo "configure:1606: 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"
+  
+                        if test "$withval" = yes; then
+                          ac_cv_use_libjpeg='wxUSE_LIBJPEG=yes'
+                        else
+                          ac_cv_use_libjpeg='wxUSE_LIBJPEG=no'
+                        fi
+                      
+else
+  
+                        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
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking "for --with-libtiff"""... $ac_c" 1>&6
+echo "configure:1645: 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'
+                        else
+                          ac_cv_use_libtiff='wxUSE_LIBTIFF=no'
+                        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
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking "for --with-opengl"""... $ac_c" 1>&6
+echo "configure:1684: 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"
+  
+                        if test "$withval" = yes; then
+                          ac_cv_use_opengl='wxUSE_OPENGL=yes'
+                        else
+                          ac_cv_use_opengl='wxUSE_OPENGL=no'
+                        fi
+                      
+else
+  
+                        LINE=`grep "wxUSE_OPENGL" ${wx_arg_cache_file}`
+                        if test "x$LINE" != x ; then
+                          eval "DEFAULT_$LINE"
+                        else
+                          no_cache=1
+                        fi
+
+                        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
+        
+
+fi
+
+
+          echo $ac_n "checking "for --with-dmalloc"""... $ac_c" 1>&6
+echo "configure:1726: 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
+  
+                        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
+
+
+          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-zlib"""... $ac_c" 1>&6
+echo "configure:1765: 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'
+                        else
+                          ac_cv_use_zlib='wxUSE_ZLIB=no'
+                        fi
+                      
+else
+  
+                        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
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking "for --with-odbc"""... $ac_c" 1>&6
+echo "configure:1804: 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
+  
+                        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
+
+
+          eval "$ac_cv_use_odbc"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_odbc >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_ODBC" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+
+
+
+          echo $ac_n "checking "for --enable-shared"""... $ac_c" 1>&6
+echo "configure:1846: 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
+  
+                          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
+
+          if test "$wxUSE_SHARED" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking "for --enable-optimise"""... $ac_c" 1>&6
+echo "configure:1885: 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
+  
+                          LINE=`grep "wxUSE_OPTIMISE" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_optimise='wxUSE_OPTIMISE='$DEFAULT_wxUSE_OPTIMISE
+                        
+fi
+
+
+          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:1924: 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
+  
+                          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
+
+
+          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
+
+
+          echo $ac_n "checking "for --enable-debug_flag"""... $ac_c" 1>&6
+echo "configure:1972: 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
+  
+                          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
+
+
+          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:2011: 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
+  
+                          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
+
+
+          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:2050: 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
+  
+                          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
+
+
+          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:2089: 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
+  
+                          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
+
+
+          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:2128: 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
+  
+                          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
+
+
+          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:2167: 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
+  
+                          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
+
+          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:2206: 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
+  
+                          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
+
+
+          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:2245: 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
+  
+                          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
+
+          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:2284: 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
+  
+                          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
+
+
+          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:2323: 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
+  
+                          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
+
+
+          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-intl"""... $ac_c" 1>&6
+echo "configure:2364: 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
+  
+                          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
+
+
+          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:2403: 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
+  
+                          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
+
+          if test "$wxUSE_CONFIG" = 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-sockets"""... $ac_c" 1>&6
+echo "configure:2444: 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
+  
+                          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
+
+
+          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
+        
+else
+wxUSE_SOCKETS=no
+fi
+
+
+          echo $ac_n "checking "for --enable-dialupman"""... $ac_c" 1>&6
+echo "configure:2487: 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
+
+
+          eval "$ac_cv_use_dialupman"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_dialupman >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_DIALUP_MANAGER" = 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:2526: 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
+  
+                          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
+
+
+          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-apple_ieee"""... $ac_c" 1>&6
+echo "configure:2565: 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
+  
+                          LINE=`grep "wxUSE_APPLE_IEEE" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_apple_ieee='wxUSE_APPLE_IEEE='$DEFAULT_wxUSE_APPLE_IEEE
+                        
+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
+
+          if test "$wxUSE_APPLE_IEEE" = 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:2604: 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
+  
+                          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
+
+
+          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-wave"""... $ac_c" 1>&6
+echo "configure:2643: checking "for --enable-wave"" >&5
+          no_cache=0
+          # Check whether --enable-wave or --disable-wave was given.
+if test "${enable_wave+set}" = set; then
+  enableval="$enable_wave"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_wave='wxUSE_WAVE=yes'
+                          else
+                            ac_cv_use_wave='wxUSE_WAVE=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_WAVE" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_wave='wxUSE_WAVE='$DEFAULT_wxUSE_WAVE
+                        
+fi
+
+
+          eval "$ac_cv_use_wave"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_wave >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_WAVE" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking "for --enable-fraction"""... $ac_c" 1>&6
+echo "configure:2682: checking "for --enable-fraction"" >&5
+          no_cache=0
+          # Check whether --enable-fraction or --disable-fraction was given.
+if test "${enable_fraction+set}" = set; then
+  enableval="$enable_fraction"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_fraction='wxUSE_FRACTION=yes'
+                          else
+                            ac_cv_use_fraction='wxUSE_FRACTION=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_FRACTION" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_fraction='wxUSE_FRACTION='$DEFAULT_wxUSE_FRACTION
+                        
+fi
+
+
+          eval "$ac_cv_use_fraction"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_fraction >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_FRACTION" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking "for --enable-dynlib"""... $ac_c" 1>&6
+echo "configure:2721: checking "for --enable-dynlib"" >&5
+          no_cache=0
+          # Check whether --enable-dynlib or --disable-dynlib was given.
+if test "${enable_dynlib+set}" = set; then
+  enableval="$enable_dynlib"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_dynlib='wxUSE_DYNLIB_CLASS=yes'
+                          else
+                            ac_cv_use_dynlib='wxUSE_DYNLIB_CLASS=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_DYNLIB_CLASS" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_dynlib='wxUSE_DYNLIB_CLASS='$DEFAULT_wxUSE_DYNLIB_CLASS
+                        
+fi
+
+
+          eval "$ac_cv_use_dynlib"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_dynlib >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_DYNLIB_CLASS" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking "for --enable-longlong"""... $ac_c" 1>&6
+echo "configure:2760: 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
+  
+                          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
+
+
+          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-log"""... $ac_c" 1>&6
+echo "configure:2799: 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
+  
+                          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
+
+
+          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:2838: 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
+  
+                          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
+
+
+          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:2877: 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
+  
+                          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
+
+          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-textfile"""... $ac_c" 1>&6
+echo "configure:2916: 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
+  
+                          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
+
+
+          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-unicode"""... $ac_c" 1>&6
+echo "configure:2955: 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
+  
+                          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
+
+
+          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:2994: checking "for --enable-wcsrtombs"" >&5
+          no_cache=0
+          # Check whether --enable-wcsrtombs or --disable-wcsrtombs was given.
+if test "${enable_wcsrtombs+set}" = set; then
+  enableval="$enable_wcsrtombs"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_wcsrtombs='wxUSE_WCSRTOMBS=yes'
+                          else
+                            ac_cv_use_wcsrtombs='wxUSE_WCSRTOMBS=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_WCSRTOMBS" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_wcsrtombs='wxUSE_WCSRTOMBS='$DEFAULT_wxUSE_WCSRTOMBS
+                        
+fi
+
+
+          eval "$ac_cv_use_wcsrtombs"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_wcsrtombs >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_WCSRTOMBS" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking "for --enable-wxprintfv"""... $ac_c" 1>&6
+echo "configure:3033: 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
+  
+                          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
+
+
+          eval "$ac_cv_use_wxprintfv"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_wxprintfv >> ${wx_arg_cache_file}.tmp
+          fi
+
+          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-joystick"""... $ac_c" 1>&6
+echo "configure:3072: 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-std_iostreams"""... $ac_c" 1>&6
+echo "configure:3111: 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
+  
+                          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
+
+
+          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-fs_inet"""... $ac_c" 1>&6
+echo "configure:3150: 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
+  
+                          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
+
+
+          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:3189: 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
+  
+                          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
+
+
+          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:3228: 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
+  
+                          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
+
+
+          eval "$ac_cv_use_zipstream"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_zipstream >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_ZIPSTREAM" = 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:3269: 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
+  
+                          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
+
+
+          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:3308: 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
+  
+                          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
+
+
+          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:3351: 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
+  
+                          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
+
+
+          eval "$ac_cv_use_docview"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_docview >> ${wx_arg_cache_file}.tmp
+          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_n "checking "for --enable-help"""... $ac_c" 1>&6
+echo "configure:3390: 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
+
+
+          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
+        
+
+          echo $ac_n "checking "for --enable-constraints"""... $ac_c" 1>&6
+echo "configure:3429: checking "for --enable-constraints"" >&5
+          no_cache=0
+          # Check whether --enable-constraints or --disable-constraints was given.
+if test "${enable_constraints+set}" = set; then
+  enableval="$enable_constraints"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_constraints='wxUSE_CONSTRAINTS=yes'
+                          else
+                            ac_cv_use_constraints='wxUSE_CONSTRAINTS=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_CONSTRAINTS" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_constraints='wxUSE_CONSTRAINTS='$DEFAULT_wxUSE_CONSTRAINTS
+                        
+fi
+
+
+          eval "$ac_cv_use_constraints"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_constraints >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$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:3468: 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
+  
+                          LINE=`grep "wxUSE_PRINTING_ARCHITECTURE" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE='$DEFAULT_wxUSE_PRINTING_ARCHITECTURE
+                        
+fi
+
+
+          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:3507: 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
+  
+                          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
+
+
+          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-postscript"""... $ac_c" 1>&6
+echo "configure:3547: 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
+  
+                          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
+
+
+          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:3588: 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
+  
+                          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:3627: 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
+
+
+          eval "$ac_cv_use_resources"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_resources >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_RESOURCES" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+
+          echo $ac_n "checking "for --enable-xresources"""... $ac_c" 1>&6
+echo "configure:3667: 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
+  
+                          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
+
+
+          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:3708: 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
+  
+                          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
+
+
+          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:3747: 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
+  
+                          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
+
+
+          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-wxtree"""... $ac_c" 1>&6
+echo "configure:3787: checking "for --enable-wxtree"" >&5
+          no_cache=0
+          # Check whether --enable-wxtree or --disable-wxtree was given.
+if test "${enable_wxtree+set}" = set; then
+  enableval="$enable_wxtree"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_wxtree='wxUSE_WXTREE=yes'
+                          else
+                            ac_cv_use_wxtree='wxUSE_WXTREE=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_WXTREE" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_wxtree='wxUSE_WXTREE='$DEFAULT_wxUSE_WXTREE
+                        
+fi
+
+
+          eval "$ac_cv_use_wxtree"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_wxtree >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_WXTREE" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+
+
+          echo $ac_n "checking "for --enable-controls"""... $ac_c" 1>&6
+echo "configure:3828: 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
+  
+                          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_CARET=yes
+  DEFAULT_wxUSE_COMBOBOX=yes
+  DEFAULT_wxUSE_BMPBUTTON=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=no
+  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_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_TOOLBAR=yes
+  DEFAULT_wxUSE_TOOLBAR_NATIVE=yes
+  DEFAULT_wxUSE_TOOLBAR_SIMPLE=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_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_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_TOOLBAR=no
+  DEFAULT_wxUSE_TOOLBAR_NATIVE=no
+  DEFAULT_wxUSE_TOOLBAR_SIMPLE=no
+  DEFAULT_wxUSE_TOOLTIPS=no
+  DEFAULT_wxUSE_TREECTRL=no
+fi
+
+
+          echo $ac_n "checking "for --enable-accel"""... $ac_c" 1>&6
+echo "configure:3936: 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
+  
+                          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
+
+
+          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-caret"""... $ac_c" 1>&6
+echo "configure:3975: checking "for --enable-caret"" >&5
+          no_cache=0
+          # Check whether --enable-caret or --disable-caret was given.
+if test "${enable_caret+set}" = set; then
+  enableval="$enable_caret"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_caret='wxUSE_CARET=yes'
+                          else
+                            ac_cv_use_caret='wxUSE_CARET=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_CARET" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_caret='wxUSE_CARET='$DEFAULT_wxUSE_CARET
+                        
+fi
+
+
+          eval "$ac_cv_use_caret"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_caret >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_CARET" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking "for --enable-bmpbutton"""... $ac_c" 1>&6
+echo "configure:4014: 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
+  
+                          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
+
+
+          eval "$ac_cv_use_bmpbutton"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_bmpbutton >> ${wx_arg_cache_file}.tmp
+          fi
+
+          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-checkbox"""... $ac_c" 1>&6
+echo "configure:4053: 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
+  
+                          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
+
+
+          eval "$ac_cv_use_checkbox"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_checkbox >> ${wx_arg_cache_file}.tmp
+          fi
+
+          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:4092: 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
+  
+                          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
+
+
+          eval "$ac_cv_use_checklst"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_checklst >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_CHECKLST" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking "for --enable-choice"""... $ac_c" 1>&6
+echo "configure:4131: 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
+  
+                          LINE=`grep "wxUSE_CHOICE" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_choice='wxUSE_CHOICE='$DEFAULT_wxUSE_CHOICE
+                        
+fi
+
+
+          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:4170: 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
+  
+                          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
+
+
+          eval "$ac_cv_use_combobox"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_combobox >> ${wx_arg_cache_file}.tmp
+          fi
+
+          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:4209: 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
+  
+                          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
+
+
+          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
+        
+
+          echo $ac_n "checking "for --enable-grid"""... $ac_c" 1>&6
+echo "configure:4248: 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
+  
+                          LINE=`grep "wxUSE_GRID" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_grid='wxUSE_GRID='$DEFAULT_wxUSE_GRID
+                        
+fi
+
+
+          eval "$ac_cv_use_grid"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_grid >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_GRID" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking "for --enable-newgrid"""... $ac_c" 1>&6
+echo "configure:4287: 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
+  
+                          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
+
+
+          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:4326: 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
+  
+                          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
+
+
+          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:4365: 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
+  
+                          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
+
+
+          eval "$ac_cv_use_listbox"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_listbox >> ${wx_arg_cache_file}.tmp
+          fi
+
+          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:4404: 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
+  
+                          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
+
+
+          eval "$ac_cv_use_listctrl"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_listctrl >> ${wx_arg_cache_file}.tmp
+          fi
+
+          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:4443: 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
+  
+                          LINE=`grep "wxUSE_NOTEBOOK" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_notebook='wxUSE_NOTEBOOK='$DEFAULT_wxUSE_NOTEBOOK
+                        
+fi
+
+
+          eval "$ac_cv_use_notebook"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_notebook >> ${wx_arg_cache_file}.tmp
+          fi
+
+          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-radiobox"""... $ac_c" 1>&6
+echo "configure:4482: 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
+
+                          ac_cv_use_radiobox='wxUSE_RADIOBOX='$DEFAULT_wxUSE_RADIOBOX
+                        
+fi
+
+
+          eval "$ac_cv_use_radiobox"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_radiobox >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_RADIOBOX" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking "for --enable-radiobtn"""... $ac_c" 1>&6
+echo "configure:4521: 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
+  
+                          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
+
+
+          eval "$ac_cv_use_radiobtn"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_radiobtn >> ${wx_arg_cache_file}.tmp
+          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:4560: 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
+  
+                          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
+
+
+          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
+        
+
+          echo $ac_n "checking "for --enable-scrollbar"""... $ac_c" 1>&6
+echo "configure:4599: 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
+  
+                          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
+
+
+          eval "$ac_cv_use_scrollbar"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_scrollbar >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_SCROLLBAR" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking "for --enable-slider"""... $ac_c" 1>&6
+echo "configure:4638: 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
+  
+                          LINE=`grep "wxUSE_SLIDER" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_slider='wxUSE_SLIDER='$DEFAULT_wxUSE_SLIDER
+                        
+fi
+
+
+          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:4677: 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
+  
+                          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
+
+
+          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:4716: 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
+  
+                          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
+
+
+          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:4755: 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
+  
+                          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
+
+
+          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:4794: 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
+  
+                          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:4833: 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
+  
+                          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
+
+
+          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:4872: 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
+  
+                          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
+
+
+          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-statusbar"""... $ac_c" 1>&6
+echo "configure:4911: 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
+  
+                          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
+
+
+          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:4950: 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
+  
+                          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-toolbar"""... $ac_c" 1>&6
+echo "configure:4989: 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
+
+                          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:5028: 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:5067: 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:5106: 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-commondlg"""... $ac_c" 1>&6
+echo "configure:5147: 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-dirdlg"""... $ac_c" 1>&6
+echo "configure:5186: 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-textdlg"""... $ac_c" 1>&6
+echo "configure:5225: 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:5264: 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:5303: 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-miniframe"""... $ac_c" 1>&6
+echo "configure:5342: 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-html"""... $ac_c" 1>&6
+echo "configure:5381: checking "for --enable-html"" >&5
+          no_cache=0
+          # Check whether --enable-html or --disable-html was given.
+if test "${enable_html+set}" = set; then
+  enableval="$enable_html"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_html='wxUSE_HTML=yes'
+                          else
+                            ac_cv_use_html='wxUSE_HTML=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_HTML" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_html='wxUSE_HTML='$DEFAULT_wxUSE_HTML
+                        
+fi
+
+
+          eval "$ac_cv_use_html"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_html >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_HTML" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+          echo $ac_n "checking "for --enable-tooltips"""... $ac_c" 1>&6
+echo "configure:5420: 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:5459: 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:5498: 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:5537: 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-gif"""... $ac_c" 1>&6
+echo "configure:5578: 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:5617: 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:5656: 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
+        
+
+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:5703: 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_WINE:-0} + ${wxUSE_MINGW:-0} + ${wxUSE_CYGWIN:-0} + ${wxUSE_PM:-0}`
+
+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
+      echo "$ac_t""`echo $toolkit | tr A-Z a-z`" 1>&6
+    fi
+  fi
+done
+
+else
+    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 eval "test $host != $build"; then
+  if eval "test $host_alias != NONE"; then
+    CC=$host_alias-gcc
+    CXX=$host_alias-c++
+    AR=$host_alias-ar
+    RANLIB=$host_alias-ranlib
+    DLLTOOL=$host_alias-dlltool
+    LD=$host_alias-ld
+    NM=$host_alias-nm
+    STRIP=$host_alias-strip
+  fi
+fi
+
+# Extract the first word of "gcc", so it can be a program name with args.
+set dummy gcc; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:5824: 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:5854: 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
@@ -757,203 +5888,463 @@ if test $ac_prog_rejected = yes; then
 fi
 fi
 fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
+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:5905: 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:5937: 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 5948 "configure"
+#include "confdefs.h"
+
+main(){return(0);}
+EOF
+if { (eval echo configure:5953: \"$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:5979: 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:5984: 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:5993: \"$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:6012: 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:6047: 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 6062 "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:6068: \"$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 6079 "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:6085: \"$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 6096 "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:6102: \"$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
-  echo "$ac_t""no" 1>&6
+  ac_cv_prog_CPP="$CPP"
 fi
+echo "$ac_t""$CPP" 1>&6
 
-  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
+
+if test $ac_cv_prog_gcc = yes; then
+    echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6
+echo "configure:6129: 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 6135 "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*
 
-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:772: 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 $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
+  if test $ac_cv_prog_gcc_traditional = no; then
+    cat > conftest.$ac_ext <<EOF
+#line 6153 "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*
 
-cat > conftest.$ac_ext <<EOF
-#line 782 "configure"
+  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:6189: 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:6221: 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 6232 "configure"
 #include "confdefs.h"
-main(){return(0);}
+
+int main(){return(0);}
 EOF
-if { (eval echo configure:786: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-  ac_cv_prog_cc_works=yes
+if { (eval echo configure:6237: \"$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_cc_cross=no
+    ac_cv_prog_cxx_cross=no
   else
-    ac_cv_prog_cc_cross=yes
+    ac_cv_prog_cxx_cross=yes
   fi
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
-  ac_cv_prog_cc_works=no
+  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_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; }
+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 ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:806: 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 the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
+echo "configure:6263: 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:811: checking whether we are using GNU C" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
+echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
+echo "configure:6268: 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
+  cat > conftest.C <<EOF
 #ifdef __GNUC__
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:820: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-  ac_cv_prog_gcc=yes
+if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:6277: \"$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
-  ac_cv_prog_gcc=no
-fi
+  GXX=
 fi
 
-echo "$ac_t""$ac_cv_prog_gcc" 1>&6
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-  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:835: checking whether ${CC-cc} accepts -g" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
+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:6296: 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.c
-if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
-  ac_cv_prog_cc_g=yes
+  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_cc_g=no
+  ac_cv_prog_cxx_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
-    CFLAGS="-g -O2"
+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
-    CFLAGS="-O2"
+    CXXFLAGS="-g"
   fi
 else
-  GCC=
-  test "${CFLAGS+set}" = set || CFLAGS="-g"
-fi
-
-
-CFLAGS=`echo "$CFLAGS" | sed 's/-g//g'`
-
-if test "x$CC" != xcc; then
-  echo $ac_n "checking whether $CC and cc understand -c and -o together""... $ac_c" 1>&6
-echo "configure:867: checking whether $CC and cc understand -c and -o together" >&5
-else
-  echo $ac_n "checking whether cc understands -c and -o together""... $ac_c" 1>&6
-echo "configure:870: checking whether cc understands -c and -o together" >&5
-fi
-set dummy $CC; ac_cc="`echo $2 |
-                      sed -e 's/[^a-zA-Z0-9_]/_/g' -e 's/^[0-9]/_/'`"
-if eval "test \"`echo '$''{'ac_cv_prog_cc_${ac_cc}_c_o'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  echo 'foo(){}' > conftest.c
-# Make sure it works both with $CC and with simple cc.
-# We do the test twice because some compilers refuse to overwrite an
-# existing .o file with -o, though they will create one.
-ac_try='${CC-cc} -c conftest.c -o conftest.o 1>&5'
-if { (eval echo configure:882: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } &&
-   test -f conftest.o && { (eval echo configure:883: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; };
-then
-  eval ac_cv_prog_cc_${ac_cc}_c_o=yes
-  if test "x$CC" != xcc; then
-    # Test first that cc exists at all.
-    if { ac_try='cc -c conftest.c 1>&5'; { (eval echo configure:888: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then
-      ac_try='cc -c conftest.c -o conftest.o 1>&5'
-      if { (eval echo configure:890: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } &&
-        test -f conftest.o && { (eval echo configure:891: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; };
-      then
-        # cc works too.
-        :
-      else
-        # cc exists but doesn't like -o.
-        eval ac_cv_prog_cc_${ac_cc}_c_o=no
-      fi
-    fi
+  if test "$GXX" = yes; then
+    CXXFLAGS="-O2"
+  else
+    CXXFLAGS=
   fi
-else
-  eval ac_cv_prog_cc_${ac_cc}_c_o=no
 fi
-rm -f conftest*
-
-fi
-if eval "test \"`echo '$ac_cv_prog_cc_'${ac_cc}_c_o`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-  cat >> confdefs.h <<\EOF
-#define NO_MINUS_C_MINUS_O 1
-EOF
 
-fi
 
-echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:918: 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 "checking how to run the C++ preprocessor""... $ac_c" 1>&6
+echo "configure:6329: 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
-    # 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 933 "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:939: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
-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"
+  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 950 "configure"
+#line 6342 "configure"
 #include "confdefs.h"
-#include <assert.h>
-Syntax Error
+#include <stdlib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:956: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
+{ (eval echo configure:6347: \"$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
@@ -961,477 +6352,816 @@ else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  CPP=/lib/cpp
+  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
-rm -f conftest*
-  ac_cv_prog_CPP="$CPP"
 fi
-  CPP="$ac_cv_prog_CPP"
+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:6385: 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
-  ac_cv_prog_CPP="$CPP"
+  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
-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:980: checking whether ${CC-cc} needs -traditional" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then
+
+# 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:6416: 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
-    ac_pattern="Autoconf.*'x'"
-  cat > conftest.$ac_ext <<EOF
-#line 986 "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
+  if test -n "$AR"; then
+  ac_cv_prog_AR="$AR" # Let the user override the test.
 else
-  rm -rf conftest*
-  ac_cv_prog_gcc_traditional=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_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
-rm -f conftest*
 
 
-  if test $ac_cv_prog_gcc_traditional = no; then
-    cat > conftest.$ac_ext <<EOF
-#line 1004 "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*
+# 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:6456: 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
 
-echo "$ac_t""$ac_cv_prog_gcc_traditional" 1>&6
-  if test $ac_cv_prog_gcc_traditional = yes; then
-    CC="$CC -traditional"
-  fi
+# 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:6512: 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:6541: 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> 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
+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; }
+fi
 
-for ac_prog in $CCC c++ g++ gcc CC cxx cc++
+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:1033: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
+echo "configure:6570: 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 "$CXX"; then
-  ac_cv_prog_CXX="$CXX" # Let the user override the test.
+  if test -n "$YACC"; then
+  ac_cv_prog_YACC="$YACC" # Let the user override the test.
 else
-  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
+  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"
+      ac_cv_prog_YACC="$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
+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 "$CXX" && break
+test -n "$YACC" && break
 done
-test -n "$CXX" || CXX="gcc"
-
+test -n "$YACC" || YACC="yacc"
 
-echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1064: 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 $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cxx_cross
+# 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:6604: 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:6638: 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 1074 "configure"
+#line 6646 "configure"
 #include "confdefs.h"
-main(){return(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 yywrap();
+
+int main() {
+yywrap()
+; return 0; }
 EOF
-if { (eval echo configure:1078: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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
+if { (eval echo configure:6657: \"$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
-  ac_cv_prog_cxx_works=no
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=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 $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
+rm -f conftest*
+LIBS="$ac_save_LIBS"
 
-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:1104: 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
+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
 
-echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
-echo "configure:1109: checking whether we are using GNU C++" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
+fi
+
+
+echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
+echo "configure:6681: 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
-  cat > conftest.C <<EOF
-#ifdef __GNUC__
-  yes;
-#endif
-EOF
-if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1118: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-  ac_cv_prog_gxx=yes
+  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_gxx=no
+  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  \
+                              \
+    /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
 
-echo "$ac_t""$ac_cv_prog_gxx" 1>&6
 
-if test $ac_cv_prog_gxx = yes; then
-  GXX=yes
-  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:1133: 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
+if test "$wxUSE_GUI" = "yes"; then
 
-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
-    CXXFLAGS="-g -O2"
-  else
-    CXXFLAGS="-O2"
-  fi
-else
-  GXX=
-  test "${CXXFLAGS+set}" = set || CXXFLAGS="-g"
-fi
+TOOLKIT=
+TOOLKIT_INCLUDE=
 
-echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6
-echo "configure:1161: 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 $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 1174 "configure"
-#include "confdefs.h"
-#include <stdlib.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1179: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
-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
-# 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 $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-fi
-fi
-CXXCPP="$ac_cv_prog_CXXCPP"
-echo "$ac_t""$CXXCPP" 1>&6
+GUIOBJS=
+COMMONOBJS=
+GENERICOBJS=
 
+GUI_TK_LIBRARY=
+GUI_TK_LINK=
 
-CXXFLAGS=`echo "$CXXFLAGS" | sed 's/-g//g'`
+WXGTK12=
+WXGTK13=
 
+WXWINE=
 
+PROGRAM_EXT=
 
-# 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:1211: 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="${IFS}:"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="ranlib"
+if test "$wxUSE_CYGWIN" = 1 || test "$wxUSE_MINGW" = 1 ; then
+    if test "$cross_compiling" = "yes" ; then
+        echo "configure: warning: Cross compiling --- skipping windows.h check" 1>&2
+    else
+        echo $ac_n "checking for Windows headers""... $ac_c" 1>&6
+echo "configure:6843: checking for Windows headers" >&5
+        
+ac_find_includes=
+for ac_dir in $SEARCH_INCLUDE;
+  do
+    if test -f "$ac_dir/windows.h"; then
+      ac_find_includes=$ac_dir
       break
     fi
   done
-  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
+
+        if test "$ac_find_includes" != "" ; then
+            echo "$ac_t""found $ac_find_includes" 1>&6
+            TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE -I$ac_find_includes"
+        else
+            echo "$ac_t""no" 1>&6
+            { echo "configure: error: please set CFLAGS to contain the location of windows.h" 1>&2; exit 1; }
+        fi
+    fi
+
+    INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS msw"
+            LIBS="$LIBS -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lctl3d32 -lcrtdll -ladvapi32 -lwsock32"
+
+        if test "$wxUSE_MINGW" = 1; then
+        LDFLAGS="$LDFLAGS -mwindows"
+    fi
+
+    TOOLKIT=MSW
+
+    GUIOBJS="\$(MSW_GUIOBJS)"
+    GUIHEADERS="\$(MSW_HEADERS)"
+    COMMONOBJS="\$(MSW_COMMONOBJS)"
+    GENERICOBJS="\$(MSW_GENERICOBJS)"
+    UNIXOBJS=
+    GUIDIST=MSW_DIST
+    PROGRAM_EXT=.exe
 fi
 
+if test "$wxUSE_GTK" = 1; 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 "ar", so it can be a program name with args.
-set dummy ar; ac_word=$2
+  # 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:1241: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
+echo "configure:6899: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  if test -n "$AR"; then
-  ac_cv_prog_AR="$AR" # Let the user override the test.
-else
-  IFS="${IFS=  }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
+  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_prog_AR="ar"
+      ac_cv_path_GTK_CONFIG="$ac_dir/$ac_word"
       break
     fi
   done
   IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_AR" && ac_cv_prog_AR="ar"
-fi
+  test -z "$ac_cv_path_GTK_CONFIG" && ac_cv_path_GTK_CONFIG="no"
+  ;;
+esac
 fi
-AR="$ac_cv_prog_AR"
-if test -n "$AR"; then
-  echo "$ac_t""$AR" 1>&6
+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.1
+  echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6
+echo "configure:6934: 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 6947 "configure"
+#include "confdefs.h"
 
-ac_aux_dir=
-for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
-  if test -f $ac_dir/install-sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f $ac_dir/install.sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; }
-fi
-ac_config_guess=$ac_aux_dir/config.guess
-ac_config_sub=$ac_aux_dir/config.sub
-ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
+#include <gtk/gtk.h>
+#include <gtk/gtkfeatures.h>
+#include <stdio.h>
 
-# 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
-# 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:1298: 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="${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.
-      for ac_prog in ginstall installbsd 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.
-           # OSF/1 installbsd also uses dspmsg, but is usable.
-           :
-         else
-           ac_cv_path_install="$ac_dir/$ac_prog -c"
-           break 2
-         fi
-       fi
-      done
-      ;;
-    esac
-  done
-  IFS="$ac_save_IFS"
+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:6979: \"$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
-  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
+rm -fr conftest*
 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_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+     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=""
+     { echo "configure: error: Is gtk-config in path and GTK+ is version 1.2.1 or above?" 1>&2; exit 1; }
+  fi
+  
+  
 
 
-echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:1349: checking whether ln -s works" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
+    TOOLKIT_INCLUDE="$GTK_CFLAGS"
+    GUI_TK_LIBRARY="$GTK_LIBS -lgthread"
+    TOOLKIT=GTK
+
+    GUIOBJS="\$(GTK_GUIOBJS)"
+    GUIHEADERS="\$(GTK_HEADERS)"
+    COMMONOBJS="\$(GTK_COMMONOBJS)"
+    GENERICOBJS="\$(GTK_GENERICOBJS)"
+    GUIDEPS="\$(GTK_GUIDEPS)"
+    COMMONDEPS="\$(GTK_COMMONDEPS)"
+    GENERICDEPS="\$(GTK_GENERICDEPS)"
+    UNIXOBJS="\$(UNIX_OBJS)"
+    UNIXDEPS="\$(UNIX_DEPS)"
+    GUIDIST=GTK_DIST
+
+echo $ac_n "checking for gdk_im_open in -lgdk""... $ac_c" 1>&6
+echo "configure:7025: 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
-  rm -f conftestdata
-if ln -s X conftestdata 2>/dev/null
-then
-  rm -f conftestdata
-  ac_cv_prog_LN_S="ln -s"
+  ac_save_LIBS="$LIBS"
+LIBS="-lgdk  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 7033 "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:7044: \"$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
-  ac_cv_prog_LN_S=ln
+  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
-LN_S="$ac_cv_prog_LN_S"
-if test "$ac_cv_prog_LN_S" = "ln -s"; then
+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
 
 
-for ac_prog in mawk gawk nawk awk
-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:1375: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$AWK"; then
-  ac_cv_prog_AWK="$AWK" # Let the user override the test.
-else
-  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_word; then
-      ac_cv_prog_AWK="$ac_prog"
+fi
+
+if test "$wxUSE_WINE" = 1; then
+    echo $ac_n "checking for WINE includes""... $ac_c" 1>&6
+echo "configure:7072: 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
-  IFS="$ac_save_ifs"
-fi
-fi
-AWK="$ac_cv_prog_AWK"
-if test -n "$AWK"; then
-  echo "$ac_t""$AWK" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
 
-test -n "$AWK" && break
-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:7093: 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
 
-echo $ac_n "checking "make for VPATH support"""... $ac_c" 1>&6
-echo "configure:1405: checking "make for VPATH support"" >&5
-cat - << EOF > confMake
-check : file
-       cp \$? \$@
-       cp \$? final_file
+    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
 
-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
-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; } 
-fi
+        echo "$ac_t""found at $ac_find_libraries" 1>&6
+    else
+        echo "$ac_t""no" 1>&6
+        echo "configure: warning: library will be compiled without support for images in XPM format" 1>&2
+    fi
+
+    MESA_LINK=""
+    echo $ac_n "checking for Mesa library""... $ac_c" 1>&6
+echo "configure:7121: checking for Mesa 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/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 -lm"
+    GUI_TK_LIBRARY="$GUI_TK_LIBRARY $GUI_TK_LINK"
+    WXWINE=1
+    TOOLKIT=MSW
+
+    GUIHEADERS="\$(MSW_HEADERS)"
+    GUIOBJS="\$(MSW_GUIOBJS)"
+    COMMONOBJS="\$(MSW_COMMONOBJS)"
+    GENERICOBJS="\$(MSW_GENERICOBJS)"
+    GUIDEPS="\$(MSW_GUIDEPS)"
+    COMMONDEPS="\$(MSW_COMMONDEPS)"
+    GENERICDEPS="\$(MSW_GENERICDEPS)"
+    UNIXOBJS="\$(UNIX_OBJS)"
+    UNIXDEPS="\$(UNIX_DEPS)"
+    GUIDIST=MSW_DIST
+fi
 
-# If we find X, set shell vars x_includes and x_libraries to the
+if test "$wxUSE_MOTIF" = 1; then
+            # If we find X, set shell vars x_includes and x_libraries to the
 # paths, otherwise set no_x=yes.
 # Uses ac_ vars as temps to allow command line to override cache and checks.
 # --without-x overrides everything else, but does not touch the cache.
 echo $ac_n "checking for X""... $ac_c" 1>&6
-echo "configure:1435: checking for X" >&5
+echo "configure:7165: checking for X" >&5
 
 # Check whether --with-x or --without-x was given.
 if test "${with_x+set}" = set; then
@@ -1493,13 +7223,13 @@ if test "$ac_x_includes" = NO; then
 
   # First, try using that file with no special directory specified.
 cat > conftest.$ac_ext <<EOF
-#line 1497 "configure"
+#line 7227 "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:1502: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
+{ (eval echo configure:7232: \"$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.
@@ -1567,14 +7297,14 @@ if test "$ac_x_libraries" = NO; then
   ac_save_LIBS="$LIBS"
   LIBS="-l$x_direct_test_library $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1571 "configure"
+#line 7301 "configure"
 #include "confdefs.h"
 
 int main() {
 ${x_direct_test_function}()
 ; return 0; }
 EOF
-if { (eval echo configure:1578: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7308: \"$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.
@@ -1680,17 +7410,17 @@ else
     case "`(uname -sr) 2>/dev/null`" in
     "SunOS 5"*)
       echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6
-echo "configure:1684: checking whether -R must be followed by a space" >&5
+echo "configure:7414: 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 1687 "configure"
+#line 7417 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:1694: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7424: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_R_nospace=yes
 else
@@ -1706,14 +7436,14 @@ rm -f conftest*
       else
        LIBS="$ac_xsave_LIBS -R $x_libraries"
        cat > conftest.$ac_ext <<EOF
-#line 1710 "configure"
+#line 7440 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:1717: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7447: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_R_space=yes
 else
@@ -1745,7 +7475,7 @@ rm -f conftest*
     # libraries were built with DECnet support.  And karl@cs.umb.edu says
     # the Alpha needs dnet_stub (dnet does not exist).
     echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
-echo "configure:1749: checking for dnet_ntoa in -ldnet" >&5
+echo "configure:7479: 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
@@ -1753,7 +7483,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ldnet  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1757 "configure"
+#line 7487 "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
@@ -1764,7 +7494,7 @@ int main() {
 dnet_ntoa()
 ; return 0; }
 EOF
-if { (eval echo configure:1768: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7498: \"$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
@@ -1786,7 +7516,7 @@ fi
 
     if test $ac_cv_lib_dnet_dnet_ntoa = no; then
       echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6
-echo "configure:1790: checking for dnet_ntoa in -ldnet_stub" >&5
+echo "configure:7520: 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
@@ -1794,7 +7524,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ldnet_stub  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1798 "configure"
+#line 7528 "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
@@ -1805,7 +7535,7 @@ int main() {
 dnet_ntoa()
 ; return 0; }
 EOF
-if { (eval echo configure:1809: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7539: \"$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
@@ -1834,12 +7564,12 @@ fi
     # The nsl library prevents programs from opening the X display
     # on Irix 5.2, according to dickey@clark.net.
     echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
-echo "configure:1838: checking for gethostbyname" >&5
+echo "configure:7568: 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 1843 "configure"
+#line 7573 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname(); below.  */
@@ -1848,6 +7578,7 @@ else
 /* 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 (*f)();
 
 int main() {
 
@@ -1857,12 +7588,12 @@ int main() {
 #if defined (__stub_gethostbyname) || defined (__stub___gethostbyname)
 choke me
 #else
-gethostbyname();
+f = gethostbyname;
 #endif
 
 ; return 0; }
 EOF
-if { (eval echo configure:1866: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7597: \"$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
@@ -1883,7 +7614,7 @@ fi
 
     if test $ac_cv_func_gethostbyname = no; then
       echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:1887: checking for gethostbyname in -lnsl" >&5
+echo "configure:7618: 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
@@ -1891,7 +7622,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1895 "configure"
+#line 7626 "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
@@ -1902,7 +7633,7 @@ int main() {
 gethostbyname()
 ; return 0; }
 EOF
-if { (eval echo configure:1906: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7637: \"$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
@@ -1932,12 +7663,12 @@ fi
     # -lsocket must be given before -lnsl if both are needed.
     # We assume that if connect needs -lnsl, so does gethostbyname.
     echo $ac_n "checking for connect""... $ac_c" 1>&6
-echo "configure:1936: checking for connect" >&5
+echo "configure:7667: 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 1941 "configure"
+#line 7672 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char connect(); below.  */
@@ -1946,6 +7677,7 @@ else
 /* 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 (*f)();
 
 int main() {
 
@@ -1955,12 +7687,12 @@ int main() {
 #if defined (__stub_connect) || defined (__stub___connect)
 choke me
 #else
-connect();
+f = connect;
 #endif
 
 ; return 0; }
 EOF
-if { (eval echo configure:1964: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7696: \"$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
@@ -1981,7 +7713,7 @@ fi
 
     if test $ac_cv_func_connect = no; then
       echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
-echo "configure:1985: checking for connect in -lsocket" >&5
+echo "configure:7717: 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
@@ -1989,7 +7721,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1993 "configure"
+#line 7725 "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
@@ -2000,7 +7732,7 @@ int main() {
 connect()
 ; return 0; }
 EOF
-if { (eval echo configure:2004: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7736: \"$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
@@ -2024,12 +7756,12 @@ fi
 
     # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX.
     echo $ac_n "checking for remove""... $ac_c" 1>&6
-echo "configure:2028: checking for remove" >&5
+echo "configure:7760: 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 2033 "configure"
+#line 7765 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char remove(); below.  */
@@ -2038,6 +7770,7 @@ else
 /* 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 (*f)();
 
 int main() {
 
@@ -2047,12 +7780,12 @@ int main() {
 #if defined (__stub_remove) || defined (__stub___remove)
 choke me
 #else
-remove();
+f = remove;
 #endif
 
 ; return 0; }
 EOF
-if { (eval echo configure:2056: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7789: \"$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
@@ -2070,173 +7803,29 @@ if eval "test \"`echo '$ac_cv_func_'remove`\" = yes"; then
 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:2077: 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 2085 "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:2096: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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:2120: 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 2125 "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:2148: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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:2169: 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 2177 "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:2188: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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:2221: checking for IceConnectionNumber in -lICE" >&5
-ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'`
+
+    if test $ac_cv_func_remove = no; then
+      echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
+echo "configure:7810: 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="-lICE  $LIBS"
+LIBS="-lposix  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2229 "configure"
+#line 7818 "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 remove();
 
 int main() {
-IceConnectionNumber()
+remove()
 ; return 0; }
 EOF
-if { (eval echo configure:2240: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7829: \"$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
@@ -2251,79 +7840,85 @@ 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"
+  X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
 else
   echo "$ac_t""no" 1>&6
 fi
 
-  LDFLAGS="$ac_save_LDFLAGS"
-
-fi
-
+    fi
 
-ac_header_dirent=no
-for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6
-echo "configure:2270: checking for $ac_hdr that defines DIR" >&5
-if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then
+    # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
+    echo $ac_n "checking for shmat""... $ac_c" 1>&6
+echo "configure:7853: 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 2275 "configure"
+#line 7858 "configure"
 #include "confdefs.h"
-#include <sys/types.h>
-#include <$ac_hdr>
+/* 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();
+char (*f)();
+
 int main() {
-DIR *dirp = 0;
+
+/* 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
+f = shmat;
+#endif
+
 ; return 0; }
 EOF
-if { (eval echo configure:2283: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7882: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  eval "ac_cv_header_dirent_$ac_safe=yes"
+  eval "ac_cv_func_shmat=yes"
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  eval "ac_cv_header_dirent_$ac_safe=no"
+  eval "ac_cv_func_shmat=no"
 fi
 rm -f conftest*
 fi
-if eval "test \"`echo '$ac_cv_header_dirent_'$ac_safe`\" = yes"; then
+
+if eval "test \"`echo '$ac_cv_func_'shmat`\" = 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
- ac_header_dirent=$ac_hdr; break
+  :
 else
   echo "$ac_t""no" 1>&6
 fi
-done
-# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
-if test $ac_header_dirent = dirent.h; then
-echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6
-echo "configure:2308: checking for opendir in -ldir" >&5
-ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'`
+
+    if test $ac_cv_func_shmat = no; then
+      echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
+echo "configure:7903: 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="-ldir  $LIBS"
+LIBS="-lipc  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2316 "configure"
+#line 7911 "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 opendir();
+char shmat();
 
 int main() {
-opendir()
+shmat()
 ; return 0; }
 EOF
-if { (eval echo configure:2327: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7922: \"$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
@@ -2338,33 +7933,44 @@ LIBS="$ac_save_LIBS"
 fi
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-  LIBS="$LIBS -ldir"
+  X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
 else
   echo "$ac_t""no" 1>&6
 fi
 
-else
-echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
-echo "configure:2349: checking for opendir in -lx" >&5
-ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'`
+    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:7955: 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="-l $LIBS"
+LIBS="-lICE $X_EXTRA_LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2357 "configure"
+#line 7963 "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 opendir();
+char IceConnectionNumber();
 
 int main() {
-opendir()
+IceConnectionNumber()
 ; return 0; }
 EOF
-if { (eval echo configure:2368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7974: \"$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
@@ -2379,295 +7985,358 @@ LIBS="$ac_save_LIBS"
 fi
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-  LIBS="$LIBS -lx"
+  X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
 else
   echo "$ac_t""no" 1>&6
 fi
 
-fi
+  LDFLAGS="$ac_save_LDFLAGS"
 
-echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:2391: 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 2396 "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:2404: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
-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 2421 "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 "$no_x" = "yes"; then
+        { echo "configure: error: X11 not found" 1>&2; exit 1; }
+    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 2439 "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*
+    GUI_TK_LIBRARY="$X_LIBS"
+    TOOLKIT_INCLUDE="$X_CFLAGS"
 
-fi
+                                                                                                
+    echo $ac_n "checking for Motif/Lesstif headers""... $ac_c" 1>&6
+echo "configure:8008: 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_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 2460 "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); }
+    if test "$ac_find_includes" != "" ; then
+        echo "$ac_t""found $ac_find_includes" 1>&6
+    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; }
+    fi
 
-EOF
-if { (eval echo configure:2471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./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
+    echo $ac_n "checking for Motif/Lesstif library""... $ac_c" 1>&6
+echo "configure:8027: 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
 
-fi
-fi
+    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 "$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
+        
+  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
 
-fi
 
-echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6
-echo "configure:2495: checking for sys/wait.h that is POSIX.1 compatible" >&5
-if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2500 "configure"
-#include "confdefs.h"
-#include <sys/types.h>
-#include <sys/wait.h>
-#ifndef WEXITSTATUS
-#define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8)
-#endif
-#ifndef WIFEXITED
-#define WIFEXITED(stat_val) (((stat_val) & 255) == 0)
-#endif
-int main() {
-int s;
-wait (&s);
-s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
-; return 0; }
-EOF
-if { (eval echo configure:2516: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_header_sys_wait_h=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_header_sys_wait_h=no
-fi
-rm -f conftest*
-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
+        echo "$ac_t""no" 1>&6
+        { echo "configure: error: please set LDFLAGS to contain the location of libXm" 1>&2; exit 1; }
+    fi
+
+    echo $ac_n "checking for Xt library""... $ac_c" 1>&6
+echo "configure:8070: 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
+
+    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"
+        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:8102: 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 "$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
 
-echo "$ac_t""$ac_cv_header_sys_wait_h" 1>&6
-if test $ac_cv_header_sys_wait_h = yes; then
-  cat >> confdefs.h <<\EOF
-#define HAVE_SYS_WAIT_H 1
+        GUI_TK_LIBRARY="$GUI_TK_LIBRARY $ac_path_to_link"
+        XPM_LINK="-lXpm "
+        cat >> confdefs.h <<\EOF
+#define wxHAVE_LIB_XPM 1
 EOF
 
-fi
+        echo "$ac_t""found at $ac_find_libraries" 1>&6
+    else
+        echo "$ac_t""no" 1>&6
+        echo "configure: warning: library will be compiled without support for images in XPM format" 1>&2
+    fi
 
-for ac_hdr in fcntl.h
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2540: 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 2545 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2550: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
-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
+    GUI_TK_LINK="-lXm $XPM_LINK -lXmu -lXext -lXt -lX11 -lm"
+    GUI_TK_LIBRARY="$GUI_TK_LIBRARY $GUI_TK_LINK"
+    TOOLKIT=MOTIF
 
-for ac_hdr in limits.h
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2580: 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 2585 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-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`
-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"
+    GUIHEADERS="\$(MOTIF_HEADERS)"
+    GUIOBJS="\$(MOTIF_GUIOBJS)"
+    COMMONOBJS="\$(MOTIF_COMMONOBJS)"
+    GENERICOBJS="\$(MOTIF_GENERICOBJS)"
+    GUIDEPS="\$(MOTIF_GUIDEPS)"
+    COMMONDEPS="\$(MOTIF_COMMONDEPS)"
+    GENERICDEPS="\$(MOTIF_GENERICDEPS)"
+    UNIXOBJS="\$(UNIX_OBJS)"
+    UNIXDEPS="\$(UNIX_DEPS)"
+    GUIDIST=MOTIF_DIST
 fi
-rm -f conftest*
+
+if test "$wxUSE_PM" = 1; then
+    TOOLKIT=PM
+
+    GUIOBJS="\$(PM_GUIOBJS)"
+    GUIHEADERS="\$(PM_HEADERS)"
+    COMMONOBJS="\$(PM_COMMONOBJS)"
+    GENERICOBJS="\$(PM_GENERICOBJS)"
+    GUIDEPS="\$(PM_GUIDEPS)"
+    COMMONDEPS="\$(PM_COMMONDEPS)"
+    GENERICDEPS="\$(PM_GENERICDEPS)"
+    UNIXOBJS=
+    UNIXDEPS=
+    GUIDIST=GTK_DIST
 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
+
+if test "$TOOLKIT" != "PM" ; then
+    TOOLKIT_DIR=`echo ${TOOLKIT} | tr "A-Z" "a-z"`
 else
-  echo "$ac_t""no" 1>&6
+    TOOLKIT_DIR="os2"
 fi
-done
 
-for ac_hdr in sys/file.h
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2620: 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 2625 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2630: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
+TOOLKIT_DEF="-D__WX${TOOLKIT}__"
+
+WX_LIBRARY="wx_${TOOLKIT_DIR}"
+
+        ALL_OBJECTS="\$(GUIOBJS) \$(COMMONOBJS) \$(GENERICOBJS) \$(UNIXOBJS) \$(HTMLOBJS) \$(IODBCOBJS)"
+    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
+    ALL_DEPFILES="\$(GUIDEPS) \$(COMMONDEPS) \$(GENERICDEPS) \$(UNIXDEPS) \$(HTMLDEPS)"
+    ALL_HEADERS="\$(GUIHEADERS) \$(HTML_HEADERS) \$(UNIX_HEADERS) \$(PROTOCOL_HEADERS) \$(GENERIC_HEADERS) \$(WX_HEADERS)"
 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*
+    
+        ALL_OBJECTS="\$(BASE_OBJS)"
+    ALL_DEPFILES="\${BASE_DEPS}"
+    ALL_HEADERS="\${BASE_HEADERS}"
+
+        WX_LIBRARY="wxbase"
 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
+
+WX_LIBRARY_NAME="lib${WX_LIBRARY}.la"
+
+WX_LIBRARY_NAME_STATIC="lib${WX_LIBRARY}.a"
+
+WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}-${WX_RELEASE}.so.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}"
+
+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"
+
+SHARED_LD=
+PIC_FLAG=
+WX_ALL=
+WX_ALL_INSTALLED=
+BURNT_LIBRARY_NAME=
+
+
+if test "$wxUSE_SHARED" = "yes"; then
+    case "${host}" in
+      *-hp-hpux* )
+        if test "$GCC" = yes ; then
+            SHARED_LD="${CC} -shared -fPIC -o"
+            PIC_FLAG="-fPIC"
+        else
+            SHARED_LD="${CXX} -b -o"
+            PIC_FLAG="+Z"
+        fi
+        WX_LIBRARY_NAME_SHARED="libwx_${TOOLKIT_DIR}.sl"
+        WX_ALL=${WX_LIBRARY_NAME_SHARED}
+      ;;
+
+            *-*-linux* )
+        SHARED_LD="${CC} -shared -o"
+        PIC_FLAG="-fPIC"
+        WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
+        WX_ALL="CREATE_LINKS"
+              ;;
+      *-*-irix5* | *-*-irix6* )
+        if test "$GCC" = yes ; then
+           SHARED_LD="${CC} -shared -o"
+           PIC_FLAG="-fPIC"
+        else
+           SHARED_LD="${CXX} -shared -o"
+        fi
+        WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
+        WX_ALL="CREATE_LINKS"
+      ;;
+      *-*-solaris2* )
+        if test "$GCC" = yes ; then
+            SHARED_LD="${CC} -shared -o"
+            PIC_FLAG="-fPIC"
+        else
+            SHARED_LD="${CXX} -G -o"
+            PIC_FLAG="-KPIC"
+        fi
+        WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
+        WX_ALL="CREATE_LINKS"
+      ;;
+      *-*-sunos4* )
+        SHARED_LD="${CC} -shared -o"
+        PIC_FLAG="-fPIC"
+        WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
+        WX_ALL="CREATE_LINKS"
+      ;;
+      *-*-freebsd* | *-*-netbsd*)
+        SHARED_LD="${CC} -shared -o"
+        PIC_FLAG="-fPIC"
+        WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
+        WX_ALL="CREATE_LINKS"
+      ;;
+      *-*-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="${CC} -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}
+      ;;
+      *-*-cygwin32* )
+                WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}"
+        WX_ALL="${WX_LIBRARY_NAME_STATIC}"
+      ;;
+      *-*-mingw32* )
+                WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}"
+        WX_ALL="${WX_LIBRARY_NAME_STATIC}"
+      ;;
+      *-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}"
+    fi
 else
-  echo "$ac_t""no" 1>&6
+        WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}"
+    WX_ALL="${WX_LIBRARY_NAME_STATIC}"
 fi
-done
 
-for ac_hdr in sys/time.h
+
+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:2660: checking for $ac_hdr" >&5
+echo "configure:8329: 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 2665 "configure"
+#line 8334 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2670: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
+{ (eval echo configure:8339: \"$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"
@@ -2696,18 +8365,18 @@ 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:2700: checking for $ac_hdr" >&5
+echo "configure:8369: 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 2705 "configure"
+#line 8374 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2710: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
+{ (eval echo configure:8379: \"$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"
@@ -2732,22 +8401,22 @@ else
 fi
 done
 
-for ac_hdr in fnmatch.h
+for ac_hdr in wchar.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2740: checking for $ac_hdr" >&5
+echo "configure:8409: 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 2745 "configure"
+#line 8414 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2750: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
+{ (eval echo configure:8419: \"$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"
@@ -2772,22 +8441,22 @@ else
 fi
 done
 
-for ac_hdr in linux/joystick.h
+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:2780: checking for $ac_hdr" >&5
+echo "configure:8449: 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 2785 "configure"
+#line 8454 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2790: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
+{ (eval echo configure:8459: \"$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"
@@ -2809,196 +8478,67 @@ EOF
  
 else
   echo "$ac_t""no" 1>&6
-fi
-done
-
-GTK_JOYSTICK=""
-if test "$ac_cv_header_linux_joystick_h" = "yes"; then
-  GTK_JOYSTICK="gtk/joystick.cpp"
-fi
-
-
-echo $ac_n "checking for vprintf""... $ac_c" 1>&6
-echo "configure:2823: 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 2828 "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
-if { (eval echo configure:2851: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'vprintf`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  cat >> confdefs.h <<\EOF
-#define HAVE_VPRINTF 1
-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:2875: 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 2880 "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:2903: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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:2928: checking for vsnprintf" >&5
-if eval "test \"`echo '$''{'ac_cv_func_vsnprintf'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2933 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char vsnprintf(); 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 vsnprintf();
-
-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_vsnprintf) || defined (__stub___vsnprintf)
-choke me
-#else
-vsnprintf();
-#endif
+fi
+done
 
-; return 0; }
+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:8489: 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 8494 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
 EOF
-if { (eval echo configure:2956: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:8499: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
   rm -rf conftest*
-  eval "ac_cv_func_vsnprintf=yes"
+  eval "ac_cv_header_$ac_safe=yes"
 else
+  echo "$ac_err" >&5
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  eval "ac_cv_func_vsnprintf=no"
+  eval "ac_cv_header_$ac_safe=no"
 fi
 rm -f conftest*
 fi
-
-if eval "test \"`echo '$ac_cv_func_'vsnprintf`\" = 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_VSNPRINTF 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
 fi
+done
 
 
-
-ac_ext=C
-# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CXX-g++} -o conftest $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cxx_cross
-
-for ac_hdr in iostream
+if test "$wxUSE_GUI" = "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:2991: checking for $ac_hdr" >&5
+echo "configure:8531: 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 2996 "configure"
+#line 8536 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3001: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
+{ (eval echo configure:8541: \"$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"
@@ -3023,132 +8563,120 @@ else
 fi
 done
 
-if test "x$HAVE_IOSTREAM" = "x" ; then
-  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 $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
 
 
-echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:3042: checking for uid_t in sys/types.h" >&5
-if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then
+echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
+echo "configure:8571: 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 3047 "configure"
+#line 8576 "configure"
 #include "confdefs.h"
-#include <sys/types.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <float.h>
 EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "uid_t" >/dev/null 2>&1; then
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:8584: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
   rm -rf conftest*
-  ac_cv_type_uid_t=yes
+  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_type_uid_t=no
+  ac_cv_header_stdc=no
 fi
 rm -f conftest*
 
+if test $ac_cv_header_stdc = yes; then
+  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+cat > conftest.$ac_ext <<EOF
+#line 8601 "configure"
+#include "confdefs.h"
+#include <string.h>
+EOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  egrep "memchr" >/dev/null 2>&1; then
+  :
+else
+  rm -rf conftest*
+  ac_cv_header_stdc=no
 fi
+rm -f conftest*
 
-echo "$ac_t""$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
+fi
 
-  cat >> confdefs.h <<\EOF
-#define gid_t int
+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 8619 "configure"
+#include "confdefs.h"
+#include <stdlib.h>
 EOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  egrep "free" >/dev/null 2>&1; then
+  :
+else
+  rm -rf conftest*
+  ac_cv_header_stdc=no
+fi
+rm -f conftest*
 
 fi
 
-echo $ac_n "checking type of array argument to getgroups""... $ac_c" 1>&6
-echo "configure:3076: checking type of array argument to getgroups" >&5
-if eval "test \"`echo '$''{'ac_cv_type_getgroups'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test "$cross_compiling" = yes; then
-  ac_cv_type_getgroups=cross
+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 3084 "configure"
+#line 8640 "configure"
 #include "confdefs.h"
-
-/* Thanks to Mike Rendell for this test.  */
-#include <sys/types.h>
-#define NGID 256
-#undef MAX
-#define MAX(x, y) ((x) > (y) ? (x) : (y))
-main()
-{
-  gid_t gidset[NGID];
-  int i, n;
-  union { gid_t gval; long lval; }  val;
-
-  val.lval = -1;
-  for (i = 0; i < NGID; i++)
-    gidset[i] = val.gval;
-  n = getgroups (sizeof (gidset) / MAX (sizeof (int), sizeof (gid_t)) - 1,
-                 gidset);
-  /* Exit non-zero if getgroups seems to require an array of ints.  This
-     happens when gid_t is short but getgroups modifies an array of ints.  */
-  exit ((n > 0 && gidset[n] != val.gval) ? 1 : 0);
-}
+#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:3109: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:8651: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
-    ac_cv_type_getgroups=gid_t
+  :
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -fr conftest*
-  ac_cv_type_getgroups=int
+  ac_cv_header_stdc=no
 fi
 rm -fr conftest*
 fi
 
-if test $ac_cv_type_getgroups = cross; then
-        cat > conftest.$ac_ext <<EOF
-#line 3123 "configure"
-#include "confdefs.h"
-#include <unistd.h>
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "getgroups.*int.*gid_t" >/dev/null 2>&1; then
-  rm -rf conftest*
-  ac_cv_type_getgroups=gid_t
-else
-  rm -rf conftest*
-  ac_cv_type_getgroups=int
-fi
-rm -f conftest*
-
 fi
 fi
 
-echo "$ac_t""$ac_cv_type_getgroups" 1>&6
-cat >> confdefs.h <<EOF
-#define GETGROUPS_T $ac_cv_type_getgroups
+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:3147: checking for mode_t" >&5
+echo "configure:8675: 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 3152 "configure"
+#line 8680 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -3157,7 +8685,7 @@ else
 #endif
 EOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "mode_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
+  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
@@ -3176,12 +8704,12 @@ EOF
 fi
 
 echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:3180: checking for off_t" >&5
+echo "configure:8708: 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 3185 "configure"
+#line 8713 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -3190,7 +8718,7 @@ else
 #endif
 EOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "off_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
+  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
@@ -3209,12 +8737,12 @@ EOF
 fi
 
 echo $ac_n "checking for pid_t""... $ac_c" 1>&6
-echo "configure:3213: checking for pid_t" >&5
+echo "configure:8741: 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 3218 "configure"
+#line 8746 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -3223,7 +8751,7 @@ else
 #endif
 EOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "pid_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
+  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
 
 fi
 
-echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
-echo "configure:3246: checking return type of signal handlers" >&5
-if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
+echo $ac_n "checking for size_t""... $ac_c" 1>&6
+echo "configure:8774: 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 3251 "configure"
+#line 8779 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
-#include <signal.h>
-#ifdef signal
-#undef signal
-#endif
-#ifdef __cplusplus
-extern "C" void (*signal (int, void (*)(int)))(int);
-#else
-void (*signal ()) ();
+#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:8807: 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 8812 "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 pw_gecos in struct passwd""... $ac_c" 1>&6
+echo "configure:8843: 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 8849 "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:8860: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  
+                wx_cv_struct_pw_gecos=yes
+                cat >> confdefs.h <<\EOF
+#define HAVE_PW_GECOS 1
+EOF
+
+             
+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
+
+
+echo $ac_n "checking for working const""... $ac_c" 1>&6
+echo "configure:8887: 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 8892 "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;
+}
 
-int main() {
-int i;
 ; return 0; }
 EOF
-if { (eval echo configure:3268: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:8941: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  ac_cv_type_signal=void
+  ac_cv_c_const=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  ac_cv_type_signal=int
+  ac_cv_c_const=no
 fi
 rm -f conftest*
 fi
 
-echo "$ac_t""$ac_cv_type_signal" 1>&6
-cat >> confdefs.h <<EOF
-#define RETSIGTYPE $ac_cv_type_signal
-EOF
-
-
-echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:3287: 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 3292 "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 "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
+echo "$ac_t""$ac_cv_c_const" 1>&6
+if test $ac_cv_c_const = no; then
   cat >> confdefs.h <<\EOF
-#define size_t unsigned
+#define const 
 EOF
 
 fi
 
-echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:3320: checking for uid_t in sys/types.h" >&5
-if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then
+echo $ac_n "checking for inline""... $ac_c" 1>&6
+echo "configure:8962: 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 3325 "configure"
+#line 8969 "configure"
 #include "confdefs.h"
-#include <sys/types.h>
+
+int main() {
+} $ac_kw foo() {
+; return 0; }
 EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "uid_t" >/dev/null 2>&1; then
+if { (eval echo configure:8976: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  ac_cv_type_uid_t=yes
+  ac_cv_c_inline=$ac_kw; break
 else
-  rm -rf conftest*
-  ac_cv_type_uid_t=no
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
 fi
 rm -f conftest*
+done
 
 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
+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 gid_t int
+ ;;
+  *)  cat >> confdefs.h <<EOF
+#define inline $ac_cv_c_inline
 EOF
-
-fi
-
+ ;;
+esac
 
 
-echo $ac_n "checking whether stat file-mode macros are broken""... $ac_c" 1>&6
-echo "configure:3356: checking whether stat file-mode macros are broken" >&5
-if eval "test \"`echo '$''{'ac_cv_header_stat_broken'+set}'`\" = set"; then
+echo $ac_n "checking size of char""... $ac_c" 1>&6
+echo "configure:9003: 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 3361 "configure"
+#line 9011 "configure"
 #include "confdefs.h"
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#if defined(S_ISBLK) && defined(S_IFDIR)
-# if S_ISBLK (S_IFDIR)
-You lose.
-# endif
-#endif
-
-#if defined(S_ISBLK) && defined(S_IFCHR)
-# if S_ISBLK (S_IFCHR)
-You lose.
-# endif
-#endif
-
-#if defined(S_ISLNK) && defined(S_IFREG)
-# if S_ISLNK (S_IFREG)
-You lose.
-# endif
-#endif
-
-#if defined(S_ISSOCK) && defined(S_IFREG)
-# if S_ISSOCK (S_IFREG)
-You lose.
-# endif
-#endif
-
+#include <stdio.h>
+main()
+{
+  FILE *f=fopen("conftestval", "w");
+  if (!f) exit(1);
+  fprintf(f, "%d\n", sizeof(char));
+  exit(0);
+}
 EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "You lose" >/dev/null 2>&1; then
-  rm -rf conftest*
-  ac_cv_header_stat_broken=yes
+if { (eval echo configure:9022: \"$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
-  rm -rf conftest*
-  ac_cv_header_stat_broken=no
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  ac_cv_sizeof_char=0
 fi
-rm -f conftest*
-
+rm -fr conftest*
 fi
 
-echo "$ac_t""$ac_cv_header_stat_broken" 1>&6
-if test $ac_cv_header_stat_broken = yes; then
-  cat >> confdefs.h <<\EOF
-#define STAT_MACROS_BROKEN 1
+fi
+echo "$ac_t""$ac_cv_sizeof_char" 1>&6
+cat >> confdefs.h <<EOF
+#define SIZEOF_CHAR $ac_cv_sizeof_char
 EOF
 
-fi
 
-echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:3412: checking whether time.h and sys/time.h may both be included" >&5
-if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
+echo $ac_n "checking size of short""... $ac_c" 1>&6
+echo "configure:9042: 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 3417 "configure"
+#line 9050 "configure"
 #include "confdefs.h"
-#include <sys/types.h>
-#include <sys/time.h>
-#include <time.h>
-int main() {
-struct tm *tp;
-; return 0; }
+#include <stdio.h>
+main()
+{
+  FILE *f=fopen("conftestval", "w");
+  if (!f) exit(1);
+  fprintf(f, "%d\n", sizeof(short));
+  exit(0);
+}
 EOF
-if { (eval echo configure:3426: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_header_time=yes
+if { (eval echo configure:9061: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  ac_cv_sizeof_short=`cat conftestval`
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_header_time=no
+  rm -fr conftest*
+  ac_cv_sizeof_short=0
 fi
-rm -f conftest*
+rm -fr conftest*
 fi
 
-echo "$ac_t""$ac_cv_header_time" 1>&6
-if test $ac_cv_header_time = yes; then
-  cat >> confdefs.h <<\EOF
-#define TIME_WITH_SYS_TIME 1
+fi
+echo "$ac_t""$ac_cv_sizeof_short" 1>&6
+cat >> confdefs.h <<EOF
+#define SIZEOF_SHORT $ac_cv_sizeof_short
 EOF
 
-fi
 
-echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6
-echo "configure:3447: checking for st_blksize in struct stat" >&5
-if eval "test \"`echo '$''{'ac_cv_struct_st_blksize'+set}'`\" = set"; then
+echo $ac_n "checking size of int *""... $ac_c" 1>&6
+echo "configure:9081: 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 3452 "configure"
+#line 9089 "configure"
 #include "confdefs.h"
-#include <sys/types.h>
-#include <sys/stat.h>
-int main() {
-struct stat s; s.st_blksize;
-; return 0; }
+#include <stdio.h>
+main()
+{
+  FILE *f=fopen("conftestval", "w");
+  if (!f) exit(1);
+  fprintf(f, "%d\n", sizeof(int *));
+  exit(0);
+}
 EOF
-if { (eval echo configure:3460: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_struct_st_blksize=yes
+if { (eval echo configure:9100: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  ac_cv_sizeof_int_p=`cat conftestval`
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_struct_st_blksize=no
+  rm -fr conftest*
+  ac_cv_sizeof_int_p=0
 fi
-rm -f conftest*
+rm -fr conftest*
 fi
 
-echo "$ac_t""$ac_cv_struct_st_blksize" 1>&6
-if test $ac_cv_struct_st_blksize = yes; then
-  cat >> confdefs.h <<\EOF
-#define HAVE_ST_BLKSIZE 1
+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
 
-fi
-echo $ac_n "checking for st_blocks in struct stat""... $ac_c" 1>&6
-echo "configure:3481: checking for st_blocks in struct stat" >&5
-if eval "test \"`echo '$''{'ac_cv_struct_st_blocks'+set}'`\" = set"; then
+
+echo $ac_n "checking size of int""... $ac_c" 1>&6
+echo "configure:9120: 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 3486 "configure"
+#line 9128 "configure"
 #include "confdefs.h"
-#include <sys/types.h>
-#include <sys/stat.h>
-int main() {
-struct stat s; s.st_blocks;
-; return 0; }
+#include <stdio.h>
+main()
+{
+  FILE *f=fopen("conftestval", "w");
+  if (!f) exit(1);
+  fprintf(f, "%d\n", sizeof(int));
+  exit(0);
+}
 EOF
-if { (eval echo configure:3494: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_struct_st_blocks=yes
+if { (eval echo configure:9139: \"$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 -rf conftest*
-  ac_cv_struct_st_blocks=no
+  rm -fr conftest*
+  ac_cv_sizeof_int=0
 fi
-rm -f conftest*
+rm -fr conftest*
 fi
 
-echo "$ac_t""$ac_cv_struct_st_blocks" 1>&6
-if test $ac_cv_struct_st_blocks = yes; then
-  cat >> confdefs.h <<\EOF
-#define HAVE_ST_BLOCKS 1
+fi
+echo "$ac_t""$ac_cv_sizeof_int" 1>&6
+cat >> confdefs.h <<EOF
+#define SIZEOF_INT $ac_cv_sizeof_int
 EOF
 
-else
-  LIBOBJS="$LIBOBJS fileblocks.o"
-fi
-echo $ac_n "checking for st_rdev in struct stat""... $ac_c" 1>&6
-echo "configure:3517: checking for st_rdev in struct stat" >&5
-if eval "test \"`echo '$''{'ac_cv_struct_st_rdev'+set}'`\" = set"; then
+
+echo $ac_n "checking size of long""... $ac_c" 1>&6
+echo "configure:9159: 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 3522 "configure"
+#line 9167 "configure"
 #include "confdefs.h"
-#include <sys/types.h>
-#include <sys/stat.h>
-int main() {
-struct stat s; s.st_rdev;
-; return 0; }
+#include <stdio.h>
+main()
+{
+  FILE *f=fopen("conftestval", "w");
+  if (!f) exit(1);
+  fprintf(f, "%d\n", sizeof(long));
+  exit(0);
+}
 EOF
-if { (eval echo configure:3530: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_struct_st_rdev=yes
+if { (eval echo configure:9178: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  ac_cv_sizeof_long=`cat conftestval`
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_struct_st_rdev=no
+  rm -fr conftest*
+  ac_cv_sizeof_long=0
 fi
-rm -f conftest*
+rm -fr conftest*
 fi
 
-echo "$ac_t""$ac_cv_struct_st_rdev" 1>&6
-if test $ac_cv_struct_st_rdev = yes; then
-  cat >> confdefs.h <<\EOF
-#define HAVE_ST_RDEV 1
+fi
+echo "$ac_t""$ac_cv_sizeof_long" 1>&6
+cat >> confdefs.h <<EOF
+#define SIZEOF_LONG $ac_cv_sizeof_long
 EOF
 
-fi
-echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6
-echo "configure:3551: checking whether struct tm is in sys/time.h or time.h" >&5
-if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then
+
+echo $ac_n "checking size of long long""... $ac_c" 1>&6
+echo "configure:9198: 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 3556 "configure"
+#line 9206 "configure"
 #include "confdefs.h"
-#include <sys/types.h>
-#include <time.h>
-int main() {
-struct tm *tp; tp->tm_sec;
-; return 0; }
+#include <stdio.h>
+main()
+{
+  FILE *f=fopen("conftestval", "w");
+  if (!f) exit(1);
+  fprintf(f, "%d\n", sizeof(long long));
+  exit(0);
+}
 EOF
-if { (eval echo configure:3564: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_struct_tm=time.h
+if { (eval echo configure:9217: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  ac_cv_sizeof_long_long=`cat conftestval`
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_struct_tm=sys/time.h
+  rm -fr conftest*
+  ac_cv_sizeof_long_long=0
 fi
-rm -f conftest*
+rm -fr conftest*
 fi
 
-echo "$ac_t""$ac_cv_struct_tm" 1>&6
-if test $ac_cv_struct_tm = sys/time.h; then
-  cat >> confdefs.h <<\EOF
-#define TM_IN_SYS_TIME 1
+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
 
-fi
 
-echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6
-echo "configure:3585: checking for tm_zone in struct tm" >&5
-if eval "test \"`echo '$''{'ac_cv_struct_tm_zone'+set}'`\" = set"; then
+
+echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
+echo "configure:9238: checking whether byte ordering is bigendian" >&5
+if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  cat > conftest.$ac_ext <<EOF
-#line 3590 "configure"
+  ac_cv_c_bigendian=unknown
+# See if sys/param.h defines the BYTE_ORDER macro.
+cat > conftest.$ac_ext <<EOF
+#line 9245 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
-#include <$ac_cv_struct_tm>
+#include <sys/param.h>
 int main() {
-struct tm tm; tm.tm_zone;
+
+#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN
+ bogus endian macros
+#endif
 ; return 0; }
 EOF
-if { (eval echo configure:3598: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_struct_tm_zone=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
+if { (eval echo configure:9256: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  ac_cv_struct_tm_zone=no
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_struct_tm_zone" 1>&6
-if test "$ac_cv_struct_tm_zone" = yes; then
-  cat >> confdefs.h <<\EOF
-#define HAVE_TM_ZONE 1
-EOF
-
-else
-  echo $ac_n "checking for tzname""... $ac_c" 1>&6
-echo "configure:3618: checking for tzname" >&5
-if eval "test \"`echo '$''{'ac_cv_var_tzname'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 3623 "configure"
+  # It does; now see whether it defined to BIG_ENDIAN or not.
+cat > conftest.$ac_ext <<EOF
+#line 9260 "configure"
 #include "confdefs.h"
-#include <time.h>
-#ifndef tzname /* For SGI.  */
-extern char *tzname[]; /* RS6000 and others reject char **tzname.  */
-#endif
+#include <sys/types.h>
+#include <sys/param.h>
 int main() {
-atoi(*tzname);
+
+#if BYTE_ORDER != BIG_ENDIAN
+ not big endian
+#endif
 ; return 0; }
 EOF
-if { (eval echo configure:3633: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:9271: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  ac_cv_var_tzname=yes
+  ac_cv_c_bigendian=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  ac_cv_var_tzname=no
+  ac_cv_c_bigendian=no
 fi
 rm -f conftest*
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
 fi
-
-echo "$ac_t""$ac_cv_var_tzname" 1>&6
-  if test $ac_cv_var_tzname = yes; then
-    cat >> confdefs.h <<\EOF
-#define HAVE_TZNAME 1
-EOF
-
-  fi
-fi
-
-
-
-echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:3657: checking for working const" >&5
-if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
+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 3662 "configure"
+#line 9291 "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;
+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);
 }
-
-; return 0; }
 EOF
-if { (eval echo configure:3711: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_c_const=yes
+if { (eval echo configure:9304: \"$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 -rf conftest*
-  ac_cv_c_const=no
+  rm -fr conftest*
+  ac_cv_c_bigendian=yes
 fi
-rm -f conftest*
+rm -fr conftest*
 fi
 
-echo "$ac_t""$ac_cv_c_const" 1>&6
-if test $ac_cv_c_const = no; then
+fi
+fi
+
+echo "$ac_t""$ac_cv_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 const 
+#define WORDS_BIGENDIAN 1
 EOF
 
 fi
 
-echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:3732: checking for inline" >&5
-if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
+
+
+  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:9351: 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_cv_c_inline=no
-for ac_kw in inline __inline__ __inline; do
   cat > conftest.$ac_ext <<EOF
-#line 3739 "configure"
+#line 9356 "configure"
 #include "confdefs.h"
-
-int main() {
-} $ac_kw foo() {
-; return 0; }
+#include <$ac_hdr>
 EOF
-if { (eval echo configure:3746: \"$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:9361: \"$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_inline=$ac_kw; break
+  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_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
+    if test "x$HAVE_IOSTREAM" = x ; then
+      cat >> confdefs.h <<\EOF
+#define wxUSE_IOSTREAMH 1
 EOF
- ;;
-esac
 
-echo $ac_n "checking whether char is unsigned""... $ac_c" 1>&6
-echo "configure:3772: checking whether char is unsigned" >&5
-if eval "test \"`echo '$''{'ac_cv_c_char_unsigned'+set}'`\" = set"; then
+    else
+      :
+    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:9409: checking if C++ compiler supports bool" >&5
+if eval "test \"`echo '$''{'wx_cv_cpp_bool'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  if test "$GCC" = yes; then
-  # GCC predefines this symbol on systems where it applies.
-cat > conftest.$ac_ext <<EOF
-#line 3779 "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 9424 "configure"
 #include "confdefs.h"
-#ifdef __CHAR_UNSIGNED__
-  yes
-#endif
 
+      
+int main() {
+
+        bool b = true;
+
+        return 0;
+      
+; return 0; }
 EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "yes" >/dev/null 2>&1; then
-  rm -rf conftest*
-  ac_cv_c_char_unsigned=yes
-else
+if { (eval echo configure:9436: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  ac_cv_c_char_unsigned=no
-fi
-rm -f conftest*
-
-else
-if test "$cross_compiling" = yes; then
-    { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
-else
-  cat > conftest.$ac_ext <<EOF
-#line 3801 "configure"
-#include "confdefs.h"
-/* volatile prevents gcc2 from optimizing the test away on sparcs.  */
-#if !defined(__STDC__) || __STDC__ != 1
-#define volatile
-#endif
-main() {
-  volatile char c = 255; exit(c < 0);
-}
+  
+        cat >> confdefs.h <<\EOF
+#define HAVE_BOOL 1
 EOF
-if { (eval echo configure:3811: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
-then
-  ac_cv_c_char_unsigned=yes
+
+        wx_cv_cpp_bool=yes
+      
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  ac_cv_c_char_unsigned=no
-fi
-rm -fr conftest*
+  rm -rf conftest*
+  
+        wx_cv_cpp_bool=no
+      
+    
 fi
+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
+
+  
 fi
 
-echo "$ac_t""$ac_cv_c_char_unsigned" 1>&6
-if test $ac_cv_c_char_unsigned = yes && test "$GCC" != yes; then
-  cat >> confdefs.h <<\EOF
-#define __CHAR_UNSIGNED__ 1
+echo "$ac_t""$wx_cv_cpp_bool" 1>&6
+
+  if test "$wx_cv_cpp_bool" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define HAVE_BOOL 1
 EOF
 
-fi
+  fi
 
-echo $ac_n "checking for long double""... $ac_c" 1>&6
-echo "configure:3835: checking for long double" >&5
-if eval "test \"`echo '$''{'ac_cv_c_long_double'+set}'`\" = set"; then
+
+
+echo $ac_n "checking if you need GNU extensions""... $ac_c" 1>&6
+echo "configure:9478: checking if you need GNU extensions" >&5
+if eval "test \"`echo '$''{'wx_cv_gnu_extensions'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  if test "$GCC" = yes; then
-  ac_cv_c_long_double=yes
-else
-if test "$cross_compiling" = yes; then
-    { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
-else
-  cat > conftest.$ac_ext <<EOF
-#line 3846 "configure"
+  
+   cat > conftest.$ac_ext <<EOF
+#line 9484 "configure"
 #include "confdefs.h"
+#include <features.h>
 int main() {
-/* The Stardent Vistra knows sizeof(long double), but does not support it.  */
-long double foo = 0.0;
-/* On Ultrix 4.3 cc, long double is 4 and double is 8.  */
-exit(sizeof(long double) < sizeof(double)); }
+
+
+#ifndef __GNU_LIBRARY__
+ Compile error wanted
+#endif
+
+
+; return 0; }
 EOF
-if { (eval echo configure:3854: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
-then
-  ac_cv_c_long_double=yes
+if { (eval echo configure:9497: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  wx_cv_gnu_extensions=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  ac_cv_c_long_double=no
-fi
-rm -fr conftest*
+  rm -rf conftest*
+  wx_cv_gnu_extensions=no
 fi
+rm -f conftest*
 
-fi
 fi
 
-echo "$ac_t""$ac_cv_c_long_double" 1>&6
-if test $ac_cv_c_long_double = yes; then
-  cat >> confdefs.h <<\EOF
-#define HAVE_LONG_DOUBLE 1
+
+echo "$ac_t""$wx_cv_gnu_extensions" 1>&6
+if test "$wx_cv_gnu_extensions" = "yes"; then
+  cat >> confdefs.h <<EOF
+#define _GNU_SOURCE 1
 EOF
 
 fi
 
 
-echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
-echo "configure:3879: checking whether byte ordering is bigendian" >&5
-if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then
+
+echo $ac_n "checking for wcslen in -lc""... $ac_c" 1>&6
+echo "configure:9522: 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_cv_c_bigendian=unknown
-# See if sys/param.h defines the BYTE_ORDER macro.
+  ac_save_LIBS="$LIBS"
+LIBS="-lc  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3886 "configure"
+#line 9530 "configure"
 #include "confdefs.h"
-#include <sys/types.h>
-#include <sys/param.h>
-int main() {
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char wcslen();
 
-#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN
- bogus endian macros
-#endif
-; return 0; }
-EOF
-if { (eval echo configure:3897: \"$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 3901 "configure"
-#include "confdefs.h"
-#include <sys/types.h>
-#include <sys/param.h>
 int main() {
-
-#if BYTE_ORDER != BIG_ENDIAN
- not big endian
-#endif
+wcslen()
 ; return 0; }
 EOF
-if { (eval echo configure:3912: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:9541: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  ac_cv_c_bigendian=yes
+  eval "ac_cv_lib_$ac_lib_var=yes"
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  ac_cv_c_bigendian=no
+  eval "ac_cv_lib_$ac_lib_var=no"
 fi
 rm -f conftest*
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
+LIBS="$ac_save_LIBS"
+
 fi
-rm -f conftest*
-if test $ac_cv_c_bigendian = unknown; then
-if test "$cross_compiling" = yes; then
-    { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
+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
-  cat > conftest.$ac_ext <<EOF
-#line 3932 "configure"
+  echo "$ac_t""no" 1>&6
+
+            echo $ac_n "checking for wcslen in -lw""... $ac_c" 1>&6
+echo "configure:9567: 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 9575 "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);
-}
+/* 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:3945: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
-then
-  ac_cv_c_bigendian=no
+if { (eval echo configure:9586: \"$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_c_bigendian=yes
-fi
-rm -fr conftest*
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
 fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
 
 fi
-fi
-
-echo "$ac_t""$ac_cv_c_bigendian" 1>&6
-if test $ac_cv_c_bigendian = yes; then
-  cat >> confdefs.h <<\EOF
-#define WORDS_BIGENDIAN 1
+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
 fi
 
+        
+fi
 
-echo $ac_n "checking size of int *""... $ac_c" 1>&6
-echo "configure:3970: checking size of int *" >&5
-if eval "test \"`echo '$''{'ac_cv_sizeof_int_p'+set}'`\" = set"; then
+
+echo $ac_n "checking for vprintf""... $ac_c" 1>&6
+echo "configure:9617: checking for vprintf" >&5
+if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test "$cross_compiling" = yes; then
-    { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
 else
   cat > conftest.$ac_ext <<EOF
-#line 3978 "configure"
+#line 9622 "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);
-}
+/* 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();
+char (*f)();
+
+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
+f = vprintf;
+#endif
+
+; return 0; }
 EOF
-if { (eval echo configure:3989: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
-then
-  ac_cv_sizeof_int_p=`cat conftestval`
+if { (eval echo configure:9646: \"$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 -fr conftest*
-  ac_cv_sizeof_int_p=0
+  rm -rf conftest*
+  eval "ac_cv_func_vprintf=no"
 fi
-rm -fr conftest*
+rm -f 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
+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
 
+else
+  echo "$ac_t""no" 1>&6
+fi
 
-echo $ac_n "checking size of int""... $ac_c" 1>&6
-echo "configure:4009: checking size of int" >&5
-if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
+if test "$ac_cv_func_vprintf" != yes; then
+echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
+echo "configure:9670: checking for _doprnt" >&5
+if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test "$cross_compiling" = yes; then
-    { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
 else
   cat > conftest.$ac_ext <<EOF
-#line 4017 "configure"
+#line 9675 "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);
-}
+/* 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();
+char (*f)();
+
+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
+f = _doprnt;
+#endif
+
+; return 0; }
 EOF
-if { (eval echo configure:4028: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
-then
-  ac_cv_sizeof_int=`cat conftestval`
+if { (eval echo configure:9699: \"$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 -fr conftest*
-  ac_cv_sizeof_int=0
-fi
-rm -fr conftest*
+  rm -rf conftest*
+  eval "ac_cv_func__doprnt=no"
 fi
-
+rm -f conftest*
 fi
-echo "$ac_t""$ac_cv_sizeof_int" 1>&6
-cat >> confdefs.h <<EOF
-#define SIZEOF_INT $ac_cv_sizeof_int
-EOF
 
-
-echo $ac_n "checking size of long""... $ac_c" 1>&6
-echo "configure:4048: 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
-    { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
-else
-  cat > conftest.$ac_ext <<EOF
-#line 4056 "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);
-}
+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
-if { (eval echo configure:4067: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./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*
+  echo "$ac_t""no" 1>&6
 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:4087: checking size of long long" >&5
-if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then
+for ac_func in vsnprintf
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:9727: 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
-  if test "$cross_compiling" = yes; then
-    { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
 else
   cat > conftest.$ac_ext <<EOF
-#line 4095 "configure"
+#line 9732 "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);
-}
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func(); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char $ac_func();
+char (*f)();
+
+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
+f = $ac_func;
+#endif
+
+; return 0; }
 EOF
-if { (eval echo configure:4106: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
-then
-  ac_cv_sizeof_long_long=`cat conftestval`
+if { (eval echo configure:9756: \"$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*
-  ac_cv_sizeof_long_long=0
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=no"
 fi
-rm -fr conftest*
+rm -f 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
+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_VSNPRINTF 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
 
 
 
+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 long file names""... $ac_c" 1>&6
-echo "configure:4130: checking for long file names" >&5
-if eval "test \"`echo '$''{'ac_cv_sys_long_file_names'+set}'`\" = set"; then
+echo $ac_n "checking for vsscanf""... $ac_c" 1>&6
+echo "configure:9796: checking for vsscanf" >&5
+if eval "test \"`echo '$''{'wx_cv_func_vsscanf'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  ac_cv_sys_long_file_names=yes
-# Test for long file names in all the places we know might matter:
-#      .               the current directory, where building will happen
-#      $prefix/lib     where we will be installing things
-#      $exec_prefix/lib        likewise
-# eval it to expand exec_prefix.
-#      $TMPDIR         if set, where it might want to write temporary files
-# if $TMPDIR is not set:
-#      /tmp            where it might want to write temporary files
-#      /var/tmp                likewise
-#      /usr/tmp                likewise
-if test -n "$TMPDIR" && test -d "$TMPDIR" && test -w "$TMPDIR"; then
-  ac_tmpdirs="$TMPDIR"
-else
-  ac_tmpdirs='/tmp /var/tmp /usr/tmp'
-fi
-for ac_dir in  . $ac_tmpdirs `eval echo $prefix/lib $exec_prefix/lib` ; do
-  test -d $ac_dir || continue
-  test -w $ac_dir || continue # It is less confusing to not echo anything here.
-  (echo 1 > $ac_dir/conftest9012345) 2>/dev/null
-  (echo 2 > $ac_dir/conftest9012346) 2>/dev/null
-  val=`cat $ac_dir/conftest9012345 2>/dev/null`
-  if test ! -f $ac_dir/conftest9012345 || test "$val" != 1; then
-    ac_cv_sys_long_file_names=no
-    rm -f $ac_dir/conftest9012345 $ac_dir/conftest9012346 2>/dev/null
-    break
-  fi
-  rm -f $ac_dir/conftest9012345 $ac_dir/conftest9012346 2>/dev/null
-done
-fi
+  
+  if test "$cross_compiling" = yes; then
+  wx_cv_func_vsscanf=no
+             
+else
+  cat > conftest.$ac_ext <<EOF
+#line 9806 "configure"
+#include "confdefs.h"
+#ifdef __cplusplus
+extern "C" void exit(int);
+#endif
 
-echo "$ac_t""$ac_cv_sys_long_file_names" 1>&6
-if test $ac_cv_sys_long_file_names = yes; then
-  cat >> confdefs.h <<\EOF
-#define HAVE_LONG_FILE_NAMES 1
-EOF
+                #include <stdio.h>
+                #include <stdarg.h>
 
-fi
+                int try_vsscanf(const char *format, ...)
+                {
+                  va_list ap;
+                  va_start(ap, format);
 
+                  vsscanf("17", format, ap);
 
-                                          
+                  va_end(ap);
+                }
 
-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:4181: 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.
+                int main()
+                {
+                  int i;
+                  try_vsscanf("%d", &i);
+                  return i == 17 ? 0 : 1;
+                }
+             
+EOF
+if { (eval echo configure:9833: \"$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_VSSCANF 1
+EOF
+
+                wx_cv_func_vsscanf=yes
+             
 else
-  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_word; then
-      ac_cv_prog_YACC="$ac_prog"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  wx_cv_func_vsscanf=no
 fi
+rm -fr conftest*
 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"
+echo "$ac_t""$wx_cv_func_vsscanf" 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
 
-# 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:4214: 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="${IFS}:"
-  for ac_dir in $PATH; 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:4247: 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
+if test "$USE_UNIX" = 1; then
+
+for ac_func in vfork
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:9869: 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$ac_lib  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 4255 "configure"
+  cat > conftest.$ac_ext <<EOF
+#line 9874 "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 yywrap();
+char $ac_func();
+char (*f)();
 
 int main() {
-yywrap()
+
+/* 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
+f = $ac_func;
+#endif
+
 ; return 0; }
 EOF
-if { (eval echo configure:4266: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:9898: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
+  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
-  LEXLIB="-l$ac_lib"
+    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
-
-echo $ac_n "checking lex output file root""... $ac_c" 1>&6
-echo "configure:4289: 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
-else
-  { echo "configure: error: cannot find output from $LEX; giving up" 1>&2; exit 1; }
-fi
-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:4310: checking whether yytext is a pointer" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_lex_yytext_pointer'+set}'`\" = set"; then
+for ac_func in timegm
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:9926: 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
-  # 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 4322 "configure"
+  cat > conftest.$ac_ext <<EOF
+#line 9931 "configure"
 #include "confdefs.h"
-`cat $LEX_OUTPUT_ROOT.c`
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func(); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char $ac_func();
+char (*f)();
+
 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
+f = $ac_func;
+#endif
+
 ; return 0; }
 EOF
-if { (eval echo configure:4329: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:9955: \"$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
+  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*
-LIBS="$ac_save_LIBS"
-rm -f "${LEX_OUTPUT_ROOT}.c"
+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
+
 
-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
+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
 
-
-
-DL_LIBRARY=
-for ac_func in dlopen
+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:4356: checking for $ac_func" >&5
+echo "configure:9994: 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 4361 "configure"
+#line 9999 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -4366,6 +10004,7 @@ else
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
 char $ac_func();
+char (*f)();
 
 int main() {
 
@@ -4375,12 +10014,12 @@ int main() {
 #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
-$ac_func();
+f = $ac_func;
 #endif
 
 ; return 0; }
 EOF
-if { (eval echo configure:4384: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:10023: \"$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
@@ -4399,32 +10038,32 @@ if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
 #define $ac_tr_func 1
 EOF
  cat >> confdefs.h <<\EOF
-#define HAVE_LIBDL 1
+#define HAVE_NANOSLEEP 1
 EOF
 
 else
   echo "$ac_t""no" 1>&6
-echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:4409: checking for dlopen in -ldl" >&5
-ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for nanosleep in -lposix4""... $ac_c" 1>&6
+echo "configure:10048: 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="-ldl  $LIBS"
+LIBS="-lposix4  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4417 "configure"
+#line 10056 "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();
+char nanosleep();
 
 int main() {
-dlopen()
+nanosleep()
 ; return 0; }
 EOF
-if { (eval echo configure:4428: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:10067: \"$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
@@ -4439,62 +10078,93 @@ 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_LIBDL 1
+  
+                    cat >> confdefs.h <<\EOF
+#define HAVE_NANOSLEEP 1
 EOF
- DL_LIBRARY="-ldl"
+
+                    POSIX4_LINK="-lposix4"
+                
 else
   echo "$ac_t""no" 1>&6
-echo $ac_n "checking for dld_link in -ldld""... $ac_c" 1>&6
-echo "configure:4450: checking for dld_link in -ldld" >&5
-ac_lib_var=`echo dld'_'dld_link | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+
+                    for ac_func in usleep
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:10095: 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="-ldld  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 4458 "configure"
+  cat > conftest.$ac_ext <<EOF
+#line 10100 "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 dld_link();
+char $ac_func();
+char (*f)();
 
 int main() {
-dld_link()
+
+/* 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
+f = $ac_func;
+#endif
+
 ; return 0; }
 EOF
-if { (eval echo configure:4469: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:10124: \"$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_DLD 1
+    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
 EOF
- DL_LIBRARY="-ldld"
 else
   echo "$ac_t""no" 1>&6
-for ac_func in shl_load
+fi
+done
+
+                    echo "configure: warning: wxSleep() function will not work" 1>&2
+                
+            
+fi
+
+        
+    
+fi
+done
+
+fi
+
+for ac_func in uname gethostname
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4493: checking for $ac_func" >&5
+echo "configure:10163: 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 4498 "configure"
+#line 10168 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -4503,6 +10173,7 @@ else
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
 char $ac_func();
+char (*f)();
 
 int main() {
 
@@ -4512,12 +10183,12 @@ int main() {
 #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
-$ac_func();
+f = $ac_func;
 #endif
 
 ; return 0; }
 EOF
-if { (eval echo configure:4521: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:10192: \"$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
@@ -4535,105 +10206,80 @@ if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
   cat >> confdefs.h <<EOF
 #define $ac_tr_func 1
 EOF
- cat >> confdefs.h <<\EOF
-#define HAVE_SHL_LOAD 1
-EOF
+ break
 else
   echo "$ac_t""no" 1>&6
 fi
 done
 
-  
-fi
-
-fi
-
-
-fi
-done
-
-
-
-echo $ac_n "checking for underscore before symbols""... $ac_c" 1>&6
-echo "configure:4561: checking for underscore before symbols" >&5
-if eval "test \"`echo '$''{'libltdl_cv_uscore'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-  echo "main(){int i=1;} fnord(){int i=23; int ltuae=42;}" > conftest.c
-  ${CC} -c conftest.c > /dev/null
-  if (nm conftest.o | grep _fnord) > /dev/null; then
-    libltdl_cv_uscore=yes
-  else
-    libltdl_cv_uscore=no
-  fi
-  rm -f conftest*
-
-fi
-
-echo "$ac_t""$libltdl_cv_uscore" 1>&6
 
-if test x"$libltdl_cv_uscore" = xyes; then
-  if test x"$ac_cv_func_dlopen" = xyes ||
-     test x"$ac_cv_lib_dl_dlopen" = xyes ; then
-       echo $ac_n "checking whether we have to add an underscore for dlsym""... $ac_c" 1>&6
-echo "configure:4583: checking whether we have to add an underscore for dlsym" >&5
-if eval "test \"`echo '$''{'libltdl_cv_need_uscore'+set}'`\" = set"; then
+for ac_func in strtok_r
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:10220: 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
-               if test "$cross_compiling" = yes; then
-  libltdl_cv_need_uscore=no
-
 else
   cat > conftest.$ac_ext <<EOF
-#line 4592 "configure"
+#line 10225 "configure"
 #include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func(); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char $ac_func();
+char (*f)();
 
-#include <dlfcn.h>
-#include <stdio.h>
-fnord() { int i=42;}
-main() { void *self, *ptr1, *ptr2; self=dlopen(NULL,RTLD_LAZY);
-    if(self) { ptr1=dlsym(self,"fnord"); ptr2=dlsym(self,"_fnord");
-    if(ptr1 && !ptr2) exit(0); } exit(1); } 
+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
+f = $ac_func;
+#endif
+
+; return 0; }
 EOF
-if { (eval echo configure:4603: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
-then
-  libltdl_cv_need_uscore=no
+if { (eval echo configure:10249: \"$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*
-  libltdl_cv_need_uscore=yes
-fi
-rm -fr conftest*
-fi
-
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=no"
 fi
-
-echo "$ac_t""$libltdl_cv_need_uscore" 1>&6
-  fi
+rm -f conftest*
 fi
 
-if test x"$libltdl_cv_need_uscore" = xyes; then
-   cat >> confdefs.h <<\EOF
-#define NEED_USCORE 1
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
 EOF
-
+else
+  echo "$ac_t""no" 1>&6
 fi
+done
 
 
-for ac_func in strerror
+INET_LINK=
+for ac_func in inet_addr
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4632: checking for $ac_func" >&5
+echo "configure:10278: 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 4637 "configure"
+#line 10283 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -4642,6 +10288,7 @@ else
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
 char $ac_func();
+char (*f)();
 
 int main() {
 
@@ -4651,12 +10298,12 @@ int main() {
 #if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
-$ac_func();
+f = $ac_func;
 #endif
 
 ; return 0; }
 EOF
-if { (eval echo configure:4660: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:10307: \"$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
@@ -4674,1538 +10321,1899 @@ if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
   cat >> confdefs.h <<EOF
 #define $ac_tr_func 1
 EOF
+ cat >> confdefs.h <<\EOF
+#define HAVE_INET_ADDR 1
+EOF
+
 else
   echo "$ac_t""no" 1>&6
-fi
-done
-
-
-
-CHECK_INCLUDE="-I/usr/include $X_CFLAGS"
-CHECK_LIB="-L/lib -L/usr/lib $X_LIBS"
-
-
+echo $ac_n "checking for inet_addr in -lnsl""... $ac_c" 1>&6
+echo "configure:10332: checking for inet_addr in -lnsl" >&5
+ac_lib_var=`echo nsl'_'inet_addr | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-lnsl  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 10340 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char inet_addr();
 
-# Make sure we can run config.sub.
-if $ac_config_sub sun4 >/dev/null 2>&1; then :
-else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
+int main() {
+inet_addr()
+; return 0; }
+EOF
+if { (eval echo configure:10351: \"$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"
 
-echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:4697: checking host system type" >&5
-
-host_alias=$host
-case "$host_alias" in
-NONE)
-  case $nonopt in
-  NONE)
-    if host_alias=`$ac_config_guess`; then :
-    else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
-    fi ;;
-  *) host_alias=$nonopt ;;
-  esac ;;
-esac
-
-host=`$ac_config_sub $host_alias`
-host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$host" 1>&6
-
-canonical=$host
-configuration=$host_alias
-
-
-USE_UNIX=1
-
-USE_LINUX=
-USE_SGI=
-USE_HPUX=
-USE_SYSV=
-USE_SVR4=
-USE_AIX=
-USE_SUN=
-USE_SOLARIS=
-USE_SUNOS=
-USE_ALPHA=
-USE_OSF=
-USE_BSD=
-USE_FREEBSD=
-USE_VMS=
-USE_ULTRIX=
-USE_DATA_GENERAL=
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  INET_LINK="nsl"
+else
+  echo "$ac_t""no" 1>&6
+echo $ac_n "checking for inet_addr in -lresolv""... $ac_c" 1>&6
+echo "configure:10370: 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="-lresolv  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 10378 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char inet_addr();
 
-cat >> confdefs.h <<\EOF
-#define __UNIX__ 1
+int main() {
+inet_addr()
+; return 0; }
 EOF
+if { (eval echo configure:10389: \"$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"
 
-case "${canonical}" in
-  *-hp-hpux* )
-    USE_HPUX=1
-    cat >> confdefs.h <<\EOF
-#define __HPUX__ 1
-EOF
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  INET_LINK="resolv"
+            
+else
+  echo "$ac_t""no" 1>&6
+fi
 
-  ;;
-  *-*-linux* )
-    USE_LINUX=1
-    cat >> confdefs.h <<\EOF
-#define __LINUX__ 1
-EOF
+        
+fi
 
-    TMP=`uname -m`
-    if test "x$TMP" = "xalpha"
-    then
-      USE_ALPHA=1
-      cat >> confdefs.h <<\EOF
-#define __ALPHA__ 1
-EOF
+    
+
+fi
+done
 
-    fi
-  ;;
-  *-*-irix5* | *-*-irix6* ) 
-    USE_SGI=1
-    USE_SVR4=1
-    cat >> confdefs.h <<\EOF
-#define __SGI__ 1
-EOF
 
-    cat >> confdefs.h <<\EOF
-#define __SVR4__ 1
-EOF
+for ac_func in inet_aton
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:10422: 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 10427 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func(); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char $ac_func();
+char (*f)();
 
-  ;;
-  *-*-solaris2* ) 
-    USE_SUN=1
-    USE_SOLARIS=1
-    USE_SVR4=1
-    cat >> confdefs.h <<\EOF
-#define __SUN__ 1
-EOF
+int main() {
 
-    cat >> confdefs.h <<\EOF
-#define __SOLARIS__ 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
+f = $ac_func;
+#endif
 
-    cat >> confdefs.h <<\EOF
-#define __SVR4__ 1
+; return 0; }
 EOF
+if { (eval echo configure:10451: \"$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
 
-  ;;
-  *-*-sunos4* ) 
-    USE_SUN=1
-    USE_SUNOS=1
-    USE_BSD=1
-    cat >> confdefs.h <<\EOF
-#define __SUN__ 1
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
 EOF
-
-    cat >> confdefs.h <<\EOF
-#define __SUNOS__ 1
+ cat >> confdefs.h <<\EOF
+#define HAVE_INET_ATON 1
 EOF
 
-    cat >> confdefs.h <<\EOF
-#define __BSD__ 1
-EOF
+else
+  echo "$ac_t""no" 1>&6
+            echo $ac_n "checking for inet_aton in -l$INET_LINK""... $ac_c" 1>&6
+echo "configure:10476: 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
+  ac_save_LIBS="$LIBS"
+LIBS="-l$INET_LINK  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 10484 "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();
 
-  ;;
-  *-*-freebsd* | *-*-netbsd*)
-    USE_BSD=1
-    USE_FREEBSD=1
-    cat >> confdefs.h <<\EOF
-#define __FREEBSD__ 1
+int main() {
+inet_aton()
+; return 0; }
 EOF
+if { (eval echo configure:10495: \"$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"
 
-    cat >> confdefs.h <<\EOF
-#define __BSD__ 1
+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
 
-  ;;
-  *-*-osf* ) 
-    USE_ALPHA=1
-    USE_OSF=1
-    cat >> confdefs.h <<\EOF
-#define __ALPHA__ 1
-EOF
+else
+  echo "$ac_t""no" 1>&6
+fi
 
-    cat >> confdefs.h <<\EOF
-#define __OSF__ 1
-EOF
+        
+fi
+done
 
-  ;;
-  *-*-dgux5* ) 
-    USE_ALPHA=1
-    USE_SVR4=1
-    cat >> confdefs.h <<\EOF
-#define __ALPHA__ 1
-EOF
 
+if test "x$INET_LINK" != "x"; then
     cat >> confdefs.h <<\EOF
-#define __SVR4__ 1
+#define HAVE_INET_ADDR 1
 EOF
 
-  ;;
-  *-*-sysv5* ) 
-    USE_SYSV=1
-    USE_SVR4=1
-    cat >> confdefs.h <<\EOF
-#define __SYSV__ 1
-EOF
+    INET_LINK="-l$INET_LINK"
+fi
 
-    cat >> confdefs.h <<\EOF
-#define __SVR4__ 1
-EOF
+fi
 
-  ;;
-  *-*-aix* ) 
-    USE_AIX=1
-    USE_SYSV=1
-    USE_SVR4=1
-    cat >> confdefs.h <<\EOF
-#define __AIX__ 1
-EOF
 
-    cat >> confdefs.h <<\EOF
-#define __SYSV__ 1
+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
 
-    cat >> confdefs.h <<\EOF
-#define __SVR4__ 1
-EOF
 
-  ;;
-  *)
-    { echo "configure: error: I don't know your system type." 1>&2; exit 1; }
-esac
 
+if test "$USE_UNIX" = 1; then
 
 
-rm -f ${OSTYPE}.system.cache.tmp
-touch ${OSTYPE}.system.cache.tmp
-touch ${OSTYPE}.system.cache
+THREADS_LINK=""
+THREADS_OBJ=""
+
+if test "$wxUSE_THREADS" = "yes" ; then
+    if test "$wxUSE_WINE" = 1 ; then
+        echo "configure: warning: Threads are not supported under WINE" 1>&2
+        wxUSE_THREADS="no"
+    elif test "$USE_BEOS" = 1; then
+        echo "configure: warning: BeOS threads are not yet supported" 1>&2
+        wxUSE_THREADS="no"
+    fi
+fi
 
+if test "$wxUSE_THREADS" = "yes" ; then
+    
+                echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6
+echo "configure:10602: 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
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-lpthread  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 10610 "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();
 
-DEFAULT_wxUSE_GTK=1
-DEFAULT_wxUSE_QT=0
-DEFAULT_wxUSE_MOTIF=0
+int main() {
+pthread_create()
+; return 0; }
+EOF
+if { (eval echo configure:10621: \"$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"
 
-DEFAULT_wxUSE_THREADS=0
-
-DEFAULT_wxUSE_SHARED=1
-DEFAULT_wxUSE_OPTIMISE=1
-DEFAULT_wxUSE_PROFILE=0
-DEFAULT_wxUSE_DEBUG_FLAG=0
-DEFAULT_wxUSE_DEBUG_INFO=0
-DEFAULT_wxUSE_MEM_TRACING=0
-DEFAULT_wxUSE_DMALLOC=0
-DEFAULT_wxUSE_APPLE_IEEE=1
-DEFAULT_wxUSE_IOSTREAMH=1
-
-DEFAULT_wxUSE_ZLIB=1
-DEFAULT_wxUSE_LIBPNG=1
-DEFAULT_wxUSE_LIBJPEG=0
-DEFAULT_wxUSE_ODBC=1
-
-DEFAULT_wxUSE_TIMEDATE=1
-DEFAULT_wxUSE_INTL=1
-DEFAULT_wxUSE_CONFIG=1
-DEFAULT_wxUSE_STREAMS=1
-DEFAULT_wxUSE_SOCKETS=1
-DEFAULT_wxUSE_SERIAL=1
-DEFAULT_wxUSE_DYNLIB_CLASS=1
-
-DEFAULT_wxUSE_AFM_FOR_POSTSCRIPT=1
-DEFAULT_WX_NORMALIZED_PS_FONTS=1
-DEFAULT_wxUSE_POSTSCRIPT=1
-
-DEFAULT_wxUSE_IPC=1
-DEFAULT_wxUSE_RESOURCES=1
-DEFAULT_wxUSE_CLIPBOARD=1
-DEFAULT_wxUSE_TOOLTIPS=1
-DEFAULT_wxUSE_DRAG_AND_DROP=1
-
-DEFAULT_wxUSE_MDI_ARCHITECTURE=1
-DEFAULT_wxUSE_DOC_VIEW_ARCHITECTURE=1
-DEFAULT_wxUSE_PRINTING_ARCHITECTURE=1
-
-DEFAULT_wxUSE_PROLOGIO=1
-DEFAULT_wxUSE_WX_RESOURCES=1
-DEFAULT_wxUSE_RPC=0
-DEFAULT_wxUSE_HELP=1
-
-DEFAULT_wxUSE_UNICODE=1
-DEFAULT_wxUSE_WCSRTOMBS=0
-
-
-
-echo $ac_n "checking "for gtk"""... $ac_c" 1>&6
-echo "configure:4944: checking "for gtk"" >&5
-# Check whether --with-gtk or --without-gtk was given.
-if test "${with_gtk+set}" = set; then
-  withval="$with_gtk"
-  if test "x$with_gtk" = xyes; then
-  ac_cv_use_gtk='wxUSE_GTK="1"'
+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
+
+                        echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6
+echo "configure:10644: 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 10652 "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:10663: \"$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
-  ac_cv_use_gtk='wxUSE_GTK="0"'
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
 fi
-else
-  
-  LINE=`grep "wxUSE_GTK" ${OSTYPE}.system.cache`
-  if test "x$LINE" != x ; then
-    eval "DEFAULT_$LINE"
-  fi
-  ac_cv_use_gtk='wxUSE_GTK='$DEFAULT_wxUSE_GTK
+rm -f conftest*
+LIBS="$ac_save_LIBS"
 
 fi
-
-eval "$ac_cv_use_gtk"
-echo $ac_cv_use_gtk >> ${OSTYPE}.system.cache.tmp
-if test "$wxUSE_GTK" = 1; then
+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
-fi
 
-
-
-echo $ac_n "checking "for qt"""... $ac_c" 1>&6
-echo "configure:4974: checking "for qt"" >&5
-# Check whether --with-qt or --without-qt was given.
-if test "${with_qt+set}" = set; then
-  withval="$with_qt"
-  if test "x$with_qt" = xyes; then
-  ac_cv_use_qt='wxUSE_QT="1"'
+                                ac_safe=`echo "sys/prctl.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for sys/prctl.h""... $ac_c" 1>&6
+echo "configure:10687: 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
-  ac_cv_use_qt='wxUSE_QT="0"'
-fi
+  cat > conftest.$ac_ext <<EOF
+#line 10692 "configure"
+#include "confdefs.h"
+#include <sys/prctl.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:10697: \"$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
-  
-  LINE=`grep "wxUSE_QT" ${OSTYPE}.system.cache`
-  if test "x$LINE" != x ; then
-    eval "DEFAULT_$LINE"
-  fi
-  ac_cv_use_qt='wxUSE_QT='$DEFAULT_wxUSE_QT
-
+  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
-
-eval "$ac_cv_use_qt"
-echo $ac_cv_use_qt >> ${OSTYPE}.system.cache.tmp
-if test "$wxUSE_QT" = 1; then
+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 motif"""... $ac_c" 1>&6
-echo "configure:5004: checking "for motif"" >&5
-# Check whether --with-motif or --without-motif was given.
-if test "${with_motif+set}" = set; then
-  withval="$with_motif"
-  if test "x$with_motif" = xyes; then
-  ac_cv_use_motif='wxUSE_MOTIF="1"'
-else
-  ac_cv_use_motif='wxUSE_MOTIF="0"'
+            
 fi
-else
-  
-  LINE=`grep "wxUSE_MOTIF" ${OSTYPE}.system.cache`
-  if test "x$LINE" != x ; then
-    eval "DEFAULT_$LINE"
-  fi
-  ac_cv_use_motif='wxUSE_MOTIF='$DEFAULT_wxUSE_MOTIF
 
+        
 fi
 
-eval "$ac_cv_use_motif"
-echo $ac_cv_use_motif >> ${OSTYPE}.system.cache.tmp
-if test "$wxUSE_MOTIF" = 1; then
-  echo "$ac_t""yes" 1>&6
-else
-  echo "$ac_t""no" 1>&6
+
+    if test -z "$THREADS_OBJ" ; then
+        wxUSE_THREADS=no
+        echo "configure: warning: No thread support on this system" 1>&2
+    fi
 fi
 
+if test "$wxUSE_THREADS" = "yes" ; then
+  for ac_func in thr_setconcurrency
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:10737: 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 10742 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func(); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char $ac_func();
+char (*f)();
 
+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
+f = $ac_func;
+#endif
 
-echo $ac_n "checking "for shared"""... $ac_c" 1>&6
-echo "configure:5035: checking "for shared"" >&5
-# Check whether --with-shared or --without-shared was given.
-if test "${with_shared+set}" = set; then
-  withval="$with_shared"
-  if test "x$with_shared" = xyes; then
-  ac_cv_use_shared='wxUSE_SHARED="1"'
+; return 0; }
+EOF
+if { (eval echo configure:10766: \"$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
-  ac_cv_use_shared='wxUSE_SHARED="0"'
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=no"
 fi
-else
-  
-  LINE=`grep "wxUSE_SHARED" ${OSTYPE}.system.cache`
-  if test "x$LINE" != x ; then
-    eval "DEFAULT_$LINE"
-  fi
-  ac_cv_use_shared='wxUSE_SHARED='$DEFAULT_wxUSE_SHARED
-
+rm -f conftest*
 fi
 
-eval "$ac_cv_use_shared"
-echo $ac_cv_use_shared >> ${OSTYPE}.system.cache.tmp
-if test "$wxUSE_SHARED" = 1; 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
 else
   echo "$ac_t""no" 1>&6
 fi
+done
 
 
-
-echo $ac_n "checking "for optimise"""... $ac_c" 1>&6
-echo "configure:5065: checking "for optimise"" >&5
-# Check whether --with-optimise or --without-optimise was given.
-if test "${with_optimise+set}" = set; then
-  withval="$with_optimise"
-  if test "x$with_optimise" = xyes; then
-  ac_cv_use_optimise='wxUSE_OPTIMISE="1"'
+                            
+  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:10796: 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_cv_use_optimise='wxUSE_OPTIMISE="0"'
-fi
+  cat > conftest.$ac_ext <<EOF
+#line 10801 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:10806: \"$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
-  
-  LINE=`grep "wxUSE_OPTIMISE" ${OSTYPE}.system.cache`
-  if test "x$LINE" != x ; then
-    eval "DEFAULT_$LINE"
-  fi
-  ac_cv_use_optimise='wxUSE_OPTIMISE='$DEFAULT_wxUSE_OPTIMISE
-
+  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
-
-eval "$ac_cv_use_optimise"
-echo $ac_cv_use_optimise >> ${OSTYPE}.system.cache.tmp
-if test "$wxUSE_OPTIMISE" = 1; then
+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
 
 
+  echo $ac_n "checking for sched_yield in -l$THREADS_LINK""... $ac_c" 1>&6
+echo "configure:10834: 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
+  ac_save_LIBS="$LIBS"
+LIBS="-l$THREADS_LINK  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 10842 "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();
 
-echo $ac_n "checking "for debug_flag"""... $ac_c" 1>&6
-echo "configure:5095: checking "for debug_flag"" >&5
-# Check whether --with-debug_flag or --without-debug_flag was given.
-if test "${with_debug_flag+set}" = set; then
-  withval="$with_debug_flag"
-  if test "x$with_debug_flag" = xyes; then
-  ac_cv_use_debug_flag='wxUSE_DEBUG_FLAG="1"'
+int main() {
+sched_yield()
+; return 0; }
+EOF
+if { (eval echo configure:10853: \"$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
-  ac_cv_use_debug_flag='wxUSE_DEBUG_FLAG="0"'
+  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
-  
-  LINE=`grep "wxUSE_DEBUG_FLAG" ${OSTYPE}.system.cache`
-  if test "x$LINE" != x ; then
-    eval "DEFAULT_$LINE"
-  fi
-  ac_cv_use_debug_flag='wxUSE_DEBUG_FLAG='$DEFAULT_wxUSE_DEBUG_FLAG
+  echo "$ac_t""no" 1>&6
+echo $ac_n "checking for sched_yield in -l"posix4"""... $ac_c" 1>&6
+echo "configure:10875: 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 $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-l"posix4"  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 10883 "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:10894: \"$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"
 
-eval "$ac_cv_use_debug_flag"
-echo $ac_cv_use_debug_flag >> ${OSTYPE}.system.cache.tmp
-if test "$wxUSE_DEBUG_FLAG" = 1; then
+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
 
 
+                echo $ac_n "checking for pthread_attr_getschedpolicy in -l$THREADS_LINK""... $ac_c" 1>&6
+echo "configure:10924: 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 10932 "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();
 
-echo $ac_n "checking "for debug_info"""... $ac_c" 1>&6
-echo "configure:5125: checking "for debug_info"" >&5
-# Check whether --with-debug_info or --without-debug_info was given.
-if test "${with_debug_info+set}" = set; then
-  withval="$with_debug_info"
-  if test "x$with_debug_info" = xyes; then
-  ac_cv_use_debug_info='wxUSE_DEBUG_INFO="1"'
+int main() {
+pthread_attr_getschedpolicy()
+; return 0; }
+EOF
+if { (eval echo configure:10943: \"$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
-  ac_cv_use_debug_info='wxUSE_DEBUG_INFO="0"'
+  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_THREAD_PRIORITY_FUNCTIONS 1
+EOF
+
 else
-  
-  LINE=`grep "wxUSE_DEBUG_INFO" ${OSTYPE}.system.cache`
-  if test "x$LINE" != x ; then
-    eval "DEFAULT_$LINE"
-  fi
-  ac_cv_use_debug_info='wxUSE_DEBUG_INFO='$DEFAULT_wxUSE_DEBUG_INFO
+  echo "$ac_t""no" 1>&6
+echo $ac_n "checking for pthread_attr_getschedpolicy in -l"posix4"""... $ac_c" 1>&6
+echo "configure:10965: 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
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-l"posix4"  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 10973 "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:10984: \"$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"
 
-eval "$ac_cv_use_debug_info"
-echo $ac_cv_use_debug_info >> ${OSTYPE}.system.cache.tmp
-if test "$wxUSE_DEBUG_INFO" = 1; then
+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_THREAD_PRIORITY_FUNCTIONS 1
+EOF
+ POSIX4_LINK="-lposix4"
 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 debug_gdb"""... $ac_c" 1>&6
-echo "configure:5155: checking "for debug_gdb"" >&5
-# Check whether --with-debug_gdb or --without-debug_gdb was given.
-if test "${with_debug_gdb+set}" = set; then
-  withval="$with_debug_gdb"
-  if test "x$with_debug_gdb" = xyes; then
-  ac_cv_use_debug_gdb='wxUSE_DEBUG_GDB="1"'
-else
-  ac_cv_use_debug_gdb='wxUSE_DEBUG_GDB="0"'
-fi
+  echo $ac_n "checking for pthread_cancel in -l$THREADS_LINK""... $ac_c" 1>&6
+echo "configure:11014: 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
-  
-  LINE=`grep "wxUSE_DEBUG_GDB" ${OSTYPE}.system.cache`
-  if test "x$LINE" != x ; then
-    eval "DEFAULT_$LINE"
-  fi
-  ac_cv_use_debug_gdb='wxUSE_DEBUG_GDB='$DEFAULT_wxUSE_DEBUG_GDB
+  ac_save_LIBS="$LIBS"
+LIBS="-l$THREADS_LINK  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 11022 "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();
 
+int main() {
+pthread_cancel()
+; return 0; }
+EOF
+if { (eval echo configure:11033: \"$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"
 
-eval "$ac_cv_use_debug_gdb"
-echo $ac_cv_use_debug_gdb >> ${OSTYPE}.system.cache.tmp
-if test "$wxUSE_DEBUG_GDB" = 1; then
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
+  cat >> confdefs.h <<\EOF
+#define HAVE_PTHREAD_CANCEL 1
+EOF
+
 else
   echo "$ac_t""no" 1>&6
+echo "configure: warning: wxThread::Kill() will not work properly" 1>&2
 fi
 
 
-
-echo $ac_n "checking "for mem_tracing"""... $ac_c" 1>&6
-echo "configure:5185: checking "for mem_tracing"" >&5
-# Check whether --with-mem_tracing or --without-mem_tracing was given.
-if test "${with_mem_tracing+set}" = set; then
-  withval="$with_mem_tracing"
-  if test "x$with_mem_tracing" = xyes; then
-  ac_cv_use_mem_tracing='wxUSE_MEM_TRACING="1"'
-else
-  ac_cv_use_mem_tracing='wxUSE_MEM_TRACING="0"'
-fi
+  echo $ac_n "checking for pthread_cleanup_push/pop""... $ac_c" 1>&6
+echo "configure:11059: 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
   
-  LINE=`grep "wxUSE_MEM_TRACING" ${OSTYPE}.system.cache`
-  if test "x$LINE" != x ; then
-    eval "DEFAULT_$LINE"
-  fi
-  ac_cv_use_mem_tracing='wxUSE_MEM_TRACING='$DEFAULT_wxUSE_MEM_TRACING
+    cat > conftest.$ac_ext <<EOF
+#line 11065 "configure"
+#include "confdefs.h"
+#include <pthread.h>
+int main() {
 
-fi
+                    pthread_cleanup_push(NULL, NULL);
+                    pthread_cleanup_pop(0);
+                 
+; return 0; }
+EOF
+if { (eval echo configure:11075: \"$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
 
-eval "$ac_cv_use_mem_tracing"
-echo $ac_cv_use_mem_tracing >> ${OSTYPE}.system.cache.tmp
-if test "$wxUSE_MEM_TRACING" = 1; then
-  echo "$ac_t""yes" 1>&6
+                 
 else
-  echo "$ac_t""no" 1>&6
+  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
 
-
-echo $ac_n "checking "for dmalloc"""... $ac_c" 1>&6
-echo "configure:5215: checking "for dmalloc"" >&5
-# Check whether --with-dmalloc or --without-dmalloc was given.
-if test "${with_dmalloc+set}" = set; then
-  withval="$with_dmalloc"
-  if test "x$with_dmalloc" = xyes; then
-  ac_cv_use_dmalloc='wxUSE_DMALLOC="1"'
-else
-  ac_cv_use_dmalloc='wxUSE_DMALLOC="0"'
+  THREADS_LINK="-l$THREADS_LINK"
 fi
-else
-  
-  LINE=`grep "wxUSE_DMALLOC" ${OSTYPE}.system.cache`
-  if test "x$LINE" != x ; then
-    eval "DEFAULT_$LINE"
-  fi
-  ac_cv_use_dmalloc='wxUSE_DMALLOC='$DEFAULT_wxUSE_DMALLOC
 
 fi
 
-eval "$ac_cv_use_dmalloc"
-echo $ac_cv_use_dmalloc >> ${OSTYPE}.system.cache.tmp
-if test "$wxUSE_DMALLOC" = 1; then
-  echo "$ac_t""yes" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
+if test "$wxUSE_THREADS" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_THREADS 1
+EOF
 
 
+    CFLAGS="${CFLAGS} -D_REENTRANT"
+  CXXFLAGS="${CXXFLAGS} -D_REENTRANT"
 
-echo $ac_n "checking "for profile"""... $ac_c" 1>&6
-echo "configure:5245: checking "for profile"" >&5
-# Check whether --with-profile or --without-profile was given.
-if test "${with_profile+set}" = set; then
-  withval="$with_profile"
-  if test "x$with_profile" = xyes; then
-  ac_cv_use_profile='wxUSE_PROFILE="1"'
-else
-  ac_cv_use_profile='wxUSE_PROFILE="0"'
-fi
+  SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS thread"
 else
-  
-  LINE=`grep "wxUSE_PROFILE" ${OSTYPE}.system.cache`
-  if test "x$LINE" != x ; then
-    eval "DEFAULT_$LINE"
+      if test "$ac_cv_func_strtok_r" = "yes"; then
+    echo $ac_n "checking if -D_REENTRANT is needed""... $ac_c" 1>&6
+echo "configure:11116: checking if -D_REENTRANT is needed" >&5
+    if test "$NEEDS_D_REENTRANT_FOR_R_FUNCS" = 1; then
+        CFLAGS="${CFLAGS} -D_REENTRANT"
+        CXXFLAGS="${CXXFLAGS} -D_REENTRANT"
+        echo "$ac_t""yes" 1>&6
+    else
+        echo "$ac_t""no" 1>&6
+    fi
   fi
-  ac_cv_use_profile='wxUSE_PROFILE='$DEFAULT_wxUSE_PROFILE
-
 fi
 
-eval "$ac_cv_use_profile"
-echo $ac_cv_use_profile >> ${OSTYPE}.system.cache.tmp
-if test "$wxUSE_PROFILE" = 1; then
-  echo "$ac_t""yes" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
+if test "$WXGTK13" = 1 ; then
+  cat >> confdefs.h <<EOF
+#define __WXGTK13__ $WXGTK13
+EOF
 
+  WXGTK12=1
+fi
 
+if test "$WXGTK12" = 1 ; then
+  cat >> confdefs.h <<EOF
+#define __WXGTK12__ $WXGTK12
+EOF
 
-echo $ac_n "checking "for apple_ieee"""... $ac_c" 1>&6
-echo "configure:5275: checking "for apple_ieee"" >&5
-# Check whether --with-apple_ieee or --without-apple_ieee was given.
-if test "${with_apple_ieee+set}" = set; then
-  withval="$with_apple_ieee"
-  if test "x$with_apple_ieee" = xyes; then
-  ac_cv_use_apple_ieee='wxUSE_APPLE_IEEE="1"'
-else
-  ac_cv_use_apple_ieee='wxUSE_APPLE_IEEE="0"'
 fi
-else
-  
-  LINE=`grep "wxUSE_APPLE_IEEE" ${OSTYPE}.system.cache`
-  if test "x$LINE" != x ; then
-    eval "DEFAULT_$LINE"
-  fi
-  ac_cv_use_apple_ieee='wxUSE_APPLE_IEEE='$DEFAULT_wxUSE_APPLE_IEEE
 
+if test "$WXWINE" = 1 ; then
+  TOOLKIT_DEF="${TOOLKIT_DEF} -D__WXWINE__"
 fi
 
-eval "$ac_cv_use_apple_ieee"
-echo $ac_cv_use_apple_ieee >> ${OSTYPE}.system.cache.tmp
-if test "$wxUSE_APPLE_IEEE" = 1; then
-  echo "$ac_t""yes" 1>&6
-else
-  echo "$ac_t""no" 1>&6
+if test "$wxUSE_CYGWIN" = 1 ; then
+  TOOLKIT_DEF="${TOOLKIT_DEF} -D__WIN95__"
 fi
 
+WXDEBUG=
 
-
-echo $ac_n "checking "for threads"""... $ac_c" 1>&6
-echo "configure:5305: checking "for threads"" >&5
-# Check whether --with-threads or --without-threads was given.
-if test "${with_threads+set}" = set; then
-  withval="$with_threads"
-  if test "x$with_threads" = xyes; then
-  ac_cv_use_threads='wxUSE_THREADS="1"'
-else
-  ac_cv_use_threads='wxUSE_THREADS="0"'
+if test "$wxUSE_DEBUG_INFO" = "yes" ; then
+    WXDEBUG="-g"
+    wxUSE_OPTIMISE=no
 fi
-else
-  
-  LINE=`grep "wxUSE_THREADS" ${OSTYPE}.system.cache`
-  if test "x$LINE" != x ; then
-    eval "DEFAULT_$LINE"
-  fi
-  ac_cv_use_threads='wxUSE_THREADS='$DEFAULT_wxUSE_THREADS
 
+if test "$wxUSE_DEBUG_GDB" = "yes" ; then
+    wxUSE_DEBUG_INFO=yes
+    WXDEBUG="-ggdb"
 fi
 
-eval "$ac_cv_use_threads"
-echo $ac_cv_use_threads >> ${OSTYPE}.system.cache.tmp
-if test "$wxUSE_THREADS" = 1; then
-  echo "$ac_t""yes" 1>&6
+if test "$wxUSE_DEBUG_FLAG" = "yes" ; then
+    cat >> confdefs.h <<\EOF
+#define WXDEBUG 1
+EOF
+
+    WXDEBUG_DEFINE="-D__WXDEBUG__"
 else
-  echo "$ac_t""no" 1>&6
+    if test "$wxUSE_GTK" = 1 ; then
+        WXDEBUG_DEFINE="-DGTK_NO_CHECK_CASTS"
+    fi
 fi
 
+if test "$wxUSE_MEM_TRACING" = "yes" ; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_MEMORY_TRACING 1
+EOF
 
+    cat >> confdefs.h <<\EOF
+#define wxUSE_GLOBAL_MEMORY_OPERATORS 1
+EOF
 
-echo $ac_n "checking "for dynlib"""... $ac_c" 1>&6
-echo "configure:5335: checking "for dynlib"" >&5
-# Check whether --with-dynlib or --without-dynlib was given.
-if test "${with_dynlib+set}" = set; then
-  withval="$with_dynlib"
-  if test "x$with_dynlib" = xyes; then
-  ac_cv_use_dynlib='wxUSE_DYNLIB_CLASS="1"'
-else
-  ac_cv_use_dynlib='wxUSE_DYNLIB_CLASS="0"'
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS memcheck"
 fi
-else
-  
-  LINE=`grep "wxUSE_DYNLIB_CLASS" ${OSTYPE}.system.cache`
-  if test "x$LINE" != x ; then
-    eval "DEFAULT_$LINE"
-  fi
-  ac_cv_use_dynlib='wxUSE_DYNLIB_CLASS='$DEFAULT_wxUSE_DYNLIB_CLASS
 
+if test "$wxUSE_DMALLOC" = "yes" ; then
+    DMALLOC_LINK="-ldmalloc"
 fi
 
-eval "$ac_cv_use_dynlib"
-echo $ac_cv_use_dynlib >> ${OSTYPE}.system.cache.tmp
-if test "$wxUSE_DYNLIB_CLASS" = 1; then
-  echo "$ac_t""yes" 1>&6
-else
-  echo "$ac_t""no" 1>&6
+PROFILE=
+if test "$wxUSE_PROFILE" = "yes" ; then
+    PROFILE="-pg"
 fi
 
-
-
-
-echo $ac_n "checking "for zlib"""... $ac_c" 1>&6
-echo "configure:5366: checking "for zlib"" >&5
-# Check whether --with-zlib or --without-zlib was given.
-if test "${with_zlib+set}" = set; then
-  withval="$with_zlib"
-  if test "x$with_zlib" = xyes; then
-  ac_cv_use_zlib='wxUSE_ZLIB="1"'
-else
-  ac_cv_use_zlib='wxUSE_ZLIB="0"'
+DEP_INFO_FLAGS=
+if test "$GCC" = yes ; then
+    if test "$wxUSE_NO_RTTI" = "yes" ; then
+        WXDEBUG_DEFINE="$WXDEBUG_DEFINE -fno-rtti"
+    fi
+    if test "$wxUSE_NO_EXCEPTIONS" = "yes" ; then
+        WXDEBUG_DEFINE="$WXDEBUG_DEFINE -fno-exceptions"
+    fi
+    if test "$wxUSE_PERMISSIVE" = "yes" ; then
+       CFLAGS="${CFLAGS} -fpermissive"
+       CXXFLAGS="${CXXFLAGS} -fpermissive"
+    fi
+    if test "$wxUSE_NO_DEPS" = "no" ; then
+        DEP_INFO_FLAGS="-MMD"
+    fi
 fi
-else
-  
-  LINE=`grep "wxUSE_ZLIB" ${OSTYPE}.system.cache`
-  if test "x$LINE" != x ; then
-    eval "DEFAULT_$LINE"
-  fi
-  ac_cv_use_zlib='wxUSE_ZLIB='$DEFAULT_wxUSE_ZLIB
 
-fi
 
-eval "$ac_cv_use_zlib"
-echo $ac_cv_use_zlib >> ${OSTYPE}.system.cache.tmp
-if test "$wxUSE_ZLIB" = 1; then
-  echo "$ac_t""yes" 1>&6
-else
-  echo "$ac_t""no" 1>&6
+CXXFLAGS=`echo "${CXXFLAGS}" | sed "s/\-O.//g" `
+CFLAGS=`echo "${CFLAGS}" | sed "s/\-O.//g" `
+if test "$wxUSE_OPTIMISE" = "no" ; then
+    OPTIMISE=
+else
+    if test "$GCC" = yes ; then
+        OPTIMISE="-O2"
+        case "${host}" in
+            i586-*-*|i686-*-* )
+            OPTIMISE="${OPTIMISE} "
+        ;;
+        esac
+    else
+        OPTIMISE="-O"
+    fi
 fi
 
 
+ZLIB_INCLUDE=
+if test "$wxUSE_ZLIB" = "yes" ; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_ZLIB 1
+EOF
 
-echo $ac_n "checking "for libpng"""... $ac_c" 1>&6
-echo "configure:5396: checking "for libpng"" >&5
-# Check whether --with-libpng or --without-libpng was given.
-if test "${with_libpng+set}" = set; then
-  withval="$with_libpng"
-  if test "x$with_libpng" = xyes; then
-  ac_cv_use_libpng='wxUSE_LIBPNG="1"'
-else
-  ac_cv_use_libpng='wxUSE_LIBPNG="0"'
+  ZLIB_INCLUDE="-I\${top_srcdir}/src/zlib"
 fi
-else
-  
-  LINE=`grep "wxUSE_LIBPNG" ${OSTYPE}.system.cache`
-  if test "x$LINE" != x ; then
-    eval "DEFAULT_$LINE"
-  fi
-  ac_cv_use_libpng='wxUSE_LIBPNG='$DEFAULT_wxUSE_LIBPNG
 
+PNG_INCLUDE=
+if test "$wxUSE_LIBPNG" = "yes" ; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_LIBPNG 1
+EOF
+
+  PNG_INCLUDE="-I\${top_srcdir}/src/png"
+  SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS png"
 fi
 
-eval "$ac_cv_use_libpng"
-echo $ac_cv_use_libpng >> ${OSTYPE}.system.cache.tmp
-if test "$wxUSE_LIBPNG" = 1; then
-  echo "$ac_t""yes" 1>&6
-else
-  echo "$ac_t""no" 1>&6
+JPEG_INCLUDE=
+if test "$wxUSE_LIBJPEG" = "yes" ; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_LIBJPEG 1
+EOF
+
+  JPEG_INCLUDE="-I\${top_srcdir}/src/jpeg"
 fi
 
+TIFF_INCLUDE=
+if test "$wxUSE_LIBTIFF" = "yes" ; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_LIBTIFF 1
+EOF
 
+  TIFF_INCLUDE="-I\${top_srcdir}/src/tiff"
+fi
 
-echo $ac_n "checking "for libjpeg"""... $ac_c" 1>&6
-echo "configure:5426: checking "for libjpeg"" >&5
-# Check whether --with-libjpeg or --without-libjpeg was given.
-if test "${with_libjpeg+set}" = set; then
-  withval="$with_libjpeg"
-  if test "x$with_libjpeg" = xyes; then
-  ac_cv_use_libjpeg='wxUSE_LIBJPEG="1"'
+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:11271: 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_cv_use_libjpeg='wxUSE_LIBJPEG="0"'
-fi
+  cat > conftest.$ac_ext <<EOF
+#line 11276 "configure"
+#include "confdefs.h"
+#include <GL/gl.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:11281: \"$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
   
-  LINE=`grep "wxUSE_LIBJPEG" ${OSTYPE}.system.cache`
-  if test "x$LINE" != x ; then
-    eval "DEFAULT_$LINE"
-  fi
-  ac_cv_use_libjpeg='wxUSE_LIBJPEG='$DEFAULT_wxUSE_LIBJPEG
+    echo $ac_n "checking for glInitNames in -lGL""... $ac_c" 1>&6
+echo "configure:11299: checking for glInitNames in -lGL" >&5
+ac_lib_var=`echo GL'_'glInitNames | 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"
+cat > conftest.$ac_ext <<EOF
+#line 11307 "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();
 
+int main() {
+glInitNames()
+; return 0; }
+EOF
+if { (eval echo configure:11318: \"$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"
 
-eval "$ac_cv_use_libjpeg"
-echo $ac_cv_use_libjpeg >> ${OSTYPE}.system.cache.tmp
-if test "$wxUSE_LIBJPEG" = 1; then
+fi
+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
+EOF
+
+      UTILS_SUBDIRS="$UTILS_SUBDIRS glcanvas/src"
+    
 else
   echo "$ac_t""no" 1>&6
-fi
-
 
+        echo $ac_n "checking for glInitNames in -lMesaGL""... $ac_c" 1>&6
+echo "configure:11345: checking for glInitNames in -lMesaGL" >&5
+ac_lib_var=`echo MesaGL'_'glInitNames | 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"
+cat > conftest.$ac_ext <<EOF
+#line 11353 "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();
 
-echo $ac_n "checking "for odbc"""... $ac_c" 1>&6
-echo "configure:5456: checking "for odbc"" >&5
-# Check whether --with-odbc or --without-odbc was given.
-if test "${with_odbc+set}" = set; then
-  withval="$with_odbc"
-  if test "x$with_odbc" = xyes; then
-  ac_cv_use_odbc='wxUSE_ODBC="1"'
+int main() {
+glInitNames()
+; return 0; }
+EOF
+if { (eval echo configure:11364: \"$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
-  ac_cv_use_odbc='wxUSE_ODBC="0"'
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
 fi
-else
-  
-  LINE=`grep "wxUSE_ODBC" ${OSTYPE}.system.cache`
-  if test "x$LINE" != x ; then
-    eval "DEFAULT_$LINE"
-  fi
-  ac_cv_use_odbc='wxUSE_ODBC='$DEFAULT_wxUSE_ODBC
+rm -f conftest*
+LIBS="$ac_save_LIBS"
 
 fi
-
-eval "$ac_cv_use_odbc"
-echo $ac_cv_use_odbc >> ${OSTYPE}.system.cache.tmp
-if test "$wxUSE_ODBC" = 1; then
+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
+EOF
+
+        UTILS_SUBDIRS="$UTILS_SUBDIRS glcanvas/src"
+      
 else
   echo "$ac_t""no" 1>&6
+wxUSE_OPENGL=0
 fi
 
+     
+fi
 
-
-
-echo $ac_n "checking "for timedate"""... $ac_c" 1>&6
-echo "configure:5487: checking "for timedate"" >&5
-# Check whether --with-timedate or --without-timedate was given.
-if test "${with_timedate+set}" = set; then
-  withval="$with_timedate"
-  if test "x$with_timedate" = xyes; then
-  ac_cv_use_timedate='wxUSE_TIMEDATE="1"'
+    
 else
-  ac_cv_use_timedate='wxUSE_TIMEDATE="0"'
+  echo "$ac_t""no" 1>&6
+wxUSE_OPENGL=0
 fi
-else
-  
-  LINE=`grep "wxUSE_TIMEDATE" ${OSTYPE}.system.cache`
-  if test "x$LINE" != x ; then
-    eval "DEFAULT_$LINE"
-  fi
-  ac_cv_use_timedate='wxUSE_TIMEDATE='$DEFAULT_wxUSE_TIMEDATE
 
 fi
 
-eval "$ac_cv_use_timedate"
-echo $ac_cv_use_timedate >> ${OSTYPE}.system.cache.tmp
-if test "$wxUSE_TIMEDATE" = 1; then
-  echo "$ac_t""yes" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
 
+if test "$wxUSE_GUI" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_GUI 1
+EOF
 
 
-echo $ac_n "checking "for intl"""... $ac_c" 1>&6
-echo "configure:5517: checking "for intl"" >&5
-# Check whether --with-intl or --without-intl was given.
-if test "${with_intl+set}" = set; then
-  withval="$with_intl"
-  if test "x$with_intl" = xyes; then
-  ac_cv_use_intl='wxUSE_INTL="1"'
-else
-  ac_cv_use_intl='wxUSE_INTL="0"'
-fi
-else
-  
-  LINE=`grep "wxUSE_INTL" ${OSTYPE}.system.cache`
-  if test "x$LINE" != x ; then
-    eval "DEFAULT_$LINE"
-  fi
-  ac_cv_use_intl='wxUSE_INTL='$DEFAULT_wxUSE_INTL
+                      else
+  cat >> confdefs.h <<\EOF
+#define wxUSE_NOGUI 1
+EOF
 
 fi
 
-eval "$ac_cv_use_intl"
-echo $ac_cv_use_intl >> ${OSTYPE}.system.cache.tmp
-if test "$wxUSE_INTL" = 1; then
-  echo "$ac_t""yes" 1>&6
-else
-  echo "$ac_t""no" 1>&6
+
+if test "$wxUSE_UNIX" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_UNIX 1
+EOF
+
 fi
 
 
+if test "$wxUSE_APPLE_IEEE" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_APPLE_IEEE 1
+EOF
 
-echo $ac_n "checking "for config"""... $ac_c" 1>&6
-echo "configure:5547: checking "for config"" >&5
-# Check whether --with-config or --without-config was given.
-if test "${with_config+set}" = set; then
-  withval="$with_config"
-  if test "x$with_config" = xyes; then
-  ac_cv_use_config='wxUSE_CONFIG="1"'
-else
-  ac_cv_use_config='wxUSE_CONFIG="0"'
 fi
-else
-  
-  LINE=`grep "wxUSE_CONFIG" ${OSTYPE}.system.cache`
-  if test "x$LINE" != x ; then
-    eval "DEFAULT_$LINE"
-  fi
-  ac_cv_use_config='wxUSE_CONFIG='$DEFAULT_wxUSE_CONFIG
 
-fi
+if test "$wxUSE_WAVE" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_WAVE 1
+EOF
 
-eval "$ac_cv_use_config"
-echo $ac_cv_use_config >> ${OSTYPE}.system.cache.tmp
-if test "$wxUSE_CONFIG" = 1; then
-  echo "$ac_t""yes" 1>&6
-else
-  echo "$ac_t""no" 1>&6
 fi
 
+if test "$wxUSE_FILE" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_FILE 1
+EOF
 
-
-echo $ac_n "checking "for streams"""... $ac_c" 1>&6
-echo "configure:5577: checking "for streams"" >&5
-# Check whether --with-streams or --without-streams was given.
-if test "${with_streams+set}" = set; then
-  withval="$with_streams"
-  if test "x$with_streams" = xyes; then
-  ac_cv_use_streams='wxUSE_STREAMS="1"'
-else
-  ac_cv_use_streams='wxUSE_STREAMS="0"'
 fi
-else
-  
-  LINE=`grep "wxUSE_STREAMS" ${OSTYPE}.system.cache`
-  if test "x$LINE" != x ; then
-    eval "DEFAULT_$LINE"
-  fi
-  ac_cv_use_streams='wxUSE_STREAMS='$DEFAULT_wxUSE_STREAMS
 
-fi
+if test "$wxUSE_FS_INET" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_FS_INET 1
+EOF
 
-eval "$ac_cv_use_streams"
-echo $ac_cv_use_streams >> ${OSTYPE}.system.cache.tmp
-if test "$wxUSE_STREAMS" = 1; then
-  echo "$ac_t""yes" 1>&6
-else
-  echo "$ac_t""no" 1>&6
 fi
 
+if test "$wxUSE_FS_ZIP" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_FS_ZIP 1
+EOF
 
-
-echo $ac_n "checking "for serial"""... $ac_c" 1>&6
-echo "configure:5607: checking "for serial"" >&5
-# Check whether --with-serial or --without-serial was given.
-if test "${with_serial+set}" = set; then
-  withval="$with_serial"
-  if test "x$with_serial" = xyes; then
-  ac_cv_use_serial='wxUSE_SERIAL="1"'
-else
-  ac_cv_use_serial='wxUSE_SERIAL="0"'
 fi
-else
-  
-  LINE=`grep "wxUSE_SERIAL" ${OSTYPE}.system.cache`
-  if test "x$LINE" != x ; then
-    eval "DEFAULT_$LINE"
-  fi
-  ac_cv_use_serial='wxUSE_SERIAL='$DEFAULT_wxUSE_SERIAL
+
+if test "$wxUSE_ZIPSTREAM" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_ZIPSTREAM 1
+EOF
 
 fi
 
-eval "$ac_cv_use_serial"
-echo $ac_cv_use_serial >> ${OSTYPE}.system.cache.tmp
-if test "$wxUSE_SERIAL" = 1; then
-  echo "$ac_t""yes" 1>&6
-else
-  echo "$ac_t""no" 1>&6
+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
 
-echo $ac_n "checking "for sockets"""... $ac_c" 1>&6
-echo "configure:5637: checking "for sockets"" >&5
-# Check whether --with-sockets or --without-sockets was given.
-if test "${with_sockets+set}" = set; then
-  withval="$with_sockets"
-  if test "x$with_sockets" = xyes; then
-  ac_cv_use_sockets='wxUSE_SOCKETS="1"'
-else
-  ac_cv_use_sockets='wxUSE_SOCKETS="0"'
+  fi
 fi
-else
-  
-  LINE=`grep "wxUSE_SOCKETS" ${OSTYPE}.system.cache`
-  if test "x$LINE" != x ; then
-    eval "DEFAULT_$LINE"
+
+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
-  ac_cv_use_sockets='wxUSE_SOCKETS='$DEFAULT_wxUSE_SOCKETS
+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"
+  fi
 fi
 
-eval "$ac_cv_use_sockets"
-echo $ac_cv_use_sockets >> ${OSTYPE}.system.cache.tmp
-if test "$wxUSE_SOCKETS" = 1; then
-  echo "$ac_t""yes" 1>&6
-else
-  echo "$ac_t""no" 1>&6
+if test "$wxUSE_LOG" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_LOG 1
+EOF
+
 fi
 
+if test "$wxUSE_LONGLONG" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_LONGLONG 1
+EOF
 
+fi
 
+if test "$wxUSE_DIALUP_MANAGER" = "yes" ; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_DIALUP_MANAGER 1
+EOF
 
-echo $ac_n "checking "for afmfonts"""... $ac_c" 1>&6
-echo "configure:5668: checking "for afmfonts"" >&5
-# Check whether --with-afmfonts or --without-afmfonts was given.
-if test "${with_afmfonts+set}" = set; then
-  withval="$with_afmfonts"
-  if test "x$with_afmfonts" = xyes; then
-  ac_cv_use_afmfonts='wxUSE_AFM_FOR_POSTSCRIPT="1"'
-else
-  ac_cv_use_afmfonts='wxUSE_AFM_FOR_POSTSCRIPT="0"'
+  SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS nettest"
 fi
-else
-  
-  LINE=`grep "wxUSE_AFM_FOR_POSTSCRIPT" ${OSTYPE}.system.cache`
-  if test "x$LINE" != x ; then
-    eval "DEFAULT_$LINE"
-  fi
-  ac_cv_use_afmfonts='wxUSE_AFM_FOR_POSTSCRIPT='$DEFAULT_wxUSE_AFM_FOR_POSTSCRIPT
+
+if test "$wxUSE_STREAMS" = "yes" ; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_STREAMS 1
+EOF
 
 fi
 
-eval "$ac_cv_use_afmfonts"
-echo $ac_cv_use_afmfonts >> ${OSTYPE}.system.cache.tmp
-if test "$wxUSE_AFM_FOR_POSTSCRIPT" = 1; then
-  echo "$ac_t""yes" 1>&6
+
+if test "$wxUSE_TIMEDATE" = "yes"; then
+        for ac_func in strptime
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:11551: 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
-  echo "$ac_t""no" 1>&6
-fi
+  cat > conftest.$ac_ext <<EOF
+#line 11556 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func(); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char $ac_func();
+char (*f)();
 
+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
+f = $ac_func;
+#endif
 
-echo $ac_n "checking "for normalized"""... $ac_c" 1>&6
-echo "configure:5698: checking "for normalized"" >&5
-# Check whether --with-normalized or --without-normalized was given.
-if test "${with_normalized+set}" = set; then
-  withval="$with_normalized"
-  if test "x$with_normalized" = xyes; then
-  ac_cv_use_normalized='WX_NORMALIZED_PS_FONTS="1"'
+; return 0; }
+EOF
+if { (eval echo configure:11580: \"$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
-  ac_cv_use_normalized='WX_NORMALIZED_PS_FONTS="0"'
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=no"
 fi
-else
-  
-  LINE=`grep "WX_NORMALIZED_PS_FONTS" ${OSTYPE}.system.cache`
-  if test "x$LINE" != x ; then
-    eval "DEFAULT_$LINE"
-  fi
-  ac_cv_use_normalized='WX_NORMALIZED_PS_FONTS='$DEFAULT_WX_NORMALIZED_PS_FONTS
-
+rm -f conftest*
 fi
 
-eval "$ac_cv_use_normalized"
-echo $ac_cv_use_normalized >> ${OSTYPE}.system.cache.tmp
-if test "$WX_NORMALIZED_PS_FONTS" = 1; 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
 else
   echo "$ac_t""no" 1>&6
 fi
+done
 
 
+        echo $ac_n "checking for timezone variable in <time.h>""... $ac_c" 1>&6
+echo "configure:11606: 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 11612 "configure"
+#include "confdefs.h"
 
-echo $ac_n "checking "for postscript"""... $ac_c" 1>&6
-echo "configure:5728: checking "for postscript"" >&5
-# Check whether --with-postscript or --without-postscript was given.
-if test "${with_postscript+set}" = set; then
-  withval="$with_postscript"
-  if test "x$with_postscript" = xyes; then
-  ac_cv_use_postscript='wxUSE_POSTSCRIPT="1"'
+                                #include <time.h>
+                            
+int main() {
+
+                                int tz;
+                                tz = __timezone;
+                            
+; return 0; }
+EOF
+if { (eval echo configure:11624: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  
+                                wx_cv_var_timezone=__timezone
+                            
 else
-  ac_cv_use_postscript='wxUSE_POSTSCRIPT="0"'
-fi
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  
+                                cat > conftest.$ac_ext <<EOF
+#line 11635 "configure"
+#include "confdefs.h"
+
+                                        #include <time.h>
+                                    
+int main() {
+
+                                        int tz;
+                                        tz = _timezone;
+                                    
+; return 0; }
+EOF
+if { (eval echo configure:11647: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  
+                                        wx_cv_var_timezone=_timezone
+                                    
 else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
   
-  LINE=`grep "wxUSE_POSTSCRIPT" ${OSTYPE}.system.cache`
-  if test "x$LINE" != x ; then
-    eval "DEFAULT_$LINE"
-  fi
-  ac_cv_use_postscript='wxUSE_POSTSCRIPT='$DEFAULT_wxUSE_POSTSCRIPT
+                                        cat > conftest.$ac_ext <<EOF
+#line 11658 "configure"
+#include "confdefs.h"
 
-fi
+                                                #include <time.h>
+                                            
+int main() {
 
-eval "$ac_cv_use_postscript"
-echo $ac_cv_use_postscript >> ${OSTYPE}.system.cache.tmp
-if test "$wxUSE_POSTSCRIPT" = 1; then
-  echo "$ac_t""yes" 1>&6
+                                                int tz;
+                                                tz = timezone;
+                                            
+; return 0; }
+EOF
+if { (eval echo configure:11670: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  
+                                                wx_cv_var_timezone=timezone
+                                            
 else
-  echo "$ac_t""no" 1>&6
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  { echo "configure: error: no timezone variable" 1>&2; exit 1; }
+                                        
+fi
+rm -f conftest*
+                                    
+                                
+fi
+rm -f conftest*
+                            
+                        
+fi
+rm -f conftest*
+                   
+    
 fi
 
+echo "$ac_t""$wx_cv_var_timezone" 1>&6
 
+        cat >> confdefs.h <<EOF
+#define WX_TIMEZONE $wx_cv_var_timezone
+EOF
+
+
+            for ac_func in localtime gettimeofday ftime
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:11705: 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 11710 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func(); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char $ac_func();
+char (*f)();
+
+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
+f = $ac_func;
+#endif
 
-echo $ac_n "checking "for unicode"""... $ac_c" 1>&6
-echo "configure:5759: checking "for unicode"" >&5
-# Check whether --with-unicode or --without-unicode was given.
-if test "${with_unicode+set}" = set; then
-  withval="$with_unicode"
-  if test "x$with_unicode" = xyes; then
-  ac_cv_use_unicode='wxUSE_UNICODE="1"'
+; return 0; }
+EOF
+if { (eval echo configure:11734: \"$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
-  ac_cv_use_unicode='wxUSE_UNICODE="0"'
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=no"
 fi
-else
-  
-  LINE=`grep "wxUSE_UNICODE" ${OSTYPE}.system.cache`
-  if test "x$LINE" != x ; then
-    eval "DEFAULT_$LINE"
-  fi
-  ac_cv_use_unicode='wxUSE_UNICODE='$DEFAULT_wxUSE_UNICODE
-
+rm -f conftest*
 fi
 
-eval "$ac_cv_use_unicode"
-echo $ac_cv_use_unicode >> ${OSTYPE}.system.cache.tmp
-if test "$wxUSE_UNICODE" = 1; 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
 
 
-
-echo $ac_n "checking "for wcsrtombs"""... $ac_c" 1>&6
-echo "configure:5789: checking "for wcsrtombs"" >&5
-# Check whether --with-wcsrtombs or --without-wcsrtombs was given.
-if test "${with_wcsrtombs+set}" = set; then
-  withval="$with_wcsrtombs"
-  if test "x$with_wcsrtombs" = xyes; then
-  ac_cv_use_wcsrtombs='wxUSE_WCSRTOMBS="1"'
-else
-  ac_cv_use_wcsrtombs='wxUSE_WCSRTOMBS="0"'
-fi
+    if test "$ac_cv_func_localtime" = "yes"; then
+        echo $ac_n "checking for tm_gmtoff in struct tm""... $ac_c" 1>&6
+echo "configure:11761: 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
   
-  LINE=`grep "wxUSE_WCSRTOMBS" ${OSTYPE}.system.cache`
-  if test "x$LINE" != x ; then
-    eval "DEFAULT_$LINE"
-  fi
-  ac_cv_use_wcsrtombs='wxUSE_WCSRTOMBS='$DEFAULT_wxUSE_WCSRTOMBS
-
-fi
-
-eval "$ac_cv_use_wcsrtombs"
-echo $ac_cv_use_wcsrtombs >> ${OSTYPE}.system.cache.tmp
-if test "$wxUSE_WCSRTOMBS" = 1; then
-  echo "$ac_t""yes" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
+            cat > conftest.$ac_ext <<EOF
+#line 11767 "configure"
+#include "confdefs.h"
 
+                    #include <time.h>
+                
+int main() {
 
+                    struct tm tm;
+                    tm.tm_gmtoff++;
+                
+; return 0; }
+EOF
+if { (eval echo configure:11779: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  
+                    wx_cv_struct_tm_has_gmtoff=yes
+                    cat >> confdefs.h <<\EOF
+#define WX_GMTOFF_IN_TM 1
+EOF
 
-echo $ac_n "checking "for wxresources"""... $ac_c" 1>&6
-echo "configure:5820: checking "for wxresources"" >&5
-# Check whether --with-wxresources or --without-wxresources was given.
-if test "${with_wxresources+set}" = set; then
-  withval="$with_wxresources"
-  if test "x$with_wxresources" = xyes; then
-  ac_cv_use_wxresources='wxUSE_WX_RESOURCES="1"'
+                
 else
-  ac_cv_use_wxresources='wxUSE_WX_RESOURCES="0"'
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  wx_cv_struct_tm_has_gmtoff=no
+            
 fi
-else
-  
-  LINE=`grep "wxUSE_WX_RESOURCES" ${OSTYPE}.system.cache`
-  if test "x$LINE" != x ; then
-    eval "DEFAULT_$LINE"
-  fi
-  ac_cv_use_wxresources='wxUSE_WX_RESOURCES='$DEFAULT_wxUSE_WX_RESOURCES
-
+rm -f conftest*
+        
 fi
 
-eval "$ac_cv_use_wxresources"
-echo $ac_cv_use_wxresources >> ${OSTYPE}.system.cache.tmp
-if test "$wxUSE_WX_RESOURCES" = 1; then
-  echo "$ac_t""yes" 1>&6
+echo "$ac_t""$wx_cv_struct_tm_has_gmtoff" 1>&6
+    elif test "$ac_cv_func_gettimeofday" = "yes"; then
+        echo $ac_n "checking whether gettimeofday takes two arguments""... $ac_c" 1>&6
+echo "configure:11802: 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
-  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 prologio"""... $ac_c" 1>&6
-echo "configure:5850: checking "for prologio"" >&5
-# Check whether --with-prologio or --without-prologio was given.
-if test "${with_prologio+set}" = set; then
-  withval="$with_prologio"
-  if test "x$with_prologio" = xyes; then
-  ac_cv_use_prologio='wxUSE_PROLOGIO="1"'
-else
-  ac_cv_use_prologio='wxUSE_PROLOGIO="0"'
-fi
-else
-  
-  LINE=`grep "wxUSE_PROLOGIO" ${OSTYPE}.system.cache`
-  if test "x$LINE" != x ; then
-    eval "DEFAULT_$LINE"
-  fi
-  ac_cv_use_prologio='wxUSE_PROLOGIO='$DEFAULT_wxUSE_PROLOGIO
+            cat > conftest.$ac_ext <<EOF
+#line 11817 "configure"
+#include "confdefs.h"
 
-fi
+                    #include <sys/time.h>
+                    #include <unistd.h>
+                
+int main() {
 
-eval "$ac_cv_use_prologio"
-echo $ac_cv_use_prologio >> ${OSTYPE}.system.cache.tmp
-if test "$wxUSE_PROLOGIO" = 1; then
-  echo "$ac_t""yes" 1>&6
+                    struct timeval tv;
+                    struct timezone tz;
+                    gettimeofday(&tv, &tz);
+                
+; return 0; }
+EOF
+if { (eval echo configure:11831: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  wx_cv_func_gettimeofday_has_2_args=yes
 else
-  echo "$ac_t""no" 1>&6
-fi
-
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  cat > conftest.$ac_ext <<EOF
+#line 11839 "configure"
+#include "confdefs.h"
 
+                        #include <sys/time.h>
+                        #include <unistd.h>
+                    
+int main() {
 
-echo $ac_n "checking "for RPC"""... $ac_c" 1>&6
-echo "configure:5880: checking "for RPC"" >&5
-# Check whether --with-rpc or --without-rpc was given.
-if test "${with_rpc+set}" = set; then
-  withval="$with_rpc"
-  if test "x$with_rpc" = xyes; then
-  ac_cv_use_rpc='wxUSE_RPC="1"'
+                        struct timeval tv;
+                        gettimeofday(&tv);
+                    
+; return 0; }
+EOF
+if { (eval echo configure:11852: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  wx_cv_func_gettimeofday_has_2_args=no
 else
-  ac_cv_use_rpc='wxUSE_RPC="0"'
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  wx_cv_func_gettimeofday_has_2_args=unknown
+                
 fi
-else
-  
-  LINE=`grep "wxUSE_RPC" ${OSTYPE}.system.cache`
-  if test "x$LINE" != x ; then
-    eval "DEFAULT_$LINE"
-  fi
-  ac_cv_use_rpc='wxUSE_RPC='$DEFAULT_wxUSE_RPC
-
+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
 
-eval "$ac_cv_use_rpc"
-echo $ac_cv_use_rpc >> ${OSTYPE}.system.cache.tmp
-if test "$wxUSE_RPC" = 1; then
-  echo "$ac_t""yes" 1>&6
-else
-  echo "$ac_t""no" 1>&6
+        
 fi
 
+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
 
+        fi
+    fi
 
-echo $ac_n "checking "for IPC"""... $ac_c" 1>&6
-echo "configure:5911: checking "for IPC"" >&5
-# Check whether --with-ipc or --without-ipc was given.
-if test "${with_ipc+set}" = set; then
-  withval="$with_ipc"
-  if test "x$with_ipc" = xyes; then
-  ac_cv_use_ipc='wxUSE_IPC="1"'
-else
-  ac_cv_use_ipc='wxUSE_IPC="0"'
-fi
-else
-  
-  LINE=`grep "wxUSE_IPC" ${OSTYPE}.system.cache`
-  if test "x$LINE" != x ; then
-    eval "DEFAULT_$LINE"
-  fi
-  ac_cv_use_ipc='wxUSE_IPC='$DEFAULT_wxUSE_IPC
+    cat >> confdefs.h <<\EOF
+#define wxUSE_TIMEDATE 1
+EOF
 
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS typetest"
 fi
 
-eval "$ac_cv_use_ipc"
-echo $ac_cv_use_ipc >> ${OSTYPE}.system.cache.tmp
-if test "$wxUSE_IPC" = 1; then
-  echo "$ac_t""yes" 1>&6
+
+if test "$wxUSE_SOCKETS" = "yes"; then
+        echo $ac_n "checking for socket""... $ac_c" 1>&6
+echo "configure:11896: checking for socket" >&5
+if eval "test \"`echo '$''{'ac_cv_func_socket'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
 else
-  echo "$ac_t""no" 1>&6
-fi
+  cat > conftest.$ac_ext <<EOF
+#line 11901 "configure"
+#include "confdefs.h"
+/* 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();
+char (*f)();
 
+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
+f = socket;
+#endif
 
-echo $ac_n "checking "for resources"""... $ac_c" 1>&6
-echo "configure:5941: checking "for resources"" >&5
-# Check whether --with-resources or --without-resources was given.
-if test "${with_resources+set}" = set; then
-  withval="$with_resources"
-  if test "x$with_resources" = xyes; then
-  ac_cv_use_resources='wxUSE_RESOURCES="1"'
+; return 0; }
+EOF
+if { (eval echo configure:11925: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_func_socket=yes"
 else
-  ac_cv_use_resources='wxUSE_RESOURCES="0"'
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_socket=no"
 fi
-else
-  
-  LINE=`grep "wxUSE_RESOURCES" ${OSTYPE}.system.cache`
-  if test "x$LINE" != x ; then
-    eval "DEFAULT_$LINE"
-  fi
-  ac_cv_use_resources='wxUSE_RESOURCES='$DEFAULT_wxUSE_RESOURCES
-
+rm -f conftest*
 fi
 
-eval "$ac_cv_use_resources"
-echo $ac_cv_use_resources >> ${OSTYPE}.system.cache.tmp
-if test "$wxUSE_RESOURCES" = 1; then
+if eval "test \"`echo '$ac_cv_func_'socket`\" = yes"; then
   echo "$ac_t""yes" 1>&6
+  :
 else
   echo "$ac_t""no" 1>&6
-fi
-
-
+echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
+echo "configure:11943: 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="-lsocket  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 11951 "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 socket();
 
-echo $ac_n "checking "for clipboard"""... $ac_c" 1>&6
-echo "configure:5971: checking "for clipboard"" >&5
-# Check whether --with-clipboard or --without-clipboard was given.
-if test "${with_clipboard+set}" = set; then
-  withval="$with_clipboard"
-  if test "x$with_clipboard" = xyes; then
-  ac_cv_use_clipboard='wxUSE_CLIPBOARD="1"'
+int main() {
+socket()
+; return 0; }
+EOF
+if { (eval echo configure:11962: \"$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
-  ac_cv_use_clipboard='wxUSE_CLIPBOARD="0"'
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
 fi
-else
-  
-  LINE=`grep "wxUSE_CLIPBOARD" ${OSTYPE}.system.cache`
-  if test "x$LINE" != x ; then
-    eval "DEFAULT_$LINE"
-  fi
-  ac_cv_use_clipboard='wxUSE_CLIPBOARD='$DEFAULT_wxUSE_CLIPBOARD
+rm -f conftest*
+LIBS="$ac_save_LIBS"
 
 fi
-
-eval "$ac_cv_use_clipboard"
-echo $ac_cv_use_clipboard >> ${OSTYPE}.system.cache.tmp
-if test "$wxUSE_CLIPBOARD" = 1; then
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
+  INET_LINK="$INET_LINK -lsocket"
 else
   echo "$ac_t""no" 1>&6
-fi
 
-
-
-echo $ac_n "checking "for tooltips"""... $ac_c" 1>&6
-echo "configure:6001: checking "for tooltips"" >&5
-# Check whether --with-tooltips or --without-tooltips was given.
-if test "${with_tooltips+set}" = set; then
-  withval="$with_tooltips"
-  if test "x$with_tooltips" = xyes; then
-  ac_cv_use_tooltips='wxUSE_TOOLTIPS="1"'
-else
-  ac_cv_use_tooltips='wxUSE_TOOLTIPS="0"'
+                echo "configure: warning: socket library not found - sockets will be disabled" 1>&2
+                wxUSE_SOCKETS=no
+            
+        
 fi
-else
-  
-  LINE=`grep "wxUSE_TOOLTIPS" ${OSTYPE}.system.cache`
-  if test "x$LINE" != x ; then
-    eval "DEFAULT_$LINE"
-  fi
-  ac_cv_use_tooltips='wxUSE_TOOLTIPS='$DEFAULT_wxUSE_TOOLTIPS
 
+    
 fi
 
-eval "$ac_cv_use_tooltips"
-echo $ac_cv_use_tooltips >> ${OSTYPE}.system.cache.tmp
-if test "$wxUSE_TOOLTIPS" = 1; then
-  echo "$ac_t""yes" 1>&6
-else
-  echo "$ac_t""no" 1>&6
 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
 
-
-echo $ac_n "checking "for dnd"""... $ac_c" 1>&6
-echo "configure:6031: checking "for dnd"" >&5
-# Check whether --with-dnd or --without-dnd was given.
-if test "${with_dnd+set}" = set; then
-  withval="$with_dnd"
-  if test "x$with_dnd" = xyes; then
-  ac_cv_use_dnd='wxUSE_DRAG_AND_DROP="1"'
+        echo $ac_n "checking the type of the third argument of getsockname""... $ac_c" 1>&6
+echo "configure:12002: checking the type of the third argument of getsockname" >&5
+    cat > conftest.$ac_ext <<EOF
+#line 12004 "configure"
+#include "confdefs.h"
+#include <sys/socket.h>
+int main() {
+socklen_t len; getsockname(0, 0, &len);
+; return 0; }
+EOF
+if { (eval echo configure:12011: \"$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
-  ac_cv_use_dnd='wxUSE_DRAG_AND_DROP="0"'
-fi
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  cat > conftest.$ac_ext <<EOF
+#line 12022 "configure"
+#include "confdefs.h"
+#include <sys/socket.h>
+int main() {
+size_t len; getsockname(0, 0, &len);
+; return 0; }
+EOF
+if { (eval echo configure:12029: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  cat >> confdefs.h <<\EOF
+#define SOCKLEN_T size_t
+EOF
+ echo "$ac_t""size_t" 1>&6
 else
-  
-  LINE=`grep "wxUSE_DRAG_AND_DROP" ${OSTYPE}.system.cache`
-  if test "x$LINE" != x ; then
-    eval "DEFAULT_$LINE"
-  fi
-  ac_cv_use_dnd='wxUSE_DRAG_AND_DROP='$DEFAULT_wxUSE_DRAG_AND_DROP
-
-fi
-
-eval "$ac_cv_use_dnd"
-echo $ac_cv_use_dnd >> ${OSTYPE}.system.cache.tmp
-if test "$wxUSE_DRAG_AND_DROP" = 1; then
-  echo "$ac_t""yes" 1>&6
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  cat > conftest.$ac_ext <<EOF
+#line 12040 "configure"
+#include "confdefs.h"
+#include <sys/socket.h>
+int main() {
+int len; getsockname(0, 0, &len);
+; return 0; }
+EOF
+if { (eval echo configure:12047: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  cat >> confdefs.h <<\EOF
+#define SOCKLEN_T int
+EOF
+ echo "$ac_t""int" 1>&6
 else
-  echo "$ac_t""no" 1>&6
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  echo "$ac_t""unknown" 1>&6
+            
 fi
-
-
-
-
-echo $ac_n "checking "for mdi"""... $ac_c" 1>&6
-echo "configure:6062: checking "for mdi"" >&5
-# Check whether --with-mdi or --without-mdi was given.
-if test "${with_mdi+set}" = set; then
-  withval="$with_mdi"
-  if test "x$with_mdi" = xyes; then
-  ac_cv_use_mdi='wxUSE_MDI_ARCHITECTURE="1"'
-else
-  ac_cv_use_mdi='wxUSE_MDI_ARCHITECTURE="0"'
+rm -f conftest*
+        
 fi
-else
-  
-  LINE=`grep "wxUSE_MDI_ARCHITECTURE" ${OSTYPE}.system.cache`
-  if test "x$LINE" != x ; then
-    eval "DEFAULT_$LINE"
-  fi
-  ac_cv_use_mdi='wxUSE_MDI_ARCHITECTURE='$DEFAULT_wxUSE_MDI_ARCHITECTURE
+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
 
-eval "$ac_cv_use_mdi"
-echo $ac_cv_use_mdi >> ${OSTYPE}.system.cache.tmp
-if test "$wxUSE_MDI_ARCHITECTURE" = 1; then
-  echo "$ac_t""yes" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
+    cat >> confdefs.h <<\EOF
+#define wxUSE_SOCKETS 1
+EOF
 
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS wxsocket"
+    INCLUDE_SUBDIRS="$INCLUDE_SUBDIRS protocol"
+fi
 
 
-echo $ac_n "checking "for docview"""... $ac_c" 1>&6
-echo "configure:6092: checking "for docview"" >&5
-# Check whether --with-docview or --without-docview was given.
-if test "${with_docview+set}" = set; then
-  withval="$with_docview"
-  if test "x$with_docview" = xyes; then
-  ac_cv_use_docview='wxUSE_DOC_VIEW_ARCHITECTURE="1"'
+if test "$wxUSE_JOYSTICK" = 1; 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:12089: 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_cv_use_docview='wxUSE_DOC_VIEW_ARCHITECTURE="0"'
-fi
+  cat > conftest.$ac_ext <<EOF
+#line 12094 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:12099: \"$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
-  
-  LINE=`grep "wxUSE_DOC_VIEW_ARCHITECTURE" ${OSTYPE}.system.cache`
-  if test "x$LINE" != x ; then
-    eval "DEFAULT_$LINE"
-  fi
-  ac_cv_use_docview='wxUSE_DOC_VIEW_ARCHITECTURE='$DEFAULT_wxUSE_DOC_VIEW_ARCHITECTURE
-
+  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
-
-eval "$ac_cv_use_docview"
-echo $ac_cv_use_docview >> ${OSTYPE}.system.cache.tmp
-if test "$wxUSE_DOC_VIEW_ARCHITECTURE" = 1; then
+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_linux_joystick_h" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_JOYSTICK 1
+EOF
 
-
-echo $ac_n "checking "for printarch"""... $ac_c" 1>&6
-echo "configure:6122: checking "for printarch"" >&5
-# Check whether --with-printarch or --without-printarch was given.
-if test "${with_printarch+set}" = set; then
-  withval="$with_printarch"
-  if test "x$with_printarch" = xyes; then
-  ac_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE="1"'
-else
-  ac_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE="0"'
-fi
-else
-  
-  LINE=`grep "wxUSE_PRINTING_ARCHITECTURE" ${OSTYPE}.system.cache`
-  if test "x$LINE" != x ; then
-    eval "DEFAULT_$LINE"
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS joytest"
   fi
-  ac_cv_use_printarch='wxUSE_PRINTING_ARCHITECTURE='$DEFAULT_wxUSE_PRINTING_ARCHITECTURE
-
 fi
 
-eval "$ac_cv_use_printarch"
-echo $ac_cv_use_printarch >> ${OSTYPE}.system.cache.tmp
-if test "$wxUSE_PRINTING_ARCHITECTURE" = 1; then
-  echo "$ac_t""yes" 1>&6
+
+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:12141: 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
-  echo "$ac_t""no" 1>&6
-fi
+  cat > conftest.$ac_ext <<EOF
+#line 12146 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func(); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char $ac_func();
+char (*f)();
 
+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
+f = $ac_func;
+#endif
 
-echo $ac_n "checking "for help"""... $ac_c" 1>&6
-echo "configure:6152: checking "for help"" >&5
-# Check whether --with-help or --without-help was given.
-if test "${with_help+set}" = set; then
-  withval="$with_help"
-  if test "x$with_help" = xyes; then
-  ac_cv_use_help='wxUSE_HELP="1"'
+; return 0; }
+EOF
+if { (eval echo configure:12170: \"$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
-  ac_cv_use_help='wxUSE_HELP="0"'
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=no"
 fi
-else
-  
-  LINE=`grep "wxUSE_HELP" ${OSTYPE}.system.cache`
-  if test "x$LINE" != x ; then
-    eval "DEFAULT_$LINE"
-  fi
-  ac_cv_use_help='wxUSE_HELP='$DEFAULT_wxUSE_HELP
-
+rm -f conftest*
 fi
 
-eval "$ac_cv_use_help"
-echo $ac_cv_use_help >> ${OSTYPE}.system.cache.tmp
-if test "$wxUSE_HELP" = 1; then
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-
-if test "$wxUSE_UNIX" = 1 ; then
-  cat >> confdefs.h <<\EOF
-#define __UNIX__ 1
+    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+            cat >> confdefs.h <<\EOF
+#define HAVE_DLOPEN 1
 EOF
 
-fi
-
-if test "$USE_LINUX" = 1; then
-       echo $ac_n "checking for gettext in -lc""... $ac_c" 1>&6
-echo "configure:6190: checking for gettext in -lc" >&5
-ac_lib_var=`echo c'_'gettext | sed 'y%./+-%__p_%'`
+            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:12198: 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="-lc  $LIBS"
+LIBS="-ldl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6198 "configure"
+#line 12206 "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();
+char dlopen();
 
 int main() {
-gettext()
+dlopen()
 ; return 0; }
 EOF
-if { (eval echo configure:6209: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:12217: \"$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
@@ -6220,1219 +12228,832 @@ 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 wxHAVE_GLIBC2 1
+  
+                            cat >> confdefs.h <<\EOF
+#define HAVE_DLOPEN 1
 EOF
 
+                            HAVE_DL_FUNCS=1
+                            LIBS="$LIBS -ldl"
+                        
 else
   echo "$ac_t""no" 1>&6
+
+                            for ac_func in shl_load
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:12246: 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 12251 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func(); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char $ac_func();
+char (*f)();
+
+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
+f = $ac_func;
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:12275: \"$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_SHL_LOAD 1
+EOF
+
+                                            HAVE_SHL_FUNCS=1
+                                          
+else
+  echo "$ac_t""no" 1>&6
 fi
+done
 
+                        
+fi
 
-TOOLKIT=
-TOOLKIT_DEF=
+        
+fi
+done
 
-GUI_TK_INCLUDE=
-GUI_TK_LIBRARY=
-GUI_TK_LINK=
 
-WX_LINK=
+    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
 
-MAKEINCLUDE=
+if test "$wxUSE_DYNLIB_CLASS" = "yes" ; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_DYNLIB_CLASS 1
+EOF
 
-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=""
+    wxUSE_ODBC=no
+    wxUSE_SERIAL=no
 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=""
+
+if test "$wxUSE_UNICODE" = "yes" ; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_UNICODE 1
+EOF
+
 fi
 
+if test "$wxUSE_WCSRTOMBS" = "yes" ; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_WCSRTOMBS 1
+EOF
 
-  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
+fi
+
+if test "$wxUSE_wxUSE_EXPERIMENTAL_PRINTF" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_EXPERIMENTAL_PRINTF 1
+EOF
 
-  # 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:6280: 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.
-  ;;
-  *)
-  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_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
+
+
+if test "$wxUSE_SERIAL" = "yes" ; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_SERIAL 1
+EOF
+
+fi
+
+
+IODBC_C_SRC=""
+if test "$wxUSE_ODBC" = "yes" ; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_ODBC 1
+EOF
+
+    WXODBCFLAG="-D_IODBC_"
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS db"
+    IODBCOBJS="\$(IODBC_OBJS)"
 else
-  echo "$ac_t""no" 1>&6
+    IODBCOBJS=
 fi
 
-  min_gtk_version=1.0.4
-  echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6
-echo "configure:6311: 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 6324 "configure"
-#include "confdefs.h"
 
-#include <gtk/gtk.h>
-#include <stdio.h>
+if test "$wxUSE_POSTSCRIPT" = "yes" ; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_POSTSCRIPT 1
+EOF
 
-int 
-main ()
-{
-  int major, minor, micro;
+fi
 
-  if (sscanf("$min_gtk_version", "%d.%d.%d", &major, &minor, &micro) != 3) {
-     printf("%s, bad version string\n", "$min_gtk_version");
-     exit(1);
-   }
+cat >> confdefs.h <<\EOF
+#define wxUSE_AFM_FOR_POSTSCRIPT 1
+EOF
+
+
+cat >> confdefs.h <<\EOF
+#define wxUSE_NORMALIZED_PS_FONTS 1
+EOF
 
-   if (gtk_minor_version > 0) 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)));
-}
 
+if test "$wxUSE_CONSTRAINTS" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_CONSTRAINTS 1
 EOF
-if { (eval echo configure:6348: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./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*
+
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS layout"
 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
-     
-       GUI_TK_INCLUDE="$GTK_CFLAGS"
-       GUI_TK_LIBRARY="$GTK_LIBS"
-       
-  else
-     echo "$ac_t""no" 1>&6
-     GTK_CFLAGS=""
-     GTK_LIBS=""
-     { echo "configure: error: Is gtk-config in path and GTK+ is version 1.0.4 up-to 1.0.6?" 1>&2; exit 1; }
-  fi
-  
-  
+if test "$wxUSE_MDI_ARCHITECTURE" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_MDI_ARCHITECTURE 1
+EOF
 
-  TOOLKIT=GTK
-  TOOLKIT_DEF=__WXGTK__
-  WX_LINK=-lwx_gtk2
-  MAKEINCLUDE=../gtk.inc
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS mdi"
 fi
 
-if test "$wxUSE_QT" = 1; then
-   echo $ac_n "checking for Qt includes""... $ac_c" 1>&6
-echo "configure:6388: checking for Qt includes" >&5
-   
-ac_find_includes=
-for ac_dir in $SEARCH_INCLUDE;
-  do
-    if test -f "$ac_dir/qapp.h"; then
-      ac_find_includes=$ac_dir
-      break
+if test "$wxUSE_DOC_VIEW_ARCHITECTURE" = "yes" ; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_DOC_VIEW_ARCHITECTURE 1
+EOF
+
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS docview"
+    if test "$wxUSE_MDI_ARCHITECTURE" = "yes"; then
+        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS docvwmdi"
     fi
-  done
+fi
 
-   if test "$ac_find_includes" != "" ; then
-     echo "$ac_t""found $ac_find_includes" 1>&6
-     echo $ac_n "checking for Qt library""... $ac_c" 1>&6
-echo "configure:6402: checking for Qt 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/libqt.$ac_extension"; then
-        ac_find_libraries=$ac_dir
-        break 2
-      fi
-    done
-  done
+if test "$wxUSE_HELP" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_HELP 1
+EOF
 
-     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
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS help"
+fi
 
-       
-  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_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
+        cat >> confdefs.h <<\EOF
+#define wxUSE_PRINTING_ARCHITECTURE 1
+EOF
 
-       CHECK_LINK="$CHECK_INCLUDE $ac_path_to_link"
-       CHECK_INCLUDE="$CHECK_INCLUDE $ac_path_to_include"
-       echo "$ac_t""found Qt at $ac_find_libraries" 1>&6
-     else
-       { echo "configure: error: no" 1>&2; exit 1; }
-     fi
-  else
-     { echo "configure: error: no" 1>&2; exit 1; }
-  fi
-  GUI_TK_LINK="-lX11 -lqt -lm"
-  TOOLKIT=QT
-  TOOLKIT_DEF=__WXQT__
-  WX_LINK=-lwx_qt
-  MAKEINCLUDE=../qt.inc
+    fi
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS printing"
 fi
 
-if test "$wxUSE_MOTIF" = 1; then
-   echo $ac_n "checking for Motif/Lesstif includes""... $ac_c" 1>&6
-echo "configure:6453: 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
-    fi
-  done
+if test "$wxUSE_PROLOGIO" = "yes" ; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_PROLOGIO 1
+EOF
 
-   if test "$ac_find_includes" != "" ; then
-     echo "$ac_t""found $ac_find_includes" 1>&6
-     echo $ac_n "checking for Motif/Lesstif library""... $ac_c" 1>&6
-echo "configure:6467: 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
+fi
 
-     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
+if test "$wxUSE_RESOURCES" = "yes" ; then
+    if test "$wxUSE_PROLOGIO" = "yes" ; then
+        cat >> confdefs.h <<\EOF
+#define wxUSE_RESOURCES 1
+EOF
 
-       
-  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
+        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS resource"
+    else
+        echo "configure: warning: wxWindows ressource system requires PrologIO and can't be compiled without it." 1>&2
+    fi
+fi
 
-       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
-       echo $ac_n "checking for Xt library""... $ac_c" 1>&6
-echo "configure:6504: 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
+if test "$wxUSE_X_RESOURCES" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_X_RESOURCES 1
+EOF
 
-       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
-         echo $ac_n "checking for Xpm library""... $ac_c" 1>&6
-echo "configure:6530: 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 "$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_IPC" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_IPC 1
+EOF
 
-           CHECK_LINK="$CHECK_LIB $ac_path_to_link"
-           echo "$ac_t""found at $ac_find_libraries" 1>&6
-         else
-           { echo "configure: error: no" 1>&2; exit 1; }
-         fi
-       else
-         { echo "configure: error: no" 1>&2; exit 1; }
-       fi
-     else
-       { echo "configure: error: no" 1>&2; exit 1; }
-     fi
-  else
-     { echo "configure: error: no" 1>&2; exit 1; }
-  fi
-  
-  GUI_TK_LINK="-lXm -lXpm -lXmu -lXt -lX11 -lm"
-  GUI_TK_LIBRARY="$CHECK_LIB $GUI_TK_LINK"
-  TOOLKIT=MOTIF
-  TOOLKIT_DEF="__WXMOTIF__ -D__LINUX__ -D__UNIX__"
-  WX_LINK=-lwx_motif2
-  MAKEINCLUDE=../motif.inc
 fi
 
-if test "$TOOLKIT" = ""; then
-  { echo "configure: error: You must specify a toolkit: --with-gtk --with-qt --with-motif" 1>&2; exit 1; } 
+if test "$wxUSE_CLIPBOARD" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_CLIPBOARD 1
+EOF
+
 fi
 
+if test "$wxUSE_DRAG_AND_DROP" = "yes" ; then
+    if test "$wxUSE_GTK" = 1; then
+        if test "$WXGTK12" != 1; then
+            echo "configure: warning: Drag and drop is only supported under GTK+ 1.2" 1>&2
+            wxUSE_DRAG_AND_DROP=no
+        fi
+    fi
 
+    if test "$wxUSE_MOTIF" = 1; then
+        echo "configure: warning: Drag and drop is not yet supported under Motif" 1>&2
+        wxUSE_DRAG_AND_DROP=no
+    fi
 
+    if test "$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:12504: 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 12509 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:12514: \"$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 "x$HAVE_OLE2_H" = x ; then
+            echo "configure: warning: Drag and drop disabled because OLE headers not found" 1>&2
+            wxUSE_DRAG_AND_DROP=no
+        fi
+    fi
 
+    if test "$wxUSE_DRAG_AND_DROP" = "yes"; then
+        cat >> confdefs.h <<\EOF
+#define wxUSE_DRAG_AND_DROP 1
+EOF
 
+        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dnd"
+    fi
 
+fi
 
+if test "$wxUSE_SPLINES" = "yes" ; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_SPLINES 1
+EOF
 
+fi
 
 
+if test "$wxUSE_ACCEL" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_ACCEL 1
+EOF
 
+fi
 
-EXTRA_LINK=
+if test "$wxUSE_CARET" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_CARET 1
+EOF
 
-WXDEBUG=
-if test "$wxUSE_DEBUG_GDB" = 1 ; then
-  wxUSE_DEBUG_INFO=1
-  WXDEBUG="-ggdb"
-  wxUSE_OPTIMISE=0
-else
-  if test "$wxUSE_DEBUG_INFO" = 1 ; then
-    WXDEBUG="-g"
-    wxUSE_OPTIMISE=0
-  else
-    EXTRA_LINK="-s $EXTRA_LINK"
-  fi
+  SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS caret"
 fi
 
+if test "$wxUSE_COMBOBOX" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_COMBOBOX 1
+EOF
 
-if test "$wxUSE_DEBUG_FLAG" = 1 ; then
-  cat >> confdefs.h <<EOF
-#define WXDEBUG $wxUSE_DEBUG_FLAG
+fi
+
+if test "$wxUSE_CHOICE" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_CHOICE 1
 EOF
 
-  WXDEBUG_DEFINE="-D__WXDEBUG__"
-  
-else
-  WXDEBUG_DEFINE="-DGTK_NO_CHECK_CASTS"
-  
 fi
 
-if test "$wxUSE_MEM_TRACING" = 1 ; then
-  cat >> confdefs.h <<EOF
-#define wxUSE_MEMORY_TRACING $wxUSE_MEM_TRACING
+if test "$wxUSE_BMPBUTTON" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_BMPBUTTON 1
 EOF
 
-  cat >> confdefs.h <<EOF
-#define wxUSE_GLOBAL_MEMORY_OPERATORS $wxUSE_MEM_TRACING
+fi
+
+if test "$wxUSE_CHECKBOX" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_CHECKBOX 1
 EOF
 
 fi
 
-if test "$wxUSE_DMALLOC" = 1 ; then
-  EXTRA_LINK="$EXTRA_LINK -ldmalloc"
+if test "$wxUSE_CHECKLST" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_CHECKLISTBOX 1
+EOF
+
+  SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS checklst"
 fi
 
+if test "$wxUSE_GAUGE" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_GAUGE 1
+EOF
 
-PROFILE=
-if test "$wxUSE_PROFILE" = 1 ; then
-  PROFILE="-pg"
 fi
 
+if test "$wxUSE_GRID" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_GRID 1
+EOF
 
-CXXFLAGS=`echo "${CXXFLAGS}" | sed "s/\-O.//g" `
-CFLAGS=`echo "${CFLAGS}" | sed "s/\-O.//g" `
-if test "$wxUSE_OPTIMISE" = 0 ; then
-  OPTIMISE=
-else
-  if test "$GCC" = yes ; then
-    OPTIMISE="-O2"
-    case "${canonical}" in
-      i586-*-*|i686-*-* )
-       OPTIMISE="${OPTIMISE} "
-       ;;
-    esac
-  else
-    OPTIMISE="-O"
-  fi
+  SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS grid"
 fi
 
-
-APPLE_IEEE=NONE
-if test "$wxUSE_APPLE_IEEE" = 1 ; then
-  APPLE_IEEE="APPLE_IEEE"
-  cat >> confdefs.h <<EOF
-#define wxUSE_APPLE_IEEE $wxUSE_APPLE_IEEE
+if test "$wxUSE_NEW_GRID" = "yes"; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_NEW_GRID 1
 EOF
 
+  SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS newgrid"
 fi
 
-wxUSE_IOSTREAMH=$DEFAULT_wxUSE_IOSTREAMH
-cat >> confdefs.h <<EOF
-#define wxUSE_IOSTREAMH $wxUSE_IOSTREAMH
+if test "$wxUSE_IMAGLIST" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_IMAGLIST 1
 EOF
 
+fi
 
-
-if test "$wxUSE_ZLIB" = 1 ; then
-  cat >> confdefs.h <<EOF
-#define wxUSE_ZLIB $wxUSE_ZLIB
+if test "$wxUSE_LISTBOX" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_LISTBOX 1
 EOF
 
-  Z_C_SRC="\$(Z_C_SRC)"
 fi
 
-
-if test "$wxUSE_LIBPNG" = 1 ; then
-  cat >> confdefs.h <<EOF
-#define wxUSE_LIBPNG $wxUSE_LIBPNG
+if test "$wxUSE_LISTCTRL" = "yes"; then
+    if test "$wxUSE_IMAGLIST" = "yes"; then
+        cat >> confdefs.h <<\EOF
+#define wxUSE_LISTCTRL 1
 EOF
-  PNG_C_SRC="\$(PNG_C_SRC)"
-fi
 
+        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS listctrl"
+    else
+        echo "configure: warning: wxListCtrl requires wxImageList and won't be compiled without it" 1>&2
+    fi
+fi
 
-JPEG_LINK=""
-if test "$wxUSE_LIBJPEG" = 1 ; then
-  cat >> confdefs.h <<EOF
-#define wxUSE_LIBJPEG $wxUSE_LIBJPEG
+if test "$wxUSE_NOTEBOOK" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_NOTEBOOK 1
 EOF
 
-  echo $ac_n "checking for  in -ljpeg""... $ac_c" 1>&6
-echo "configure:6702: checking for  in -ljpeg" >&5
-ac_lib_var=`echo jpeg'_' | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-ljpeg  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 6710 "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 ();
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS notebook"
+fi
 
-int main() {
-()
-; return 0; }
+if test "$wxUSE_RADIOBOX" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_RADIOBOX 1
 EOF
-if { (eval echo configure:6721: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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
-    ac_tr_lib=HAVE_LIB`echo jpeg | sed -e 's/[^a-zA-Z0-9_]/_/g' \
-    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_lib 1
-EOF
 
-  LIBS="-ljpeg $LIBS"
+if test "$wxUSE_RADIOBTN" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_RADIOBTN 1
+EOF
 
-else
-  echo "$ac_t""no" 1>&6
-fi
-  JPEG_LINK="-ljpeg"
 fi
 
-
-IODBC_C_SRC=""
-if test "$wxUSE_ODBC" = 1 ; then
-  cat >> confdefs.h <<EOF
-#define wxUSE_ODBC $wxUSE_ODBC
+if test "$wxUSE_SASH" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_SASH 1
 EOF
-  IODBC_C_SRC="\$(IODBC_C_SRC)"
+
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS sashtest"
 fi
 
+if test "$wxUSE_SCROLLBAR" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_SCROLLBAR 1
+EOF
 
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS scroll scrollsub"
+fi
 
-if test "$wxUSE_CONFIG" = 1 ; then
-  cat >> confdefs.h <<EOF
-#define wxUSE_CONFIG $wxUSE_CONFIG
+if test "$wxUSE_SLIDER" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_SLIDER 1
 EOF
 
 fi
 
-if test "$wxUSE_TIMEDATE" = 1 ; then
-  cat >> confdefs.h <<EOF
-#define wxUSE_TIMEDATE $wxUSE_TIMEDATE
+if test "$wxUSE_SPINBTN" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_SPINBTN 1
 EOF
 
 fi
 
-if test "$wxUSE_INTL" = 1 ; then
-  cat >> confdefs.h <<EOF
-#define wxUSE_INTL $wxUSE_INTL
+if test "$wxUSE_SPINCTRL" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_SPINCTRL 1
 EOF
 
 fi
 
-if test "$wxUSE_STREAMS" = 1 ; then
-  cat >> confdefs.h <<EOF
-#define wxUSE_STREAMS $wxUSE_STREAMS
+if test "$wxUSE_SPLITTER" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_SPLITTER 1
 EOF
 
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS splitter"
 fi
 
-if test "$wxUSE_SERIAL" = 1 ; then
-  cat >> confdefs.h <<EOF
-#define wxUSE_SERIAL $wxUSE_SERIAL
+if test "$wxUSE_STATBMP" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_STATBMP 1
 EOF
 
 fi
 
+if test "$wxUSE_STATBOX" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_STATBOX 1
+EOF
 
-HAVE_DL_FUNCS=0
-if test "$wxUSE_DYNLIB_CLASS" = "1"; then
-            for ac_func in dlopen
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:6804: 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 6809 "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_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
 
-/* 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
 
-; return 0; }
+if test "$wxUSE_STATUSBAR" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_STATUSBAR 1
 EOF
-if { (eval echo configure:6832: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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_DLOPEN 1
+if test "$wxUSE_TABDIALOG" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_TAB_DIALOG 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:6857: 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 6865 "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:6876: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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"
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS tab"
 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_DLOPEN 1
+if test "$wxUSE_TOOLBAR_SIMPLE" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_TOOLBAR_SIMPLE 1
 EOF
- HAVE_DL_FUNCS=1
-else
-  echo "$ac_t""no" 1>&6
-fi
 
+    wxUSE_TOOLBAR="yes"
 fi
-done
 
-    for ac_func in shl_load
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:6905: 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 6910 "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_TOOLBAR" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_TOOLBAR 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_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-$ac_func();
-#endif
+        if test "$wxUSE_TOOLBAR_SIMPLE" != "yes"; then
+        wxUSE_TOOLBAR_NATIVE="yes"
+    fi
 
-; return 0; }
-EOF
-if { (eval echo configure:6933: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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 toolbar"
 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_SHL_LOAD 1
+if test "$wxUSE_TOOLBAR_NATIVE" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_TOOLBAR_NATIVE 1
 EOF
- HAVE_DL_FUNCS=1
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
 
+fi
 
-    if test "$HAVE_DL_FUNCS" = 0; then
-        echo "configure: warning: "--with-dynlib will be disabled because no function was found to load a shared library on this platform"" 1>&2
+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
 
-        wxUSE_DYNLIB_CLASS=0
+        fi
     fi
 fi
 
-if test "$wxUSE_DYNLIB_CLASS" = 1 ; then
-  cat >> confdefs.h <<EOF
-#define wxUSE_DYNLIB_CLASS $wxUSE_DYNLIB_CLASS
+if test "$wxUSE_TREECTRL" = "yes"; then
+    if test "$wxUSE_IMAGLIST" = "yes"; then
+        cat >> confdefs.h <<\EOF
+#define wxUSE_TREECTRL 1
 EOF
 
+        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_RPC" = 1 ; then
-  cat >> confdefs.h <<EOF
-#define wxUSE_RPC $wxUSE_RPC
+
+if test "$wxUSE_METAFILE" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_METAFILE 1
 EOF
 
 fi
 
-if test "$wxUSE_WX_RESOURCES" = 1 ; then
-  cat >> confdefs.h <<EOF
-#define wxUSE_WX_RESOURCES $wxUSE_WX_RESOURCES
+if test "$wxUSE_DIRDLG" = "yes"; then
+    if test "$wxUSE_CONSTRAINTS" != "yes"; then
+       echo "configure: warning: wxDirDialog requires constraints so it won't be compiled without them" 1>&2
+    else
+        if test "$wxUSE_TREECTRL" != "yes"; then
+            echo "configure: warning: wxDirDialog requires wxTreeCtrl so it won't be compiled without it" 1>&2
+        else
+            cat >> confdefs.h <<\EOF
+#define wxUSE_DIRDLG 1
 EOF
 
+        fi
+    fi
 fi
 
-if test "$wxUSE_PROLOGIO" = 1 ; then
-  cat >> confdefs.h <<EOF
-#define wxUSE_PROLOGIO 1
+if test "$wxUSE_TEXTDLG" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_TEXTDLG 1
 EOF
 
 fi
 
-
-if test "$wxUSE_POSTSCRIPT" = 1 ; then
-  cat >> confdefs.h <<EOF
-#define wxUSE_POSTSCRIPT 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
 
+    fi
 fi
 
-cat >> confdefs.h <<EOF
-#define wxUSE_AFM_FOR_POSTSCRIPT $wxUSE_AFM_FOR_POSTSCRIPT
+if test "$wxUSE_PROGRESSDLG" = "yes"; then
+    if test "$wxUSE_CONSTRAINTS" != "yes"; then
+       echo "configure: warning: wxProgressDialog requires constraints so it won't be compiled without them" 1>&2
+    else
+        cat >> confdefs.h <<\EOF
+#define wxUSE_PROGRESSDLG 1
 EOF
 
+    fi
+fi
 
-cat >> confdefs.h <<EOF
-#define WX_NORMALIZED_PS_FONTS $WX_NORMALIZED_PS_FONTS
+if test "$wxUSE_MINIFRAME" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_MINIFRAME 1
 EOF
 
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS minifram"
+fi
 
-
-if test "$wxUSE_MDI_ARCHITECTURE" = 1 ; then
-  cat >> confdefs.h <<EOF
-#define wxUSE_MDI_ARCHITECTURE $wxUSE_MDI_ARCHITECTURE
+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_DOC_VIEW_ARCHITECTURE" = 1 ; then
-  cat >> confdefs.h <<EOF
-#define wxUSE_DOC_VIEW_ARCHITECTURE $wxUSE_DOC_VIEW_ARCHITECTURE
+if test "$wxUSE_VALIDATORS" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_VALIDATORS 1
 EOF
 
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS validate"
 fi
 
-if test "$wxUSE_PRINTING_ARCHITECTURE" = 1 ; then
-  cat >> confdefs.h <<EOF
-#define wxUSE_PRINTING_ARCHITECTURE $wxUSE_PRINTING_ARCHITECTURE
+if test "$wxUSE_GIF" = "yes" ; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_GIF 1
 EOF
 
 fi
 
-
-if test "$wxUSE_UNICODE" = 1 ; then
-  cat >> confdefs.h <<EOF
-#define wxUSE_UNICODE 1
+if test "$wxUSE_PCX" = "yes" ; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_PCX 1
 EOF
 
 fi
 
-if test "$wxUSE_WCSRTOMBS" = 1 ; then
-  cat >> confdefs.h <<EOF
-#define wxUSE_WCSRTOMBS 1
+if test "$wxUSE_PNM" = "yes" ; then
+  cat >> confdefs.h <<\EOF
+#define wxUSE_PNM 1
 EOF
 
 fi
 
 
-if test "$wxUSE_IPC" = 1 ; then
-  cat >> confdefs.h <<EOF
-#define wxUSE_IPC 1
+OSINFO=`uname -s -r -m`
+OSINFO="\"$OSINFO\""
+cat >> confdefs.h <<EOF
+#define WXWIN_OS_DESCRIPTION $OSINFO
 EOF
 
-fi
 
-if test "$wxUSE_RESOURCES" = 1 ; then
-  cat >> confdefs.h <<EOF
-#define wxUSE_RESOURCES $wxUSE_RESOURCES
-EOF
 
+GUILIBS="$GUI_TK_LIBRARY $OPENGL_LINK $LIBPNG_LINK $ZLIB_LINK $TOOLKIT_LINK"
+
+EXTRA_LIBS="$LIBS $POSIX4_LINK $INET_LINK $WCHAR_LINK $THREADS_LINK $DMALLOC_LINK $DL_LINK"
+if test "$wxUSE_GUI" = "yes"; then
+    EXTRA_LIBS="$EXTRA_LIBS $GUILIBS"
 fi
 
-if test "$wxUSE_CLIPBOARD" = 1 ; then
-  cat >> confdefs.h <<EOF
-#define wxUSE_CLIPBOARD $wxUSE_CLIPBOARD
-EOF
+LD_LIBS="\${top_builddir}/lib/${WX_LIBRARY_NAME_STATIC} $EXTRA_LIBS"
 
-fi
+INCLUDES="-I. -I\${top_builddir}/include -I\${top_srcdir}/include $ZLIB_INCLUDE $PNG_INCLUDE $JPEG_INCLUDE $TIFF_INCLUDE $TOOLKIT_INCLUDE"
 
-if test "$wxUSE_TOOLTIPS" = 1 ; then
-  cat >> confdefs.h <<EOF
-#define wxUSE_TOOLTIPS $wxUSE_TOOLTIPS
-EOF
+if test "$GXX" = yes ; then
+        CXXWARNINGS="-Wall"
+            fi
+EXTRA_CFLAGS="$WXDEBUG $WXODBCFLAG $PROFILE $OPTIMISE $INCLUDES"
 
-fi
+CFLAGS=`echo $CFLAGS $EXTRA_CFLAGS | sed 's/ \\+/ /g'`
+CXXFLAGS=`echo $CXXFLAGS $EXTRA_CFLAGS $CXXWARNINGS | sed 's/ \+/ /g'`
 
-if test "$wxUSE_DRAG_AND_DROP" = 1 ; then
-  cat >> confdefs.h <<EOF
-#define wxUSE_DRAG_AND_DROP $wxUSE_DRAG_AND_DROP
-EOF
+LDFLAGS="$LDFLAGS $PROFILE"
 
+if test "$wxUSE_GUI" = "yes"; then
+        
+            SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS bombs controls dialogs drawing dynamic \
+                     font forty fractal image minimal richedit wxpoem"
+
+        CPPFLAGS="$CPPFLAGS \$(EXTRADEFS)"
+else
+    SAMPLES_SUBDIRS=""
 fi
 
+SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq | tr '\n' ' '`"
+
+
+
+
 
-HELP=NONE
-if test "$wxUSE_HELP" = 1 ; then
-  HELP="HELP"
-  cat >> confdefs.h <<EOF
-#define wxUSE_HELP $wxUSE_HELP
-EOF
 
-fi
 
 
 
-THREADS_LINK=""
-UNIX_THREAD=""
 
-if test "$wxUSE_THREADS" = "1"; then
 
-     
-     echo $ac_n "checking for pthread_create in -lpthread-0.7""... $ac_c" 1>&6
-echo "configure:7107: checking for pthread_create in -lpthread-0.7" >&5
-ac_lib_var=`echo pthread-0.7'_'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="-lpthread-0.7  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 7115 "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:7126: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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
-  
-       UNIX_THREAD="gtk/threadpsx.cpp"
-       THREADS_LINK="-lpthread-0.7"
-     
-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:7150: 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 7155 "configure"
-#include "confdefs.h"
-#include <sys/prctl.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7160: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
-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
-  
-          UNIX_THREAD="gtk/threadsgi.cpp"
-     
-else
-  echo "$ac_t""no" 1>&6
-fi
 
 
-          
-     echo $ac_n "checking for pthread_setcanceltype in -lpthread""... $ac_c" 1>&6
-echo "configure:7186: checking for pthread_setcanceltype in -lpthread" >&5
-ac_lib_var=`echo pthread'_'pthread_setcanceltype | 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="-lpthread  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 7194 "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_setcanceltype();
 
-int main() {
-pthread_setcanceltype()
-; return 0; }
-EOF
-if { (eval echo configure:7205: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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
-  
-       UNIX_THREAD="gtk/threadpsx.cpp"
-       THREADS_LINK="-lpthread"
-     
-else
-  echo "$ac_t""no" 1>&6
-fi
 
-    
-fi
 
 
-    if test "$THREADS_LINK" != ""; then
-      cat >> confdefs.h <<\EOF
-#define wxUSE_THREADS 1
-EOF
 
-    fi
 
-    
-    echo $ac_n "checking for printf in -lposix4""... $ac_c" 1>&6
-echo "configure:7241: checking for printf in -lposix4" >&5
-ac_lib_var=`echo posix4'_'printf | 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 7249 "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 printf();
 
-int main() {
-printf()
-; return 0; }
-EOF
-if { (eval echo configure:7260: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; 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_LINK="$THREADS_LINK -lposix4"
-    
-else
-  echo "$ac_t""no" 1>&6
-fi
 
-    
-fi
 
-if test "$wxUSE_MOTIF" = "1"; then
-  UNIX_THREAD="motif/thread.cpp"
-fi
 
-if test -z "$UNIX_THREAD"; then
-  wxUSE_THREADS=0
-fi
 
 
 
 
 
 
-PICFLAGS=
-CREATE_SHARED=
-case "${canonical}" in
 
-  *-hp-hpux* )
-    if test "$GCC" != "yes" ; then
-      CXXFLAGS="${CXXFLAGS} +a1 -z -Aa -D_HPUX_SOURCE"
-      CFLAGS="${CFLAGS} -z -D_HPUX_SOURCE"
-      PICFLAGS="+z"
-    else
-      PICFLAGS="-fPIC"
-    fi
-    LDFLAGS="-Wl,+s"
-    CREATE_SHARED=sharedHpux
-  ;;
 
-  *-*-linux* )
-    PICFLAGS=-fPIC
-    CREATE_SHARED=sharedLinux
-  ;;
 
-  *-*-irix5* | *-*-irix6* ) 
-    # PICFLAGS can remain empty, as pic is the default
-    LDFLAGS="-Wl,+s"
-    CREATE_SHARED=sharedIrix
-    cat >> confdefs.h <<\EOF
-#define SVR4 1
-EOF
 
-  ;;
 
-  *-*-solaris2* ) 
-    if test "$GCC" != "yes" ; then
-      PICFLAGS="-KPIC"
-    else
-      PICFLAGS="-fPIC"
-    fi
-    CREATE_SHARED=sharedSolaris2
-    cat >> confdefs.h <<\EOF
-#define SVR4 1
-EOF
 
-  ;;
 
-  *-*-sunos4* ) 
-    if test "$GCC" != "yes" ; then
-      PICFLAGS="-PIC"
-    else
-      PICFLAGS="-fPIC"
-    fi
-    LDFLAGS="-Wl,+s"
-    CREATE_SHARED=sharedSunos4
-    cat >> confdefs.h <<\EOF
-#define BSD 1
-EOF
 
-  ;;
 
-  *-*-freebsd* | *-*-netbsd*)
-    PICFLAGS=-fPIC
-    CREATE_SHARED=sharedBsd
-    cat >> confdefs.h <<\EOF
-#define BSD 1
-EOF
 
-  ;;
 
-  *-*-osf* ) 
-    PICFLAGS="-fPIC"
-    CREATE_SHARED=sharedOSF
-  ;;
 
-  *-*-dgux5* ) 
-    if test "$GCC" != "yes" ; then
-      PICFLAGS="-K PIC"
-    else
-      PICFLAGS="-fPIC"
-    fi
-    CREATE_SHARED=sharedDgux
-    cat >> confdefs.h <<\EOF
-#define SVR4 1
-EOF
 
-  ;;
 
-  *-*-sysv5* ) 
-    if test "$GCC" != "yes" ; then
-      PICFLAGS="-K PIC"
-    else
-      PICFLAGS="-fPIC"
-    fi
-    CREATE_SHARED=sharedSysV
-    cat >> confdefs.h <<\EOF
-#define SVR4 1
-EOF
 
-  ;;
 
-  *-*-aix* ) 
-    if test "$GCC" != "yes" ; then
-      PICFLAGS="-bM\:SRE"
-    else
-      PICFLAGS="-fPIC"
-    fi
-    CREATE_SHARED=sharedAIX
-    cat >> confdefs.h <<\EOF
-#define SYSV 1
-EOF
 
-  ;;
 
-  *)
-    CREATE_SHARED=
-    PICFLAGS=
-esac
 
-if test "x$GCC" = xyes; then
-  CFLAGS="${CFLAGS} -Wall -Wno-unused -Wno-uninitialized -D_REENTRANT -DLEX_SCANNER -DHAVE_LIBDL"
-fi
 
-if test "x$GXX" = xyes; then
-  if test "$wxUSE_MOTIF" = 1; then
-    CXXFLAGS="${CXXFLAGS} -Wall -Wno-unused -D_REENTRANT"
-  else
-    CXXFLAGS="${CXXFLAGS} -Wall -D_REENTRANT"
-  fi
-fi
 
-if test "$wxUSE_SHARED" != 1; then
-    CREATE_SHARED=
-    PICFLAGS=
-fi
 
 
+echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
+echo "configure:13024: 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
 
 
 
 
-echo $OS >> system.list
+if test "${TOOLKIT_DIR}" = "msw" ; then
+  GL_TOOLKIT_DIR="win"
+else
+  GL_TOOLKIT_DIR="${TOOLKIT_DIR}"
+fi
 
 
 trap '' 1 2 15
@@ -7458,7 +13079,7 @@ EOF
 # 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) 2>&1` in
+  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 \).
@@ -7525,7 +13146,7 @@ do
     echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
     exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
   -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "$CONFIG_STATUS generated by autoconf version 2.12"
+    echo "$CONFIG_STATUS generated by autoconf version 2.14"
     exit 0 ;;
   -help | --help | --hel | --he | --h)
     echo "\$ac_cs_usage"; exit 0 ;;
@@ -7536,7 +13157,78 @@ done
 ac_given_srcdir=$srcdir
 ac_given_INSTALL="$INSTALL"
 
-trap 'rm -fr `echo "./setup/substit ./wx-config:./wx-config.in ./include/wx/gtk/setup.h:./setup/setup.hin" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+trap 'rm -fr `echo "
+            wx-config
+            src/make.env
+            src/makeprog.env
+            src/makelib.env
+            Makefile
+            samples/Makefile
+            samples/bombs/Makefile
+            samples/caret/Makefile
+            samples/calendar/Makefile
+            samples/checklst/Makefile
+            samples/config/Makefile
+            samples/controls/Makefile
+            samples/console/Makefile
+            samples/db/Makefile
+            samples/dialogs/Makefile
+            samples/docview/Makefile
+            samples/docvwmdi/Makefile
+            samples/dnd/Makefile
+            samples/drawing/Makefile
+            samples/forty/Makefile
+            samples/font/Makefile
+            samples/fractal/Makefile
+            samples/grid/Makefile
+            samples/help/Makefile
+            samples/image/Makefile
+            samples/internat/Makefile
+            samples/layout/Makefile
+            samples/life/Makefile
+            samples/listctrl/Makefile
+            samples/mdi/Makefile
+            samples/minifram/Makefile
+            samples/minimal/Makefile
+            samples/nettest/Makefile
+            samples/newgrid/Makefile
+            samples/notebook/Makefile
+            samples/png/Makefile
+            samples/printing/Makefile
+            samples/proplist/Makefile
+            samples/richedit/Makefile
+            samples/resource/Makefile
+            samples/sashtest/Makefile
+            samples/scroll/Makefile
+            samples/scrollsub/Makefile
+            samples/splitter/Makefile
+            samples/text/Makefile
+            samples/thread/Makefile
+            samples/toolbar/Makefile
+            samples/treectrl/Makefile
+            samples/typetest/Makefile
+            samples/validate/Makefile
+            samples/wxpoem/Makefile
+            samples/wxsocket/Makefile
+            samples/wizard/Makefile
+            samples/html/Makefile
+            samples/html/about/Makefile
+            samples/html/help/Makefile
+            samples/html/printing/Makefile
+            samples/html/helpview/Makefile
+            samples/html/test/Makefile
+            samples/html/zip/Makefile
+            samples/html/virtual/Makefile
+            samples/html/widget/Makefile
+            utils/Makefile
+            utils/wxMMedia2/Makefile
+            utils/wxMMedia2/lib/Makefile
+            utils/wxMMedia2/sample/Makefile
+            utils/glcanvas/Makefile
+            utils/glcanvas/${GL_TOOLKIT_DIR}/Makefile
+            utils/ogl/Makefile
+            utils/ogl/src/Makefile
+           setup.h:setup.h.in" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
 cat >> $CONFIG_STATUS <<EOF
 
@@ -7545,9 +13237,11 @@ sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
  s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
 $ac_vpsub
 $extrasub
+s%@SHELL@%$SHELL%g
 s%@CFLAGS@%$CFLAGS%g
 s%@CPPFLAGS@%$CPPFLAGS%g
 s%@CXXFLAGS@%$CXXFLAGS%g
+s%@FFLAGS@%$FFLAGS%g
 s%@DEFS@%$DEFS%g
 s%@LDFLAGS@%$LDFLAGS%g
 s%@LIBS@%$LIBS%g
@@ -7566,7 +13260,21 @@ s%@includedir@%$includedir%g
 s%@oldincludedir@%$oldincludedir%g
 s%@infodir@%$infodir%g
 s%@mandir@%$mandir%g
-s%@WXBASEDIR@%$WXBASEDIR%g
+s%@host@%$host%g
+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%@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
@@ -7574,50 +13282,68 @@ s%@CXXCPP@%$CXXCPP%g
 s%@RANLIB@%$RANLIB%g
 s%@AR@%$AR%g
 s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
+s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
 s%@INSTALL_DATA@%$INSTALL_DATA%g
-s%@LN_S@%$LN_S%g
-s%@AWK@%$AWK%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_JOYSTICK@%$GTK_JOYSTICK%g
-s%@LIBOBJS@%$LIBOBJS%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%@DL_LIBRARY@%$DL_LIBRARY%g
-s%@host@%$host%g
-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%@LN_S@%$LN_S%g
 s%@GTK_CONFIG@%$GTK_CONFIG%g
 s%@GTK_CFLAGS@%$GTK_CFLAGS%g
 s%@GTK_LIBS@%$GTK_LIBS%g
-s%@GUI_TK_INCLUDE@%$GUI_TK_INCLUDE%g
-s%@GUI_TK_LIBRARY@%$GUI_TK_LIBRARY%g
-s%@GUI_TK_LINK@%$GUI_TK_LINK%g
-s%@WX_LINK@%$WX_LINK%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%@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_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%@BURNT_LIBRARY_NAME@%$BURNT_LIBRARY_NAME%g
+s%@WXDEBUG_DEFINE@%$WXDEBUG_DEFINE%g
 s%@TOOLKIT@%$TOOLKIT%g
 s%@TOOLKIT_DEF@%$TOOLKIT_DEF%g
-s%@MAKEINCLUDE@%$MAKEINCLUDE%g
-s%@WXDEBUG@%$WXDEBUG%g
-s%@WXDEBUG_DEFINE@%$WXDEBUG_DEFINE%g
-s%@EXTRA_LINK@%$EXTRA_LINK%g
-s%@PROFILE@%$PROFILE%g
-s%@OPTIMISE@%$OPTIMISE%g
-s%@Z_C_SRC@%$Z_C_SRC%g
-s%@PNG_C_SRC@%$PNG_C_SRC%g
-s%@JPEG_LINK@%$JPEG_LINK%g
-s%@IODBC_C_SRC@%$IODBC_C_SRC%g
-s%@HELP@%$HELP%g
-s%@UNIX_THREAD@%$UNIX_THREAD%g
-s%@THREADS_LINK@%$THREADS_LINK%g
-s%@OS@%$OS%g
-s%@PICFLAGS@%$PICFLAGS%g
-s%@CREATE_SHARED@%$CREATE_SHARED%g
+s%@TOOLKIT_DIR@%$TOOLKIT_DIR%g
+s%@TOOLKIT_INCLUDE@%$TOOLKIT_INCLUDE%g
+s%@GUIHEADERS@%$GUIHEADERS%g
+s%@GUIOBJS@%$GUIOBJS%g
+s%@COMMONOBJS@%$COMMONOBJS%g
+s%@GENERICOBJS@%$GENERICOBJS%g
+s%@GUIDEPS@%$GUIDEPS%g
+s%@COMMONDEPS@%$COMMONDEPS%g
+s%@GENERICDEPS@%$GENERICDEPS%g
+s%@IODBCOBJS@%$IODBCOBJS%g
+s%@UNIXOBJS@%$UNIXOBJS%g
+s%@UNIXDEPS@%$UNIXDEPS%g
+s%@ALL_OBJECTS@%$ALL_OBJECTS%g
+s%@ALL_DEPFILES@%$ALL_DEPFILES%g
+s%@ALL_HEADERS@%$ALL_HEADERS%g
+s%@GUIDIST@%$GUIDIST%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%@EXTRADEFS@%$EXTRADEFS%g
+s%@LD_LIBS@%$LD_LIBS%g
+s%@SET_MAKE@%$SET_MAKE%g
+s%@GL_TOOLKIT_DIR@%$GL_TOOLKIT_DIR%g
 
 CEOF
 EOF
@@ -7659,7 +13385,77 @@ EOF
 
 cat >> $CONFIG_STATUS <<EOF
 
-CONFIG_FILES=\${CONFIG_FILES-"./setup/substit ./wx-config:./wx-config.in"}
+CONFIG_FILES=\${CONFIG_FILES-"wx-config
+            src/make.env
+            src/makeprog.env
+            src/makelib.env
+            Makefile
+            samples/Makefile
+            samples/bombs/Makefile
+            samples/caret/Makefile
+            samples/calendar/Makefile
+            samples/checklst/Makefile
+            samples/config/Makefile
+            samples/controls/Makefile
+            samples/console/Makefile
+            samples/db/Makefile
+            samples/dialogs/Makefile
+            samples/docview/Makefile
+            samples/docvwmdi/Makefile
+            samples/dnd/Makefile
+            samples/drawing/Makefile
+            samples/forty/Makefile
+            samples/font/Makefile
+            samples/fractal/Makefile
+            samples/grid/Makefile
+            samples/help/Makefile
+            samples/image/Makefile
+            samples/internat/Makefile
+            samples/layout/Makefile
+            samples/life/Makefile
+            samples/listctrl/Makefile
+            samples/mdi/Makefile
+            samples/minifram/Makefile
+            samples/minimal/Makefile
+            samples/nettest/Makefile
+            samples/newgrid/Makefile
+            samples/notebook/Makefile
+            samples/png/Makefile
+            samples/printing/Makefile
+            samples/proplist/Makefile
+            samples/richedit/Makefile
+            samples/resource/Makefile
+            samples/sashtest/Makefile
+            samples/scroll/Makefile
+            samples/scrollsub/Makefile
+            samples/splitter/Makefile
+            samples/text/Makefile
+            samples/thread/Makefile
+            samples/toolbar/Makefile
+            samples/treectrl/Makefile
+            samples/typetest/Makefile
+            samples/validate/Makefile
+            samples/wxpoem/Makefile
+            samples/wxsocket/Makefile
+            samples/wizard/Makefile
+            samples/html/Makefile
+            samples/html/about/Makefile
+            samples/html/help/Makefile
+            samples/html/printing/Makefile
+            samples/html/helpview/Makefile
+            samples/html/test/Makefile
+            samples/html/zip/Makefile
+            samples/html/virtual/Makefile
+            samples/html/widget/Makefile
+            utils/Makefile
+            utils/wxMMedia2/Makefile
+            utils/wxMMedia2/lib/Makefile
+            utils/wxMMedia2/sample/Makefile
+            utils/glcanvas/Makefile
+            utils/glcanvas/${GL_TOOLKIT_DIR}/Makefile
+            utils/ogl/Makefile
+            utils/ogl/src/Makefile
+          "}
 EOF
 cat >> $CONFIG_STATUS <<\EOF
 for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
@@ -7740,7 +13536,7 @@ ac_eD='%g'
 if test "${CONFIG_HEADERS+set}" != set; then
 EOF
 cat >> $CONFIG_STATUS <<EOF
-  CONFIG_HEADERS="./include/wx/gtk/setup.h:./setup/setup.hin"
+  CONFIG_HEADERS="setup.h:setup.h.in"
 EOF
 cat >> $CONFIG_STATUS <<\EOF
 fi
@@ -7828,9 +13624,26 @@ fi; done
 EOF
 cat >> $CONFIG_STATUS <<EOF
 
+            TOOLKIT_DIR="${TOOLKIT_DIR}"
+          
+         
 EOF
 cat >> $CONFIG_STATUS <<\EOF
-./setup/general/createall
+
+            chmod +x wx-config
+            if test ! -d include; then
+              mkdir include
+            fi
+            if test ! -d include/wx; then
+              mkdir include/wx
+            fi
+            if test ! -d include/wx/${TOOLKIT_DIR}; then
+              mkdir include/wx/${TOOLKIT_DIR}
+            fi
+            if test -f setup.h; then
+                mv -f setup.h include/wx/${TOOLKIT_DIR}/setup.h
+            fi
+          
 exit 0
 EOF
 chmod +x $CONFIG_STATUS
@@ -7838,6 +13651,3 @@ rm -fr confdefs* $ac_clean_files
 test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
 
 
-
-mv ${OSTYPE}.system.cache.tmp ${OSTYPE}.system.cache
-