don't build the GUI version of tex2rtf wif --disable-gui

[wxWidgets.git] / configure

diff --git a/configure b/configure
index 804789401b6acf09432d09c84364ee42180187cd..8d6ff1e934595ecf0c191ffb8bfd7079ba8bd7f1 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,7 +1,7 @@
 #! /bin/sh
 # From configure.in Id: configure.in.
 # Guess values for system-dependent variables and create Makefiles.
 #! /bin/sh
 # From configure.in Id: configure.in.
 # Guess values for system-dependent variables and create Makefiles.

-# Generated by GNU Autoconf 2.57 for wxWindows 2.5.0.
+# Generated by GNU Autoconf 2.57 for wxWindows 2.5.1.

 #
 # Report bugs to <wx-dev@lists.wxwindows.org>.
 #
 #
 # Report bugs to <wx-dev@lists.wxwindows.org>.
 #


@@ -269,8 +269,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='wxWindows'
 PACKAGE_TARNAME='wxwindows'
 # Identity of this package.
 PACKAGE_NAME='wxWindows'
 PACKAGE_TARNAME='wxwindows'

-PACKAGE_VERSION='2.5.0'
-PACKAGE_STRING='wxWindows 2.5.0'
+PACKAGE_VERSION='2.5.1'
+PACKAGE_STRING='wxWindows 2.5.1'

 PACKAGE_BUGREPORT='wx-dev@lists.wxwindows.org'
 
 ac_unique_file="wx-config.in"
 PACKAGE_BUGREPORT='wx-dev@lists.wxwindows.org'
 
 ac_unique_file="wx-config.in"


@@ -312,7 +312,7 @@ ac_includes_default="\
 #endif"
 
 ac_subdirs_all="$ac_subdirs_all src/expat"
 #endif"
 
 ac_subdirs_all="$ac_subdirs_all src/expat"

-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP CXX CXXFLAGS ac_ct_CXX RANLIB ac_ct_RANLIB AR INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA STRIP IF_GNU_MAKE LN_S CXXCPP subdirs PKG_CONFIG GTK_CFLAGS GTK_LIBS GTK_CONFIG PANGOFT2_CFLAGS PANGOFT2_LIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS PANGOX_CFLAGS PANGOX_LIBS PANGOXFT_CFLAGS PANGOXFT_LIBS RESCOMP DEREZ SETFILE LIBICONV EXTRALIBS_ESD CORE_BASE_LIBS CORE_GUI_LIBS wxUSE_ZLIB wxUSE_REGEX wxUSE_EXPAT wxUSE_ODBC wxUSE_LIBJPEG wxUSE_LIBPNG wxUSE_LIBTIFF VENDOR OFFICIAL_BUILD WXUNIV MONOLITHIC EXTRALIBS EXTRALIBS_XML EXTRALIBS_ODBC EXTRALIBS_GUI EXTRALIBS_OPENGL UNICODE BUILD DEBUG_INFO DEBUG_FLAG SHARED TOOLKIT_LOWERCASE TOOLKIT_VERSION SAMPLES_RPATH_FLAG SAMPLES_RPATH_POSTLINK HOST_SUFFIX SET_MAKE MAKE_SET ac_ct_AR ac_ct_STRIP NM ac_ct_NM INSTALL_DIR LDFLAGS_GUI PLATFORM_UNIX PLATFORM_WIN32 PLATFORM_MSDOS PLATFORM_MAC PLATFORM_MACOSX PLATFORM_OS2 SO_SUFFIX SO_SUFFIX_MODULE LIBPREFIX DLLPREFIX DLLPREFIX_MODULE AIX_CXX_LD SHARED_LD_CC SHARED_LD_CXX SHARED_LD_MODULE_CC SHARED_LD_MODULE_CXX PIC_FLAG USE_SOVERSION USE_SOVERLINUX USE_SOVERSOLARIS USE_MACVERSION USE_SOSYMLINKS SONAME_FLAG DEPS_TRACKING GCC_PCH COND_BUILD_DEBUG COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT COND_BUILD_RELEASE COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT COND_DEBUG_FLAG_1 COND_DEBUG_INFO_0 COND_DEBUG_INFO_1 COND_DEPS_TRACKING_0 COND_DEPS_TRACKING_1 COND_GCC_PCH_1 COND_MONOLITHIC_0 COND_MONOLITHIC_0_SHARED_0 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1 COND_MONOLITHIC_0_SHARED_0_USE_HTML_1 COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1 COND_MONOLITHIC_0_SHARED_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1 COND_MONOLITHIC_0_SHARED_1_USE_HTML_1 COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1 COND_MONOLITHIC_1 COND_MONOLITHIC_1_SHARED_0 COND_MONOLITHIC_1_SHARED_1 COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1 COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1 COND_PLATFORM_MACOSX_0_USE_SOVERSION_1 COND_PLATFORM_MACOSX_1 COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA COND_PLATFORM_MACOSX_1_TOOLKIT_GTK COND_PLATFORM_MACOSX_1_TOOLKIT_MAC COND_PLATFORM_MACOSX_1_USE_SOVERSION_1 COND_PLATFORM_MAC_1 COND_PLATFORM_OS2_1 COND_PLATFORM_UNIX_0 COND_PLATFORM_UNIX_1 COND_PLATFORM_WIN32_0 COND_PLATFORM_WIN32_1 COND_SHARED_0 COND_SHARED_0_USE_GUI_1_USE_OPENGL_1 COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN COND_SHARED_0_WXUSE_EXPAT_BUILTIN COND_SHARED_0_WXUSE_ODBC_BUILTIN COND_SHARED_0_WXUSE_REGEX_BUILTIN COND_SHARED_0_WXUSE_ZLIB_BUILTIN COND_SHARED_1 COND_SHARED_1_USE_GUI_1_USE_OPENGL_1 COND_TOOLKIT_COCOA COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_GTK COND_TOOLKIT_GTK_USE_GUI_1 COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MAC COND_TOOLKIT_MAC_USE_GUI_1 COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MGL COND_TOOLKIT_MGL_USE_GUI_1 COND_TOOLKIT_MOTIF COND_TOOLKIT_MOTIF_USE_GUI_1 COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MSW COND_TOOLKIT_MSW_USE_GUI_1 COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_PM COND_TOOLKIT_PM_USE_GUI_1 COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_X11 COND_TOOLKIT_X11_USE_GUI_1 COND_UNICODE_1 COND_USE_GUI_0 COND_USE_GUI_1 COND_USE_GUI_1_WXUNIV_0 COND_USE_GUI_1_WXUNIV_1 COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN COND_USE_SOSYMLINKS_1 COND_USE_SOVERLINUX_1 COND_USE_SOVERSION_0 COND_USE_SOVERSOLARIS_1 COND_WXUNIV_1 COND_WXUSE_EXPAT_BUILTIN COND_WXUSE_LIBJPEG_BUILTIN COND_WXUSE_LIBPNG_BUILTIN COND_WXUSE_LIBTIFF_BUILTIN COND_WXUSE_ODBC_BUILTIN COND_WXUSE_REGEX_BUILTIN COND_WXUSE_ZLIB_BUILTIN PATH_IFS WX_MAJOR_VERSION_NUMBER WX_MINOR_VERSION_NUMBER WX_RELEASE_NUMBER WX_LIBRARY_NAME_STATIC WX_LIBRARY_NAME_SHARED WX_LIBRARY_BASENAME_NOGUI WX_LIBRARY_BASENAME_GUI WX_LIBRARY_IMPORTLIB WX_TARGET_LIBRARY WX_LIBRARY_LINK1 WX_LIBRARY_LINK2 PROGRAM_EXT WX_LIBRARY_NAME_STATIC_GL WX_LIBRARY_NAME_SHARED_GL WX_TARGET_LIBRARY_GL WX_LIBRARY_LINK1_GL WX_LIBRARY_LINK2_GL WX_ALL WX_ALL_INSTALLED SHARED_LD WX_TARGET_LIBRARY_TYPE STATIC_FLAG WXDEBUG_DEFINE USE_GUI AFMINSTALL WIN32INSTALL TOOLKIT TOOLKIT_DIR TOOLKIT_VPATH TOOLCHAIN_NAME TOOLCHAIN_DEFS TOOLCHAIN_DLL_DEFS top_builddir_wxconfig cross_compiling WXCONFIG_EXTRALIBS WXCONFIG_LIBS WXCONFIG_LIBS_GL WXCONFIG_LIBS_STATIC WXCONFIG_LIBS_STATIC_GL WXCONFIG_INCLUDE WXCONFIG_RPATH WXCONFIG_LDFLAGS_GUI WX_LARGEFILE_FLAGS CODE_GEN_FLAGS CODE_GEN_FLAGS_CXX ALL_OBJECTS ALL_HEADERS ALL_SOURCES GUIDIST PORT_FILES DISTDIR SAMPLES_SUBDIRS LDFLAGS_GL LDFLAGS_VERSIONING LDFLAGS_EXE OPENGL_LIBS DMALLOC_LIBS WX_VERSION_TAG RESFLAGS RESPROGRAMOBJ WX_RESOURCES_MACOSX_ASCII WX_RESOURCES_MACOSX_DATA MACOSX_BUNDLE LIBWXMACRES MACRESCOMP MACSETFILE MACRESWXCONFIG GCC DLLTOOL AS LD MAKEINFO INSTALL_LIBRARY LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP CXX CXXFLAGS ac_ct_CXX RANLIB ac_ct_RANLIB AR INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA STRIP IF_GNU_MAKE LN_S CXXCPP subdirs PKG_CONFIG GTK_CFLAGS GTK_LIBS GTK_CONFIG PANGOFT2_CFLAGS PANGOFT2_LIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS PANGOX_CFLAGS PANGOX_LIBS PANGOXFT_CFLAGS PANGOXFT_LIBS RESCOMP DEREZ SETFILE LIBICONV EXTRALIBS_ESD CORE_BASE_LIBS CORE_GUI_LIBS wxUSE_ZLIB wxUSE_REGEX wxUSE_EXPAT wxUSE_ODBC wxUSE_LIBJPEG wxUSE_LIBPNG wxUSE_LIBTIFF VENDOR OFFICIAL_BUILD WXUNIV MONOLITHIC EXTRALIBS EXTRALIBS_XML EXTRALIBS_ODBC EXTRALIBS_GUI EXTRALIBS_OPENGL UNICODE BUILD DEBUG_INFO DEBUG_FLAG SHARED TOOLKIT_LOWERCASE TOOLKIT_VERSION SAMPLES_RPATH_FLAG SAMPLES_RPATH_POSTLINK HOST_SUFFIX SET_MAKE MAKE_SET ac_ct_AR ac_ct_STRIP NM ac_ct_NM INSTALL_DIR LDFLAGS_GUI PLATFORM_UNIX PLATFORM_WIN32 PLATFORM_MSDOS PLATFORM_MAC PLATFORM_MACOSX PLATFORM_OS2 SO_SUFFIX SO_SUFFIX_MODULE LIBPREFIX DLLPREFIX DLLPREFIX_MODULE AIX_CXX_LD SHARED_LD_CC SHARED_LD_CXX SHARED_LD_MODULE_CC SHARED_LD_MODULE_CXX PIC_FLAG USE_SOVERSION USE_SOVERLINUX USE_SOVERSOLARIS USE_MACVERSION USE_SOSYMLINKS SONAME_FLAG DEPS_TRACKING GCC_PCH COND_BUILD_DEBUG COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT COND_BUILD_RELEASE COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT COND_DEBUG_FLAG_1 COND_DEBUG_INFO_0 COND_DEBUG_INFO_1 COND_DEPS_TRACKING_0 COND_DEPS_TRACKING_1 COND_GCC_PCH_1 COND_MONOLITHIC_0 COND_MONOLITHIC_0_SHARED_0 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1 COND_MONOLITHIC_0_SHARED_0_USE_GUI_1_USE_ODBC_1 COND_MONOLITHIC_0_SHARED_0_USE_HTML_1 COND_MONOLITHIC_0_SHARED_0_USE_ODBC_1 COND_MONOLITHIC_0_SHARED_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1 COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE_ODBC_1 COND_MONOLITHIC_0_SHARED_1_USE_HTML_1 COND_MONOLITHIC_0_SHARED_1_USE_ODBC_1 COND_MONOLITHIC_1 COND_MONOLITHIC_1_SHARED_0 COND_MONOLITHIC_1_SHARED_1 COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1 COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1 COND_PLATFORM_MACOSX_0_USE_SOVERSION_1 COND_PLATFORM_MACOSX_1 COND_PLATFORM_MACOSX_1_TOOLKIT_COCOA COND_PLATFORM_MACOSX_1_TOOLKIT_GTK COND_PLATFORM_MACOSX_1_TOOLKIT_MAC COND_PLATFORM_MACOSX_1_USE_SOVERSION_1 COND_PLATFORM_MAC_1 COND_PLATFORM_OS2_1 COND_PLATFORM_UNIX_0 COND_PLATFORM_UNIX_1 COND_PLATFORM_WIN32_0 COND_PLATFORM_WIN32_1 COND_SHARED_0 COND_SHARED_0_USE_GUI_1_USE_OPENGL_1 COND_SHARED_0_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN COND_SHARED_0_USE_GUI_1_WXUSE_LIBPNG_BUILTIN COND_SHARED_0_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN COND_SHARED_0_WXUSE_EXPAT_BUILTIN COND_SHARED_0_WXUSE_ODBC_BUILTIN COND_SHARED_0_WXUSE_REGEX_BUILTIN COND_SHARED_0_WXUSE_ZLIB_BUILTIN COND_SHARED_1 COND_SHARED_1_USE_GUI_1_USE_OPENGL_1 COND_TOOLKIT_COCOA COND_TOOLKIT_COCOA_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_GTK COND_TOOLKIT_GTK_USE_GUI_1 COND_TOOLKIT_GTK_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MAC COND_TOOLKIT_MAC_USE_GUI_1 COND_TOOLKIT_MAC_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MGL COND_TOOLKIT_MGL_USE_GUI_1 COND_TOOLKIT_MOTIF COND_TOOLKIT_MOTIF_USE_GUI_1 COND_TOOLKIT_MOTIF_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_MSW COND_TOOLKIT_MSW_USE_GUI_1 COND_TOOLKIT_MSW_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_PM COND_TOOLKIT_PM_USE_GUI_1 COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_X11 COND_TOOLKIT_X11_USE_GUI_1 COND_UNICODE_1 COND_USE_EXCEPTIONS_0 COND_USE_EXCEPTIONS_1 COND_USE_GUI_0 COND_USE_GUI_1 COND_USE_GUI_1_WXUNIV_0 COND_USE_GUI_1_WXUNIV_1 COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN COND_USE_ODBC_1 COND_USE_SOSYMLINKS_1 COND_USE_SOVERLINUX_1 COND_USE_SOVERSION_0 COND_USE_SOVERSOLARIS_1 COND_WXUNIV_1 COND_WXUSE_EXPAT_BUILTIN COND_WXUSE_LIBJPEG_BUILTIN COND_WXUSE_LIBPNG_BUILTIN COND_WXUSE_LIBTIFF_BUILTIN COND_WXUSE_ODBC_BUILTIN COND_WXUSE_REGEX_BUILTIN COND_WXUSE_ZLIB_BUILTIN PATH_IFS WX_MAJOR_VERSION_NUMBER WX_MINOR_VERSION_NUMBER WX_RELEASE_NUMBER WX_LIBRARY_NAME_STATIC WX_LIBRARY_NAME_SHARED WX_LIBRARY_BASENAME_NOGUI WX_LIBRARY_BASENAME_GUI WX_LIBRARY_IMPORTLIB WX_TARGET_LIBRARY WX_LIBRARY_LINK1 WX_LIBRARY_LINK2 PROGRAM_EXT WX_LIBRARY_NAME_STATIC_GL WX_LIBRARY_NAME_SHARED_GL WX_TARGET_LIBRARY_GL WX_LIBRARY_LINK1_GL WX_LIBRARY_LINK2_GL WX_ALL WX_ALL_INSTALLED SHARED_LD WX_TARGET_LIBRARY_TYPE STATIC_FLAG WXDEBUG_DEFINE USE_GUI AFMINSTALL WIN32INSTALL TOOLKIT TOOLKIT_DIR TOOLKIT_VPATH TOOLCHAIN_NAME TOOLCHAIN_DEFS TOOLCHAIN_DLL_DEFS top_builddir_wxconfig cross_compiling WXCONFIG_EXTRALIBS WXCONFIG_LIBS WXCONFIG_LIBS_GL WXCONFIG_LIBS_STATIC WXCONFIG_LIBS_STATIC_GL WXCONFIG_INCLUDE WXCONFIG_RPATH WXCONFIG_LDFLAGS_GUI WX_LARGEFILE_FLAGS CODE_GEN_FLAGS CODE_GEN_FLAGS_CXX ALL_OBJECTS ALL_HEADERS ALL_SOURCES GUIDIST PORT_FILES DISTDIR SAMPLES_SUBDIRS LDFLAGS_GL LDFLAGS_VERSIONING LDFLAGS_EXE OPENGL_LIBS DMALLOC_LIBS WX_VERSION_TAG RESFLAGS RESPROGRAMOBJ WX_RESOURCES_MACOSX_ASCII WX_RESOURCES_MACOSX_DATA MACOSX_BUNDLE LIBWXMACRES MACRESCOMP MACSETFILE MACRESWXCONFIG GCC DLLTOOL AS LD MAKEINFO INSTALL_LIBRARY LIBOBJS LTLIBOBJS'

 ac_subst_files=''
 
 # Initialize some variables set by options.
 ac_subst_files=''
 
 # Initialize some variables set by options.


@@ -793,7 +793,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF

-\`configure' configures wxWindows 2.5.0 to adapt to many kinds of systems.
+\`configure' configures wxWindows 2.5.1 to adapt to many kinds of systems.

 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 


@@ -859,7 +859,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in

-     short | recursive ) echo "Configuration of wxWindows 2.5.0:";;
+     short | recursive ) echo "Configuration of wxWindows 2.5.1:";;

    esac
   cat <<\_ACEOF
 
    esac
   cat <<\_ACEOF
 


@@ -895,40 +895,41 @@ Optional Features:
   --enable-http           use wxHTTP (requires wxProtocol
   --enable-fileproto      use wxFileProto class (requires wxProtocol
   --enable-sockets        use socket/network classes
   --enable-http           use wxHTTP (requires wxProtocol
   --enable-fileproto      use wxFileProto class (requires wxProtocol
   --enable-sockets        use socket/network classes

-  --enable-ole            use OLE classes
+  --enable-ole            use OLE classes (Win32 only)

   --enable-dataobj        use data object classes
   --enable-ipc            use interprocess communication (wxSocket etc.)
   --enable-dataobj        use data object classes
   --enable-ipc            use interprocess communication (wxSocket etc.)

+  --enable-apple_ieee     use the Apple IEEE codec
+  --enable-catch_segvs    catch signals in wxApp::OnFatalException (Unix only)

   --enable-cmdline        use wxCmdLineParser class
   --enable-datetime       use wxDateTime class
   --enable-cmdline        use wxCmdLineParser class
   --enable-datetime       use wxDateTime class

-  --enable-stopwatch      use wxStopWatch class

   --enable-dialupman      use dialup network classes
   --enable-dialupman      use dialup network classes

-  --enable-apple_ieee     use the Apple IEEE codec
-  --enable-timer          use wxTimer class
-  --enable-wave           use wxWave class
-  --enable-fraction       use wxFraction class

   --enable-dynlib         use wxLibrary class for DLL loading
   --enable-dynamicloader  use (new) wxDynamicLibrary class
   --enable-dynlib         use wxLibrary class for DLL loading
   --enable-dynamicloader  use (new) wxDynamicLibrary class

-  --enable-longlong       use wxLongLong class
+  --enable-exceptions     build exception-safe library
+  --enable-ffile          use wxFFile class
+  --enable-file           use wxFile class
+  --enable-filesystem     use virtual file systems classes
+  --enable-fontmap        use font encodings conversion classes
+  --enable-fs_inet        use virtual HTTP/FTP filesystems
+  --enable-fs_zip         use virtual ZIP filesystems

   --enable-geometry       use geometry class
   --enable-log            use logging system
   --enable-geometry       use geometry class
   --enable-log            use logging system

+  --enable-longlong       use wxLongLong class
+  --enable-mimetype       use wxMimeTypesManager
+  --enable-mslu           use MS Layer for Unicode on Windows 9x (Win32 only)
+  --enable-snglinst       use wxSingleInstanceChecker class

   --enable-streams        use wxStream etc classes
   --enable-streams        use wxStream etc classes

-  --enable-file           use wxFile classes
-  --enable-ffile          use wxFFile classes
+  --enable-std_iostreams  use standard C++ stream classes
+  --enable-stopwatch      use wxStopWatch class
+  --enable-sysoptions     use wxSystemOptions

   --enable-textbuf        use wxTextBuffer class
   --enable-textfile       use wxTextFile class
   --enable-textbuf        use wxTextBuffer class
   --enable-textfile       use wxTextFile class

-  --enable-fontmap        use font encodings conversion classes
+  --enable-timer          use wxTimer class

   --enable-unicode        compile wxString with Unicode support
   --enable-unicode        compile wxString with Unicode support

-  --enable-mslu           use MS Layer for Unicode on Windows 9x (win32 only)
+  --enable-wave           use wxWave class

   --enable-wxprintfv      use wxWindows implementation of vprintf()
   --enable-wxprintfv      use wxWindows implementation of vprintf()

-  --enable-std_iostreams  use standard C++ stream classes
-  --enable-filesystem     use virtual file systems classes
-  --enable-fs_inet        use virtual HTTP/FTP filesystems
-  --enable-fs_zip         use virtual ZIP filesystems

   --enable-zipstream      use wxZipInputStream
   --enable-zipstream      use wxZipInputStream

-  --enable-catch_segvs    catch signals and pass them to wxApp::OnFatalException
-  --enable-snglinst       use wxSingleInstanceChecker class
-  --enable-mimetype       use wxMimeTypesManager
-  --enable-sysoptions     use wxSystemOptions
+  --enable-gzstream       use wxGzipInputStream

   --enable-url            use wxURL class
   --enable-protocol       use wxProtocol class
   --enable-protocol-http  HTTP support in wxProtocol
   --enable-url            use wxURL class
   --enable-protocol       use wxProtocol class
   --enable-protocol-http  HTTP support in wxProtocol


@@ -1136,7 +1137,7 @@ fi
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF

-wxWindows configure 2.5.0
+wxWindows configure 2.5.1

 generated by GNU Autoconf 2.57
 
 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
 generated by GNU Autoconf 2.57
 
 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002


@@ -1151,7 +1152,7 @@ cat >&5 <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 

-It was created by wxWindows $as_me 2.5.0, which was
+It was created by wxWindows $as_me 2.5.1, which was

 generated by GNU Autoconf 2.57.  Invocation command line was
 
   $ $0 $@
 generated by GNU Autoconf 2.57.  Invocation command line was
 
   $ $0 $@


@@ -1602,14 +1603,14 @@ test -n "$target_alias" &&
 
 WX_MAJOR_VERSION_NUMBER=2
 WX_MINOR_VERSION_NUMBER=5
 
 WX_MAJOR_VERSION_NUMBER=2
 WX_MINOR_VERSION_NUMBER=5

-WX_RELEASE_NUMBER=0
+WX_RELEASE_NUMBER=1

 
 WX_VERSION=$WX_MAJOR_VERSION_NUMBER.$WX_MINOR_VERSION_NUMBER.$WX_RELEASE_NUMBER
 WX_RELEASE=$WX_MAJOR_VERSION_NUMBER.$WX_MINOR_VERSION_NUMBER
 
 WX_MSW_VERSION=$WX_MAJOR_VERSION_NUMBER$WX_MINOR_VERSION_NUMBER$WX_RELEASE_NUMBER
 
 
 WX_VERSION=$WX_MAJOR_VERSION_NUMBER.$WX_MINOR_VERSION_NUMBER.$WX_RELEASE_NUMBER
 WX_RELEASE=$WX_MAJOR_VERSION_NUMBER.$WX_MINOR_VERSION_NUMBER
 
 WX_MSW_VERSION=$WX_MAJOR_VERSION_NUMBER$WX_MINOR_VERSION_NUMBER$WX_RELEASE_NUMBER
 

-WX_CURRENT=0
+WX_CURRENT=1

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


@@ -1891,6 +1892,10 @@ _ACEOF
 _ACEOF
 
     USE_OS2=1
 _ACEOF
 
     USE_OS2=1

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

     PROGRAM_EXT=".exe"
     DEFAULT_DEFAULT_wxUSE_PM=1
         CXX=gcc
     PROGRAM_EXT=".exe"
     DEFAULT_DEFAULT_wxUSE_PM=1
         CXX=gcc


@@ -1898,7 +1903,7 @@ _ACEOF
                         ac_executable_extensions=".exe"
     export ac_executable_extensions
             ac_save_IFS="$IFS"
                         ac_executable_extensions=".exe"
     export ac_executable_extensions
             ac_save_IFS="$IFS"

-    IFS="\\"
+    IFS='\\'

     ac_TEMP_PATH=
     for ac_dir in $PATH; do
       IFS=$ac_save_IFS
     ac_TEMP_PATH=
     for ac_dir in $PATH; do
       IFS=$ac_save_IFS


@@ -1983,6 +1988,7 @@ if test $DEBUG_CONFIGURE = 1; then
   DEFAULT_wxUSE_DMALLOC=no
   DEFAULT_wxUSE_APPLE_IEEE=no
 
   DEFAULT_wxUSE_DMALLOC=no
   DEFAULT_wxUSE_APPLE_IEEE=no
 

+  DEFAULT_wxUSE_EXCEPTIONS=no

   DEFAULT_wxUSE_LOG=yes
   DEFAULT_wxUSE_LOGWINDOW=no
   DEFAULT_wxUSE_LOGGUI=no
   DEFAULT_wxUSE_LOG=yes
   DEFAULT_wxUSE_LOGWINDOW=no
   DEFAULT_wxUSE_LOGGUI=no


@@ -2080,6 +2086,7 @@ if test $DEBUG_CONFIGURE = 1; then
   DEFAULT_wxUSE_FS_ZIP=no
   DEFAULT_wxUSE_BUSYINFO=no
   DEFAULT_wxUSE_ZIPSTREAM=no
   DEFAULT_wxUSE_FS_ZIP=no
   DEFAULT_wxUSE_BUSYINFO=no
   DEFAULT_wxUSE_ZIPSTREAM=no

+  DEFAULT_wxUSE_GZSTREAM=no

   DEFAULT_wxUSE_VALIDATORS=no
 
   DEFAULT_wxUSE_ACCEL=no
   DEFAULT_wxUSE_VALIDATORS=no
 
   DEFAULT_wxUSE_ACCEL=no


@@ -2161,6 +2168,7 @@ else
   DEFAULT_wxUSE_DMALLOC=no
   DEFAULT_wxUSE_APPLE_IEEE=yes
 
   DEFAULT_wxUSE_DMALLOC=no
   DEFAULT_wxUSE_APPLE_IEEE=yes
 

+  DEFAULT_wxUSE_EXCEPTIONS=yes

   DEFAULT_wxUSE_LOG=yes
   DEFAULT_wxUSE_LOGWINDOW=yes
   DEFAULT_wxUSE_LOGGUI=yes
   DEFAULT_wxUSE_LOG=yes
   DEFAULT_wxUSE_LOGWINDOW=yes
   DEFAULT_wxUSE_LOGGUI=yes


@@ -2257,6 +2265,7 @@ else
   DEFAULT_wxUSE_FS_ZIP=yes
   DEFAULT_wxUSE_BUSYINFO=yes
   DEFAULT_wxUSE_ZIPSTREAM=yes
   DEFAULT_wxUSE_FS_ZIP=yes
   DEFAULT_wxUSE_BUSYINFO=yes
   DEFAULT_wxUSE_ZIPSTREAM=yes

+  DEFAULT_wxUSE_GZSTREAM=yes

   DEFAULT_wxUSE_VALIDATORS=yes
 
   DEFAULT_wxUSE_ACCEL=yes
   DEFAULT_wxUSE_VALIDATORS=yes
 
   DEFAULT_wxUSE_ACCEL=yes


@@ -4195,161 +4204,38 @@ echo "${ECHO_T}no" >&6
 
 
          enablestring=
 
 
          enablestring=

-          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-cmdline" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-cmdline... $ECHO_C" >&6
-          no_cache=0
-          # Check whether --enable-cmdline or --disable-cmdline was given.
-if test "${enable_cmdline+set}" = set; then
-  enableval="$enable_cmdline"
-
-                          if test "$enableval" = yes; then
-                            ac_cv_use_cmdline='wxUSE_CMDLINE_PARSER=yes'
-                          else
-                            ac_cv_use_cmdline='wxUSE_CMDLINE_PARSER=no'
-                          fi
-
-else
-
-                          LINE=`grep "wxUSE_CMDLINE_PARSER" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
-                          ac_cv_use_cmdline='wxUSE_CMDLINE_PARSER='$DEFAULT_wxUSE_CMDLINE_PARSER
-
-fi;
-
-          eval "$ac_cv_use_cmdline"
-          if test "$no_cache" != 1; then
-            echo $ac_cv_use_cmdline >> ${wx_arg_cache_file}.tmp
-          fi
-
-          if test "$wxUSE_CMDLINE_PARSER" = yes; then
-            echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-          else
-            echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-          fi
-
-
-         enablestring=
-          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-datetime" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-datetime... $ECHO_C" >&6
-          no_cache=0
-          # Check whether --enable-datetime or --disable-datetime was given.
-if test "${enable_datetime+set}" = set; then
-  enableval="$enable_datetime"
-
-                          if test "$enableval" = yes; then
-                            ac_cv_use_datetime='wxUSE_DATETIME=yes'
-                          else
-                            ac_cv_use_datetime='wxUSE_DATETIME=no'
-                          fi
-
-else
-
-                          LINE=`grep "wxUSE_DATETIME" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
-                          ac_cv_use_datetime='wxUSE_DATETIME='$DEFAULT_wxUSE_DATETIME
-
-fi;
-
-          eval "$ac_cv_use_datetime"
-          if test "$no_cache" != 1; then
-            echo $ac_cv_use_datetime >> ${wx_arg_cache_file}.tmp
-          fi
-
-          if test "$wxUSE_DATETIME" = yes; then
-            echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-          else
-            echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-          fi
-
-
-         enablestring=
-          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-stopwatch" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-stopwatch... $ECHO_C" >&6
-          no_cache=0
-          # Check whether --enable-stopwatch or --disable-stopwatch was given.
-if test "${enable_stopwatch+set}" = set; then
-  enableval="$enable_stopwatch"
-
-                          if test "$enableval" = yes; then
-                            ac_cv_use_stopwatch='wxUSE_STOPWATCH=yes'
-                          else
-                            ac_cv_use_stopwatch='wxUSE_STOPWATCH=no'
-                          fi
-
-else
-
-                          LINE=`grep "wxUSE_STOPWATCH" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
-                          ac_cv_use_stopwatch='wxUSE_STOPWATCH='$DEFAULT_wxUSE_STOPWATCH
-
-fi;
-
-          eval "$ac_cv_use_stopwatch"
-          if test "$no_cache" != 1; then
-            echo $ac_cv_use_stopwatch >> ${wx_arg_cache_file}.tmp
-          fi
-
-          if test "$wxUSE_STOPWATCH" = yes; then
-            echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-          else
-            echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-          fi
-
-
-         enablestring=
-          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dialupman" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-dialupman... $ECHO_C" >&6
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-apple_ieee" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-apple_ieee... $ECHO_C" >&6

           no_cache=0
           no_cache=0

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

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

-                            ac_cv_use_dialupman='wxUSE_DIALUP_MANAGER=yes'
+                            ac_cv_use_apple_ieee='wxUSE_APPLE_IEEE=yes'

                           else
                           else

-                            ac_cv_use_dialupman='wxUSE_DIALUP_MANAGER=no'
+                            ac_cv_use_apple_ieee='wxUSE_APPLE_IEEE=no'

                           fi
 
 else
 
                           fi
 
 else
 

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

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

-                          ac_cv_use_dialupman='wxUSE_DIALUP_MANAGER='$DEFAULT_wxUSE_DIALUP_MANAGER
+                          ac_cv_use_apple_ieee='wxUSE_APPLE_IEEE='$DEFAULT_wxUSE_APPLE_IEEE

 
 fi;
 
 
 fi;
 

-          eval "$ac_cv_use_dialupman"
+          eval "$ac_cv_use_apple_ieee"

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

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

           fi
 
           fi
 

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

             echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
           else
             echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
           else


@@ -4359,38 +4245,38 @@ echo "${ECHO_T}no" >&6
 
 
          enablestring=
 
 
          enablestring=

-          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-apple_ieee" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-apple_ieee... $ECHO_C" >&6
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-catch_segvs" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-catch_segvs... $ECHO_C" >&6

           no_cache=0
           no_cache=0

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

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

-                            ac_cv_use_apple_ieee='wxUSE_APPLE_IEEE=yes'
+                            ac_cv_use_catch_segvs='wxUSE_ON_FATAL_EXCEPTION=yes'

                           else
                           else

-                            ac_cv_use_apple_ieee='wxUSE_APPLE_IEEE=no'
+                            ac_cv_use_catch_segvs='wxUSE_ON_FATAL_EXCEPTION=no'

                           fi
 
 else
 
                           fi
 
 else
 

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

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

-                          ac_cv_use_apple_ieee='wxUSE_APPLE_IEEE='$DEFAULT_wxUSE_APPLE_IEEE
+                          ac_cv_use_catch_segvs='wxUSE_ON_FATAL_EXCEPTION='$DEFAULT_wxUSE_ON_FATAL_EXCEPTION

 
 fi;
 
 
 fi;
 

-          eval "$ac_cv_use_apple_ieee"
+          eval "$ac_cv_use_catch_segvs"

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

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

           fi
 
           fi
 

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

             echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
           else
             echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
           else


@@ -4400,38 +4286,38 @@ echo "${ECHO_T}no" >&6
 
 
          enablestring=
 
 
          enablestring=

-          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-timer" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-timer... $ECHO_C" >&6
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-cmdline" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-cmdline... $ECHO_C" >&6

           no_cache=0
           no_cache=0

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

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

-                            ac_cv_use_timer='wxUSE_TIMER=yes'
+                            ac_cv_use_cmdline='wxUSE_CMDLINE_PARSER=yes'

                           else
                           else

-                            ac_cv_use_timer='wxUSE_TIMER=no'
+                            ac_cv_use_cmdline='wxUSE_CMDLINE_PARSER=no'

                           fi
 
 else
 
                           fi
 
 else
 

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

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

-                          ac_cv_use_timer='wxUSE_TIMER='$DEFAULT_wxUSE_TIMER
+                          ac_cv_use_cmdline='wxUSE_CMDLINE_PARSER='$DEFAULT_wxUSE_CMDLINE_PARSER

 
 fi;
 
 
 fi;
 

-          eval "$ac_cv_use_timer"
+          eval "$ac_cv_use_cmdline"

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

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

           fi
 
           fi
 

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

             echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
           else
             echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
           else


@@ -4441,38 +4327,38 @@ echo "${ECHO_T}no" >&6
 
 
          enablestring=
 
 
          enablestring=

-          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-wave" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-wave... $ECHO_C" >&6
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-datetime" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-datetime... $ECHO_C" >&6

           no_cache=0
           no_cache=0

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

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

-                            ac_cv_use_wave='wxUSE_WAVE=yes'
+                            ac_cv_use_datetime='wxUSE_DATETIME=yes'

                           else
                           else

-                            ac_cv_use_wave='wxUSE_WAVE=no'
+                            ac_cv_use_datetime='wxUSE_DATETIME=no'

                           fi
 
 else
 
                           fi
 
 else
 

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

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

-                          ac_cv_use_wave='wxUSE_WAVE='$DEFAULT_wxUSE_WAVE
+                          ac_cv_use_datetime='wxUSE_DATETIME='$DEFAULT_wxUSE_DATETIME

 
 fi;
 
 
 fi;
 

-          eval "$ac_cv_use_wave"
+          eval "$ac_cv_use_datetime"

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

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

           fi
 
           fi
 

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

             echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
           else
             echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
           else


@@ -4482,38 +4368,38 @@ echo "${ECHO_T}no" >&6
 
 
          enablestring=
 
 
          enablestring=

-          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-fraction" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-fraction... $ECHO_C" >&6
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-dialupman" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-dialupman... $ECHO_C" >&6

           no_cache=0
           no_cache=0

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

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

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

                           else
                           else

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

                           fi
 
 else
 
                           fi
 
 else
 

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

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

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

 
 fi;
 
 
 fi;
 

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

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

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

           fi
 
           fi
 

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

             echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
           else
             echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
           else


@@ -4605,38 +4491,38 @@ echo "${ECHO_T}no" >&6
 
 
          enablestring=
 
 
          enablestring=

-          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-longlong" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-longlong... $ECHO_C" >&6
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-exceptions" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-exceptions... $ECHO_C" >&6

           no_cache=0
           no_cache=0

-          # Check whether --enable-longlong or --disable-longlong was given.
-if test "${enable_longlong+set}" = set; then
-  enableval="$enable_longlong"
+          # Check whether --enable-exceptions or --disable-exceptions was given.
+if test "${enable_exceptions+set}" = set; then
+  enableval="$enable_exceptions"

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

-                            ac_cv_use_longlong='wxUSE_LONGLONG=yes'
+                            ac_cv_use_exceptions='wxUSE_EXCEPTIONS=yes'

                           else
                           else

-                            ac_cv_use_longlong='wxUSE_LONGLONG=no'
+                            ac_cv_use_exceptions='wxUSE_EXCEPTIONS=no'

                           fi
 
 else
 
                           fi
 
 else
 

-                          LINE=`grep "wxUSE_LONGLONG" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_EXCEPTIONS" ${wx_arg_cache_file}`

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

-                          ac_cv_use_longlong='wxUSE_LONGLONG='$DEFAULT_wxUSE_LONGLONG
+                          ac_cv_use_exceptions='wxUSE_EXCEPTIONS='$DEFAULT_wxUSE_EXCEPTIONS

 
 fi;
 
 
 fi;
 

-          eval "$ac_cv_use_longlong"
+          eval "$ac_cv_use_exceptions"

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

-            echo $ac_cv_use_longlong >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_exceptions >> ${wx_arg_cache_file}.tmp

           fi
 
           fi
 

-          if test "$wxUSE_LONGLONG" = yes; then
+          if test "$wxUSE_EXCEPTIONS" = yes; then

             echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
           else
             echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
           else


@@ -4646,38 +4532,38 @@ echo "${ECHO_T}no" >&6
 
 
          enablestring=
 
 
          enablestring=

-          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-geometry" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-geometry... $ECHO_C" >&6
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-ffile" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-ffile... $ECHO_C" >&6

           no_cache=0
           no_cache=0

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

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

-                            ac_cv_use_geometry='wxUSE_GEOMETRY=yes'
+                            ac_cv_use_ffile='wxUSE_FFILE=yes'

                           else
                           else

-                            ac_cv_use_geometry='wxUSE_GEOMETRY=no'
+                            ac_cv_use_ffile='wxUSE_FFILE=no'

                           fi
 
 else
 
                           fi
 
 else
 

-                          LINE=`grep "wxUSE_GEOMETRY" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_FFILE" ${wx_arg_cache_file}`

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

-                          ac_cv_use_geometry='wxUSE_GEOMETRY='$DEFAULT_wxUSE_GEOMETRY
+                          ac_cv_use_ffile='wxUSE_FFILE='$DEFAULT_wxUSE_FFILE

 
 fi;
 
 
 fi;
 

-          eval "$ac_cv_use_geometry"
+          eval "$ac_cv_use_ffile"

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

-            echo $ac_cv_use_geometry >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_ffile >> ${wx_arg_cache_file}.tmp

           fi
 
           fi
 

-          if test "$wxUSE_GEOMETRY" = yes; then
+          if test "$wxUSE_FFILE" = yes; then

             echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
           else
             echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
           else


@@ -4687,38 +4573,38 @@ echo "${ECHO_T}no" >&6
 
 
          enablestring=
 
 
          enablestring=

-          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-log" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-log... $ECHO_C" >&6
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-file" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-file... $ECHO_C" >&6

           no_cache=0
           no_cache=0

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

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

-                            ac_cv_use_log='wxUSE_LOG=yes'
+                            ac_cv_use_file='wxUSE_FILE=yes'

                           else
                           else

-                            ac_cv_use_log='wxUSE_LOG=no'
+                            ac_cv_use_file='wxUSE_FILE=no'

                           fi
 
 else
 
                           fi
 
 else
 

-                          LINE=`grep "wxUSE_LOG" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_FILE" ${wx_arg_cache_file}`

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

-                          ac_cv_use_log='wxUSE_LOG='$DEFAULT_wxUSE_LOG
+                          ac_cv_use_file='wxUSE_FILE='$DEFAULT_wxUSE_FILE

 
 fi;
 
 
 fi;
 

-          eval "$ac_cv_use_log"
+          eval "$ac_cv_use_file"

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

-            echo $ac_cv_use_log >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_file >> ${wx_arg_cache_file}.tmp

           fi
 
           fi
 

-          if test "$wxUSE_LOG" = yes; then
+          if test "$wxUSE_FILE" = yes; then

             echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
           else
             echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
           else


@@ -4728,38 +4614,38 @@ echo "${ECHO_T}no" >&6
 
 
          enablestring=
 
 
          enablestring=

-          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-streams" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-streams... $ECHO_C" >&6
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-filesystem" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-filesystem... $ECHO_C" >&6

           no_cache=0
           no_cache=0

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

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

-                            ac_cv_use_streams='wxUSE_STREAMS=yes'
+                            ac_cv_use_filesystem='wxUSE_FILESYSTEM=yes'

                           else
                           else

-                            ac_cv_use_streams='wxUSE_STREAMS=no'
+                            ac_cv_use_filesystem='wxUSE_FILESYSTEM=no'

                           fi
 
 else
 
                           fi
 
 else
 

-                          LINE=`grep "wxUSE_STREAMS" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_FILESYSTEM" ${wx_arg_cache_file}`

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

-                          ac_cv_use_streams='wxUSE_STREAMS='$DEFAULT_wxUSE_STREAMS
+                          ac_cv_use_filesystem='wxUSE_FILESYSTEM='$DEFAULT_wxUSE_FILESYSTEM

 
 fi;
 
 
 fi;
 

-          eval "$ac_cv_use_streams"
+          eval "$ac_cv_use_filesystem"

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

-            echo $ac_cv_use_streams >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_filesystem >> ${wx_arg_cache_file}.tmp

           fi
 
           fi
 

-          if test "$wxUSE_STREAMS" = yes; then
+          if test "$wxUSE_FILESYSTEM" = yes; then

             echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
           else
             echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
           else


@@ -4769,38 +4655,38 @@ echo "${ECHO_T}no" >&6
 
 
          enablestring=
 
 
          enablestring=

-          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-file" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-file... $ECHO_C" >&6
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-fontmap" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-fontmap... $ECHO_C" >&6

           no_cache=0
           no_cache=0

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

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

-                            ac_cv_use_file='wxUSE_FILE=yes'
+                            ac_cv_use_fontmap='wxUSE_FONTMAP=yes'

                           else
                           else

-                            ac_cv_use_file='wxUSE_FILE=no'
+                            ac_cv_use_fontmap='wxUSE_FONTMAP=no'

                           fi
 
 else
 
                           fi
 
 else
 

-                          LINE=`grep "wxUSE_FILE" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_FONTMAP" ${wx_arg_cache_file}`

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

-                          ac_cv_use_file='wxUSE_FILE='$DEFAULT_wxUSE_FILE
+                          ac_cv_use_fontmap='wxUSE_FONTMAP='$DEFAULT_wxUSE_FONTMAP

 
 fi;
 
 
 fi;
 

-          eval "$ac_cv_use_file"
+          eval "$ac_cv_use_fontmap"

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

-            echo $ac_cv_use_file >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_fontmap >> ${wx_arg_cache_file}.tmp

           fi
 
           fi
 

-          if test "$wxUSE_FILE" = yes; then
+          if test "$wxUSE_FONTMAP" = yes; then

             echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
           else
             echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
           else


@@ -4810,38 +4696,38 @@ echo "${ECHO_T}no" >&6
 
 
          enablestring=
 
 
          enablestring=

-          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-ffile" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-ffile... $ECHO_C" >&6
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-fs_inet" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-fs_inet... $ECHO_C" >&6

           no_cache=0
           no_cache=0

-          # Check whether --enable-ffile or --disable-ffile was given.
-if test "${enable_ffile+set}" = set; then
-  enableval="$enable_ffile"
+          # 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
 
                           if test "$enableval" = yes; then

-                            ac_cv_use_ffile='wxUSE_FFILE=yes'
+                            ac_cv_use_fs_inet='wxUSE_FS_INET=yes'

                           else
                           else

-                            ac_cv_use_ffile='wxUSE_FFILE=no'
+                            ac_cv_use_fs_inet='wxUSE_FS_INET=no'

                           fi
 
 else
 
                           fi
 
 else
 

-                          LINE=`grep "wxUSE_FFILE" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_FS_INET" ${wx_arg_cache_file}`

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

-                          ac_cv_use_ffile='wxUSE_FFILE='$DEFAULT_wxUSE_FFILE
+                          ac_cv_use_fs_inet='wxUSE_FS_INET='$DEFAULT_wxUSE_FS_INET

 
 fi;
 
 
 fi;
 

-          eval "$ac_cv_use_ffile"
+          eval "$ac_cv_use_fs_inet"

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

-            echo $ac_cv_use_ffile >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_fs_inet >> ${wx_arg_cache_file}.tmp

           fi
 
           fi
 

-          if test "$wxUSE_FFILE" = yes; then
+          if test "$wxUSE_FS_INET" = yes; then

             echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
           else
             echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
           else


@@ -4851,38 +4737,38 @@ echo "${ECHO_T}no" >&6
 
 
          enablestring=
 
 
          enablestring=

-          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-textbuf" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-textbuf... $ECHO_C" >&6
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-fs_zip" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-fs_zip... $ECHO_C" >&6

           no_cache=0
           no_cache=0

-          # Check whether --enable-textbuf or --disable-textbuf was given.
-if test "${enable_textbuf+set}" = set; then
-  enableval="$enable_textbuf"
+          # 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
 
                           if test "$enableval" = yes; then

-                            ac_cv_use_textbuf='wxUSE_TEXTBUFFER=yes'
+                            ac_cv_use_fs_zip='wxUSE_FS_ZIP=yes'

                           else
                           else

-                            ac_cv_use_textbuf='wxUSE_TEXTBUFFER=no'
+                            ac_cv_use_fs_zip='wxUSE_FS_ZIP=no'

                           fi
 
 else
 
                           fi
 
 else
 

-                          LINE=`grep "wxUSE_TEXTBUFFER" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_FS_ZIP" ${wx_arg_cache_file}`

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

-                          ac_cv_use_textbuf='wxUSE_TEXTBUFFER='$DEFAULT_wxUSE_TEXTBUFFER
+                          ac_cv_use_fs_zip='wxUSE_FS_ZIP='$DEFAULT_wxUSE_FS_ZIP

 
 fi;
 
 
 fi;
 

-          eval "$ac_cv_use_textbuf"
+          eval "$ac_cv_use_fs_zip"

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

-            echo $ac_cv_use_textbuf >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_fs_zip >> ${wx_arg_cache_file}.tmp

           fi
 
           fi
 

-          if test "$wxUSE_TEXTBUFFER" = yes; then
+          if test "$wxUSE_FS_ZIP" = yes; then

             echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
           else
             echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
           else


@@ -4892,38 +4778,38 @@ echo "${ECHO_T}no" >&6
 
 
          enablestring=
 
 
          enablestring=

-          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-textfile" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-textfile... $ECHO_C" >&6
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-geometry" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-geometry... $ECHO_C" >&6

           no_cache=0
           no_cache=0

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

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

-                            ac_cv_use_textfile='wxUSE_TEXTFILE=yes'
+                            ac_cv_use_geometry='wxUSE_GEOMETRY=yes'

                           else
                           else

-                            ac_cv_use_textfile='wxUSE_TEXTFILE=no'
+                            ac_cv_use_geometry='wxUSE_GEOMETRY=no'

                           fi
 
 else
 
                           fi
 
 else
 

-                          LINE=`grep "wxUSE_TEXTFILE" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_GEOMETRY" ${wx_arg_cache_file}`

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

-                          ac_cv_use_textfile='wxUSE_TEXTFILE='$DEFAULT_wxUSE_TEXTFILE
+                          ac_cv_use_geometry='wxUSE_GEOMETRY='$DEFAULT_wxUSE_GEOMETRY

 
 fi;
 
 
 fi;
 

-          eval "$ac_cv_use_textfile"
+          eval "$ac_cv_use_geometry"

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

-            echo $ac_cv_use_textfile >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_geometry >> ${wx_arg_cache_file}.tmp

           fi
 
           fi
 

-          if test "$wxUSE_TEXTFILE" = yes; then
+          if test "$wxUSE_GEOMETRY" = yes; then

             echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
           else
             echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
           else


@@ -4933,38 +4819,38 @@ echo "${ECHO_T}no" >&6
 
 
          enablestring=
 
 
          enablestring=

-          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-fontmap" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-fontmap... $ECHO_C" >&6
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-log" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-log... $ECHO_C" >&6

           no_cache=0
           no_cache=0

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

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

-                            ac_cv_use_fontmap='wxUSE_FONTMAP=yes'
+                            ac_cv_use_log='wxUSE_LOG=yes'

                           else
                           else

-                            ac_cv_use_fontmap='wxUSE_FONTMAP=no'
+                            ac_cv_use_log='wxUSE_LOG=no'

                           fi
 
 else
 
                           fi
 
 else
 

-                          LINE=`grep "wxUSE_FONTMAP" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_LOG" ${wx_arg_cache_file}`

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

-                          ac_cv_use_fontmap='wxUSE_FONTMAP='$DEFAULT_wxUSE_FONTMAP
+                          ac_cv_use_log='wxUSE_LOG='$DEFAULT_wxUSE_LOG

 
 fi;
 
 
 fi;
 

-          eval "$ac_cv_use_fontmap"
+          eval "$ac_cv_use_log"

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

-            echo $ac_cv_use_fontmap >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_log >> ${wx_arg_cache_file}.tmp

           fi
 
           fi
 

-          if test "$wxUSE_FONTMAP" = yes; then
+          if test "$wxUSE_LOG" = yes; then

             echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
           else
             echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
           else


@@ -4974,38 +4860,79 @@ echo "${ECHO_T}no" >&6
 
 
          enablestring=
 
 
          enablestring=

-          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-unicode" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-unicode... $ECHO_C" >&6
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-longlong" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-longlong... $ECHO_C" >&6

           no_cache=0
           no_cache=0

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

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

-                            ac_cv_use_unicode='wxUSE_UNICODE=yes'
+                            ac_cv_use_longlong='wxUSE_LONGLONG=yes'

                           else
                           else

-                            ac_cv_use_unicode='wxUSE_UNICODE=no'
+                            ac_cv_use_longlong='wxUSE_LONGLONG=no'

                           fi
 
 else
 
                           fi
 
 else
 

-                          LINE=`grep "wxUSE_UNICODE" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_LONGLONG" ${wx_arg_cache_file}`

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

-                          ac_cv_use_unicode='wxUSE_UNICODE='$DEFAULT_wxUSE_UNICODE
+                          ac_cv_use_longlong='wxUSE_LONGLONG='$DEFAULT_wxUSE_LONGLONG

 
 fi;
 
 
 fi;
 

-          eval "$ac_cv_use_unicode"
+          eval "$ac_cv_use_longlong"

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

-            echo $ac_cv_use_unicode >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_longlong >> ${wx_arg_cache_file}.tmp

           fi
 
           fi
 

-          if test "$wxUSE_UNICODE" = yes; then
+          if test "$wxUSE_LONGLONG" = yes; then
+            echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+          else
+            echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+          fi
+
+
+         enablestring=
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-mimetype" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-mimetype... $ECHO_C" >&6
+          no_cache=0
+          # Check whether --enable-mimetype or --disable-mimetype was given.
+if test "${enable_mimetype+set}" = set; then
+  enableval="$enable_mimetype"
+
+                          if test "$enableval" = yes; then
+                            ac_cv_use_mimetype='wxUSE_MIMETYPE=yes'
+                          else
+                            ac_cv_use_mimetype='wxUSE_MIMETYPE=no'
+                          fi
+
+else
+
+                          LINE=`grep "wxUSE_MIMETYPE" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_mimetype='wxUSE_MIMETYPE='$DEFAULT_wxUSE_MIMETYPE
+
+fi;
+
+          eval "$ac_cv_use_mimetype"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_mimetype >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_MIMETYPE" = yes; then

             echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
           else
             echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
           else


@@ -5056,38 +4983,79 @@ echo "${ECHO_T}no" >&6
 
 
          enablestring=
 
 
          enablestring=

-          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-wxprintfv" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-wxprintfv... $ECHO_C" >&6
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-snglinst" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-snglinst... $ECHO_C" >&6

           no_cache=0
           no_cache=0

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

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

-                            ac_cv_use_wxprintfv='wxUSE_EXPERIMENTAL_PRINTF=yes'
+                            ac_cv_use_snglinst='wxUSE_SNGLINST_CHECKER=yes'

                           else
                           else

-                            ac_cv_use_wxprintfv='wxUSE_EXPERIMENTAL_PRINTF=no'
+                            ac_cv_use_snglinst='wxUSE_SNGLINST_CHECKER=no'

                           fi
 
 else
 
                           fi
 
 else
 

-                          LINE=`grep "wxUSE_EXPERIMENTAL_PRINTF" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_SNGLINST_CHECKER" ${wx_arg_cache_file}`

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

-                          ac_cv_use_wxprintfv='wxUSE_EXPERIMENTAL_PRINTF='$DEFAULT_wxUSE_EXPERIMENTAL_PRINTF
+                          ac_cv_use_snglinst='wxUSE_SNGLINST_CHECKER='$DEFAULT_wxUSE_SNGLINST_CHECKER

 
 fi;
 
 
 fi;
 

-          eval "$ac_cv_use_wxprintfv"
+          eval "$ac_cv_use_snglinst"

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

-            echo $ac_cv_use_wxprintfv >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_snglinst >> ${wx_arg_cache_file}.tmp

           fi
 
           fi
 

-          if test "$wxUSE_EXPERIMENTAL_PRINTF" = yes; then
+          if test "$wxUSE_SNGLINST_CHECKER" = yes; then
+            echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+          else
+            echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+          fi
+
+
+         enablestring=
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-streams" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-streams... $ECHO_C" >&6
+          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 "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
           else
             echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
           else


@@ -5138,38 +5106,38 @@ echo "${ECHO_T}no" >&6
 
 
          enablestring=
 
 
          enablestring=

-          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-filesystem" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-filesystem... $ECHO_C" >&6
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-stopwatch" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-stopwatch... $ECHO_C" >&6

           no_cache=0
           no_cache=0

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

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

-                            ac_cv_use_filesystem='wxUSE_FILESYSTEM=yes'
+                            ac_cv_use_stopwatch='wxUSE_STOPWATCH=yes'

                           else
                           else

-                            ac_cv_use_filesystem='wxUSE_FILESYSTEM=no'
+                            ac_cv_use_stopwatch='wxUSE_STOPWATCH=no'

                           fi
 
 else
 
                           fi
 
 else
 

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

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

-                          ac_cv_use_filesystem='wxUSE_FILESYSTEM='$DEFAULT_wxUSE_FILESYSTEM
+                          ac_cv_use_stopwatch='wxUSE_STOPWATCH='$DEFAULT_wxUSE_STOPWATCH

 
 fi;
 
 
 fi;
 

-          eval "$ac_cv_use_filesystem"
+          eval "$ac_cv_use_stopwatch"

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

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

           fi
 
           fi
 

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

             echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
           else
             echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
           else


@@ -5179,38 +5147,38 @@ echo "${ECHO_T}no" >&6
 
 
          enablestring=
 
 
          enablestring=

-          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-fs_inet" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-fs_inet... $ECHO_C" >&6
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-system_options" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-system_options... $ECHO_C" >&6

           no_cache=0
           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"
+          # Check whether --enable-system_options or --disable-system_options was given.
+if test "${enable_system_options+set}" = set; then
+  enableval="$enable_system_options"

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

-                            ac_cv_use_fs_inet='wxUSE_FS_INET=yes'
+                            ac_cv_use_system_options='wxUSE_SYSTEM_OPTIONS=yes'

                           else
                           else

-                            ac_cv_use_fs_inet='wxUSE_FS_INET=no'
+                            ac_cv_use_system_options='wxUSE_SYSTEM_OPTIONS=no'

                           fi
 
 else
 
                           fi
 
 else
 

-                          LINE=`grep "wxUSE_FS_INET" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_SYSTEM_OPTIONS" ${wx_arg_cache_file}`

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

-                          ac_cv_use_fs_inet='wxUSE_FS_INET='$DEFAULT_wxUSE_FS_INET
+                          ac_cv_use_system_options='wxUSE_SYSTEM_OPTIONS='$DEFAULT_wxUSE_SYSTEM_OPTIONS

 
 fi;
 
 
 fi;
 

-          eval "$ac_cv_use_fs_inet"
+          eval "$ac_cv_use_system_options"

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

-            echo $ac_cv_use_fs_inet >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_system_options >> ${wx_arg_cache_file}.tmp

           fi
 
           fi
 

-          if test "$wxUSE_FS_INET" = yes; then
+          if test "$wxUSE_SYSTEM_OPTIONS" = yes; then

             echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
           else
             echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
           else


@@ -5220,38 +5188,243 @@ echo "${ECHO_T}no" >&6
 
 
          enablestring=
 
 
          enablestring=

-          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-fs_zip" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-fs_zip... $ECHO_C" >&6
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-textbuf" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-textbuf... $ECHO_C" >&6

           no_cache=0
           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"
+          # Check whether --enable-textbuf or --disable-textbuf was given.
+if test "${enable_textbuf+set}" = set; then
+  enableval="$enable_textbuf"

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

-                            ac_cv_use_fs_zip='wxUSE_FS_ZIP=yes'
+                            ac_cv_use_textbuf='wxUSE_TEXTBUFFER=yes'

                           else
                           else

-                            ac_cv_use_fs_zip='wxUSE_FS_ZIP=no'
+                            ac_cv_use_textbuf='wxUSE_TEXTBUFFER=no'

                           fi
 
 else
 
                           fi
 
 else
 

-                          LINE=`grep "wxUSE_FS_ZIP" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_TEXTBUFFER" ${wx_arg_cache_file}`

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

-                          ac_cv_use_fs_zip='wxUSE_FS_ZIP='$DEFAULT_wxUSE_FS_ZIP
+                          ac_cv_use_textbuf='wxUSE_TEXTBUFFER='$DEFAULT_wxUSE_TEXTBUFFER

 
 fi;
 
 
 fi;
 

-          eval "$ac_cv_use_fs_zip"
+          eval "$ac_cv_use_textbuf"

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

-            echo $ac_cv_use_fs_zip >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_textbuf >> ${wx_arg_cache_file}.tmp

           fi
 
           fi
 

-          if test "$wxUSE_FS_ZIP" = yes; then
+          if test "$wxUSE_TEXTBUFFER" = yes; then
+            echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+          else
+            echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+          fi
+
+
+         enablestring=
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-textfile" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-textfile... $ECHO_C" >&6
+          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 "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+          else
+            echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+          fi
+
+
+         enablestring=
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-timer" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-timer... $ECHO_C" >&6
+          no_cache=0
+          # Check whether --enable-timer or --disable-timer was given.
+if test "${enable_timer+set}" = set; then
+  enableval="$enable_timer"
+
+                          if test "$enableval" = yes; then
+                            ac_cv_use_timer='wxUSE_TIMER=yes'
+                          else
+                            ac_cv_use_timer='wxUSE_TIMER=no'
+                          fi
+
+else
+
+                          LINE=`grep "wxUSE_TIMER" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_timer='wxUSE_TIMER='$DEFAULT_wxUSE_TIMER
+
+fi;
+
+          eval "$ac_cv_use_timer"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_timer >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_TIMER" = yes; then
+            echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+          else
+            echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+          fi
+
+
+         enablestring=
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-unicode" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-unicode... $ECHO_C" >&6
+          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 "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+          else
+            echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+          fi
+
+
+         enablestring=
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-wave" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-wave... $ECHO_C" >&6
+          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 "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+          else
+            echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+          fi
+
+
+         enablestring=
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-wxprintfv" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-wxprintfv... $ECHO_C" >&6
+          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 "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
           else
             echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
           else


@@ -5301,164 +5474,39 @@ echo "${ECHO_T}no" >&6
           fi
 
 
           fi
 
 

-
-         enablestring=
-          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-catch_segvs" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-catch_segvs... $ECHO_C" >&6
-          no_cache=0
-          # Check whether --enable-catch_segvs or --disable-catch_segvs was given.
-if test "${enable_catch_segvs+set}" = set; then
-  enableval="$enable_catch_segvs"
-
-                          if test "$enableval" = yes; then
-                            ac_cv_use_catch_segvs='wxUSE_ON_FATAL_EXCEPTION=yes'
-                          else
-                            ac_cv_use_catch_segvs='wxUSE_ON_FATAL_EXCEPTION=no'
-                          fi
-
-else
-
-                          LINE=`grep "wxUSE_ON_FATAL_EXCEPTION" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
-                          ac_cv_use_catch_segvs='wxUSE_ON_FATAL_EXCEPTION='$DEFAULT_wxUSE_ON_FATAL_EXCEPTION
-
-fi;
-
-          eval "$ac_cv_use_catch_segvs"
-          if test "$no_cache" != 1; then
-            echo $ac_cv_use_catch_segvs >> ${wx_arg_cache_file}.tmp
-          fi
-
-          if test "$wxUSE_ON_FATAL_EXCEPTION" = yes; then
-            echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-          else
-            echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-          fi
-
-
-         enablestring=
-          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-snglinst" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-snglinst... $ECHO_C" >&6
-          no_cache=0
-          # Check whether --enable-snglinst or --disable-snglinst was given.
-if test "${enable_snglinst+set}" = set; then
-  enableval="$enable_snglinst"
-
-                          if test "$enableval" = yes; then
-                            ac_cv_use_snglinst='wxUSE_SNGLINST_CHECKER=yes'
-                          else
-                            ac_cv_use_snglinst='wxUSE_SNGLINST_CHECKER=no'
-                          fi
-
-else
-
-                          LINE=`grep "wxUSE_SNGLINST_CHECKER" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
-                          ac_cv_use_snglinst='wxUSE_SNGLINST_CHECKER='$DEFAULT_wxUSE_SNGLINST_CHECKER
-
-fi;
-
-          eval "$ac_cv_use_snglinst"
-          if test "$no_cache" != 1; then
-            echo $ac_cv_use_snglinst >> ${wx_arg_cache_file}.tmp
-          fi
-
-          if test "$wxUSE_SNGLINST_CHECKER" = yes; then
-            echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-          else
-            echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-          fi
-
-
-
-         enablestring=
-          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-mimetype" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-mimetype... $ECHO_C" >&6
-          no_cache=0
-          # Check whether --enable-mimetype or --disable-mimetype was given.
-if test "${enable_mimetype+set}" = set; then
-  enableval="$enable_mimetype"
-
-                          if test "$enableval" = yes; then
-                            ac_cv_use_mimetype='wxUSE_MIMETYPE=yes'
-                          else
-                            ac_cv_use_mimetype='wxUSE_MIMETYPE=no'
-                          fi
-
-else
-
-                          LINE=`grep "wxUSE_MIMETYPE" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
-                          ac_cv_use_mimetype='wxUSE_MIMETYPE='$DEFAULT_wxUSE_MIMETYPE
-
-fi;
-
-          eval "$ac_cv_use_mimetype"
-          if test "$no_cache" != 1; then
-            echo $ac_cv_use_mimetype >> ${wx_arg_cache_file}.tmp
-          fi
-
-          if test "$wxUSE_MIMETYPE" = yes; then
-            echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-          else
-            echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-          fi
-
-

          enablestring=
          enablestring=

-          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-system_options" >&5
-echo $ECHO_N "checking for --${enablestring:-enable}-system_options... $ECHO_C" >&6
+          echo "$as_me:$LINENO: checking for --${enablestring:-enable}-gzstream" >&5
+echo $ECHO_N "checking for --${enablestring:-enable}-gzstream... $ECHO_C" >&6

           no_cache=0
           no_cache=0

-          # Check whether --enable-system_options or --disable-system_options was given.
-if test "${enable_system_options+set}" = set; then
-  enableval="$enable_system_options"
+          # Check whether --enable-gzstream or --disable-gzstream was given.
+if test "${enable_gzstream+set}" = set; then
+  enableval="$enable_gzstream"

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

-                            ac_cv_use_system_options='wxUSE_SYSTEM_OPTIONS=yes'
+                            ac_cv_use_gzstream='wxUSE_GZSTREAM=yes'

                           else
                           else

-                            ac_cv_use_system_options='wxUSE_SYSTEM_OPTIONS=no'
+                            ac_cv_use_gzstream='wxUSE_GZSTREAM=no'

                           fi
 
 else
 
                           fi
 
 else
 

-                          LINE=`grep "wxUSE_SYSTEM_OPTIONS" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_GZSTREAM" ${wx_arg_cache_file}`

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

-                          ac_cv_use_system_options='wxUSE_SYSTEM_OPTIONS='$DEFAULT_wxUSE_SYSTEM_OPTIONS
+                          ac_cv_use_gzstream='wxUSE_GZSTREAM='$DEFAULT_wxUSE_GZSTREAM

 
 fi;
 
 
 fi;
 

-          eval "$ac_cv_use_system_options"
+          eval "$ac_cv_use_gzstream"

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

-            echo $ac_cv_use_system_options >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_gzstream >> ${wx_arg_cache_file}.tmp

           fi
 
           fi
 

-          if test "$wxUSE_SYSTEM_OPTIONS" = yes; then
+          if test "$wxUSE_GZSTREAM" = yes; then

             echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
           else
             echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
           else


@@ -21036,12 +21084,12 @@ echo "${ECHO_T}$MGL_ROOT" >&6
 
         echo "$as_me:$LINENO: checking for libmgl location" >&5
 echo $ECHO_N "checking for libmgl location... $ECHO_C" >&6
 
         echo "$as_me:$LINENO: checking for libmgl location" >&5
 echo $ECHO_N "checking for libmgl location... $ECHO_C" >&6

-                        case "${host}" in
+                                case "${host}" in

             *-*-linux* )
             *-*-linux* )

-              if test "x$wxUSE_SHARED" = xyes ; then
-                  mgl_os_candidates="linux/gcc/glibc.so linux/gcc/glibc"
+                                          if test "x$wxUSE_SHARED" = xyes ; then
+                  mgl_os_candidates="linux/gcc/x86/so linux/gcc/x86/a linux/gcc/glibc.so linux/gcc/glibc"

               else
               else

-                  mgl_os_candidates="linux/gcc/glibc linux/gcc/glibc.so"
+                  mgl_os_candidates="linux/gcc/x86/a linux/gcc/x86/so linux/gcc/glibc linux/gcc/glibc.so"

               fi
               ;;
             *-pc-msdosdjgpp )
               fi
               ;;
             *-pc-msdosdjgpp )


@@ -24105,7 +24153,7 @@ echo $ECHO_N "checking if we need -lXp and/or -lSM -lICE... $ECHO_C" >&6
         libs_found=0
         for libp in "" " -lXp"; do
             if test "$libs_found" = "0"; then
         libs_found=0
         for libp in "" " -lXp"; do
             if test "$libs_found" = "0"; then

-                for libsm_ice in " -lSM -lICE"; do
+                for libsm_ice in "" " -lSM -lICE"; do

                     if test "$libs_found" = "0"; then
                         save_LIBS="$LIBS"
                         LIBS="$GUI_TK_LIBRARY -lXm${xpm_link} ${libp} -lXmu -lXext -lXt${libsm_ice} -lX11"
                     if test "$libs_found" = "0"; then
                         save_LIBS="$LIBS"
                         LIBS="$GUI_TK_LIBRARY -lXm${xpm_link} ${libp} -lXmu -lXext -lXt${libsm_ice} -lX11"


@@ -24312,7 +24360,22 @@ rm -f conftest.$ac_objext conftest.$ac_ext
     fi
 
     if test "$wxUSE_MAC" = 1; then
     fi
 
     if test "$wxUSE_MAC" = 1; then

-        CPPFLAGS="$CPPFLAGS -fpascal-strings -I\${top_srcdir}/src/mac/morefilex -I/Developer/Headers/FlatCarbon"
+        echo "$as_me:$LINENO: checking for compiler syntax to enable Pascal strings" >&5
+echo $ECHO_N "checking for compiler syntax to enable Pascal strings... $ECHO_C" >&6
+        if test "$GCC" = yes; then
+            echo "$as_me:$LINENO: result: gcc" >&5
+echo "${ECHO_T}gcc" >&6
+            CPPFLAGS_PASCAL="-fpascal-strings"
+        elif test "`echo $CXX | sed -e 's@.*/@@'`" = "xlC"; then
+            echo "$as_me:$LINENO: result: xlc" >&5
+echo "${ECHO_T}xlc" >&6
+            CPPFLAGS_PASCAL="-qmacpstr"
+        else
+            echo "$as_me:$LINENO: result: none" >&5
+echo "${ECHO_T}none" >&6
+        fi
+
+        CPPFLAGS="$CPPFLAGS $CPPFLAGS_PASCAL -I\${top_srcdir}/src/mac/morefilex -I/Developer/Headers/FlatCarbon"

 
         TOOLKIT_VPATH="\${top_srcdir}/src/mac${PATH_IFS}\${top_srcdir}/src/mac/morefilex"
         TOOLKIT=MAC
 
         TOOLKIT_VPATH="\${top_srcdir}/src/mac${PATH_IFS}\${top_srcdir}/src/mac/morefilex"
         TOOLKIT=MAC


@@ -24550,13 +24613,13 @@ fi
 
 
         if test "x$found_sql_h" = "x1" ; then
 
 
         if test "x$found_sql_h" = "x1" ; then

-            echo "$as_me:$LINENO: checking for iodbc in -lSQLAllocEnv" >&5
-echo $ECHO_N "checking for iodbc in -lSQLAllocEnv... $ECHO_C" >&6
-if test "${ac_cv_lib_SQLAllocEnv_iodbc+set}" = set; then
+            echo "$as_me:$LINENO: checking for SQLAllocEnv in -liodbc" >&5
+echo $ECHO_N "checking for SQLAllocEnv in -liodbc... $ECHO_C" >&6
+if test "${ac_cv_lib_iodbc_SQLAllocEnv+set}" = set; then

   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS

-LIBS="-lSQLAllocEnv  $LIBS"
+LIBS="-liodbc  $LIBS"

 cat >conftest.$ac_ext <<_ACEOF
 #line $LINENO "configure"
 /* confdefs.h.  */
 cat >conftest.$ac_ext <<_ACEOF
 #line $LINENO "configure"
 /* confdefs.h.  */


@@ -24571,11 +24634,11 @@ extern "C"
 #endif
 /* We use char because int might match the return type of a gcc2
    builtin and then its argument prototype would still apply.  */
 #endif
 /* We use char because int might match the return type of a gcc2
    builtin and then its argument prototype would still apply.  */

-char iodbc ();
+char SQLAllocEnv ();

 int
 main ()
 {
 int
 main ()
 {

-iodbc ();
+SQLAllocEnv ();

   ;
   return 0;
 }
   ;
   return 0;
 }


@@ -24592,29 +24655,29 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then

-  ac_cv_lib_SQLAllocEnv_iodbc=yes
+  ac_cv_lib_iodbc_SQLAllocEnv=yes

 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-ac_cv_lib_SQLAllocEnv_iodbc=no
+ac_cv_lib_iodbc_SQLAllocEnv=no

 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:$LINENO: result: $ac_cv_lib_SQLAllocEnv_iodbc" >&5
-echo "${ECHO_T}$ac_cv_lib_SQLAllocEnv_iodbc" >&6
-if test $ac_cv_lib_SQLAllocEnv_iodbc = yes; then
+echo "$as_me:$LINENO: result: $ac_cv_lib_iodbc_SQLAllocEnv" >&5
+echo "${ECHO_T}$ac_cv_lib_iodbc_SQLAllocEnv" >&6
+if test $ac_cv_lib_iodbc_SQLAllocEnv = yes; then

   ODBC_LINK=" -liodbc"
 else
 
   ODBC_LINK=" -liodbc"
 else
 

-                echo "$as_me:$LINENO: checking for unixodbc in -lSQLAllocEnv" >&5
-echo $ECHO_N "checking for unixodbc in -lSQLAllocEnv... $ECHO_C" >&6
-if test "${ac_cv_lib_SQLAllocEnv_unixodbc+set}" = set; then
+                echo "$as_me:$LINENO: checking for SQLAllocEnv in -lunixodbc" >&5
+echo $ECHO_N "checking for SQLAllocEnv in -lunixodbc... $ECHO_C" >&6
+if test "${ac_cv_lib_unixodbc_SQLAllocEnv+set}" = set; then

   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS

-LIBS="-lSQLAllocEnv  $LIBS"
+LIBS="-lunixodbc  $LIBS"

 cat >conftest.$ac_ext <<_ACEOF
 #line $LINENO "configure"
 /* confdefs.h.  */
 cat >conftest.$ac_ext <<_ACEOF
 #line $LINENO "configure"
 /* confdefs.h.  */


@@ -24629,11 +24692,11 @@ extern "C"
 #endif
 /* We use char because int might match the return type of a gcc2
    builtin and then its argument prototype would still apply.  */
 #endif
 /* We use char because int might match the return type of a gcc2
    builtin and then its argument prototype would still apply.  */

-char unixodbc ();
+char SQLAllocEnv ();

 int
 main ()
 {
 int
 main ()
 {

-unixodbc ();
+SQLAllocEnv ();

   ;
   return 0;
 }
   ;
   return 0;
 }


@@ -24650,29 +24713,29 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then

-  ac_cv_lib_SQLAllocEnv_unixodbc=yes
+  ac_cv_lib_unixodbc_SQLAllocEnv=yes

 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-ac_cv_lib_SQLAllocEnv_unixodbc=no
+ac_cv_lib_unixodbc_SQLAllocEnv=no

 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:$LINENO: result: $ac_cv_lib_SQLAllocEnv_unixodbc" >&5
-echo "${ECHO_T}$ac_cv_lib_SQLAllocEnv_unixodbc" >&6
-if test $ac_cv_lib_SQLAllocEnv_unixodbc = yes; then
+echo "$as_me:$LINENO: result: $ac_cv_lib_unixodbc_SQLAllocEnv" >&5
+echo "${ECHO_T}$ac_cv_lib_unixodbc_SQLAllocEnv" >&6
+if test $ac_cv_lib_unixodbc_SQLAllocEnv = yes; then

   ODBC_LINK=" -lunixodbc"
 else
 
   ODBC_LINK=" -lunixodbc"
 else
 

-                    echo "$as_me:$LINENO: checking for odbc in -lSQLAllocEnv" >&5
-echo $ECHO_N "checking for odbc in -lSQLAllocEnv... $ECHO_C" >&6
-if test "${ac_cv_lib_SQLAllocEnv_odbc+set}" = set; then
+                    echo "$as_me:$LINENO: checking for SQLAllocEnv in -lodbc" >&5
+echo $ECHO_N "checking for SQLAllocEnv in -lodbc... $ECHO_C" >&6
+if test "${ac_cv_lib_odbc_SQLAllocEnv+set}" = set; then

   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS

-LIBS="-lSQLAllocEnv  $LIBS"
+LIBS="-lodbc  $LIBS"

 cat >conftest.$ac_ext <<_ACEOF
 #line $LINENO "configure"
 /* confdefs.h.  */
 cat >conftest.$ac_ext <<_ACEOF
 #line $LINENO "configure"
 /* confdefs.h.  */


@@ -24687,11 +24750,11 @@ extern "C"
 #endif
 /* We use char because int might match the return type of a gcc2
    builtin and then its argument prototype would still apply.  */
 #endif
 /* We use char because int might match the return type of a gcc2
    builtin and then its argument prototype would still apply.  */

-char odbc ();
+char SQLAllocEnv ();

 int
 main ()
 {
 int
 main ()
 {

-odbc ();
+SQLAllocEnv ();

   ;
   return 0;
 }
   ;
   return 0;
 }


@@ -24708,19 +24771,19 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then

-  ac_cv_lib_SQLAllocEnv_odbc=yes
+  ac_cv_lib_odbc_SQLAllocEnv=yes

 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 

-ac_cv_lib_SQLAllocEnv_odbc=no
+ac_cv_lib_odbc_SQLAllocEnv=no

 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi

-echo "$as_me:$LINENO: result: $ac_cv_lib_SQLAllocEnv_odbc" >&5
-echo "${ECHO_T}$ac_cv_lib_SQLAllocEnv_odbc" >&6
-if test $ac_cv_lib_SQLAllocEnv_odbc = yes; then
+echo "$as_me:$LINENO: result: $ac_cv_lib_odbc_SQLAllocEnv" >&5
+echo "${ECHO_T}$ac_cv_lib_odbc_SQLAllocEnv" >&6
+if test $ac_cv_lib_odbc_SQLAllocEnv = yes; then

   ODBC_LINK=" -lodbc"
 fi
 
   ODBC_LINK=" -lodbc"
 fi
 


@@ -29843,66 +29906,6 @@ echo "$as_me: WARNING: wxThread::Kill() will not work properly" >&2;}
 fi
 
 
 fi
 
 

-      echo "$as_me:$LINENO: checking for pthread_cleanup_push/pop" >&5
-echo $ECHO_N "checking for pthread_cleanup_push/pop... $ECHO_C" >&6
-if test "${wx_cv_func_pthread_cleanup_push+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-        cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <pthread.h>
-int
-main ()
-{
-
-                        pthread_cleanup_push(NULL, NULL);
-                        pthread_cleanup_pop(0);
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
-                        wx_cv_func_pthread_cleanup_push=yes
-
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-                        wx_cv_func_pthread_cleanup_push=no
-
-fi
-rm -f conftest.$ac_objext conftest.$ac_ext
-
-fi
-echo "$as_me:$LINENO: result: $wx_cv_func_pthread_cleanup_push" >&5
-echo "${ECHO_T}$wx_cv_func_pthread_cleanup_push" >&6
-
-      if test "$wx_cv_func_pthread_cleanup_push" = "yes"; then
-          cat >>confdefs.h <<\_ACEOF
-#define HAVE_THREAD_CLEANUP_FUNCTIONS 1
-_ACEOF
-
-      fi

 
 
       echo "$as_me:$LINENO: checking for pthread_mutexattr_t" >&5
 
 
       echo "$as_me:$LINENO: checking for pthread_mutexattr_t" >&5


@@ -30362,6 +30365,13 @@ _ACEOF
 
 fi
 
 
 fi
 

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

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


@@ -33089,6 +33099,13 @@ _ACEOF
 fi
 
 
 fi
 
 

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

 
 if test "$wxUSE_DRAGIMAGE" = "yes"; then
     cat >>confdefs.h <<\_ACEOF
 
 if test "$wxUSE_DRAGIMAGE" = "yes"; then
     cat >>confdefs.h <<\_ACEOF


@@ -33098,12 +33115,21 @@ _ACEOF
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dragimag"
 fi
 
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dragimag"
 fi
 

-if test "$wxUSE_ACCESSIBILITY" = "yes"; then
+if test "$wxUSE_EXCEPTIONS" = "yes"; then

     cat >>confdefs.h <<\_ACEOF
     cat >>confdefs.h <<\_ACEOF

-#define wxUSE_ACCESSIBILITY 1
+#define wxUSE_EXCEPTIONS 1

 _ACEOF
 
 _ACEOF
 

-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS access"
+fi
+
+USE_HTML=0
+if test "$wxUSE_HTML" = "yes"; then
+    cat >>confdefs.h <<\_ACEOF
+#define wxUSE_HTML 1
+_ACEOF
+
+    USE_HTML=1
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS html html/about html/help html/helpview html/printing html/test html/virtual html/widget html/zip htlbox"

 fi
 
 if test "$wxUSE_MENUS" = "yes"; then
 fi
 
 if test "$wxUSE_MENUS" = "yes"; then


@@ -33128,18 +33154,6 @@ _ACEOF
 
 fi
 
 
 fi
 

-if test "$wxUSE_SYSTEM_OPTIONS" = "yes"; then
-    cat >>confdefs.h <<\_ACEOF
-#define wxUSE_SYSTEM_OPTIONS 1
-_ACEOF
-
-if test "$TOOLKIT" = "MSW" -o "$TOOLKIT" = "GTK" -o "$TOOLKIT" = "X11" -o \
-        "$TOOLKIT" = "MOTIF"; then
-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS taskbar"
-fi
-
-fi
-

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


@@ -33148,16 +33162,18 @@ _ACEOF
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS minifram"
 fi
 
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS minifram"
 fi
 

-USE_HTML=0
-if test "$wxUSE_HTML" = "yes"; then
+if test "$wxUSE_SYSTEM_OPTIONS" = "yes"; then

     cat >>confdefs.h <<\_ACEOF
     cat >>confdefs.h <<\_ACEOF

-#define wxUSE_HTML 1
+#define wxUSE_SYSTEM_OPTIONS 1

 _ACEOF
 
 _ACEOF
 

-    USE_HTML=1
-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS html html/about html/help html/helpview html/printing html/test html/virtual html/widget html/zip htlbox"
+    if test "$TOOLKIT" = "MSW" -o "$TOOLKIT" = "GTK" -o "$TOOLKIT" = "X11" -o \
+        "$TOOLKIT" = "MOTIF"; then
+        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS taskbar"
+    fi

 fi
 
 fi
 

+

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


@@ -33173,57 +33189,58 @@ _ACEOF
 
 fi
 
 
 fi
 

+if test "$wxUSE_UNICODE" = "yes" -a "$wxUSE_UNICODE_MSLU" = "yes" ; then
+    LIBS=" -lunicows $LIBS"
+fi
+
+

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

-  cat >>confdefs.h <<\_ACEOF
+    cat >>confdefs.h <<\_ACEOF

 #define wxUSE_IMAGE 1
 _ACEOF
 
 #define wxUSE_IMAGE 1
 _ACEOF
 

-fi

 
 

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

 #define wxUSE_GIF 1
 _ACEOF
 
 #define wxUSE_GIF 1
 _ACEOF
 

-fi
+    fi

 
 

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

 #define wxUSE_PCX 1
 _ACEOF
 
 #define wxUSE_PCX 1
 _ACEOF
 

-fi
+    fi

 
 

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

 #define wxUSE_IFF 1
 _ACEOF
 
 #define wxUSE_IFF 1
 _ACEOF
 

-fi
+    fi

 
 

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

 #define wxUSE_PNM 1
 _ACEOF
 
 #define wxUSE_PNM 1
 _ACEOF
 

-fi
+    fi

 
 

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

 #define wxUSE_XPM 1
 _ACEOF
 
 #define wxUSE_XPM 1
 _ACEOF
 

-fi
+    fi

 
 

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

 #define wxUSE_ICO_CUR 1
 _ACEOF
 
 #define wxUSE_ICO_CUR 1
 _ACEOF
 

-fi
-
-if test "$wxUSE_UNICODE" = "yes" -a "$wxUSE_UNICODE_MSLU" = "yes" ; then
-    LIBS=" -lunicows $LIBS"
+    fi

 fi
 
 
 fi
 
 


@@ -33377,6 +33394,10 @@ if test "$wxUSE_HTML" = "yes" ; then
     CORE_GUI_LIBS="html $CORE_GUI_LIBS"
 fi
 
     CORE_GUI_LIBS="html $CORE_GUI_LIBS"
 fi
 

+if test "$wxUSE_GUI" != "yes"; then
+    CORE_GUI_LIBS=""
+fi
+

 
 
 
 
 
 


@@ -35530,6 +35551,16 @@ EOF
         COND_UNICODE_1=""
     fi
 
         COND_UNICODE_1=""
     fi
 

+    COND_USE_EXCEPTIONS_0="#"
+    if test "x$USE_EXCEPTIONS" = "x0" ; then
+        COND_USE_EXCEPTIONS_0=""
+    fi
+
+    COND_USE_EXCEPTIONS_1="#"
+    if test "x$USE_EXCEPTIONS" = "x1" ; then
+        COND_USE_EXCEPTIONS_1=""
+    fi
+

     COND_USE_GUI_0="#"
     if test "x$USE_GUI" = "x0" ; then
         COND_USE_GUI_0=""
     COND_USE_GUI_0="#"
     if test "x$USE_GUI" = "x0" ; then
         COND_USE_GUI_0=""


@@ -35565,6 +35596,11 @@ EOF
         COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN=""
     fi
 
         COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN=""
     fi
 

+    COND_USE_ODBC_1="#"
+    if test "x$USE_ODBC" = "x1" ; then
+        COND_USE_ODBC_1=""
+    fi
+

     COND_USE_SOSYMLINKS_1="#"
     if test "x$USE_SOSYMLINKS" = "x1" ; then
         COND_USE_SOSYMLINKS_1=""
     COND_USE_SOSYMLINKS_1="#"
     if test "x$USE_SOSYMLINKS" = "x1" ; then
         COND_USE_SOSYMLINKS_1=""


@@ -35810,7 +35846,9 @@ for subdir in `echo $SUBDIRS`; do
         else                                     if test ${subdir} = "samples"; then
                 makefiles="samples/Makefile.in samples/console/Makefile.in"
             else                 makefiles="utils/HelpGen/Makefile.in \
         else                                     if test ${subdir} = "samples"; then
                 makefiles="samples/Makefile.in samples/console/Makefile.in"
             else                 makefiles="utils/HelpGen/Makefile.in \

-                           utils/HelpGen/src/Makefile.in"
+                           utils/HelpGen/src/Makefile.in \
+                           utils/tex2rtf/Makefile.in \
+                           utils/tex2rtf/src/Makefile.in"

             fi
         fi
 
             fi
         fi
 


@@ -36183,7 +36221,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
 } >&5
 cat >&5 <<_CSEOF
 

-This file was extended by wxWindows $as_me 2.5.0, which was
+This file was extended by wxWindows $as_me 2.5.1, which was

 generated by GNU Autoconf 2.57.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
 generated by GNU Autoconf 2.57.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES


@@ -36246,7 +36284,7 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\

-wxWindows config.status 2.5.0
+wxWindows config.status 2.5.1

 configured by $0, generated by GNU Autoconf 2.57,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
 configured by $0, generated by GNU Autoconf 2.57,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 


@@ -36639,6 +36677,8 @@ s,@COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0@,$COND_TOOLKIT_PM_USE_GUI_1_WXUNIV_0,;t t
 s,@COND_TOOLKIT_X11@,$COND_TOOLKIT_X11,;t t
 s,@COND_TOOLKIT_X11_USE_GUI_1@,$COND_TOOLKIT_X11_USE_GUI_1,;t t
 s,@COND_UNICODE_1@,$COND_UNICODE_1,;t t
 s,@COND_TOOLKIT_X11@,$COND_TOOLKIT_X11,;t t
 s,@COND_TOOLKIT_X11_USE_GUI_1@,$COND_TOOLKIT_X11_USE_GUI_1,;t t
 s,@COND_UNICODE_1@,$COND_UNICODE_1,;t t

+s,@COND_USE_EXCEPTIONS_0@,$COND_USE_EXCEPTIONS_0,;t t
+s,@COND_USE_EXCEPTIONS_1@,$COND_USE_EXCEPTIONS_1,;t t

 s,@COND_USE_GUI_0@,$COND_USE_GUI_0,;t t
 s,@COND_USE_GUI_1@,$COND_USE_GUI_1,;t t
 s,@COND_USE_GUI_1_WXUNIV_0@,$COND_USE_GUI_1_WXUNIV_0,;t t
 s,@COND_USE_GUI_0@,$COND_USE_GUI_0,;t t
 s,@COND_USE_GUI_1@,$COND_USE_GUI_1,;t t
 s,@COND_USE_GUI_1_WXUNIV_0@,$COND_USE_GUI_1_WXUNIV_0,;t t


@@ -36646,6 +36686,7 @@ s,@COND_USE_GUI_1_WXUNIV_1@,$COND_USE_GUI_1_WXUNIV_1,;t t
 s,@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@,$COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN,;t t
 s,@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@,$COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN,;t t
 s,@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@,$COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN,;t t
 s,@COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@,$COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN,;t t
 s,@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@,$COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN,;t t
 s,@COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@,$COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN,;t t

+s,@COND_USE_ODBC_1@,$COND_USE_ODBC_1,;t t

 s,@COND_USE_SOSYMLINKS_1@,$COND_USE_SOSYMLINKS_1,;t t
 s,@COND_USE_SOVERLINUX_1@,$COND_USE_SOVERLINUX_1,;t t
 s,@COND_USE_SOVERSION_0@,$COND_USE_SOVERSION_0,;t t
 s,@COND_USE_SOSYMLINKS_1@,$COND_USE_SOSYMLINKS_1,;t t
 s,@COND_USE_SOVERLINUX_1@,$COND_USE_SOVERLINUX_1,;t t
 s,@COND_USE_SOVERSION_0@,$COND_USE_SOVERSION_0,;t t