Header correction.

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

index b7ba447ca81eb6dcdf85e639a377b754e0969828..b88c06ef4799b732587870b4cf97deaf60b91aee 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -17,7 +17,7 @@ dnl ---------------------------------------------------------------------------
  dnl initialization
  dnl ---------------------------------------------------------------------------
  
  dnl initialization
  dnl ---------------------------------------------------------------------------
  
-AC_INIT([wxWidgets], [2.5.3], [wx-dev@lists.wxwidgets.org])
+AC_INIT([wxWidgets], [2.6.2], [wx-dev@lists.wxwidgets.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])
@@ -31,32 +31,11 @@ AC_CANONICAL_TARGET
  dnl When making releases do:
  dnl
  dnl wx_release_number += 1
  dnl When making releases do:
  dnl
  dnl wx_release_number += 1
-dnl
-dnl ..and update WX_CURRENT, WX_REVISION and WX_AGE according to the
-dnl following rules:
-dnl
-dnl    If any changes have been made to the public interface, that is if any
-dnl    exported class, method, global or global type has been added, removed
-dnl    or changed in any way, then do:  WX_CURRENT += 1
-dnl
-dnl    If source changes have been made that *do not* alter the public
-dnl    interface then do:  WX_REVISION += 1
-dnl    If WX_CURRENT was incremented (as above) instead do:  WX_REVISION = 0
-dnl
-dnl    If any public interface was added, do:  WX_AGE += 1
-dnl    If any public interface was removed (or altered in a way effectively
-dnl    removing the previous definition), instead do:  WX_AGE = 0
-dnl
-dnl When the major or minor version numbers are incremented, all the above
-dnl variables should be reset to 0.
-dnl
-dnl The resulting library name will be of the form:
-dnl   libwx_$(TOOLKIT)-$(WX_RELEASE).so.$(WX_CURRENT).$(WX_REVISION).$(WX_AGE)
  
  wx_major_version_number=2
  
  wx_major_version_number=2
-wx_minor_version_number=5
-wx_release_number=3
-wx_subrelease_number=0
+wx_minor_version_number=6
+wx_release_number=2
+wx_subrelease_number=1
  
  WX_RELEASE=$wx_major_version_number.$wx_minor_version_number
  WX_VERSION=$WX_RELEASE.$wx_release_number
  
  WX_RELEASE=$wx_major_version_number.$wx_minor_version_number
  WX_VERSION=$WX_RELEASE.$wx_release_number
@@ -64,9 +43,6 @@ WX_SUBVERSION=$WX_VERSION.$wx_subrelease_number
  
  WX_MSW_VERSION=$wx_major_version_number$wx_minor_version_number$wx_release_number
  
  
  WX_MSW_VERSION=$wx_major_version_number$wx_minor_version_number$wx_release_number
  
-WX_CURRENT=3
-WX_REVISION=0
-WX_AGE=0
  
  
  dnl ------------------------------------------------------------------------
  
  
  dnl ------------------------------------------------------------------------
@@ -145,6 +121,8 @@ SO_SUFFIX=so
  SAMPLES_RPATH_FLAG=
  SAMPLES_RPATH_POSTLINK=
  
  SAMPLES_RPATH_FLAG=
  SAMPLES_RPATH_POSTLINK=
  
+DEFAULT_STD_FLAG=yes
+
  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 and also define the shared library flags below - search for
  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 and also define the shared library flags below - search for
@@ -276,6 +254,7 @@ case "${host}" in
      PROGRAM_EXT=".exe"
      RESCOMP=windres
      DEFAULT_DEFAULT_wxUSE_MSW=1
      PROGRAM_EXT=".exe"
      RESCOMP=windres
      DEFAULT_DEFAULT_wxUSE_MSW=1
+    DEFAULT_STD_FLAG=no
    ;;
  
    *-pc-msdosdjgpp )
    ;;
  
    *-pc-msdosdjgpp )
@@ -284,8 +263,6 @@ case "${host}" in
      AC_DEFINE(__DOS__)
      PROGRAM_EXT=".exe"
      DEFAULT_DEFAULT_wxUSE_MGL=1
      AC_DEFINE(__DOS__)
      PROGRAM_EXT=".exe"
      DEFAULT_DEFAULT_wxUSE_MGL=1
-    dnl DJGPP needs explicit -lstdc++ for some reason (VS: mayb some versions only?)
-    LIBS="$LIBS -lstdc++"
    ;;
  
    *-pc-os2_emx | *-pc-os2-emx )
    ;;
  
    *-pc-os2_emx | *-pc-os2-emx )
@@ -319,6 +296,7 @@ case "${host}" in
      done
      export PATH="$ac_TEMP_PATH"
      unset ac_TEMP_PATH
      done
      export PATH="$ac_TEMP_PATH"
      unset ac_TEMP_PATH
+    DEFAULT_STD_FLAG=no
    ;;
  
    powerpc-*-darwin* )
    ;;
  
    powerpc-*-darwin* )
@@ -328,9 +306,21 @@ case "${host}" in
      SO_SUFFIX=dylib
      AC_DEFINE(__BSD__)
      AC_DEFINE(__DARWIN__)
      SO_SUFFIX=dylib
      AC_DEFINE(__BSD__)
      AC_DEFINE(__DARWIN__)
-    AC_DEFINE(__POWERPC__)
      AC_DEFINE(TARGET_CARBON)
      DEFAULT_DEFAULT_wxUSE_MAC=1
      AC_DEFINE(TARGET_CARBON)
      DEFAULT_DEFAULT_wxUSE_MAC=1
+    DEFAULT_STD_FLAG=no
+  ;;
+  powerpc-apple-macos* )
+    dnl Classic Mac OS (< X)
+    USE_UNIX=0
+    dnl For some reason the test that should be cross-compiler capable fails
+    dnl However, there is no doubt that MacOS PowerPC is big endian.
+    ac_cv_c_bigendian=yes
+    SO_SUFFIX=shlib
+    dnl AC_DEFINE(TARGET_CARBON)
+    dnl platform.h needs TARGET_CARBON before setup.h, we'll add it to CPPFLAGS
+    DEFAULT_DEFAULT_wxUSE_MAC=1
+    DEFAULT_STD_FLAG=no
    ;;
  
    *-*-beos* )
    ;;
  
    *-*-beos* )
@@ -372,6 +362,7 @@ if test $DEBUG_CONFIGURE = 1; then
    DEFAULT_wxUSE_NO_DEPS=no
    DEFAULT_wxUSE_NO_RTTI=no
    DEFAULT_wxUSE_NO_EXCEPTIONS=no
    DEFAULT_wxUSE_NO_DEPS=no
    DEFAULT_wxUSE_NO_RTTI=no
    DEFAULT_wxUSE_NO_EXCEPTIONS=no
+  DEFAULT_wxUSE_RPATH=yes
    DEFAULT_wxUSE_PERMISSIVE=no
    DEFAULT_wxUSE_DEBUG_FLAG=yes
    DEFAULT_wxUSE_DEBUG_INFO=yes
    DEFAULT_wxUSE_PERMISSIVE=no
    DEFAULT_wxUSE_DEBUG_FLAG=yes
    DEFAULT_wxUSE_DEBUG_INFO=yes
@@ -400,21 +391,27 @@ if test $DEBUG_CONFIGURE = 1; then
    DEFAULT_wxUSE_LIBXPM=no
    DEFAULT_wxUSE_LIBMSPACK=no
    DEFAULT_wxUSE_LIBSDL=no
    DEFAULT_wxUSE_LIBXPM=no
    DEFAULT_wxUSE_LIBMSPACK=no
    DEFAULT_wxUSE_LIBSDL=no
+  DEFAULT_wxUSE_LIBGNOMEPRINT=no
    DEFAULT_wxUSE_ODBC=no
    DEFAULT_wxUSE_OPENGL=no
  
    DEFAULT_wxUSE_ON_FATAL_EXCEPTION=no
    DEFAULT_wxUSE_ODBC=no
    DEFAULT_wxUSE_OPENGL=no
  
    DEFAULT_wxUSE_ON_FATAL_EXCEPTION=no
+  DEFAULT_wxUSE_STACKWALKER=no
+  DEFAULT_wxUSE_DEBUGREPORT=no
    DEFAULT_wxUSE_SNGLINST_CHECKER=no
    DEFAULT_wxUSE_STD_IOSTREAM=no
    DEFAULT_wxUSE_SNGLINST_CHECKER=no
    DEFAULT_wxUSE_STD_IOSTREAM=no
+  DEFAULT_wxUSE_STD_STRING=no
    DEFAULT_wxUSE_CMDLINE_PARSER=no
    DEFAULT_wxUSE_DATETIME=no
    DEFAULT_wxUSE_TIMER=no
    DEFAULT_wxUSE_STOPWATCH=no
    DEFAULT_wxUSE_FILE=no
    DEFAULT_wxUSE_FFILE=no
    DEFAULT_wxUSE_CMDLINE_PARSER=no
    DEFAULT_wxUSE_DATETIME=no
    DEFAULT_wxUSE_TIMER=no
    DEFAULT_wxUSE_STOPWATCH=no
    DEFAULT_wxUSE_FILE=no
    DEFAULT_wxUSE_FFILE=no
+  DEFAULT_wxUSE_STDPATHS=no
    DEFAULT_wxUSE_TEXTBUFFER=no
    DEFAULT_wxUSE_TEXTFILE=no
    DEFAULT_wxUSE_SOUND=no
    DEFAULT_wxUSE_TEXTBUFFER=no
    DEFAULT_wxUSE_TEXTFILE=no
    DEFAULT_wxUSE_SOUND=no
+  DEFAULT_wxUSE_MEDIACTRL=no  
    DEFAULT_wxUSE_INTL=no
    DEFAULT_wxUSE_CONFIG=no
    DEFAULT_wxUSE_FONTMAP=no
    DEFAULT_wxUSE_INTL=no
    DEFAULT_wxUSE_CONFIG=no
    DEFAULT_wxUSE_FONTMAP=no
@@ -438,6 +435,7 @@ if test $DEBUG_CONFIGURE = 1; then
    DEFAULT_wxUSE_DRAG_AND_DROP=no
    DEFAULT_wxUSE_DRAGIMAGE=no
    DEFAULT_wxUSE_SPLINES=no
    DEFAULT_wxUSE_DRAG_AND_DROP=no
    DEFAULT_wxUSE_DRAGIMAGE=no
    DEFAULT_wxUSE_SPLINES=no
+  DEFAULT_wxUSE_MOUSEWHEEL=no
  
    DEFAULT_wxUSE_MDI=no
    DEFAULT_wxUSE_MDI_ARCHITECTURE=no
  
    DEFAULT_wxUSE_MDI=no
    DEFAULT_wxUSE_MDI_ARCHITECTURE=no
@@ -484,6 +482,7 @@ if test $DEBUG_CONFIGURE = 1; then
    DEFAULT_wxUSE_FS_INET=no
    DEFAULT_wxUSE_FS_ZIP=no
    DEFAULT_wxUSE_BUSYINFO=no
    DEFAULT_wxUSE_FS_INET=no
    DEFAULT_wxUSE_FS_ZIP=no
    DEFAULT_wxUSE_BUSYINFO=no
+  DEFAULT_wxUSE_ARCHIVE_STREAMS=no
    DEFAULT_wxUSE_ZIPSTREAM=no
    DEFAULT_wxUSE_VALIDATORS=no
  
    DEFAULT_wxUSE_ZIPSTREAM=no
    DEFAULT_wxUSE_VALIDATORS=no
  
@@ -497,6 +496,7 @@ if test $DEBUG_CONFIGURE = 1; then
    DEFAULT_wxUSE_CHOICE=no
    DEFAULT_wxUSE_CHOICEBOOK=no
    DEFAULT_wxUSE_COMBOBOX=no
    DEFAULT_wxUSE_CHOICE=no
    DEFAULT_wxUSE_CHOICEBOOK=no
    DEFAULT_wxUSE_COMBOBOX=no
+  DEFAULT_wxUSE_DATEPICKCTRL=no
    DEFAULT_wxUSE_DISPLAY=no
    DEFAULT_wxUSE_GAUGE=no
    DEFAULT_wxUSE_GRID=no
    DEFAULT_wxUSE_DISPLAY=no
    DEFAULT_wxUSE_GAUGE=no
    DEFAULT_wxUSE_GRID=no
@@ -559,6 +559,7 @@ else
    DEFAULT_wxUSE_NO_DEPS=no
    DEFAULT_wxUSE_NO_RTTI=no
    DEFAULT_wxUSE_NO_EXCEPTIONS=no
    DEFAULT_wxUSE_NO_DEPS=no
    DEFAULT_wxUSE_NO_RTTI=no
    DEFAULT_wxUSE_NO_EXCEPTIONS=no
+  DEFAULT_wxUSE_RPATH=yes
    DEFAULT_wxUSE_PERMISSIVE=no
    DEFAULT_wxUSE_DEBUG_FLAG=no
    DEFAULT_wxUSE_DEBUG_INFO=no
    DEFAULT_wxUSE_PERMISSIVE=no
    DEFAULT_wxUSE_DEBUG_FLAG=no
    DEFAULT_wxUSE_DEBUG_INFO=no
@@ -586,21 +587,27 @@ else
    DEFAULT_wxUSE_LIBXPM=yes
    DEFAULT_wxUSE_LIBMSPACK=yes
    DEFAULT_wxUSE_LIBSDL=no
    DEFAULT_wxUSE_LIBXPM=yes
    DEFAULT_wxUSE_LIBMSPACK=yes
    DEFAULT_wxUSE_LIBSDL=no
+  DEFAULT_wxUSE_LIBGNOMEPRINT=no
    DEFAULT_wxUSE_ODBC=no
    DEFAULT_wxUSE_OPENGL=no
  
    DEFAULT_wxUSE_ON_FATAL_EXCEPTION=yes
    DEFAULT_wxUSE_ODBC=no
    DEFAULT_wxUSE_OPENGL=no
  
    DEFAULT_wxUSE_ON_FATAL_EXCEPTION=yes
+  DEFAULT_wxUSE_STACKWALKER=yes
+  DEFAULT_wxUSE_DEBUGREPORT=yes
    DEFAULT_wxUSE_SNGLINST_CHECKER=yes
    DEFAULT_wxUSE_SNGLINST_CHECKER=yes
-  DEFAULT_wxUSE_STD_IOSTREAM=no
+  DEFAULT_wxUSE_STD_IOSTREAM=$DEFAULT_STD_FLAG
+  DEFAULT_wxUSE_STD_STRING=$DEFAULT_STD_FLAG
    DEFAULT_wxUSE_CMDLINE_PARSER=yes
    DEFAULT_wxUSE_DATETIME=yes
    DEFAULT_wxUSE_TIMER=yes
    DEFAULT_wxUSE_STOPWATCH=yes
    DEFAULT_wxUSE_FILE=yes
    DEFAULT_wxUSE_FFILE=yes
    DEFAULT_wxUSE_CMDLINE_PARSER=yes
    DEFAULT_wxUSE_DATETIME=yes
    DEFAULT_wxUSE_TIMER=yes
    DEFAULT_wxUSE_STOPWATCH=yes
    DEFAULT_wxUSE_FILE=yes
    DEFAULT_wxUSE_FFILE=yes
+  DEFAULT_wxUSE_STDPATHS=yes
    DEFAULT_wxUSE_TEXTBUFFER=yes
    DEFAULT_wxUSE_TEXTFILE=yes
    DEFAULT_wxUSE_SOUND=yes
    DEFAULT_wxUSE_TEXTBUFFER=yes
    DEFAULT_wxUSE_TEXTFILE=yes
    DEFAULT_wxUSE_SOUND=yes
+  DEFAULT_wxUSE_MEDIACTRL=no
    DEFAULT_wxUSE_INTL=yes
    DEFAULT_wxUSE_CONFIG=yes
    DEFAULT_wxUSE_FONTMAP=yes
    DEFAULT_wxUSE_INTL=yes
    DEFAULT_wxUSE_CONFIG=yes
    DEFAULT_wxUSE_FONTMAP=yes
@@ -624,6 +631,7 @@ else
    DEFAULT_wxUSE_DRAG_AND_DROP=yes
    DEFAULT_wxUSE_DRAGIMAGE=yes
    DEFAULT_wxUSE_SPLINES=yes
    DEFAULT_wxUSE_DRAG_AND_DROP=yes
    DEFAULT_wxUSE_DRAGIMAGE=yes
    DEFAULT_wxUSE_SPLINES=yes
+  DEFAULT_wxUSE_MOUSEWHEEL=yes
  
    DEFAULT_wxUSE_MDI=yes
    DEFAULT_wxUSE_MDI_ARCHITECTURE=yes
  
    DEFAULT_wxUSE_MDI=yes
    DEFAULT_wxUSE_MDI_ARCHITECTURE=yes
@@ -670,6 +678,7 @@ else
    DEFAULT_wxUSE_FS_INET=yes
    DEFAULT_wxUSE_FS_ZIP=yes
    DEFAULT_wxUSE_BUSYINFO=yes
    DEFAULT_wxUSE_FS_INET=yes
    DEFAULT_wxUSE_FS_ZIP=yes
    DEFAULT_wxUSE_BUSYINFO=yes
+  DEFAULT_wxUSE_ARCHIVE_STREAMS=yes
    DEFAULT_wxUSE_ZIPSTREAM=yes
    DEFAULT_wxUSE_VALIDATORS=yes
  
    DEFAULT_wxUSE_ZIPSTREAM=yes
    DEFAULT_wxUSE_VALIDATORS=yes
  
@@ -683,6 +692,7 @@ else
    DEFAULT_wxUSE_CHOICE=yes
    DEFAULT_wxUSE_CHOICEBOOK=yes
    DEFAULT_wxUSE_COMBOBOX=yes
    DEFAULT_wxUSE_CHOICE=yes
    DEFAULT_wxUSE_CHOICEBOOK=yes
    DEFAULT_wxUSE_COMBOBOX=yes
+  DEFAULT_wxUSE_DATEPICKCTRL=yes
    DEFAULT_wxUSE_DISPLAY=yes
    DEFAULT_wxUSE_GAUGE=yes
    DEFAULT_wxUSE_GRID=yes
    DEFAULT_wxUSE_DISPLAY=yes
    DEFAULT_wxUSE_GAUGE=yes
    DEFAULT_wxUSE_GRID=yes
@@ -736,6 +746,7 @@ else
    DEFAULT_wxUSE_GTK2=yes
  fi
  
    DEFAULT_wxUSE_GTK2=yes
  fi
  
+
  dnl WX_ARG_WITH should be used to select whether an external package will be
  dnl used or not, to configure compile-time features of this package itself,
  dnl use WX_ARG_ENABLE instead
  dnl WX_ARG_WITH should be used to select whether an external package will be
  dnl used or not, to configure compile-time features of this package itself,
  dnl use WX_ARG_ENABLE instead
@@ -752,6 +763,11 @@ for toolkit in `echo $ALL_TOOLKITS`; do
      has_toolkit_in_cache=1
      eval "DEFAULT_$LINE"
      eval "CACHE_$toolkit=1"
      has_toolkit_in_cache=1
      eval "DEFAULT_$LINE"
      eval "CACHE_$toolkit=1"
+    
+    LINE=`grep "wx${toolkit}_VERSION=" ${wx_arg_cache_file}`
+    if test "x$LINE" != "x" ; then
+        eval "DEFAULT_$LINE"
+    fi
    fi
  done
  
    fi
  done
  
@@ -770,7 +786,7 @@ WX_ARG_ENABLE(plugins,     [  --enable-plugins        build parts of wxWidgets a
  if test "$wxUSE_GUI" = "yes"; then
  
  WX_ARG_ENABLE(universal,   [  --enable-universal      use wxWidgets GUI controls instead of native ones], wxUSE_UNIVERSAL)
  if test "$wxUSE_GUI" = "yes"; then
  
  WX_ARG_ENABLE(universal,   [  --enable-universal      use wxWidgets GUI controls instead of native ones], wxUSE_UNIVERSAL)
-AC_ARG_WITH(gtk,           [  --with-gtk              use GTK+], [wxUSE_GTK="$withval" CACHE_GTK=1 TOOLKIT_GIVEN=1])
+AC_ARG_WITH(gtk,          [[  --with-gtk[=VERSION]    use GTK+, VERSION can be 2 (default), 1 or "any"]], [wxUSE_GTK="$withval" CACHE_GTK=1 TOOLKIT_GIVEN=1])
  AC_ARG_WITH(motif,         [  --with-motif            use Motif/Lesstif], [wxUSE_MOTIF="$withval" CACHE_MOTIF=1 TOOLKIT_GIVEN=1])
  AC_ARG_WITH(mac,           [  --with-mac              use Mac OS X], [wxUSE_MAC="$withval" CACHE_MAC=1 TOOLKIT_GIVEN=1])
  AC_ARG_WITH(cocoa,         [  --with-cocoa            use Cocoa], [wxUSE_COCOA="$withval" CACHE_COCOA=1 TOOLKIT_GIVEN=1])
  AC_ARG_WITH(motif,         [  --with-motif            use Motif/Lesstif], [wxUSE_MOTIF="$withval" CACHE_MOTIF=1 TOOLKIT_GIVEN=1])
  AC_ARG_WITH(mac,           [  --with-mac              use Mac OS X], [wxUSE_MAC="$withval" CACHE_MAC=1 TOOLKIT_GIVEN=1])
  AC_ARG_WITH(cocoa,         [  --with-cocoa            use Cocoa], [wxUSE_COCOA="$withval" CACHE_COCOA=1 TOOLKIT_GIVEN=1])
@@ -782,7 +798,7 @@ AC_ARG_WITH(microwin,      [  --with-microwin         use MicroWindows], [wxUSE_
  AC_ARG_WITH(x11,           [  --with-x11              use X11], [wxUSE_X11="$withval" wxUSE_UNIVERSAL="yes" CACHE_X11=1 TOOLKIT_GIVEN=1])
  WX_ARG_ENABLE(nanox,       [  --enable-nanox          use NanoX], wxUSE_NANOX)
  
  AC_ARG_WITH(x11,           [  --with-x11              use X11], [wxUSE_X11="$withval" wxUSE_UNIVERSAL="yes" CACHE_X11=1 TOOLKIT_GIVEN=1])
  WX_ARG_ENABLE(nanox,       [  --enable-nanox          use NanoX], wxUSE_NANOX)
  
-WX_ARG_ENABLE(gtk2,        [  --disable-gtk2          use GTK+ 1.2 instead of 2.0], wxUSE_GTK2)
+AC_ARG_ENABLE(gtk2,        [  --disable-gtk2          use GTK+ 1.2 instead of 2.0], [wxUSE_GTK2="$enableval"])
  WX_ARG_ENABLE(gpe,         [  --enable-gpe            use GNOME PDA Environment features if possible], wxUSE_GPE)
  
  WX_ARG_SYS_WITH(libpng,    [  --with-libpng           use libpng (PNG image format)], wxUSE_LIBPNG)
  WX_ARG_ENABLE(gpe,         [  --enable-gpe            use GNOME PDA Environment features if possible], wxUSE_GPE)
  
  WX_ARG_SYS_WITH(libpng,    [  --with-libpng           use libpng (PNG image format)], wxUSE_LIBPNG)
@@ -791,6 +807,7 @@ WX_ARG_SYS_WITH(libtiff,   [  --with-libtiff          use libtiff (TIFF file for
  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(sdl,           [  --with-sdl              use SDL for audio on Unix], wxUSE_LIBSDL)
  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(sdl,           [  --with-sdl              use SDL for audio on Unix], wxUSE_LIBSDL)
+WX_ARG_WITH(gnomeprint,    [  --with-gnomeprint       use GNOME print for printing under Unix], wxUSE_LIBGNOMEPRINT)
  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
@@ -811,6 +828,7 @@ WX_ARG_ENABLE(optimise,    [  --enable-optimise       create optimised code], wx
  WX_ARG_ENABLE(debug,       [  --enable-debug          same as debug_flag and debug_info], wxUSE_DEBUG)
  WX_ARG_ENABLE(stl,         [  --enable-stl            use STL for containers], wxUSE_STL)
  if test "$USE_OS2" = "1"; then
  WX_ARG_ENABLE(debug,       [  --enable-debug          same as debug_flag and debug_info], wxUSE_DEBUG)
  WX_ARG_ENABLE(stl,         [  --enable-stl            use STL for containers], wxUSE_STL)
  if test "$USE_OS2" = "1"; then
+    DEFAULT_wxUSE_OMF=no
      WX_ARG_ENABLE(omf,     [  --enable-omf            use OMF object format], wxUSE_OMF)
  fi
  
      WX_ARG_ENABLE(omf,     [  --enable-omf            use OMF object format], wxUSE_OMF)
  fi
  
@@ -838,11 +856,7 @@ WX_ARG_ENABLE(no_deps,       [  --enable-no_deps        create code without depe
  WX_ARG_ENABLE(compat22,      [  --enable-compat22       enable wxWidgets 2.2 compatibility], WXWIN_COMPATIBILITY_2_2)
  WX_ARG_ENABLE(compat24,      [  --disable-compat24      disable wxWidgets 2.4 compatibility], WXWIN_COMPATIBILITY_2_4, disable)
  
  WX_ARG_ENABLE(compat22,      [  --enable-compat22       enable wxWidgets 2.2 compatibility], WXWIN_COMPATIBILITY_2_2)
  WX_ARG_ENABLE(compat24,      [  --disable-compat24      disable wxWidgets 2.4 compatibility], WXWIN_COMPATIBILITY_2_4, disable)
  
-AC_ARG_ENABLE(rpath,         [  --enable-rpath=DIR      output the rpath flag from wx-config], [wxRPATH_DIR="$enableval"])
-
-if test "$wxRPATH_DIR" != "" -a "$wxRPATH_DIR" != "disable" -a "$wxRPATH_DIR" != "no"; then
-   WXCONFIG_RPATH="-Wl,-rpath -Wl,$wxRPATH_DIR"
-fi
+WX_ARG_ENABLE(rpath,         [  --disable-rpath         disable use of rpath for uninstalled builds], wxUSE_RPATH)
  
  
  dnl ---------------------------------------------------------------------------
  
  
  dnl ---------------------------------------------------------------------------
@@ -864,9 +878,12 @@ WX_ARG_ENABLE(ipc,           [  --enable-ipc            use interprocess communi
  
  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)
  
  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(arcstream,     [  --enable-arcstream      use wxArchive streams], wxUSE_ARCHIVE_STREAMS)
+WX_ARG_ENABLE(backtrace,     [  --enable-backtrace      use wxStackWalker class for getting backtraces], wxUSE_STACKWALKER)
  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(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(debugreport,   [  --enable-debugreport    use wxDebugReport class], wxUSE_DEBUGREPORT)
  WX_ARG_ENABLE(dialupman,     [  --enable-dialupman      use dialup network classes], wxUSE_DIALUP_MANAGER)
  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(dialupman,     [  --enable-dialupman      use dialup network classes], wxUSE_DIALUP_MANAGER)
  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)
@@ -883,17 +900,20 @@ WX_ARG_ENABLE(longlong,      [  --enable-longlong       use wxLongLong class], w
  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(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(std_iostreams, [  --enable-std_iostreams  use standard C++ stream classes], wxUSE_STD_IOSTREAM)
  WX_ARG_ENABLE(std_iostreams, [  --enable-std_iostreams  use standard C++ stream classes], wxUSE_STD_IOSTREAM)
+WX_ARG_ENABLE(std_string,    [  --enable-std_string     use standard C++ string classes], wxUSE_STD_STRING)
+WX_ARG_ENABLE(stdpaths,      [  --enable-stdpaths       use wxStandardPaths class], wxUSE_STDPATHS)
  WX_ARG_ENABLE(stopwatch,     [  --enable-stopwatch      use wxStopWatch class], wxUSE_STOPWATCH)
  WX_ARG_ENABLE(stopwatch,     [  --enable-stopwatch      use wxStopWatch class], wxUSE_STOPWATCH)
+WX_ARG_ENABLE(streams,       [  --enable-streams        use wxStream etc classes], wxUSE_STREAMS)
  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(timer,         [  --enable-timer          use wxTimer class], wxUSE_TIMER)
  WX_ARG_ENABLE(unicode,       [  --enable-unicode        compile wxString with Unicode support], wxUSE_UNICODE)
  WX_ARG_ENABLE(sound,         [  --enable-sound          use wxSound class], wxUSE_SOUND)
  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(timer,         [  --enable-timer          use wxTimer class], wxUSE_TIMER)
  WX_ARG_ENABLE(unicode,       [  --enable-unicode        compile wxString with Unicode support], wxUSE_UNICODE)
  WX_ARG_ENABLE(sound,         [  --enable-sound          use wxSound class], wxUSE_SOUND)
+WX_ARG_ENABLE(mediactrl,     [  --enable-mediactrl      use wxMediaCtrl class], wxUSE_MEDIACTRL)
  WX_ARG_ENABLE(wxprintfv,     [  --enable-wxprintfv      use wxWidgets implementation of vprintf()], wxUSE_EXPERIMENTAL_PRINTF)
  WX_ARG_ENABLE(wxprintfv,     [  --enable-wxprintfv      use wxWidgets implementation of vprintf()], wxUSE_EXPERIMENTAL_PRINTF)
-WX_ARG_ENABLE(zipstream,     [  --enable-zipstream      use wxZipInputStream], wxUSE_ZIPSTREAM)
+WX_ARG_ENABLE(zipstream,     [  --enable-zipstream      use wxZip streams], wxUSE_ZIPSTREAM)
  
  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)
@@ -968,13 +988,14 @@ if test "$wxUSE_CONTROLS" = "yes"; then
    DEFAULT_wxUSE_ACCEL=yes
    DEFAULT_wxUSE_BMPBUTTON=yes
    DEFAULT_wxUSE_BUTTON=yes
    DEFAULT_wxUSE_ACCEL=yes
    DEFAULT_wxUSE_BMPBUTTON=yes
    DEFAULT_wxUSE_BUTTON=yes
-  DEFAULT_wxUSE_CALCTRL=no
+  DEFAULT_wxUSE_CALCTRL=yes
    DEFAULT_wxUSE_CARET=yes
    DEFAULT_wxUSE_COMBOBOX=yes
    DEFAULT_wxUSE_CHECKBOX=yes
    DEFAULT_wxUSE_CHECKLISTBOX=yes
    DEFAULT_wxUSE_CHOICE=yes
    DEFAULT_wxUSE_CHOICEBOOK=yes
    DEFAULT_wxUSE_CARET=yes
    DEFAULT_wxUSE_COMBOBOX=yes
    DEFAULT_wxUSE_CHECKBOX=yes
    DEFAULT_wxUSE_CHECKLISTBOX=yes
    DEFAULT_wxUSE_CHOICE=yes
    DEFAULT_wxUSE_CHOICEBOOK=yes
+  DEFAULT_wxUSE_DATEPICKCTRL=yes
    DEFAULT_wxUSE_GAUGE=yes
    DEFAULT_wxUSE_GRID=yes
    DEFAULT_wxUSE_IMAGLIST=yes
    DEFAULT_wxUSE_GAUGE=yes
    DEFAULT_wxUSE_GRID=yes
    DEFAULT_wxUSE_IMAGLIST=yes
@@ -1014,6 +1035,7 @@ elif test "$wxUSE_CONTROLS" = "no"; then
    DEFAULT_wxUSE_CHECKLISTBOX=no
    DEFAULT_wxUSE_CHOICE=no
    DEFAULT_wxUSE_CHOICEBOOK=no
    DEFAULT_wxUSE_CHECKLISTBOX=no
    DEFAULT_wxUSE_CHOICE=no
    DEFAULT_wxUSE_CHOICEBOOK=no
+  DEFAULT_wxUSE_DATEPICKCTRL=no
    DEFAULT_wxUSE_GAUGE=no
    DEFAULT_wxUSE_GRID=no
    DEFAULT_wxUSE_IMAGLIST=no
    DEFAULT_wxUSE_GAUGE=no
    DEFAULT_wxUSE_GRID=no
    DEFAULT_wxUSE_IMAGLIST=no
@@ -1054,6 +1076,7 @@ WX_ARG_ENABLE(checklst,    [  --enable-checklst       use wxCheckListBox (listbo
  WX_ARG_ENABLE(choice,      [  --enable-choice         use wxChoice class], wxUSE_CHOICE)
  WX_ARG_ENABLE(choicebook,  [  --enable-choicebook     use wxChoicebook class], wxUSE_CHOICEBOOK)
  WX_ARG_ENABLE(combobox,    [  --enable-combobox       use wxComboBox class], wxUSE_COMBOBOX)
  WX_ARG_ENABLE(choice,      [  --enable-choice         use wxChoice class], wxUSE_CHOICE)
  WX_ARG_ENABLE(choicebook,  [  --enable-choicebook     use wxChoicebook class], wxUSE_CHOICEBOOK)
  WX_ARG_ENABLE(combobox,    [  --enable-combobox       use wxComboBox class], wxUSE_COMBOBOX)
+WX_ARG_ENABLE(datepick,    [  --enable-datepick       use wxDatePickerCtrl class], wxUSE_DATEPICKCTRL)
  WX_ARG_ENABLE(display,     [  --enable-display        use wxDisplay class], wxUSE_DISPLAY)
  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(display,     [  --enable-display        use wxDisplay class], wxUSE_DISPLAY)
  WX_ARG_ENABLE(gauge,       [  --enable-gauge          use wxGauge class], wxUSE_GAUGE)
  WX_ARG_ENABLE(grid,        [  --enable-grid           use wxGrid class], wxUSE_GRID)
@@ -1112,9 +1135,10 @@ WX_ARG_ENABLE(menus,       [  --enable-menus          use wxMenu/wxMenuBar/wxMen
  WX_ARG_ENABLE(miniframe,   [  --enable-miniframe      use wxMiniFrame class], wxUSE_MINIFRAME)
  WX_ARG_ENABLE(tooltips,    [  --enable-tooltips       use wxToolTip class], wxUSE_TOOLTIPS)
  WX_ARG_ENABLE(splines,     [  --enable-splines        use spline drawing code], wxUSE_SPLINES)
  WX_ARG_ENABLE(miniframe,   [  --enable-miniframe      use wxMiniFrame class], wxUSE_MINIFRAME)
  WX_ARG_ENABLE(tooltips,    [  --enable-tooltips       use wxToolTip class], wxUSE_TOOLTIPS)
  WX_ARG_ENABLE(splines,     [  --enable-splines        use spline drawing code], wxUSE_SPLINES)
+WX_ARG_ENABLE(mousewheel,  [  --enable-mousewheel     use mousewheel], wxUSE_MOUSEWHEEL)
  WX_ARG_ENABLE(validators,  [  --enable-validators     use wxValidator and derived classes], wxUSE_VALIDATORS)
  WX_ARG_ENABLE(busyinfo,    [  --enable-busyinfo       use wxBusyInfo], wxUSE_BUSYINFO)
  WX_ARG_ENABLE(validators,  [  --enable-validators     use wxValidator and derived classes], wxUSE_VALIDATORS)
  WX_ARG_ENABLE(busyinfo,    [  --enable-busyinfo       use wxBusyInfo], wxUSE_BUSYINFO)
-WX_ARG_ENABLE(joystick,    [  --enable-joystick       use wxJoystick (Linux only)], wxUSE_JOYSTICK)
+WX_ARG_ENABLE(joystick,    [  --enable-joystick       use wxJoystick], wxUSE_JOYSTICK)
  WX_ARG_ENABLE(metafile,    [  --enable-metafiles      use wxMetaFile (Windows only)], wxUSE_METAFILE)
  WX_ARG_ENABLE(dragimage,   [  --enable-dragimage      use wxDragImage], wxUSE_DRAGIMAGE)
  WX_ARG_ENABLE(accessibility,[  --enable-accessibility  enable accessibility support], wxUSE_ACCESSIBILITY)
  WX_ARG_ENABLE(metafile,    [  --enable-metafiles      use wxMetaFile (Windows only)], wxUSE_METAFILE)
  WX_ARG_ENABLE(dragimage,   [  --enable-dragimage      use wxDragImage], wxUSE_DRAGIMAGE)
  WX_ARG_ENABLE(accessibility,[  --enable-accessibility  enable accessibility support], wxUSE_ACCESSIBILITY)
@@ -1172,6 +1196,7 @@ if test "$wxUSE_WINE" = "yes"; then
      wxUSE_SHARED=no
  fi
  
      wxUSE_SHARED=no
  fi
  
+
  if test "$wxUSE_GUI" = "yes"; then
  
      if test "$USE_BEOS" = 1; then
  if test "$wxUSE_GUI" = "yes"; then
  
      if test "$USE_BEOS" = 1; then
@@ -1179,11 +1204,19 @@ if test "$wxUSE_GUI" = "yes"; then
      fi
  
      if test "$TOOLKIT_GIVEN" = 1; then
      fi
  
      if test "$TOOLKIT_GIVEN" = 1; then
-      dnl convert "yes" to 1 and "no" to 0
+      dnl convert "yes", "any" or a number to 1 and "no" to 0
        for toolkit in `echo $ALL_TOOLKITS`; do
          var=wxUSE_$toolkit
          eval "value=\$${var}"
        for toolkit in `echo $ALL_TOOLKITS`; do
          var=wxUSE_$toolkit
          eval "value=\$${var}"
-        eval "$var=`echo \$value | sed -e "s/yes/1/" -e "s/no/0/"`"
+        if test "x$value" = "xno"; then
+          eval "$var=0"
+        elif test "x$value" != "x"; then
+          eval "$var=1"
+        fi
+
+        if test "x$value" != "x" -a "x$value" != "xyes" -a "x$value" != "xno"; then
+          eval "wx${toolkit}_VERSION=$value"
+        fi
        done
      else
        dnl try to guess the most apropriate toolkit for this platform
        done
      else
        dnl try to guess the most apropriate toolkit for this platform
@@ -1192,6 +1225,11 @@ if test "$wxUSE_GUI" = "yes"; then
            var=DEFAULT_DEFAULT_wxUSE_$toolkit
          else
            var=DEFAULT_wxUSE_$toolkit
            var=DEFAULT_DEFAULT_wxUSE_$toolkit
          else
            var=DEFAULT_wxUSE_$toolkit
+
+          eval "version=\$DEFAULT_wx${toolkit}_VERSION"
+          if test "x$version" != "x"; then
+            eval "wx${toolkit}_VERSION=$version"
+          fi
          fi
          eval "wxUSE_$toolkit=\$${var}"
        done
          fi
          eval "wxUSE_$toolkit=\$${var}"
        done
@@ -1219,6 +1257,13 @@ if test "$wxUSE_GUI" = "yes"; then
          AC_MSG_ERROR(Please specify at most one toolkit (maybe some are cached in configarg.cache?))
      esac
  
          AC_MSG_ERROR(Please specify at most one toolkit (maybe some are cached in configarg.cache?))
      esac
  
+    # to be removed when --disable-gtk2 isn't needed
+    if test "x$wxUSE_GTK2" = "xyes"; then
+        wxGTK_VERSION=2
+    elif test "x$wxUSE_GTK2" = "xno"; then
+        wxGTK_VERSION=1
+    fi
+
      dnl cache the wxUSE_<TOOLKIT> values too
      for toolkit in `echo $ALL_TOOLKITS`; do
        var=wxUSE_$toolkit
      dnl cache the wxUSE_<TOOLKIT> values too
      for toolkit in `echo $ALL_TOOLKITS`; do
        var=wxUSE_$toolkit
@@ -1228,6 +1273,10 @@ if test "$wxUSE_GUI" = "yes"; then
          eval "cache=\$${cache_var}"
          if test "$cache" = 1; then
            echo "$var=$value" >> ${wx_arg_cache_file}
          eval "cache=\$${cache_var}"
          if test "$cache" = 1; then
            echo "$var=$value" >> ${wx_arg_cache_file}
+          eval "version=\$wx${toolkit}_VERSION"
+          if test "x$version" != "x"; then
+            echo "wx${toolkit}_VERSION=$version" >> ${wx_arg_cache_file}
+          fi
          fi
          if test "$value" = 1; then
            toolkit_echo=`echo $toolkit | tr "[[A-Z]]" "[[a-z]]"`
          fi
          if test "$value" = 1; then
            toolkit_echo=`echo $toolkit | tr "[[A-Z]]" "[[a-z]]"`
@@ -1254,6 +1303,7 @@ case "${host}" in
    *-*-cygwin*)
        if test "$wxUSE_MSW" = 1 ; then
          wants_win32=1
    *-*-cygwin*)
        if test "$wxUSE_MSW" = 1 ; then
          wants_win32=1
+        BAKEFILE_FORCE_PLATFORM=win32
        else
          doesnt_want_win32=1
        fi
        else
          doesnt_want_win32=1
        fi
@@ -1308,7 +1358,7 @@ AC_CACHE_SAVE
  dnl cross-compiling support: we're cross compiling if the build system is
  dnl different from the target one (assume host and target be always the same)
  if test "$build" != "$host" ; then
  dnl cross-compiling support: we're cross compiling if the build system is
  dnl different from the target one (assume host and target be always the same)
  if test "$build" != "$host" ; then
-    if test "$USE_WIN32" = 1 -o "$USE_DOS" = 1 -o "$USE_UNIX"; then
+    if test "$USE_WIN32" = 1 -o "$USE_DOS" = 1 -o "$USE_UNIX" = 1; then
          CC=$host_alias-gcc
          CXX=$host_alias-c++
          AR=$host_alias-ar
          CC=$host_alias-gcc
          CXX=$host_alias-c++
          AR=$host_alias-ar
@@ -1316,6 +1366,8 @@ if test "$build" != "$host" ; then
          DLLTOOL=$host_alias-dlltool
          RESCOMP=$host_alias-windres
          STRIP=$host_alias-strip
          DLLTOOL=$host_alias-dlltool
          RESCOMP=$host_alias-windres
          STRIP=$host_alias-strip
+    elif test "x$CC" '!=' "x"; then
+        echo "You set CC, I assume you know what you are doing."
      else
          AC_MSG_ERROR($build_alias -> $host_alias cross compilation not supported yet.)
      fi
      else
          AC_MSG_ERROR($build_alias -> $host_alias cross compilation not supported yet.)
      fi
@@ -1331,7 +1383,7 @@ dnl this magic incantation is needed to prevent AC_PROG_CC from setting the
  dnl default CFLAGS (something like "-g -O2") -- we don't need this as we add
  dnl -g and -O flags ourselves below
  CFLAGS=${CFLAGS:=}
  dnl default CFLAGS (something like "-g -O2") -- we don't need this as we add
  dnl -g and -O flags ourselves below
  CFLAGS=${CFLAGS:=}
-AC_PROG_CC
+AC_BAKEFILE_PROG_CC
  
  dnl is -traditional needed for correct compilations
  dnl   adds -traditional for gcc if needed
  
  dnl is -traditional needed for correct compilations
  dnl   adds -traditional for gcc if needed
@@ -1348,7 +1400,7 @@ dnl   defines CXXFLAGS
  dnl
  dnl see CFLAGS line above
  CXXFLAGS=${CXXFLAGS:=}
  dnl
  dnl see CFLAGS line above
  CXXFLAGS=${CXXFLAGS:=}
-AC_PROG_CXX
+AC_BAKEFILE_PROG_CXX
  
  AC_LANG_RESTORE
  
  
  AC_LANG_RESTORE
  
@@ -1463,6 +1515,46 @@ dnl ------------------------------------------------------------------------
  dnl Platform specific tests
  dnl ------------------------------------------------------------------------
  
  dnl Platform specific tests
  dnl ------------------------------------------------------------------------
  
+dnl xlC needs -qunique (at least on AIX) so that one source file can be
+dnl compiled to multiple object files and safely linked together.
+if test "x$XLCXX" = "xyes"; then
+    CXXFLAGS="$CXXFLAGS -qunique"
+fi
+
+
+dnl This case is for OS X vs. everything else
+case "${host}" in
+  powerpc-*-darwin* )
+    AC_MSG_CHECKING([if __POWERPC__ is already defined])
+    AC_TRY_COMPILE([],[#ifndef __POWERPC__
+        choke me for lack of PowerPC
+#endif
+],
+        [AC_MSG_RESULT([yes])],
+        [AC_MSG_RESULT([no])
+        AC_DEFINE(__POWERPC__)
+    ])
+    AC_MSG_CHECKING([if CoreFoundation/CFBase.h is usable])
+    AC_TRY_COMPILE([#include <CoreFoundation/CFBase.h>
+],[],
+        [AC_MSG_RESULT([yes])],
+        [AC_MSG_RESULT([no])
+        AC_MSG_CHECKING([if __CF_USE_FRAMEWORK_INCLUDES__ is required])
+        AC_TRY_COMPILE([#define __CF_USE_FRAMEWORK_INCLUDES__
+#include <CoreFoundation/CFBase.h>
+        ],[],
+        [AC_MSG_RESULT([yes])
+        dnl We must use -D so source files that don't include wx/setup.h
+        dnl but do include CFBase will work.
+        CPPFLAGS="$CPPFLAGS -D__CF_USE_FRAMEWORK_INCLUDES__"],
+        [AC_MSG_FAILURE([no.  CoreFoundation not available.])]
+        )
+        ]
+    )
+  ;;
+esac
+
+dnl This case is for OS/2 vs. everything else
  case "${host}" in
    *-pc-os2_emx | *-pc-os2-emx )
        dnl ---------------------------------------------------------------------
  case "${host}" in
    *-pc-os2_emx | *-pc-os2-emx )
        dnl ---------------------------------------------------------------------
@@ -1481,46 +1573,56 @@ 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 version], wx_cv_gccversion,[
-          AC_TRY_COMPILE([],
+      dnl Check for the gcc version (and thereby for the C runtime library).
+      dnl wx_cv_gccversion = EMX2 -> Standard EMX environment
+      dnl wx_cv_gccversion = EMX3 -> EMX with gcc-3.0.3 or gcc-3.2.1
+      dnl wx_cv_gccversion = Innotek5 -> gcc-3.2.2 with Innotek libc5
+      dnl wx_cv_gccversion = Innotek6 -> gcc-3.3.5 with Innotek libc6.
+      AC_CACHE_CHECK([for gcc/libc version], wx_cv_gccversion,[
+          AC_TRY_RUN(
+              dnl Check the gcc version macro.  
                [
                [
+                  #include <stdio.h>
+
+                  int main()
+                  {
+                      FILE *f=fopen("conftestval", "w");
+                      if (!f) exit(1);
+                      fprintf(f,
                    #if (__GNUC__ < 3)
                    #if (__GNUC__ < 3)
-                      #error old gcc
+                              "EMX2"
+                  #elif (__GNUC__==3) && ((__GNUC_MINOR__ < 2) || ((__GNUC_MINOR__==2) && (__GNUC_PATCHLEVEL__<2)))
+                              "EMX3"
+                  #elif (__GNUC__==3) && (__GNUC_MINOR__==2) && (__GNUC_PATCHLEVEL__==2)
+                              "Innotek5"
+                  #else
+                              "Innotek6"
                    #endif
                    #endif
+                     );
+                      exit(0);
+                  }
                ],
                ],
-              [
-                  AC_TRY_COMPILE([],
-                      [
-                          #if (__GNUC__==3) && ((__GNUC_MINOR__ < 2) || ((__GNUC_MINOR__==2) && (__GNUC_PATCHLEVEL__<2)))
-                              #error intermediate gcc
-                          #endif
-                      ],
-                      [
-                         wx_cv_gccversion=Innotek
-                      ],
-                      [
-                         wx_cv_gccversion=3
-                      ]
-                  )
-              ],
-              [
-                  wx_cv_gccversion=2
-              ]
+             wx_cv_gccversion=`cat conftestval`,
+              wx_cv_gccversion="EMX2",
+              dnl Compilation error: Assuming standard EMX environment
+              wx_cv_gccversion="EMX2"
            )
        ])
            )
        ])
-      if test "$wx_cv_gccversion" = "2"; then
+      if test "$wx_cv_gccversion" = "EMX2"; then
            LIBS="$LIBS -lstdcpp"
            LDFLAGS="$LDFLAGS -Zsysv-signals"
        else
            LIBS="$LIBS -lstdcpp"
            LDFLAGS="$LDFLAGS -Zsysv-signals"
        else
-          if test "$wx_cv_gccversion" = "3"; then
-              LIBS="$LIBS -lstdcxx"
+          if test "$wx_cv_gccversion" = "EMX3"; then
+              LIBS="$LIBS -lstdcxx -lgcc"
                LDFLAGS="$LDFLAGS -Zsysv-signals"
            else
                LIBS="$LIBS -lstdc++"
            fi
        fi
                LDFLAGS="$LDFLAGS -Zsysv-signals"
            else
                LIBS="$LIBS -lstdc++"
            fi
        fi
-      if test "$wxUSE_OMF" = "yes"; then
-        LDFLAGS="$LDFLAGS -Zomf -Zlinker /PMTYPE:PM -Zlinker /EXEPACK"
+      if test "$wxUSE_SHARED" = "yes" -a "$wxUSE_OMF" = "no"; then
+        AC_MSG_WARN([Building DLLs requires OMF mode, enabled])
+        wxUSE_OMF=yes
+       enable_omf=yes
        fi
        dnl (end of OS/2-only piece)
    ;;
        fi
        dnl (end of OS/2-only piece)
    ;;
@@ -1605,8 +1707,12 @@ AC_CHECK_HEADERS(langinfo.h)
  
  case "${host}" in
    *-pc-os2_emx | *-pc-os2-emx )
  
  case "${host}" in
    *-pc-os2_emx | *-pc-os2-emx )
-      dnl Explicitly link -lintl if langinfo.h is available.
-      if test $ac_cv_header_langinfo_h = "yes"; then
+      dnl Explicitly link -lintl if langinfo.h is available
+      dnl and intl not yet included in libc
+      if test $ac_cv_header_langinfo_h = "yes" \
+                -a \(   "$wx_cv_gccversion" = "EMX2" \
+                     -o "$wx_cv_gccversion" = "EMX3" \
+                     -o "$wx_cv_gccversion" = "Innotek5" \); then
            LIBS="$LIBS -lintl"
        fi
    ;;
            LIBS="$LIBS -lintl"
        fi
    ;;
@@ -1659,51 +1765,31 @@ case "${host}" in
          AC_CHECK_SIZEOF(long long, 0)
  esac
  
          AC_CHECK_SIZEOF(long long, 0)
  esac
  
-dnl we have to do it ourselves because SGI/Irix's stdio.h does not include
-dnl wchar_t and AC_CHECK_SIZEOF only includes stdio.h
-dnl Mac OS X does not provide wchar.h and wchar_t is defined by stdlib.h (GD)
-AC_CACHE_CHECK([size of wchar_t], wx_cv_sizeof_wchar_t,
-[
-    AC_TRY_RUN(
-        [
-            /* DJGPP only has fake wchar_t: */
-            #ifdef __DJGPP__
-            #  error "fake wchar_t"
-            #endif
-            #ifdef HAVE_WCHAR_H
-            #  ifdef __CYGWIN__
-            #    include <stddef.h>
-            #  endif
-            #  include <wchar.h>
-            #endif
-            #ifdef HAVE_STDLIB_H
-            #  include <stdlib.h>
-            #endif
-            #include <stdio.h>
-            int main()
-            {
-                FILE *f=fopen("conftestval", "w");
-                if (!f) exit(1);
-                fprintf(f, "%i", sizeof(wchar_t));
-                exit(0);
-            }
-        ],
-        wx_cv_sizeof_wchar_t=`cat conftestval`,
-        wx_cv_sizeof_wchar_t=0,
-        [
-            case "${host}" in
-              *-pc-msdosdjgpp )
-                wx_cv_sizeof_wchar_t=0
-                ;;
-              * )
-                wx_cv_sizeof_wchar_t=4
-                ;;
-            esac
-        ]
-    )
-])
-
-AC_DEFINE_UNQUOTED(SIZEOF_WCHAR_T, $wx_cv_sizeof_wchar_t)
+dnl SGI/Irix's stdio.h does not include wchar_t. Mac OS X does not provide
+dnl wchar.h and wchar_t is defined by stdlib.h (GD)
+AC_CHECK_SIZEOF(wchar_t, 0,
+    [
+        /* DJGPP's wchar_t is now a keyword in C++ (still not C though) */
+        #if defined(__DJGPP__) && !( (__GNUC_MINOR__ >= 8 && __GNUC__ == 2 ) || __GNUC__ >= 3 )
+        #  error "fake wchar_t"
+        #endif
+        #ifdef HAVE_WCHAR_H
+        #  ifdef __CYGWIN__
+        #    include <stddef.h>
+        #  endif
+        #  include <wchar.h>
+        #endif
+        #ifdef HAVE_STDLIB_H
+        #  include <stdlib.h>
+        #endif
+        #include <stdio.h>
+    ]
+)
+if test "$ac_cv_sizeof_wchar_t" != "0"; then
+    wxUSE_WCHAR_T=yes
+else
+    wxUSE_WCHAR_T=no
+fi
  
  dnl checks needed to define wxVaCopy
  AC_CACHE_CHECK([for va_copy],
  
  dnl checks needed to define wxVaCopy
  AC_CACHE_CHECK([for va_copy],
@@ -1718,6 +1804,11 @@ AC_CACHE_CHECK([for va_copy],
                  va_copy(ap2, ap1);
                  va_end(ap2);
                  va_end(ap1);
                  va_copy(ap2, ap1);
                  va_end(ap2);
                  va_end(ap1);
+            }
+            int main()
+            {
+                foo("hi", 17);
+                return 0;
              }],
              wx_cv_func_va_copy=yes,
              wx_cv_func_va_copy=no
              }],
              wx_cv_func_va_copy=yes,
              wx_cv_func_va_copy=no
@@ -1778,6 +1869,11 @@ if test "x$wx_largefile" = "xyes"; then
      else
          WX_LARGEFILE_FLAGS="-D_LARGE_FILES"
      fi
      else
          WX_LARGEFILE_FLAGS="-D_LARGE_FILES"
      fi
+    dnl AC_FUNC_FSEEKO sets HAVE_FSEEKO and $ac_cv_sys_largefile_source
+    AC_FUNC_FSEEKO
+    if test "$ac_cv_sys_largefile_source" != no; then
+        WX_LARGEFILE_FLAGS="$WX_LARGEFILE_FLAGS -D_LARGEFILE_SOURCE=$ac_cv_sys_largefile_source"
+    fi
      CPPFLAGS="$CPPFLAGS $WX_LARGEFILE_FLAGS"
  fi
  
      CPPFLAGS="$CPPFLAGS $WX_LARGEFILE_FLAGS"
  fi
  
@@ -1797,8 +1893,79 @@ dnl check whether C++ compiler supports C++ casts
  AC_CXX_CONST_CAST
  AC_CXX_REINTERPRET_CAST
  AC_CXX_STATIC_CAST
  AC_CXX_CONST_CAST
  AC_CXX_REINTERPRET_CAST
  AC_CXX_STATIC_CAST
+dnl we don't use HAVE_DYNAMIC_CAST anywhere right now...
+dnl AC_CXX_DYNAMIC_CAST
+
+dnl check for std::string or std::wstring
+if test "$wxUSE_STD_STRING" = "yes" -o "$wxUSE_STL" = "yes"; then
+    AC_LANG_PUSH(C++)
+
+    if test "$wxUSE_UNICODE" = "yes"; then
+        std_string="std::wstring"
+        char_type="wchar_t"
+    else
+        std_string="std::string"
+        char_type="char"
+    fi
+
+    dnl check if <string> declares std::wstring
+    AC_MSG_CHECKING([for $std_string in <string>])
+    AC_TRY_COMPILE([#include <string>],
+                   [$std_string foo;],
+                   [AC_MSG_RESULT(yes)
+                    AC_DEFINE(HAVE_STD_WSTRING)],
+                   [AC_MSG_RESULT(no)
+                    AC_MSG_CHECKING([if std::basic_string<$char_type> works])
+                    AC_TRY_COMPILE([
+                        #ifdef HAVE_WCHAR_H
+                        #  ifdef __CYGWIN__
+                        #    include <stddef.h>
+                        #  endif
+                        #  include <wchar.h>
+                        #endif
+                        #ifdef HAVE_STDLIB_H
+                        #  include <stdlib.h>
+                        #endif
+                        #include <stdio.h>
+                        #include <string>
+                        ],
+                        [std::basic_string<$char_type> foo;
+                         const $char_type* dummy = foo.c_str();],
+                        [AC_MSG_RESULT(yes)],
+                        [AC_MSG_RESULT([no])
+                         if test "$wxUSE_STL" = "yes"; then
+                             AC_MSG_ERROR([Can't use --enable-stl without $std_string or std::basic_string<$char_type>])
+                         elif grep wxUSE_STD_STRING $wx_arg_cache_file >/dev/null; then
+                             AC_MSG_ERROR([Can't use --enable-std_string without $std_string or std::basic_string<$char_type>])
+                         else
+                             AC_MSG_WARN([No $std_string or std::basic_string<$char_type>, switching to --disable-std_string])
+                             wxUSE_STD_STRING=no
+                         fi
+                        ]
+                    )
+                    ])
+
+    AC_LANG_POP
+fi
+
+if test "$wxUSE_STD_IOSTREAM" = "yes"; then
+    AC_LANG_PUSH(C++)
+
+    AC_CHECK_TYPES([std::istream, std::ostream],,
+                   [wxUSE_STD_IOSTREAM=no],
+                   [#include <iostream>])
+
+    if test "$wxUSE_STD_IOSTREAM" != "yes"; then
+        if grep wxUSE_STD_IOSTREAM $wx_arg_cache_file >/dev/null; then
+            AC_MSG_ERROR([Can't use --enable-std_iostreams without std::istream and std::ostream])
+        else
+            AC_MSG_WARN([No std::iostreams, switching to --disable-std_iostreams])
+        fi
+    fi
+    
+    AC_LANG_POP
+fi
  
  
-dnl check various STL features
  if test "$wxUSE_STL" = "yes"; then
      AC_LANG_PUSH(C++)
  
  if test "$wxUSE_STL" = "yes"; then
      AC_LANG_PUSH(C++)
  
@@ -1818,14 +1985,6 @@ if test "$wxUSE_STL" = "yes"; then
                      [AC_MSG_RESULT([no])
                       AC_MSG_ERROR([Basic STL functionality missing])])
  
                      [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>],
      dnl check for compliant std::string::compare
      AC_MSG_CHECKING([for compliant std::string::compare])
      AC_TRY_COMPILE([#include <string>],
@@ -1952,8 +2111,44 @@ dnl be found before the ones in lib64 for 32bit compilation -- of course, this
  dnl probably/surely breaks 64bit compilation... IMO the only real solution is to
  dnl stop using WX_PATH_FIND_LIBRARIES() at all and use AC_CHECK_LIB() instead
  dnl
  dnl probably/surely breaks 64bit compilation... IMO the only real solution is to
  dnl stop using WX_PATH_FIND_LIBRARIES() at all and use AC_CHECK_LIB() instead
  dnl
-dnl add 64 bit versions for Linux on AMD (this is not perfect but well...)
-SEARCH_LIB="/usr/lib /usr/lib32 `echo "$SEARCH_INCLUDE" | sed s/include/lib/g` /usr/lib64 /usr/X11R6/lib64"
+dnl also put 64 bit versions for Linux on AMD, they must come before the usual
+dnl locations or 64 bit compilation failed
+SEARCH_LIB="/usr/lib /usr/lib32 /usr/lib64 /usr/X11R6/lib64 `echo "$SEARCH_INCLUDE" | sed s/include/lib/g`"
+
+dnl Cross compiling with gcc?
+if test "$build" != "$host" -a "$GCC" = yes; then
+    dnl for gcc cross-compilers "$CC -print-prog-name=ld" prints the path to
+    dnl the linker. Stripping off the trailing '/bin/ld' gives us a candiate
+    dnl for a 'root' below which libraries and headers for the target system
+    dnl might be installed.
+    if cross_root=`$CC -print-prog-name=ld 2>/dev/null`; then
+        cross_root=`dirname $cross_root`
+        cross_root=`dirname $cross_root`
+
+        dnl substitute this candiate root for '^/usr' in the search lists,
+        dnl strip out any that don't start '^/usr'.
+        SEARCH_LIB=`for x in $SEARCH_LIB; do echo $x; done | sed -ne "s|^/usr|$cross_root|p"`
+        SEARCH_INCLUDE=`for x in $SEARCH_INCLUDE; do echo $x; done | sed -ne "s|^/usr|$cross_root|p"`
+
+        dnl also have pkg-config search for *.pc files under this 'root'
+        if test -z "$PKG_CONFIG_PATH"; then
+            PKG_CONFIG_PATH="$cross_root/local/lib/pkgconfig:$cross_root/lib/pkgconfig"
+            export PKG_CONFIG_PATH
+        fi
+
+        dnl AC_PATH_XTRA doesn't work currently unless -x-includes and
+        dnl -x-libraries are given on the command line. So if they are not
+        dnl set then set them here to plausible defaults.
+        if test -z "$x_includes" -o "$x_includes" = NONE; then
+            WX_PATH_FIND_INCLUDES($SEARCH_INCLUDE, X11/Intrinsic.h)
+            x_includes=$ac_find_includes
+        fi
+        if test -z "$x_libraries" -o "$x_libraries" = NONE; then
+            WX_PATH_FIND_LIBRARIES($SEARCH_LIB, Xt)
+            x_libraries=$ac_find_libraries
+        fi
+    fi
+fi
  
  dnl ------------------------------------------------------------------------
  dnl Check for libraries
  
  dnl ------------------------------------------------------------------------
  dnl Check for libraries
@@ -2297,6 +2492,17 @@ dnl ------------------------------------------------------------------------
  dnl Check for expat libraries
  dnl ------------------------------------------------------------------------
  
  dnl Check for expat libraries
  dnl ------------------------------------------------------------------------
  
+if test "$wxUSE_WCHAR_T" != "yes"; then
+    if test "$wxUSE_EXPAT" != "no"; then
+        AC_MSG_WARN([wxWidgets requires wchar_t to use expat, disabling])
+        wxUSE_EXPAT=no
+    fi
+    if test "$wxUSE_XML" != "no"; then
+        AC_MSG_WARN([wxWidgets requires wchar_t to use xml, disabling])
+        wxUSE_XML=no
+    fi
+fi
+
  if test "$wxUSE_EXPAT" != "no"; then
      wxUSE_XML=yes
      AC_DEFINE(wxUSE_EXPAT)
  if test "$wxUSE_EXPAT" != "no"; then
      wxUSE_XML=yes
      AC_DEFINE(wxUSE_EXPAT)
@@ -2346,7 +2552,6 @@ dnl Check for libmspack
  dnl ------------------------------------------------------------------------
  
  if test "$wxUSE_LIBMSPACK" != "no"; then
  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,
      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,
@@ -2354,11 +2559,13 @@ if test "$wxUSE_LIBMSPACK" != "no"; then
      fi
      if test "x$MSPACK_LINK" = "x" ; then
          wxUSE_LIBMSPACK=no
      fi
      if test "x$MSPACK_LINK" = "x" ; then
          wxUSE_LIBMSPACK=no
-    else
-        AC_DEFINE(wxUSE_LIBMSPACK)
      fi
  fi
  
      fi
  fi
  
+if test "$wxUSE_LIBMSPACK" != "no"; then
+    AC_DEFINE(wxUSE_LIBMSPACK)
+fi
+
  
  dnl ----------------------------------------------------------------
  dnl search for toolkit (widget sets)
  
  dnl ----------------------------------------------------------------
  dnl search for toolkit (widget sets)
@@ -2466,16 +2673,20 @@ if test "$wxUSE_GUI" = "yes"; then
                      GTK_MODULES=gthread
                  fi
  
                      GTK_MODULES=gthread
                  fi
  
-                dnl note that if we fail to find GTK2 we abort and don't fall
-                dnl back to GTK1.x
+                dnl detect GTK2
                  wx_cv_lib_gtk=
                  wx_cv_lib_gtk=
-                if test "x$wxUSE_GTK2" = "xyes"; then
+                if test "x$wxGTK_VERSION" != "x1"; then
                      AM_PATH_GTK_2_0(2.0.0, wx_cv_lib_gtk=2.0, , $GTK_MODULES)
                      AM_PATH_GTK_2_0(2.0.0, wx_cv_lib_gtk=2.0, , $GTK_MODULES)
-                else
-                    AM_PATH_GTK(1.2.7, wx_cv_lib_gtk=1.2.7, , $GTK_MODULES)
+                fi
+
+                dnl detect GTK1.x
+                if test -z "$wx_cv_lib_gtk"; then
+                    if test "x$wxGTK_VERSION" = "x1" -o "x$wxGTK_VERSION" = "xany" ; then
+                        AM_PATH_GTK(1.2.7, wx_cv_lib_gtk=1.2.7, , $GTK_MODULES)
  
  
-                    if test -z "$wx_cv_lib_gtk"; then
-                        AM_PATH_GTK(1.2.3, wx_cv_lib_gtk=1.2.3, , $GTK_MODULES)
+                        if test -z "$wx_cv_lib_gtk"; then
+                            AM_PATH_GTK(1.2.3, wx_cv_lib_gtk=1.2.3, , $GTK_MODULES)
+                        fi
                      fi
                  fi
  
                      fi
                  fi
  
@@ -2507,38 +2718,61 @@ if test "$wxUSE_GUI" = "yes"; then
              1.2.3)  WXGTK12=1
                      ;;
              *)      AC_MSG_ERROR([
              1.2.3)  WXGTK12=1
                      ;;
              *)      AC_MSG_ERROR([
-Please check that gtk-config is in path, the directory
-where GTK+ libraries are installed (returned by
-'gtk-config --libs' command) is in LD_LIBRARY_PATH or
-equivalent variable and GTK+ is version 1.2.3 or above.
+The development files for GTK+ were not found. For GTK+ 2, please
+ensure that pkg-config is in the path and that gtk+-2.0.pc is
+installed. For GTK+ 1.2 please check that gtk-config is in the path,
+and that the version is 1.2.3 or above. Also check that the
+libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
+--libs' are in the LD_LIBRARY_PATH or equivalent.
                              ])
                      ;;
          esac
  
          if test "$WXGTK20" = 1; then
                              ])
                      ;;
          esac
  
          if test "$WXGTK20" = 1; then
-            if test "$wxUSE_PRINTING_ARCHITECTURE" = "yes" ; then
-                PKG_CHECK_MODULES(PANGOFT2, pangoft2,
-                    [
-                        CXXFLAGS="$CXXFLAGS $PANGOFT2_CFLAGS"
-                        # FIXME: GTK_LIBS already has a lot of what this is
-                        #        about to add, but we go ahead and just add
-                        #        it all again anyway.
-                        # This is not a good way to manage things.  And simply
-                        # uniq'ing the list later is hardly better.
-                        GUI_TK_LIBRARY="$GUI_TK_LIBRARY $PANGOFT2_LIBS"
-                    ],
-                    [
-                        AC_MSG_WARN([pangoft2 library not found, library will be compiled without printing support])
-                        wxUSE_PRINTING_ARCHITECTURE="no"
-                    ]
-                )
-            fi
-                
              save_CFLAGS="$CFLAGS"
              save_LIBS="$LIBS"
              save_CFLAGS="$CFLAGS"
              save_LIBS="$LIBS"
-            CFLAGS="$CFLAGS $GTK_CFLAGS"
-            LIBS="$LIBS $GTK_LIBS"
+            CFLAGS="$CFLAGS $wx_cv_cflags_gtk"
+            LIBS="$LIBS $wx_cv_libs_gtk"
+            
              AC_CHECK_FUNCS([pango_font_family_is_monospace])
              AC_CHECK_FUNCS([pango_font_family_is_monospace])
+
+            dnl gtk_icon_size_lookup is not available in the GTK+ headers
+            dnl that have shipped with some versions of Sun's JDS. Not using
+            dnl AC_CHECK_FUNCS here since it only checks the function exists
+            dnl in the lib (not the header).
+            AC_MSG_CHECKING([if gtk_icon_size_lookup is missing])
+            AC_TRY_COMPILE([
+                            #include <gtk/gtk.h>
+                           ],
+                           [
+                            void *f = gtk_icon_size_lookup;
+                           ],
+                           [
+                            AC_MSG_RESULT([no])
+                           ],
+                           [
+                            AC_DEFINE(NEED_GTK_ICON_SIZE_LOOKUP)
+                            AC_MSG_RESULT([yes])
+                           ])
+            
+            dnl test if we have at least GTK+ 2.4:
+            AC_MSG_CHECKING([if GTK+ is version >= 2.4])
+            AC_TRY_COMPILE([
+                            #include <gtk/gtk.h>
+                           ],
+                           [
+                            #if !GTK_CHECK_VERSION(2,4,0)
+                            #error "Not GTK+ 2.4"
+                            #endif
+                           ],
+                           [
+                            AC_DEFINE(__WXGTK24__)
+                            AC_MSG_RESULT([yes])
+                           ],
+                           [
+                            AC_MSG_RESULT([no])
+                           ])
+            
              CFLAGS="$save_CFLAGS"
              LIBS="$save_LIBS"
          else
              CFLAGS="$save_CFLAGS"
              LIBS="$save_LIBS"
          else
@@ -2742,6 +2976,7 @@ equivalent variable and GTK+ is version 1.2.3 or above.
                  )
                  PKG_CHECK_MODULES(PANGOXFT, pangoxft,
                      [
                  )
                  PKG_CHECK_MODULES(PANGOXFT, pangoxft,
                      [
+                        AC_DEFINE(HAVE_PANGO_XFT)
                          CXXFLAGS="$CXXFLAGS $PANGOXFT_CFLAGS"
                          GUI_TK_LIBRARY="$GUI_TK_LIBRARY $PANGOXFT_LIBS"
                      ],
                          CXXFLAGS="$CXXFLAGS $PANGOXFT_CFLAGS"
                          GUI_TK_LIBRARY="$GUI_TK_LIBRARY $PANGOXFT_LIBS"
                      ],
@@ -2773,6 +3008,10 @@ equivalent variable and GTK+ is version 1.2.3 or above.
      fi
  
      if test "$wxUSE_MOTIF" = 1; then
      fi
  
      if test "$wxUSE_MOTIF" = 1; then
+        if test "$wxUSE_UNICODE" = "yes"; then
+            AC_MSG_ERROR([Unicode configuration not supported with Motif])
+        fi
+
          AC_MSG_CHECKING(for Motif/Lesstif headers)
          WX_PATH_FIND_INCLUDES($SEARCH_INCLUDE, Xm/Xm.h)
          if test "$ac_find_includes" != "" ; then
          AC_MSG_CHECKING(for Motif/Lesstif headers)
          WX_PATH_FIND_INCLUDES($SEARCH_INCLUDE, Xm/Xm.h)
          if test "$ac_find_includes" != "" ; then
@@ -2996,7 +3235,12 @@ equivalent variable and GTK+ is version 1.2.3 or above.
              AC_MSG_RESULT([none])
          fi
  
              AC_MSG_RESULT([none])
          fi
  
-        CPPFLAGS="$CPPFLAGS $CPPFLAGS_PASCAL -I\${top_srcdir}/src/mac/carbon/morefilex -I/Developer/Headers/FlatCarbon"
+        if test "x$wxUSE_UNIX" = "xyes"; then
+            CPPFLAGS="$CPPFLAGS $CPPFLAGS_PASCAL -I\${top_srcdir}/src/mac/carbon/morefilex -I/Developer/Headers/FlatCarbon"
+        else
+            dnl platform.h needs TARGET_CARBON before setup.h
+            CPPFLAGS="$CPPFLAGS $CPPFLAGS_PASCAL -I\${top_srcdir}/src/mac/carbon/morefilex -DTARGET_CARBON"
+        fi
  
          TOOLKIT=MAC
          dnl we can't call this MAC_DIST or autoconf thinks its a macro
  
          TOOLKIT=MAC
          dnl we can't call this MAC_DIST or autoconf thinks its a macro
@@ -3082,7 +3326,7 @@ dnl ----------------------------------------------------------------
  IODBC_C_SRC=""
  
  
  IODBC_C_SRC=""
  
  
-dnl ODBC is handled seperately for MSW 
+dnl ODBC is handled separately for MSW 
  if test "$TOOLKIT" != "MSW" ; then
  
      if test "$wxUSE_ODBC" = "sys" -o "$wxUSE_ODBC" = "yes" ; then
  if test "$TOOLKIT" != "MSW" ; then
  
      if test "$wxUSE_ODBC" = "sys" -o "$wxUSE_ODBC" = "yes" ; then
@@ -3111,18 +3355,19 @@ if test "$TOOLKIT" != "MSW" ; then
              wxUSE_ODBC=sys
          fi
      fi
              wxUSE_ODBC=sys
          fi
      fi
-    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_"
+
+    if test "$wxUSE_ODBC" = "builtin" ; then
+        AC_DEFINE(wxUSE_BUILTIN_IODBC)
      fi
  fi
  
      fi
  fi
  
+if test "$wxUSE_ODBC" != "no" ; then
+    AC_DEFINE(wxUSE_ODBC)
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS db"
+
+    dnl is this still necessary?
+    WXODBCFLAG="-D_IODBC_"
+fi
  
  dnl ---------------------------------------------------------------------------
  dnl wxDisplay Sanity checks
  
  dnl ---------------------------------------------------------------------------
  dnl wxDisplay Sanity checks
@@ -3170,10 +3415,12 @@ dnl ---------------------------------------------------------------------------
  dnl ---------------------------------------------------------------------------
  dnl DirectDraw  / Multimon for MSW
  dnl ---------------------------------------------------------------------------
  dnl ---------------------------------------------------------------------------
  dnl DirectDraw  / Multimon for MSW
  dnl ---------------------------------------------------------------------------
-        AC_CHECK_HEADERS([multimon.h ddraw.h], [], [
-            wxUSE_DISPLAY="no"
-            AC_MSG_WARN([ddraw.h or multimon.h not found; disabling wxDisplay])
-          ] )
+        AC_CHECK_HEADERS([multimon.h ddraw.h], [],
+            [
+                wxUSE_DISPLAY="no"
+                AC_MSG_WARN([ddraw.h or multimon.h not found; disabling wxDisplay])
+            ],
+            [#include <windows.h>])
      fi
  fi
  
      fi
  fi
  
@@ -3206,6 +3453,8 @@ if test "$wxUSE_OPENGL" = "yes"; then
                  AC_MSG_CHECKING([for -lGL])
                  WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],GL)
                  if test "$ac_find_libraries" != "" ; then
                  AC_MSG_CHECKING([for -lGL])
                  WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],GL)
                  if test "$ac_find_libraries" != "" ; then
+                    AC_MSG_RESULT([yes])
+
                      WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS])
                      if test "$ac_path_to_link" != " -L/usr/lib" ; then
                          LDFLAGS_GL="$ac_path_to_link"
                      WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS])
                      if test "$ac_path_to_link" != " -L/usr/lib" ; then
                          LDFLAGS_GL="$ac_path_to_link"
@@ -3214,6 +3463,7 @@ if test "$wxUSE_OPENGL" = "yes"; then
                      dnl don't suppose that libGL and libGLU are always in the
                      dnl same directory -- this is not true for some common
                      dnl distributions
                      dnl don't suppose that libGL and libGLU are always in the
                      dnl same directory -- this is not true for some common
                      dnl distributions
+                    AC_MSG_CHECKING([for -lGLU])
                      WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],GLU)
                      if test "$ac_find_libraries" != "" ; then
                          WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS])
                      WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],GLU)
                      if test "$ac_find_libraries" != "" ; then
                          WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS])
@@ -3225,11 +3475,14 @@ if test "$wxUSE_OPENGL" = "yes"; then
                          found_gl=1
                          OPENGL_LIBS="-lGL -lGLU"
                          AC_MSG_RESULT([yes])
                          found_gl=1
                          OPENGL_LIBS="-lGL -lGLU"
                          AC_MSG_RESULT([yes])
+                    else
+                        AC_MSG_RESULT([no])
                      fi
                      fi
+                else
+                    AC_MSG_RESULT([no])
                  fi
  
                  if test "$found_gl" != 1; then
                  fi
  
                  if test "$found_gl" != 1; then
-                    AC_MSG_RESULT([no])
                      AC_MSG_CHECKING([for -lMesaGL])
                      WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],MesaGL)
                      if test "$ac_find_libraries" != "" ; then
                      AC_MSG_CHECKING([for -lMesaGL])
                      WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],MesaGL)
                      if test "$ac_find_libraries" != "" ; then
@@ -3245,7 +3498,7 @@ if test "$wxUSE_OPENGL" = "yes"; then
  
          if test "x$OPENGL_LIBS" = "x"; then
              dnl it should be an error and not a warning because OpenGL is not on
  
          if test "x$OPENGL_LIBS" = "x"; then
              dnl it should be an error and not a warning because OpenGL is not on
-            dnl by default and so if it had been explicitely requested, we
+            dnl by default and so if it had been explicitly requested, we
              dnl shouldn't just fall back to compiling the library without it
              AC_MSG_ERROR(OpenGL libraries not available)
          fi
              dnl shouldn't just fall back to compiling the library without it
              AC_MSG_ERROR(OpenGL libraries not available)
          fi
@@ -3286,6 +3539,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"
+        WXCONFIG_RPATH="-Wl,-rpath,\$libdir"
         ;;
  
        *-*-solaris2* )
         ;;
  
        *-*-solaris2* )
@@ -3304,29 +3558,33 @@ if test "$wxUSE_SHARED" = "yes"; then
                  [
                      AC_MSG_RESULT([yes])
                      SAMPLES_RPATH_FLAG="-Wl,-rpath,\$(top_builddir)lib"
                  [
                      AC_MSG_RESULT([yes])
                      SAMPLES_RPATH_FLAG="-Wl,-rpath,\$(top_builddir)lib"
-                ],
-                [
+                    WXCONFIG_RPATH="-Wl,-rpath,\$libdir"
+                ],[
                      AC_MSG_RESULT([no])
                      AC_MSG_CHECKING([if the linker accepts -R])
                      LDFLAGS="$saveLdflags -Wl,-R,/"
                      AC_TRY_LINK(
                          [],[],
                          [
                      AC_MSG_RESULT([no])
                      AC_MSG_CHECKING([if the linker accepts -R])
                      LDFLAGS="$saveLdflags -Wl,-R,/"
                      AC_TRY_LINK(
                          [],[],
                          [
-                             AC_MSG_RESULT([yes])
-                             SAMPLES_RPATH_FLAG="-Wl,-R,\$(top_builddir)lib"],
-                        [
+                            AC_MSG_RESULT([yes])
+                            SAMPLES_RPATH_FLAG="-Wl,-R,\$(top_builddir)lib"
+                            WXCONFIG_RPATH="-Wl,-R,\$libdir"
+                        ],[
                              AC_MSG_RESULT([no])
                          ])                    
                  ])
              LDFLAGS="$saveLdflags"
          else
              SAMPLES_RPATH_FLAG="-R\$(top_builddir)lib"
                              AC_MSG_RESULT([no])
                          ])                    
                  ])
              LDFLAGS="$saveLdflags"
          else
              SAMPLES_RPATH_FLAG="-R\$(top_builddir)lib"
+            WXCONFIG_RPATH="-R\$libdir"
          fi
        ;;
        
        powerpc-*-darwin* )
          fi
        ;;
        
        powerpc-*-darwin* )
-        SAMPLES_RPATH_POSTLINK="\$(top_builddir)change-install-names \$(LIBDIRNAME) \$(prefix) \$@"
-        cat <<EOF >change-install-names
+        install_name_tool=`which install_name_tool`
+        if test "$install_name_tool" -a -x "$install_name_tool"; then
+            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 "
  #!/bin/sh
  libnames=\`cd \${1} ; ls -1 | grep '\.[[0-9]][[0-9]]*\.dylib\$'\`
  inst_cmd="install_name_tool "
@@ -3335,22 +3593,34 @@ for i in \${libnames} ; do
  done
  \${inst_cmd} \${3}
  EOF
  done
  \${inst_cmd} \${3}
  EOF
-        chmod +x change-install-names
+            chmod +x change-install-names
+        fi
        ;;
        
        *-*-cygwin* | *-*-mingw32* )
          TOOLCHAIN_DLL_DEFS="${TOOLCHAIN_DLL_DEFS} -DWXUSINGDLL=1"
         ;;
        
        ;;
        
        *-*-cygwin* | *-*-mingw32* )
          TOOLCHAIN_DLL_DEFS="${TOOLCHAIN_DLL_DEFS} -DWXUSINGDLL=1"
         ;;
        
+      *-*-hpux* )
+        SAMPLES_RPATH_FLAG="-Wl,+b,\$(top_builddir)lib"
+        WXCONFIG_RPATH="-Wl,+b,\$libdir"
+       ;;
+        
      esac
      esac
-fi
  
  
-dnl do not 'else' this, it may be changed in the above conditional.
-if test "$wxUSE_SHARED" = "no"; then
+    if test $wxUSE_RPATH = "no"; then
+        SAMPLES_RPATH_FLAG=''
+        SAMPLES_RPATH_POSTLINK=''
+        WXCONFIG_RPATH=''
+    fi
+
+    SHARED=1
+
+else
+
      config_linkage_component="-static"
      SHARED=0
      config_linkage_component="-static"
      SHARED=0
-else
-    SHARED=1
+
  fi
  
  
  fi
  
  
@@ -3396,15 +3666,48 @@ dnl library link name
  dnl These just save us from exporting lib_{unicode,debug,flavour}_suffix.
  dnl If we ever need to do that, we won't need to keep these.
  WX_LIBRARY_BASENAME_NOGUI="wx_base${WXBASEPORT}${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}"
  dnl These just save us from exporting lib_{unicode,debug,flavour}_suffix.
  dnl If we ever need to do that, we won't need to keep these.
  WX_LIBRARY_BASENAME_NOGUI="wx_base${WXBASEPORT}${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}"
-WX_LIBRARY_BASENAME_GUI="wx_${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}"
-
-
+if test "${TOOLKIT_DIR}" = "os2"; then
+    WX_LIBRARY_BASENAME_GUI="wx_pm${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}"
+else
+    WX_LIBRARY_BASENAME_GUI="wx_${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}"
+fi
+
+
+
+if test "$wxUSE_COCOA" = 1; then
+    AC_LANG_SAVE
+    AC_WX_LANG_OBJECTIVEC
+dnl Recent AppKit/NSEvent.h include parts of IOKit which eventually
+dnl gets IOKit/graphics/IOGraphicsTypes.h included which typedefs
+dnl Point but only if MacTypes.h was not included first.  Of course,
+dnl if MacTypes.h is included later then you're screwed when it
+dnl tries to typedef Point.  Defining __Point__ will cause IOGraphicsTypes.h
+dnl to not typedef Point and thus fix the problem.
+    AC_MSG_CHECKING([if AppKit/NSEvent.h conflicts with CoreFoundation])
+    AC_TRY_COMPILE([#include <AppKit/NSEvent.h>
+#include <CoreFoundation/CoreFoundation.h>
+        ],[],
+        [AC_MSG_RESULT([no])],
+        [AC_MSG_RESULT([yes])
+        AC_MSG_CHECKING([if defining __Point__ will fix it])
+        AC_TRY_COMPILE([#define __Point__ 1
+#include <AppKit/NSEvent.h>
+#include <CoreFoundation/CoreFoundation.h>
+            ],[],
+            [AC_MSG_RESULT([yes])
+            AC_DEFINE(__Point__)
+            ],
+            [AC_MSG_FAILURE([no])]
+        )]
+    )
+    AC_LANG_RESTORE
+fi
  
  if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1; then
      dnl base name of the resource file for wxMac must be the same
      dnl as library installation base name (-install_name)
  
  if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1; then
      dnl base name of the resource file for wxMac must be the same
      dnl as library installation base name (-install_name)
-    WX_RESOURCES_MACOSX_ASCII="libwx_${TOOLCHAIN_NAME}.${WX_CURRENT}.r"
-    WX_RESOURCES_MACOSX_DATA="libwx_${TOOLCHAIN_NAME}.${WX_CURRENT}.rsrc"
+    WX_RESOURCES_MACOSX_ASCII="libwx_${TOOLCHAIN_NAME}.${wx_release_number}.r"
+    WX_RESOURCES_MACOSX_DATA="libwx_${TOOLCHAIN_NAME}.${wx_release_number}.rsrc"
  
      dnl add the resources target for wxMac
      LIBWXMACRES="\$(top_builddir)lib/${WX_RESOURCES_MACOSX_ASCII}"
  
      dnl add the resources target for wxMac
      LIBWXMACRES="\$(top_builddir)lib/${WX_RESOURCES_MACOSX_ASCII}"
@@ -3418,25 +3721,25 @@ if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1; then
      dnl resources are bundled both with shared library and applications
      dnl since the carb resource *must* be included in the application
      if test "$wxUSE_MAC" = 1; then
      dnl resources are bundled both with shared library and applications
      dnl since the carb resource *must* be included in the application
      if test "$wxUSE_MAC" = 1; then
-        MACRESCOMP="\$(RESCOMP) -d __DARWIN__ -t APPL Carbon.r ${LIBWXMACRES} -o"
+        MACRESCOMP="\$(RESCOMP) -d __DARWIN__ -t APPL Carbon.r -o"
  
          dnl this command is used to implement `wx-config --rezflags` and it is
          dnl eval'd there so escape any metacharacters inside
  
          dnl this command is used to implement `wx-config --rezflags` and it is
          dnl eval'd there so escape any metacharacters inside
-        MACRESWXCONFIG="${RESCOMP} -d __DARWIN__ -t APPL Carbon.r \\\${exec_prefix}/lib/${WX_RESOURCES_MACOSX_ASCII} -o"
+        MACRESWXCONFIG="${RESCOMP} -d __DARWIN__ -t APPL Carbon.r -o"
      else
          MACRESCOMP="echo -n | \$(RESCOMP) -d __DARWIN__ -t APPL ${LIBWXMACRES} -o"
          MACRESWXCONFIG="echo -n \\\| ${RESCOMP} -d __DARWIN__ -t APPL \\\${exec_prefix}/lib/${WX_RESOURCES_MACOSX_ASCII} -o"
      fi
  else
      dnl default value is to (silently) do nothing in the makefile
      else
          MACRESCOMP="echo -n | \$(RESCOMP) -d __DARWIN__ -t APPL ${LIBWXMACRES} -o"
          MACRESWXCONFIG="echo -n \\\| ${RESCOMP} -d __DARWIN__ -t APPL \\\${exec_prefix}/lib/${WX_RESOURCES_MACOSX_ASCII} -o"
      fi
  else
      dnl default value is to (silently) do nothing in the makefile
-    MACSETFILE="@#"
-    MACRESWXCONFIG="#"
+    MACSETFILE="@true"
+    MACRESWXCONFIG="@true"
  
      dnl confusingly, wxOS2 also uses MACRESCOMP in its post-link step
      if test "$wxUSE_PM" = 1; then
          MACRESCOMP="emxbind -ep"
      else
  
      dnl confusingly, wxOS2 also uses MACRESCOMP in its post-link step
      if test "$wxUSE_PM" = 1; then
          MACRESCOMP="emxbind -ep"
      else
-        MACRESCOMP="@#"
+        MACRESCOMP="@true"
      fi
  fi
  
      fi
  fi
  
@@ -3456,6 +3759,9 @@ AC_TYPE_SIZE_T
  dnl   defines uid_t and gid_t if not already defined
  AC_TYPE_UID_T
  
  dnl   defines uid_t and gid_t if not already defined
  AC_TYPE_UID_T
  
+dnl sets HAVE_SSIZE_T if ssize_t is defined
+AC_CHECK_TYPES(ssize_t)
+
  dnl check what exactly size_t is on this machine - this is necessary to avoid
  dnl ambiguous overloads in several places, notably wx/string.h and wx/array.h
  AC_LANG_SAVE
  dnl check what exactly size_t is on this machine - this is necessary to avoid
  dnl ambiguous overloads in several places, notably wx/string.h and wx/array.h
  AC_LANG_SAVE
@@ -3540,7 +3846,7 @@ dnl Check for functions
  dnl ---------------------------------------------------------------------------
  
  dnl don't check for wchar_t functions if we haven't got wchar_t itself
  dnl ---------------------------------------------------------------------------
  
  dnl don't check for wchar_t functions if we haven't got wchar_t itself
-if test "$wx_cv_sizeof_wchar_t" != "0"; then
+if test "$wxUSE_WCHAR_T" = "yes"; then
      AC_DEFINE(wxUSE_WCHAR_T)
  
      dnl check for wcslen in all possible places
      AC_DEFINE(wxUSE_WCHAR_T)
  
      dnl check for wcslen in all possible places
@@ -3563,8 +3869,8 @@ if test "$wx_cv_sizeof_wchar_t" != "0"; then
          AC_DEFINE(HAVE_WCSLEN)
      fi
  
          AC_DEFINE(HAVE_WCSLEN)
      fi
  
-    dnl HP-UX aCC needs this define to find mbstrtowcs() &c
-    if test "$USE_HPUX" = 1 -a "x$GCC" != "xyes"; then
+    dnl on HP-UX aCC and g++ need this define to find mbstrtowcs() &c
+    if test "$USE_HPUX" = 1; then
          CPPFLAGS="$CPPFLAGS -D_INCLUDE__STDC_A1_SOURCE "
      fi
  
          CPPFLAGS="$CPPFLAGS -D_INCLUDE__STDC_A1_SOURCE "
      fi
  
@@ -3606,7 +3912,27 @@ if test "$ac_cv_func_vsnprintf" = "yes"; then
                      vsnprintf(buf, 10u, "%s", ap);
                  ],
                  wx_cv_func_vsnprintf_decl=yes,
                      vsnprintf(buf, 10u, "%s", ap);
                  ],
                  wx_cv_func_vsnprintf_decl=yes,
-                wx_cv_func_vsnprintf_decl=no
+                [
+                    dnl Metrowerks does provide a vsnprintf declaration
+                    dnl but in C++ mode it's always in std namespace.
+                    dnl FIXME: Do we have any UNIX C++ compilers that would
+                    dnl fail this test if using namespace std; was
+                    dnl simply always included?
+                    AC_TRY_COMPILE(
+                        [
+                            #include <stdio.h>
+                            #include <stdarg.h>
+                            using namespace std;
+                        ],
+                        [
+                            char *buf;
+                            va_list ap;
+                            vsnprintf(buf, 10u, "%s", ap);
+                        ],
+                        wx_cv_func_vsnprintf_decl=yes,
+                        wx_cv_func_vsnprintf_decl=no
+                    )
+                ]
              )
          ]
      )
              )
          ]
      )
@@ -3680,6 +4006,59 @@ if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes" -a "$wxUSE_UNIX" = "yes"; then
      fi
  fi
  
      fi
  fi
  
+dnl backtrace() and backtrace_symbols() for wxStackWalker
+if test "$wxUSE_STACKWALKER" = "yes" -a "$wxUSE_UNIX" = "yes"; then
+    AC_LANG_SAVE
+    AC_LANG_CPLUSPLUS
+
+    AC_CACHE_CHECK([for backtrace() in <execinfo.h>], wx_cv_func_backtrace,
+        [
+            AC_TRY_COMPILE([#include <execinfo.h>],
+                [
+                    void *trace[1];
+                    char **messages;
+
+                    backtrace(trace, 1);
+                    messages = backtrace_symbols(trace, 1);
+                ],
+                wx_cv_func_backtrace=yes,
+                wx_cv_func_backtrace=no
+            )
+        ]
+    )
+
+
+    if test "$wx_cv_func_backtrace" = "no"; then
+        AC_MSG_WARN([backtrace() is not available, wxStackWalker will not be available])
+        wxUSE_STACKWALKER=no
+    else
+        AC_CACHE_CHECK([for __cxa_demangle() in <cxxabi.h>], wx_cv_func_cxa_demangle,
+            [
+                AC_TRY_LINK([#include <cxxabi.h>],
+                    [
+                        int rc;
+                        __cxxabiv1::__cxa_demangle("foo", 0, 0, &rc);
+                    ],
+                    wx_cv_func_cxa_demangle=yes,
+                    wx_cv_func_cxa_demangle=no
+                )
+            ]
+        )
+
+        if test "$wx_cv_func_cxa_demangle" = "yes"; then
+            AC_DEFINE(HAVE_CXA_DEMANGLE)
+        fi
+    fi
+
+    AC_LANG_RESTORE
+fi
+
+if test "$wxUSE_STACKWALKER" = "yes" -a "$USE_WIN32" != "1" -a "$USE_UNIX" != "1"; then 
+    AC_MSG_WARN([wxStackWalker is only available on Win32 and UNIX... disabled])
+    wxUSE_STACKWALKER=no
+fi
+
+
  dnl check for the function for temp files creation
  AC_CHECK_FUNCS(mkstemp mktemp, break)
  
  dnl check for the function for temp files creation
  AC_CHECK_FUNCS(mkstemp mktemp, break)
  
@@ -4096,10 +4475,6 @@ if test "$TOOLKIT" != "MSW" -a "$USE_OS2" != 1; then
                  if test "x$GCC" != "xyes"; then
                      dnl see http://docs.hp.com/hpux/onlinedocs/2213/threads.htm
                      flag="$flag -D_RWSTD_MULTI_THREAD"
                  if test "x$GCC" != "xyes"; then
                      dnl see http://docs.hp.com/hpux/onlinedocs/2213/threads.htm
                      flag="$flag -D_RWSTD_MULTI_THREAD"
-
-                    dnl we also need -lcma for user threads (-lpthread is for
-                    dnl kernel threads only) according to Ian Brown
-                    LIBS="$LIBS -lcma"
                  fi
                  ;;
              *solaris* | alpha*-osf*)
                  fi
                  ;;
              *solaris* | alpha*-osf*)
@@ -4168,26 +4543,8 @@ if test "$TOOLKIT" != "MSW" -a "$USE_OS2" != 1; 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]))
  
-      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
+      AC_CHECK_FUNC(pthread_attr_setstacksize,
+                    AC_DEFINE(HAVE_PTHREAD_ATTR_SETSTACKSIZE))
  
        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:
@@ -4319,7 +4676,9 @@ fi
  
  if test "$wxUSE_DEBUG_GDB" = "yes" ; then
      wxUSE_DEBUG_INFO=yes
  
  if test "$wxUSE_DEBUG_GDB" = "yes" ; then
      wxUSE_DEBUG_INFO=yes
-    WXDEBUG="-ggdb"
+    if test "$GCC" = yes; then
+        WXDEBUG="-ggdb"
+    fi
  fi
  
  if test "$wxUSE_DEBUG_FLAG" = "yes" ; then
  fi
  
  if test "$wxUSE_DEBUG_FLAG" = "yes" ; then
@@ -4339,7 +4698,7 @@ if test "$wxUSE_MEM_TRACING" = "yes" ; then
  fi
  
  if test "$wxUSE_DMALLOC" = "yes" ; then
  fi
  
  if test "$wxUSE_DMALLOC" = "yes" ; then
-    DMALLOC_LIBS="-ldmalloc"
+    DMALLOC_LIBS="-ldmallocthcxx"
  fi
  
  PROFILE=
  fi
  
  PROFILE=
@@ -4422,21 +4781,19 @@ dnl the library may be built without GUI classes at all
  dnl ---------------------------------------------------------------------------
  
  if test "$wxUSE_GUI" = "yes"; then
  dnl ---------------------------------------------------------------------------
  
  if test "$wxUSE_GUI" = "yes"; then
-  AC_DEFINE(wxUSE_GUI)
-
-  dnl the things we always pull in the GUI version of the library:
-  dnl 1. basic things like wxApp, wxWindow, wxControl, wxFrame, wxDialog (the
-  dnl    library really can't be built without those)
-  dnl 2. basic controls: wxButton, wxStaticText, wxTextCtrl (these are used in
-  dnl    almost any program and the first 2 are needed to show a message box
-  dnl    which want to be always able to do)
-  dnl 3. GDI stuff: icon, cursors and all that. Although it would be very nice
-  dnl    to compile without them (if the app doesn't do any drawing, it doesn't
-  dnl    need the dcs, pens, brushes, ...), this just can't be done now
-  dnl 4. menu stuff: wxMenu, wxMenuBar, wxMenuItem
-  dnl 5. misc stuff: timers, settings, message box
-else
-  AC_DEFINE(wxUSE_NOGUI)
+    AC_DEFINE(wxUSE_GUI)
+
+    dnl the things we always pull in the GUI version of the library:
+    dnl 1. basic things like wxApp, wxWindow, wxControl, wxFrame, wxDialog (the
+    dnl    library really can't be built without those)
+    dnl 2. basic controls: wxButton, wxStaticText, wxTextCtrl (these are used in
+    dnl    almost any program and the first 2 are needed to show a message box
+    dnl    which want to be always able to do)
+    dnl 3. GDI stuff: icon, cursors and all that. Although it would be very nice
+    dnl    to compile without them (if the app doesn't do any drawing, it doesn't
+    dnl    need the dcs, pens, brushes, ...), this just can't be done now
+    dnl 4. menu stuff: wxMenu, wxMenuBar, wxMenuItem
+    dnl 5. misc stuff: timers, settings, message box
  fi
  
  dnl ---------------------------------------------------------------------------
  fi
  
  dnl ---------------------------------------------------------------------------
@@ -4460,6 +4817,8 @@ if test "$TOOLKIT" != "MSW" -a "$USE_OS2" != 1; then
          if test "$USE_DARWIN" = 1; then
              dnl dlopen/dlerror is implemented in dynlib.cpp for Darwin/Mac OS X
              HAVE_DL_FUNCS=1
          if test "$USE_DARWIN" = 1; then
              dnl dlopen/dlerror is implemented in dynlib.cpp for Darwin/Mac OS X
              HAVE_DL_FUNCS=1
+        elif test "$USE_DOS" = 1; then
+            HAVE_DL_FUNCS=0
          else
              dnl the test is a bit complicated because we check for dlopen() both with
              dnl and without -ldl and we also try to find shl_load() if there is no
          else
              dnl the test is a bit complicated because we check for dlopen() both with
              dnl and without -ldl and we also try to find shl_load() if there is no
@@ -4505,7 +4864,7 @@ if test "$TOOLKIT" != "MSW" -a "$USE_OS2" != 1; then
  
          if test "$HAVE_DL_FUNCS" = 0; then
              if test "$HAVE_SHL_FUNCS" = 0; then
  
          if test "$HAVE_DL_FUNCS" = 0; then
              if test "$HAVE_SHL_FUNCS" = 0; then
-              if test "$USE_UNIX" = 1; then
+              if test "$USE_UNIX" = 1 -o "$USE_DOS" = 1; then
                    AC_MSG_WARN([Missing dynamic loading support, several features will be disabled])
                    wxUSE_DYNAMIC_LOADER=no
                    wxUSE_DYNLIB_CLASS=no
                    AC_MSG_WARN([Missing dynamic loading support, several features will be disabled])
                    wxUSE_DYNAMIC_LOADER=no
                    wxUSE_DYNLIB_CLASS=no
@@ -4563,13 +4922,15 @@ if test "$wxUSE_TIMER" = "yes"; then
    AC_DEFINE(wxUSE_TIMER)
  fi
  
    AC_DEFINE(wxUSE_TIMER)
  fi
  
+dnl Unix implementation needs additional checks because audio support
+dnl comes in many favours:
+if test "$USE_UNIX" = "1" ; then
+    AC_CHECK_HEADERS([sys/soundcard.h],,
+                     [DISABLED_CONTRIB="$DISABLED_CONTRIB mmedia"])
+fi
  WITH_PLUGIN_SDL=0
  if test "$wxUSE_SOUND" = "yes"; then
  WITH_PLUGIN_SDL=0
  if test "$wxUSE_SOUND" = "yes"; then
-  dnl Unix implementation needs additional checks because audio support
-  dnl comes in many favours:
    if test "$USE_UNIX" = "1" ; then
    if test "$USE_UNIX" = "1" ; then
-    AC_CHECK_HEADERS([sys/soundcard.h])
-
      if test "$wxUSE_LIBSDL" != "no"; then
        AM_PATH_SDL([1.2.0],
                    [
      if test "$wxUSE_LIBSDL" != "no"; then
        AM_PATH_SDL([1.2.0],
                    [
@@ -4588,6 +4949,27 @@ if test "$wxUSE_SOUND" = "yes"; then
    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS sound"
  fi
  
    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS sound"
  fi
  
+if test "$WXGTK20" = 1; then
+    if test "$wxUSE_PRINTING_ARCHITECTURE" = "yes" ; then
+        if test "$wxUSE_LIBGNOMEPRINT" = "yes" ; then
+        
+                PKG_CHECK_MODULES(LIBGNOMEPRINTUI, 
+                                  [libgnomeprintui-2.2 >= 2.8],
+                    [
+dnl                     EXTRALIBS_GNOMEPRINT="$LIBGNOMEPRINTUI_LIBS"
+                        CXXFLAGS="$CXXFLAGS $LIBGNOMEPRINTUI_CFLAGS"
+                        AC_DEFINE(wxUSE_LIBGNOMEPRINT)
+                    ],
+                    [
+                        AC_MSG_WARN([libgnomeprintui not found, library will use standard PostScript printing])
+                        wxUSE_LIBGNOMEPRINT="no"
+                    ]
+                )
+        fi
+    fi
+fi
+
+
  if test "$wxUSE_CMDLINE_PARSER" = "yes"; then
    AC_DEFINE(wxUSE_CMDLINE_PARSER)
  fi
  if test "$wxUSE_CMDLINE_PARSER" = "yes"; then
    AC_DEFINE(wxUSE_CMDLINE_PARSER)
  fi
@@ -4616,12 +4998,43 @@ if test "$wxUSE_FS_ZIP" = "yes"; then
    AC_DEFINE(wxUSE_FS_ZIP)
  fi
  
    AC_DEFINE(wxUSE_FS_ZIP)
  fi
  
+if test "$wxUSE_ARCHIVE_STREAMS" = "yes"; then
+  AC_DEFINE(wxUSE_ARCHIVE_STREAMS)
+fi
+
  if test "$wxUSE_ZIPSTREAM" = "yes"; then
  if test "$wxUSE_ZIPSTREAM" = "yes"; then
-  AC_DEFINE(wxUSE_ZIPSTREAM)
+  if test "$wxUSE_ARCHIVE_STREAMS" != "yes"; then
+    AC_MSG_WARN(wxZip requires wxArchive... disabled)
+  elif test "$wxUSE_ZLIB" = "no"; then
+    AC_MSG_WARN(wxZip requires wxZlib... disabled)
+  else
+    AC_DEFINE(wxUSE_ZIPSTREAM)
+  fi
  fi
  
  if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes"; then
  fi
  
  if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes"; then
-  AC_DEFINE(wxUSE_ON_FATAL_EXCEPTION)
+  if test "$USE_UNIX" != 1; then
+    AC_MSG_WARN([Catching fatal exceptions not currently supported on this system, wxApp::OnFatalException will not be called])
+    wxUSE_ON_FATAL_EXCEPTION=no
+  else
+    AC_DEFINE(wxUSE_ON_FATAL_EXCEPTION)
+  fi
+fi
+
+if test "$wxUSE_STACKWALKER" = "yes"; then
+    AC_DEFINE(wxUSE_STACKWALKER)
+fi
+
+if test "$wxUSE_DEBUGREPORT" = "yes"; then
+    if test "$USE_UNIX" != "1" -a "$USE_WIN32" != "1"; then
+        AC_MSG_WARN([Creating debug reports not currently supported on this system, disabled])
+        wxUSE_DEBUGREPORT=no
+    else
+        AC_DEFINE(wxUSE_DEBUGREPORT)
+        if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes"; then
+            SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS debugrpt"
+        fi
+    fi
  fi
  
  if test "$wxUSE_SNGLINST_CHECKER" = "yes"; then
  fi
  
  if test "$wxUSE_SNGLINST_CHECKER" = "yes"; then
@@ -4636,6 +5049,14 @@ if test "$wxUSE_STD_IOSTREAM" = "yes"; then
    AC_DEFINE(wxUSE_STD_IOSTREAM)
  fi
  
    AC_DEFINE(wxUSE_STD_IOSTREAM)
  fi
  
+if test "$wxUSE_STD_STRING" = "yes"; then
+  AC_DEFINE(wxUSE_STD_STRING)
+fi
+
+if test "$wxUSE_STDPATHS" = "yes"; then
+  AC_DEFINE(wxUSE_STDPATHS)
+fi
+
  if test "$wxUSE_TEXTBUFFER" = "yes"; then
      AC_DEFINE(wxUSE_TEXTBUFFER)
  fi
  if test "$wxUSE_TEXTBUFFER" = "yes"; then
      AC_DEFINE(wxUSE_TEXTBUFFER)
  fi
@@ -4653,6 +5074,7 @@ if test "$wxUSE_CONFIG" = "yes" ; then
      AC_MSG_WARN(wxConfig requires wxTextFile... disabled)
    else
      AC_DEFINE(wxUSE_CONFIG)
      AC_MSG_WARN(wxConfig requires wxTextFile... disabled)
    else
      AC_DEFINE(wxUSE_CONFIG)
+    AC_DEFINE(wxUSE_CONFIG_NATIVE)
      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS config"
    fi
  fi
      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS config"
    fi
  fi
@@ -4681,6 +5103,9 @@ if test "$wxUSE_LOG" = "yes"; then
      if test "$wxUSE_LOGDIALOG" = "yes"; then
        AC_DEFINE(wxUSE_LOG_DIALOG)
      fi
      if test "$wxUSE_LOGDIALOG" = "yes"; then
        AC_DEFINE(wxUSE_LOG_DIALOG)
      fi
+
+    dnl the keyboard sample requires wxUSE_LOG
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS keyboard"
  fi
  
  if test "$wxUSE_LONGLONG" = "yes"; then
  fi
  
  if test "$wxUSE_LONGLONG" = "yes"; then
@@ -4691,11 +5116,6 @@ if test "$wxUSE_GEOMETRY" = "yes"; then
    AC_DEFINE(wxUSE_GEOMETRY)
  fi
  
    AC_DEFINE(wxUSE_GEOMETRY)
  fi
  
-if test "$wxUSE_DIALUP_MANAGER" = "yes" ; then
-  AC_DEFINE(wxUSE_DIALUP_MANAGER)
-  SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dialup"
-fi
-
  if test "$wxUSE_STREAMS" = "yes" ; then
    AC_DEFINE(wxUSE_STREAMS)
  fi
  if test "$wxUSE_STREAMS" = "yes" ; then
    AC_DEFINE(wxUSE_STREAMS)
  fi
@@ -4944,6 +5364,67 @@ if test "$wxUSE_SOCKETS" = "yes" ; then
          else
              AC_DEFINE_UNQUOTED(SOCKLEN_T, $wx_cv_type_getsockname3)
          fi
          else
              AC_DEFINE_UNQUOTED(SOCKLEN_T, $wx_cv_type_getsockname3)
          fi
+        dnl Do this again for getsockopt as it may be different
+        AC_CACHE_CHECK([what is the type of the fifth argument of getsockopt],
+                       wx_cv_type_getsockopt5,
+            [
+                AC_TRY_COMPILE(
+                    [
+                        #include <sys/types.h>
+                        #include <sys/socket.h>
+                    ],
+                    [
+                        socklen_t len;
+                        getsockopt(0, 0, 0, 0, &len);
+                    ],
+                    wx_cv_type_getsockopt5=socklen_t,
+                    [
+                        dnl the compiler will compile the version with size_t
+                        dnl even if the real type of the last parameter is int
+                        dnl but it should give at least a warning about
+                        dnl converting between incompatible pointer types, so
+                        dnl try to use it to get the correct behaviour at
+                        dnl least with gcc (otherwise we'd always use size_t)
+                        CFLAGS_OLD="$CFLAGS"
+                        if test "$GCC" = yes ; then
+                            CFLAGS="$CFLAGS -Werror"
+                        fi
+
+                        AC_TRY_COMPILE(
+                            [
+                                #include <sys/types.h>
+                                #include <sys/socket.h>
+                            ],
+                            [
+                                size_t len;
+                                getsockopt(0, 0, 0, 0, &len);
+                            ],
+                            wx_cv_type_getsockopt5=size_t,
+                            AC_TRY_COMPILE(
+                                [
+                                    #include <sys/types.h>
+                                    #include <sys/socket.h>
+                                ],
+                                [
+                                    int len;
+                                    getsockopt(0, 0, 0, 0, &len);
+                                ],
+                                wx_cv_type_getsockopt5=int,
+                                wx_cv_type_getsockopt5=unknown
+                            )
+                        )
+
+                        CFLAGS="$CFLAGS_OLD"
+                    ]
+                )
+            ])
+
+        if test "$wx_cv_type_getsockopt5" = "unknown"; then
+            wxUSE_SOCKETS=no
+            AC_MSG_WARN([Couldn't find socklen_t synonym for this system])
+        else
+            AC_DEFINE_UNQUOTED(SOCKOPTLEN_T, $wx_cv_type_getsockopt5)
+        fi
          AC_LANG_POP
      fi
  fi
          AC_LANG_POP
      fi
  fi
@@ -4997,28 +5478,39 @@ dnl ---------------------------------------------------------------------------
  dnl Joystick support
  dnl ---------------------------------------------------------------------------
  
  dnl Joystick support
  dnl ---------------------------------------------------------------------------
  
-if test "$wxUSE_GUI" = "yes"; then
+if test "$wxUSE_GUI" = "yes" -a "$wxUSE_JOYSTICK" = "yes"; then
+    wxUSE_JOYSTICK=no
  
  
-    if test "$TOOLKIT" = "MAC" -o "$TOOLKIT" = "COCOA"; then
-        AC_MSG_WARN([Joystick not yet supported under Mac OS X... disabled])
-        wxUSE_JOYSTICK=no
-     fi
-    
-     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
-            AC_CHECK_HEADERS(linux/joystick.h)
-            if test "$ac_cv_header_linux_joystick_h" != "yes"; then
-                wxUSE_JOYSTICK=no
-                AC_MSG_WARN(Joystick not supported by this system... disabled)
-            fi
+    dnl under MSW we always have joystick support
+    if test "$TOOLKIT" = "MSW"; then
+        wxUSE_JOYSTICK=yes
+
+    dnl mac only available on darwin
+    elif test "$TOOLKIT" = "MAC" -o "$TOOLKIT" = "COCOA"; then
+        if test "$USE_DARWIN" = 1; then
+            dnl check for a bug in the headers, some have bad setEventCallout
+            AC_MSG_CHECKING([headers have declarations needed for joystick support])
+            AC_LANG_PUSH(C++)
+            AC_TRY_COMPILE( [ #include <IOKit/hid/IOHIDLib.h> ],
+                            [ IOHIDQueueInterface *qi = NULL;
+                              IOHIDCallbackFunction cb = NULL;
+                              qi->setEventCallout(NULL, cb, NULL, NULL); ],
+                            [ wxUSE_JOYSTICK=yes ]
+                          )
+            AC_LANG_POP
+            AC_MSG_RESULT($wxUSE_JOYSTICK)
          fi
          fi
+
+    dnl joystick support is only for Linux 2.1.x or greater
+    else
+        AC_CHECK_HEADERS(linux/joystick.h, wxUSE_JOYSTICK=yes)
      fi
  
      if test "$wxUSE_JOYSTICK" = "yes"; then
          AC_DEFINE(wxUSE_JOYSTICK)
          SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS joytest"
      fi
  
      if test "$wxUSE_JOYSTICK" = "yes"; then
          AC_DEFINE(wxUSE_JOYSTICK)
          SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS joytest"
+    else
+        AC_MSG_WARN(Joystick not supported by this system... disabled)           
      fi
  fi
  
      fi
  fi
  
@@ -5154,6 +5646,7 @@ if test "$USE_WIN32" = 1 -a \( "$wxUSE_DATAOBJ"       = "yes" \
              LIBS=" -lrpcrt4 -loleaut32 -lole32 -luuid$LIBS"
              if test "$wxUSE_OLE" = "yes" ; then
                  AC_DEFINE(wxUSE_OLE)
              LIBS=" -lrpcrt4 -loleaut32 -lole32 -luuid$LIBS"
              if test "$wxUSE_OLE" = "yes" ; then
                  AC_DEFINE(wxUSE_OLE)
+                SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS oleauto"
              fi
          fi
  
              fi
          fi
  
@@ -5179,11 +5672,23 @@ if test "$USE_WIN32" = 1 -a \( "$wxUSE_DATAOBJ"       = "yes" \
  fi
  
  if test "$wxUSE_IPC" = "yes"; then
  fi
  
  if test "$wxUSE_IPC" = "yes"; then
-    if test "$wxUSE_SOCKETS" != "yes"; then
+    if test "$wxUSE_SOCKETS" != "yes" -a "$USE_WIN32" != 1; then
          AC_MSG_WARN(wxWidgets IPC classes require sockets... disabled)
          AC_MSG_WARN(wxWidgets IPC classes require sockets... disabled)
+        wxUSE_IPC=no
      fi
  
      fi
  
-    AC_DEFINE(wxUSE_IPC)
+    if test "$wxUSE_IPC" = "yes"; then
+        AC_DEFINE(wxUSE_IPC)
+        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS ipc"
+    fi
+fi
+
+if test "$wxUSE_DATAOBJ" = "yes"; then
+    AC_DEFINE(wxUSE_DATAOBJ)
+else
+    AC_MSG_WARN([Clipboard and drag-and-drop require wxDataObject -- disabled])
+    wxUSE_CLIPBOARD=no
+    wxUSE_DRAG_AND_DROP=no
  fi
  
  if test "$wxUSE_CLIPBOARD" = "yes"; then
  fi
  
  if test "$wxUSE_CLIPBOARD" = "yes"; then
@@ -5194,9 +5699,6 @@ if test "$wxUSE_CLIPBOARD" = "yes"; then
  
      if test "$wxUSE_CLIPBOARD" = "yes"; then
          AC_DEFINE(wxUSE_CLIPBOARD)
  
      if test "$wxUSE_CLIPBOARD" = "yes"; then
          AC_DEFINE(wxUSE_CLIPBOARD)
-
-        dnl required by clipboard code in configuration check
-        AC_DEFINE(wxUSE_DATAOBJ)
      fi
  fi
  
      fi
  fi
  
@@ -5237,6 +5739,10 @@ if test "$wxUSE_SPLINES" = "yes" ; then
    AC_DEFINE(wxUSE_SPLINES)
  fi
  
    AC_DEFINE(wxUSE_SPLINES)
  fi
  
+if test "$wxUSE_MOUSEWHEEL" = "yes" ; then
+  AC_DEFINE(wxUSE_MOUSEWHEEL)
+fi
+
  dnl ---------------------------------------------------------------------------
  dnl GUI controls
  dnl ---------------------------------------------------------------------------
  dnl ---------------------------------------------------------------------------
  dnl GUI controls
  dnl ---------------------------------------------------------------------------
@@ -5299,9 +5805,14 @@ if test "$wxUSE_CHECKLST" = "yes"; then
    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS checklst"
  fi
  
    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS checklst"
  fi
  
+if test "$wxUSE_DATEPICKCTRL" = "yes"; then
+  AC_DEFINE(wxUSE_DATEPICKCTRL)
+  USES_CONTROLS=1
+fi
+
  if test "$wxUSE_DISPLAY" = "yes"; then
      AC_DEFINE(wxUSE_DISPLAY)
  if test "$wxUSE_DISPLAY" = "yes"; then
      AC_DEFINE(wxUSE_DISPLAY)
-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS display"
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS display multimon"
  fi
  
  if test "$wxUSE_GAUGE" = "yes"; then
  fi
  
  if test "$wxUSE_GAUGE" = "yes"; then
@@ -5327,6 +5838,7 @@ 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
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS listbox"
  fi
  
  if test "$wxUSE_LISTCTRL" = "yes"; then
  fi
  
  if test "$wxUSE_LISTCTRL" = "yes"; then
@@ -5413,6 +5925,8 @@ if test "$wxUSE_STATLINE" = "yes"; then
  fi
  
  if test "$wxUSE_STATUSBAR" = "yes"; then
  fi
  
  if test "$wxUSE_STATUSBAR" = "yes"; then
+    dnl this will get undefined in wx/chkconf.h if it's not supported
+    AC_DEFINE(wxUSE_NATIVE_STATUSBAR)
      AC_DEFINE(wxUSE_STATUSBAR)
      USES_CONTROLS=1
  
      AC_DEFINE(wxUSE_STATUSBAR)
      USES_CONTROLS=1
  
@@ -5421,7 +5935,6 @@ fi
  
  if test "$wxUSE_TABDIALOG" = "yes"; then
      AC_DEFINE(wxUSE_TAB_DIALOG)
  
  if test "$wxUSE_TABDIALOG" = "yes"; then
      AC_DEFINE(wxUSE_TAB_DIALOG)
-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS tab"
  fi
  
  if test "$wxUSE_TEXTCTRL" = "yes"; then
  fi
  
  if test "$wxUSE_TEXTCTRL" = "yes"; then
@@ -5434,11 +5947,6 @@ if test "$wxUSE_TOGGLEBTN" = "yes"; then
      if test "$wxUSE_COCOA" = 1 ; then
          AC_MSG_WARN([Toggle button not yet supported under Mac OS X... disabled])
          wxUSE_TOGGLEBTN=no
      if test "$wxUSE_COCOA" = 1 ; then
          AC_MSG_WARN([Toggle button not yet supported under Mac OS X... disabled])
          wxUSE_TOGGLEBTN=no
-    else
-        if test "$wxUSE_PM" = 1; then
-            AC_MSG_WARN([Toggle button not yet supported under PM... disabled])
-            wxUSE_TOGGLEBTN=no
-        fi
      fi
      if test "$wxUSE_UNIVERSAL" = "yes"; then
          AC_MSG_WARN([Toggle button not yet supported under wxUniversal... disabled])
      fi
      if test "$wxUSE_UNIVERSAL" = "yes"; then
          AC_MSG_WARN([Toggle button not yet supported under wxUniversal... disabled])
@@ -5504,12 +6012,22 @@ if test "$wxUSE_POPUPWIN" = "yes"; then
              AC_MSG_WARN([wxPopupWindow not yet supported under PM... disabled])
          else
              AC_DEFINE(wxUSE_POPUPWIN)
              AC_MSG_WARN([wxPopupWindow not yet supported under PM... disabled])
          else
              AC_DEFINE(wxUSE_POPUPWIN)
+            SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS popup"
  
              USES_CONTROLS=1
          fi
      fi
  fi
  
  
              USES_CONTROLS=1
          fi
      fi
  fi
  
+if test "$wxUSE_DIALUP_MANAGER" = "yes"; then
+    if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1 ; then
+        AC_MSG_WARN([Dialup manager not yet supported under Mac OS X... disabled])
+    else
+        AC_DEFINE(wxUSE_DIALUP_MANAGER)
+        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dialup"
+    fi
+fi
+
  if test "$wxUSE_TIPWINDOW" = "yes"; then
      if test "$wxUSE_PM" = 1; then
          AC_MSG_WARN([wxTipWindow not yet supported under PM... disabled])
  if test "$wxUSE_TIPWINDOW" = "yes"; then
      if test "$wxUSE_PM" = 1; then
          AC_MSG_WARN([wxTipWindow not yet supported under PM... disabled])
@@ -5556,7 +6074,7 @@ if test "$wxUSE_HTML" = "yes"; then
      fi
  fi
  if test "$wxUSE_WEBKIT" = "yes"; then
      fi
  fi
  if test "$wxUSE_WEBKIT" = "yes"; then
-    if test "$wxUSE_MAC" = 1; then
+    if test "$wxUSE_MAC" = 1 -a "$USE_DARWIN" = 1; then
          old_CPPFLAGS="$CPPFLAGS"
          CPPFLAGS="$CPPFLAGS -x objective-c++"
          AC_CHECK_HEADER([WebKit/HIWebView.h],
          old_CPPFLAGS="$CPPFLAGS"
          CPPFLAGS="$CPPFLAGS -x objective-c++"
          AC_CHECK_HEADER([WebKit/HIWebView.h],
@@ -5610,7 +6128,7 @@ fi
  if test "$wxUSE_SYSTEM_OPTIONS" = "yes"; then
      AC_DEFINE(wxUSE_SYSTEM_OPTIONS)
      if test "$TOOLKIT" = "MSW" -o "$TOOLKIT" = "GTK" -o "$TOOLKIT" = "X11" -o \
  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
+        "$TOOLKIT" = "MOTIF" -o "$TOOLKIT" = "COCOA"; then
          SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS taskbar"
      fi
  fi
          SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS taskbar"
      fi
  fi
@@ -5733,7 +6251,94 @@ if test "$wxUSE_WIZARDDLG" = "yes"; then
  fi
  
  dnl ---------------------------------------------------------------------------
  fi
  
  dnl ---------------------------------------------------------------------------
-dnl get the string with OS info - used by wxGetOsDescription()
+dnl wxMediaCtrl 
+dnl ---------------------------------------------------------------------------
+
+if test "$wxUSE_MEDIACTRL" = "yes"; then
+    dnl -----------------------------------------------------------------------
+    dnl GStreamer 
+    dnl -----------------------------------------------------------------------
+    if test "$wxUSE_GTK" = 1; then
+        wxUSE_GSTREAMER="yes"
+        
+        dnl -------------------------------------------------------------------
+        dnl Test for gstreamer module from pkg-config
+        dnl -------------------------------------------------------------------
+        PKG_CHECK_MODULES(GSTREAMER, gstreamer-0.8,
+        [
+            CPPFLAGS="$CPPFLAGS $GSTREAMER_CFLAGS"
+            LIBS="$LIBS $GSTREAMER_LIBS -lgstplay-0.8"
+        ],
+        [
+            AC_MSG_WARN([GStreamer installation not found])
+            wxUSE_GSTREAMER="no"
+        ])
+        
+        dnl -------------------------------------------------------------------
+        dnl Perform a check for a GStreamer element using gst-inspect
+        dnl Thomas Vander Stichele <thomas at apestaart dot org>
+        dnl Last modification: 25/01/2005
+        dnl
+        dnl AM_GST_ELEMENT_CHECK(ELEMENT-NAME, ACTION-IF-FOUND, ACTION-IF-NOT-FOUND)
+        dnl -------------------------------------------------------------------
+        AC_DEFUN([AM_GST_ELEMENT_CHECK],
+        [
+        if test "x$GST_INSPECT" == "x"; then
+            AC_CHECK_PROG(GST_INSPECT, gst-inspect, gst-inspect, [])
+        fi
+        
+        if test "x$GST_INSPECT" != "x"; then
+            AC_MSG_CHECKING(GStreamer element $1)
+            if [ $GST_INSPECT $1 > /dev/null 2> /dev/null ]; then
+            AC_MSG_RESULT(found.)
+            $2
+            else
+            AC_MSG_RESULT(not found.)
+            $3
+            fi
+        fi
+        ])
+        
+        dnl -------------------------------------------------------------------
+        dnl Test for x video sink (video useless without)
+        dnl -------------------------------------------------------------------
+        AM_GST_ELEMENT_CHECK(xvimagesink,[], 
+                        [
+                            wxUSE_GSTREAMER="no"
+                            AC_MSG_WARN([x video sink not found - cannot use GStreamer])
+                        ])
+                            
+        dnl -------------------------------------------------------------------
+        dnl Check for gstplay-0.8 lib and corresponding x overlay header
+        dnl -------------------------------------------------------------------        
+        AC_CHECK_HEADER(gst/xoverlay/xoverlay.h, [], 
+                        [
+                            wxUSE_GSTREAMER="no"
+                            AC_MSG_WARN([xoverlay header not found, cannot use GStreamer])
+                        ],
+                        [#include <gst/gst.h>])
+        
+        AC_MSG_CHECKING([for gstplay 0.8])
+        WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],gstplay-0.8)           
+        
+        if test "$ac_find_libraries" = "" ; then
+            AC_MSG_RESULT([no])
+            wxUSE_GSTREAMER="no"
+        else
+            AC_MSG_RESULT([yes])        
+        fi
+        
+        if test "$wxUSE_GSTREAMER" = "yes"; then
+            AC_DEFINE(wxUSE_GSTREAMER)
+            AC_MSG_RESULT([GStreamer detection successful])
+        fi
+    fi
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS mediaplayer"
+    AC_DEFINE(wxUSE_MEDIACTRL)
+fi
+
+dnl ---------------------------------------------------------------------------
+dnl get the string with OS info - used by wxGetOsDescription() on MacOS X
  dnl ---------------------------------------------------------------------------
  
  if test "$cross_compiling" = "yes"; then
  dnl ---------------------------------------------------------------------------
  
  if test "$cross_compiling" = "yes"; then
@@ -5777,6 +6382,9 @@ fi
  if test "$wxUSE_HTML" = "yes" ; then
      CORE_GUI_LIBS="html $CORE_GUI_LIBS"
  fi
  if test "$wxUSE_HTML" = "yes" ; then
      CORE_GUI_LIBS="html $CORE_GUI_LIBS"
  fi
+if test "$wxUSE_DEBUGREPORT" = "yes" ; then
+    CORE_GUI_LIBS="qa $CORE_GUI_LIBS"
+fi
  if test "$wxUSE_XRC" = "yes" ; then
      CORE_GUI_LIBS="xrc $CORE_GUI_LIBS"
  fi
  if test "$wxUSE_XRC" = "yes" ; then
      CORE_GUI_LIBS="xrc $CORE_GUI_LIBS"
  fi
@@ -5799,16 +6407,27 @@ dnl note that we always link with -lm except for Mac OS X
  dnl extended.c uses floor() and is always linked in
  
  if test "$wxUSE_MAC" = 1 ; then
  dnl extended.c uses floor() and is always linked in
  
  if test "$wxUSE_MAC" = 1 ; then
-    if test "$wxUSE_SOUND" = "yes"; then
-       LDFLAGS="$LDFLAGS -framework QuickTime"
+    if test "$wxUSE_SOUND" = "yes" || test "$wxUSE_MEDIACTRL" = "yes"; then
+        if test "$USE_DARWIN" = 1; then
+            LDFLAGS="$LDFLAGS -framework QuickTime"
+        else
+            LDFLAGS="$LDFLAGS -lQuickTimeLib"
+        fi
      fi
      if test "$USE_DARWIN" = 1; then
      fi
      if test "$USE_DARWIN" = 1; then
-       LDFLAGS="$LDFLAGS -framework IOKit"
+        LDFLAGS="$LDFLAGS -framework IOKit -framework Carbon -framework Cocoa -framework System"
+    else
+        LDFLAGS="$LDFLAGS -lCarbonLib"
      fi
      fi
-    LDFLAGS="$LDFLAGS -framework Carbon -framework Cocoa -framework System"
  fi
  if test "$wxUSE_COCOA" = 1 ; then
  fi
  if test "$wxUSE_COCOA" = 1 ; then
-    LDFLAGS="$LDFLAGS -framework Cocoa -framework System"
+    LDFLAGS="$LDFLAGS -framework IOKit -framework Cocoa"
+    if test "$wxUSE_MEDIACTRL" = "yes"; then
+        LDFLAGS="$LDFLAGS -framework QuickTime"
+    fi
+fi
+if test "$USE_DARWIN" = 1 -a "$wxUSE_MAC" != 1 -a "$wxUSE_COCOA" != 1 ; then
+    LDFLAGS="$LDFLAGS -framework IOKit -framework CoreServices -framework System -framework ApplicationServices"
  fi
  
  dnl FIXME: should this be covered by the conditional above
  fi
  
  dnl FIXME: should this be covered by the conditional above
@@ -5863,15 +6482,24 @@ if test "$wxUSE_GUI" = "yes"; then
      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)
  
-    dnl TODO some samples are never built so far:
-    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 render"
+    dnl TODO some samples are never built so far: mfc (requires VC++)
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS artprov controls dialogs drawing \
+                     dynamic erase event exec font image minimal mobile \
+                     mobile/wxedit mobile/styles propsize render \
+                     richedit rotate shaped vscroll widgets"
  
      if test "$wxUSE_MONOLITHIC" != "yes"; then
          SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS console"
      fi
  
      if test "$wxUSE_MONOLITHIC" != "yes"; then
          SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS console"
      fi
+    if test "$TOOLKIT" = "MSW"; then
+        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS regtest"
+        if test "$wxUSE_UNIVERSAL" != "yes"; then
+            SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS ownerdrw nativdlg"
+        fi
+    fi
+    if test "$TOOLKIT" = "PM" -a "$wxUSE_UNIVERSAL" != "yes"; then
+        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS ownerdrw"
+    fi
  else
      SAMPLES_SUBDIRS="console"
  fi
  else
      SAMPLES_SUBDIRS="console"
  fi
@@ -5889,7 +6517,8 @@ INCLUDES="-I\${top_builddir}lib/wx/include/${TOOLCHAIN_FULLNAME} \
  dnl C/C++ compiler options used to compile wxWidgets
  if test "$GXX" = yes ; then
      dnl CXXWARNINGS="-Wall -W -Wcast-qual -Werror"
  dnl C/C++ compiler options used to compile wxWidgets
  if test "$GXX" = yes ; then
      dnl CXXWARNINGS="-Wall -W -Wcast-qual -Werror"
-    CXXWARNINGS="-Wall"
+    CWARNINGS="-Wall" 
+    CXXWARNINGS="$CWARNINGS -Wno-ctor-dtor-privacy" 
      dnl should enable this one day...
      dnl CXXWARNINGS="-Wall -Werror"
  fi
      dnl should enable this one day...
      dnl CXXWARNINGS="-Wall -Werror"
  fi
@@ -5898,9 +6527,24 @@ EXTRA_CFLAGS="$WXDEBUG $WXODBCFLAG $PROFILE $OPTIMISE"
  
  dnl remove the extra white space from the cc/c++/ld options
  CPPFLAGS=`echo $WXDEBUG_DEFINE $INCLUDES $CPPFLAGS`
  
  dnl remove the extra white space from the cc/c++/ld options
  CPPFLAGS=`echo $WXDEBUG_DEFINE $INCLUDES $CPPFLAGS`
-CFLAGS=`echo $CODE_GEN_FLAGS $EXTRA_CFLAGS $CFLAGS $CXXWARNINGS`
+CFLAGS=`echo $CODE_GEN_FLAGS $EXTRA_CFLAGS $CFLAGS $CWARNINGS`
  CXXFLAGS=`echo $CODE_GEN_FLAGS $CODE_GEN_FLAGS_CXX $EXTRA_CFLAGS $CXXFLAGS $CXXWARNINGS`
      
  CXXFLAGS=`echo $CODE_GEN_FLAGS $CODE_GEN_FLAGS_CXX $EXTRA_CFLAGS $CXXFLAGS $CXXWARNINGS`
      
+if test "x$MWCC" = "xyes"; then
+    dnl Correct MW 8.3 to be more similar to GCC.  In particular we
+    dnl must use <regex.h> from system not our local copy on OS X,
+    dnl but must use local not system on OS 9.
+    dnl The following should make all -I paths usable for <> includes
+    dnl while first checking in real system paths.  With 8.3 using
+    dnl -gccincludes it will actually check local paths before system
+    dnl even for <> which is totally wrong.
+
+    dnl Note that because this absolutely needs to be before any -I
+    dnl that we have to tack it on to the end of the compiler commandline.
+    CC="$CC -cwd source -I-"
+    CXX="$CXX -cwd source -I-"
+fi
+
  
  LIBS=`echo $LIBS`
  EXTRALIBS="$LDFLAGS $LDFLAGS_VERSIONING $LIBS $DMALLOC_LIBS"
  
  LIBS=`echo $LIBS`
  EXTRALIBS="$LDFLAGS $LDFLAGS_VERSIONING $LIBS $DMALLOC_LIBS"
@@ -5908,7 +6552,7 @@ EXTRALIBS_XML="$EXPAT_LINK"
  EXTRALIBS_HTML="$MSPACK_LINK"
  EXTRALIBS_ODBC="$ODBC_LINK"
  if test "$wxUSE_GUI" = "yes"; then
  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 $WEBKIT_LINK`
+    EXTRALIBS_GUI=`echo $GUI_TK_LIBRARY $PNG_LINK $JPEG_LINK $TIFF_LINK $WEBKIT_LINK $EXTRALIBS_GNOMEPRINT`
  fi
  if test "$wxUSE_OPENGL" = "yes"; then
      EXTRALIBS_OPENGL="$LDFLAGS_GL $OPENGL_LIBS"
  fi
  if test "$wxUSE_OPENGL" = "yes"; then
      EXTRALIBS_OPENGL="$LDFLAGS_GL $OPENGL_LIBS"
@@ -5927,32 +6571,29 @@ WXCONFIG_EXTRALIBS="$LIBS"
  
  dnl wx-config must output builtin 3rd party libs in --libs in static build:
  if test "$wxUSE_REGEX" = "builtin" ; then
  
  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${lib_unicode_suffix}"
+    wxconfig_3rdparty="regex${lib_unicode_suffix} $wxconfig_3rdparty"
  fi
  if test "$wxUSE_EXPAT" = "builtin" ; then
  fi
  if test "$wxUSE_EXPAT" = "builtin" ; then
-    wxconfig_3rdparty="$wxconfig_3rdparty expat"
+    wxconfig_3rdparty="expat $wxconfig_3rdparty"
  fi
  if test "$wxUSE_ODBC" = "builtin" ; then
  fi
  if test "$wxUSE_ODBC" = "builtin" ; then
-    wxconfig_3rdparty="$wxconfig_3rdparty odbc"
+    wxconfig_3rdparty="odbc $wxconfig_3rdparty"
  fi
  if test "$wxUSE_LIBTIFF" = "builtin" ; then
  fi
  if test "$wxUSE_LIBTIFF" = "builtin" ; then
-    wxconfig_3rdparty="$wxconfig_3rdparty tiff"
+    wxconfig_3rdparty="tiff $wxconfig_3rdparty"
  fi
  if test "$wxUSE_LIBJPEG" = "builtin" ; then
  fi
  if test "$wxUSE_LIBJPEG" = "builtin" ; then
-    wxconfig_3rdparty="$wxconfig_3rdparty jpeg"
+    wxconfig_3rdparty="jpeg $wxconfig_3rdparty"
  fi
  if test "$wxUSE_LIBPNG" = "builtin" ; then
  fi
  if test "$wxUSE_LIBPNG" = "builtin" ; then
-    wxconfig_3rdparty="$wxconfig_3rdparty png"
+    wxconfig_3rdparty="png $wxconfig_3rdparty"
  fi
  if test "$wxUSE_ZLIB" = "builtin" ; then
  fi
  if test "$wxUSE_ZLIB" = "builtin" ; then
-    wxconfig_3rdparty="$wxconfig_3rdparty zlib"
-fi
-if test "$wxUSE_ODBC" = "builtin" ; then
-    wxconfig_3rdparty="$wxconfig_3rdparty odbc"
+    wxconfig_3rdparty="zlib $wxconfig_3rdparty"
  fi
  
  for i in $wxconfig_3rdparty ; do
  fi
  
  for i in $wxconfig_3rdparty ; do
-    WXCONFIG_EXTRALIBS="$WXCONFIG_EXTRALIBS -lwx${i}${lib_debug_suffix}${WX_LIB_FLAVOUR}-${WX_RELEASE}${HOST_SUFFIX}"
+    WXCONFIG_EXTRALIBS="-lwx${i}${lib_debug_suffix}${WX_LIB_FLAVOUR}-${WX_RELEASE}${HOST_SUFFIX} $WXCONFIG_EXTRALIBS"
  done
  
  
  done
  
  
@@ -5988,6 +6629,12 @@ else
      USE_ODBC=0
  fi
  
      USE_ODBC=0
  fi
  
+if test "$wxUSE_DEBUGREPORT" = "yes" ; then
+    USE_QA=1
+else
+    USE_QA=0
+fi
+
  if test $wxUSE_OFFICIAL_BUILD = "yes" ; then
      OFFICIAL_BUILD=1
  else
  if test $wxUSE_OFFICIAL_BUILD = "yes" ; then
      OFFICIAL_BUILD=1
  else
@@ -6011,6 +6658,7 @@ AC_SUBST(EXTRALIBS_GUI)
  AC_SUBST(EXTRALIBS_OPENGL)
  AC_SUBST(EXTRALIBS_SDL)
  AC_SUBST(WITH_PLUGIN_SDL)
  AC_SUBST(EXTRALIBS_OPENGL)
  AC_SUBST(EXTRALIBS_SDL)
  AC_SUBST(WITH_PLUGIN_SDL)
+AC_SUBST(EXTRALIBS_GNOMEPRINT)
  AC_SUBST(UNICODE)
  AC_SUBST(BUILD)
  AC_SUBST(DEBUG_INFO)
  AC_SUBST(UNICODE)
  AC_SUBST(BUILD)
  AC_SUBST(DEBUG_INFO)
@@ -6037,7 +6685,15 @@ case "$TOOLKIT" in
          ;;
  esac
  
          ;;
  esac
  
-AC_BAKEFILE
+if test "$wxUSE_WINE" = "yes"; then
+    BAKEFILE_FORCE_PLATFORM=win32
+fi
+
+AC_BAKEFILE([m4_include(autoconf_inc.m4)])
+
+if test "$wxUSE_WINE" = "yes"; then
+    RESCOMP=wrc
+fi
  
  if test "$wxUSE_SHARED" = "yes"; then
  
  
  if test "$wxUSE_SHARED" = "yes"; then
  
@@ -6050,48 +6706,103 @@ if test "$wxUSE_SHARED" = "yes"; then
      sanitised_bakefile_mess=`echo "$SHARED_LD_CXX" | tr -d '()'`
      EXE_LINKER=`eval echo "$sanitised_bakefile_mess"`
  
      sanitised_bakefile_mess=`echo "$SHARED_LD_CXX" | tr -d '()'`
      EXE_LINKER=`eval echo "$sanitised_bakefile_mess"`
  
+    dnl Need addtional flag on OS/2, so override bakefiles value
+    dnl (there currently is no suitable variable to which the
+    dnl  missing flags could be added, AFAICS. SN, 18.12.2004. )
+    case "${host}" in
+      *-pc-os2_emx | *-pc-os2-emx )
+        SHARED_LD_CC="`pwd`/dllar.sh -name-mangler-script ./dllnames.sh -libf INITINSTANCE -libf TERMINSTANCE -o"
+        SHARED_LD_CXX="`pwd`/dllar.sh -name-mangler-script ./dllnames.sh -libf INITINSTANCE -libf TERMINSTANCE -o"
+       cp -p ${srcdir}/src/os2/dllnames.sh .
+       cp -p ${srcdir}/src/os2/dllar.sh .
+      ;;
+    esac
  else
  
      dnl No bakefile support for static builds, but this should be ok for most.
      EXE_LINKER="$CXX -o"
  
  fi
  else
  
      dnl No bakefile support for static builds, but this should be ok for most.
      EXE_LINKER="$CXX -o"
  
  fi
+if test "$wxUSE_OMF" = "yes"; then
+    case "${host}" in
+      *-pc-os2_emx | *-pc-os2-emx )
+        LDFLAGS="$LDFLAGS -Zlinker /EXEPACK"
+        LDFLAGS_GUI="-Zlinker /PMTYPE:PM"
+        WXCONFIG_LDFLAGS_GUI="-Zlinker /PMTYPE:PM"
+      ;;
+    esac
+fi
  
  
+dnl According to Vaclav, if NO_GCC_PRAGMA is used for any reason it needs to
+dnl be in wx-config output.  Not doing so could result in link problems.
  GCC_PRAGMA_FLAGS=""
  GCC_PRAGMA_FLAGS=""
-dnl Find out if we have to define NO_GCC_PRAGMA and WX_PRECOMP:
+PCH_FLAGS=""
+
+dnl Find out if we have to define WX_PRECOMP (and thus NO_GCC_PRAGMA)
  if test $GCC_PCH = 1 ; then
  if test $GCC_PCH = 1 ; then
-    GCC_PRAGMA_FLAGS="-DWX_PRECOMP -DNO_GCC_PRAGMA"
+    PCH_FLAGS="-DWX_PRECOMP"
+    GCC_PRAGMA_FLAGS="-DNO_GCC_PRAGMA"
  else
  else
-    case "${host}" in
-        powerpc-*-darwin* )
-            dnl Some Apple's GCC version are broken and can't handle the
-            dnl pragmas:
-            GCC_PRAGMA_FLAGS="-DNO_GCC_PRAGMA"
-            ;;
-        *-*-mingw32* )
-            dnl MinGW GCC versions >= 3.2 have problems with
-            dnl static member of classes derived from templates
-            dnl in combination with #pragma interface/implementation
-            dnl (the test case uses 4 files)
-            dnl ... and with exceptions handling (undefined symbols needed
-            dnl to correctly calls dtors when unwinding) as well
-            if test "$wxUSE_STL" = "yes" -o \
+    dnl Find out if we have to define NO_GCC_PRAGMA
+    if test "$GCC" = yes; then
+        AC_MSG_CHECKING([if this GCC version is >= 4.0 and needs -DNO_GCC_PRAGMA])
+        AC_TRY_COMPILE([],
+            [#if (__GNUC__ < 4)
+             #error "Not GCC 4.0 or greater"
+             #endif
+            ],
+            [GCC_PRAGMA_FLAGS="-DNO_GCC_PRAGMA"
+             AC_MSG_RESULT([yes])],
+            [AC_MSG_RESULT([no])
+            case "${host}" in
+                powerpc-*-darwin* )
+                    dnl Some Apple's GCC version are broken and can't handle the
+                    dnl pragmas:
+                    GCC_PRAGMA_FLAGS="-DNO_GCC_PRAGMA"
+                ;;
+                *-*-mingw32* )
+                    dnl MinGW GCC versions > 3.2 have problems with
+                    dnl static member of classes derived from templates
+                    dnl in combination with #pragma interface/implementation
+                    dnl (the test case uses 4 files)
+                    dnl ... and with exceptions handling (undefined symbols needed
+                    dnl to correctly calls dtors when unwinding) as well
+                    if test "$wxUSE_STL" = "yes" -o \
                      "$wxUSE_NO_EXCEPTIONS" != "yes" -o \
                      "$wxUSE_NO_RTTI" != "yes"; then
                      "$wxUSE_NO_EXCEPTIONS" != "yes" -o \
                      "$wxUSE_NO_RTTI" != "yes"; then
-               AC_MSG_CHECKING([if this MinGW version needs -DNO_GCC_PRAGMA])
-               AC_TRY_COMPILE([],
-                              [#if !(__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 2))
-                               #error "Not GCC 3.2 or greater"
-                               #endif
-                               ],
-                              [GCC_PRAGMA_FLAGS="-DNO_GCC_PRAGMA"
-                               AC_MSG_RESULT([yes])],
-                              [AC_MSG_RESULT([no])])
-            fi
-            ;;
-    esac
+                        AC_MSG_CHECKING([if this MinGW version needs -DNO_GCC_PRAGMA])
+                        AC_TRY_COMPILE([],
+                            [#if !(__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 2))
+                             #error "Not GCC 3.2 or greater"
+                             #endif
+                            ],
+                            [GCC_PRAGMA_FLAGS="-DNO_GCC_PRAGMA"
+                             AC_MSG_RESULT([yes])],
+                            [AC_MSG_RESULT([no])])
+                    fi
+                    ;;
+                *-pc-os2_emx | *-pc-os2-emx )
+                    dnl GCC versions ported to OS/2 have similar problems with
+                    dnl static member of classes in combination with STL and
+                    dnl pragma interface/implementation
+                    if test "$wxUSE_STL" = "yes"; then
+                        AC_MSG_CHECKING([if this gcc version needs -DNO_GCC_PRAGMA])
+                        AC_TRY_COMPILE([],
+                            [#if !(__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 2))
+                             #error "Not GCC 3.2 or greater"
+                             #endif
+                            ],
+                            [GCC_PRAGMA_FLAGS="-DNO_GCC_PRAGMA"
+                             AC_MSG_RESULT([yes])],
+                            [AC_MSG_RESULT([no])])
+                    fi
+                    ;;
+            esac
+dnl  closing bracket of if GCC < 4.0
+        ] ) 
+    fi
  fi
  fi
-CPPFLAGS="$GCC_PRAGMA_FLAGS $CPPFLAGS"
+CPPFLAGS="$PCH_FLAGS $GCC_PRAGMA_FLAGS $CPPFLAGS"
  
  
  dnl for convenience, sort the samples in alphabetical order
  
  
  dnl for convenience, sort the samples in alphabetical order
@@ -6237,8 +6948,14 @@ for subdir in `echo $SUBDIRS`; do
                          makefiles="samples/$sample/Makefile.in $makefiles"
                      fi
                  done
                          makefiles="samples/$sample/Makefile.in $makefiles"
                      fi
                  done
-            else dnl assume that everything compiles for utils &c
-                makefiles=`(cd $srcdir ; find $subdir -name Makefile.in)`
+            else
+                dnl assume that everything compiles for utils &c
+                dnl any that shouldn't be built can be added to
+                dnl DISABLED_UTILS, DISABLED_CONTRIB or DISABLED_DEMOS
+                disabled_var=DISABLED_`echo $subdir | tr [[a-z]] [[A-Z]]`;
+                eval "disabled=\$$disabled_var"
+                disabled=/`echo X $disabled | sed 's@ @/|/@g'`/
+                makefiles=`(cd $srcdir ; find $subdir -name Makefile.in) | egrep -v "$disabled"`
              fi
          else dnl we build wxBase only
              dnl don't take all samples/utils, just those which build with
              fi
          else dnl we build wxBase only
              dnl don't take all samples/utils, just those which build with
@@ -6246,10 +6963,14 @@ for subdir in `echo $SUBDIRS`; do
              if test ${subdir} = "samples"; then
                  makefiles="samples/Makefile.in samples/console/Makefile.in"
              elif test ${subdir} = "utils"; then
              if test ${subdir} = "samples"; then
                  makefiles="samples/Makefile.in samples/console/Makefile.in"
              elif test ${subdir} = "utils"; then
-                makefiles="utils/HelpGen/Makefile.in \
-                           utils/HelpGen/src/Makefile.in \
-                           utils/tex2rtf/Makefile.in \
-                           utils/tex2rtf/src/Makefile.in"
+                makefiles=""
+                for util in HelpGen tex2rtf ; do
+                    if test -d $srcdir/utils/$util ; then
+                        makefiles="utils/$util/Makefile.in \
+                                   utils/$util/src/Makefile.in \
+                                   $makefiles"
+                    fi
+                done
              else dnl assume that everything compiles for tests
                  makefiles=`(cd $srcdir ; find $subdir -name Makefile.in)`
              fi
              else dnl assume that everything compiles for tests
                  makefiles=`(cd $srcdir ; find $subdir -name Makefile.in)`
              fi
@@ -6293,6 +7014,7 @@ echo "                                       odbc               ${wxUSE_ODBC}"
  echo "                                       expat              ${wxUSE_EXPAT}"
  echo "                                       libmspack          ${wxUSE_LIBMSPACK}"
  echo "                                       sdl                ${wxUSE_LIBSDL}"
  echo "                                       expat              ${wxUSE_EXPAT}"
  echo "                                       libmspack          ${wxUSE_LIBMSPACK}"
  echo "                                       sdl                ${wxUSE_LIBSDL}"
+echo "                                       gnomeprint         ${wxUSE_LIBGNOMEPRINT-none}"
  
  echo ""
  
  
  echo ""