Added wxHtmlCell::[S|G]etId

[wxWidgets.git] / configure.in
diff --git a/configure.in b/configure.in

index 369eb74be6ea9f2a1c9376f8331048aeba9d2a29..83e0084cc337922d2f83cc9d6ced8832a6323f5f 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -17,7 +17,7 @@ dnl ---------------------------------------------------------------------------
  dnl initialization
  dnl ---------------------------------------------------------------------------
  
  dnl initialization
  dnl ---------------------------------------------------------------------------
  
-AC_INIT([wxWindows], [2.5.0], [wx-dev@lists.wxwindows.org])
+AC_INIT([wxWindows], [2.5.1], [wx-dev@lists.wxwindows.org])
  
  dnl the file passed to AC_CONFIG_SRCDIR should be specific to our package
  AC_CONFIG_SRCDIR([wx-config.in])
  
  dnl the file passed to AC_CONFIG_SRCDIR should be specific to our package
  AC_CONFIG_SRCDIR([wx-config.in])
@@ -55,14 +55,14 @@ dnl   libwx_$(TOOLKIT)-$(WX_RELEASE).so.$(WX_CURRENT).$(WX_REVISION).$(WX_AGE)
  
  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
  
@@ -73,6 +73,7 @@ dnl ------------------------------------------------------------------------
  
  dnl OS (assume Unix)
  USE_UNIX=1
  
  dnl OS (assume Unix)
  USE_UNIX=1
+USE_OS2=0
  USE_WIN32=0
  USE_DOS=0
  USE_BEOS=0
  USE_WIN32=0
  USE_DOS=0
  USE_BEOS=0
@@ -140,6 +141,7 @@ DEFAULT_DEFAULT_wxUSE_X11=0
  PROGRAM_EXT=
  SO_SUFFIX=so
  SAMPLES_RPATH_FLAG=
  PROGRAM_EXT=
  SO_SUFFIX=so
  SAMPLES_RPATH_FLAG=
+SAMPLES_RPATH_POSTLINK=
  
  dnl to support a new system, you need to add its canonical name (as determined
  dnl by config.sub or specified by the configure command line) to this "case"
  
  dnl to support a new system, you need to add its canonical name (as determined
  dnl by config.sub or specified by the configure command line) to this "case"
@@ -287,8 +289,35 @@ case "${host}" in
  
    *-pc-os2_emx | *-pc-os2-emx )
      AC_DEFINE(__EMX__)
  
    *-pc-os2_emx | *-pc-os2-emx )
      AC_DEFINE(__EMX__)
+    USE_OS2=1
+    AC_DEFINE(__OS2__)
      PROGRAM_EXT=".exe"
      DEFAULT_DEFAULT_wxUSE_PM=1
      PROGRAM_EXT=".exe"
      DEFAULT_DEFAULT_wxUSE_PM=1
+    dnl "c++" wrapper is not always available, so always use plain gcc.
+    CXX=gcc
+    LDFLAGS="$LDFLAGS -Zcrtdll -Zsysv-signals"
+    dnl
+    dnl Some special code that's automatically added by autoconf-2.57 for OS/2
+    dnl and hopefully also by autoconf-2.58 and newer on all other platforms.
+    dnl For now however, we still need it to make sure the configure script
+    dnl works on OS/2 no matter what platform it is generated on.
+    ac_executable_extensions=".exe"
+    export ac_executable_extensions
+    dnl This strange code is necessary to deal with handling of
+    dnl backslashes by ksh and pdksh's sh variant.
+    ac_save_IFS="$IFS"
+    IFS='\\'
+    ac_TEMP_PATH=
+    for ac_dir in $PATH; do
+      IFS=$ac_save_IFS
+      if test -z "$ac_TEMP_PATH"; then
+        ac_TEMP_PATH="$ac_dir"
+      else
+        ac_TEMP_PATH="$ac_TEMP_PATH/$ac_dir"
+      fi
+    done
+    export PATH="$ac_TEMP_PATH"
+    unset ac_TEMP_PATH
    ;;
  
    powerpc-*-darwin* )
    ;;
  
    powerpc-*-darwin* )
@@ -330,6 +359,7 @@ dnl usage
  DEBUG_CONFIGURE=0
  if test $DEBUG_CONFIGURE = 1; then
    DEFAULT_wxUSE_UNIVERSAL=no
  DEBUG_CONFIGURE=0
  if test $DEBUG_CONFIGURE = 1; then
    DEFAULT_wxUSE_UNIVERSAL=no
+  DEFAULT_wxUSE_STL=no
  
    DEFAULT_wxUSE_NANOX=no
  
  
    DEFAULT_wxUSE_NANOX=no
  
@@ -348,9 +378,9 @@ if test $DEBUG_CONFIGURE = 1; then
    DEFAULT_wxUSE_MEM_TRACING=no
    DEFAULT_wxUSE_DEBUG_CONTEXT=no
    DEFAULT_wxUSE_DMALLOC=no
    DEFAULT_wxUSE_MEM_TRACING=no
    DEFAULT_wxUSE_DEBUG_CONTEXT=no
    DEFAULT_wxUSE_DMALLOC=no
-  DEFAULT_wxUSE_PRECOMP=no
    DEFAULT_wxUSE_APPLE_IEEE=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
@@ -360,10 +390,13 @@ if test $DEBUG_CONFIGURE = 1; then
    DEFAULT_wxUSE_CONTROLS=no
  
    DEFAULT_wxUSE_REGEX=no
    DEFAULT_wxUSE_CONTROLS=no
  
    DEFAULT_wxUSE_REGEX=no
+  DEFAULT_wxUSE_XML=no
+  DEFAULT_wxUSE_EXPAT=no
    DEFAULT_wxUSE_ZLIB=no
    DEFAULT_wxUSE_LIBPNG=no
    DEFAULT_wxUSE_LIBJPEG=no
    DEFAULT_wxUSE_LIBTIFF=no
    DEFAULT_wxUSE_ZLIB=no
    DEFAULT_wxUSE_LIBPNG=no
    DEFAULT_wxUSE_LIBJPEG=no
    DEFAULT_wxUSE_LIBTIFF=no
+  DEFAULT_wxUSE_LIBXPM=no
    DEFAULT_wxUSE_ODBC=no
    DEFAULT_wxUSE_OPENGL=no
  
    DEFAULT_wxUSE_ODBC=no
    DEFAULT_wxUSE_OPENGL=no
  
@@ -446,6 +479,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
@@ -461,6 +495,7 @@ if test $DEBUG_CONFIGURE = 1; then
    DEFAULT_wxUSE_GAUGE=no
    DEFAULT_wxUSE_GRID=no
    DEFAULT_wxUSE_IMAGLIST=no
    DEFAULT_wxUSE_GAUGE=no
    DEFAULT_wxUSE_GRID=no
    DEFAULT_wxUSE_IMAGLIST=no
+  DEFAULT_wxUSE_LISTBOOK=no
    DEFAULT_wxUSE_LISTBOX=no
    DEFAULT_wxUSE_LISTCTRL=no
    DEFAULT_wxUSE_NOTEBOOK=no
    DEFAULT_wxUSE_LISTBOX=no
    DEFAULT_wxUSE_LISTCTRL=no
    DEFAULT_wxUSE_NOTEBOOK=no
@@ -501,9 +536,11 @@ if test $DEBUG_CONFIGURE = 1; then
    DEFAULT_wxUSE_ICO_CUR=no
    DEFAULT_wxUSE_ACCESSIBILITY=no
    
    DEFAULT_wxUSE_ICO_CUR=no
    DEFAULT_wxUSE_ACCESSIBILITY=no
    
-  DEFAULT_wxUSE_MONOLITHIC=yes
+  DEFAULT_wxUSE_MONOLITHIC=no
+  DEFAULT_wxUSE_OFFICIAL_BUILD=no
  else
    DEFAULT_wxUSE_UNIVERSAL=no
  else
    DEFAULT_wxUSE_UNIVERSAL=no
+  DEFAULT_wxUSE_STL=no
  
    DEFAULT_wxUSE_NANOX=no
  
  
    DEFAULT_wxUSE_NANOX=no
  
@@ -522,9 +559,9 @@ else
    DEFAULT_wxUSE_MEM_TRACING=no
    DEFAULT_wxUSE_DEBUG_CONTEXT=no
    DEFAULT_wxUSE_DMALLOC=no
    DEFAULT_wxUSE_MEM_TRACING=no
    DEFAULT_wxUSE_DEBUG_CONTEXT=no
    DEFAULT_wxUSE_DMALLOC=no
-  DEFAULT_wxUSE_PRECOMP=no
    DEFAULT_wxUSE_APPLE_IEEE=yes
  
    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
@@ -533,10 +570,14 @@ else
    DEFAULT_wxUSE_GUI=yes
  
    DEFAULT_wxUSE_REGEX=yes
    DEFAULT_wxUSE_GUI=yes
  
    DEFAULT_wxUSE_REGEX=yes
+  DEFAULT_wxUSE_XML=yes
+  DEFAULT_wxUSE_EXPAT=yes
    DEFAULT_wxUSE_ZLIB=yes
    DEFAULT_wxUSE_LIBPNG=yes
    DEFAULT_wxUSE_LIBJPEG=yes
    DEFAULT_wxUSE_LIBTIFF=yes
    DEFAULT_wxUSE_ZLIB=yes
    DEFAULT_wxUSE_LIBPNG=yes
    DEFAULT_wxUSE_LIBJPEG=yes
    DEFAULT_wxUSE_LIBTIFF=yes
+  DEFAULT_wxUSE_LIBXPM=yes
+  DEFAULT_wxUSE_LIBMSPACK=yes
    DEFAULT_wxUSE_ODBC=no
    DEFAULT_wxUSE_OPENGL=no
  
    DEFAULT_wxUSE_ODBC=no
    DEFAULT_wxUSE_OPENGL=no
  
@@ -619,6 +660,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
@@ -634,6 +676,7 @@ else
    DEFAULT_wxUSE_GAUGE=yes
    DEFAULT_wxUSE_GRID=yes
    DEFAULT_wxUSE_IMAGLIST=yes
    DEFAULT_wxUSE_GAUGE=yes
    DEFAULT_wxUSE_GRID=yes
    DEFAULT_wxUSE_IMAGLIST=yes
+  DEFAULT_wxUSE_LISTBOOK=yes
    DEFAULT_wxUSE_LISTBOX=yes
    DEFAULT_wxUSE_LISTCTRL=yes
    DEFAULT_wxUSE_NOTEBOOK=yes
    DEFAULT_wxUSE_LISTBOX=yes
    DEFAULT_wxUSE_LISTCTRL=yes
    DEFAULT_wxUSE_NOTEBOOK=yes
@@ -674,7 +717,8 @@ else
    DEFAULT_wxUSE_ICO_CUR=yes
    DEFAULT_wxUSE_ACCESSIBILITY=no
    
    DEFAULT_wxUSE_ICO_CUR=yes
    DEFAULT_wxUSE_ACCESSIBILITY=no
    
-  DEFAULT_wxUSE_MONOLITHIC=yes
+  DEFAULT_wxUSE_MONOLITHIC=no
+  DEFAULT_wxUSE_OFFICIAL_BUILD=no
  fi
  
  dnl WX_ARG_WITH should be used to select whether an external package will be
  fi
  
  dnl WX_ARG_WITH should be used to select whether an external package will be
@@ -727,6 +771,8 @@ WX_ARG_ENABLE(gtk2,        [  --enable-gtk2           use GTK+ 2.0 if available
  WX_ARG_SYS_WITH(libpng,    [  --with-libpng           use libpng (PNG image format)], wxUSE_LIBPNG)
  WX_ARG_SYS_WITH(libjpeg,   [  --with-libjpeg          use libjpeg (JPEG file format)], wxUSE_LIBJPEG)
  WX_ARG_SYS_WITH(libtiff,   [  --with-libtiff          use libtiff (TIFF file format)], wxUSE_LIBTIFF)
  WX_ARG_SYS_WITH(libpng,    [  --with-libpng           use libpng (PNG image format)], wxUSE_LIBPNG)
  WX_ARG_SYS_WITH(libjpeg,   [  --with-libjpeg          use libjpeg (JPEG file format)], wxUSE_LIBJPEG)
  WX_ARG_SYS_WITH(libtiff,   [  --with-libtiff          use libtiff (TIFF file format)], wxUSE_LIBTIFF)
+WX_ARG_SYS_WITH(libxpm,    [  --with-libxpm           use libxpm (XPM file format)], wxUSE_LIBXPM)
+WX_ARG_WITH(libmspack,     [  --with-libmspack        use libmspack (CHM help files loading)], wxUSE_LIBMSPACK)
  WX_ARG_WITH(opengl,        [  --with-opengl           use OpenGL (or Mesa)], wxUSE_OPENGL)
  
  fi
  WX_ARG_WITH(opengl,        [  --with-opengl           use OpenGL (or Mesa)], wxUSE_OPENGL)
  
  fi
@@ -736,6 +782,7 @@ WX_ARG_WITH(dmalloc,       [  --with-dmalloc          use dmalloc library (http:
  WX_ARG_SYS_WITH(regex,     [  --with-regex            enable support for wxRegEx class], wxUSE_REGEX)
  WX_ARG_SYS_WITH(zlib,      [  --with-zlib             use zlib for LZW compression], wxUSE_ZLIB)
  WX_ARG_SYS_WITH(odbc,      [  --with-odbc             use the IODBC and wxODBC classes], wxUSE_ODBC)
  WX_ARG_SYS_WITH(regex,     [  --with-regex            enable support for wxRegEx class], wxUSE_REGEX)
  WX_ARG_SYS_WITH(zlib,      [  --with-zlib             use zlib for LZW compression], wxUSE_ZLIB)
  WX_ARG_SYS_WITH(odbc,      [  --with-odbc             use the IODBC and wxODBC classes], wxUSE_ODBC)
+WX_ARG_SYS_WITH(expat,     [  --with-expat            enable XML support using expat parser], wxUSE_EXPAT)
  
  dnl ---------------------------------------------------------------------------
  dnl compile options
  
  dnl ---------------------------------------------------------------------------
  dnl compile options
@@ -744,16 +791,16 @@ dnl ---------------------------------------------------------------------------
  WX_ARG_ENABLE(shared,      [  --enable-shared         create shared library code], wxUSE_SHARED)
  WX_ARG_ENABLE(optimise,    [  --enable-optimise       create optimised code], wxUSE_OPTIMISE)
  WX_ARG_ENABLE(debug,       [  --enable-debug          same as debug_flag and debug_info], wxUSE_DEBUG)
  WX_ARG_ENABLE(shared,      [  --enable-shared         create shared library code], wxUSE_SHARED)
  WX_ARG_ENABLE(optimise,    [  --enable-optimise       create optimised code], wxUSE_OPTIMISE)
  WX_ARG_ENABLE(debug,       [  --enable-debug          same as debug_flag and debug_info], wxUSE_DEBUG)
-
-dnl allow the precompiled header option to be disabled under Mac OS X/Darwin
-WX_ARG_ENABLE(precomp,     [  --enable-precomp        enable use of precompiled headers (Mac OS X/Darwin)], wxUSE_PRECOMP)
+WX_ARG_ENABLE(stl,         [  --enable-stl            use STL for containers], wxUSE_STL)
  
  if test "$wxUSE_DEBUG" = "yes"; then
    DEFAULT_wxUSE_DEBUG_FLAG=yes
    DEFAULT_wxUSE_DEBUG_INFO=yes
  
  if test "$wxUSE_DEBUG" = "yes"; then
    DEFAULT_wxUSE_DEBUG_FLAG=yes
    DEFAULT_wxUSE_DEBUG_INFO=yes
+  BUILD=debug
  elif test "$wxUSE_DEBUG" = "no"; then
    DEFAULT_wxUSE_DEBUG_FLAG=no
    DEFAULT_wxUSE_DEBUG_INFO=no
  elif test "$wxUSE_DEBUG" = "no"; then
    DEFAULT_wxUSE_DEBUG_FLAG=no
    DEFAULT_wxUSE_DEBUG_INFO=no
+  BUILD=release
  fi
  
  WX_ARG_ENABLE(debug_flag,    [  --enable-debug_flag     set __WXDEBUG__ flag (recommended for developers!)], wxUSE_DEBUG_FLAG)
  fi
  
  WX_ARG_ENABLE(debug_flag,    [  --enable-debug_flag     set __WXDEBUG__ flag (recommended for developers!)], wxUSE_DEBUG_FLAG)
@@ -767,7 +814,6 @@ WX_ARG_ENABLE(no_exceptions, [  --enable-no_exceptions  create code without C++
  WX_ARG_ENABLE(permissive,    [  --enable-permissive     compile code disregarding strict ANSI], wxUSE_PERMISSIVE)
  WX_ARG_ENABLE(no_deps,       [  --enable-no_deps        create code without dependency information], wxUSE_NO_DEPS)
  
  WX_ARG_ENABLE(permissive,    [  --enable-permissive     compile code disregarding strict ANSI], wxUSE_PERMISSIVE)
  WX_ARG_ENABLE(no_deps,       [  --enable-no_deps        create code without dependency information], wxUSE_NO_DEPS)
  
-WX_ARG_ENABLE(compat20,      [  --enable-compat20       enable wxWindows 2.0 compatibility], WXWIN_COMPATIBILITY_2)
  WX_ARG_ENABLE(compat22,      [  --enable-compat22       enable wxWindows 2.2 compatibility], WXWIN_COMPATIBILITY_2_2)
  WX_ARG_ENABLE(compat24,      [  --disable-compat24      disable wxWindows 2.4 compatibility], WXWIN_COMPATIBILITY_2_4, disable)
  
  WX_ARG_ENABLE(compat22,      [  --enable-compat22       enable wxWindows 2.2 compatibility], WXWIN_COMPATIBILITY_2_2)
  WX_ARG_ENABLE(compat24,      [  --disable-compat24      disable wxWindows 2.4 compatibility], WXWIN_COMPATIBILITY_2_4, disable)
  
@@ -790,44 +836,44 @@ WX_ARG_ENABLE(ftp,           [  --enable-ftp            use wxFTP (requires wxPr
  WX_ARG_ENABLE(http,          [  --enable-http           use wxHTTP (requires wxProtocol], wxUSE_PROTOCOL_HTTP)
  WX_ARG_ENABLE(fileproto,     [  --enable-fileproto      use wxFileProto class (requires wxProtocol], wxUSE_PROTOCOL_FILE)
  WX_ARG_ENABLE(sockets,       [  --enable-sockets        use socket/network classes], wxUSE_SOCKETS)
  WX_ARG_ENABLE(http,          [  --enable-http           use wxHTTP (requires wxProtocol], wxUSE_PROTOCOL_HTTP)
  WX_ARG_ENABLE(fileproto,     [  --enable-fileproto      use wxFileProto class (requires wxProtocol], wxUSE_PROTOCOL_FILE)
  WX_ARG_ENABLE(sockets,       [  --enable-sockets        use socket/network classes], wxUSE_SOCKETS)
-WX_ARG_ENABLE(ole,           [  --enable-ole            use OLE classes], wxUSE_OLE)
+WX_ARG_ENABLE(ole,           [  --enable-ole            use OLE classes (Win32 only)], wxUSE_OLE)
  WX_ARG_ENABLE(dataobj,       [  --enable-dataobj        use data object classes], wxUSE_DATAOBJ)
  
  WX_ARG_ENABLE(ipc,           [  --enable-ipc            use interprocess communication (wxSocket etc.)], wxUSE_IPC)
  
  WX_ARG_ENABLE(dataobj,       [  --enable-dataobj        use data object classes], wxUSE_DATAOBJ)
  
  WX_ARG_ENABLE(ipc,           [  --enable-ipc            use interprocess communication (wxSocket etc.)], wxUSE_IPC)
  
+dnl please keep the settings below in alphabetical order
+WX_ARG_ENABLE(apple_ieee,    [  --enable-apple_ieee     use the Apple IEEE codec], wxUSE_APPLE_IEEE)
+WX_ARG_ENABLE(catch_segvs,   [  --enable-catch_segvs    catch signals in wxApp::OnFatalException (Unix only)], wxUSE_ON_FATAL_EXCEPTION)
  WX_ARG_ENABLE(cmdline,       [  --enable-cmdline        use wxCmdLineParser class], wxUSE_CMDLINE_PARSER)
  WX_ARG_ENABLE(datetime,      [  --enable-datetime       use wxDateTime class], wxUSE_DATETIME)
  WX_ARG_ENABLE(cmdline,       [  --enable-cmdline        use wxCmdLineParser class], wxUSE_CMDLINE_PARSER)
  WX_ARG_ENABLE(datetime,      [  --enable-datetime       use wxDateTime class], wxUSE_DATETIME)
-WX_ARG_ENABLE(stopwatch,     [  --enable-stopwatch      use wxStopWatch class], wxUSE_STOPWATCH)
  WX_ARG_ENABLE(dialupman,     [  --enable-dialupman      use dialup network classes], wxUSE_DIALUP_MANAGER)
  WX_ARG_ENABLE(dialupman,     [  --enable-dialupman      use dialup network classes], wxUSE_DIALUP_MANAGER)
-WX_ARG_ENABLE(apple_ieee,    [  --enable-apple_ieee     use the Apple IEEE codec], wxUSE_APPLE_IEEE)
-WX_ARG_ENABLE(timer,         [  --enable-timer          use wxTimer class], wxUSE_TIMER)
-WX_ARG_ENABLE(wave,          [  --enable-wave           use wxWave class], wxUSE_WAVE)
-WX_ARG_ENABLE(fraction,      [  --enable-fraction       use wxFraction class], wxUSE_FRACTION)
  WX_ARG_ENABLE(dynlib,        [  --enable-dynlib         use wxLibrary class for DLL loading], wxUSE_DYNLIB_CLASS)
  WX_ARG_ENABLE(dynamicloader, [  --enable-dynamicloader  use (new) wxDynamicLibrary class], wxUSE_DYNAMIC_LOADER)
  WX_ARG_ENABLE(dynlib,        [  --enable-dynlib         use wxLibrary class for DLL loading], wxUSE_DYNLIB_CLASS)
  WX_ARG_ENABLE(dynamicloader, [  --enable-dynamicloader  use (new) wxDynamicLibrary class], wxUSE_DYNAMIC_LOADER)
-WX_ARG_ENABLE(longlong,      [  --enable-longlong       use wxLongLong class], wxUSE_LONGLONG)
+WX_ARG_ENABLE(exceptions,    [  --enable-exceptions     build exception-safe library], wxUSE_EXCEPTIONS)
+WX_ARG_ENABLE(ffile,         [  --enable-ffile          use wxFFile class], wxUSE_FFILE)
+WX_ARG_ENABLE(file,          [  --enable-file           use wxFile class], wxUSE_FILE)
+WX_ARG_ENABLE(filesystem,    [  --enable-filesystem     use virtual file systems classes], wxUSE_FILESYSTEM)
+WX_ARG_ENABLE(fontmap,       [  --enable-fontmap        use font encodings conversion classes], wxUSE_FONTMAP)
+WX_ARG_ENABLE(fs_inet,       [  --enable-fs_inet        use virtual HTTP/FTP filesystems], wxUSE_FS_INET)
+WX_ARG_ENABLE(fs_zip,        [  --enable-fs_zip         use virtual ZIP filesystems], wxUSE_FS_ZIP)
  WX_ARG_ENABLE(geometry,      [  --enable-geometry       use geometry class], wxUSE_GEOMETRY)
  WX_ARG_ENABLE(log,           [  --enable-log            use logging system], wxUSE_LOG)
  WX_ARG_ENABLE(geometry,      [  --enable-geometry       use geometry class], wxUSE_GEOMETRY)
  WX_ARG_ENABLE(log,           [  --enable-log            use logging system], wxUSE_LOG)
+WX_ARG_ENABLE(longlong,      [  --enable-longlong       use wxLongLong class], wxUSE_LONGLONG)
+WX_ARG_ENABLE(mimetype,      [  --enable-mimetype       use wxMimeTypesManager], wxUSE_MIMETYPE)
+WX_ARG_ENABLE(mslu,          [  --enable-mslu           use MS Layer for Unicode on Windows 9x (Win32 only)], wxUSE_UNICODE_MSLU)
+WX_ARG_ENABLE(snglinst,      [  --enable-snglinst       use wxSingleInstanceChecker class], wxUSE_SNGLINST_CHECKER)
  WX_ARG_ENABLE(streams,       [  --enable-streams        use wxStream etc classes], wxUSE_STREAMS)
  WX_ARG_ENABLE(streams,       [  --enable-streams        use wxStream etc classes], wxUSE_STREAMS)
-WX_ARG_ENABLE(file,          [  --enable-file           use wxFile classes], wxUSE_FILE)
-WX_ARG_ENABLE(ffile,         [  --enable-ffile          use wxFFile classes], wxUSE_FFILE)
+WX_ARG_ENABLE(std_iostreams, [  --enable-std_iostreams  use standard C++ stream classes], wxUSE_STD_IOSTREAM)
+WX_ARG_ENABLE(stopwatch,     [  --enable-stopwatch      use wxStopWatch class], wxUSE_STOPWATCH)
+WX_ARG_ENABLE(system_options,[  --enable-sysoptions     use wxSystemOptions], wxUSE_SYSTEM_OPTIONS)
  WX_ARG_ENABLE(textbuf,       [  --enable-textbuf        use wxTextBuffer class], wxUSE_TEXTBUFFER)
  WX_ARG_ENABLE(textfile,      [  --enable-textfile       use wxTextFile class], wxUSE_TEXTFILE)
  WX_ARG_ENABLE(textbuf,       [  --enable-textbuf        use wxTextBuffer class], wxUSE_TEXTBUFFER)
  WX_ARG_ENABLE(textfile,      [  --enable-textfile       use wxTextFile class], wxUSE_TEXTFILE)
-WX_ARG_ENABLE(fontmap,       [  --enable-fontmap        use font encodings conversion classes], wxUSE_FONTMAP)
+WX_ARG_ENABLE(timer,         [  --enable-timer          use wxTimer class], wxUSE_TIMER)
  WX_ARG_ENABLE(unicode,       [  --enable-unicode        compile wxString with Unicode support], wxUSE_UNICODE)
  WX_ARG_ENABLE(unicode,       [  --enable-unicode        compile wxString with Unicode support], wxUSE_UNICODE)
-WX_ARG_ENABLE(mslu,          [  --enable-mslu           use MS Layer for Unicode on Windows 9x (win32 only)], wxUSE_UNICODE_MSLU)
+WX_ARG_ENABLE(wave,          [  --enable-wave           use wxWave class], wxUSE_WAVE)
  WX_ARG_ENABLE(wxprintfv,     [  --enable-wxprintfv      use wxWindows implementation of vprintf()], wxUSE_EXPERIMENTAL_PRINTF)
  WX_ARG_ENABLE(wxprintfv,     [  --enable-wxprintfv      use wxWindows implementation of vprintf()], wxUSE_EXPERIMENTAL_PRINTF)
-WX_ARG_ENABLE(std_iostreams, [  --enable-std_iostreams  use standard C++ stream classes], wxUSE_STD_IOSTREAM)
-WX_ARG_ENABLE(filesystem,    [  --enable-filesystem     use virtual file systems classes], wxUSE_FILESYSTEM)
-WX_ARG_ENABLE(fs_inet,       [  --enable-fs_inet        use virtual HTTP/FTP filesystems], wxUSE_FS_INET)
-WX_ARG_ENABLE(fs_zip,        [  --enable-fs_zip         use virtual ZIP filesystems], wxUSE_FS_ZIP)
  WX_ARG_ENABLE(zipstream,     [  --enable-zipstream      use wxZipInputStream], wxUSE_ZIPSTREAM)
  WX_ARG_ENABLE(zipstream,     [  --enable-zipstream      use wxZipInputStream], wxUSE_ZIPSTREAM)
-
-WX_ARG_ENABLE(catch_segvs,   [  --enable-catch_segvs    catch signals and pass them to wxApp::OnFatalException], wxUSE_ON_FATAL_EXCEPTION)
-WX_ARG_ENABLE(snglinst,      [  --enable-snglinst       use wxSingleInstanceChecker class], wxUSE_SNGLINST_CHECKER)
-
-WX_ARG_ENABLE(mimetype,      [  --enable-mimetype       use wxMimeTypesManager], wxUSE_MIMETYPE)
-WX_ARG_ENABLE(system_options,[  --enable-sysoptions     use wxSystemOptions], wxUSE_SYSTEM_OPTIONS)
+WX_ARG_ENABLE(gzstream,      [  --enable-gzstream       use wxGzipInputStream], wxUSE_GZSTREAM)
  
  WX_ARG_ENABLE(url,           [  --enable-url            use wxURL class], wxUSE_URL)
  WX_ARG_ENABLE(protocol,      [  --enable-protocol       use wxProtocol class], wxUSE_PROTOCOL)
  
  WX_ARG_ENABLE(url,           [  --enable-url            use wxURL class], wxUSE_URL)
  WX_ARG_ENABLE(protocol,      [  --enable-protocol       use wxProtocol class], wxUSE_PROTOCOL)
@@ -908,6 +954,7 @@ if test "$wxUSE_CONTROLS" = "yes"; then
    DEFAULT_wxUSE_GAUGE=yes
    DEFAULT_wxUSE_GRID=yes
    DEFAULT_wxUSE_IMAGLIST=yes
    DEFAULT_wxUSE_GAUGE=yes
    DEFAULT_wxUSE_GRID=yes
    DEFAULT_wxUSE_IMAGLIST=yes
+  DEFAULT_wxUSE_LISTBOOK=yes
    DEFAULT_wxUSE_LISTBOX=yes
    DEFAULT_wxUSE_LISTCTRL=yes
    DEFAULT_wxUSE_NOTEBOOK=yes
    DEFAULT_wxUSE_LISTBOX=yes
    DEFAULT_wxUSE_LISTCTRL=yes
    DEFAULT_wxUSE_NOTEBOOK=yes
@@ -945,6 +992,7 @@ elif test "$wxUSE_CONTROLS" = "no"; then
    DEFAULT_wxUSE_GAUGE=no
    DEFAULT_wxUSE_GRID=no
    DEFAULT_wxUSE_IMAGLIST=no
    DEFAULT_wxUSE_GAUGE=no
    DEFAULT_wxUSE_GRID=no
    DEFAULT_wxUSE_IMAGLIST=no
+  DEFAULT_wxUSE_LISTBOOK=no
    DEFAULT_wxUSE_LISTBOX=no
    DEFAULT_wxUSE_LISTCTRL=no
    DEFAULT_wxUSE_NOTEBOOK=no
    DEFAULT_wxUSE_LISTBOX=no
    DEFAULT_wxUSE_LISTCTRL=no
    DEFAULT_wxUSE_NOTEBOOK=no
@@ -974,31 +1022,12 @@ fi
  ## FIXME: This is a blatant hack
  if test "x$wxUSE_COCOA" != "x" -a "$wxUSE_COCOA" != "0" ; then
    wxUSE_PRINTING_ARCHITECTURE=no
  ## FIXME: This is a blatant hack
  if test "x$wxUSE_COCOA" != "x" -a "$wxUSE_COCOA" != "0" ; then
    wxUSE_PRINTING_ARCHITECTURE=no
-  wxUSE_HELP=no
-  wxUSE_CLIPBOARD=no
    wxUSE_DRAG_AND_DROP=no
    wxUSE_DRAG_AND_DROP=no
-  wxUSE_DATAOBJ=no
    # Generic notebook requires tab dialog
    DEFAULT_wxUSE_TABDIALOG=yes
    # Generic notebook requires tab dialog
    DEFAULT_wxUSE_TABDIALOG=yes
-  DEFAULT_wxUSE_TOOLBAR_NATIVE=no
-  DEFAULT_wxUSE_GAUGE=no
    DEFAULT_wxUSE_SCROLLBAR=no
    DEFAULT_wxUSE_SCROLLBAR=no
-  DEFAULT_wxUSE_COMBOBOX=no
-  DEFAULT_wxUSE_CALCTRL=no
-  DEFAULT_wxUSE_SPINBTN=no
-  DEFAULT_wxUSE_SPINCTRL=no
    DEFAULT_wxUSE_TOOLTIPS=no
    DEFAULT_wxUSE_DRAGIMAGE=no
    DEFAULT_wxUSE_TOOLTIPS=no
    DEFAULT_wxUSE_DRAGIMAGE=no
-  DEFAULT_wxUSE_FINDREPLDLG=no
-  DEFAULT_wxUSE_FONTDLG=no
-  DEFAULT_wxUSE_GRID=no
-  DEFAULT_wxUSE_NUMBERDLG=no
-  DEFAULT_wxUSE_PROGRESSDLG=no
-  DEFAULT_wxUSE_SASH=no
-  DEFAULT_wxUSE_SPLITTER=no
-  DEFAULT_wxUSE_WIZARDDLG=no
-  DEFAULT_wxUSE_SPLITTER=no
-  DEFAULT_wxUSE_STARTUP_TIPS=no
  fi
  
  WX_ARG_ENABLE(accel,       [  --enable-accel          use accelerators], wxUSE_ACCEL)
  fi
  
  WX_ARG_ENABLE(accel,       [  --enable-accel          use accelerators], wxUSE_ACCEL)
@@ -1014,6 +1043,7 @@ WX_ARG_ENABLE(display,     [  --enable-display        use wxDisplay class], wxUS
  WX_ARG_ENABLE(gauge,       [  --enable-gauge          use wxGauge class], wxUSE_GAUGE)
  WX_ARG_ENABLE(grid,        [  --enable-grid           use wxGrid class], wxUSE_GRID)
  WX_ARG_ENABLE(imaglist,    [  --enable-imaglist       use wxImageList class], wxUSE_IMAGLIST)
  WX_ARG_ENABLE(gauge,       [  --enable-gauge          use wxGauge class], wxUSE_GAUGE)
  WX_ARG_ENABLE(grid,        [  --enable-grid           use wxGrid class], wxUSE_GRID)
  WX_ARG_ENABLE(imaglist,    [  --enable-imaglist       use wxImageList class], wxUSE_IMAGLIST)
+WX_ARG_ENABLE(listbook,    [  --enable-listbook       use wxListbook class], wxUSE_LISTBOOK)
  WX_ARG_ENABLE(listbox,     [  --enable-listbox        use wxListBox class], wxUSE_LISTBOX)
  WX_ARG_ENABLE(listctrl,    [  --enable-listctrl       use wxListCtrl class], wxUSE_LISTCTRL)
  WX_ARG_ENABLE(notebook,    [  --enable-notebook       use wxNotebook class], wxUSE_NOTEBOOK)
  WX_ARG_ENABLE(listbox,     [  --enable-listbox        use wxListBox class], wxUSE_LISTBOX)
  WX_ARG_ENABLE(listctrl,    [  --enable-listctrl       use wxListCtrl class], wxUSE_LISTCTRL)
  WX_ARG_ENABLE(notebook,    [  --enable-notebook       use wxNotebook class], wxUSE_NOTEBOOK)
@@ -1089,19 +1119,24 @@ WX_ARG_ENABLE(ico_cur,     [  --enable-icocur         use Windows ICO and CUR fo
  
  fi
  
  
  fi
  
+dnl ---------------------------------------------------------------------------
+dnl some win32 settings
+dnl ---------------------------------------------------------------------------
+
+WX_ARG_ENABLE(official_build,  [  --enable-official_build official build of wxWindows (win32 DLL only)], wxUSE_OFFICIAL_BUILD)
+AC_ARG_ENABLE(vendor,  [  --enable-vendor=VENDOR  vendor name (win32 DLL only)], [VENDOR="$enableval"])
+if test "x$VENDOR" = "x"; then
+    VENDOR="custom"
+fi
+
  dnl General settings (needed for GUI and non-GUI compilations alike).
  dnl Path separator; ':' for unix, ';' for OS/2
  dnl General settings (needed for GUI and non-GUI compilations alike).
  dnl Path separator; ':' for unix, ';' for OS/2
-dnl Stem for flex output; lexyy for OS/2, lex.yy otherwise
  case "${host}" in
    *-pc-os2_emx | *-pc-os2-emx )
      PATH_IFS=';'
  case "${host}" in
    *-pc-os2_emx | *-pc-os2-emx )
      PATH_IFS=';'
-dnl Really ought to text for this as meanwhile there are flex versions using
-dnl lex.yy as well due to FAT support being more and more dropped...
-    LEX_STEM="lexyy"
    ;;
    *)
      PATH_IFS=':'
    ;;
    *)
      PATH_IFS=':'
-    LEX_STEM="lex.yy"
    ;;
  esac
  
    ;;
  esac
  
@@ -1120,6 +1155,7 @@ if test "$wxUSE_WINE" = "yes"; then
      DEFAULT_DEFAULT_wxUSE_GTK=0
      DEFAULT_DEFAULT_wxUSE_MOTIF=0
      DEFAULT_DEFAULT_wxUSE_MSW=1
      DEFAULT_DEFAULT_wxUSE_GTK=0
      DEFAULT_DEFAULT_wxUSE_MOTIF=0
      DEFAULT_DEFAULT_wxUSE_MSW=1
+    wxUSE_SHARED=no
  fi
  
  if test "$wxUSE_GUI" = "yes"; then
  fi
  
  if test "$wxUSE_GUI" = "yes"; then
@@ -1180,7 +1216,7 @@ if test "$wxUSE_GUI" = "yes"; then
            echo "$var=$value" >> ${wx_arg_cache_file}
          fi
          if test "$value" = 1; then
            echo "$var=$value" >> ${wx_arg_cache_file}
          fi
          if test "$value" = 1; then
-          toolkit_echo=`echo $toolkit | tr [[A-Z]] [[a-z]]`
+          toolkit_echo=`echo $toolkit | tr "[[A-Z]]" "[[a-z]]"`
            AC_MSG_RESULT($toolkit_echo)
          fi
        fi
            AC_MSG_RESULT($toolkit_echo)
          fi
        fi
@@ -1222,6 +1258,7 @@ if test "$wxUSE_WINE" = "yes"; then
      CC=winegcc
      CXX=wineg++
      RESCOMP=wrc
      CC=winegcc
      CXX=wineg++
      RESCOMP=wrc
+    LDFLAGS_GUI="-mwindows"
  fi
  
  dnl NB: The two tests bellow are *NOT* mutually exclusive! They should only
  fi
  
  dnl NB: The two tests bellow are *NOT* mutually exclusive! They should only
@@ -1309,7 +1346,10 @@ AC_PROG_RANLIB
  
  dnl ar command
  dnl   defines AR with the appropriate command
  
  dnl ar command
  dnl   defines AR with the appropriate command
-AC_CHECK_PROG(AR, ar, ar, ar)
+AC_CHECK_PROG(AR, ar, ar)
+if test "x$AR" = "x" ; then
+    AC_MSG_ERROR([ar is needed to build wxWindows])
+fi
  
  dnl install checks
  dnl   defines INSTALL with the appropriate command
  
  dnl install checks
  dnl   defines INSTALL with the appropriate command
@@ -1414,27 +1454,18 @@ you are trying to compile.
  fi dnl make without VPATH
  fi dnl not GNU make
  
  fi dnl make without VPATH
  fi dnl not GNU make
  
-dnl YACC checks
-dnl   defines YACC with the appropriate command
-AC_PROG_YACC
-
-dnl LEX checks
-dnl   defines LEX with the appropriate command
-dnl   defines LEXLIB with the appropriate library
-AC_PROG_LEX
-
  dnl needed for making link to setup.h
  AC_PROG_LN_S
  
  dnl ---------------------------------------------------------------------------
  dnl When we are using gcc on OS/2, we want to be either using resources (PM)
  dnl or a more complete POSIX emulation for Motif/GTK+/X11
  dnl needed for making link to setup.h
  AC_PROG_LN_S
  
  dnl ---------------------------------------------------------------------------
  dnl When we are using gcc on OS/2, we want to be either using resources (PM)
  dnl or a more complete POSIX emulation for Motif/GTK+/X11
+dnl Moreover we need to link explicitly against either stdcpp.a or stdcxx.a
+dnl (depending on compiler version), since we are using "gcc", not "g++/c++".
  dnl ---------------------------------------------------------------------------
  dnl (OS/2-only piece)
  case "${host}" in
    *-pc-os2_emx | *-pc-os2-emx )
  dnl ---------------------------------------------------------------------------
  dnl (OS/2-only piece)
  case "${host}" in
    *-pc-os2_emx | *-pc-os2-emx )
-      dnl Explicitly link -lstdcpp, since we are using "gcc" not "g++"/"c++".
-      LIBS="$LIBS -lstdcpp"
        if test "$wxUSE_MOTIF" = 1 -o "$wxUSE_GTK" = 1 -o "$wxUSE_X11" = 1; then
            dnl More complete Unix emulation for unix-like ports
            dnl by linking in POSIX/2's cExt (if available).
        if test "$wxUSE_MOTIF" = 1 -o "$wxUSE_GTK" = 1 -o "$wxUSE_X11" = 1; then
            dnl More complete Unix emulation for unix-like ports
            dnl by linking in POSIX/2's cExt (if available).
@@ -1443,6 +1474,26 @@ case "${host}" in
            dnl Include resources for the "native" port (wxPM).
            RESPROGRAMOBJ="\${top_srcdir}/include/wx/os2/wx.res"
        fi
            dnl Include resources for the "native" port (wxPM).
            RESPROGRAMOBJ="\${top_srcdir}/include/wx/os2/wx.res"
        fi
+      AC_CACHE_CHECK([for gcc 3 or later], wx_cv_gcc3,[
+          AC_TRY_COMPILE([],
+              [
+                  #if (__GNUC__ < 3)
+                      #error old gcc
+                  #endif
+              ],
+              [
+                  wx_cv_gcc3=yes
+              ],
+              [
+                  wx_cv_gcc3=no
+              ]
+          )
+      ])
+      if test "$wx_cv_gcc3" = "no"; then
+          LIBS="$LIBS -lstdcpp"
+      else
+          LIBS="$LIBS -lstdcxx"
+      fi
    ;;
  esac
  dnl (end of OS/2-only piece)
    ;;
  esac
  dnl (end of OS/2-only piece)
@@ -1508,9 +1559,15 @@ case "${host}" in
  esac
  
  if test "$wxUSE_GUI" = "yes"; then
  esac
  
  if test "$wxUSE_GUI" = "yes"; then
-    if test "$wxUSE_UNIX" = "yes"; then
+    if test "$wxUSE_UNIX" = "yes" -a "$wxUSE_PM" != 1; then
          dnl defines HAVE_X11_XKBLIB_H
          dnl defines HAVE_X11_XKBLIB_H
-        AC_CHECK_HEADERS(X11/XKBlib.h)
+        AC_CHECK_HEADERS(X11/Xlib.h)
+        AC_CHECK_HEADERS([X11/XKBlib.h], [], [], 
+                         [
+                          #if HAVE_X11_XLIB_H
+                            #include <X11/Xlib.h>
+                          #endif
+                         ])
      fi
  fi
  
      fi
  fi
  
@@ -1625,6 +1682,51 @@ WX_CPP_EXPLICIT
  dnl check whether C++ compiler supports C++ casts
  AC_CXX_CONST_CAST
  
  dnl check whether C++ compiler supports C++ casts
  AC_CXX_CONST_CAST
  
+dnl check various STL features
+if test "$wxUSE_STL" = "yes"; then
+    AC_LANG_PUSH(C++)
+
+    dnl check for basic STL functionality
+    AC_MSG_CHECKING([for basic STL functionality])
+    AC_TRY_COMPILE([#include <string>
+                    #include <functional>
+                    #include <algorithm>
+                    #include <vector>
+                    #include <list>],
+                    [std::vector<int> moo;
+                     std::list<int> foo;
+                     std::vector<int>::iterator it = 
+                         std::find_if(moo.begin(), moo.end(),
+                                      std::bind2nd(std::less<int>(), 3));],
+                    [AC_MSG_RESULT([yes])],
+                    [AC_MSG_RESULT([no])
+                     AC_MSG_ERROR([Basic STL functionality missing])])
+
+    dnl check if <string> declares std::wstring
+    AC_MSG_CHECKING([for std::wstring in <string>])
+    AC_TRY_COMPILE([#include <string>],
+                   [std::wstring foo;],
+                   [AC_MSG_RESULT(yes)
+                    AC_DEFINE(HAVE_STD_WSTRING)],
+                   [AC_MSG_RESULT(no)])
+
+    dnl check for compliant std::string::compare
+    AC_MSG_CHECKING([for compliant std::string::compare])
+    AC_TRY_COMPILE([#include <string>],
+                   [std::string foo, bar;
+                    foo.compare(bar);
+                    foo.compare(1, 1, bar);
+                    foo.compare(1, 1, bar, 1, 1);
+                    foo.compare("");
+                    foo.compare(1, 1, "");
+                    foo.compare(1, 1, "", 2);],
+                   [AC_MSG_RESULT(yes)
+                    AC_DEFINE(HAVE_STD_STRING_COMPARE)],
+                   [AC_MSG_RESULT(no)])
+
+    AC_LANG_POP
+fi
+
  dnl ---------------------------------------------------------------------------
  dnl Define search path for includes and libraries: all headers and libs will be
  dnl looked for in all directories of this path
  dnl ---------------------------------------------------------------------------
  dnl Define search path for includes and libraries: all headers and libs will be
  dnl looked for in all directories of this path
@@ -1773,7 +1875,6 @@ dnl ------------------------------------------------------------------------
  dnl Check for regex libraries
  dnl ------------------------------------------------------------------------
  
  dnl Check for regex libraries
  dnl ------------------------------------------------------------------------
  
-REGEX_INCLUDE=
  if test "$wxUSE_REGEX" != "no"; then
      AC_DEFINE(wxUSE_REGEX)
  
  if test "$wxUSE_REGEX" != "no"; then
      AC_DEFINE(wxUSE_REGEX)
  
@@ -1794,17 +1895,12 @@ if test "$wxUSE_REGEX" != "no"; then
              wxUSE_REGEX=sys
          fi
      fi
              wxUSE_REGEX=sys
          fi
      fi
-
-    if test "$wxUSE_REGEX" = "builtin" ; then
-        REGEX_INCLUDE="-I\${top_srcdir}/src/regex"
-    fi
  fi
  
  dnl ------------------------------------------------------------------------
  dnl Check for zlib compression library
  dnl ------------------------------------------------------------------------
  
  fi
  
  dnl ------------------------------------------------------------------------
  dnl Check for zlib compression library
  dnl ------------------------------------------------------------------------
  
-ZLIB_INCLUDE=
  ZLIB_LINK=
  if test "$wxUSE_ZLIB" != "no" ; then
      AC_DEFINE(wxUSE_ZLIB)
  ZLIB_LINK=
  if test "$wxUSE_ZLIB" != "no" ; then
      AC_DEFINE(wxUSE_ZLIB)
@@ -1872,17 +1968,12 @@ if test "$wxUSE_ZLIB" != "no" ; then
              wxUSE_ZLIB=sys
          fi
      fi
              wxUSE_ZLIB=sys
          fi
      fi
-
-    if test "$wxUSE_ZLIB" = "builtin" ; then
-        ZLIB_INCLUDE="-I\${top_srcdir}/src/zlib"
-    fi
  fi
  
  dnl ------------------------------------------------------------------------
  dnl Check for png library
  dnl ------------------------------------------------------------------------
  
  fi
  
  dnl ------------------------------------------------------------------------
  dnl Check for png library
  dnl ------------------------------------------------------------------------
  
-PNG_INCLUDE=
  PNG_LINK=
  if test "$wxUSE_LIBPNG" != "no" ; then
      AC_DEFINE(wxUSE_LIBPNG)
  PNG_LINK=
  if test "$wxUSE_LIBPNG" != "no" ; then
      AC_DEFINE(wxUSE_LIBPNG)
@@ -1947,10 +2038,6 @@ if test "$wxUSE_LIBPNG" != "no" ; then
          fi
      fi
  
          fi
      fi
  
-    if test "$wxUSE_LIBPNG" = "builtin" ; then
-        PNG_INCLUDE="-I\${top_srcdir}/src/png"
-    fi
-
      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS png"
  fi
  
      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS png"
  fi
  
@@ -1958,7 +2045,6 @@ dnl ------------------------------------------------------------------------
  dnl Check for jpeg library
  dnl ------------------------------------------------------------------------
  
  dnl Check for jpeg library
  dnl ------------------------------------------------------------------------
  
-JPEG_INCLUDE=
  JPEG_LINK=
  if test "$wxUSE_LIBJPEG" != "no" ; then
      AC_DEFINE(wxUSE_LIBJPEG)
  JPEG_LINK=
  if test "$wxUSE_LIBJPEG" != "no" ; then
      AC_DEFINE(wxUSE_LIBJPEG)
@@ -2007,17 +2093,12 @@ if test "$wxUSE_LIBJPEG" != "no" ; then
              fi
          fi
      fi
              fi
          fi
      fi
-
-    if test "$wxUSE_LIBJPEG" = "builtin" ; then
-        JPEG_INCLUDE="-I\${top_srcdir}/src/jpeg"
-    fi
  fi
  
  dnl ------------------------------------------------------------------------
  dnl Check for tiff library
  dnl ------------------------------------------------------------------------
  
  fi
  
  dnl ------------------------------------------------------------------------
  dnl Check for tiff library
  dnl ------------------------------------------------------------------------
  
-TIFF_INCLUDE=
  TIFF_LINK=
  TIFF_PREREQ_LINKS=-lm
  if test "$wxUSE_LIBTIFF" != "no" ; then
  TIFF_LINK=
  TIFF_PREREQ_LINKS=-lm
  if test "$wxUSE_LIBTIFF" != "no" ; then
@@ -2033,10 +2114,12 @@ if test "$wxUSE_LIBTIFF" != "no" ; then
              TIFF_PREREQ_LINKS="$TIFF_PREREQ_LINKS $ZLIB_LINK"
          fi
          AC_CHECK_HEADER(tiffio.h,
              TIFF_PREREQ_LINKS="$TIFF_PREREQ_LINKS $ZLIB_LINK"
          fi
          AC_CHECK_HEADER(tiffio.h,
-                        AC_CHECK_LIB(tiff, TIFFError,
-                                     TIFF_LINK=" -ltiff",
-                                     ,
-                                     $TIFF_PREREQ_LINKS)
+                        [
+                            AC_CHECK_LIB(tiff, TIFFError,
+                                         TIFF_LINK=" -ltiff",
+                                         ,
+                                         $TIFF_PREREQ_LINKS)
+                        ]
                         )
  
          if test "x$TIFF_LINK" = "x" ; then
                         )
  
          if test "x$TIFF_LINK" = "x" ; then
@@ -2051,12 +2134,75 @@ if test "$wxUSE_LIBTIFF" != "no" ; then
              wxUSE_LIBTIFF=sys
          fi
      fi
              wxUSE_LIBTIFF=sys
          fi
      fi
+fi
  
  
-    if test "$wxUSE_LIBTIFF" = "builtin" ; then
-        TIFF_INCLUDE="-I\${top_srcdir}/src/tiff"
+dnl ------------------------------------------------------------------------
+dnl Check for expat libraries
+dnl ------------------------------------------------------------------------
+
+if test "$wxUSE_EXPAT" != "no"; then
+    wxUSE_XML=yes
+    AC_DEFINE(wxUSE_EXPAT)
+    AC_DEFINE(wxUSE_XML)
+    
+    if test "$wxUSE_EXPAT" = "sys" -o "$wxUSE_EXPAT" = "yes" ; then           
+        AC_CHECK_HEADER([expat.h], [found_expat_h=1])
+        if test "x$found_expat_h" = "x1"; then
+            dnl Expat 1.95.6 comes with broken expat.h:
+            AC_CACHE_CHECK([if expat.h is valid C++ header],
+                wx_cv_expat_is_not_broken,
+                [
+                AC_LANG_SAVE
+                AC_LANG_CPLUSPLUS
+                AC_TRY_COMPILE([#include <expat.h>],[],
+                    wx_cv_expat_is_not_broken=yes,
+                    wx_cv_expat_is_not_broken=no
+                )
+                AC_LANG_RESTORE
+                ]
+            )
+            if test "$wx_cv_expat_is_not_broken" = "yes" ; then
+                AC_CHECK_LIB(expat, XML_ParserCreate, EXPAT_LINK=" -lexpat")
+            fi
+        fi
+        if test "x$EXPAT_LINK" = "x" ; then
+            if test "$wxUSE_EXPAT" = "sys" ; then
+                AC_MSG_ERROR([system expat library not found! Use --with-expat=builtin to use built-in version])
+            else
+                AC_MSG_WARN([system expat library not found, will use built-in instead])
+                wxUSE_EXPAT=builtin
+            fi
+        else
+            dnl we are using the system library
+            wxUSE_EXPAT=sys
+        fi
+    fi
+    if test "$wxUSE_EXPAT" = "builtin" ; then
+        dnl Expat needs this:
+        AC_CONFIG_SUBDIRS([src/expat])
      fi
  fi
  
      fi
  fi
  
+
+dnl ------------------------------------------------------------------------
+dnl Check for libmspack
+dnl ------------------------------------------------------------------------
+
+if test "$wxUSE_LIBMSPACK" != "no"; then
+    
+    AC_CHECK_HEADER([mspack.h], [found_mspack_h=1])
+    if test "x$found_mspack_h" = "x1"; then
+        AC_CHECK_LIB(mspack, mspack_create_chm_decompressor,
+                     MSPACK_LINK=" -lmspack")
+    fi
+    if test "x$MSPACK_LINK" = "x" ; then
+        wxUSE_LIBMSPACK=no
+    else
+        AC_DEFINE(wxUSE_LIBMSPACK)
+    fi
+fi
+
+
  dnl ----------------------------------------------------------------
  dnl search for toolkit (widget sets)
  dnl ----------------------------------------------------------------
  dnl ----------------------------------------------------------------
  dnl search for toolkit (widget sets)
  dnl ----------------------------------------------------------------
@@ -2077,29 +2223,6 @@ if test "$USE_WIN32" = 1 ; then
          AC_MSG_ERROR(please set CFLAGS to contain the location of windows.h)
      ])
  
          AC_MSG_ERROR(please set CFLAGS to contain the location of windows.h)
      ])
  
-    dnl check if can use _WIN32_IE macro
-    AC_CACHE_CHECK([if w32api has good enough MSIE support], wx_cv_w32api_win32_ie,
-    [
-      AC_TRY_COMPILE([#include <w32api.h>],
-                     [
-                       #define wxCHECK_W32API_VERSION( major, minor ) \
-                       ( defined( __W32API_MAJOR_VERSION ) && defined( __W32API_MINOR_VERSION ) \
-                       && ( ( __W32API_MAJOR_VERSION > (major) ) \
-                       || ( __W32API_MAJOR_VERSION == (major) && __W32API_MINOR_VERSION >= (minor))))
-
-                       #if !wxCHECK_W32API_VERSION(1,1)
-                       #error You need w32api 1.1 or newer
-                       #endif
-                     ], [
-                        wx_cv_w32api_win32_ie=yes
-                     ], [
-                        wx_cv_w32api_win32_ie=no
-                     ])
-    ])
-    if test "$wx_cv_w32api_win32_ie" = "yes" ; then
-        CPPFLAGS="$CPPFLAGS -D_WIN32_IE=0x400"
-    fi
-
      dnl --- FIXME: This is still a somewhat random list of libs,
      dnl ---        some of them should probably be included conditionally.
      LIBS="$LIBS -lwinspool -lwinmm -lshell32 -lcomctl32 -lcomdlg32 -lctl3d32 -ladvapi32 -lwsock32 -lgdi32"
      dnl --- FIXME: This is still a somewhat random list of libs,
      dnl ---        some of them should probably be included conditionally.
      LIBS="$LIBS -lwinspool -lwinmm -lshell32 -lcomctl32 -lcomdlg32 -lctl3d32 -ladvapi32 -lwsock32 -lgdi32"
@@ -2132,16 +2255,6 @@ if test "$USE_WIN32" = 1 ; then
      WIN32INSTALL=win32install
  fi
  
      WIN32INSTALL=win32install
  fi
  
-if test "$USE_DARWIN" = 1; then
-    dnl Mac OS X/Darwin GCC uses precompiled headers by default
-    dnl this can cause problems both when compiling wxMac and wxBase
-    if test "$wxUSE_PRECOMP" = "yes"; then
-        CPPFLAGS="$CPPFLAGS -cpp-precomp"
-    else
-        CPPFLAGS="$CPPFLAGS -no-cpp-precomp"
-    fi
-fi
-
  if test "$wxUSE_GUI" = "yes"; then
      USE_GUI=1
  
  if test "$wxUSE_GUI" = "yes"; then
      USE_GUI=1
  
@@ -2154,6 +2267,14 @@ if test "$wxUSE_GUI" = "yes"; then
      if test "$wxUSE_MSW" = 1 ; then
          TOOLKIT=MSW
          GUIDIST=MSW_DIST
      if test "$wxUSE_MSW" = 1 ; then
          TOOLKIT=MSW
          GUIDIST=MSW_DIST
+
+        dnl -mwindows causes a heap of other default gui libs to be linked in.
+        dnl FIXME: If cygwin needs this, please push it above, if not, please
+        dnl        remove this comment :-)
+        case "${host}" in
+            *-*-mingw32* )
+                WXCONFIG_LDFLAGS_GUI="$LDFLAGS -Wl,--subsystem,windows -mwindows"
+        esac
      fi
  
      if test "$wxUSE_GTK" = 1; then
      fi
  
      if test "$wxUSE_GTK" = 1; then
@@ -2228,7 +2349,7 @@ equivalent variable and GTK+ is version 1.2.3 or above.
                  PKG_CHECK_MODULES(PANGOFT2, pangoft2,
                      [
                          CXXFLAGS="$CXXFLAGS $PANGOFT2_CFLAGS"
                  PKG_CHECK_MODULES(PANGOFT2, pangoft2,
                      [
                          CXXFLAGS="$CXXFLAGS $PANGOFT2_CFLAGS"
-                        LIBS="$LIBS $PANGOFT2_LIBS"
+                        GUI_TK_LIBRARY="$GUI_TK_LIBRARY $PANGOFT2_LIBS"
                      ],
                      [
                          AC_MSG_WARN([pangoft2 library not found, library will be compiled without printing support])
                      ],
                      [
                          AC_MSG_WARN([pangoft2 library not found, library will be compiled without printing support])
@@ -2250,7 +2371,7 @@ equivalent variable and GTK+ is version 1.2.3 or above.
          fi
  
          TOOLKIT_INCLUDE="$wx_cv_cflags_gtk"
          fi
  
          TOOLKIT_INCLUDE="$wx_cv_cflags_gtk"
-        GUI_TK_LIBRARY="$wx_cv_libs_gtk"
+        GUI_TK_LIBRARY="$wx_cv_libs_gtk $GUI_TK_LIBRARY"
  
          AFMINSTALL=afminstall
          TOOLKIT=GTK
  
          AFMINSTALL=afminstall
          TOOLKIT=GTK
@@ -2271,13 +2392,16 @@ equivalent variable and GTK+ is version 1.2.3 or above.
  
          AC_MSG_CHECKING(for libmgl location)
          dnl Find MGL library that we want
  
          AC_MSG_CHECKING(for libmgl location)
          dnl Find MGL library that we want
-        dnl FIXME_MGL - test for MGL variants for freebsd etc.
+        dnl FIXME_MGL - test for MGL variants for freebsd etc.;
+        dnl             and for non-x86 versions
          case "${host}" in
              *-*-linux* )
          case "${host}" in
              *-*-linux* )
+              dnl glibc.so, glibc are for older versions of MGL,
+              dnl x86/a, x86/so are used by >= 5.0 R11
                if test "x$wxUSE_SHARED" = xyes ; then
                if test "x$wxUSE_SHARED" = xyes ; then
-                  mgl_os_candidates="linux/gcc/glibc.so linux/gcc/glibc"
+                  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 )
@@ -2377,49 +2501,11 @@ equivalent variable and GTK+ is version 1.2.3 or above.
              fi
          fi
  
              fi
          fi
  
-        xpm_link=
-        AC_MSG_CHECKING(for Xpm library)
-        WX_PATH_FIND_LIBRARIES($SEARCH_LIB,Xpm)
-        if test "$ac_find_libraries" != "" ; then
-            WX_LINK_PATH_EXIST($ac_find_libraries,$GUI_TK_LIBRARY)
-            GUI_TK_LIBRARY="$GUI_TK_LIBRARY$ac_path_to_link"
-            xpm_link=" -lXpm"
-            AC_DEFINE(wxHAVE_LIB_XPM)
-            AC_MSG_RESULT(found at $ac_find_libraries)
-        else
-            AC_TRY_COMPILE(
-                [
-                    #include <X11/xpm.h>
-                ],
-                [
-                    int version;
-                    version = XpmLibraryVersion();
-                ],
-                [
-                    xpm_link=" -lXpm"
-                    AC_DEFINE(wxHAVE_LIB_XPM)
-                    AC_MSG_RESULT(found in default search path)
-                    COMPILED_X_PROGRAM=0
-                ],
-                [
-                    AC_MSG_RESULT(no)
-                    AC_MSG_WARN(library will be compiled without support for images in XPM format)
-                ]
-            )
-        fi
-
-        AC_CHECK_LIB([Xext], [XShapeQueryExtension],
-                     [
-                      GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXext"
-                      wxHAVE_XEXT_LIB=1
-                     ],
-                     [], [$GUI_TK_LIBRARY -lX11])
-
          if test "$wxUSE_UNICODE" = "yes"; then
                  PKG_CHECK_MODULES(PANGOX, pangox,
                      [
                          CXXFLAGS="$CXXFLAGS $PANGOX_CFLAGS"
          if test "$wxUSE_UNICODE" = "yes"; then
                  PKG_CHECK_MODULES(PANGOX, pangox,
                      [
                          CXXFLAGS="$CXXFLAGS $PANGOX_CFLAGS"
-                        LIBS="$LIBS $PANGOX_LIBS"
+                        GUI_TK_LIBRARY="$GUI_TK_LIBRARY $PANGOX_LIBS"
                      ],
                      [
                          AC_MSG_ERROR([pangox library not found, library cannot be compiled in Unicode mode])
                      ],
                      [
                          AC_MSG_ERROR([pangox library not found, library cannot be compiled in Unicode mode])
@@ -2428,7 +2514,7 @@ equivalent variable and GTK+ is version 1.2.3 or above.
                  PKG_CHECK_MODULES(PANGOFT2, pangoft2,
                      [
                          CXXFLAGS="$CXXFLAGS $PANGOFT2_CFLAGS"
                  PKG_CHECK_MODULES(PANGOFT2, pangoft2,
                      [
                          CXXFLAGS="$CXXFLAGS $PANGOFT2_CFLAGS"
-                        LIBS="$LIBS $PANGOFT2_LIBS"
+                        GUI_TK_LIBRARY="$GUI_TK_LIBRARY $PANGOFT2_LIBS"
                      ],
                      [
                          AC_MSG_WARN([pangoft2 library not found, library will be compiled without printing support])
                      ],
                      [
                          AC_MSG_WARN([pangoft2 library not found, library will be compiled without printing support])
@@ -2438,7 +2524,7 @@ equivalent variable and GTK+ is version 1.2.3 or above.
                  PKG_CHECK_MODULES(PANGOXFT, pangoxft,
                      [
                          CXXFLAGS="$CXXFLAGS $PANGOXFT_CFLAGS"
                  PKG_CHECK_MODULES(PANGOXFT, pangoxft,
                      [
                          CXXFLAGS="$CXXFLAGS $PANGOXFT_CFLAGS"
-                        LIBS="$LIBS $PANGOXFT_LIBS"
+                        GUI_TK_LIBRARY="$GUI_TK_LIBRARY $PANGOXFT_LIBS"
                      ],
                      [
                          AC_MSG_WARN([pangoxft library not found, library will be compiled without anti-aliasing support])
                      ],
                      [
                          AC_MSG_WARN([pangoxft library not found, library will be compiled without anti-aliasing support])
@@ -2453,7 +2539,7 @@ equivalent variable and GTK+ is version 1.2.3 or above.
              TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__NANOX__ -DMWPIXEL_FORMAT=MWPF_TRUECOLOR0888 -DHAVE_FILEIO -DHAVE_BMP_SUPPORT=1 -DHAVE_GIF_SUPPORT=1 -DHAVE_PNM_SUPPORT=1 -DHAVE_XPM_SUPPORT=1 -DUNIX=1 -DUSE_EXPOSURE -DSCREEN_HEIGHT=480 -DSCREEN_WIDTH=640 -DSCREEN_DEPTH=4 -DX11=1"
              GUI_TK_LIBRARY="$GUI_TK_LIBRARY \$(MICROWIN)/src/lib/libnano-X.a"
          else
              TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__NANOX__ -DMWPIXEL_FORMAT=MWPF_TRUECOLOR0888 -DHAVE_FILEIO -DHAVE_BMP_SUPPORT=1 -DHAVE_GIF_SUPPORT=1 -DHAVE_PNM_SUPPORT=1 -DHAVE_XPM_SUPPORT=1 -DUNIX=1 -DUSE_EXPOSURE -DSCREEN_HEIGHT=480 -DSCREEN_WIDTH=640 -DSCREEN_DEPTH=4 -DX11=1"
              GUI_TK_LIBRARY="$GUI_TK_LIBRARY \$(MICROWIN)/src/lib/libnano-X.a"
          else
-            GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lX11$xpm_link"
+            GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lX11"
          fi
  
          TOOLKIT_VPATH="\${top_srcdir}/src/x11"
          fi
  
          TOOLKIT_VPATH="\${top_srcdir}/src/x11"
@@ -2540,53 +2626,16 @@ equivalent variable and GTK+ is version 1.2.3 or above.
              fi
          fi
  
              fi
          fi
  
-        xpm_link=
-        AC_MSG_CHECKING(for Xpm library)
-        WX_PATH_FIND_LIBRARIES($SEARCH_LIB,Xpm)
-        if test "$ac_find_libraries" != "" ; then
-            WX_LINK_PATH_EXIST($ac_find_libraries,$GUI_TK_LIBRARY)
-            GUI_TK_LIBRARY="$GUI_TK_LIBRARY$ac_path_to_link"
-
-            xpm_link=" -lXpm"
-            AC_DEFINE(wxHAVE_LIB_XPM)
-            AC_MSG_RESULT(found at $ac_find_libraries)
-        else
-            save_CFLAGS=$CFLAGS
-            CFLAGS="$CFLAGS $TOOLKIT_INCLUDE"
-
-            AC_TRY_COMPILE(
-                [
-                    #include <X11/xpm.h>
-                ],
-                [
-                    int version;
-                    version = XpmLibraryVersion();
-                ],
-                [
-                    xpm_link=" -lXpm"
-                    AC_DEFINE(wxHAVE_LIB_XPM)
-                    AC_MSG_RESULT(found in default search path)
-                    COMPILED_X_PROGRAM=0
-                ],
-                [
-                    AC_MSG_RESULT(no)
-                    AC_MSG_WARN(library will be compiled without support for images in XPM format)
-                ]
-            )
-
-            CFLAGS=$save_CFLAGS
-        fi
-
          AC_MSG_CHECKING([if we need -lXp and/or -lSM -lICE])
          libp_link=""
          libsm_ice_link=""
          libs_found=0
          for libp in "" " -lXp"; do
              if test "$libs_found" = "0"; then
          AC_MSG_CHECKING([if we need -lXp and/or -lSM -lICE])
          libp_link=""
          libsm_ice_link=""
          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"
                      if test "$libs_found" = "0"; then
                          save_LIBS="$LIBS"
-                        LIBS="$GUI_TK_LIBRARY -lXm${xpm_link} ${libp} -lXmu -lXext -lXt${libsm_ice} -lX11"
+                        LIBS="$GUI_TK_LIBRARY -lXm ${libp} -lXmu -lXext -lXt${libsm_ice} -lX11"
                          save_CFLAGS=$CFLAGS
                          CFLAGS="$CFLAGS $TOOLKIT_INCLUDE"
  
                          save_CFLAGS=$CFLAGS
                          CFLAGS="$CFLAGS $TOOLKIT_INCLUDE"
  
@@ -2643,45 +2692,109 @@ equivalent variable and GTK+ is version 1.2.3 or above.
                         ])
          CFLAGS=$save_CFLAGS
  
                         ])
          CFLAGS=$save_CFLAGS
  
-        GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXm$xpm_link${libp_link} -lXmu -lXext -lXt${libsm_ice_link} -lX11"
+        GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXm${libp_link} -lXmu -lXext -lXt${libsm_ice_link} -lX11"
          TOOLKIT_VPATH="\${top_srcdir}/src/motif${PATH_IFS}\${top_srcdir}/src/motif/xmcombo${PATH_IFS}\${top_srcdir}/src/x11"
          TOOLKIT=MOTIF
          GUIDIST=MOTIF_DIST
          TOOLKIT_VPATH="\${top_srcdir}/src/motif${PATH_IFS}\${top_srcdir}/src/motif/xmcombo${PATH_IFS}\${top_srcdir}/src/x11"
          TOOLKIT=MOTIF
          GUIDIST=MOTIF_DIST
-        wxHAVE_XEXT_LIB=1
      fi
  
      fi
  
-    if test "$wxUSE_X11" = 1 -o "$wxUSE_MOTIF" = 1 &&
-       test "$wxHAVE_XEXT_LIB" = 1; then
-        save_CFLAGS="$CFLAGS"
-        CFLAGS="$CFLAGS $TOOLKIT_INCLUDE"
+    if test "$wxUSE_X11" = 1 -o "$wxUSE_MOTIF" = 1; then
+        dnl test for external libxpm if we're configured to use it
+        if test "$wxUSE_LIBXPM" = "sys"; then
+            AC_MSG_CHECKING(for Xpm library)
+            WX_PATH_FIND_LIBRARIES($SEARCH_LIB,Xpm)
+            if test "$ac_find_libraries" != "" ; then
+                WX_LINK_PATH_EXIST($ac_find_libraries,$GUI_TK_LIBRARY)
+                GUI_TK_LIBRARY="$GUI_TK_LIBRARY$ac_path_to_link"
+                AC_MSG_RESULT(found at $ac_find_libraries)
  
  
-        AC_MSG_CHECKING([for X11/extensions/shape.h])
-        AC_TRY_COMPILE([
-                        #include <X11/Xlib.h> 
-                        #include <X11/extensions/shape.h>
-                       ],
-                       [
-                        int dummy1, dummy2;
-                        XShapeQueryExtension((Display*)NULL,
-                                             (int*)NULL, (int*)NULL);
-                       ],
-                       [
-                        AC_DEFINE(HAVE_XSHAPE)
-                        AC_MSG_RESULT([found])
-                       ],
-                       [
-                        AC_MSG_RESULT([not found])
-                       ])
-        CFLAGS="$save_CFLAGS"
+                AC_CACHE_CHECK([for X11/xpm.h],
+                    wx_cv_x11_xpm_h,
+                    [
+                        save_CFLAGS=$CFLAGS
+                        CFLAGS="$CFLAGS $TOOLKIT_INCLUDE"
+
+                        AC_TRY_COMPILE(
+                            [
+                                #include <X11/xpm.h>
+                            ],
+                            [
+                                int version;
+                                version = XpmLibraryVersion();
+                            ],
+                            wx_cv_x11_xpm_h=yes,
+                            wx_cv_x11_xpm_h=no
+                        )
+
+                        CFLAGS=$save_CFLAGS
+                    ]
+                )
+
+                if test $wx_cv_x11_xpm_h = "yes"; then
+                    GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXpm"
+                    AC_DEFINE(wxHAVE_LIB_XPM)
+                else
+                    AC_MSG_WARN([built-in less efficient XPM decoder will be used])
+                fi
+            fi
+
+        fi
+
+        dnl XShapeQueryExtension checks: first the library, then prototype
+        AC_CHECK_LIB([Xext], [XShapeQueryExtension],
+                     [
+                      GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXext"
+                      wxHAVE_XEXT_LIB=1
+                     ],
+                     [], [$GUI_TK_LIBRARY -lX11])
+
+        if test "$wxHAVE_XEXT_LIB" = 1; then
+            save_CFLAGS="$CFLAGS"
+            CFLAGS="$CFLAGS $TOOLKIT_INCLUDE"
+
+            AC_MSG_CHECKING([for X11/extensions/shape.h])
+            AC_TRY_COMPILE([
+                            #include <X11/Xlib.h> 
+                            #include <X11/extensions/shape.h>
+                           ],
+                           [
+                            int dummy1, dummy2;
+                            XShapeQueryExtension((Display*)NULL,
+                                                 (int*)NULL, (int*)NULL);
+                           ],
+                           [
+                            AC_DEFINE(HAVE_XSHAPE)
+                            AC_MSG_RESULT([found])
+                           ],
+                           [
+                            AC_MSG_RESULT([not found])
+                           ])
+            CFLAGS="$save_CFLAGS"
+
+        fi
      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"
+        AC_MSG_CHECKING([for compiler syntax to enable Pascal strings])
+        if test "$GCC" = yes; then
+            AC_MSG_RESULT([gcc])
+            CPPFLAGS_PASCAL="-fpascal-strings"
+        elif test "`echo $CXX | sed -e 's@.*/@@'`" = "xlC"; then
+            AC_MSG_RESULT([xlc])
+            CPPFLAGS_PASCAL="-qmacpstr"
+        else
+            AC_MSG_RESULT([none])
+        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
          dnl we can't call this MAC_DIST or autoconf thinks its a macro
          GUIDIST=MACX_DIST
  
          TOOLKIT_VPATH="\${top_srcdir}/src/mac${PATH_IFS}\${top_srcdir}/src/mac/morefilex"
          TOOLKIT=MAC
          dnl we can't call this MAC_DIST or autoconf thinks its a macro
          GUIDIST=MACX_DIST
+        dnl wxMac version of wxBase and wxCocoa or wxBase-only built on Darwin
+        dnl are different, so they need different names:
+        WXBASEPORT="_carbon"
      fi
  
      if test "$wxUSE_COCOA" = 1; then
      fi
  
      if test "$wxUSE_COCOA" = 1; then
@@ -2693,8 +2806,6 @@ equivalent variable and GTK+ is version 1.2.3 or above.
      if test "$wxUSE_PM" = 1; then
          TOOLKIT=PM
          GUIDIST=GTK_DIST
      if test "$wxUSE_PM" = 1; then
          TOOLKIT=PM
          GUIDIST=GTK_DIST
-        AC_MSG_WARN([OS/2 threads are not yet supported... disabled])
-        wxUSE_THREADS="no"
      fi
  
      dnl the name of the directory where the files for this toolkit live
      fi
  
      dnl the name of the directory where the files for this toolkit live
@@ -2798,31 +2909,42 @@ IODBC_C_SRC=""
  dnl ODBC is handled seperately for MSW 
  if test "$TOOLKIT" != "MSW" ; then
  
  dnl ODBC is handled seperately for MSW 
  if test "$TOOLKIT" != "MSW" ; then
  
+    if test "$wxUSE_ODBC" = "sys" -o "$wxUSE_ODBC" = "yes" ; then
+        dnl This is not ideal we really ough to use the unixodbc-config
+        dnl  or iodbc-config if they exist.
+
+        AC_CHECK_HEADER([sql.h], [found_sql_h=1])
+        if test "x$found_sql_h" = "x1" ; then
+            AC_CHECK_LIB(iodbc, SQLAllocEnv, ODBC_LINK=" -liodbc",
+            [
+                AC_CHECK_LIB(unixodbc, SQLAllocEnv, ODBC_LINK=" -lunixodbc",
+                [
+                    AC_CHECK_LIB(odbc, SQLAllocEnv, ODBC_LINK=" -lodbc")
+                ])
+            ])
+        fi 
+        if test "x$ODBC_LINK" = "x" ; then
+            if test "$wxUSE_ODBC" = "sys" ; then
+                AC_MSG_ERROR([system ODBC library not found! Use --with-odbc=builtin to use built-in version])
+            else
+                AC_MSG_WARN([system ODBC library not found, will use built-in instead])
+                wxUSE_ODBC=builtin
+            fi
+        else
+            dnl we are using the system library
+            wxUSE_ODBC=sys
+        fi
+    fi
      if test "$wxUSE_ODBC" != "no" ; then
          AC_DEFINE(wxUSE_ODBC)
      if test "$wxUSE_ODBC" != "no" ; then
          AC_DEFINE(wxUSE_ODBC)
+        if test "$wxUSE_ODBC" = "builtin" ; then
+            AC_DEFINE(wxUSE_BUILTIN_IODBC)
+        fi
          SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS db"
      
          dnl is this still necessary in 2.5?
          WXODBCFLAG="-D_IODBC_"
          SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS db"
      
          dnl is this still necessary in 2.5?
          WXODBCFLAG="-D_IODBC_"
-
-
-        if test "$wxUSE_ODBC" = "sys" ; then
-            dnl This is not ideal we really ough to use the unixodbc-config
-            dnl  or iodbc-config if they exist.
-
-            AC_CHECK_HEADER(sql.h)
-            AC_SEARCH_LIBS(SQLAllocEnv,iodbc unixodbc odbc , , [ 
-                wxUSE_ODBC=builtin; 
-                AC_MSG_WARN( [ can't find system Odbc library falling back to builtin ])
-            ] )
-        fi
-        dnl Not "no" either...
-        if test "$wxUSE_ODBC" != "sys" ; then
-            ALL_OBJECTS="${ALL_OBJECTS} \$(IODBCOBJS)"
-        fi
-
      fi
      fi
-    
  fi
  
  if test "$wxUSE_REGEX" = "builtin" ; then
  fi
  
  if test "$wxUSE_REGEX" = "builtin" ; then
@@ -2832,10 +2954,52 @@ if test "$wxUSE_ZLIB" = "builtin" ; then
      ALL_OBJECTS="${ALL_OBJECTS} \$(ZLIBOBJS)"
  fi
  
      ALL_OBJECTS="${ALL_OBJECTS} \$(ZLIBOBJS)"
  fi
  
+dnl ---------------------------------------------------------------------------
+dnl Xinerama (for unix wxDisplay) - Brian Victor
+dnl ---------------------------------------------------------------------------
+if test "$wxUSE_DISPLAY" = "yes"; then
+    if test "$wxUSE_UNIX" = "yes" -a "$wxUSE_MAC" != 1; then
+        AC_MSG_CHECKING([for Xinerama])
+        WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],Xinerama)
+        if test "$ac_find_libraries" != "" ; then
+            WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS])
+            if test "$ac_path_to_link" != " -L/usr/lib" ; then
+                LDFLAGS="$LDFLAGS $ac_path_to_link"
+            fi
+            GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXinerama"
+            AC_MSG_RESULT([yes])
+
+            AC_MSG_CHECKING([for Xxf86vm extension])
+            WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],Xxf86vm)
+            if test "$ac_find_libraries" != "" ; then
+                AC_MSG_RESULT([yes])
+                AC_CHECK_HEADERS([X11/extensions/xf86vmode.h],
+                                 [
+                                  GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXxf86vm"
+                                 ],
+                                 [], 
+                                 [
+                                      #if HAVE_X11_XLIB_H
+                                        #include <X11/Xlib.h>
+                                      #endif
+                                 ])
+            else
+                AC_MSG_RESULT([no])
+            fi
+        
+        else
+            AC_MSG_RESULT([no])
+            AC_MSG_WARN("*** Xinerama not found; disabling wxDisplay")
+            wxUSE_DISPLAY="no"
+        fi
+    fi
+fi
+
  dnl ---------------------------------------------------------------------------
  dnl OpenGL libraries
  dnl ---------------------------------------------------------------------------
  
  dnl ---------------------------------------------------------------------------
  dnl OpenGL libraries
  dnl ---------------------------------------------------------------------------
  
+USE_OPENGL=0
  if test "$wxUSE_OPENGL" = "yes"; then
      if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = "1"; then
          OPENGL_LIBS="-framework OpenGL -framework AGL"
  if test "$wxUSE_OPENGL" = "yes"; then
      if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = "1"; then
          OPENGL_LIBS="-framework OpenGL -framework AGL"
@@ -2849,10 +3013,8 @@ if test "$wxUSE_OPENGL" = "yes"; then
          WX_PATH_FIND_INCLUDES($SEARCH_INCLUDE, GL/gl.h)
          if test "$ac_find_includes" != "" ; then
              AC_MSG_RESULT(found in $ac_find_includes)
          WX_PATH_FIND_INCLUDES($SEARCH_INCLUDE, GL/gl.h)
          if test "$ac_find_includes" != "" ; then
              AC_MSG_RESULT(found in $ac_find_includes)
-            set -x
              WX_INCLUDE_PATH_EXIST($ac_find_includes, $CPPFLAGS)
              CPPFLAGS="$CPPFLAGS$ac_path_to_include"
              WX_INCLUDE_PATH_EXIST($ac_find_includes, $CPPFLAGS)
              CPPFLAGS="$CPPFLAGS$ac_path_to_include"
-            set +x
          fi
  
          AC_CHECK_HEADER(GL/gl.h,
          fi
  
          AC_CHECK_HEADER(GL/gl.h,
@@ -2884,7 +3046,7 @@ if test "$wxUSE_OPENGL" = "yes"; then
                      fi
                  fi
  
                      fi
                  fi
  
-                if "$found_gl" != 1; then
+                if test "$found_gl" != 1; then
                      AC_MSG_RESULT([no])
                      AC_MSG_CHECKING([for -lMesaGL])
                      WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],MesaGL)
                      AC_MSG_RESULT([no])
                      AC_MSG_CHECKING([for -lMesaGL])
                      WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],MesaGL)
@@ -2908,9 +3070,10 @@ if test "$wxUSE_OPENGL" = "yes"; then
      fi
  
      if test "$wxUSE_OPENGL" = "yes"; then
      fi
  
      if test "$wxUSE_OPENGL" = "yes"; then
+        USE_OPENGL=1
          AC_DEFINE(wxUSE_OPENGL)
          AC_DEFINE(wxUSE_GLCANVAS)
          AC_DEFINE(wxUSE_OPENGL)
          AC_DEFINE(wxUSE_GLCANVAS)
-        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS opengl"
+        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS opengl opengl/cube opengl/penguin opengl/isosurf"
      fi
  fi
  
      fi
  fi
  
@@ -2931,13 +3094,18 @@ if test "$wxUSE_UNICODE" = "yes"; then
  fi
  
  lib_debug_suffix=
  fi
  
  lib_debug_suffix=
-BUILD=release
+DEBUG_FLAG=0
  if test "$wxUSE_DEBUG_FLAG" = "yes"; then
      lib_debug_suffix=d
  if test "$wxUSE_DEBUG_FLAG" = "yes"; then
      lib_debug_suffix=d
-    BUILD=debug
+    DEBUG_FLAG=1
+fi
+
+DEBUG_INFO=0
+if test "$wxUSE_DEBUG_INFO" = "yes"; then
+    DEBUG_INFO=1
  fi
  
  fi
  
-WX_VERSION_TAG=`echo WX${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}_${WX_RELEASE} | tr "[[a-z]]" "[[A-Z]]"`
+WX_VERSION_TAG=`echo WX${lib_unicode_suffix}${lib_debug_suffix}_${WX_RELEASE} | tr "[[a-z]]" "[[A-Z]]"`
  
  TOOLCHAIN_NAME="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}-${WX_RELEASE}"
  TOOLCHAIN_NAME_GL="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}_gl-${WX_RELEASE}"
  
  TOOLCHAIN_NAME="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}-${WX_RELEASE}"
  TOOLCHAIN_NAME_GL="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}_gl-${WX_RELEASE}"
@@ -2945,12 +3113,14 @@ TOOLCHAIN_NAME_GL="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_su
  if test "$cross_compiling" = "yes"; then
      TOOLCHAIN_NAME="${TOOLCHAIN_NAME}-${host_alias}"
      TOOLCHAIN_NAME_GL="${TOOLCHAIN_NAME_GL}-${host_alias}"
  if test "$cross_compiling" = "yes"; then
      TOOLCHAIN_NAME="${TOOLCHAIN_NAME}-${host_alias}"
      TOOLCHAIN_NAME_GL="${TOOLCHAIN_NAME_GL}-${host_alias}"
+    HOST_SUFFIX="-${host_alias}"
  fi
  
  dnl library link name
  WX_LIBRARY="wx_${TOOLCHAIN_NAME}"
  WX_LIBRARY_GL="wx_${TOOLCHAIN_NAME_GL}"
  fi
  
  dnl library link name
  WX_LIBRARY="wx_${TOOLCHAIN_NAME}"
  WX_LIBRARY_GL="wx_${TOOLCHAIN_NAME_GL}"
-WX_LIBRARY_BASENAME="wx_${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}"
+WX_LIBRARY_BASENAME_NOGUI="wx_base${WXBASEPORT}${lib_unicode_suffix}${lib_debug_suffix}"
+WX_LIBRARY_BASENAME_GUI="wx_${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}"
  
  dnl the name of the shared library
  WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}.${SO_SUFFIX}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}"
  
  dnl the name of the shared library
  WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}.${SO_SUFFIX}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}"
@@ -2964,22 +3134,8 @@ WX_LIBRARY_LINK2_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}"
  
  case "${host}" in
      *-*-cygwin* | *-*-mingw32* )
  
  case "${host}" in
      *-*-cygwin* | *-*-mingw32* )
-
-        dnl If we are cross compiling we want to use the 'full' unix type name for the
-        dnl lib, but for a native install use the windows style naming convention.
-        dnl (excepting again that we strip the ELF style version numbers off it).
-
-        dnl FIXME: is this GL stuff actually even used for wxMSW?  should it be??
-
-        if test "$cross_compiling" != "yes" -a "$TOOLKIT_DIR" = "msw"; then
-            WX_LIBRARY="wxmsw${WX_MSW_VERSION}${lib_unicode_suffix}${lib_debug_suffix}"
-            WX_LIBRARY_GL="wxmsw_gl${WX_MSW_VERSION}${lib_unicode_suffix}${lib_debug_suffix}"
-            WX_LIBRARY_NAME_SHARED="${WX_LIBRARY}.${SO_SUFFIX}"
-            WX_LIBRARY_NAME_SHARED_GL="${WX_LIBRARY_GL}.${SO_SUFFIX}"
-        else
-            WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}.${SO_SUFFIX}"
-            WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}"
-        fi
+        WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}.${SO_SUFFIX}"
+        WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}"
          ;;
  
      *-*-darwin* )
          ;;
  
      *-*-darwin* )
@@ -3042,7 +3198,7 @@ if test "$wxUSE_SHARED" = "yes"; then
      case "${host}" in
        *-*-linux* | *-*-gnu* )
          SAMPLES_RPATH_FLAG="-Wl,-rpath,\$(top_builddir)lib"
      case "${host}" in
        *-*-linux* | *-*-gnu* )
          SAMPLES_RPATH_FLAG="-Wl,-rpath,\$(top_builddir)lib"
-      ;;
+       ;;
  
        *-*-solaris2* )
          if test "$GCC" = yes ; then
  
        *-*-solaris2* )
          if test "$GCC" = yes ; then
@@ -3081,16 +3237,21 @@ if test "$wxUSE_SHARED" = "yes"; then
              SAMPLES_RPATH_FLAG="-R\$(top_builddir)lib"
          fi
        ;;
              SAMPLES_RPATH_FLAG="-R\$(top_builddir)lib"
          fi
        ;;
-
-      *-*-cygwin* | *-*-mingw32* )
-        dnl Don't build seperate GL library
-        WX_ALL="\$(build_libdir)/${WX_LIBRARY_NAME_SHARED}"
-        WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
-
-        if test "$wxUSE_OPENGL" = "yes"; then
-            LIBS="${LIBS} ${OPENGL_LIBS}"
-        fi
+      
+      powerpc-*-darwin* )
+        SAMPLES_RPATH_POSTLINK="\$(top_builddir)change-install-names \$(LIBDIRNAME) \$(prefix) \$@"
+        cat <<EOF >change-install-names
+#!/bin/sh
+libnames=\`cd \${1} ; ls -1 | grep '\.[[0-9]][[0-9]]*\.dylib\$'\`
+inst_cmd="install_name_tool "
+for i in \${libnames} ; do
+    inst_cmd="\${inst_cmd} -change \${2}/lib/\${i} \${1}/\${i}"
+done
+\${inst_cmd} \${3}
+EOF
+        chmod +x change-install-names
        ;;
        ;;
+      
      esac
  
      dnl set target to shared if not explicitly chose static before
      esac
  
      dnl set target to shared if not explicitly chose static before
@@ -3588,12 +3749,16 @@ AC_CHECK_FUNCS(inet_addr,
      [
          AC_CHECK_LIB(nsl, inet_addr,
              INET_LINK="nsl",
      [
          AC_CHECK_LIB(nsl, inet_addr,
              INET_LINK="nsl",
-            AC_CHECK_LIB(resolv, inet_addr,
-                INET_LINK="resolv",
-                AC_CHECK_LIB(socket, inet_addr,
-                    INET_LINK="socket"
+            [
+                AC_CHECK_LIB(resolv, inet_addr,
+                    INET_LINK="resolv",
+                    [
+                        AC_CHECK_LIB(socket, inet_addr,
+                            INET_LINK="socket"
+                        )
+                    ]
                  )
                  )
-            )
+            ]
          )
      ]
  )
          )
      ]
  )
@@ -3619,13 +3784,27 @@ dnl Checks specific to contrib libs (MMedia)
  dnl ------------------------------------------
  
  dnl Check for ESD:
  dnl ------------------------------------------
  
  dnl Check for ESD:
-ESD_LINK=
-AC_CHECK_HEADER([esd.h], [
-  AC_CHECK_LIB(esd, esd_close, [
-    ESD_LINK="-lesd"
+EXTRALIBS_ESD=
+AC_CHECK_LIB(esd, esd_close, [
+    AC_CHECK_HEADERS([esd.h], [
+    EXTRALIBS_ESD="-lesd"
    ])
  ])
    ])
  ])
-
+AC_SUBST(EXTRALIBS_ESD)
+
+dnl check for known CD-ROM interface
+AC_MSG_CHECKING([for known CD-ROM interface])
+AC_TRY_COMPILE([#ifdef __linux__
+                #include <linux/cdrom.h>
+                #else
+                /* For Solaris */
+                #include <sys/cdio.h>
+                #endif
+                ],
+               [struct cdrom_tocentry entry, old_entry;],
+               [AC_MSG_RESULT([yes])
+                AC_DEFINE(HAVE_KNOWN_CDROM_INTERFACE)],
+               [AC_MSG_RESULT([no])])
  
  dnl ===========================================================================
  dnl Now we have all the info we need - use it!
  
  dnl ===========================================================================
  dnl Now we have all the info we need - use it!
@@ -3635,12 +3814,13 @@ dnl flush the cache
  AC_CACHE_SAVE
  
  dnl ---------------------------------------------------------------------------
  AC_CACHE_SAVE
  
  dnl ---------------------------------------------------------------------------
-dnl thread support for Unix (for Win32 see past the next matching "else")
+dnl thread support for Unix (for Win32 and OS/2 see past
+dnl                          the next matching "else")
  dnl ---------------------------------------------------------------------------
  
  dnl under MSW (except mingw32) we always have thread support
  CPP_MT_FLAG=
  dnl ---------------------------------------------------------------------------
  
  dnl under MSW (except mingw32) we always have thread support
  CPP_MT_FLAG=
-if test "$TOOLKIT" != "MSW"; then
+if test "$TOOLKIT" != "MSW" -a "$USE_OS2" != 1; then
  
      dnl the code below:
      dnl
  
      dnl the code below:
      dnl
@@ -3867,22 +4047,26 @@ if test "$TOOLKIT" != "MSW"; then
                      AC_DEFINE(HAVE_PTHREAD_CANCEL),
                      AC_MSG_WARN([wxThread::Kill() will not work properly]))
  
                      AC_DEFINE(HAVE_PTHREAD_CANCEL),
                      AC_MSG_WARN([wxThread::Kill() will not work properly]))
  
-      AC_CACHE_CHECK([for pthread_cleanup_push/pop], wx_cv_func_pthread_cleanup_push,
-      [
-        AC_TRY_COMPILE([#include <pthread.h>],
-                     [
-                        pthread_cleanup_push(NULL, NULL);
-                        pthread_cleanup_pop(0);
-                     ], [
-                        wx_cv_func_pthread_cleanup_push=yes
-                     ], [
-                        wx_cv_func_pthread_cleanup_push=no
-                     ])
-      ])
-
-      if test "$wx_cv_func_pthread_cleanup_push" = "yes"; then
-          AC_DEFINE(HAVE_THREAD_CLEANUP_FUNCTIONS)
-      fi
+      dnl we don't use pthread_cleanup_push/pop() any more in the code, but I
+      dnl the code here for now in case we need it again soon; otherwise it
+      dnl should be removed in a couple of months (VZ in Sep 2003)
+      dnl
+      dnl AC_CACHE_CHECK([for pthread_cleanup_push/pop], wx_cv_func_pthread_cleanup_push,
+      dnl [
+      dnl   AC_TRY_COMPILE([#include <pthread.h>],
+      dnl                [
+      dnl                   pthread_cleanup_push(NULL, NULL);
+      dnl                   pthread_cleanup_pop(0);
+      dnl                ], [
+      dnl                   wx_cv_func_pthread_cleanup_push=yes
+      dnl                ], [
+      dnl                   wx_cv_func_pthread_cleanup_push=no
+      dnl                ])
+      dnl ])
+      dnl 
+      dnl if test "$wx_cv_func_pthread_cleanup_push" = "yes"; then
+      dnl     AC_DEFINE(HAVE_THREAD_CLEANUP_FUNCTIONS)
+      dnl fi
  
        dnl mutexattr_t initialization is done in quite different ways on different
        dnl platforms, so check for a few things:
  
        dnl mutexattr_t initialization is done in quite different ways on different
        dnl platforms, so check for a few things:
@@ -3961,6 +4145,11 @@ else
                  CFLAGS="$CFLAGS_OLD"
              fi
          ;;
                  CFLAGS="$CFLAGS_OLD"
              fi
          ;;
+        *-pc-os2*emx )
+            CFLAGS="$CFLAGS -Zmt -D__ST_MT_ERRNO__"
+            CXXFLAGS="$CXXFLAGS -Zmt -D__ST_MT_ERRNO__"
+            LDFLAGS="$LDFLAGS -Zmt"
+        ;;
        esac
      fi
  fi
        esac
      fi
  fi
@@ -4045,12 +4234,6 @@ if test "$GCC" = "yes" ; then
      if test "$wxUSE_PERMISSIVE" = "yes" ; then
          CODE_GEN_FLAGS="$CODE_GEN_FLAGS -fpermissive"
      fi
      if test "$wxUSE_PERMISSIVE" = "yes" ; then
          CODE_GEN_FLAGS="$CODE_GEN_FLAGS -fpermissive"
      fi
-    if test "$USE_WIN32" = 1 ; then
-        # I'm not even really sure what this was ever added to solve,
-        # but someone added it for mingw native builds, so I guess
-        # they had a reason, right??
-        CODE_GEN_FLAGS="$CODE_GEN_FLAGS -fno-pcc-struct-return"
-    fi
  
      dnl Ian Brown <ian.brown@printsoft.de> reports that versions of gcc before
      dnl 3.0 overflow the table of contents on rs6000 as they create an entry
  
      dnl Ian Brown <ian.brown@printsoft.de> reports that versions of gcc before
      dnl 3.0 overflow the table of contents on rs6000 as they create an entry
@@ -4099,12 +4282,6 @@ dnl ---------------------------------------------------------------------------
  dnl compatibility level
  dnl ---------------------------------------------------------------------------
  
  dnl compatibility level
  dnl ---------------------------------------------------------------------------
  
-if test "$WXWIN_COMPATIBILITY_2" = "yes"; then
-    AC_DEFINE(WXWIN_COMPATIBILITY_2)
-
-    WXWIN_COMPATIBILITY_2_2="yes"
-fi
-
  if test "x$WXWIN_COMPATIBILITY_2_2" = "xyes"; then
      AC_DEFINE(WXWIN_COMPATIBILITY_2_2)
  
  if test "x$WXWIN_COMPATIBILITY_2_2" = "xyes"; then
      AC_DEFINE(WXWIN_COMPATIBILITY_2_2)
  
@@ -4149,6 +4326,10 @@ dnl ---------------------------------------------------------------------------
  dnl Register non-GUI class options for makefiles and setup.h
  dnl ---------------------------------------------------------------------------
  
  dnl Register non-GUI class options for makefiles and setup.h
  dnl ---------------------------------------------------------------------------
  
+if test "$wxUSE_STL" = "yes"; then
+  AC_DEFINE(wxUSE_STL)
+fi
+
  if test "$wxUSE_APPLE_IEEE" = "yes"; then
    AC_DEFINE(wxUSE_APPLE_IEEE)
  fi
  if test "$wxUSE_APPLE_IEEE" = "yes"; then
    AC_DEFINE(wxUSE_APPLE_IEEE)
  fi
@@ -4185,10 +4366,6 @@ if test "$wxUSE_FILESYSTEM" = "yes"; then
    AC_DEFINE(wxUSE_FILESYSTEM)
  fi
  
    AC_DEFINE(wxUSE_FILESYSTEM)
  fi
  
-if test "$wxUSE_FS_INET" = "yes"; then
-  AC_DEFINE(wxUSE_FS_INET)
-fi
-
  if test "$wxUSE_FS_ZIP" = "yes"; then
    AC_DEFINE(wxUSE_FS_ZIP)
  fi
  if test "$wxUSE_FS_ZIP" = "yes"; then
    AC_DEFINE(wxUSE_FS_ZIP)
  fi
@@ -4197,6 +4374,10 @@ if test "$wxUSE_ZIPSTREAM" = "yes"; then
    AC_DEFINE(wxUSE_ZIPSTREAM)
  fi
  
    AC_DEFINE(wxUSE_ZIPSTREAM)
  fi
  
+if test "$wxUSE_GZSTREAM" = "yes"; then
+  AC_DEFINE(wxUSE_GZSTREAM)
+fi
+
  if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes"; then
    AC_DEFINE(wxUSE_ON_FATAL_EXCEPTION)
  fi
  if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes"; then
    AC_DEFINE(wxUSE_ON_FATAL_EXCEPTION)
  fi
@@ -4423,12 +4604,16 @@ dnl ------------------------------------------------------------------------
  dnl wxSocket
  dnl ------------------------------------------------------------------------
  
  dnl wxSocket
  dnl ------------------------------------------------------------------------
  
-dnl VZ: the GUI hooks wxSocket needs are not implemented yet in wxMGL
+dnl VZ: the GUI hooks wxSocket needs are not implemented yet in some toolkits
  if test "$wxUSE_SOCKETS" = "yes"; then
      if test "$wxUSE_MGL" = "1"; then
          AC_MSG_WARN([wxSocket not yet supported under MGL... disabled])
          wxUSE_SOCKETS="no"
      fi
  if test "$wxUSE_SOCKETS" = "yes"; then
      if test "$wxUSE_MGL" = "1"; then
          AC_MSG_WARN([wxSocket not yet supported under MGL... disabled])
          wxUSE_SOCKETS="no"
      fi
+    if test "$wxUSE_COCOA" = "1"; then
+        AC_MSG_WARN([wxSocket not yet supported under Cocoa... disabled])
+        wxUSE_SOCKETS="no"
+    fi
  fi
  
  if test "$wxUSE_SOCKETS" = "yes"; then
  fi
  
  if test "$wxUSE_SOCKETS" = "yes"; then
@@ -4436,15 +4621,17 @@ if test "$wxUSE_SOCKETS" = "yes"; then
      if test "$TOOLKIT" != "MSW"; then
          dnl under Solaris and OS/2, socket functions live in -lsocket
          AC_CHECK_FUNC(socket,,
      if test "$TOOLKIT" != "MSW"; then
          dnl under Solaris and OS/2, socket functions live in -lsocket
          AC_CHECK_FUNC(socket,,
-            AC_CHECK_LIB(socket, socket,
-                if test "$INET_LINK" != " -lsocket"; then
-                    INET_LINK="$INET_LINK -lsocket"
-                fi,
-                [
-                    AC_MSG_WARN([socket library not found - sockets will be disabled])
-                    wxUSE_SOCKETS=no
-                ]
-            )
+            [
+                AC_CHECK_LIB(socket, socket,
+                    if test "$INET_LINK" != " -lsocket"; then
+                        INET_LINK="$INET_LINK -lsocket"
+                    fi,
+                    [
+                        AC_MSG_WARN([socket library not found - sockets will be disabled])
+                        wxUSE_SOCKETS=no
+                    ]
+                )
+            ]
          )
      fi
  fi
          )
      fi
  fi
@@ -4523,6 +4710,46 @@ if test "$wxUSE_SOCKETS" = "yes" ; then
      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS sockets"
  fi
  
      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS sockets"
  fi
  
+if test "$wxUSE_PROTOCOL" = "yes"; then
+    if test "$wxUSE_SOCKETS" != "yes"; then
+        AC_MSG_WARN(Protocol classes require sockets... disabled)
+        wxUSE_PROTOCOL=no
+    fi
+fi
+
+if test "$wxUSE_PROTOCOL" = "yes"; then
+    AC_DEFINE(wxUSE_PROTOCOL)
+
+    if test "$wxUSE_PROTOCOL_HTTP" = "yes"; then
+        AC_DEFINE(wxUSE_PROTOCOL_HTTP)
+    fi
+    if test "$wxUSE_PROTOCOL_FTP" = "yes"; then
+        AC_DEFINE(wxUSE_PROTOCOL_FTP)
+    fi
+    if test "$wxUSE_PROTOCOL_FILE" = "yes"; then
+        AC_DEFINE(wxUSE_PROTOCOL_FILE)
+    fi
+else
+    if test "$wxUSE_FS_INET" = "yes"; then
+        AC_MSG_WARN([HTTP filesystem require protocol classes... disabled])   
+        wxUSE_FS_INET="no"
+    fi
+fi
+
+if test "$wxUSE_URL" = "yes"; then
+    if test "$wxUSE_PROTOCOL" != "yes"; then
+        AC_MSG_WARN(wxURL class requires wxProtocol... disabled)
+        wxUSE_URL=no
+    fi
+    if test "$wxUSE_URL" = "yes"; then
+        AC_DEFINE(wxUSE_URL)
+    fi
+fi
+
+if test "$wxUSE_FS_INET" = "yes"; then
+  AC_DEFINE(wxUSE_FS_INET)
+fi
+
  dnl ---------------------------------------------------------------------------
  dnl Joystick support
  dnl ---------------------------------------------------------------------------
  dnl ---------------------------------------------------------------------------
  dnl Joystick support
  dnl ---------------------------------------------------------------------------
@@ -4533,16 +4760,8 @@ if test "$wxUSE_GUI" = "yes"; then
          AC_MSG_WARN([Joystick not yet supported under Mac OS X... disabled])
          wxUSE_JOYSTICK=no
       fi
          AC_MSG_WARN([Joystick not yet supported under Mac OS X... disabled])
          wxUSE_JOYSTICK=no
       fi
-    if test "$TOOLKIT" = "MOTIF"; then
-        AC_MSG_WARN([Joystick not yet supported under Motif... disabled])
-        wxUSE_JOYSTICK=no
-     fi
-    if test "$TOOLKIT" = "X11"; then
-        AC_MSG_WARN([Joystick not yet supported under X11... disabled])
-        wxUSE_JOYSTICK=no
-     fi
-
-    dnl under MSW we always have joystick support
+    
+     dnl under MSW we always have joystick support
      if test "$TOOLKIT" != "MSW"; then
          if test "$wxUSE_JOYSTICK" = "yes"; then
              dnl joystick support is only for Linux 2.1.x or greater
      if test "$TOOLKIT" != "MSW"; then
          if test "$wxUSE_JOYSTICK" = "yes"; then
              dnl joystick support is only for Linux 2.1.x or greater
@@ -4565,7 +4784,7 @@ dnl DLL support
  dnl ------------------------------------------------------------------------
  
  dnl under MSW we always have LoadLibrary/GetProcAddress
  dnl ------------------------------------------------------------------------
  
  dnl under MSW we always have LoadLibrary/GetProcAddress
-if test "$TOOLKIT" != "MSW"; then
+if test "$TOOLKIT" != "MSW" -a "$USE_OS2" != 1; then
  
      HAVE_DL_FUNCS=0
      HAVE_SHL_FUNCS=0
  
      HAVE_DL_FUNCS=0
      HAVE_SHL_FUNCS=0
@@ -4608,8 +4827,11 @@ if test "$TOOLKIT" != "MSW"; then
          dnl check also for dlerror()
          if test "$HAVE_DL_FUNCS" = 1; then
              AC_CHECK_FUNCS(dlerror,
          dnl check also for dlerror()
          if test "$HAVE_DL_FUNCS" = 1; then
              AC_CHECK_FUNCS(dlerror,
-                           AC_DEFINE(HAVE_DLERROR),
-                           AC_CHECK_LIB(dl, dlerror, AC_DEFINE(HAVE_DLERROR)))
+                AC_DEFINE(HAVE_DLERROR),
+                [
+                    AC_CHECK_LIB(dl, dlerror, AC_DEFINE(HAVE_DLERROR))
+                ]
+            )
          fi
          fi
  
          fi
          fi
  
@@ -4629,7 +4851,8 @@ fi
  
  if test "$wxUSE_DYNAMIC_LOADER" = "yes" ; then
      AC_DEFINE(wxUSE_DYNAMIC_LOADER)
  
  if test "$wxUSE_DYNAMIC_LOADER" = "yes" ; then
      AC_DEFINE(wxUSE_DYNAMIC_LOADER)
-elif test "$wxUSE_DYNLIB_CLASS" = "yes" ; then
+fi
+if test "$wxUSE_DYNLIB_CLASS" = "yes" ; then
      AC_DEFINE(wxUSE_DYNLIB_CLASS)
  fi
  
      AC_DEFINE(wxUSE_DYNLIB_CLASS)
  fi
  
@@ -4644,11 +4867,11 @@ fi
  if test "$wxUSE_UNICODE" = "yes" ; then
    AC_DEFINE(wxUSE_UNICODE)
  
  if test "$wxUSE_UNICODE" = "yes" ; then
    AC_DEFINE(wxUSE_UNICODE)
  
-  if test "$wxUSE_MSW" != 1; then
+  if test "$USE_WIN32" != 1; then
        wxUSE_UNICODE_MSLU=no
    fi
  
        wxUSE_UNICODE_MSLU=no
    fi
  
-  if test "$wxUSE_MSW" = 1 -a "$wxUSE_UNICODE_MSLU" = "yes"; then
+  if test "$USE_WIN32" = 1 -a "$wxUSE_UNICODE_MSLU" = "yes"; then
          AC_CHECK_LIB(unicows,main,
              [
                  AC_DEFINE(wxUSE_UNICODE_MSLU)
          AC_CHECK_LIB(unicows,main,
              [
                  AC_DEFINE(wxUSE_UNICODE_MSLU)
@@ -4687,17 +4910,8 @@ if test "$wxUSE_CONSTRAINTS" = "yes"; then
  fi
  
  if test "$wxUSE_MDI_ARCHITECTURE" = "yes"; then
  fi
  
  if test "$wxUSE_MDI_ARCHITECTURE" = "yes"; then
-
-dnl     There is now experimental generic MDI support
-dnl     if test "$wxUSE_UNIVERSAL" = "yes"; then
-dnl         AC_MSG_WARN(MDI not yet supported for wxUniversal... disabled)
-dnl         wxUSE_MDI_ARCHITECTURE=no
-dnl     fi
-
-   if test "$wxUSE_MDI_ARCHITECTURE" = "yes"; then
-       AC_DEFINE(wxUSE_MDI_ARCHITECTURE)
-       SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS mdi"
-   fi
+   AC_DEFINE(wxUSE_MDI_ARCHITECTURE)
+   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS mdi"
  fi
  
  if test "$wxUSE_DOC_VIEW_ARCHITECTURE" = "yes" ; then
  fi
  
  if test "$wxUSE_DOC_VIEW_ARCHITECTURE" = "yes" ; then
@@ -4924,6 +5138,11 @@ if test "$wxUSE_IMAGLIST" = "yes"; then
      AC_DEFINE(wxUSE_IMAGLIST)
  fi
  
      AC_DEFINE(wxUSE_IMAGLIST)
  fi
  
+if test "$wxUSE_LISTBOOK" = "yes"; then
+    AC_DEFINE(wxUSE_LISTBOOK)
+    USES_CONTROLS=1
+fi
+
  if test "$wxUSE_LISTBOX" = "yes"; then
      AC_DEFINE(wxUSE_LISTBOX)
      USES_CONTROLS=1
  if test "$wxUSE_LISTBOX" = "yes"; then
      AC_DEFINE(wxUSE_LISTBOX)
      USES_CONTROLS=1
@@ -5095,16 +5314,12 @@ if test "$wxUSE_POPUPWIN" = "yes"; then
      if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1 ; then
          AC_MSG_WARN([Popup window not yet supported under Mac OS X... disabled])
      else
      if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1 ; then
          AC_MSG_WARN([Popup window not yet supported under Mac OS X... disabled])
      else
-        if test "$wxUSE_MOTIF" = 1; then
-            AC_MSG_WARN([wxPopupWindow not yet supported under Motif... disabled])
+        if test "$wxUSE_PM" = 1; then
+            AC_MSG_WARN([wxPopupWindow not yet supported under PM... disabled])
          else
          else
-            if test "$wxUSE_PM" = 1; then
-                AC_MSG_WARN([wxPopupWindow not yet supported under PM... disabled])
-            else
-                AC_DEFINE(wxUSE_POPUPWIN)
+            AC_DEFINE(wxUSE_POPUPWIN)
  
  
-                USES_CONTROLS=1
-            fi
+            USES_CONTROLS=1
          fi
      fi
  fi
          fi
      fi
  fi
@@ -5125,19 +5340,26 @@ dnl ---------------------------------------------------------------------------
  dnl misc options
  dnl ---------------------------------------------------------------------------
  
  dnl misc options
  dnl ---------------------------------------------------------------------------
  
-dnl if test "$wxUSE_TREELAYOUT" = "yes"; then
-dnl     AC_DEFINE(wxUSE_TREELAYOUT)
-dnl     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS treelay"
-dnl fi
+dnl please keep the settings below in alphabetical order
+if test "$wxUSE_ACCESSIBILITY" = "yes"; then
+    AC_DEFINE(wxUSE_ACCESSIBILITY)
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS access"
+fi
  
  if test "$wxUSE_DRAGIMAGE" = "yes"; then
      AC_DEFINE(wxUSE_DRAGIMAGE)
      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dragimag"
  fi
  
  
  if test "$wxUSE_DRAGIMAGE" = "yes"; then
      AC_DEFINE(wxUSE_DRAGIMAGE)
      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dragimag"
  fi
  
-if test "$wxUSE_ACCESSIBILITY" = "yes"; then
-    AC_DEFINE(wxUSE_ACCESSIBILITY)
-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS access"
+if test "$wxUSE_EXCEPTIONS" = "yes"; then
+    AC_DEFINE(wxUSE_EXCEPTIONS)
+fi
+
+USE_HTML=0
+if test "$wxUSE_HTML" = "yes"; then
+    AC_DEFINE(wxUSE_HTML)
+    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
@@ -5153,55 +5375,20 @@ if test "$wxUSE_MIMETYPE" = "yes"; then
      AC_DEFINE(wxUSE_MIMETYPE)
  fi
  
      AC_DEFINE(wxUSE_MIMETYPE)
  fi
  
-if test "$wxUSE_SYSTEM_OPTIONS" = "yes"; then
-    AC_DEFINE(wxUSE_SYSTEM_OPTIONS)
-if test "$TOOLKIT" = "MSW"; then
-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS taskbar"
-fi
-
-fi
-
-if test "$wxUSE_PROTOCOL" = "yes"; then
-    if test "$wxUSE_SOCKETS" != "yes"; then
-        AC_MSG_WARN(Protocol classes require sockets... disabled)
-        wxUSE_PROTOCOL=no
-    fi
-
-    if test "$wxUSE_PROTOCOL" = "yes"; then
-        AC_DEFINE(wxUSE_PROTOCOL)
-
-        if test "$wxUSE_PROTOCOL_HTTP" = "yes"; then
-            AC_DEFINE(wxUSE_PROTOCOL_HTTP)
-        fi
-        if test "$wxUSE_PROTOCOL_FTP" = "yes"; then
-            AC_DEFINE(wxUSE_PROTOCOL_FTP)
-        fi
-        if test "$wxUSE_PROTOCOL_FILE" = "yes"; then
-            AC_DEFINE(wxUSE_PROTOCOL_FILE)
-        fi
-    fi
-fi
-
-if test "$wxUSE_URL" = "yes"; then
-    if test "$wxUSE_PROTOCOL" != "yes"; then
-        AC_MSG_WARN(wxURL class requires wxProtocol... disabled)
-        wxUSE_URL=no
-    fi
-    if test "$wxUSE_URL" = "yes"; then
-        AC_DEFINE(wxUSE_URL)
-    fi
-fi
-
  if test "$wxUSE_MINIFRAME" = "yes"; then
      AC_DEFINE(wxUSE_MINIFRAME)
      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS minifram"
  fi
  
  if test "$wxUSE_MINIFRAME" = "yes"; then
      AC_DEFINE(wxUSE_MINIFRAME)
      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS minifram"
  fi
  
-if test "$wxUSE_HTML" = "yes"; then
-    AC_DEFINE(wxUSE_HTML)
-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS html htlbox"
+if test "$wxUSE_SYSTEM_OPTIONS" = "yes"; then
+    AC_DEFINE(wxUSE_SYSTEM_OPTIONS)
+    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
      AC_DEFINE(wxUSE_VALIDATORS)
      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS validate"
  if test "$wxUSE_VALIDATORS" = "yes"; then
      AC_DEFINE(wxUSE_VALIDATORS)
      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS validate"
@@ -5211,41 +5398,45 @@ if test "$wxUSE_PALETTE" = "yes" ; then
    AC_DEFINE(wxUSE_PALETTE)
  fi
  
    AC_DEFINE(wxUSE_PALETTE)
  fi
  
-if test "$wxUSE_IMAGE" = "yes" ; then
-  AC_DEFINE(wxUSE_IMAGE)
+if test "$wxUSE_UNICODE" = "yes" -a "$wxUSE_UNICODE_MSLU" = "yes" ; then
+  dnl Must be done this late because -lunicows must be before all the other libs
+  LIBS=" -lunicows $LIBS"
  fi
  
  fi
  
-if test "$wxUSE_GIF" = "yes" ; then
-  AC_DEFINE(wxUSE_GIF)
-fi
+dnl ---------------------------------------------------------------------------
+dnl wxImage options
+dnl ---------------------------------------------------------------------------
  
  
-if test "$wxUSE_PCX" = "yes" ; then
-  AC_DEFINE(wxUSE_PCX)
-fi
+if test "$wxUSE_IMAGE" = "yes" ; then
+    AC_DEFINE(wxUSE_IMAGE)
  
  
-if test "$wxUSE_IFF" = "yes" ; then
-  AC_DEFINE(wxUSE_IFF)
-fi
+    if test "$wxUSE_GIF" = "yes" ; then
+      AC_DEFINE(wxUSE_GIF)
+    fi
  
  
-if test "$wxUSE_PNM" = "yes" ; then
-  AC_DEFINE(wxUSE_PNM)
-fi
+    if test "$wxUSE_PCX" = "yes" ; then
+      AC_DEFINE(wxUSE_PCX)
+    fi
  
  
-if test "$wxUSE_XPM" = "yes" ; then
-  AC_DEFINE(wxUSE_XPM)
-fi
+    if test "$wxUSE_IFF" = "yes" ; then
+      AC_DEFINE(wxUSE_IFF)
+    fi
  
  
-if test "$wxUSE_ICO_CUR" = "yes" ; then
-  AC_DEFINE(wxUSE_ICO_CUR)
-fi
+    if test "$wxUSE_PNM" = "yes" ; then
+      AC_DEFINE(wxUSE_PNM)
+    fi
  
  
-if test "$wxUSE_UNICODE" = "yes" -a "$wxUSE_UNICODE_MSLU" = "yes" ; then
-  dnl Must be done this late because -lunicows must be before all the other libs
-  LIBS=" -lunicows $LIBS"
+    if test "$wxUSE_XPM" = "yes" ; then
+      AC_DEFINE(wxUSE_XPM)
+    fi
+
+    if test "$wxUSE_ICO_CUR" = "yes" ; then
+      AC_DEFINE(wxUSE_ICO_CUR)
+    fi
  fi
  
  dnl ---------------------------------------------------------------------------
  fi
  
  dnl ---------------------------------------------------------------------------
-dnl common dialog
+dnl common dialogs
  dnl ---------------------------------------------------------------------------
  
  if test "$wxUSE_CHOICEDLG" = "yes"; then
  dnl ---------------------------------------------------------------------------
  
  if test "$wxUSE_CHOICEDLG" = "yes"; then
@@ -5343,6 +5534,33 @@ AC_DEFINE_UNQUOTED(wxINSTALL_PREFIX, "$wxPREFIX")
  dnl define the variables used in wx-config
  top_builddir_wxconfig=`pwd`
  
  dnl define the variables used in wx-config
  top_builddir_wxconfig=`pwd`
  
+
+dnl ---------------------------------------------------------------------------
+dnl define variables with all built libraries for wx-config
+dnl ---------------------------------------------------------------------------
+
+CORE_BASE_LIBS="net base"
+CORE_GUI_LIBS="adv core"
+
+if test "$wxUSE_XML" = "yes" ; then
+    CORE_BASE_LIBS="xml $CORE_BASE_LIBS"
+fi
+if test "$wxUSE_ODBC" != "no" ; then
+    CORE_BASE_LIBS="odbc $CORE_BASE_LIBS"
+    CORE_GUI_LIBS="dbgrid $CORE_GUI_LIBS"
+fi
+if test "$wxUSE_HTML" = "yes" ; then
+    CORE_GUI_LIBS="html $CORE_GUI_LIBS"
+fi
+
+if test "$wxUSE_GUI" != "yes"; then
+    CORE_GUI_LIBS=""
+fi
+
+AC_SUBST(CORE_BASE_LIBS)
+AC_SUBST(CORE_GUI_LIBS)
+
+
  dnl ---------------------------------------------------------------------------
  dnl Output the makefiles and such from the results found above
  dnl ---------------------------------------------------------------------------
  dnl ---------------------------------------------------------------------------
  dnl Output the makefiles and such from the results found above
  dnl ---------------------------------------------------------------------------
@@ -5408,8 +5626,6 @@ fi
  
  if test "$wxUSE_GUI" = "yes"; then
  
  
  if test "$wxUSE_GUI" = "yes"; then
  
-    LIBS="$GUI_TK_LIBRARY $PNG_LINK $JPEG_LINK $TIFF_LINK $LIBS"
-
      dnl TODO add checks that these samples will really compile (i.e. all the
      dnl      library features they need are present)
  
      dnl TODO add checks that these samples will really compile (i.e. all the
      dnl      library features they need are present)
  
@@ -5417,7 +5633,7 @@ if test "$wxUSE_GUI" = "yes"; then
      dnl      ipc, mfc, nativdlg, oleauto, ownerdrw
      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS artprov controls dialogs \
                       drawing dynamic erase event exec font image \
      dnl      ipc, mfc, nativdlg, oleauto, ownerdrw
      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS artprov controls dialogs \
                       drawing dynamic erase event exec font image \
-                     minimal propsize rotate shaped widgets"
+                     minimal propsize rotate shaped widgets render"
  
      if test "$wxUSE_MONOLITHIC" != "yes"; then
          SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS console"
  
      if test "$wxUSE_MONOLITHIC" != "yes"; then
          SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS console"
@@ -5429,15 +5645,12 @@ fi
  
  dnl all -I options we must pass to the compiler
  dnl
  
  dnl all -I options we must pass to the compiler
  dnl
-dnl note that the order is somewhat important, in particular the ZLIB_INCLUDE
-dnl and other stuff for the built in libraries should come first to avoid
-dnl including the system headers with the same name (it is particularly
-dnl important for zlib because XFree 4.2.0 has its own, horribly old and
-dnl incompatible, zlib.h) and the wxWindows headers should come first anyhow
+dnl note that the order is somewhat important: wxWindows headers should
+dnl come first and the one with setup.h should be before $(top_srcdir)/include
+dnl in case the latter contains setup.h used by non-autoconf makefiles (e.g.
+dnl CodeWarrior):
  INCLUDES="-I\${top_builddir}lib/wx/include/${TOOLCHAIN_NAME} \
  INCLUDES="-I\${top_builddir}lib/wx/include/${TOOLCHAIN_NAME} \
--I\${top_srcdir}/include \
-$REGEX_INCLUDE $ZLIB_INCLUDE $PNG_INCLUDE $JPEG_INCLUDE $TIFF_INCLUDE \
-$TOOLKIT_INCLUDE"
+-I\${top_srcdir}/include $TOOLKIT_INCLUDE"
  
  dnl C/C++ compiler options used to compile wxWindows
  if test "$GXX" = yes ; then
  
  dnl C/C++ compiler options used to compile wxWindows
  if test "$GXX" = yes ; then
@@ -5450,11 +5663,23 @@ fi
  EXTRA_CFLAGS="$WXDEBUG $WXODBCFLAG $PROFILE $OPTIMISE"
  
  dnl remove the extra white space from the cc/c++/ld options
  EXTRA_CFLAGS="$WXDEBUG $WXODBCFLAG $PROFILE $OPTIMISE"
  
  dnl remove the extra white space from the cc/c++/ld options
-CPPFLAGS=`echo $INCLUDES $CPPFLAGS | sed 's/ \\+/ /g'`
+CPPFLAGS=`echo $WXDEBUG_DEFINE $INCLUDES $CPPFLAGS | sed 's/ \\+/ /g'`
  CFLAGS=`echo $CODE_GEN_FLAGS $EXTRA_CFLAGS $CFLAGS $CXXWARNINGS | sed 's/ \\+/ /g'`
  CXXFLAGS=`echo $CODE_GEN_FLAGS $CODE_GEN_FLAGS_CXX $EXTRA_CFLAGS $CXXFLAGS $CXXWARNINGS | sed 's/ \+/ /g'`
  CFLAGS=`echo $CODE_GEN_FLAGS $EXTRA_CFLAGS $CFLAGS $CXXWARNINGS | sed 's/ \\+/ /g'`
  CXXFLAGS=`echo $CODE_GEN_FLAGS $CODE_GEN_FLAGS_CXX $EXTRA_CFLAGS $CXXFLAGS $CXXWARNINGS | sed 's/ \+/ /g'`
-LIBS=`echo $LIBS | sed 's/ \+/ /g'`
+    
  
  
+LIBS=`echo $LIBS | sed 's/ \+/ /g'`
+EXTRALIBS="$LDFLAGS $LDFLAGS_VERSIONING $LIBS $DMALLOC_LIBS"
+EXTRALIBS_XML="$EXPAT_LINK"
+EXTRALIBS_HTML="$MSPACK_LINK"
+EXTRALIBS_ODBC="$ODBC_LINK"
+if test "$wxUSE_GUI" = "yes"; then
+    EXTRALIBS_GUI=`echo $GUI_TK_LIBRARY $PNG_LINK $JPEG_LINK $TIFF_LINK | sed 's/ \+/ /g'`
+fi
+if test "$wxUSE_OPENGL" = "yes"; then
+    EXTRALIBS_OPENGL="$LDFLAGS_GL $OPENGL_LIBS"
+fi
+    
  LDFLAGS="$LDFLAGS $PROFILE"
  
  dnl wxGTK does not need TOOLKIT includes in wx-config
  LDFLAGS="$LDFLAGS $PROFILE"
  
  dnl wxGTK does not need TOOLKIT includes in wx-config
@@ -5464,6 +5689,39 @@ else
      WXCONFIG_INCLUDE="$TOOLKIT_INCLUDE"
  fi
  
      WXCONFIG_INCLUDE="$TOOLKIT_INCLUDE"
  fi
  
+WXCONFIG_EXTRALIBS="$LIBS"
+
+dnl wx-config must output builtin 3rd party libs in --libs in static build:
+if test "$wxUSE_REGEX" = "builtin" ; then
+    wxconfig_3rdparty="$wxconfig_3rdparty regex"
+fi
+if test "$wxUSE_EXPAT" = "builtin" ; then
+    wxconfig_3rdparty="$wxconfig_3rdparty expat"
+fi
+if test "$wxUSE_ODBC" = "builtin" ; then
+    wxconfig_3rdparty="$wxconfig_3rdparty odbc"
+fi
+if test "$wxUSE_LIBTIFF" = "builtin" ; then
+    wxconfig_3rdparty="$wxconfig_3rdparty tiff"
+fi
+if test "$wxUSE_LIBJPEG" = "builtin" ; then
+    wxconfig_3rdparty="$wxconfig_3rdparty jpeg"
+fi
+if test "$wxUSE_LIBPNG" = "builtin" ; then
+    wxconfig_3rdparty="$wxconfig_3rdparty png"
+fi
+if test "$wxUSE_ZLIB" = "builtin" ; then
+    wxconfig_3rdparty="$wxconfig_3rdparty zlib"
+fi
+if test "$wxUSE_ODBC" = "builtin" ; then
+    wxconfig_3rdparty="$wxconfig_3rdparty odbc"
+fi
+
+for i in $wxconfig_3rdparty ; do
+    WXCONFIG_EXTRALIBS="$WXCONFIG_EXTRALIBS -lwx${i}${lib_debug_suffix}${HOST_SUFFIX}"
+done
+
+
  if test "x$wxUSE_UNIVERSAL" = "xyes" ; then
      WXUNIV=1
  else
  if test "x$wxUSE_UNIVERSAL" = "xyes" ; then
      WXUNIV=1
  else
@@ -5472,39 +5730,72 @@ fi
  
  AC_SUBST(wxUSE_ZLIB)
  AC_SUBST(wxUSE_REGEX)
  
  AC_SUBST(wxUSE_ZLIB)
  AC_SUBST(wxUSE_REGEX)
+AC_SUBST(wxUSE_EXPAT)
  AC_SUBST(wxUSE_ODBC)
  AC_SUBST(wxUSE_LIBJPEG)
  AC_SUBST(wxUSE_LIBPNG)
  AC_SUBST(wxUSE_LIBTIFF)
  
  AC_SUBST(wxUSE_ODBC)
  AC_SUBST(wxUSE_LIBJPEG)
  AC_SUBST(wxUSE_LIBPNG)
  AC_SUBST(wxUSE_LIBTIFF)
  
-EXTRALIBS="$LDFLAGS $LDFLAGS_VERSIONING $LIBS $DMALLOC_LIBS"
-
  if test $wxUSE_MONOLITHIC = "yes" ; then
      MONOLITHIC=1
  else
      MONOLITHIC=0
  fi
  
  if test $wxUSE_MONOLITHIC = "yes" ; then
      MONOLITHIC=1
  else
      MONOLITHIC=0
  fi
  
-dnl FIXME -- make configurable!
-VENDOR="custom"
-OFFICIAL_BUILD=0
+if test $wxUSE_ODBC != "no" ; then
+    USE_ODBC=1
+else
+    USE_ODBC=0
+fi
+
+if test $wxUSE_OFFICIAL_BUILD = "yes" ; then
+    OFFICIAL_BUILD=1
+else
+    OFFICIAL_BUILD=0
+fi
+
  AC_SUBST(VENDOR)
  AC_SUBST(OFFICIAL_BUILD)
  
  AC_SUBST(WXUNIV)
  AC_SUBST(MONOLITHIC)
  AC_SUBST(VENDOR)
  AC_SUBST(OFFICIAL_BUILD)
  
  AC_SUBST(WXUNIV)
  AC_SUBST(MONOLITHIC)
+AC_SUBST(LIBS)
  AC_SUBST(EXTRALIBS)
  AC_SUBST(EXTRALIBS)
+AC_SUBST(EXTRALIBS_XML)
+AC_SUBST(EXTRALIBS_HTML)
+AC_SUBST(EXTRALIBS_ODBC)
+AC_SUBST(EXTRALIBS_GUI)
+AC_SUBST(EXTRALIBS_OPENGL)
  AC_SUBST(UNICODE)
  AC_SUBST(BUILD)
  AC_SUBST(UNICODE)
  AC_SUBST(BUILD)
+AC_SUBST(DEBUG_INFO)
+AC_SUBST(DEBUG_FLAG)
  AC_SUBST(SHARED)
  AC_SUBST(SHARED)
-TOOLKIT_LOWERCASE=`echo $TOOLKIT | tr [[A-Z]] [[a-z]]`
+TOOLKIT_LOWERCASE=`echo $TOOLKIT | tr "[[A-Z]]" "[[a-z]]"`
  AC_SUBST(TOOLKIT_LOWERCASE)
  AC_SUBST(TOOLKIT_VERSION)
  AC_SUBST(SAMPLES_RPATH_FLAG)
  AC_SUBST(TOOLKIT_LOWERCASE)
  AC_SUBST(TOOLKIT_VERSION)
  AC_SUBST(SAMPLES_RPATH_FLAG)
+AC_SUBST(SAMPLES_RPATH_POSTLINK)
+AC_SUBST(HOST_SUFFIX)
  
  AC_BAKEFILE
  
  
  
  AC_BAKEFILE
  
  
+dnl Find out if we have to define NO_GCC_PRAGMA and WX_PRECOMP:
+if test $GCC_PCH = 1 ; then
+    CODE_GEN_FLAGS="-DWX_PRECOMP -DNO_GCC_PRAGMA $CODE_GEN_FLAGS"
+    CPPFLAGS="-DWX_PRECOMP -DNO_GCC_PRAGMA $CPPFLAGS"
+else
+    case "${host}" in
+        powerpc-*-darwin* )
+            dnl Some Apple's GCC version are broken and can't handle the
+            dnl pragmas:
+            CODE_GEN_FLAGS="-DNO_GCC_PRAGMA $CODE_GEN_FLAGS"
+            CPPFLAGS="-DNO_GCC_PRAGMA $CPPFLAGS"
+            ;;
+    esac
+fi
+
  
  dnl for convenience, sort the samples in alphabetical order
  dnl
  
  dnl for convenience, sort the samples in alphabetical order
  dnl
@@ -5517,7 +5808,6 @@ dnl       only removes the Unix-like part of the introduced line break.
  SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq | tr '\n' ' '| tr -d '\r'`"
  
  dnl makefile variables
  SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq | tr '\n' ' '| tr -d '\r'`"
  
  dnl makefile variables
-AC_SUBST(LEX_STEM)
  AC_SUBST(PATH_IFS)
  
  dnl global options
  AC_SUBST(PATH_IFS)
  
  dnl global options
@@ -5526,7 +5816,8 @@ AC_SUBST(WX_MINOR_VERSION_NUMBER)
  AC_SUBST(WX_RELEASE_NUMBER)
  AC_SUBST(WX_LIBRARY_NAME_STATIC)
  AC_SUBST(WX_LIBRARY_NAME_SHARED)
  AC_SUBST(WX_RELEASE_NUMBER)
  AC_SUBST(WX_LIBRARY_NAME_STATIC)
  AC_SUBST(WX_LIBRARY_NAME_SHARED)
-AC_SUBST(WX_LIBRARY_BASENAME)
+AC_SUBST(WX_LIBRARY_BASENAME_NOGUI)
+AC_SUBST(WX_LIBRARY_BASENAME_GUI)
  AC_SUBST(WX_LIBRARY_IMPORTLIB)
  AC_SUBST(WX_TARGET_LIBRARY)
  AC_SUBST(WX_LIBRARY_LINK1)
  AC_SUBST(WX_LIBRARY_IMPORTLIB)
  AC_SUBST(WX_TARGET_LIBRARY)
  AC_SUBST(WX_LIBRARY_LINK1)
@@ -5569,12 +5860,14 @@ dnl wx-config options
  AC_SUBST(top_builddir_wxconfig)
  AC_SUBST(host_alias)
  AC_SUBST(cross_compiling)
  AC_SUBST(top_builddir_wxconfig)
  AC_SUBST(host_alias)
  AC_SUBST(cross_compiling)
+AC_SUBST(WXCONFIG_EXTRALIBS)
  AC_SUBST(WXCONFIG_LIBS)
  AC_SUBST(WXCONFIG_LIBS_GL)
  AC_SUBST(WXCONFIG_LIBS_STATIC)
  AC_SUBST(WXCONFIG_LIBS_STATIC_GL)
  AC_SUBST(WXCONFIG_INCLUDE)
  AC_SUBST(WXCONFIG_RPATH)
  AC_SUBST(WXCONFIG_LIBS)
  AC_SUBST(WXCONFIG_LIBS_GL)
  AC_SUBST(WXCONFIG_LIBS_STATIC)
  AC_SUBST(WXCONFIG_LIBS_STATIC_GL)
  AC_SUBST(WXCONFIG_INCLUDE)
  AC_SUBST(WXCONFIG_RPATH)
+AC_SUBST(WXCONFIG_LDFLAGS_GUI)
  AC_SUBST(WX_LARGEFILE_FLAGS)
  AC_SUBST(CODE_GEN_FLAGS)
  AC_SUBST(CODE_GEN_FLAGS_CXX)
  AC_SUBST(WX_LARGEFILE_FLAGS)
  AC_SUBST(CODE_GEN_FLAGS)
  AC_SUBST(CODE_GEN_FLAGS_CXX)
@@ -5626,9 +5919,6 @@ AC_SUBST(MAKEINFO)
  AC_SUBST(INSTALL_LIBRARY)
  AC_SUBST(INSTALL_DIR)
  
  AC_SUBST(INSTALL_LIBRARY)
  AC_SUBST(INSTALL_DIR)
  
-dnl contrib tests results:
-AC_SUBST(ESD_LINK)
-
  
  dnl MAKE_SET will be replaced with "MAKE=..." or nothing if make sets MAKE
  dnl itself (this macro is required if SUBDIRS variable is used in Makefile.am
  
  dnl MAKE_SET will be replaced with "MAKE=..." or nothing if make sets MAKE
  dnl itself (this macro is required if SUBDIRS variable is used in Makefile.am
@@ -5706,6 +5996,7 @@ for subdir in `echo $SUBDIRS`; do
              if test ${subdir} = "samples"; then
                  dnl only take those samples which compile in the current
                  dnl configuration and which exist
              if test ${subdir} = "samples"; then
                  dnl only take those samples which compile in the current
                  dnl configuration and which exist
+                makefiles="samples/Makefile.in $makefiles"
                  for sample in `echo $SAMPLES_SUBDIRS`; do
                      if test -d $srcdir/samples/$sample; then
                          makefiles="samples/$sample/Makefile.in $makefiles"
                  for sample in `echo $SAMPLES_SUBDIRS`; do
                      if test -d $srcdir/samples/$sample; then
                          makefiles="samples/$sample/Makefile.in $makefiles"
@@ -5718,11 +6009,12 @@ for subdir in `echo $SUBDIRS`; do
              dnl don't take all samples/utils, just those which build with
              dnl wxBase
              if test ${subdir} = "samples"; then
              dnl don't take all samples/utils, just those which build with
              dnl wxBase
              if test ${subdir} = "samples"; then
-                makefiles="samples/console/Makefile.in"
+                makefiles="samples/Makefile.in samples/console/Makefile.in"
              else dnl utils
                  makefiles="utils/HelpGen/Makefile.in \
                             utils/HelpGen/src/Makefile.in \
              else dnl utils
                  makefiles="utils/HelpGen/Makefile.in \
                             utils/HelpGen/src/Makefile.in \
-                           utils/makegen/Makefile.in"
+                           utils/tex2rtf/Makefile.in \
+                           utils/tex2rtf/src/Makefile.in"
              fi
          fi
  
              fi
          fi
  
@@ -5740,7 +6032,7 @@ dnl report on what we decided to do
  echo
  echo "Configured wxWindows ${WX_VERSION} for \`${host}'"
  echo ""
  echo
  echo "Configured wxWindows ${WX_VERSION} for \`${host}'"
  echo ""
-echo "  Which GUI toolkit should wxWindows use?                 ${TOOLKIT:-base only}"
+echo "  Which GUI toolkit should wxWindows use?                 ${TOOLKIT_LOWERCASE:-base only}"
  echo "  Should wxWindows be compiled into single library?       ${wxUSE_MONOLITHIC:-yes}"
  
  echo "  Should wxWindows be compiled in debug mode?             ${wxUSE_DEBUG:-no}"
  echo "  Should wxWindows be compiled into single library?       ${wxUSE_MONOLITHIC:-yes}"
  
  echo "  Should wxWindows be compiled in debug mode?             ${wxUSE_DEBUG:-no}"
@@ -5748,7 +6040,6 @@ echo "  Should wxWindows be linked as a shared library?         ${wxUSE_SHARED:-
  echo "  Should wxWindows be compiled in Unicode mode?           ${wxUSE_UNICODE:-no}"
  
  echo "  What level of wxWindows compatibility should be enabled?"
  echo "  Should wxWindows be compiled in Unicode mode?           ${wxUSE_UNICODE:-no}"
  
  echo "  What level of wxWindows compatibility should be enabled?"
-echo "                                       wxWindows 2.0      ${WXWIN_COMPATIBILITY_2:-no}"
  echo "                                       wxWindows 2.2      ${WXWIN_COMPATIBILITY_2_2:-no}"
  echo "                                       wxWindows 2.4      ${WXWIN_COMPATIBILITY_2_4:-yes}"
  
  echo "                                       wxWindows 2.2      ${WXWIN_COMPATIBILITY_2_2:-no}"
  echo "                                       wxWindows 2.4      ${WXWIN_COMPATIBILITY_2_4:-yes}"
  
@@ -5757,8 +6048,13 @@ echo "                                       jpeg               ${wxUSE_LIBJPEG-
  echo "                                       png                ${wxUSE_LIBPNG-none}"
  echo "                                       regex              ${wxUSE_REGEX}"
  echo "                                       tiff               ${wxUSE_LIBTIFF-none}"
  echo "                                       png                ${wxUSE_LIBPNG-none}"
  echo "                                       regex              ${wxUSE_REGEX}"
  echo "                                       tiff               ${wxUSE_LIBTIFF-none}"
+if test "$wxUSE_X11" = 1 -o "$wxUSE_MOTIF" = 1; then
+echo "                                       xpm                ${wxUSE_LIBXPM-none}"
+fi
  echo "                                       zlib               ${wxUSE_ZLIB}"
  echo "                                       odbc               ${wxUSE_ODBC}"
  echo "                                       zlib               ${wxUSE_ZLIB}"
  echo "                                       odbc               ${wxUSE_ODBC}"
+echo "                                       expat              ${wxUSE_EXPAT}"
+echo "                                       libmspack          ${wxUSE_LIBMSPACK}"
  
  echo ""
  
  
  echo ""