X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1d1b75ace99a2325bea1e950904df2e5fcd86fb4..abd9b10e390de62e8b9060ba5ed002c943a67d59:/configure?ds=sidebyside

diff --git a/configure b/configure
index 4a18a2a11e..3f1d6e4ecc 100755
--- a/configure
+++ b/configure
@@ -43,6 +43,15 @@
 
 
 
+
+
+
+
+
+
+
+
+
 
 
 
@@ -63,6 +72,11 @@
 
 
 
+
+
+
+
+
 # Guess values for system-dependent variables and create Makefiles.
 # Generated automatically using autoconf version 2.13 
 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
@@ -85,7 +99,9 @@ ac_help="$ac_help
 ac_help="$ac_help
   --with-mac              use Mac OS X"
 ac_help="$ac_help
-  --with-wine             use WINE"
+  --with-cocoa            use Cocoa"
+ac_help="$ac_help
+  --with-wine             use Wine"
 ac_help="$ac_help
   --with-msw              use MS-Windows"
 ac_help="$ac_help
@@ -125,7 +141,7 @@ ac_help="$ac_help
 ac_help="$ac_help
   --enable-debug          same as debug_flag and debug_info"
 ac_help="$ac_help
-  --enable-precomp        enable use of precompiled headers (Mac OS X)"
+  --enable-precomp        enable use of precompiled headers (Mac OS X/Darwin)"
 ac_help="$ac_help
   --enable-debug_flag     set __WXDEBUG__ flag (recommended for developers!)"
 ac_help="$ac_help
@@ -149,7 +165,11 @@ ac_help="$ac_help
 ac_help="$ac_help
   --enable-compat20       enable wxWindows 2.0 compatibility"
 ac_help="$ac_help
-  --disable-compat22      disable wxWindows 2.2 compatibility"
+  --enable-compat22       enable wxWindows 2.2 compatibility"
+ac_help="$ac_help
+  --disable-compat24      disable wxWindows 2.4 compatibility"
+ac_help="$ac_help
+  --enable-rpath=DIR      output the rpath flag from wx-config"
 ac_help="$ac_help
   --enable-intl           use internationalization system"
 ac_help="$ac_help
@@ -164,14 +184,16 @@ ac_help="$ac_help
   --enable-fileproto      use wxFileProto class (requires wxProtocol"
 ac_help="$ac_help
   --enable-sockets        use socket/network classes"
+ac_help="$ac_help
+  --enable-ole            use OLE classes"
+ac_help="$ac_help
+  --enable-dataobj        use data object classes"
 ac_help="$ac_help
   --enable-ipc            use interprocess communication (wxSocket etc.)"
 ac_help="$ac_help
   --enable-cmdline        use wxCmdLineParser class"
 ac_help="$ac_help
   --enable-datetime       use wxDateTime class"
-ac_help="$ac_help
-  --enable-timedate       use obsolete wxDate/wxTime classes"
 ac_help="$ac_help
   --enable-stopwatch      use wxStopWatch class"
 ac_help="$ac_help
@@ -266,20 +288,16 @@ ac_help="$ac_help
   --enable-logdialog      use wxLogDialog"
 ac_help="$ac_help
   --enable-postscript     use wxPostscriptDC device context (default for gtk+)"
-ac_help="$ac_help
-  --enable-prologio       use Prolog IO library"
 ac_help="$ac_help
   --enable-resources      use wxWindows resources"
 ac_help="$ac_help
   --enable-xresources     use X resources for save (default for gtk+)"
 ac_help="$ac_help
-  --enable-clipboard      use wxClipboard classes"
+  --enable-clipboard      use wxClipboard class"
 ac_help="$ac_help
   --enable-dnd            use Drag'n'Drop classes"
 ac_help="$ac_help
   --enable-metafile       use win32 metafiles"
-ac_help="$ac_help
-  --enable-treelayout     use wxTreeLayout classes"
 ac_help="$ac_help
   --enable-controls       use all usual controls"
 ac_help="$ac_help
@@ -299,13 +317,13 @@ ac_help="$ac_help
 ac_help="$ac_help
   --enable-choice         use wxChoice class"
 ac_help="$ac_help
-  --enable-combobox       use wxComboBox classes"
+  --enable-combobox       use wxComboBox class"
+ac_help="$ac_help
+  --enable-display        use wxDisplay class"
 ac_help="$ac_help
   --enable-gauge          use wxGauge class"
 ac_help="$ac_help
   --enable-grid           use wxGrid class"
-ac_help="$ac_help
-  --enable-newgrid        use new wxGrid class"
 ac_help="$ac_help
   --enable-imaglist       use wxImageList class"
 ac_help="$ac_help
@@ -314,8 +332,6 @@ ac_help="$ac_help
   --enable-listctrl       use wxListCtrl class"
 ac_help="$ac_help
   --enable-notebook       use wxNotebook class"
-ac_help="$ac_help
-  --enable-propsheet      use wxPropertySheet class"
 ac_help="$ac_help
   --enable-radiobox       use wxRadioBox class"
 ac_help="$ac_help
@@ -1000,7 +1016,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:1004: checking host system type" >&5
+echo "configure:1020: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -1021,7 +1037,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$host" 1>&6
 
 echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:1025: checking target system type" >&5
+echo "configure:1041: checking target system type" >&5
 
 target_alias=$target
 case "$target_alias" in
@@ -1039,7 +1055,7 @@ target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$target" 1>&6
 
 echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:1043: checking build system type" >&5
+echo "configure:1059: checking build system type" >&5
 
 build_alias=$build
 case "$build_alias" in
@@ -1064,15 +1080,15 @@ test "$host_alias" != "$target_alias" &&
 
 
 WX_MAJOR_VERSION_NUMBER=2
-WX_MINOR_VERSION_NUMBER=3
-WX_RELEASE_NUMBER=3
+WX_MINOR_VERSION_NUMBER=5
+WX_RELEASE_NUMBER=0
 
 WX_VERSION=$WX_MAJOR_VERSION_NUMBER.$WX_MINOR_VERSION_NUMBER.$WX_RELEASE_NUMBER
 WX_RELEASE=$WX_MAJOR_VERSION_NUMBER.$WX_MINOR_VERSION_NUMBER
 
 WX_MSW_VERSION=$WX_MAJOR_VERSION_NUMBER$WX_MINOR_VERSION_NUMBER$WX_RELEASE_NUMBER
 
-WX_CURRENT=2
+WX_CURRENT=0
 WX_REVISION=0
 WX_AGE=0
 
@@ -1084,30 +1100,32 @@ USE_DOS=0
 USE_BEOS=0
 USE_MAC=0
 
-USE_LINUX=
-USE_SGI=
-USE_HPUX=
-USE_SYSV=
-USE_SVR4=
 USE_AIX=
-USE_SUN=
-USE_SOLARIS=
-USE_SUNOS=
-USE_ALPHA=
-USE_OSF=
 USE_BSD=
 USE_DARWIN=
 USE_FREEBSD=
-USE_OPENBSD=
+USE_HPUX=
+USE_LINUX=
 USE_NETBSD=
+USE_OPENBSD=
+USE_OSF=
+USE_SGI=
+USE_SOLARIS=
+USE_SUN=
+USE_SUNOS=
+USE_SVR4=
+USE_SYSV=
 USE_VMS=
 USE_ULTRIX=
-USE_DATA_GENERAL=
+USE_UNIXWARE=
+
+USE_ALPHA=
 
 NEEDS_D_REENTRANT_FOR_R_FUNCS=0
 
-ALL_TOOLKITS="GTK MAC MGL MICROWIN MOTIF MSW PM WINE X11"
+ALL_TOOLKITS="COCOA GTK MAC MGL MICROWIN MOTIF MSW PM X11"
 
+DEFAULT_wxUSE_COCOA=0
 DEFAULT_wxUSE_GTK=0
 DEFAULT_wxUSE_MAC=0
 DEFAULT_wxUSE_MGL=0
@@ -1115,9 +1133,9 @@ DEFAULT_wxUSE_MICROWIN=0
 DEFAULT_wxUSE_MOTIF=0
 DEFAULT_wxUSE_MSW=0
 DEFAULT_wxUSE_PM=0
-DEFAULT_wxUSE_WINE=0
 DEFAULT_wxUSE_X11=0
 
+DEFAULT_DEFAULT_wxUSE_COCOA=0
 DEFAULT_DEFAULT_wxUSE_GTK=0
 DEFAULT_DEFAULT_wxUSE_MAC=0
 DEFAULT_DEFAULT_wxUSE_MGL=0
@@ -1125,7 +1143,6 @@ DEFAULT_DEFAULT_wxUSE_MICROWIN=0
 DEFAULT_DEFAULT_wxUSE_MOTIF=0
 DEFAULT_DEFAULT_wxUSE_MSW=0
 DEFAULT_DEFAULT_wxUSE_PM=0
-DEFAULT_DEFAULT_wxUSE_WINE=0
 DEFAULT_DEFAULT_wxUSE_X11=0
 
 PROGRAM_EXT=
@@ -1225,11 +1242,11 @@ EOF
     USE_BSD=1
     USE_OPENBSD=1
     cat >> confdefs.h <<\EOF
-#define __FREEBSD__ 1
+#define __OPENBSD__ 1
 EOF
 
     cat >> confdefs.h <<\EOF
-#define __OPENBSD__ 1
+#define __BSD__ 1
 EOF
 
     DEFAULT_DEFAULT_wxUSE_GTK=1
@@ -1238,11 +1255,11 @@ EOF
     USE_BSD=1
     USE_NETBSD=1
     cat >> confdefs.h <<\EOF
-#define __FREEBSD__ 1
+#define __NETBSD__ 1
 EOF
 
     cat >> confdefs.h <<\EOF
-#define __NETBSD__ 1
+#define __BSD__ 1
 EOF
 
     DEFAULT_DEFAULT_wxUSE_GTK=1
@@ -1291,7 +1308,7 @@ EOF
     USE_AIX=1
     USE_SYSV=1
     USE_SVR4=1
-            SO_SUFFIX=a
+                        SO_SUFFIX=a
     cat >> confdefs.h <<\EOF
 #define __AIX__ 1
 EOF
@@ -1307,34 +1324,18 @@ EOF
     DEFAULT_DEFAULT_wxUSE_MOTIF=1
   ;;
 
-  *-*-cygwin* | *-*-mingw32* )
-    USE_UNIX=0
-    USE_WIN32=1
-    SO_SUFFIX=dll
-    cat >> confdefs.h <<\EOF
-#define __WIN32__ 1
-EOF
-
-    cat >> confdefs.h <<\EOF
-#define __WIN95__ 1
-EOF
-
-    cat >> confdefs.h <<\EOF
-#define __WINDOWS__ 1
-EOF
-
-    cat >> confdefs.h <<\EOF
-#define __GNUWIN32__ 1
-EOF
-
+  *-*-*UnixWare*)
+    USE_SYSV=1
+    USE_SVR4=1
+    USE_UNIXWARE=1
     cat >> confdefs.h <<\EOF
-#define STRICT 1
+#define __UNIXWARE__ 1
 EOF
 
-    cat >> confdefs.h <<\EOF
-#define WINVER 0x0400
-EOF
+  ;;
 
+  *-*-cygwin* | *-*-mingw32* )
+                SO_SUFFIX=dll
     PROGRAM_EXT=".exe"
     RESCOMP=windres
     DEFAULT_DEFAULT_wxUSE_MSW=1
@@ -1349,6 +1350,7 @@ EOF
 
     PROGRAM_EXT=".exe"
     DEFAULT_DEFAULT_wxUSE_MGL=1
+        LIBS="$LIBS -lstdc++"
   ;;
 
   *-pc-os2_emx | *-pc-os2-emx )
@@ -1358,7 +1360,6 @@ EOF
 
     PROGRAM_EXT=".exe"
     DEFAULT_DEFAULT_wxUSE_PM=1
-    LIBS="$LIBS -lstdcpp"
   ;;
 
   powerpc-*-darwin* )
@@ -1375,6 +1376,10 @@ EOF
 
     cat >> confdefs.h <<\EOF
 #define __POWERPC__ 1
+EOF
+
+    cat >> confdefs.h <<\EOF
+#define TARGET_CARBON 1
 EOF
 
     DEFAULT_DEFAULT_wxUSE_MAC=1
@@ -1392,14 +1397,6 @@ EOF
     { echo "configure: error: unknown system type ${host}." 1>&2; exit 1; }
 esac
 
-if test "$USE_UNIX" = 1 ; then
-    wxUSE_UNIX=yes
-    cat >> confdefs.h <<\EOF
-#define __UNIX__ 1
-EOF
-
-fi
-
 
 
 
@@ -1456,7 +1453,6 @@ if test $DEBUG_CONFIGURE = 1; then
   DEFAULT_wxUSE_STD_IOSTREAM=no
   DEFAULT_wxUSE_CMDLINE_PARSER=no
   DEFAULT_wxUSE_DATETIME=no
-  DEFAULT_wxUSE_TIMEDATE=no
   DEFAULT_wxUSE_TIMER=no
   DEFAULT_wxUSE_STOPWATCH=no
   DEFAULT_wxUSE_FILE=no
@@ -1469,6 +1465,8 @@ if test $DEBUG_CONFIGURE = 1; then
   DEFAULT_wxUSE_FONTMAP=no
   DEFAULT_wxUSE_STREAMS=no
   DEFAULT_wxUSE_SOCKETS=no
+  DEFAULT_wxUSE_OLE=no
+  DEFAULT_wxUSE_DATAOBJ=no
   DEFAULT_wxUSE_DIALUP_MANAGER=no
   DEFAULT_wxUSE_JOYSTICK=no
   DEFAULT_wxUSE_DYNLIB_CLASS=no
@@ -1491,7 +1489,6 @@ if test $DEBUG_CONFIGURE = 1; then
   DEFAULT_wxUSE_DOC_VIEW_ARCHITECTURE=no
   DEFAULT_wxUSE_PRINTING_ARCHITECTURE=no
 
-  DEFAULT_wxUSE_PROLOGIO=no
   DEFAULT_wxUSE_RESOURCES=no
   DEFAULT_wxUSE_CONSTRAINTS=no
   DEFAULT_wxUSE_IPC=no
@@ -1507,7 +1504,7 @@ if test $DEBUG_CONFIGURE = 1; then
   DEFAULT_wxUSE_PROTOCOL_FTP=no
   DEFAULT_wxUSE_PROTOCOL_FILE=no
   DEFAULT_wxUSE_URL=no
-  
+
   DEFAULT_wxUSE_COMMONDLGS=no
   DEFAULT_wxUSE_CHOICEDLG=no
   DEFAULT_wxUSE_COLOURDLG=no
@@ -1542,14 +1539,13 @@ if test $DEBUG_CONFIGURE = 1; then
   DEFAULT_wxUSE_CHECKLST=no
   DEFAULT_wxUSE_CHOICE=no
   DEFAULT_wxUSE_COMBOBOX=no
+  DEFAULT_wxUSE_DISPLAY=no
   DEFAULT_wxUSE_GAUGE=no
   DEFAULT_wxUSE_GRID=no
-  DEFAULT_wxUSE_NEW_GRID=no
   DEFAULT_wxUSE_IMAGLIST=no
   DEFAULT_wxUSE_LISTBOX=no
   DEFAULT_wxUSE_LISTCTRL=no
   DEFAULT_wxUSE_NOTEBOOK=no
-  DEFAULT_wxUSE_PROPSHEET=no
   DEFAULT_wxUSE_RADIOBOX=no
   DEFAULT_wxUSE_RADIOBTN=no
   DEFAULT_wxUSE_SASH=no
@@ -1629,7 +1625,6 @@ else
   DEFAULT_wxUSE_STD_IOSTREAM=no
   DEFAULT_wxUSE_CMDLINE_PARSER=yes
   DEFAULT_wxUSE_DATETIME=yes
-  DEFAULT_wxUSE_TIMEDATE=no
   DEFAULT_wxUSE_TIMER=yes
   DEFAULT_wxUSE_STOPWATCH=yes
   DEFAULT_wxUSE_FILE=yes
@@ -1642,6 +1637,8 @@ else
   DEFAULT_wxUSE_FONTMAP=yes
   DEFAULT_wxUSE_STREAMS=yes
   DEFAULT_wxUSE_SOCKETS=yes
+  DEFAULT_wxUSE_OLE=yes
+  DEFAULT_wxUSE_DATAOBJ=yes
   DEFAULT_wxUSE_DIALUP_MANAGER=yes
   DEFAULT_wxUSE_JOYSTICK=yes
   DEFAULT_wxUSE_DYNLIB_CLASS=yes
@@ -1664,8 +1661,7 @@ else
   DEFAULT_wxUSE_DOC_VIEW_ARCHITECTURE=yes
   DEFAULT_wxUSE_PRINTING_ARCHITECTURE=yes
 
-  DEFAULT_wxUSE_PROLOGIO=yes
-  DEFAULT_wxUSE_RESOURCES=yes
+  DEFAULT_wxUSE_RESOURCES=no
   DEFAULT_wxUSE_CONSTRAINTS=yes
   DEFAULT_wxUSE_IPC=yes
   DEFAULT_wxUSE_HELP=yes
@@ -1715,14 +1711,13 @@ else
   DEFAULT_wxUSE_CHECKLST=yes
   DEFAULT_wxUSE_CHOICE=yes
   DEFAULT_wxUSE_COMBOBOX=yes
+  DEFAULT_wxUSE_DISPLAY=no
   DEFAULT_wxUSE_GAUGE=yes
   DEFAULT_wxUSE_GRID=yes
-  DEFAULT_wxUSE_NEW_GRID=yes
   DEFAULT_wxUSE_IMAGLIST=yes
   DEFAULT_wxUSE_LISTBOX=yes
   DEFAULT_wxUSE_LISTCTRL=yes
   DEFAULT_wxUSE_NOTEBOOK=yes
-  DEFAULT_wxUSE_PROPSHEET=yes
   DEFAULT_wxUSE_RADIOBOX=yes
   DEFAULT_wxUSE_RADIOBTN=yes
   DEFAULT_wxUSE_SASH=yes
@@ -1763,8 +1758,8 @@ fi
 
 
 for toolkit in `echo $ALL_TOOLKITS`; do
-  LINE=`grep "wxUSE_$toolkit" ${wx_arg_cache_file}`
-  if test "x$LINE" != x ; then
+  LINE=`grep "wxUSE_$toolkit=" ${wx_arg_cache_file}`
+  if test "x$LINE" != "x" ; then
     has_toolkit_in_cache=1
     eval "DEFAULT_$LINE"
     eval "CACHE_$toolkit=1"
@@ -1773,8 +1768,9 @@ done
 
 
 
-          echo $ac_n "checking for --enable-gui""... $ac_c" 1>&6
-echo "configure:1778: checking for --enable-gui" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-gui""... $ac_c" 1>&6
+echo "configure:1774: checking for --${enablestring:-enable}-gui" >&5
           no_cache=0
           # Check whether --enable-gui or --disable-gui was given.
 if test "${enable_gui+set}" = set; then
@@ -1815,8 +1811,9 @@ fi
 if test "$wxUSE_GUI" = "yes"; then
 
 
-          echo $ac_n "checking for --enable-universal""... $ac_c" 1>&6
-echo "configure:1820: checking for --enable-universal" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-universal""... $ac_c" 1>&6
+echo "configure:1817: checking for --${enablestring:-enable}-universal" >&5
           no_cache=0
           # Check whether --enable-universal or --disable-universal was given.
 if test "${enable_universal+set}" = set; then
@@ -1871,10 +1868,16 @@ if test "${with_mac+set}" = set; then
   wxUSE_MAC="$withval" TOOLKIT_GIVEN=1
 fi
 
+# Check whether --with-cocoa or --without-cocoa was given.
+if test "${with_cocoa+set}" = set; then
+  withval="$with_cocoa"
+  wxUSE_COCOA="$withval" TOOLKIT_GIVEN=1
+fi
+
 # Check whether --with-wine or --without-wine was given.
 if test "${with_wine+set}" = set; then
   withval="$with_wine"
-  wxUSE_WINE="$withval" CACHE_WINE=1 TOOLKIT_GIVEN=1
+  wxUSE_WINE="$withval" CACHE_WINE=1
 fi
 
 # Check whether --with-msw or --without-msw was given.
@@ -1892,7 +1895,7 @@ fi
 # Check whether --with-mgl or --without-mgl was given.
 if test "${with_mgl+set}" = set; then
   withval="$with_mgl"
-  wxUSE_MGL="$withval" CACHE_MGL=1 TOOLKIT_GIVEN=1
+  wxUSE_MGL="$withval" wxUSE_UNIVERSAL="yes" CACHE_MGL=1 TOOLKIT_GIVEN=1
 fi
 
 # Check whether --with-microwin or --without-microwin was given.
@@ -1908,8 +1911,9 @@ if test "${with_x11+set}" = set; then
 fi
 
 
-          echo $ac_n "checking for --enable-nanox""... $ac_c" 1>&6
-echo "configure:1913: checking for --enable-nanox" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-nanox""... $ac_c" 1>&6
+echo "configure:1917: checking for --${enablestring:-enable}-nanox" >&5
           no_cache=0
           # Check whether --enable-nanox or --disable-nanox was given.
 if test "${enable_nanox+set}" = set; then
@@ -1947,18 +1951,50 @@ fi
           fi
         
 
-# Check whether --enable-gtk2 or --disable-gtk2 was given.
+
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-gtk2""... $ac_c" 1>&6
+echo "configure:1958: checking for --${enablestring:-enable}-gtk2" >&5
+          no_cache=0
+          # Check whether --enable-gtk2 or --disable-gtk2 was given.
 if test "${enable_gtk2+set}" = set; then
   enableval="$enable_gtk2"
-  wxUSE_GTK2="yes"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_gtk2='wxUSE_GTK2=yes'
+                          else
+                            ac_cv_use_gtk2='wxUSE_GTK2=no'
+                          fi
+                        
 else
-  wxUSE_GTK2="no"
+  
+                          LINE=`grep "wxUSE_GTK2" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_gtk2='wxUSE_GTK2='$DEFAULT_wxUSE_GTK2
+                        
 fi
 
 
+          eval "$ac_cv_use_gtk2"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_gtk2 >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_GTK2" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
 
           echo $ac_n "checking for --with-libpng""... $ac_c" 1>&6
-echo "configure:1962: checking for --with-libpng" >&5
+echo "configure:1998: checking for --with-libpng" >&5
           no_cache=0
           # Check whether --with-libpng or --without-libpng was given.
 if test "${with_libpng+set}" = set; then
@@ -2009,7 +2045,7 @@ fi
         
 
           echo $ac_n "checking for --with-libjpeg""... $ac_c" 1>&6
-echo "configure:2013: checking for --with-libjpeg" >&5
+echo "configure:2049: checking for --with-libjpeg" >&5
           no_cache=0
           # Check whether --with-libjpeg or --without-libjpeg was given.
 if test "${with_libjpeg+set}" = set; then
@@ -2060,7 +2096,7 @@ fi
         
 
           echo $ac_n "checking for --with-libtiff""... $ac_c" 1>&6
-echo "configure:2064: checking for --with-libtiff" >&5
+echo "configure:2100: checking for --with-libtiff" >&5
           no_cache=0
           # Check whether --with-libtiff or --without-libtiff was given.
 if test "${with_libtiff+set}" = set; then
@@ -2111,7 +2147,7 @@ fi
         
 
           echo $ac_n "checking for --with-opengl""... $ac_c" 1>&6
-echo "configure:2115: checking for --with-opengl" >&5
+echo "configure:2151: checking for --with-opengl" >&5
           no_cache=0
           # Check whether --with-opengl or --without-opengl was given.
 if test "${with_opengl+set}" = set; then
@@ -2153,7 +2189,7 @@ fi
 
 
           echo $ac_n "checking for --with-dmalloc""... $ac_c" 1>&6
-echo "configure:2157: checking for --with-dmalloc" >&5
+echo "configure:2193: checking for --with-dmalloc" >&5
           no_cache=0
           # Check whether --with-dmalloc or --without-dmalloc was given.
 if test "${with_dmalloc+set}" = set; then
@@ -2192,7 +2228,7 @@ fi
         
 
           echo $ac_n "checking for --with-regex""... $ac_c" 1>&6
-echo "configure:2196: checking for --with-regex" >&5
+echo "configure:2232: checking for --with-regex" >&5
           no_cache=0
           # Check whether --with-regex or --without-regex was given.
 if test "${with_regex+set}" = set; then
@@ -2243,7 +2279,7 @@ fi
         
 
           echo $ac_n "checking for --with-zlib""... $ac_c" 1>&6
-echo "configure:2247: checking for --with-zlib" >&5
+echo "configure:2283: checking for --with-zlib" >&5
           no_cache=0
           # Check whether --with-zlib or --without-zlib was given.
 if test "${with_zlib+set}" = set; then
@@ -2294,7 +2330,7 @@ fi
         
 
           echo $ac_n "checking for --with-odbc""... $ac_c" 1>&6
-echo "configure:2298: checking for --with-odbc" >&5
+echo "configure:2334: checking for --with-odbc" >&5
           no_cache=0
           # Check whether --with-odbc or --without-odbc was given.
 if test "${with_odbc+set}" = set; then
@@ -2334,8 +2370,9 @@ fi
 
 
 
-          echo $ac_n "checking for --enable-shared""... $ac_c" 1>&6
-echo "configure:2339: checking for --enable-shared" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-shared""... $ac_c" 1>&6
+echo "configure:2376: checking for --${enablestring:-enable}-shared" >&5
           no_cache=0
           # Check whether --enable-shared or --disable-shared was given.
 if test "${enable_shared+set}" = set; then
@@ -2373,8 +2410,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-soname""... $ac_c" 1>&6
-echo "configure:2378: checking for --enable-soname" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-soname""... $ac_c" 1>&6
+echo "configure:2416: checking for --${enablestring:-enable}-soname" >&5
           no_cache=0
           # Check whether --enable-soname or --disable-soname was given.
 if test "${enable_soname+set}" = set; then
@@ -2412,8 +2450,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-optimise""... $ac_c" 1>&6
-echo "configure:2417: checking for --enable-optimise" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-optimise""... $ac_c" 1>&6
+echo "configure:2456: checking for --${enablestring:-enable}-optimise" >&5
           no_cache=0
           # Check whether --enable-optimise or --disable-optimise was given.
 if test "${enable_optimise+set}" = set; then
@@ -2451,8 +2490,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-debug""... $ac_c" 1>&6
-echo "configure:2456: checking for --enable-debug" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-debug""... $ac_c" 1>&6
+echo "configure:2496: checking for --${enablestring:-enable}-debug" >&5
           no_cache=0
           # Check whether --enable-debug or --disable-debug was given.
 if test "${enable_debug+set}" = set; then
@@ -2491,8 +2531,9 @@ fi
         
 
 
-          echo $ac_n "checking for --enable-precomp""... $ac_c" 1>&6
-echo "configure:2496: checking for --enable-precomp" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-precomp""... $ac_c" 1>&6
+echo "configure:2537: checking for --${enablestring:-enable}-precomp" >&5
           no_cache=0
           # Check whether --enable-precomp or --disable-precomp was given.
 if test "${enable_precomp+set}" = set; then
@@ -2539,8 +2580,9 @@ elif test "$wxUSE_DEBUG" = "no"; then
 fi
 
 
-          echo $ac_n "checking for --enable-debug_flag""... $ac_c" 1>&6
-echo "configure:2544: checking for --enable-debug_flag" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-debug_flag""... $ac_c" 1>&6
+echo "configure:2586: checking for --${enablestring:-enable}-debug_flag" >&5
           no_cache=0
           # Check whether --enable-debug_flag or --disable-debug_flag was given.
 if test "${enable_debug_flag+set}" = set; then
@@ -2578,8 +2620,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-debug_info""... $ac_c" 1>&6
-echo "configure:2583: checking for --enable-debug_info" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-debug_info""... $ac_c" 1>&6
+echo "configure:2626: checking for --${enablestring:-enable}-debug_info" >&5
           no_cache=0
           # Check whether --enable-debug_info or --disable-debug_info was given.
 if test "${enable_debug_info+set}" = set; then
@@ -2617,8 +2660,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-debug_gdb""... $ac_c" 1>&6
-echo "configure:2622: checking for --enable-debug_gdb" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-debug_gdb""... $ac_c" 1>&6
+echo "configure:2666: checking for --${enablestring:-enable}-debug_gdb" >&5
           no_cache=0
           # Check whether --enable-debug_gdb or --disable-debug_gdb was given.
 if test "${enable_debug_gdb+set}" = set; then
@@ -2656,8 +2700,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-debug_cntxt""... $ac_c" 1>&6
-echo "configure:2661: checking for --enable-debug_cntxt" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-debug_cntxt""... $ac_c" 1>&6
+echo "configure:2706: checking for --${enablestring:-enable}-debug_cntxt" >&5
           no_cache=0
           # Check whether --enable-debug_cntxt or --disable-debug_cntxt was given.
 if test "${enable_debug_cntxt+set}" = set; then
@@ -2695,8 +2740,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-mem_tracing""... $ac_c" 1>&6
-echo "configure:2700: checking for --enable-mem_tracing" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-mem_tracing""... $ac_c" 1>&6
+echo "configure:2746: checking for --${enablestring:-enable}-mem_tracing" >&5
           no_cache=0
           # Check whether --enable-mem_tracing or --disable-mem_tracing was given.
 if test "${enable_mem_tracing+set}" = set; then
@@ -2734,8 +2780,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-profile""... $ac_c" 1>&6
-echo "configure:2739: checking for --enable-profile" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-profile""... $ac_c" 1>&6
+echo "configure:2786: checking for --${enablestring:-enable}-profile" >&5
           no_cache=0
           # Check whether --enable-profile or --disable-profile was given.
 if test "${enable_profile+set}" = set; then
@@ -2773,8 +2820,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-no_rtti""... $ac_c" 1>&6
-echo "configure:2778: checking for --enable-no_rtti" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-no_rtti""... $ac_c" 1>&6
+echo "configure:2826: checking for --${enablestring:-enable}-no_rtti" >&5
           no_cache=0
           # Check whether --enable-no_rtti or --disable-no_rtti was given.
 if test "${enable_no_rtti+set}" = set; then
@@ -2812,8 +2860,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-no_exceptions""... $ac_c" 1>&6
-echo "configure:2817: checking for --enable-no_exceptions" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-no_exceptions""... $ac_c" 1>&6
+echo "configure:2866: checking for --${enablestring:-enable}-no_exceptions" >&5
           no_cache=0
           # Check whether --enable-no_exceptions or --disable-no_exceptions was given.
 if test "${enable_no_exceptions+set}" = set; then
@@ -2851,8 +2900,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-permissive""... $ac_c" 1>&6
-echo "configure:2856: checking for --enable-permissive" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-permissive""... $ac_c" 1>&6
+echo "configure:2906: checking for --${enablestring:-enable}-permissive" >&5
           no_cache=0
           # Check whether --enable-permissive or --disable-permissive was given.
 if test "${enable_permissive+set}" = set; then
@@ -2890,8 +2940,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-no_deps""... $ac_c" 1>&6
-echo "configure:2895: checking for --enable-no_deps" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-no_deps""... $ac_c" 1>&6
+echo "configure:2946: checking for --${enablestring:-enable}-no_deps" >&5
           no_cache=0
           # Check whether --enable-no_deps or --disable-no_deps was given.
 if test "${enable_no_deps+set}" = set; then
@@ -2930,8 +2981,9 @@ fi
         
 
 
-          echo $ac_n "checking for --enable-compat20""... $ac_c" 1>&6
-echo "configure:2935: checking for --enable-compat20" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-compat20""... $ac_c" 1>&6
+echo "configure:2987: checking for --${enablestring:-enable}-compat20" >&5
           no_cache=0
           # Check whether --enable-compat20 or --disable-compat20 was given.
 if test "${enable_compat20+set}" = set; then
@@ -2969,8 +3021,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-compat22""... $ac_c" 1>&6
-echo "configure:2974: checking for --enable-compat22" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-compat22""... $ac_c" 1>&6
+echo "configure:3027: checking for --${enablestring:-enable}-compat22" >&5
           no_cache=0
           # Check whether --enable-compat22 or --disable-compat22 was given.
 if test "${enable_compat22+set}" = set; then
@@ -3008,10 +3061,63 @@ fi
           fi
         
 
+	  enablestring=disable
+          echo $ac_n "checking for --${enablestring:-enable}-compat24""... $ac_c" 1>&6
+echo "configure:3067: checking for --${enablestring:-enable}-compat24" >&5
+          no_cache=0
+          # Check whether --enable-compat24 or --disable-compat24 was given.
+if test "${enable_compat24+set}" = set; then
+  enableval="$enable_compat24"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_compat24='WXWIN_COMPATIBILITY_2_4=yes'
+                          else
+                            ac_cv_use_compat24='WXWIN_COMPATIBILITY_2_4=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "WXWIN_COMPATIBILITY_2_4" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_compat24='WXWIN_COMPATIBILITY_2_4='$DEFAULT_WXWIN_COMPATIBILITY_2_4
+                        
+fi
+
+
+          eval "$ac_cv_use_compat24"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_compat24 >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$WXWIN_COMPATIBILITY_2_4" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+# Check whether --enable-rpath or --disable-rpath was given.
+if test "${enable_rpath+set}" = set; then
+  enableval="$enable_rpath"
+  wxRPATH_DIR="$enableval"
+fi
+
+
+if test "$wxRPATH_DIR" != "" -a "$wxRPATH_DIR" != "disable"; then
+   WXCONFIG_RPATH="-Wl,-rpath -Wl,$wxRPATH_DIR"
+fi
+
+
 
 
-          echo $ac_n "checking for --enable-intl""... $ac_c" 1>&6
-echo "configure:3015: checking for --enable-intl" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-intl""... $ac_c" 1>&6
+echo "configure:3121: checking for --${enablestring:-enable}-intl" >&5
           no_cache=0
           # Check whether --enable-intl or --disable-intl was given.
 if test "${enable_intl+set}" = set; then
@@ -3049,8 +3155,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-config""... $ac_c" 1>&6
-echo "configure:3054: checking for --enable-config" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-config""... $ac_c" 1>&6
+echo "configure:3161: checking for --${enablestring:-enable}-config" >&5
           no_cache=0
           # Check whether --enable-config or --disable-config was given.
 if test "${enable_config+set}" = set; then
@@ -3089,8 +3196,9 @@ fi
         
 
 
-          echo $ac_n "checking for --enable-protocols""... $ac_c" 1>&6
-echo "configure:3094: checking for --enable-protocols" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-protocols""... $ac_c" 1>&6
+echo "configure:3202: checking for --${enablestring:-enable}-protocols" >&5
           no_cache=0
           # Check whether --enable-protocols or --disable-protocols was given.
 if test "${enable_protocols+set}" = set; then
@@ -3128,8 +3236,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-ftp""... $ac_c" 1>&6
-echo "configure:3133: checking for --enable-ftp" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-ftp""... $ac_c" 1>&6
+echo "configure:3242: checking for --${enablestring:-enable}-ftp" >&5
           no_cache=0
           # Check whether --enable-ftp or --disable-ftp was given.
 if test "${enable_ftp+set}" = set; then
@@ -3167,8 +3276,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-http""... $ac_c" 1>&6
-echo "configure:3172: checking for --enable-http" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-http""... $ac_c" 1>&6
+echo "configure:3282: checking for --${enablestring:-enable}-http" >&5
           no_cache=0
           # Check whether --enable-http or --disable-http was given.
 if test "${enable_http+set}" = set; then
@@ -3206,8 +3316,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-fileproto""... $ac_c" 1>&6
-echo "configure:3211: checking for --enable-fileproto" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-fileproto""... $ac_c" 1>&6
+echo "configure:3322: checking for --${enablestring:-enable}-fileproto" >&5
           no_cache=0
           # Check whether --enable-fileproto or --disable-fileproto was given.
 if test "${enable_fileproto+set}" = set; then
@@ -3245,8 +3356,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-sockets""... $ac_c" 1>&6
-echo "configure:3250: checking for --enable-sockets" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-sockets""... $ac_c" 1>&6
+echo "configure:3362: checking for --${enablestring:-enable}-sockets" >&5
           no_cache=0
           # Check whether --enable-sockets or --disable-sockets was given.
 if test "${enable_sockets+set}" = set; then
@@ -3284,9 +3396,90 @@ fi
           fi
         
 
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-ole""... $ac_c" 1>&6
+echo "configure:3402: checking for --${enablestring:-enable}-ole" >&5
+          no_cache=0
+          # Check whether --enable-ole or --disable-ole was given.
+if test "${enable_ole+set}" = set; then
+  enableval="$enable_ole"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_ole='wxUSE_OLE=yes'
+                          else
+                            ac_cv_use_ole='wxUSE_OLE=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_OLE" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_ole='wxUSE_OLE='$DEFAULT_wxUSE_OLE
+                        
+fi
+
+
+          eval "$ac_cv_use_ole"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_ole >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_OLE" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-dataobj""... $ac_c" 1>&6
+echo "configure:3442: checking for --${enablestring:-enable}-dataobj" >&5
+          no_cache=0
+          # Check whether --enable-dataobj or --disable-dataobj was given.
+if test "${enable_dataobj+set}" = set; then
+  enableval="$enable_dataobj"
+  
+                          if test "$enableval" = yes; then
+                            ac_cv_use_dataobj='wxUSE_DATAOBJ=yes'
+                          else
+                            ac_cv_use_dataobj='wxUSE_DATAOBJ=no'
+                          fi
+                        
+else
+  
+                          LINE=`grep "wxUSE_DATAOBJ" ${wx_arg_cache_file}`
+                          if test "x$LINE" != x ; then
+                            eval "DEFAULT_$LINE"
+                          else
+                            no_cache=1
+                          fi
+
+                          ac_cv_use_dataobj='wxUSE_DATAOBJ='$DEFAULT_wxUSE_DATAOBJ
+                        
+fi
+
+
+          eval "$ac_cv_use_dataobj"
+          if test "$no_cache" != 1; then
+            echo $ac_cv_use_dataobj >> ${wx_arg_cache_file}.tmp
+          fi
+
+          if test "$wxUSE_DATAOBJ" = yes; then
+            echo "$ac_t""yes" 1>&6
+          else
+            echo "$ac_t""no" 1>&6
+          fi
+        
+
 
-          echo $ac_n "checking for --enable-ipc""... $ac_c" 1>&6
-echo "configure:3290: checking for --enable-ipc" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-ipc""... $ac_c" 1>&6
+echo "configure:3483: checking for --${enablestring:-enable}-ipc" >&5
           no_cache=0
           # Check whether --enable-ipc or --disable-ipc was given.
 if test "${enable_ipc+set}" = set; then
@@ -3325,8 +3518,9 @@ fi
         
 
 
-          echo $ac_n "checking for --enable-cmdline""... $ac_c" 1>&6
-echo "configure:3330: checking for --enable-cmdline" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-cmdline""... $ac_c" 1>&6
+echo "configure:3524: checking for --${enablestring:-enable}-cmdline" >&5
           no_cache=0
           # Check whether --enable-cmdline or --disable-cmdline was given.
 if test "${enable_cmdline+set}" = set; then
@@ -3364,8 +3558,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-datetime""... $ac_c" 1>&6
-echo "configure:3369: checking for --enable-datetime" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-datetime""... $ac_c" 1>&6
+echo "configure:3564: checking for --${enablestring:-enable}-datetime" >&5
           no_cache=0
           # Check whether --enable-datetime or --disable-datetime was given.
 if test "${enable_datetime+set}" = set; then
@@ -3403,47 +3598,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-timedate""... $ac_c" 1>&6
-echo "configure:3408: checking for --enable-timedate" >&5
-          no_cache=0
-          # Check whether --enable-timedate or --disable-timedate was given.
-if test "${enable_timedate+set}" = set; then
-  enableval="$enable_timedate"
-  
-                          if test "$enableval" = yes; then
-                            ac_cv_use_timedate='wxUSE_TIMEDATE=yes'
-                          else
-                            ac_cv_use_timedate='wxUSE_TIMEDATE=no'
-                          fi
-                        
-else
-  
-                          LINE=`grep "wxUSE_TIMEDATE" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
-                          ac_cv_use_timedate='wxUSE_TIMEDATE='$DEFAULT_wxUSE_TIMEDATE
-                        
-fi
-
-
-          eval "$ac_cv_use_timedate"
-          if test "$no_cache" != 1; then
-            echo $ac_cv_use_timedate >> ${wx_arg_cache_file}.tmp
-          fi
-
-          if test "$wxUSE_TIMEDATE" = yes; then
-            echo "$ac_t""yes" 1>&6
-          else
-            echo "$ac_t""no" 1>&6
-          fi
-        
-
-          echo $ac_n "checking for --enable-stopwatch""... $ac_c" 1>&6
-echo "configure:3447: checking for --enable-stopwatch" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-stopwatch""... $ac_c" 1>&6
+echo "configure:3604: checking for --${enablestring:-enable}-stopwatch" >&5
           no_cache=0
           # Check whether --enable-stopwatch or --disable-stopwatch was given.
 if test "${enable_stopwatch+set}" = set; then
@@ -3481,8 +3638,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-dialupman""... $ac_c" 1>&6
-echo "configure:3486: checking for --enable-dialupman" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-dialupman""... $ac_c" 1>&6
+echo "configure:3644: checking for --${enablestring:-enable}-dialupman" >&5
           no_cache=0
           # Check whether --enable-dialupman or --disable-dialupman was given.
 if test "${enable_dialupman+set}" = set; then
@@ -3520,8 +3678,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-apple_ieee""... $ac_c" 1>&6
-echo "configure:3525: checking for --enable-apple_ieee" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-apple_ieee""... $ac_c" 1>&6
+echo "configure:3684: checking for --${enablestring:-enable}-apple_ieee" >&5
           no_cache=0
           # Check whether --enable-apple_ieee or --disable-apple_ieee was given.
 if test "${enable_apple_ieee+set}" = set; then
@@ -3559,8 +3718,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-timer""... $ac_c" 1>&6
-echo "configure:3564: checking for --enable-timer" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-timer""... $ac_c" 1>&6
+echo "configure:3724: checking for --${enablestring:-enable}-timer" >&5
           no_cache=0
           # Check whether --enable-timer or --disable-timer was given.
 if test "${enable_timer+set}" = set; then
@@ -3598,8 +3758,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-wave""... $ac_c" 1>&6
-echo "configure:3603: checking for --enable-wave" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-wave""... $ac_c" 1>&6
+echo "configure:3764: checking for --${enablestring:-enable}-wave" >&5
           no_cache=0
           # Check whether --enable-wave or --disable-wave was given.
 if test "${enable_wave+set}" = set; then
@@ -3637,8 +3798,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-fraction""... $ac_c" 1>&6
-echo "configure:3642: checking for --enable-fraction" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-fraction""... $ac_c" 1>&6
+echo "configure:3804: checking for --${enablestring:-enable}-fraction" >&5
           no_cache=0
           # Check whether --enable-fraction or --disable-fraction was given.
 if test "${enable_fraction+set}" = set; then
@@ -3676,8 +3838,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-dynlib""... $ac_c" 1>&6
-echo "configure:3681: checking for --enable-dynlib" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-dynlib""... $ac_c" 1>&6
+echo "configure:3844: checking for --${enablestring:-enable}-dynlib" >&5
           no_cache=0
           # Check whether --enable-dynlib or --disable-dynlib was given.
 if test "${enable_dynlib+set}" = set; then
@@ -3715,8 +3878,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-dynamicloader""... $ac_c" 1>&6
-echo "configure:3720: checking for --enable-dynamicloader" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-dynamicloader""... $ac_c" 1>&6
+echo "configure:3884: checking for --${enablestring:-enable}-dynamicloader" >&5
           no_cache=0
           # Check whether --enable-dynamicloader or --disable-dynamicloader was given.
 if test "${enable_dynamicloader+set}" = set; then
@@ -3754,8 +3918,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-longlong""... $ac_c" 1>&6
-echo "configure:3759: checking for --enable-longlong" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-longlong""... $ac_c" 1>&6
+echo "configure:3924: checking for --${enablestring:-enable}-longlong" >&5
           no_cache=0
           # Check whether --enable-longlong or --disable-longlong was given.
 if test "${enable_longlong+set}" = set; then
@@ -3793,8 +3958,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-geometry""... $ac_c" 1>&6
-echo "configure:3798: checking for --enable-geometry" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-geometry""... $ac_c" 1>&6
+echo "configure:3964: checking for --${enablestring:-enable}-geometry" >&5
           no_cache=0
           # Check whether --enable-geometry or --disable-geometry was given.
 if test "${enable_geometry+set}" = set; then
@@ -3832,8 +3998,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-log""... $ac_c" 1>&6
-echo "configure:3837: checking for --enable-log" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-log""... $ac_c" 1>&6
+echo "configure:4004: checking for --${enablestring:-enable}-log" >&5
           no_cache=0
           # Check whether --enable-log or --disable-log was given.
 if test "${enable_log+set}" = set; then
@@ -3871,8 +4038,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-streams""... $ac_c" 1>&6
-echo "configure:3876: checking for --enable-streams" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-streams""... $ac_c" 1>&6
+echo "configure:4044: checking for --${enablestring:-enable}-streams" >&5
           no_cache=0
           # Check whether --enable-streams or --disable-streams was given.
 if test "${enable_streams+set}" = set; then
@@ -3910,8 +4078,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-file""... $ac_c" 1>&6
-echo "configure:3915: checking for --enable-file" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-file""... $ac_c" 1>&6
+echo "configure:4084: checking for --${enablestring:-enable}-file" >&5
           no_cache=0
           # Check whether --enable-file or --disable-file was given.
 if test "${enable_file+set}" = set; then
@@ -3949,8 +4118,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-ffile""... $ac_c" 1>&6
-echo "configure:3954: checking for --enable-ffile" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-ffile""... $ac_c" 1>&6
+echo "configure:4124: checking for --${enablestring:-enable}-ffile" >&5
           no_cache=0
           # Check whether --enable-ffile or --disable-ffile was given.
 if test "${enable_ffile+set}" = set; then
@@ -3988,8 +4158,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-textbuf""... $ac_c" 1>&6
-echo "configure:3993: checking for --enable-textbuf" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-textbuf""... $ac_c" 1>&6
+echo "configure:4164: checking for --${enablestring:-enable}-textbuf" >&5
           no_cache=0
           # Check whether --enable-textbuf or --disable-textbuf was given.
 if test "${enable_textbuf+set}" = set; then
@@ -4027,8 +4198,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-textfile""... $ac_c" 1>&6
-echo "configure:4032: checking for --enable-textfile" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-textfile""... $ac_c" 1>&6
+echo "configure:4204: checking for --${enablestring:-enable}-textfile" >&5
           no_cache=0
           # Check whether --enable-textfile or --disable-textfile was given.
 if test "${enable_textfile+set}" = set; then
@@ -4066,8 +4238,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-fontmap""... $ac_c" 1>&6
-echo "configure:4071: checking for --enable-fontmap" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-fontmap""... $ac_c" 1>&6
+echo "configure:4244: checking for --${enablestring:-enable}-fontmap" >&5
           no_cache=0
           # Check whether --enable-fontmap or --disable-fontmap was given.
 if test "${enable_fontmap+set}" = set; then
@@ -4105,8 +4278,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-unicode""... $ac_c" 1>&6
-echo "configure:4110: checking for --enable-unicode" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-unicode""... $ac_c" 1>&6
+echo "configure:4284: checking for --${enablestring:-enable}-unicode" >&5
           no_cache=0
           # Check whether --enable-unicode or --disable-unicode was given.
 if test "${enable_unicode+set}" = set; then
@@ -4144,8 +4318,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-mslu""... $ac_c" 1>&6
-echo "configure:4149: checking for --enable-mslu" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-mslu""... $ac_c" 1>&6
+echo "configure:4324: checking for --${enablestring:-enable}-mslu" >&5
           no_cache=0
           # Check whether --enable-mslu or --disable-mslu was given.
 if test "${enable_mslu+set}" = set; then
@@ -4183,8 +4358,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-wxprintfv""... $ac_c" 1>&6
-echo "configure:4188: checking for --enable-wxprintfv" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-wxprintfv""... $ac_c" 1>&6
+echo "configure:4364: checking for --${enablestring:-enable}-wxprintfv" >&5
           no_cache=0
           # Check whether --enable-wxprintfv or --disable-wxprintfv was given.
 if test "${enable_wxprintfv+set}" = set; then
@@ -4222,8 +4398,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-std_iostreams""... $ac_c" 1>&6
-echo "configure:4227: checking for --enable-std_iostreams" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-std_iostreams""... $ac_c" 1>&6
+echo "configure:4404: checking for --${enablestring:-enable}-std_iostreams" >&5
           no_cache=0
           # Check whether --enable-std_iostreams or --disable-std_iostreams was given.
 if test "${enable_std_iostreams+set}" = set; then
@@ -4261,8 +4438,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-filesystem""... $ac_c" 1>&6
-echo "configure:4266: checking for --enable-filesystem" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-filesystem""... $ac_c" 1>&6
+echo "configure:4444: checking for --${enablestring:-enable}-filesystem" >&5
           no_cache=0
           # Check whether --enable-filesystem or --disable-filesystem was given.
 if test "${enable_filesystem+set}" = set; then
@@ -4300,8 +4478,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-fs_inet""... $ac_c" 1>&6
-echo "configure:4305: checking for --enable-fs_inet" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-fs_inet""... $ac_c" 1>&6
+echo "configure:4484: checking for --${enablestring:-enable}-fs_inet" >&5
           no_cache=0
           # Check whether --enable-fs_inet or --disable-fs_inet was given.
 if test "${enable_fs_inet+set}" = set; then
@@ -4339,8 +4518,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-fs_zip""... $ac_c" 1>&6
-echo "configure:4344: checking for --enable-fs_zip" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-fs_zip""... $ac_c" 1>&6
+echo "configure:4524: checking for --${enablestring:-enable}-fs_zip" >&5
           no_cache=0
           # Check whether --enable-fs_zip or --disable-fs_zip was given.
 if test "${enable_fs_zip+set}" = set; then
@@ -4378,8 +4558,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-zipstream""... $ac_c" 1>&6
-echo "configure:4383: checking for --enable-zipstream" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-zipstream""... $ac_c" 1>&6
+echo "configure:4564: checking for --${enablestring:-enable}-zipstream" >&5
           no_cache=0
           # Check whether --enable-zipstream or --disable-zipstream was given.
 if test "${enable_zipstream+set}" = set; then
@@ -4418,8 +4599,9 @@ fi
         
 
 
-          echo $ac_n "checking for --enable-catch_segvs""... $ac_c" 1>&6
-echo "configure:4423: checking for --enable-catch_segvs" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-catch_segvs""... $ac_c" 1>&6
+echo "configure:4605: checking for --${enablestring:-enable}-catch_segvs" >&5
           no_cache=0
           # Check whether --enable-catch_segvs or --disable-catch_segvs was given.
 if test "${enable_catch_segvs+set}" = set; then
@@ -4457,8 +4639,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-snglinst""... $ac_c" 1>&6
-echo "configure:4462: checking for --enable-snglinst" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-snglinst""... $ac_c" 1>&6
+echo "configure:4645: checking for --${enablestring:-enable}-snglinst" >&5
           no_cache=0
           # Check whether --enable-snglinst or --disable-snglinst was given.
 if test "${enable_snglinst+set}" = set; then
@@ -4497,8 +4680,9 @@ fi
         
 
 
-          echo $ac_n "checking for --enable-mimetype""... $ac_c" 1>&6
-echo "configure:4502: checking for --enable-mimetype" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-mimetype""... $ac_c" 1>&6
+echo "configure:4686: checking for --${enablestring:-enable}-mimetype" >&5
           no_cache=0
           # Check whether --enable-mimetype or --disable-mimetype was given.
 if test "${enable_mimetype+set}" = set; then
@@ -4536,8 +4720,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-system_options""... $ac_c" 1>&6
-echo "configure:4541: checking for --enable-system_options" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-system_options""... $ac_c" 1>&6
+echo "configure:4726: checking for --${enablestring:-enable}-system_options" >&5
           no_cache=0
           # Check whether --enable-system_options or --disable-system_options was given.
 if test "${enable_system_options+set}" = set; then
@@ -4576,8 +4761,9 @@ fi
         
 
 
-          echo $ac_n "checking for --enable-url""... $ac_c" 1>&6
-echo "configure:4581: checking for --enable-url" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-url""... $ac_c" 1>&6
+echo "configure:4767: checking for --${enablestring:-enable}-url" >&5
           no_cache=0
           # Check whether --enable-url or --disable-url was given.
 if test "${enable_url+set}" = set; then
@@ -4615,8 +4801,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-protocol""... $ac_c" 1>&6
-echo "configure:4620: checking for --enable-protocol" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-protocol""... $ac_c" 1>&6
+echo "configure:4807: checking for --${enablestring:-enable}-protocol" >&5
           no_cache=0
           # Check whether --enable-protocol or --disable-protocol was given.
 if test "${enable_protocol+set}" = set; then
@@ -4654,8 +4841,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-protocol_http""... $ac_c" 1>&6
-echo "configure:4659: checking for --enable-protocol_http" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-protocol_http""... $ac_c" 1>&6
+echo "configure:4847: checking for --${enablestring:-enable}-protocol_http" >&5
           no_cache=0
           # Check whether --enable-protocol_http or --disable-protocol_http was given.
 if test "${enable_protocol_http+set}" = set; then
@@ -4693,8 +4881,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-protocol_ftp""... $ac_c" 1>&6
-echo "configure:4698: checking for --enable-protocol_ftp" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-protocol_ftp""... $ac_c" 1>&6
+echo "configure:4887: checking for --${enablestring:-enable}-protocol_ftp" >&5
           no_cache=0
           # Check whether --enable-protocol_ftp or --disable-protocol_ftp was given.
 if test "${enable_protocol_ftp+set}" = set; then
@@ -4732,8 +4921,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-protocol_file""... $ac_c" 1>&6
-echo "configure:4737: checking for --enable-protocol_file" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-protocol_file""... $ac_c" 1>&6
+echo "configure:4927: checking for --${enablestring:-enable}-protocol_file" >&5
           no_cache=0
           # Check whether --enable-protocol_file or --disable-protocol_file was given.
 if test "${enable_protocol_file+set}" = set; then
@@ -4774,8 +4964,9 @@ fi
 
 
 
-          echo $ac_n "checking for --enable-threads""... $ac_c" 1>&6
-echo "configure:4779: checking for --enable-threads" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-threads""... $ac_c" 1>&6
+echo "configure:4970: checking for --${enablestring:-enable}-threads" >&5
           no_cache=0
           # Check whether --enable-threads or --disable-threads was given.
 if test "${enable_threads+set}" = set; then
@@ -4817,8 +5008,9 @@ if test "$wxUSE_GUI" = "yes"; then
 
 
 
-          echo $ac_n "checking for --enable-docview""... $ac_c" 1>&6
-echo "configure:4822: checking for --enable-docview" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-docview""... $ac_c" 1>&6
+echo "configure:5014: checking for --${enablestring:-enable}-docview" >&5
           no_cache=0
           # Check whether --enable-docview or --disable-docview was given.
 if test "${enable_docview+set}" = set; then
@@ -4856,8 +5048,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-help""... $ac_c" 1>&6
-echo "configure:4861: checking for --enable-help" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-help""... $ac_c" 1>&6
+echo "configure:5054: checking for --${enablestring:-enable}-help" >&5
           no_cache=0
           # Check whether --enable-help or --disable-help was given.
 if test "${enable_help+set}" = set; then
@@ -4895,8 +5088,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-mshtmlhelp""... $ac_c" 1>&6
-echo "configure:4900: checking for --enable-mshtmlhelp" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-mshtmlhelp""... $ac_c" 1>&6
+echo "configure:5094: checking for --${enablestring:-enable}-mshtmlhelp" >&5
           no_cache=0
           # Check whether --enable-mshtmlhelp or --disable-mshtmlhelp was given.
 if test "${enable_mshtmlhelp+set}" = set; then
@@ -4934,8 +5128,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-html""... $ac_c" 1>&6
-echo "configure:4939: checking for --enable-html" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-html""... $ac_c" 1>&6
+echo "configure:5134: checking for --${enablestring:-enable}-html" >&5
           no_cache=0
           # Check whether --enable-html or --disable-html was given.
 if test "${enable_html+set}" = set; then
@@ -4973,8 +5168,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-htmlhelp""... $ac_c" 1>&6
-echo "configure:4978: checking for --enable-htmlhelp" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-htmlhelp""... $ac_c" 1>&6
+echo "configure:5174: checking for --${enablestring:-enable}-htmlhelp" >&5
           no_cache=0
           # Check whether --enable-htmlhelp or --disable-htmlhelp was given.
 if test "${enable_htmlhelp+set}" = set; then
@@ -5012,8 +5208,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-constraints""... $ac_c" 1>&6
-echo "configure:5017: checking for --enable-constraints" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-constraints""... $ac_c" 1>&6
+echo "configure:5214: checking for --${enablestring:-enable}-constraints" >&5
           no_cache=0
           # Check whether --enable-constraints or --disable-constraints was given.
 if test "${enable_constraints+set}" = set; then
@@ -5051,8 +5248,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-printarch""... $ac_c" 1>&6
-echo "configure:5056: checking for --enable-printarch" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-printarch""... $ac_c" 1>&6
+echo "configure:5254: checking for --${enablestring:-enable}-printarch" >&5
           no_cache=0
           # Check whether --enable-printarch or --disable-printarch was given.
 if test "${enable_printarch+set}" = set; then
@@ -5090,8 +5288,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-mdi""... $ac_c" 1>&6
-echo "configure:5095: checking for --enable-mdi" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-mdi""... $ac_c" 1>&6
+echo "configure:5294: checking for --${enablestring:-enable}-mdi" >&5
           no_cache=0
           # Check whether --enable-mdi or --disable-mdi was given.
 if test "${enable_mdi+set}" = set; then
@@ -5129,8 +5328,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-loggui""... $ac_c" 1>&6
-echo "configure:5134: checking for --enable-loggui" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-loggui""... $ac_c" 1>&6
+echo "configure:5334: checking for --${enablestring:-enable}-loggui" >&5
           no_cache=0
           # Check whether --enable-loggui or --disable-loggui was given.
 if test "${enable_loggui+set}" = set; then
@@ -5168,8 +5368,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-logwin""... $ac_c" 1>&6
-echo "configure:5173: checking for --enable-logwin" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-logwin""... $ac_c" 1>&6
+echo "configure:5374: checking for --${enablestring:-enable}-logwin" >&5
           no_cache=0
           # Check whether --enable-logwin or --disable-logwin was given.
 if test "${enable_logwin+set}" = set; then
@@ -5207,8 +5408,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-logdialog""... $ac_c" 1>&6
-echo "configure:5212: checking for --enable-logdialog" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-logdialog""... $ac_c" 1>&6
+echo "configure:5414: checking for --${enablestring:-enable}-logdialog" >&5
           no_cache=0
           # Check whether --enable-logdialog or --disable-logdialog was given.
 if test "${enable_logdialog+set}" = set; then
@@ -5247,8 +5449,9 @@ fi
         
 
 
-          echo $ac_n "checking for --enable-postscript""... $ac_c" 1>&6
-echo "configure:5252: checking for --enable-postscript" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-postscript""... $ac_c" 1>&6
+echo "configure:5455: checking for --${enablestring:-enable}-postscript" >&5
           no_cache=0
           # Check whether --enable-postscript or --disable-postscript was given.
 if test "${enable_postscript+set}" = set; then
@@ -5289,94 +5492,57 @@ fi
 
 
 
-          echo $ac_n "checking for --enable-prologio""... $ac_c" 1>&6
-echo "configure:5294: checking for --enable-prologio" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-resources""... $ac_c" 1>&6
+echo "configure:5498: checking for --${enablestring:-enable}-resources" >&5
           no_cache=0
-          # Check whether --enable-prologio or --disable-prologio was given.
-if test "${enable_prologio+set}" = set; then
-  enableval="$enable_prologio"
+          # Check whether --enable-resources or --disable-resources was given.
+if test "${enable_resources+set}" = set; then
+  enableval="$enable_resources"
   
                           if test "$enableval" = yes; then
-                            ac_cv_use_prologio='wxUSE_PROLOGIO=yes'
+                            ac_cv_use_resources='wxUSE_RESOURCES=yes'
                           else
-                            ac_cv_use_prologio='wxUSE_PROLOGIO=no'
+                            ac_cv_use_resources='wxUSE_RESOURCES=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_PROLOGIO" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_RESOURCES" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_prologio='wxUSE_PROLOGIO='$DEFAULT_wxUSE_PROLOGIO
+                          ac_cv_use_resources='wxUSE_RESOURCES='$DEFAULT_wxUSE_RESOURCES
                         
 fi
 
 
-          eval "$ac_cv_use_prologio"
+          eval "$ac_cv_use_resources"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_prologio >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_resources >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_PROLOGIO" = yes; then
+          if test "$wxUSE_RESOURCES" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-          echo $ac_n "checking for --enable-resources""... $ac_c" 1>&6
-echo "configure:5333: checking for --enable-resources" >&5
+
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-xresources""... $ac_c" 1>&6
+echo "configure:5539: checking for --${enablestring:-enable}-xresources" >&5
           no_cache=0
-          # Check whether --enable-resources or --disable-resources was given.
-if test "${enable_resources+set}" = set; then
-  enableval="$enable_resources"
+          # Check whether --enable-xresources or --disable-xresources was given.
+if test "${enable_xresources+set}" = set; then
+  enableval="$enable_xresources"
   
                           if test "$enableval" = yes; then
-                            ac_cv_use_resources='wxUSE_RESOURCES=yes'
-                          else
-                            ac_cv_use_resources='wxUSE_RESOURCES=no'
-                          fi
-                        
-else
-  
-                          LINE=`grep "wxUSE_RESOURCES" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
-                          ac_cv_use_resources='wxUSE_RESOURCES='$DEFAULT_wxUSE_RESOURCES
-                        
-fi
-
-
-          eval "$ac_cv_use_resources"
-          if test "$no_cache" != 1; then
-            echo $ac_cv_use_resources >> ${wx_arg_cache_file}.tmp
-          fi
-
-          if test "$wxUSE_RESOURCES" = yes; then
-            echo "$ac_t""yes" 1>&6
-          else
-            echo "$ac_t""no" 1>&6
-          fi
-        
-
-
-          echo $ac_n "checking for --enable-xresources""... $ac_c" 1>&6
-echo "configure:5373: checking for --enable-xresources" >&5
-          no_cache=0
-          # Check whether --enable-xresources or --disable-xresources was given.
-if test "${enable_xresources+set}" = set; then
-  enableval="$enable_xresources"
-  
-                          if test "$enableval" = yes; then
-                            ac_cv_use_xresources='wxUSE_X_RESOURCES=yes'
+                            ac_cv_use_xresources='wxUSE_X_RESOURCES=yes'
                           else
                             ac_cv_use_xresources='wxUSE_X_RESOURCES=no'
                           fi
@@ -5409,8 +5575,9 @@ fi
 
 
 
-          echo $ac_n "checking for --enable-clipboard""... $ac_c" 1>&6
-echo "configure:5414: checking for --enable-clipboard" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-clipboard""... $ac_c" 1>&6
+echo "configure:5581: checking for --${enablestring:-enable}-clipboard" >&5
           no_cache=0
           # Check whether --enable-clipboard or --disable-clipboard was given.
 if test "${enable_clipboard+set}" = set; then
@@ -5448,8 +5615,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-dnd""... $ac_c" 1>&6
-echo "configure:5453: checking for --enable-dnd" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-dnd""... $ac_c" 1>&6
+echo "configure:5621: checking for --${enablestring:-enable}-dnd" >&5
           no_cache=0
           # Check whether --enable-dnd or --disable-dnd was given.
 if test "${enable_dnd+set}" = set; then
@@ -5487,8 +5655,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-metafile""... $ac_c" 1>&6
-echo "configure:5492: checking for --enable-metafile" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-metafile""... $ac_c" 1>&6
+echo "configure:5661: checking for --${enablestring:-enable}-metafile" >&5
           no_cache=0
           # Check whether --enable-metafile or --disable-metafile was given.
 if test "${enable_metafile+set}" = set; then
@@ -5527,49 +5696,11 @@ fi
         
 
 
-          echo $ac_n "checking for --enable-treelayout""... $ac_c" 1>&6
-echo "configure:5532: checking for --enable-treelayout" >&5
-          no_cache=0
-          # Check whether --enable-treelayout or --disable-treelayout was given.
-if test "${enable_treelayout+set}" = set; then
-  enableval="$enable_treelayout"
-  
-                          if test "$enableval" = yes; then
-                            ac_cv_use_treelayout='wxUSE_TREELAYOUT=yes'
-                          else
-                            ac_cv_use_treelayout='wxUSE_TREELAYOUT=no'
-                          fi
-                        
-else
-  
-                          LINE=`grep "wxUSE_TREELAYOUT" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
-                          ac_cv_use_treelayout='wxUSE_TREELAYOUT='$DEFAULT_wxUSE_TREELAYOUT
-                        
-fi
-
-
-          eval "$ac_cv_use_treelayout"
-          if test "$no_cache" != 1; then
-            echo $ac_cv_use_treelayout >> ${wx_arg_cache_file}.tmp
-          fi
-
-          if test "$wxUSE_TREELAYOUT" = yes; then
-            echo "$ac_t""yes" 1>&6
-          else
-            echo "$ac_t""no" 1>&6
-          fi
-        
-
 
 
-          echo $ac_n "checking for --enable-controls""... $ac_c" 1>&6
-echo "configure:5573: checking for --enable-controls" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-controls""... $ac_c" 1>&6
+echo "configure:5704: checking for --${enablestring:-enable}-controls" >&5
           no_cache=0
           # Check whether --enable-controls or --disable-controls was given.
 if test "${enable_controls+set}" = set; then
@@ -5619,12 +5750,10 @@ if test "$wxUSE_CONTROLS" = "yes"; then
   DEFAULT_wxUSE_CHOICE=yes
   DEFAULT_wxUSE_GAUGE=yes
   DEFAULT_wxUSE_GRID=yes
-  DEFAULT_wxUSE_NEW_GRID=yes
   DEFAULT_wxUSE_IMAGLIST=yes
   DEFAULT_wxUSE_LISTBOX=yes
   DEFAULT_wxUSE_LISTCTRL=yes
   DEFAULT_wxUSE_NOTEBOOK=yes
-  DEFAULT_wxUSE_PROPSHEET=yes
   DEFAULT_wxUSE_RADIOBOX=yes
   DEFAULT_wxUSE_RADIOBTN=yes
   DEFAULT_wxUSE_SASH=yes
@@ -5658,12 +5787,10 @@ elif test "$wxUSE_CONTROLS" = "no"; then
   DEFAULT_wxUSE_CHOICE=no
   DEFAULT_wxUSE_GAUGE=no
   DEFAULT_wxUSE_GRID=no
-  DEFAULT_wxUSE_NEW_GRID=no
   DEFAULT_wxUSE_IMAGLIST=no
   DEFAULT_wxUSE_LISTBOX=no
   DEFAULT_wxUSE_LISTCTRL=no
   DEFAULT_wxUSE_NOTEBOOK=no
-  DEFAULT_wxUSE_PROPSHEET=no
   DEFAULT_wxUSE_RADIOBOX=no
   DEFAULT_wxUSE_RADIOBTN=no
   DEFAULT_wxUSE_SASH=no
@@ -5687,9 +5814,40 @@ elif test "$wxUSE_CONTROLS" = "no"; then
   DEFAULT_wxUSE_TIPWINDOW=no
 fi
 
+## FIXME: This is a blatant hack
+if test "x$wxUSE_COCOA" != "x" -a "$wxUSE_COCOA" != "0" ; then
+  wxUSE_PRINTING_ARCHITECTURE=no
+  wxUSE_HELP=no
+  wxUSE_CLIPBOARD=no
+  wxUSE_DRAG_AND_DROP=no
+  wxUSE_DATAOBJ=no
+  DEFAULT_wxUSE_TOOLBAR_NATIVE=no
+  DEFAULT_wxUSE_GAUGE=no
+  DEFAULT_wxUSE_SCROLLBAR=no
+  DEFAULT_wxUSE_SLIDER=no
+  DEFAULT_wxUSE_COMBOBOX=no
+  DEFAULT_wxUSE_CALCTRL=no
+  DEFAULT_wxUSE_SPINBTN=no
+  DEFAULT_wxUSE_SPINCTRL=no
+  DEFAULT_wxUSE_TOOLTIPS=no
+  DEFAULT_wxUSE_COLOURDLG=no
+  DEFAULT_wxUSE_DRAGIMAGE=no
+  DEFAULT_wxUSE_FINDREPLDLG=no
+  DEFAULT_wxUSE_FONTDLG=no
+  DEFAULT_wxUSE_GRID=no
+  DEFAULT_wxUSE_NUMBERDLG=no
+  DEFAULT_wxUSE_PROGRESSDLG=no
+  DEFAULT_wxUSE_SASH=no
+  DEFAULT_wxUSE_SPLITTER=no
+  DEFAULT_wxUSE_WIZARDDLG=no
+  DEFAULT_wxUSE_SPLITTER=no
+  DEFAULT_wxUSE_STARTUP_TIPS=no
+fi
+
 
-          echo $ac_n "checking for --enable-accel""... $ac_c" 1>&6
-echo "configure:5693: checking for --enable-accel" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-accel""... $ac_c" 1>&6
+echo "configure:5851: checking for --${enablestring:-enable}-accel" >&5
           no_cache=0
           # Check whether --enable-accel or --disable-accel was given.
 if test "${enable_accel+set}" = set; then
@@ -5727,8 +5885,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-button""... $ac_c" 1>&6
-echo "configure:5732: checking for --enable-button" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-button""... $ac_c" 1>&6
+echo "configure:5891: checking for --${enablestring:-enable}-button" >&5
           no_cache=0
           # Check whether --enable-button or --disable-button was given.
 if test "${enable_button+set}" = set; then
@@ -5766,8 +5925,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-bmpbutton""... $ac_c" 1>&6
-echo "configure:5771: checking for --enable-bmpbutton" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-bmpbutton""... $ac_c" 1>&6
+echo "configure:5931: checking for --${enablestring:-enable}-bmpbutton" >&5
           no_cache=0
           # Check whether --enable-bmpbutton or --disable-bmpbutton was given.
 if test "${enable_bmpbutton+set}" = set; then
@@ -5805,8 +5965,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-calendar""... $ac_c" 1>&6
-echo "configure:5810: checking for --enable-calendar" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-calendar""... $ac_c" 1>&6
+echo "configure:5971: checking for --${enablestring:-enable}-calendar" >&5
           no_cache=0
           # Check whether --enable-calendar or --disable-calendar was given.
 if test "${enable_calendar+set}" = set; then
@@ -5844,8 +6005,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-caret""... $ac_c" 1>&6
-echo "configure:5849: checking for --enable-caret" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-caret""... $ac_c" 1>&6
+echo "configure:6011: checking for --${enablestring:-enable}-caret" >&5
           no_cache=0
           # Check whether --enable-caret or --disable-caret was given.
 if test "${enable_caret+set}" = set; then
@@ -5883,8 +6045,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-checkbox""... $ac_c" 1>&6
-echo "configure:5888: checking for --enable-checkbox" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-checkbox""... $ac_c" 1>&6
+echo "configure:6051: checking for --${enablestring:-enable}-checkbox" >&5
           no_cache=0
           # Check whether --enable-checkbox or --disable-checkbox was given.
 if test "${enable_checkbox+set}" = set; then
@@ -5922,8 +6085,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-checklst""... $ac_c" 1>&6
-echo "configure:5927: checking for --enable-checklst" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-checklst""... $ac_c" 1>&6
+echo "configure:6091: checking for --${enablestring:-enable}-checklst" >&5
           no_cache=0
           # Check whether --enable-checklst or --disable-checklst was given.
 if test "${enable_checklst+set}" = set; then
@@ -5961,8 +6125,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-choice""... $ac_c" 1>&6
-echo "configure:5966: checking for --enable-choice" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-choice""... $ac_c" 1>&6
+echo "configure:6131: checking for --${enablestring:-enable}-choice" >&5
           no_cache=0
           # Check whether --enable-choice or --disable-choice was given.
 if test "${enable_choice+set}" = set; then
@@ -6000,8 +6165,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-combobox""... $ac_c" 1>&6
-echo "configure:6005: checking for --enable-combobox" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-combobox""... $ac_c" 1>&6
+echo "configure:6171: checking for --${enablestring:-enable}-combobox" >&5
           no_cache=0
           # Check whether --enable-combobox or --disable-combobox was given.
 if test "${enable_combobox+set}" = set; then
@@ -6039,125 +6205,129 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-gauge""... $ac_c" 1>&6
-echo "configure:6044: checking for --enable-gauge" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-display""... $ac_c" 1>&6
+echo "configure:6211: checking for --${enablestring:-enable}-display" >&5
           no_cache=0
-          # Check whether --enable-gauge or --disable-gauge was given.
-if test "${enable_gauge+set}" = set; then
-  enableval="$enable_gauge"
+          # Check whether --enable-display or --disable-display was given.
+if test "${enable_display+set}" = set; then
+  enableval="$enable_display"
   
                           if test "$enableval" = yes; then
-                            ac_cv_use_gauge='wxUSE_GAUGE=yes'
+                            ac_cv_use_display='wxUSE_DISPLAY=yes'
                           else
-                            ac_cv_use_gauge='wxUSE_GAUGE=no'
+                            ac_cv_use_display='wxUSE_DISPLAY=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_GAUGE" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_DISPLAY" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_gauge='wxUSE_GAUGE='$DEFAULT_wxUSE_GAUGE
+                          ac_cv_use_display='wxUSE_DISPLAY='$DEFAULT_wxUSE_DISPLAY
                         
 fi
 
 
-          eval "$ac_cv_use_gauge"
+          eval "$ac_cv_use_display"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_gauge >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_display >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_GAUGE" = yes; then
+          if test "$wxUSE_DISPLAY" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-          echo $ac_n "checking for --enable-grid""... $ac_c" 1>&6
-echo "configure:6083: checking for --enable-grid" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-gauge""... $ac_c" 1>&6
+echo "configure:6251: checking for --${enablestring:-enable}-gauge" >&5
           no_cache=0
-          # Check whether --enable-grid or --disable-grid was given.
-if test "${enable_grid+set}" = set; then
-  enableval="$enable_grid"
+          # Check whether --enable-gauge or --disable-gauge was given.
+if test "${enable_gauge+set}" = set; then
+  enableval="$enable_gauge"
   
                           if test "$enableval" = yes; then
-                            ac_cv_use_grid='wxUSE_GRID=yes'
+                            ac_cv_use_gauge='wxUSE_GAUGE=yes'
                           else
-                            ac_cv_use_grid='wxUSE_GRID=no'
+                            ac_cv_use_gauge='wxUSE_GAUGE=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_GRID" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_GAUGE" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_grid='wxUSE_GRID='$DEFAULT_wxUSE_GRID
+                          ac_cv_use_gauge='wxUSE_GAUGE='$DEFAULT_wxUSE_GAUGE
                         
 fi
 
 
-          eval "$ac_cv_use_grid"
+          eval "$ac_cv_use_gauge"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_grid >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_gauge >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_GRID" = yes; then
+          if test "$wxUSE_GAUGE" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-          echo $ac_n "checking for --enable-newgrid""... $ac_c" 1>&6
-echo "configure:6122: checking for --enable-newgrid" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-grid""... $ac_c" 1>&6
+echo "configure:6291: checking for --${enablestring:-enable}-grid" >&5
           no_cache=0
-          # Check whether --enable-newgrid or --disable-newgrid was given.
-if test "${enable_newgrid+set}" = set; then
-  enableval="$enable_newgrid"
+          # Check whether --enable-grid or --disable-grid was given.
+if test "${enable_grid+set}" = set; then
+  enableval="$enable_grid"
   
                           if test "$enableval" = yes; then
-                            ac_cv_use_newgrid='wxUSE_NEW_GRID=yes'
+                            ac_cv_use_grid='wxUSE_GRID=yes'
                           else
-                            ac_cv_use_newgrid='wxUSE_NEW_GRID=no'
+                            ac_cv_use_grid='wxUSE_GRID=no'
                           fi
                         
 else
   
-                          LINE=`grep "wxUSE_NEW_GRID" ${wx_arg_cache_file}`
+                          LINE=`grep "wxUSE_GRID" ${wx_arg_cache_file}`
                           if test "x$LINE" != x ; then
                             eval "DEFAULT_$LINE"
                           else
                             no_cache=1
                           fi
 
-                          ac_cv_use_newgrid='wxUSE_NEW_GRID='$DEFAULT_wxUSE_NEW_GRID
+                          ac_cv_use_grid='wxUSE_GRID='$DEFAULT_wxUSE_GRID
                         
 fi
 
 
-          eval "$ac_cv_use_newgrid"
+          eval "$ac_cv_use_grid"
           if test "$no_cache" != 1; then
-            echo $ac_cv_use_newgrid >> ${wx_arg_cache_file}.tmp
+            echo $ac_cv_use_grid >> ${wx_arg_cache_file}.tmp
           fi
 
-          if test "$wxUSE_NEW_GRID" = yes; then
+          if test "$wxUSE_GRID" = yes; then
             echo "$ac_t""yes" 1>&6
           else
             echo "$ac_t""no" 1>&6
           fi
         
 
-          echo $ac_n "checking for --enable-imaglist""... $ac_c" 1>&6
-echo "configure:6161: checking for --enable-imaglist" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-imaglist""... $ac_c" 1>&6
+echo "configure:6331: checking for --${enablestring:-enable}-imaglist" >&5
           no_cache=0
           # Check whether --enable-imaglist or --disable-imaglist was given.
 if test "${enable_imaglist+set}" = set; then
@@ -6195,8 +6365,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-listbox""... $ac_c" 1>&6
-echo "configure:6200: checking for --enable-listbox" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-listbox""... $ac_c" 1>&6
+echo "configure:6371: checking for --${enablestring:-enable}-listbox" >&5
           no_cache=0
           # Check whether --enable-listbox or --disable-listbox was given.
 if test "${enable_listbox+set}" = set; then
@@ -6234,8 +6405,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-listctrl""... $ac_c" 1>&6
-echo "configure:6239: checking for --enable-listctrl" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-listctrl""... $ac_c" 1>&6
+echo "configure:6411: checking for --${enablestring:-enable}-listctrl" >&5
           no_cache=0
           # Check whether --enable-listctrl or --disable-listctrl was given.
 if test "${enable_listctrl+set}" = set; then
@@ -6273,8 +6445,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-notebook""... $ac_c" 1>&6
-echo "configure:6278: checking for --enable-notebook" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-notebook""... $ac_c" 1>&6
+echo "configure:6451: checking for --${enablestring:-enable}-notebook" >&5
           no_cache=0
           # Check whether --enable-notebook or --disable-notebook was given.
 if test "${enable_notebook+set}" = set; then
@@ -6312,47 +6485,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-propsheet""... $ac_c" 1>&6
-echo "configure:6317: checking for --enable-propsheet" >&5
-          no_cache=0
-          # Check whether --enable-propsheet or --disable-propsheet was given.
-if test "${enable_propsheet+set}" = set; then
-  enableval="$enable_propsheet"
-  
-                          if test "$enableval" = yes; then
-                            ac_cv_use_propsheet='wxUSE_PROPSHEET=yes'
-                          else
-                            ac_cv_use_propsheet='wxUSE_PROPSHEET=no'
-                          fi
-                        
-else
-  
-                          LINE=`grep "wxUSE_PROPSHEET" ${wx_arg_cache_file}`
-                          if test "x$LINE" != x ; then
-                            eval "DEFAULT_$LINE"
-                          else
-                            no_cache=1
-                          fi
-
-                          ac_cv_use_propsheet='wxUSE_PROPSHEET='$DEFAULT_wxUSE_PROPSHEET
-                        
-fi
-
-
-          eval "$ac_cv_use_propsheet"
-          if test "$no_cache" != 1; then
-            echo $ac_cv_use_propsheet >> ${wx_arg_cache_file}.tmp
-          fi
-
-          if test "$wxUSE_PROPSHEET" = yes; then
-            echo "$ac_t""yes" 1>&6
-          else
-            echo "$ac_t""no" 1>&6
-          fi
-        
-
-          echo $ac_n "checking for --enable-radiobox""... $ac_c" 1>&6
-echo "configure:6356: checking for --enable-radiobox" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-radiobox""... $ac_c" 1>&6
+echo "configure:6491: checking for --${enablestring:-enable}-radiobox" >&5
           no_cache=0
           # Check whether --enable-radiobox or --disable-radiobox was given.
 if test "${enable_radiobox+set}" = set; then
@@ -6390,8 +6525,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-radiobtn""... $ac_c" 1>&6
-echo "configure:6395: checking for --enable-radiobtn" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-radiobtn""... $ac_c" 1>&6
+echo "configure:6531: checking for --${enablestring:-enable}-radiobtn" >&5
           no_cache=0
           # Check whether --enable-radiobtn or --disable-radiobtn was given.
 if test "${enable_radiobtn+set}" = set; then
@@ -6429,8 +6565,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-sash""... $ac_c" 1>&6
-echo "configure:6434: checking for --enable-sash" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-sash""... $ac_c" 1>&6
+echo "configure:6571: checking for --${enablestring:-enable}-sash" >&5
           no_cache=0
           # Check whether --enable-sash or --disable-sash was given.
 if test "${enable_sash+set}" = set; then
@@ -6468,8 +6605,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-scrollbar""... $ac_c" 1>&6
-echo "configure:6473: checking for --enable-scrollbar" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-scrollbar""... $ac_c" 1>&6
+echo "configure:6611: checking for --${enablestring:-enable}-scrollbar" >&5
           no_cache=0
           # Check whether --enable-scrollbar or --disable-scrollbar was given.
 if test "${enable_scrollbar+set}" = set; then
@@ -6507,8 +6645,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-slider""... $ac_c" 1>&6
-echo "configure:6512: checking for --enable-slider" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-slider""... $ac_c" 1>&6
+echo "configure:6651: checking for --${enablestring:-enable}-slider" >&5
           no_cache=0
           # Check whether --enable-slider or --disable-slider was given.
 if test "${enable_slider+set}" = set; then
@@ -6546,8 +6685,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-spinbtn""... $ac_c" 1>&6
-echo "configure:6551: checking for --enable-spinbtn" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-spinbtn""... $ac_c" 1>&6
+echo "configure:6691: checking for --${enablestring:-enable}-spinbtn" >&5
           no_cache=0
           # Check whether --enable-spinbtn or --disable-spinbtn was given.
 if test "${enable_spinbtn+set}" = set; then
@@ -6585,8 +6725,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-spinctrl""... $ac_c" 1>&6
-echo "configure:6590: checking for --enable-spinctrl" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-spinctrl""... $ac_c" 1>&6
+echo "configure:6731: checking for --${enablestring:-enable}-spinctrl" >&5
           no_cache=0
           # Check whether --enable-spinctrl or --disable-spinctrl was given.
 if test "${enable_spinctrl+set}" = set; then
@@ -6624,8 +6765,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-splitter""... $ac_c" 1>&6
-echo "configure:6629: checking for --enable-splitter" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-splitter""... $ac_c" 1>&6
+echo "configure:6771: checking for --${enablestring:-enable}-splitter" >&5
           no_cache=0
           # Check whether --enable-splitter or --disable-splitter was given.
 if test "${enable_splitter+set}" = set; then
@@ -6663,8 +6805,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-statbmp""... $ac_c" 1>&6
-echo "configure:6668: checking for --enable-statbmp" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-statbmp""... $ac_c" 1>&6
+echo "configure:6811: checking for --${enablestring:-enable}-statbmp" >&5
           no_cache=0
           # Check whether --enable-statbmp or --disable-statbmp was given.
 if test "${enable_statbmp+set}" = set; then
@@ -6702,8 +6845,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-statbox""... $ac_c" 1>&6
-echo "configure:6707: checking for --enable-statbox" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-statbox""... $ac_c" 1>&6
+echo "configure:6851: checking for --${enablestring:-enable}-statbox" >&5
           no_cache=0
           # Check whether --enable-statbox or --disable-statbox was given.
 if test "${enable_statbox+set}" = set; then
@@ -6741,8 +6885,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-statline""... $ac_c" 1>&6
-echo "configure:6746: checking for --enable-statline" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-statline""... $ac_c" 1>&6
+echo "configure:6891: checking for --${enablestring:-enable}-statline" >&5
           no_cache=0
           # Check whether --enable-statline or --disable-statline was given.
 if test "${enable_statline+set}" = set; then
@@ -6780,8 +6925,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-stattext""... $ac_c" 1>&6
-echo "configure:6785: checking for --enable-stattext" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-stattext""... $ac_c" 1>&6
+echo "configure:6931: checking for --${enablestring:-enable}-stattext" >&5
           no_cache=0
           # Check whether --enable-stattext or --disable-stattext was given.
 if test "${enable_stattext+set}" = set; then
@@ -6819,8 +6965,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-statusbar""... $ac_c" 1>&6
-echo "configure:6824: checking for --enable-statusbar" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-statusbar""... $ac_c" 1>&6
+echo "configure:6971: checking for --${enablestring:-enable}-statusbar" >&5
           no_cache=0
           # Check whether --enable-statusbar or --disable-statusbar was given.
 if test "${enable_statusbar+set}" = set; then
@@ -6858,8 +7005,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-tabdialog""... $ac_c" 1>&6
-echo "configure:6863: checking for --enable-tabdialog" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-tabdialog""... $ac_c" 1>&6
+echo "configure:7011: checking for --${enablestring:-enable}-tabdialog" >&5
           no_cache=0
           # Check whether --enable-tabdialog or --disable-tabdialog was given.
 if test "${enable_tabdialog+set}" = set; then
@@ -6897,8 +7045,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-textctrl""... $ac_c" 1>&6
-echo "configure:6902: checking for --enable-textctrl" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-textctrl""... $ac_c" 1>&6
+echo "configure:7051: checking for --${enablestring:-enable}-textctrl" >&5
           no_cache=0
           # Check whether --enable-textctrl or --disable-textctrl was given.
 if test "${enable_textctrl+set}" = set; then
@@ -6936,8 +7085,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-togglebtn""... $ac_c" 1>&6
-echo "configure:6941: checking for --enable-togglebtn" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-togglebtn""... $ac_c" 1>&6
+echo "configure:7091: checking for --${enablestring:-enable}-togglebtn" >&5
           no_cache=0
           # Check whether --enable-togglebtn or --disable-togglebtn was given.
 if test "${enable_togglebtn+set}" = set; then
@@ -6975,8 +7125,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-toolbar""... $ac_c" 1>&6
-echo "configure:6980: checking for --enable-toolbar" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-toolbar""... $ac_c" 1>&6
+echo "configure:7131: checking for --${enablestring:-enable}-toolbar" >&5
           no_cache=0
           # Check whether --enable-toolbar or --disable-toolbar was given.
 if test "${enable_toolbar+set}" = set; then
@@ -7014,8 +7165,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-tbarnative""... $ac_c" 1>&6
-echo "configure:7019: checking for --enable-tbarnative" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-tbarnative""... $ac_c" 1>&6
+echo "configure:7171: checking for --${enablestring:-enable}-tbarnative" >&5
           no_cache=0
           # Check whether --enable-tbarnative or --disable-tbarnative was given.
 if test "${enable_tbarnative+set}" = set; then
@@ -7053,8 +7205,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-tbarsmpl""... $ac_c" 1>&6
-echo "configure:7058: checking for --enable-tbarsmpl" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-tbarsmpl""... $ac_c" 1>&6
+echo "configure:7211: checking for --${enablestring:-enable}-tbarsmpl" >&5
           no_cache=0
           # Check whether --enable-tbarsmpl or --disable-tbarsmpl was given.
 if test "${enable_tbarsmpl+set}" = set; then
@@ -7092,8 +7245,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-treectrl""... $ac_c" 1>&6
-echo "configure:7097: checking for --enable-treectrl" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-treectrl""... $ac_c" 1>&6
+echo "configure:7251: checking for --${enablestring:-enable}-treectrl" >&5
           no_cache=0
           # Check whether --enable-treectrl or --disable-treectrl was given.
 if test "${enable_treectrl+set}" = set; then
@@ -7131,8 +7285,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-tipwindow""... $ac_c" 1>&6
-echo "configure:7136: checking for --enable-tipwindow" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-tipwindow""... $ac_c" 1>&6
+echo "configure:7291: checking for --${enablestring:-enable}-tipwindow" >&5
           no_cache=0
           # Check whether --enable-tipwindow or --disable-tipwindow was given.
 if test "${enable_tipwindow+set}" = set; then
@@ -7170,8 +7325,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-popupwin""... $ac_c" 1>&6
-echo "configure:7175: checking for --enable-popupwin" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-popupwin""... $ac_c" 1>&6
+echo "configure:7331: checking for --${enablestring:-enable}-popupwin" >&5
           no_cache=0
           # Check whether --enable-popupwin or --disable-popupwin was given.
 if test "${enable_popupwin+set}" = set; then
@@ -7211,8 +7367,9 @@ fi
 
 
 
-          echo $ac_n "checking for --enable-commondlg""... $ac_c" 1>&6
-echo "configure:7216: checking for --enable-commondlg" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-commondlg""... $ac_c" 1>&6
+echo "configure:7373: checking for --${enablestring:-enable}-commondlg" >&5
           no_cache=0
           # Check whether --enable-commondlg or --disable-commondlg was given.
 if test "${enable_commondlg+set}" = set; then
@@ -7250,8 +7407,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-choicedlg""... $ac_c" 1>&6
-echo "configure:7255: checking for --enable-choicedlg" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-choicedlg""... $ac_c" 1>&6
+echo "configure:7413: checking for --${enablestring:-enable}-choicedlg" >&5
           no_cache=0
           # Check whether --enable-choicedlg or --disable-choicedlg was given.
 if test "${enable_choicedlg+set}" = set; then
@@ -7289,8 +7447,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-coldlg""... $ac_c" 1>&6
-echo "configure:7294: checking for --enable-coldlg" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-coldlg""... $ac_c" 1>&6
+echo "configure:7453: checking for --${enablestring:-enable}-coldlg" >&5
           no_cache=0
           # Check whether --enable-coldlg or --disable-coldlg was given.
 if test "${enable_coldlg+set}" = set; then
@@ -7328,8 +7487,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-filedlg""... $ac_c" 1>&6
-echo "configure:7333: checking for --enable-filedlg" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-filedlg""... $ac_c" 1>&6
+echo "configure:7493: checking for --${enablestring:-enable}-filedlg" >&5
           no_cache=0
           # Check whether --enable-filedlg or --disable-filedlg was given.
 if test "${enable_filedlg+set}" = set; then
@@ -7367,8 +7527,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-finddlg""... $ac_c" 1>&6
-echo "configure:7372: checking for --enable-finddlg" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-finddlg""... $ac_c" 1>&6
+echo "configure:7533: checking for --${enablestring:-enable}-finddlg" >&5
           no_cache=0
           # Check whether --enable-finddlg or --disable-finddlg was given.
 if test "${enable_finddlg+set}" = set; then
@@ -7406,8 +7567,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-fontdlg""... $ac_c" 1>&6
-echo "configure:7411: checking for --enable-fontdlg" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-fontdlg""... $ac_c" 1>&6
+echo "configure:7573: checking for --${enablestring:-enable}-fontdlg" >&5
           no_cache=0
           # Check whether --enable-fontdlg or --disable-fontdlg was given.
 if test "${enable_fontdlg+set}" = set; then
@@ -7445,8 +7607,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-dirdlg""... $ac_c" 1>&6
-echo "configure:7450: checking for --enable-dirdlg" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-dirdlg""... $ac_c" 1>&6
+echo "configure:7613: checking for --${enablestring:-enable}-dirdlg" >&5
           no_cache=0
           # Check whether --enable-dirdlg or --disable-dirdlg was given.
 if test "${enable_dirdlg+set}" = set; then
@@ -7484,8 +7647,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-msgdlg""... $ac_c" 1>&6
-echo "configure:7489: checking for --enable-msgdlg" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-msgdlg""... $ac_c" 1>&6
+echo "configure:7653: checking for --${enablestring:-enable}-msgdlg" >&5
           no_cache=0
           # Check whether --enable-msgdlg or --disable-msgdlg was given.
 if test "${enable_msgdlg+set}" = set; then
@@ -7523,8 +7687,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-numberdlg""... $ac_c" 1>&6
-echo "configure:7528: checking for --enable-numberdlg" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-numberdlg""... $ac_c" 1>&6
+echo "configure:7693: checking for --${enablestring:-enable}-numberdlg" >&5
           no_cache=0
           # Check whether --enable-numberdlg or --disable-numberdlg was given.
 if test "${enable_numberdlg+set}" = set; then
@@ -7562,8 +7727,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-splash""... $ac_c" 1>&6
-echo "configure:7567: checking for --enable-splash" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-splash""... $ac_c" 1>&6
+echo "configure:7733: checking for --${enablestring:-enable}-splash" >&5
           no_cache=0
           # Check whether --enable-splash or --disable-splash was given.
 if test "${enable_splash+set}" = set; then
@@ -7601,8 +7767,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-textdlg""... $ac_c" 1>&6
-echo "configure:7606: checking for --enable-textdlg" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-textdlg""... $ac_c" 1>&6
+echo "configure:7773: checking for --${enablestring:-enable}-textdlg" >&5
           no_cache=0
           # Check whether --enable-textdlg or --disable-textdlg was given.
 if test "${enable_textdlg+set}" = set; then
@@ -7640,8 +7807,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-tipdlg""... $ac_c" 1>&6
-echo "configure:7645: checking for --enable-tipdlg" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-tipdlg""... $ac_c" 1>&6
+echo "configure:7813: checking for --${enablestring:-enable}-tipdlg" >&5
           no_cache=0
           # Check whether --enable-tipdlg or --disable-tipdlg was given.
 if test "${enable_tipdlg+set}" = set; then
@@ -7679,8 +7847,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-progressdlg""... $ac_c" 1>&6
-echo "configure:7684: checking for --enable-progressdlg" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-progressdlg""... $ac_c" 1>&6
+echo "configure:7853: checking for --${enablestring:-enable}-progressdlg" >&5
           no_cache=0
           # Check whether --enable-progressdlg or --disable-progressdlg was given.
 if test "${enable_progressdlg+set}" = set; then
@@ -7718,8 +7887,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-wizarddlg""... $ac_c" 1>&6
-echo "configure:7723: checking for --enable-wizarddlg" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-wizarddlg""... $ac_c" 1>&6
+echo "configure:7893: checking for --${enablestring:-enable}-wizarddlg" >&5
           no_cache=0
           # Check whether --enable-wizarddlg or --disable-wizarddlg was given.
 if test "${enable_wizarddlg+set}" = set; then
@@ -7759,8 +7929,9 @@ fi
 
 
 
-          echo $ac_n "checking for --enable-menus""... $ac_c" 1>&6
-echo "configure:7764: checking for --enable-menus" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-menus""... $ac_c" 1>&6
+echo "configure:7935: checking for --${enablestring:-enable}-menus" >&5
           no_cache=0
           # Check whether --enable-menus or --disable-menus was given.
 if test "${enable_menus+set}" = set; then
@@ -7798,8 +7969,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-miniframe""... $ac_c" 1>&6
-echo "configure:7803: checking for --enable-miniframe" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-miniframe""... $ac_c" 1>&6
+echo "configure:7975: checking for --${enablestring:-enable}-miniframe" >&5
           no_cache=0
           # Check whether --enable-miniframe or --disable-miniframe was given.
 if test "${enable_miniframe+set}" = set; then
@@ -7837,8 +8009,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-tooltips""... $ac_c" 1>&6
-echo "configure:7842: checking for --enable-tooltips" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-tooltips""... $ac_c" 1>&6
+echo "configure:8015: checking for --${enablestring:-enable}-tooltips" >&5
           no_cache=0
           # Check whether --enable-tooltips or --disable-tooltips was given.
 if test "${enable_tooltips+set}" = set; then
@@ -7876,8 +8049,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-splines""... $ac_c" 1>&6
-echo "configure:7881: checking for --enable-splines" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-splines""... $ac_c" 1>&6
+echo "configure:8055: checking for --${enablestring:-enable}-splines" >&5
           no_cache=0
           # Check whether --enable-splines or --disable-splines was given.
 if test "${enable_splines+set}" = set; then
@@ -7915,8 +8089,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-validators""... $ac_c" 1>&6
-echo "configure:7920: checking for --enable-validators" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-validators""... $ac_c" 1>&6
+echo "configure:8095: checking for --${enablestring:-enable}-validators" >&5
           no_cache=0
           # Check whether --enable-validators or --disable-validators was given.
 if test "${enable_validators+set}" = set; then
@@ -7954,8 +8129,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-busyinfo""... $ac_c" 1>&6
-echo "configure:7959: checking for --enable-busyinfo" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-busyinfo""... $ac_c" 1>&6
+echo "configure:8135: checking for --${enablestring:-enable}-busyinfo" >&5
           no_cache=0
           # Check whether --enable-busyinfo or --disable-busyinfo was given.
 if test "${enable_busyinfo+set}" = set; then
@@ -7993,8 +8169,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-joystick""... $ac_c" 1>&6
-echo "configure:7998: checking for --enable-joystick" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-joystick""... $ac_c" 1>&6
+echo "configure:8175: checking for --${enablestring:-enable}-joystick" >&5
           no_cache=0
           # Check whether --enable-joystick or --disable-joystick was given.
 if test "${enable_joystick+set}" = set; then
@@ -8032,8 +8209,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-metafile""... $ac_c" 1>&6
-echo "configure:8037: checking for --enable-metafile" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-metafile""... $ac_c" 1>&6
+echo "configure:8215: checking for --${enablestring:-enable}-metafile" >&5
           no_cache=0
           # Check whether --enable-metafile or --disable-metafile was given.
 if test "${enable_metafile+set}" = set; then
@@ -8071,8 +8249,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-dragimage""... $ac_c" 1>&6
-echo "configure:8076: checking for --enable-dragimage" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-dragimage""... $ac_c" 1>&6
+echo "configure:8255: checking for --${enablestring:-enable}-dragimage" >&5
           no_cache=0
           # Check whether --enable-dragimage or --disable-dragimage was given.
 if test "${enable_dragimage+set}" = set; then
@@ -8112,8 +8291,9 @@ fi
 
 
 
-          echo $ac_n "checking for --enable-palette""... $ac_c" 1>&6
-echo "configure:8117: checking for --enable-palette" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-palette""... $ac_c" 1>&6
+echo "configure:8297: checking for --${enablestring:-enable}-palette" >&5
           no_cache=0
           # Check whether --enable-palette or --disable-palette was given.
 if test "${enable_palette+set}" = set; then
@@ -8151,8 +8331,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-image""... $ac_c" 1>&6
-echo "configure:8156: checking for --enable-image" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-image""... $ac_c" 1>&6
+echo "configure:8337: checking for --${enablestring:-enable}-image" >&5
           no_cache=0
           # Check whether --enable-image or --disable-image was given.
 if test "${enable_image+set}" = set; then
@@ -8190,8 +8371,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-gif""... $ac_c" 1>&6
-echo "configure:8195: checking for --enable-gif" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-gif""... $ac_c" 1>&6
+echo "configure:8377: checking for --${enablestring:-enable}-gif" >&5
           no_cache=0
           # Check whether --enable-gif or --disable-gif was given.
 if test "${enable_gif+set}" = set; then
@@ -8229,8 +8411,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-pcx""... $ac_c" 1>&6
-echo "configure:8234: checking for --enable-pcx" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-pcx""... $ac_c" 1>&6
+echo "configure:8417: checking for --${enablestring:-enable}-pcx" >&5
           no_cache=0
           # Check whether --enable-pcx or --disable-pcx was given.
 if test "${enable_pcx+set}" = set; then
@@ -8268,8 +8451,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-iff""... $ac_c" 1>&6
-echo "configure:8273: checking for --enable-iff" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-iff""... $ac_c" 1>&6
+echo "configure:8457: checking for --${enablestring:-enable}-iff" >&5
           no_cache=0
           # Check whether --enable-iff or --disable-iff was given.
 if test "${enable_iff+set}" = set; then
@@ -8307,8 +8491,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-pnm""... $ac_c" 1>&6
-echo "configure:8312: checking for --enable-pnm" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-pnm""... $ac_c" 1>&6
+echo "configure:8497: checking for --${enablestring:-enable}-pnm" >&5
           no_cache=0
           # Check whether --enable-pnm or --disable-pnm was given.
 if test "${enable_pnm+set}" = set; then
@@ -8346,8 +8531,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-xpm""... $ac_c" 1>&6
-echo "configure:8351: checking for --enable-xpm" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-xpm""... $ac_c" 1>&6
+echo "configure:8537: checking for --${enablestring:-enable}-xpm" >&5
           no_cache=0
           # Check whether --enable-xpm or --disable-xpm was given.
 if test "${enable_xpm+set}" = set; then
@@ -8385,8 +8571,9 @@ fi
           fi
         
 
-          echo $ac_n "checking for --enable-ico_cur""... $ac_c" 1>&6
-echo "configure:8390: checking for --enable-ico_cur" >&5
+	  enablestring=
+          echo $ac_n "checking for --${enablestring:-enable}-ico_cur""... $ac_c" 1>&6
+echo "configure:8577: checking for --${enablestring:-enable}-ico_cur" >&5
           no_cache=0
           # Check whether --enable-ico_cur or --disable-ico_cur was given.
 if test "${enable_ico_cur+set}" = set; then
@@ -8428,7 +8615,8 @@ fi
 
 case "${host}" in
   *-pc-os2_emx | *-pc-os2-emx )
-        LEX_STEM="lexyy"
+    PATH_IFS=';'
+    LEX_STEM="lexyy"
   ;;
   *)
     PATH_IFS=':'
@@ -8444,7 +8632,14 @@ esac
 
 
 echo $ac_n "checking for toolkit""... $ac_c" 1>&6
-echo "configure:8448: checking for toolkit" >&5
+echo "configure:8636: checking for toolkit" >&5
+
+# In Wine, we need to default to MSW, not GTK or MOTIF
+if test "$wxUSE_WINE" = "yes"; then
+    DEFAULT_DEFAULT_wxUSE_GTK=0
+    DEFAULT_DEFAULT_wxUSE_MOTIF=0
+    DEFAULT_DEFAULT_wxUSE_MSW=1
+fi
 
 if test "$wxUSE_GUI" = "yes"; then
 
@@ -8469,8 +8664,9 @@ if test "$wxUSE_GUI" = "yes"; then
       done
     fi
 
-            NUM_TOOLKITS=`expr ${wxUSE_GTK:-0} + ${wxUSE_MOTIF:-0} + ${wxUSE_MAC:-0}  \
-                  + ${wxUSE_WINE:-0} + ${wxUSE_MSW:-0} + ${wxUSE_MGL:-0} + ${wxUSE_MICROWIN:-0} + ${wxUSE_X11:-0}`
+            NUM_TOOLKITS=`expr ${wxUSE_COCOA:-0} + ${wxUSE_GTK:-0} + ${wxUSE_MAC:-0} \
+                  + ${wxUSE_MGL:-0} + ${wxUSE_MICROWIN:-0} \
+                  + ${wxUSE_MOTIF:-0} + ${wxUSE_MSW:-0} + ${wxUSE_X11:-0}`
 
         case "${host}" in
       *-pc-os2_emx | *-pc-os2-emx )
@@ -8481,10 +8677,10 @@ if test "$wxUSE_GUI" = "yes"; then
       1)
       ;;
       0)
-        { echo "configure: error: Please specify a toolkit - cannot determine the default for ${host}" 1>&2; exit 1; }
+        { echo "configure: error: Please specify a toolkit -- cannot determine the default for ${host}" 1>&2; exit 1; }
       ;;
       *)
-        { echo "configure: error: Please specify at most one toolkit (may be some are cached?)" 1>&2; exit 1; }
+        { echo "configure: error: Please specify at most one toolkit (maybe some are cached in configarg.cache?)" 1>&2; exit 1; }
     esac
 
         for toolkit in `echo $ALL_TOOLKITS`; do
@@ -8506,6 +8702,69 @@ else
     echo "$ac_t""base ($host_alias hosted) only" 1>&6
 fi
 
+wants_win32=0
+doesnt_want_win32=0
+case "${host}" in
+  *-*-cygwin*)
+      if test "$wxUSE_MSW" = 1 ; then
+        wants_win32=1
+      else
+        doesnt_want_win32=1
+      fi
+  ;;
+  *-*-mingw*)
+      wants_win32=1
+  ;;
+esac
+
+if test "$wxUSE_WINE" = "yes"; then
+    wants_win32=1
+        CC=winegcc
+    CXX=wineg++
+    RESCOMP=wrc
+fi
+
+if test "$wants_win32" = 1 ; then
+    USE_UNIX=0
+    USE_WIN32=1
+    cat >> confdefs.h <<\EOF
+#define __WIN32__ 1
+EOF
+
+    cat >> confdefs.h <<\EOF
+#define __WIN95__ 1
+EOF
+
+    cat >> confdefs.h <<\EOF
+#define __WINDOWS__ 1
+EOF
+
+    cat >> confdefs.h <<\EOF
+#define __GNUWIN32__ 1
+EOF
+
+    cat >> confdefs.h <<\EOF
+#define STRICT 1
+EOF
+
+    cat >> confdefs.h <<\EOF
+#define WINVER 0x0400
+EOF
+
+fi
+if test "$doesnt_want_win32" = 1 ; then
+    USE_UNIX=1
+    USE_WIN32=0
+fi
+
+if test "$USE_UNIX" = 1 ; then
+    wxUSE_UNIX=yes
+    cat >> confdefs.h <<\EOF
+#define __UNIX__ 1
+EOF
+
+fi
+
 
 cat > confcache <<\EOF
 # This file is a shell script that caches the results of configure
@@ -8575,7 +8834,7 @@ CFLAGS=${CFLAGS:=}
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:8579: checking for $ac_word" >&5
+echo "configure:8838: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -8605,7 +8864,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:8609: checking for $ac_word" >&5
+echo "configure:8868: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -8656,7 +8915,7 @@ fi
       # Extract the first word of "cl", so it can be a program name with args.
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:8660: checking for $ac_word" >&5
+echo "configure:8919: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -8688,7 +8947,7 @@ fi
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:8692: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:8951: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -8699,12 +8958,12 @@ cross_compiling=$ac_cv_prog_cc_cross
 
 cat > conftest.$ac_ext << EOF
 
-#line 8703 "configure"
+#line 8962 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:8708: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8967: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -8730,12 +8989,12 @@ if test $ac_cv_prog_cc_works = no; then
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:8734: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:8993: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:8739: checking whether we are using GNU C" >&5
+echo "configure:8998: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -8744,7 +9003,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:8748: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:9007: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -8763,7 +9022,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:8767: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:9026: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -8796,7 +9055,7 @@ fi
 
 
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:8800: checking how to run the C preprocessor" >&5
+echo "configure:9059: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
@@ -8811,13 +9070,13 @@ else
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 8815 "configure"
+#line 9074 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8821: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9080: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -8828,13 +9087,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 8832 "configure"
+#line 9091 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8838: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9097: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -8845,13 +9104,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -nologo -E"
   cat > conftest.$ac_ext <<EOF
-#line 8849 "configure"
+#line 9108 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8855: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9114: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -8877,13 +9136,13 @@ echo "$ac_t""$CPP" 1>&6
 
 if test $ac_cv_prog_gcc = yes; then
     echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6
-echo "configure:8881: checking whether ${CC-cc} needs -traditional" >&5
+echo "configure:9140: checking whether ${CC-cc} needs -traditional" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
     ac_pattern="Autoconf.*'x'"
   cat > conftest.$ac_ext <<EOF
-#line 8887 "configure"
+#line 9146 "configure"
 #include "confdefs.h"
 #include <sgtty.h>
 Autoconf TIOCGETP
@@ -8901,7 +9160,7 @@ rm -f conftest*
 
   if test $ac_cv_prog_gcc_traditional = no; then
     cat > conftest.$ac_ext <<EOF
-#line 8905 "configure"
+#line 9164 "configure"
 #include "confdefs.h"
 #include <termio.h>
 Autoconf TCGETA
@@ -8938,7 +9197,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:8942: checking for $ac_word" >&5
+echo "configure:9201: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -8970,7 +9229,7 @@ test -n "$CXX" || CXX="gcc"
 
 
 echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:8974: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
+echo "configure:9233: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
 
 ac_ext=C
 # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -8981,12 +9240,12 @@ cross_compiling=$ac_cv_prog_cxx_cross
 
 cat > conftest.$ac_ext << EOF
 
-#line 8985 "configure"
+#line 9244 "configure"
 #include "confdefs.h"
 
 int main(){return(0);}
 EOF
-if { (eval echo configure:8990: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9249: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cxx_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -9012,12 +9271,12 @@ if test $ac_cv_prog_cxx_works = no; then
   { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:9016: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:9275: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
 cross_compiling=$ac_cv_prog_cxx_cross
 
 echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
-echo "configure:9021: checking whether we are using GNU C++" >&5
+echo "configure:9280: checking whether we are using GNU C++" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -9026,7 +9285,7 @@ else
   yes;
 #endif
 EOF
-if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:9030: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:9289: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gxx=yes
 else
   ac_cv_prog_gxx=no
@@ -9045,7 +9304,7 @@ ac_test_CXXFLAGS="${CXXFLAGS+set}"
 ac_save_CXXFLAGS="$CXXFLAGS"
 CXXFLAGS=
 echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
-echo "configure:9049: checking whether ${CXX-g++} accepts -g" >&5
+echo "configure:9308: checking whether ${CXX-g++} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -9088,7 +9347,7 @@ cross_compiling=$ac_cv_prog_cc_cross
 # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:9092: checking for $ac_word" >&5
+echo "configure:9351: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -9119,7 +9378,7 @@ fi
 # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:9123: checking for $ac_word" >&5
+echo "configure:9382: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -9159,7 +9418,7 @@ fi
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:9163: checking for a BSD compatible install" >&5
+echo "configure:9422: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -9215,10 +9474,21 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 case ${INSTALL} in
   /* ) # Absolute
      ;;
-  *)     
+  ?:* ) # Drive letter, considered as absolute.
+     ;;
+  *)
      INSTALL=`pwd`/${INSTALL} ;;
 esac
 
+case ${host} in
+    *-hp-hpux* )
+        INSTALL_DIR="mkdir"
+        ;;
+
+    *)  INSTALL_DIR="$INSTALL -d"
+        ;;
+esac
+
 
 case "${host}" in
 
@@ -9233,7 +9503,7 @@ esac
 # Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:9237: checking for $ac_word" >&5
+echo "configure:9507: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -9262,7 +9532,7 @@ fi
 
 
 echo $ac_n "checking if make is GNU make""... $ac_c" 1>&6
-echo "configure:9266: checking if make is GNU make" >&5
+echo "configure:9536: checking if make is GNU make" >&5
 if eval "test \"`echo '$''{'wx_cv_prog_makeisgnu'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -9288,7 +9558,7 @@ fi
 
 if test "x$wx_cv_prog_makeisgnu" != "xyes"; then
 echo $ac_n "checking if make supports VPATH""... $ac_c" 1>&6
-echo "configure:9292: checking if make supports VPATH" >&5
+echo "configure:9562: checking if make supports VPATH" >&5
 if eval "test \"`echo '$''{'wx_cv_prog_makevpath'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -9335,7 +9605,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:9339: checking for $ac_word" >&5
+echo "configure:9609: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -9369,7 +9639,7 @@ test -n "$YACC" || YACC="yacc"
 # Extract the first word of "flex", so it can be a program name with args.
 set dummy flex; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:9373: checking for $ac_word" >&5
+echo "configure:9643: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -9403,7 +9673,7 @@ then
   *) ac_lib=l ;;
   esac
   echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6
-echo "configure:9407: checking for yywrap in -l$ac_lib" >&5
+echo "configure:9677: checking for yywrap in -l$ac_lib" >&5
 ac_lib_var=`echo $ac_lib'_'yywrap | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -9411,7 +9681,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-l$ac_lib  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 9415 "configure"
+#line 9685 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -9422,7 +9692,7 @@ int main() {
 yywrap()
 ; return 0; }
 EOF
-if { (eval echo configure:9426: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9696: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -9446,7 +9716,7 @@ fi
 
 
 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:9450: checking whether ln -s works" >&5
+echo "configure:9720: checking whether ln -s works" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -9467,23 +9737,73 @@ else
 fi
 
 
+case "${host}" in
+  *-pc-os2_emx | *-pc-os2-emx )
+            LIBS="$LIBS -lstdcpp"
+      if test "$wxUSE_MOTIF" = 1 -o "$wxUSE_GTK" = 1 -o "$wxUSE_X11" = 1; then
+                              echo $ac_n "checking for drand48 in -lcExt""... $ac_c" 1>&6
+echo "configure:9746: checking for drand48 in -lcExt" >&5
+ac_lib_var=`echo cExt'_'drand48 | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-lcExt  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 9754 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char drand48();
+
+int main() {
+drand48()
+; return 0; }
+EOF
+if { (eval echo configure:9765: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  LIBS="$LIBS -lcExt"
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+      else
+                    RESPROGRAMOBJ="\${top_srcdir}/include/wx/os2/wx.res"
+      fi
+  ;;
+esac
+
 
-if test "$wxUSE_MAC" != 1; then
+if test "$wxUSE_MAC" != 1 -a "$wxUSE_COCOA" != 1; then
     for ac_hdr in strings.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:9477: checking for $ac_hdr" >&5
+echo "configure:9797: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 9482 "configure"
+#line 9802 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9487: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9807: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -9515,17 +9835,17 @@ for ac_hdr in stdlib.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:9519: checking for $ac_hdr" >&5
+echo "configure:9839: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 9524 "configure"
+#line 9844 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9529: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9849: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -9555,17 +9875,17 @@ for ac_hdr in malloc.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:9559: checking for $ac_hdr" >&5
+echo "configure:9879: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 9564 "configure"
+#line 9884 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9569: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9889: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -9595,17 +9915,17 @@ for ac_hdr in unistd.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:9599: checking for $ac_hdr" >&5
+echo "configure:9919: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 9604 "configure"
+#line 9924 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9609: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9929: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -9635,17 +9955,17 @@ for ac_hdr in wchar.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:9639: checking for $ac_hdr" >&5
+echo "configure:9959: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 9644 "configure"
+#line 9964 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9649: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9969: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -9677,17 +9997,17 @@ if test "$ac_cv_header_wchar_h" != "yes"; then
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:9681: checking for $ac_hdr" >&5
+echo "configure:10001: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 9686 "configure"
+#line 10006 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9691: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10011: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -9715,22 +10035,21 @@ done
 
 fi
 
-
 for ac_hdr in fnmatch.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:9724: checking for $ac_hdr" >&5
+echo "configure:10043: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 9729 "configure"
+#line 10048 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9734: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10053: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -9761,12 +10080,12 @@ if test "x$ac_cv_header_fnmatch_h" = "xyes"; then
     for ac_func in fnmatch
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:9765: checking for $ac_func" >&5
+echo "configure:10084: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 9770 "configure"
+#line 10089 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -9789,7 +10108,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:9793: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10112: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -9819,17 +10138,17 @@ for ac_hdr in langinfo.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:9823: checking for $ac_hdr" >&5
+echo "configure:10142: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 9828 "configure"
+#line 10147 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9833: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10152: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -9856,23 +10175,31 @@ fi
 done
 
 
+case "${host}" in
+  *-pc-os2_emx | *-pc-os2-emx )
+            if test $ac_cv_header_langinfo_h = "yes"; then
+          LIBS="$LIBS -lintl"
+      fi
+  ;;
+esac
+
 if test "$wxUSE_GUI" = "yes"; then
     if test "$wxUSE_UNIX" = "yes"; then
                 for ac_hdr in X11/XKBlib.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:9866: checking for $ac_hdr" >&5
+echo "configure:10193: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 9871 "configure"
+#line 10198 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9876: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10203: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -9903,12 +10230,12 @@ fi
 
 
 echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:9907: checking for working const" >&5
+echo "configure:10234: checking for working const" >&5
 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 9912 "configure"
+#line 10239 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -9957,7 +10284,7 @@ ccp = (char const *const *) p;
 
 ; return 0; }
 EOF
-if { (eval echo configure:9961: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10288: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_const=yes
 else
@@ -9978,21 +10305,21 @@ EOF
 fi
 
 echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:9982: checking for inline" >&5
+echo "configure:10309: checking for inline" >&5
 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat > conftest.$ac_ext <<EOF
-#line 9989 "configure"
+#line 10316 "configure"
 #include "confdefs.h"
 
 int main() {
 } $ac_kw foo() {
 ; return 0; }
 EOF
-if { (eval echo configure:9996: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10323: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_inline=$ac_kw; break
 else
@@ -10019,7 +10346,7 @@ esac
 
 
 echo $ac_n "checking size of char""... $ac_c" 1>&6
-echo "configure:10023: checking size of char" >&5
+echo "configure:10350: checking size of char" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_char'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -10027,7 +10354,7 @@ else
   ac_cv_sizeof_char=1
 else
   cat > conftest.$ac_ext <<EOF
-#line 10031 "configure"
+#line 10358 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -10038,7 +10365,7 @@ main()
   exit(0);
 }
 EOF
-if { (eval echo configure:10042: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:10369: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_char=`cat conftestval`
 else
@@ -10058,7 +10385,7 @@ EOF
 
 
 echo $ac_n "checking size of short""... $ac_c" 1>&6
-echo "configure:10062: checking size of short" >&5
+echo "configure:10389: checking size of short" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -10066,7 +10393,7 @@ else
   ac_cv_sizeof_short=2
 else
   cat > conftest.$ac_ext <<EOF
-#line 10070 "configure"
+#line 10397 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -10077,7 +10404,7 @@ main()
   exit(0);
 }
 EOF
-if { (eval echo configure:10081: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:10408: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_short=`cat conftestval`
 else
@@ -10097,7 +10424,7 @@ EOF
 
 
 echo $ac_n "checking size of void *""... $ac_c" 1>&6
-echo "configure:10101: checking size of void *" >&5
+echo "configure:10428: checking size of void *" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_void_p'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -10105,7 +10432,7 @@ else
   ac_cv_sizeof_void_p=4
 else
   cat > conftest.$ac_ext <<EOF
-#line 10109 "configure"
+#line 10436 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -10116,7 +10443,7 @@ main()
   exit(0);
 }
 EOF
-if { (eval echo configure:10120: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:10447: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_void_p=`cat conftestval`
 else
@@ -10136,7 +10463,7 @@ EOF
 
 
 echo $ac_n "checking size of int""... $ac_c" 1>&6
-echo "configure:10140: checking size of int" >&5
+echo "configure:10467: checking size of int" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -10144,7 +10471,7 @@ else
   ac_cv_sizeof_int=4
 else
   cat > conftest.$ac_ext <<EOF
-#line 10148 "configure"
+#line 10475 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -10155,7 +10482,7 @@ main()
   exit(0);
 }
 EOF
-if { (eval echo configure:10159: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:10486: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_int=`cat conftestval`
 else
@@ -10175,7 +10502,7 @@ EOF
 
 
 echo $ac_n "checking size of long""... $ac_c" 1>&6
-echo "configure:10179: checking size of long" >&5
+echo "configure:10506: checking size of long" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -10183,7 +10510,7 @@ else
   ac_cv_sizeof_long=4
 else
   cat > conftest.$ac_ext <<EOF
-#line 10187 "configure"
+#line 10514 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -10194,7 +10521,7 @@ main()
   exit(0);
 }
 EOF
-if { (eval echo configure:10198: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:10525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_long=`cat conftestval`
 else
@@ -10217,7 +10544,7 @@ EOF
 case "${host}" in
     arm-*-linux* )
         echo $ac_n "checking size of long long""... $ac_c" 1>&6
-echo "configure:10221: checking size of long long" >&5
+echo "configure:10548: checking size of long long" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -10225,7 +10552,7 @@ else
   ac_cv_sizeof_long_long=8
 else
   cat > conftest.$ac_ext <<EOF
-#line 10229 "configure"
+#line 10556 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -10236,7 +10563,7 @@ main()
   exit(0);
 }
 EOF
-if { (eval echo configure:10240: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:10567: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_long_long=`cat conftestval`
 else
@@ -10255,10 +10582,54 @@ cat >> confdefs.h <<EOF
 EOF
 
 
+    ;;
+    *-hp-hpux* )
+        echo $ac_n "checking size of long long""... $ac_c" 1>&6
+echo "configure:10589: checking size of long long" >&5
+if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test "$cross_compiling" = yes; then
+  ac_cv_sizeof_long_long=0
+else
+  cat > conftest.$ac_ext <<EOF
+#line 10597 "configure"
+#include "confdefs.h"
+#include <stdio.h>
+main()
+{
+  FILE *f=fopen("conftestval", "w");
+  if (!f) exit(1);
+  fprintf(f, "%d\n", sizeof(long long));
+  exit(0);
+}
+EOF
+if { (eval echo configure:10608: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  ac_cv_sizeof_long_long=`cat conftestval`
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  ac_cv_sizeof_long_long=0
+fi
+rm -fr conftest*
+fi
+
+fi
+echo "$ac_t""$ac_cv_sizeof_long_long" 1>&6
+cat >> confdefs.h <<EOF
+#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long
+EOF
+
+
+        if test "$ac_cv_sizeof_long_long" != "0"; then
+                        CPPFLAGS="$CPPFLAGS -D_INCLUDE_LONGLONG"
+        fi
     ;;
     * )
         echo $ac_n "checking size of long long""... $ac_c" 1>&6
-echo "configure:10262: checking size of long long" >&5
+echo "configure:10633: checking size of long long" >&5
 if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -10266,7 +10637,7 @@ else
   ac_cv_sizeof_long_long=0
 else
   cat > conftest.$ac_ext <<EOF
-#line 10270 "configure"
+#line 10641 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -10277,7 +10648,7 @@ main()
   exit(0);
 }
 EOF
-if { (eval echo configure:10281: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:10652: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_sizeof_long_long=`cat conftestval`
 else
@@ -10299,19 +10670,32 @@ EOF
 esac
 
 echo $ac_n "checking size of wchar_t""... $ac_c" 1>&6
-echo "configure:10303: checking size of wchar_t" >&5
+echo "configure:10674: checking size of wchar_t" >&5
 if eval "test \"`echo '$''{'wx_cv_sizeof_wchar_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
     if test "$cross_compiling" = yes; then
-  wx_cv_sizeof_wchar_t=4
+  
+            case "${host}" in
+              *-pc-msdosdjgpp )
+                wx_cv_sizeof_wchar_t=0
+                ;;
+              * )
+                wx_cv_sizeof_wchar_t=4
+                ;;
+            esac
+        
     
 else
   cat > conftest.$ac_ext <<EOF
-#line 10313 "configure"
+#line 10693 "configure"
 #include "confdefs.h"
 
+            /* DJGPP only has fake wchar_t: */
+            #ifdef __DJGPP__
+            #  error "fake wchar_t"
+            #endif
             #ifdef HAVE_WCHAR_H
             #  ifdef __CYGWIN__
             #    include <stddef.h>
@@ -10331,7 +10715,7 @@ else
             }
         
 EOF
-if { (eval echo configure:10335: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:10719: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   wx_cv_sizeof_wchar_t=`cat conftestval`
 else
@@ -10363,13 +10747,13 @@ if test "$enable_largefile" != no; then
             wx_largefile=no
     
     echo $ac_n "checking for _FILE_OFFSET_BITS value needed for large files""... $ac_c" 1>&6
-echo "configure:10367: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+echo "configure:10751: checking for _FILE_OFFSET_BITS value needed for large files" >&5
 if eval "test \"`echo '$''{'ac_cv_sys_file_offset_bits'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
           cat > conftest.$ac_ext <<EOF
-#line 10373 "configure"
+#line 10757 "configure"
 #include "confdefs.h"
 #define _FILE_OFFSET_BITS 64
                           #include <sys/types.h>
@@ -10380,7 +10764,7 @@ typedef struct {
 
 ; return 0; }
 EOF
-if { (eval echo configure:10384: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10768: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_sys_file_offset_bits=64
 else
@@ -10407,13 +10791,13 @@ EOF
     if test "x$wx_largefile" != "xyes"; then
         
     echo $ac_n "checking for _LARGE_FILES value needed for large files""... $ac_c" 1>&6
-echo "configure:10411: checking for _LARGE_FILES value needed for large files" >&5
+echo "configure:10795: checking for _LARGE_FILES value needed for large files" >&5
 if eval "test \"`echo '$''{'ac_cv_sys_large_files'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
           cat > conftest.$ac_ext <<EOF
-#line 10417 "configure"
+#line 10801 "configure"
 #include "confdefs.h"
 #define _LARGE_FILES 1
                           #include <sys/types.h>
@@ -10424,7 +10808,7 @@ typedef struct {
 
 ; return 0; }
 EOF
-if { (eval echo configure:10428: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10812: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_sys_large_files=1
 else
@@ -10451,7 +10835,7 @@ EOF
     fi
 
     echo $ac_n "checking if large file support is available""... $ac_c" 1>&6
-echo "configure:10455: checking if large file support is available" >&5
+echo "configure:10839: checking if large file support is available" >&5
     if test "x$wx_largefile" = "xyes"; then
         cat >> confdefs.h <<\EOF
 #define HAVE_LARGEFILE_SUPPORT 1
@@ -10462,15 +10846,24 @@ EOF
 fi
 
 
+if test "x$wx_largefile" = "xyes"; then
+    if test "x$ac_cv_sys_file_offset_bits" = "x64"; then
+        WX_LARGEFILE_FLAGS="-D_FILE_OFFSET_BITS=64 -D_LARGE_FILES"
+    else
+        WX_LARGEFILE_FLAGS="-D_LARGE_FILES"
+    fi
+    CPPFLAGS="$CPPFLAGS $WX_LARGEFILE_FLAGS"
+fi
+
 echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
-echo "configure:10467: checking whether byte ordering is bigendian" >&5
+echo "configure:10860: checking whether byte ordering is bigendian" >&5
 if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_cv_c_bigendian=unknown
 # See if sys/param.h defines the BYTE_ORDER macro.
 cat > conftest.$ac_ext <<EOF
-#line 10474 "configure"
+#line 10867 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/param.h>
@@ -10481,11 +10874,11 @@ int main() {
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:10485: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10878: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   # It does; now see whether it defined to BIG_ENDIAN or not.
 cat > conftest.$ac_ext <<EOF
-#line 10489 "configure"
+#line 10882 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/param.h>
@@ -10496,7 +10889,7 @@ int main() {
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:10500: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10893: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_bigendian=yes
 else
@@ -10516,7 +10909,7 @@ if test "$cross_compiling" = yes; then
   ac_cv_c_bigendian=unknown
 else
   cat > conftest.$ac_ext <<EOF
-#line 10520 "configure"
+#line 10913 "configure"
 #include "confdefs.h"
 main () {
   /* Are we little or big endian?  From Harbison&Steele.  */
@@ -10529,7 +10922,7 @@ main () {
   exit (u.c[sizeof (long) - 1] == 1);
 }
 EOF
-if { (eval echo configure:10533: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:10926: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_c_bigendian=no
 else
@@ -10557,7 +10950,7 @@ fi
 
 
 echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6
-echo "configure:10561: checking how to run the C++ preprocessor" >&5
+echo "configure:10954: checking how to run the C++ preprocessor" >&5
 if test -z "$CXXCPP"; then
 if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -10570,12 +10963,12 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes
 cross_compiling=$ac_cv_prog_cxx_cross
   CXXCPP="${CXX-g++} -E"
   cat > conftest.$ac_ext <<EOF
-#line 10574 "configure"
+#line 10967 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10579: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10972: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -10619,17 +11012,17 @@ cross_compiling=$ac_cv_prog_cxx_cross
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:10623: checking for $ac_hdr" >&5
+echo "configure:11016: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 10628 "configure"
+#line 11021 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10633: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11026: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -10677,7 +11070,7 @@ cross_compiling=$ac_cv_prog_cc_cross
 
 
   echo $ac_n "checking if C++ compiler supports bool""... $ac_c" 1>&6
-echo "configure:10681: checking if C++ compiler supports bool" >&5
+echo "configure:11074: checking if C++ compiler supports bool" >&5
 if eval "test \"`echo '$''{'wx_cv_cpp_bool'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -10692,7 +11085,7 @@ cross_compiling=$ac_cv_prog_cxx_cross
 
 
     cat > conftest.$ac_ext <<EOF
-#line 10696 "configure"
+#line 11089 "configure"
 #include "confdefs.h"
 
       
@@ -10704,7 +11097,7 @@ int main() {
       
 ; return 0; }
 EOF
-if { (eval echo configure:10708: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11101: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
         wx_cv_cpp_bool=yes
@@ -10741,6 +11134,142 @@ EOF
 
 
 
+  echo $ac_n "checking if C++ compiler supports the explicit keyword""... $ac_c" 1>&6
+echo "configure:11139: checking if C++ compiler supports the explicit keyword" >&5
+if eval "test \"`echo '$''{'wx_cv_explicit'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  
+    
+    ac_ext=C
+# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cxx_cross
+
+
+            cat > conftest.$ac_ext <<EOF
+#line 11154 "configure"
+#include "confdefs.h"
+
+        class Foo { public: explicit Foo(int) {} };
+      
+int main() {
+
+        return 0;
+      
+; return 0; }
+EOF
+if { (eval echo configure:11165: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  
+        cat > conftest.$ac_ext <<EOF
+#line 11169 "configure"
+#include "confdefs.h"
+
+                class Foo { public: explicit Foo(int) {} };
+                static void TakeFoo(const Foo& foo) { }
+            
+int main() {
+
+                TakeFoo(17);
+                return 0;
+            
+; return 0; }
+EOF
+if { (eval echo configure:11182: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  wx_cv_explicit=no
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  wx_cv_explicit=yes
+        
+fi
+rm -f conftest*
+      
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  wx_cv_explicit=no
+    
+fi
+rm -f conftest*
+
+    ac_ext=c
+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cc_cross
+
+  
+fi
+
+echo "$ac_t""$wx_cv_explicit" 1>&6
+
+  if test "$wx_cv_explicit" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define HAVE_EXPLICIT 1
+EOF
+
+  fi
+
+
+echo $ac_n "checking whether the compiler supports const_cast<>""... $ac_c" 1>&6
+echo "configure:11224: checking whether the compiler supports const_cast<>" >&5
+if eval "test \"`echo '$''{'ac_cv_cxx_const_cast'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  
+ ac_ext=C
+# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cxx_cross
+
+ cat > conftest.$ac_ext <<EOF
+#line 11237 "configure"
+#include "confdefs.h"
+
+int main() {
+int x = 0;const int& y = x;int& z = const_cast<int&>(y);return z;
+; return 0; }
+EOF
+if { (eval echo configure:11244: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  ac_cv_cxx_const_cast=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ac_cv_cxx_const_cast=no
+fi
+rm -f conftest*
+ ac_ext=c
+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cc_cross
+
+
+fi
+
+echo "$ac_t""$ac_cv_cxx_const_cast" 1>&6
+if test "$ac_cv_cxx_const_cast" = yes; then
+  cat >> confdefs.h <<\EOF
+#define HAVE_CONST_CAST 
+EOF
+
+fi
+
+
+
 SEARCH_INCLUDE="\
     /usr/local/include        \
                               \
@@ -10804,9 +11333,7 @@ SEARCH_INCLUDE="\
     /usr/local/x11r5/include  \
     /usr/lpp/Xamples/include  \
                               \
-    /usr/openwin/share/include \
-                               \
-    /usr/include"
+    /usr/openwin/share/include"
 
 SEARCH_LIB="`echo "$SEARCH_INCLUDE" | sed s/include/lib/g` "
 
@@ -10861,13 +11388,13 @@ rm -f confcache
 
 if test "$USE_LINUX" = 1; then
     echo $ac_n "checking for glibc 2.1 or later""... $ac_c" 1>&6
-echo "configure:10865: checking for glibc 2.1 or later" >&5
+echo "configure:11392: checking for glibc 2.1 or later" >&5
 if eval "test \"`echo '$''{'wx_cv_lib_glibc21'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
         cat > conftest.$ac_ext <<EOF
-#line 10871 "configure"
+#line 11398 "configure"
 #include "confdefs.h"
 #include <features.h>
 int main() {
@@ -10878,7 +11405,7 @@ int main() {
             
 ; return 0; }
 EOF
-if { (eval echo configure:10882: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11409: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
                 wx_cv_lib_glibc21=yes
@@ -10905,6 +11432,15 @@ EOF
     fi
 fi
 
+if test "x$wx_cv_lib_glibc21" = "xyes"; then
+    if test "$wxUSE_UNICODE" = "yes" -o "$wxUSE_THREADS" = "yes"; then
+        cat >> confdefs.h <<\EOF
+#define _GNU_SOURCE 1
+EOF
+
+    fi
+fi
+
 
 
 REGEX_INCLUDE=
@@ -10917,17 +11453,17 @@ EOF
     if test "$wxUSE_REGEX" = "sys" -o "$wxUSE_REGEX" = "yes" ; then
                         ac_safe=`echo "regex.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for regex.h""... $ac_c" 1>&6
-echo "configure:10921: checking for regex.h" >&5
+echo "configure:11457: checking for regex.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 10926 "configure"
+#line 11462 "configure"
 #include "confdefs.h"
 #include <regex.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10931: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11467: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -10946,12 +11482,12 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   for ac_func in regcomp
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:10950: checking for $ac_func" >&5
+echo "configure:11486: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 10955 "configure"
+#line 11491 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -10974,7 +11510,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:10978: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11514: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -11030,19 +11566,69 @@ EOF
 
 
     if test "$wxUSE_ZLIB" = "sys" -o "$wxUSE_ZLIB" = "yes" ; then
-        ac_safe=`echo "zlib.h" | sed 'y%./+-%__p_%'`
+                                                if test "$USE_DARWIN" = 1; then
+            system_zlib_h_ok="yes"
+        else
+                                                                                    echo $ac_n "checking for zlib.h >= 1.1.4""... $ac_c" 1>&6
+echo "configure:11574: checking for zlib.h >= 1.1.4" >&5
+if eval "test \"`echo '$''{'ac_cv_header_zlib_h'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test "$cross_compiling" = yes; then
+                      unset ac_cv_header_zlib_h
+                
+else
+  cat > conftest.$ac_ext <<EOF
+#line 11583 "configure"
+#include "confdefs.h"
+
+                                                #include <zlib.h>
+                        #include <stdio.h>
+
+                                                
+                        int main()
+                        {
+                            FILE *f=fopen("conftestval", "w");
+                            if (!f) exit(1);
+                            fprintf(f, "%s",
+                                    ZLIB_VERSION[0] == '1' &&
+                                    (ZLIB_VERSION[2] > '1' ||
+                                    (ZLIB_VERSION[2] == '1' &&
+                                     ZLIB_VERSION[4] >= '4')) ? "yes" : "no");
+                            exit(0);
+                        }
+                        
+                    
+EOF
+if { (eval echo configure:11604: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  ac_cv_header_zlib_h=`cat conftestval`
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  ac_cv_header_zlib_h=no
+fi
+rm -fr conftest*
+fi
+
+            
+fi
+
+echo "$ac_t""$ac_cv_header_zlib_h" 1>&6
+                                    ac_safe=`echo "zlib.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for zlib.h""... $ac_c" 1>&6
-echo "configure:11036: checking for zlib.h" >&5
+echo "configure:11622: checking for zlib.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 11041 "configure"
+#line 11627 "configure"
 #include "confdefs.h"
 #include <zlib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11046: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11632: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -11058,8 +11644,18 @@ rm -f conftest*
 fi
 if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-  echo $ac_n "checking for deflate in -lz""... $ac_c" 1>&6
-echo "configure:11063: checking for deflate in -lz" >&5
+  :
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+
+            system_zlib_h_ok=$ac_cv_header_zlib_h
+        fi
+
+        if test "$system_zlib_h_ok" = "yes"; then
+            echo $ac_n "checking for deflate in -lz""... $ac_c" 1>&6
+echo "configure:11659: checking for deflate in -lz" >&5
 ac_lib_var=`echo z'_'deflate | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -11067,7 +11663,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lz  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 11071 "configure"
+#line 11667 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -11078,7 +11674,7 @@ int main() {
 deflate()
 ; return 0; }
 EOF
-if { (eval echo configure:11082: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11678: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -11098,16 +11694,13 @@ else
   echo "$ac_t""no" 1>&6
 fi
 
-else
-  echo "$ac_t""no" 1>&6
-fi
-
+        fi
 
         if test "x$ZLIB_LINK" = "x" ; then
             if test "$wxUSE_ZLIB" = "sys" ; then
-                { echo "configure: error: system zlib compression library not found! Use --with-zlib=builtin to use built-in version" 1>&2; exit 1; }
+                { echo "configure: error: zlib library not found or too old! Use --with-zlib=builtin to use built-in version" 1>&2; exit 1; }
             else
-                echo "configure: warning: system zlib compression library not found, will use built-in instead" 1>&2
+                echo "configure: warning: zlib library not found or too old, will use built-in instead" 1>&2
                 wxUSE_ZLIB=builtin
             fi
         else
@@ -11128,7 +11721,7 @@ if test "$wxUSE_LIBPNG" != "no" ; then
 #define wxUSE_LIBPNG 1
 EOF
 
-    
+
     if test "$wxUSE_MGL" = 1 -a "$wxUSE_LIBPNG" = "builtin" ; then
         echo "configure: warning: wxMGL doesn't work with builtin png library, will use MGL one instead" 1>&2
         wxUSE_LIBPNG=sys
@@ -11141,19 +11734,61 @@ EOF
 
     if test "$wxUSE_MGL" != 1 ; then
                 if test "$wxUSE_LIBPNG" = "sys" -o "$wxUSE_LIBPNG" = "yes" ; then
+                                    echo $ac_n "checking for png.h > 0.90""... $ac_c" 1>&6
+echo "configure:11739: checking for png.h > 0.90" >&5
+if eval "test \"`echo '$''{'ac_cv_header_png_h'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test "$cross_compiling" = yes; then
+                      unset ac_cv_header_png_h
+                
+else
+  cat > conftest.$ac_ext <<EOF
+#line 11748 "configure"
+#include "confdefs.h"
+
+                                                #include <png.h>
+                        #include <stdio.h>
+
+                        int main()
+                        {
+                            FILE *f=fopen("conftestval", "w");
+                            if (!f) exit(1);
+                            fprintf(f, "%s",
+                                     PNG_LIBPNG_VER > 90 ? "yes" : "no");
+                            exit(0);
+                        }
+                    
+EOF
+if { (eval echo configure:11764: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+then
+  ac_cv_header_png_h=`cat conftestval`
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  ac_cv_header_png_h=no
+fi
+rm -fr conftest*
+fi
+
+            
+fi
+
+echo "$ac_t""$ac_cv_header_png_h" 1>&6
             ac_safe=`echo "png.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for png.h""... $ac_c" 1>&6
-echo "configure:11147: checking for png.h" >&5
+echo "configure:11782: checking for png.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 11152 "configure"
+#line 11787 "configure"
 #include "confdefs.h"
 #include <png.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11157: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11792: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -11169,8 +11804,15 @@ rm -f conftest*
 fi
 if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-  echo $ac_n "checking for png_check_sig in -lpng""... $ac_c" 1>&6
-echo "configure:11174: checking for png_check_sig in -lpng" >&5
+  :
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+
+            if test "$ac_cv_header_png_h" = "yes"; then
+                echo $ac_n "checking for png_check_sig in -lpng""... $ac_c" 1>&6
+echo "configure:11816: checking for png_check_sig in -lpng" >&5
 ac_lib_var=`echo png'_'png_check_sig | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -11178,7 +11820,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lpng -lz -lm $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 11182 "configure"
+#line 11824 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -11189,7 +11831,7 @@ int main() {
 png_check_sig()
 ; return 0; }
 EOF
-if { (eval echo configure:11193: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11835: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -11209,21 +11851,17 @@ else
   echo "$ac_t""no" 1>&6
 fi
 
-                           
-else
-  echo "$ac_t""no" 1>&6
-fi
-
+            fi
 
             if test "x$PNG_LINK" = "x" ; then
                 if test "$wxUSE_LIBPNG" = "sys" ; then
-                    { echo "configure: error: system png library not found! Use --with-libpng=builtin to use built-in version" 1>&2; exit 1; }
+                    { echo "configure: error: system png library not found or too old! Use --with-libpng=builtin to use built-in version" 1>&2; exit 1; }
                 else
-                    echo "configure: warning: system png library not found, will use built-in instead" 1>&2
+                    echo "configure: warning: system png library not found or too old, will use built-in instead" 1>&2
                     wxUSE_LIBPNG=builtin
                 fi
             else
-                                wxUSE_LIBPNG=yes
+                                wxUSE_LIBPNG=sys
             fi
         fi
     fi
@@ -11252,12 +11890,12 @@ EOF
     if test "$wxUSE_MGL" != 1 ; then
                 if test "$wxUSE_LIBJPEG" = "sys" -o "$wxUSE_LIBJPEG" = "yes" ; then
                                                 echo $ac_n "checking for jpeglib.h""... $ac_c" 1>&6
-echo "configure:11256: checking for jpeglib.h" >&5
+echo "configure:11894: checking for jpeglib.h" >&5
             if eval "test \"`echo '$''{'ac_cv_header_jpeglib_h'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 11261 "configure"
+#line 11899 "configure"
 #include "confdefs.h"
 
                         #undef HAVE_STDLIB_H
@@ -11269,7 +11907,7 @@ int main() {
                     
 ; return 0; }
 EOF
-if { (eval echo configure:11273: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11911: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_jpeglib_h=yes
 else
@@ -11287,7 +11925,7 @@ fi
 
             if test "$ac_cv_header_jpeglib_h" = "yes"; then
                 echo $ac_n "checking for jpeg_read_header in -ljpeg""... $ac_c" 1>&6
-echo "configure:11291: checking for jpeg_read_header in -ljpeg" >&5
+echo "configure:11929: checking for jpeg_read_header in -ljpeg" >&5
 ac_lib_var=`echo jpeg'_'jpeg_read_header | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -11295,7 +11933,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ljpeg  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 11299 "configure"
+#line 11937 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -11306,7 +11944,7 @@ int main() {
 jpeg_read_header()
 ; return 0; }
 EOF
-if { (eval echo configure:11310: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11948: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -11349,6 +11987,7 @@ fi
 
 TIFF_INCLUDE=
 TIFF_LINK=
+TIFF_PREREQ_LINKS=-lm
 if test "$wxUSE_LIBTIFF" != "no" ; then
     cat >> confdefs.h <<\EOF
 #define wxUSE_LIBTIFF 1
@@ -11356,19 +11995,25 @@ EOF
 
 
     if test "$wxUSE_LIBTIFF" = "sys" -o "$wxUSE_LIBTIFF" = "yes" ; then
+                        if test "$wxUSE_LIBJPEG" = "sys"; then
+            TIFF_PREREQ_LINKS="$TIFF_PREREQ_LINKS $JPEG_LINK"
+        fi
+        if test "$wxUSE_ZLIB" = "sys"; then
+            TIFF_PREREQ_LINKS="$TIFF_PREREQ_LINKS $ZLIB_LINK"
+        fi
         ac_safe=`echo "tiffio.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for tiffio.h""... $ac_c" 1>&6
-echo "configure:11362: checking for tiffio.h" >&5
+echo "configure:12007: checking for tiffio.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 11367 "configure"
+#line 12012 "configure"
 #include "confdefs.h"
 #include <tiffio.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11372: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12017: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -11385,15 +12030,15 @@ fi
 if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   echo $ac_n "checking for TIFFError in -ltiff""... $ac_c" 1>&6
-echo "configure:11389: checking for TIFFError in -ltiff" >&5
+echo "configure:12034: checking for TIFFError in -ltiff" >&5
 ac_lib_var=`echo tiff'_'TIFFError | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
-LIBS="-ltiff -lm $LIBS"
+LIBS="-ltiff $TIFF_PREREQ_LINKS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 11397 "configure"
+#line 12042 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -11404,7 +12049,7 @@ int main() {
 TIFFError()
 ; return 0; }
 EOF
-if { (eval echo configure:11408: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12053: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -11449,6 +12094,7 @@ fi
 
 
 AFMINSTALL=
+WIN32INSTALL=
 
 TOOLKIT=
 TOOLKIT_INCLUDE=
@@ -11459,17 +12105,17 @@ if test "$USE_WIN32" = 1 ; then
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11463: checking for $ac_hdr" >&5
+echo "configure:12109: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 11468 "configure"
+#line 12114 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11473: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12119: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -11497,17 +12143,17 @@ done
 
     ac_safe=`echo "windows.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for windows.h""... $ac_c" 1>&6
-echo "configure:11501: checking for windows.h" >&5
+echo "configure:12147: checking for windows.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 11506 "configure"
+#line 12152 "configure"
 #include "confdefs.h"
 #include <windows.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11511: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12157: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -11533,13 +12179,13 @@ fi
 
 
         echo $ac_n "checking if w32api has good enough MSIE support""... $ac_c" 1>&6
-echo "configure:11537: checking if w32api has good enough MSIE support" >&5
+echo "configure:12183: checking if w32api has good enough MSIE support" >&5
 if eval "test \"`echo '$''{'wx_cv_w32api_win32_ie'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
       cat > conftest.$ac_ext <<EOF
-#line 11543 "configure"
+#line 12189 "configure"
 #include "confdefs.h"
 #include <w32api.h>
 int main() {
@@ -11555,7 +12201,7 @@ int main() {
                      
 ; return 0; }
 EOF
-if { (eval echo configure:11559: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:12205: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
                         wx_cv_w32api_win32_ie=yes
@@ -11591,6 +12237,16 @@ echo "$ac_t""$wx_cv_w32api_win32_ie" 1>&6
 
     RESFLAGS="--include-dir \$(top_srcdir)/include --include-dir \$(top_srcdir)/\$(program_dir) --define __WIN32__ --define __WIN95__ --define __GNUWIN32__"
     RESPROGRAMOBJ="\$(PROGRAM)_resources.o"
+
+        WIN32INSTALL=win32install
+fi
+
+if test "$USE_DARWIN" = 1; then
+            if test "$wxUSE_PRECOMP" = "yes"; then
+        CPPFLAGS="$CPPFLAGS -cpp-precomp"
+    else
+        CPPFLAGS="$CPPFLAGS -no-cpp-precomp"
+    fi
 fi
 
 if test "$wxUSE_GUI" = "yes"; then
@@ -11606,15 +12262,12 @@ if test "$wxUSE_GUI" = "yes"; then
         TOOLKIT=MSW
         GUIDIST=MSW_DIST
 
-                                case "${host}" in
-            *-*-mingw32* )
-                LDFLAGS="$LDFLAGS -Wl,--subsystem,windows -mwindows"
-        esac
+                        LDFLAGS="$LDFLAGS -Wl,--subsystem,windows -mwindows"
     fi
 
     if test "$wxUSE_GTK" = 1; then
         echo $ac_n "checking for GTK+ version""... $ac_c" 1>&6
-echo "configure:11618: checking for GTK+ version" >&5
+echo "configure:12271: checking for GTK+ version" >&5
 
         gtk_version_cached=1
         if eval "test \"`echo '$''{'wx_cv_lib_gtk'+set}'`\" = set"; then
@@ -11629,7 +12282,7 @@ else
                     GTK_MODULES=gthread
                 fi
 
-                wx_cv_lib_gtk=
+                                                wx_cv_lib_gtk=
                 if test "x$wxUSE_GTK2" = "xyes"; then
                     # Check whether --enable-gtktest or --disable-gtktest was given.
 if test "${enable_gtktest+set}" = set; then
@@ -11655,7 +12308,7 @@ fi
   # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:11659: checking for $ac_word" >&5
+echo "configure:12312: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -11703,7 +12356,7 @@ fi
 
   min_gtk_version=2.0.0
   echo $ac_n "checking for GTK+ - version >= $min_gtk_version""... $ac_c" 1>&6
-echo "configure:11707: checking for GTK+ - version >= $min_gtk_version" >&5
+echo "configure:12360: checking for GTK+ - version >= $min_gtk_version" >&5
 
   if test x$PKG_CONFIG != xno ; then
     ## don't try to run the test against uninstalled libtool libs
@@ -11738,7 +12391,7 @@ echo "configure:11707: checking for GTK+ - version >= $min_gtk_version" >&5
   echo $ac_n "cross compiling; assumed OK... $ac_c"
 else
   cat > conftest.$ac_ext <<EOF
-#line 11742 "configure"
+#line 12395 "configure"
 #include "confdefs.h"
 
 #include <gtk/gtk.h>
@@ -11813,7 +12466,7 @@ main ()
 }
 
 EOF
-if { (eval echo configure:11817: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:12470: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -11842,10 +12495,12 @@ fi
         :
        else
           echo "*** Could not run GTK+ test program, checking why..."
+	  ac_save_CFLAGS="$CFLAGS"
+	  ac_save_LIBS="$LIBS"
           CFLAGS="$CFLAGS $GTK_CFLAGS"
           LIBS="$LIBS $GTK_LIBS"
           cat > conftest.$ac_ext <<EOF
-#line 11849 "configure"
+#line 12504 "configure"
 #include "confdefs.h"
 
 #include <gtk/gtk.h>
@@ -11855,7 +12510,7 @@ int main() {
  return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); 
 ; return 0; }
 EOF
-if { (eval echo configure:11859: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12514: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
    echo "*** The test program compiled, but did not run. This usually means"
           echo "*** that the run-time linker is not finding GTK+ or finding the wrong"
@@ -11871,9 +12526,7 @@ else
   cat conftest.$ac_ext >&5
   rm -rf conftest*
    echo "*** The test program failed to compile or link. See the file config.log for the"
-          echo "*** exact error that occured. This usually means GTK+ was incorrectly installed"
-          echo "*** or that you have moved GTK+ since it was installed. In the latter case, you"
-          echo "*** may want to edit the pkg-config script: $PKG_CONFIG" 
+          echo "*** exact error that occured. This usually means GTK+ is incorrectly installed."
 fi
 rm -f conftest*
           CFLAGS="$ac_save_CFLAGS"
@@ -11888,9 +12541,7 @@ rm -f conftest*
   
   rm -f conf.gtktest
 
-                fi
-
-                if test -z "$wx_cv_lib_gtk"; then
+                else
                     # Check whether --with-gtk-prefix or --without-gtk-prefix was given.
 if test "${with_gtk_prefix+set}" = set; then
   withval="$with_gtk_prefix"
@@ -11941,7 +12592,7 @@ fi
   # Extract the first word of "gtk-config", so it can be a program name with args.
 set dummy gtk-config; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:11945: checking for $ac_word" >&5
+echo "configure:12596: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -11976,7 +12627,7 @@ fi
 
   min_gtk_version=1.2.7
   echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6
-echo "configure:11980: checking for GTK - version >= $min_gtk_version" >&5
+echo "configure:12631: checking for GTK - version >= $min_gtk_version" >&5
   no_gtk=""
   if test "$GTK_CONFIG" = "no" ; then
     no_gtk=yes
@@ -11999,7 +12650,7 @@ echo "configure:11980: checking for GTK - version >= $min_gtk_version" >&5
   echo $ac_n "cross compiling; assumed OK... $ac_c"
 else
   cat > conftest.$ac_ext <<EOF
-#line 12003 "configure"
+#line 12654 "configure"
 #include "confdefs.h"
 
 #include <gtk/gtk.h>
@@ -12077,7 +12728,7 @@ main ()
 }
 
 EOF
-if { (eval echo configure:12081: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:12732: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -12111,7 +12762,7 @@ fi
           CFLAGS="$CFLAGS $GTK_CFLAGS"
           LIBS="$LIBS $GTK_LIBS"
           cat > conftest.$ac_ext <<EOF
-#line 12115 "configure"
+#line 12766 "configure"
 #include "confdefs.h"
 
 #include <gtk/gtk.h>
@@ -12121,7 +12772,7 @@ int main() {
  return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); 
 ; return 0; }
 EOF
-if { (eval echo configure:12125: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12776: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
    echo "*** The test program compiled, but did not run. This usually means"
           echo "*** that the run-time linker is not finding GTK or finding the wrong"
@@ -12159,10 +12810,9 @@ rm -f conftest*
   
   rm -f conf.gtktest
 
-                fi
 
-                if test -z "$wx_cv_lib_gtk"; then
-                    # Check whether --with-gtk-prefix or --without-gtk-prefix was given.
+                    if test -z "$wx_cv_lib_gtk"; then
+                        # Check whether --with-gtk-prefix or --without-gtk-prefix was given.
 if test "${with_gtk_prefix+set}" = set; then
   withval="$with_gtk_prefix"
   gtk_config_prefix="$withval"
@@ -12212,7 +12862,7 @@ fi
   # Extract the first word of "gtk-config", so it can be a program name with args.
 set dummy gtk-config; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:12216: checking for $ac_word" >&5
+echo "configure:12866: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -12247,7 +12897,7 @@ fi
 
   min_gtk_version=1.2.3
   echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6
-echo "configure:12251: checking for GTK - version >= $min_gtk_version" >&5
+echo "configure:12901: checking for GTK - version >= $min_gtk_version" >&5
   no_gtk=""
   if test "$GTK_CONFIG" = "no" ; then
     no_gtk=yes
@@ -12270,7 +12920,7 @@ echo "configure:12251: checking for GTK - version >= $min_gtk_version" >&5
   echo $ac_n "cross compiling; assumed OK... $ac_c"
 else
   cat > conftest.$ac_ext <<EOF
-#line 12274 "configure"
+#line 12924 "configure"
 #include "confdefs.h"
 
 #include <gtk/gtk.h>
@@ -12348,7 +12998,7 @@ main ()
 }
 
 EOF
-if { (eval echo configure:12352: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:13002: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -12382,7 +13032,7 @@ fi
           CFLAGS="$CFLAGS $GTK_CFLAGS"
           LIBS="$LIBS $GTK_LIBS"
           cat > conftest.$ac_ext <<EOF
-#line 12386 "configure"
+#line 13036 "configure"
 #include "confdefs.h"
 
 #include <gtk/gtk.h>
@@ -12392,7 +13042,7 @@ int main() {
  return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); 
 ; return 0; }
 EOF
-if { (eval echo configure:12396: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13046: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
    echo "*** The test program compiled, but did not run. This usually means"
           echo "*** that the run-time linker is not finding GTK or finding the wrong"
@@ -12430,6 +13080,7 @@ rm -f conftest*
   
   rm -f conf.gtktest
 
+                    fi
                 fi
 
                 if test -z "$wx_cv_lib_gtk"; then
@@ -12449,6 +13100,7 @@ fi
 
         case "$wx_cv_lib_gtk" in
             2.0)    WXGTK20=1
+                    TOOLKIT_VERSION=2
                     ;;
             1.2.7)  WXGTK127=1
                     WXGTK12=1
@@ -12464,15 +13116,179 @@ equivalent variable and GTK+ is version 1.2.3 or above.
                     ;;
         esac
 
-        TOOLKIT_INCLUDE="$wx_cv_cflags_gtk"
-        GUI_TK_LIBRARY="$wx_cv_libs_gtk"
+        if test "$WXGTK20" = 1; then
+            if test "$wxUSE_PRINTING_ARCHITECTURE" = "yes" ; then
+                
+  succeeded=no
+
+  if test -z "$PKG_CONFIG"; then
+    # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:13129: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  case "$PKG_CONFIG" in
+  /*)
+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  ?:/*)			 
+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a dos path.
+  ;;
+  *)
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do 
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+  ;;
+esac
+fi
+PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+if test -n "$PKG_CONFIG"; then
+  echo "$ac_t""$PKG_CONFIG" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+  fi
+
+  if test "$PKG_CONFIG" = "no" ; then
+     echo "*** The pkg-config script could not be found. Make sure it is"
+     echo "*** in your path, or set the PKG_CONFIG environment variable"
+     echo "*** to the full path to pkg-config."
+     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
+  else
+     PKG_CONFIG_MIN_VERSION=0.9.0
+     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+        echo $ac_n "checking for pangoft2""... $ac_c" 1>&6
+echo "configure:13173: checking for pangoft2" >&5
+
+        if $PKG_CONFIG --exists "pangoft2" ; then
+            echo "$ac_t""yes" 1>&6
+            succeeded=yes
+
+            echo $ac_n "checking PANGOFT2_CFLAGS""... $ac_c" 1>&6
+echo "configure:13180: checking PANGOFT2_CFLAGS" >&5
+            PANGOFT2_CFLAGS=`$PKG_CONFIG --cflags "pangoft2"`
+            echo "$ac_t""$PANGOFT2_CFLAGS" 1>&6
+
+            echo $ac_n "checking PANGOFT2_LIBS""... $ac_c" 1>&6
+echo "configure:13185: checking PANGOFT2_LIBS" >&5
+            PANGOFT2_LIBS=`$PKG_CONFIG --libs "pangoft2"`
+            echo "$ac_t""$PANGOFT2_LIBS" 1>&6
+        else
+            PANGOFT2_CFLAGS=""
+            PANGOFT2_LIBS=""
+            ## If we have a custom action on failure, don't print errors, but 
+            ## do set a variable so people can do so.
+            PANGOFT2_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "pangoft2"`
+            
+        fi
+
+        
+        
+     else
+        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
+        echo "*** See http://www.freedesktop.org/software/pkgconfig"
+     fi
+  fi
+
+  if test $succeeded = yes; then
+     
+                        CXXFLAGS="$CXXFLAGS $PANGOFT2_CFLAGS"
+                        LIBS="$LIBS $PANGOFT2_LIBS"
+                    
+  else
+     
+                        echo "configure: warning: pangoft2 library not found, library will be compiled without printing support" 1>&2
+                        wxUSE_PRINTING_ARCHITECTURE="no"
+                    
+                
+  fi
+
+            fi
+        else
+            if test "$wxUSE_UNICODE" = "yes"; then
+                echo "configure: warning: Unicode configuration not supported with GTK+ 1.x" 1>&2
+                wxUSE_UNICODE=no
+            fi
+        fi
+
+                        if test "$USE_DARWIN" != 1; then
+            for ac_func in poll
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:13230: checking for $ac_func" >&5
+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 13235 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func(); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char $ac_func();
+
+int main() {
+
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+$ac_func();
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:13258: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+ 
+else
+  echo "$ac_t""no" 1>&6
+fi
+done
+
+        fi
+
+        TOOLKIT_INCLUDE="$wx_cv_cflags_gtk"
+        GUI_TK_LIBRARY="$wx_cv_libs_gtk"
 
         AFMINSTALL=afminstall
         TOOLKIT=GTK
         GUIDIST=GTK_DIST
 
                 echo $ac_n "checking for gdk_im_open in -lgdk""... $ac_c" 1>&6
-echo "configure:12476: checking for gdk_im_open in -lgdk" >&5
+echo "configure:13292: checking for gdk_im_open in -lgdk" >&5
 ac_lib_var=`echo gdk'_'gdk_im_open | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -12480,7 +13296,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lgdk  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 12484 "configure"
+#line 13300 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -12491,7 +13307,7 @@ int main() {
 gdk_im_open()
 ; return 0; }
 EOF
-if { (eval echo configure:12495: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13311: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -12517,8 +13333,8 @@ fi
     fi
 
     if test "$wxUSE_MGL" = 1; then
-        echo $ac_n "checking for SciTech MGL library""... $ac_c" 1>&6
-echo "configure:12522: checking for SciTech MGL library" >&5
+       echo $ac_n "checking for SciTech MGL library""... $ac_c" 1>&6
+echo "configure:13338: checking for SciTech MGL library" >&5
         if test "x$MGL_ROOT" = x ; then
             echo "$ac_t""not found" 1>&6
             { echo "configure: error: Cannot find MGL library. Make sure MGL_ROOT is set." 1>&2; exit 1; }
@@ -12526,33 +13342,50 @@ echo "configure:12522: checking for SciTech MGL library" >&5
             echo "$ac_t""$MGL_ROOT" 1>&6
         fi
 
+        echo $ac_n "checking for libmgl location""... $ac_c" 1>&6
+echo "configure:13347: checking for libmgl location" >&5
                         case "${host}" in
             *-*-linux* )
-              mgl_os=linux/gcc/glibc
+              if test "x$wxUSE_SHARED" = xyes ; then
+                  mgl_os_candidates="linux/gcc/glibc.so linux/gcc/glibc"
+              else
+                  mgl_os_candidates="linux/gcc/glibc linux/gcc/glibc.so"
+              fi
               ;;
             *-pc-msdosdjgpp )
-              mgl_os=dos32/dj2
+              mgl_os_candidates="dos32/dj2"
               ;;
             *)
               { echo "configure: error: This system type ${host} is not yet supported by wxMGL." 1>&2; exit 1; }
         esac
 
         mgl_lib_type=""
-
-        if test "$wxUSE_DEBUG_FLAG" = yes ; then
-            if test -f $MGL_ROOT/lib/debug/$mgl_os/libmgl.a -o \
-                    -f $MGL_ROOT/lib/debug/$mgl_os/libmgl.so; then
-                mgl_lib_type=debug
-            fi
-        fi
-        if test "x$mgl_lib_type" = x ; then
-            if test -f $MGL_ROOT/lib/release/$mgl_os/libmgl.a -o \
-                    -f $MGL_ROOT/lib/release/$mgl_os/libmgl.so; then
-                mgl_lib_type=release
-            else
-                { echo "configure: error: Cannot find MGL libraries, make sure they are compiled." 1>&2; exit 1; }
+        mgl_os=""
+
+        for mgl_os_i in $mgl_os_candidates ; do
+            if test "x$mgl_os" = x ; then
+                if test "$wxUSE_DEBUG_FLAG" = yes ; then
+                    if test -f $MGL_ROOT/lib/debug/$mgl_os_i/libmgl.a -o \
+                            -f $MGL_ROOT/lib/debug/$mgl_os_i/libmgl.so; then
+                        mgl_lib_type=debug
+                        mgl_os=$mgl_os_i
+                    fi
+                fi
+                if test "x$mgl_lib_type" = x ; then
+                    if test -f $MGL_ROOT/lib/release/$mgl_os_i/libmgl.a -o \
+                            -f $MGL_ROOT/lib/release/$mgl_os_i/libmgl.so; then
+                        mgl_lib_type=release
+                        mgl_os=$mgl_os_i
+                    fi
+                fi
             fi
+        done
+
+        if test "x$mgl_os" = x ; then
+            echo "$ac_t""not found" 1>&6
+            { echo "configure: error: Cannot find MGL libraries, make sure they are compiled." 1>&2; exit 1; }
         fi
+        echo "$ac_t"""$MGL_ROOT/lib/$mgl_lib_type/$mgl_os"" 1>&6
 
         wxUSE_UNIVERSAL="yes"
 
@@ -12566,7 +13399,7 @@ echo "configure:12522: checking for SciTech MGL library" >&5
 
     if test "$wxUSE_MICROWIN" = 1; then
         echo $ac_n "checking for MicroWindows""... $ac_c" 1>&6
-echo "configure:12570: checking for MicroWindows" >&5
+echo "configure:13403: checking for MicroWindows" >&5
         if test "x$MICROWINDOWS" = x ; then
             echo "$ac_t""not found" 1>&6
             { echo "configure: error: Cannot find MicroWindows library. Make sure MICROWINDOWS is set." 1>&2; exit 1; }
@@ -12598,7 +13431,7 @@ echo "configure:12570: checking for MicroWindows" >&5
 # Uses ac_ vars as temps to allow command line to override cache and checks.
 # --without-x overrides everything else, but does not touch the cache.
 echo $ac_n "checking for X""... $ac_c" 1>&6
-echo "configure:12602: checking for X" >&5
+echo "configure:13435: checking for X" >&5
 
 # Check whether --with-x or --without-x was given.
 if test "${with_x+set}" = set; then
@@ -12660,12 +13493,12 @@ if test "$ac_x_includes" = NO; then
 
   # First, try using that file with no special directory specified.
 cat > conftest.$ac_ext <<EOF
-#line 12664 "configure"
+#line 13497 "configure"
 #include "confdefs.h"
 #include <$x_direct_test_include>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12669: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13502: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -12734,14 +13567,14 @@ if test "$ac_x_libraries" = NO; then
   ac_save_LIBS="$LIBS"
   LIBS="-l$x_direct_test_library $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 12738 "configure"
+#line 13571 "configure"
 #include "confdefs.h"
 
 int main() {
 ${x_direct_test_function}()
 ; return 0; }
 EOF
-if { (eval echo configure:12745: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13578: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   LIBS="$ac_save_LIBS"
 # We can link X programs with no special library path.
@@ -12847,17 +13680,17 @@ else
     case "`(uname -sr) 2>/dev/null`" in
     "SunOS 5"*)
       echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6
-echo "configure:12851: checking whether -R must be followed by a space" >&5
+echo "configure:13684: checking whether -R must be followed by a space" >&5
       ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries"
       cat > conftest.$ac_ext <<EOF
-#line 12854 "configure"
+#line 13687 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:12861: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13694: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_R_nospace=yes
 else
@@ -12873,14 +13706,14 @@ rm -f conftest*
       else
 	LIBS="$ac_xsave_LIBS -R $x_libraries"
 	cat > conftest.$ac_ext <<EOF
-#line 12877 "configure"
+#line 13710 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:12884: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13717: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_R_space=yes
 else
@@ -12912,7 +13745,7 @@ rm -f conftest*
     # libraries were built with DECnet support.  And karl@cs.umb.edu says
     # the Alpha needs dnet_stub (dnet does not exist).
     echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
-echo "configure:12916: checking for dnet_ntoa in -ldnet" >&5
+echo "configure:13749: checking for dnet_ntoa in -ldnet" >&5
 ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -12920,7 +13753,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ldnet  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 12924 "configure"
+#line 13757 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -12931,7 +13764,7 @@ int main() {
 dnet_ntoa()
 ; return 0; }
 EOF
-if { (eval echo configure:12935: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13768: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -12953,7 +13786,7 @@ fi
 
     if test $ac_cv_lib_dnet_dnet_ntoa = no; then
       echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6
-echo "configure:12957: checking for dnet_ntoa in -ldnet_stub" >&5
+echo "configure:13790: checking for dnet_ntoa in -ldnet_stub" >&5
 ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -12961,7 +13794,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ldnet_stub  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 12965 "configure"
+#line 13798 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -12972,7 +13805,7 @@ int main() {
 dnet_ntoa()
 ; return 0; }
 EOF
-if { (eval echo configure:12976: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13809: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -13001,12 +13834,12 @@ fi
     # The nsl library prevents programs from opening the X display
     # on Irix 5.2, according to dickey@clark.net.
     echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
-echo "configure:13005: checking for gethostbyname" >&5
+echo "configure:13838: checking for gethostbyname" >&5
 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 13010 "configure"
+#line 13843 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname(); below.  */
@@ -13029,7 +13862,7 @@ gethostbyname();
 
 ; return 0; }
 EOF
-if { (eval echo configure:13033: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13866: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_gethostbyname=yes"
 else
@@ -13050,7 +13883,7 @@ fi
 
     if test $ac_cv_func_gethostbyname = no; then
       echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:13054: checking for gethostbyname in -lnsl" >&5
+echo "configure:13887: checking for gethostbyname in -lnsl" >&5
 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -13058,7 +13891,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 13062 "configure"
+#line 13895 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -13069,7 +13902,7 @@ int main() {
 gethostbyname()
 ; return 0; }
 EOF
-if { (eval echo configure:13073: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13906: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -13099,12 +13932,12 @@ fi
     # -lsocket must be given before -lnsl if both are needed.
     # We assume that if connect needs -lnsl, so does gethostbyname.
     echo $ac_n "checking for connect""... $ac_c" 1>&6
-echo "configure:13103: checking for connect" >&5
+echo "configure:13936: checking for connect" >&5
 if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 13108 "configure"
+#line 13941 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char connect(); below.  */
@@ -13127,7 +13960,7 @@ connect();
 
 ; return 0; }
 EOF
-if { (eval echo configure:13131: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13964: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_connect=yes"
 else
@@ -13148,7 +13981,7 @@ fi
 
     if test $ac_cv_func_connect = no; then
       echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
-echo "configure:13152: checking for connect in -lsocket" >&5
+echo "configure:13985: checking for connect in -lsocket" >&5
 ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -13156,7 +13989,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 13160 "configure"
+#line 13993 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -13167,7 +14000,7 @@ int main() {
 connect()
 ; return 0; }
 EOF
-if { (eval echo configure:13171: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14004: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -13191,12 +14024,12 @@ fi
 
     # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX.
     echo $ac_n "checking for remove""... $ac_c" 1>&6
-echo "configure:13195: checking for remove" >&5
+echo "configure:14028: checking for remove" >&5
 if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 13200 "configure"
+#line 14033 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char remove(); below.  */
@@ -13219,7 +14052,7 @@ remove();
 
 ; return 0; }
 EOF
-if { (eval echo configure:13223: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14056: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_remove=yes"
 else
@@ -13240,7 +14073,7 @@ fi
 
     if test $ac_cv_func_remove = no; then
       echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
-echo "configure:13244: checking for remove in -lposix" >&5
+echo "configure:14077: checking for remove in -lposix" >&5
 ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -13248,7 +14081,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lposix  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 13252 "configure"
+#line 14085 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -13259,7 +14092,7 @@ int main() {
 remove()
 ; return 0; }
 EOF
-if { (eval echo configure:13263: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14096: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -13283,12 +14116,12 @@ fi
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
     echo $ac_n "checking for shmat""... $ac_c" 1>&6
-echo "configure:13287: checking for shmat" >&5
+echo "configure:14120: checking for shmat" >&5
 if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 13292 "configure"
+#line 14125 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char shmat(); below.  */
@@ -13311,7 +14144,7 @@ shmat();
 
 ; return 0; }
 EOF
-if { (eval echo configure:13315: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14148: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_shmat=yes"
 else
@@ -13332,7 +14165,7 @@ fi
 
     if test $ac_cv_func_shmat = no; then
       echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
-echo "configure:13336: checking for shmat in -lipc" >&5
+echo "configure:14169: checking for shmat in -lipc" >&5
 ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -13340,7 +14173,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lipc  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 13344 "configure"
+#line 14177 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -13351,7 +14184,7 @@ int main() {
 shmat()
 ; return 0; }
 EOF
-if { (eval echo configure:13355: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14188: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -13384,7 +14217,7 @@ fi
   # libraries we check for below, so use a different variable.
   #  --interran@uluru.Stanford.EDU, kb@cs.umb.edu.
   echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6
-echo "configure:13388: checking for IceConnectionNumber in -lICE" >&5
+echo "configure:14221: checking for IceConnectionNumber in -lICE" >&5
 ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -13392,7 +14225,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 13396 "configure"
+#line 14229 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -13403,7 +14236,7 @@ int main() {
 IceConnectionNumber()
 ; return 0; }
 EOF
-if { (eval echo configure:13407: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14240: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -13439,7 +14272,7 @@ fi
 
         if test "$wxUSE_NANOX" = "yes"; then
             echo $ac_n "checking for MicroWindows/NanoX distribution""... $ac_c" 1>&6
-echo "configure:13443: checking for MicroWindows/NanoX distribution" >&5
+echo "configure:14276: checking for MicroWindows/NanoX distribution" >&5
             if test "x$MICROWIN" = x ; then
                 echo "$ac_t""not found" 1>&6
                 { echo "configure: error: Cannot find MicroWindows library. Make sure MICROWIN is set." 1>&2; exit 1; }
@@ -13454,10 +14287,10 @@ EOF
 
         xpm_link=
         echo $ac_n "checking for Xpm library""... $ac_c" 1>&6
-echo "configure:13458: checking for Xpm library" >&5
+echo "configure:14291: checking for Xpm library" >&5
         
 ac_find_libraries=
-for ac_dir in $SEARCH_LIB;
+for ac_dir in $SEARCH_LIB /usr/lib;
   do
     for ac_extension in a so sl dylib; do
       if test -f "$ac_dir/libXpm.$ac_extension"; then
@@ -13486,7 +14319,7 @@ EOF
             echo "$ac_t""found at $ac_find_libraries" 1>&6
         else
             cat > conftest.$ac_ext <<EOF
-#line 13490 "configure"
+#line 14323 "configure"
 #include "confdefs.h"
 
                     #include <X11/xpm.h>
@@ -13498,7 +14331,7 @@ int main() {
                 
 ; return 0; }
 EOF
-if { (eval echo configure:13502: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14335: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
                     xpm_link=" -lXpm"
@@ -13522,117 +14355,355 @@ fi
 rm -f conftest*
         fi
 
-        wxUSE_UNIVERSAL="yes"
-
-        if test "$wxUSE_NANOX" = "yes"; then
-            TOOLKIT_INCLUDE="-I\$(top_srcdir)/include/wx/x11/nanox -I\$(MICROWIN)/src/include $TOOLKIT_INCLUDE"
-            TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__NANOX__ -DMWPIXEL_FORMAT=MWPF_TRUECOLOR0888 -DHAVE_FILEIO -DHAVE_BMP_SUPPORT=1 -DHAVE_GIF_SUPPORT=1 -DHAVE_PNM_SUPPORT=1 -DHAVE_XPM_SUPPORT=1 -DLINUX=1 -DUNIX=1 -DUSE_EXPOSURE -DSCREEN_HEIGHT=480 -DSCREEN_WIDTH=640 -DSCREEN_DEPTH=4 -DX11=1"
-            GUI_TK_LIBRARY="$GUI_TK_LIBRARY \$(MICROWIN)/src/lib/libnano-X.a"
-        else
-            GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lX11$xpm_link"
-        fi
-
-        TOOLKIT_VPATH="\${top_srcdir}/src/x11"
-        TOOLKIT=X11
-        GUIDIST=X11_DIST
-    fi
-
-    if test "$wxUSE_WINE" = 1; then
-        ac_safe=`echo "windows.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for windows.h""... $ac_c" 1>&6
-echo "configure:13544: checking for windows.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+        echo $ac_n "checking for XShapeQueryExtension in -lXext""... $ac_c" 1>&6
+echo "configure:14360: checking for XShapeQueryExtension in -lXext" >&5
+ac_lib_var=`echo Xext'_'XShapeQueryExtension | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  cat > conftest.$ac_ext <<EOF
-#line 13549 "configure"
+  ac_save_LIBS="$LIBS"
+LIBS="-lXext $GUI_TK_LIBRARY -lX11 $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 14368 "configure"
 #include "confdefs.h"
-#include <windows.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char XShapeQueryExtension();
+
+int main() {
+XShapeQueryExtension()
+; return 0; }
 EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13554: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
+if { (eval echo configure:14379: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
+  eval "ac_cv_lib_$ac_lib_var=yes"
 else
-  echo "$ac_err" >&5
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
+  eval "ac_cv_lib_$ac_lib_var=no"
 fi
 rm -f conftest*
+LIBS="$ac_save_LIBS"
+
 fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-  :
+  
+                      GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXext"
+                      wxHAVE_XEXT_LIB=1
+                     
 else
   echo "$ac_t""no" 1>&6
-
-            { echo "configure: error: please set CFLAGS to contain the location of windows.h" 1>&2; exit 1; }
-        
 fi
 
 
-        xpm_link=
-        echo $ac_n "checking for Xpm library""... $ac_c" 1>&6
-echo "configure:13581: checking for Xpm library" >&5
-        
-ac_find_libraries=
-for ac_dir in $SEARCH_LIB;
-  do
-    for ac_extension in a so sl dylib; do
-      if test -f "$ac_dir/libXpm.$ac_extension"; then
-        ac_find_libraries=$ac_dir
-        break 2
-      fi
-    done
+        if test "$wxUSE_UNICODE" = "yes"; then
+                
+  succeeded=no
+
+  if test -z "$PKG_CONFIG"; then
+    # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:14411: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  case "$PKG_CONFIG" in
+  /*)
+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  ?:/*)			 
+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a dos path.
+  ;;
+  *)
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do 
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
+      break
+    fi
   done
+  IFS="$ac_save_ifs"
+  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+  ;;
+esac
+fi
+PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+if test -n "$PKG_CONFIG"; then
+  echo "$ac_t""$PKG_CONFIG" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
 
-        if test "$ac_find_libraries" != "" ; then
-            GUI_TK_LIBRARY="-L$ac_find_libraries"
-            xpm_link=" -lXpm"
-            cat >> confdefs.h <<\EOF
-#define wxHAVE_LIB_XPM 1
-EOF
+  fi
 
-            echo "$ac_t""found at $ac_find_libraries" 1>&6
-        else
-            echo "$ac_t""no" 1>&6
-            echo "configure: warning: library will be compiled without support for images in XPM format" 1>&2
-        fi
+  if test "$PKG_CONFIG" = "no" ; then
+     echo "*** The pkg-config script could not be found. Make sure it is"
+     echo "*** in your path, or set the PKG_CONFIG environment variable"
+     echo "*** to the full path to pkg-config."
+     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
+  else
+     PKG_CONFIG_MIN_VERSION=0.9.0
+     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+        echo $ac_n "checking for pangox""... $ac_c" 1>&6
+echo "configure:14455: checking for pangox" >&5
 
-        mesa_link=
-        echo $ac_n "checking for Mesa library""... $ac_c" 1>&6
-echo "configure:13609: checking for Mesa library" >&5
-        
-ac_find_libraries=
-for ac_dir in $SEARCH_LIB;
-  do
-    for ac_extension in a so sl dylib; do
-      if test -f "$ac_dir/libMesaGL.$ac_extension"; then
-        ac_find_libraries=$ac_dir
-        break 2
-      fi
-    done
-  done
+        if $PKG_CONFIG --exists "pangox" ; then
+            echo "$ac_t""yes" 1>&6
+            succeeded=yes
 
-        if test "$ac_find_libraries" != "" ; then
-            GUI_TK_LIBRARY="$GUI_TK_LIBRARY -L$ac_find_libraries"
-            mesa_link=" -lMesaGL"
-            echo "$ac_t""found at $ac_find_libraries" 1>&6
+            echo $ac_n "checking PANGOX_CFLAGS""... $ac_c" 1>&6
+echo "configure:14462: checking PANGOX_CFLAGS" >&5
+            PANGOX_CFLAGS=`$PKG_CONFIG --cflags "pangox"`
+            echo "$ac_t""$PANGOX_CFLAGS" 1>&6
+
+            echo $ac_n "checking PANGOX_LIBS""... $ac_c" 1>&6
+echo "configure:14467: checking PANGOX_LIBS" >&5
+            PANGOX_LIBS=`$PKG_CONFIG --libs "pangox"`
+            echo "$ac_t""$PANGOX_LIBS" 1>&6
         else
-            { echo "configure: error: no" 1>&2; exit 1; }
+            PANGOX_CFLAGS=""
+            PANGOX_LIBS=""
+            ## If we have a custom action on failure, don't print errors, but 
+            ## do set a variable so people can do so.
+            PANGOX_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "pangox"`
+            
         fi
 
-        GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lwine$mesa_link$xpm_link -lXxf86dga -lXxf86vm -lSM -lICE -lXext -lXmu -lX11 -lncurses"
-        TOOLKIT=MSW
-        GUIDIST=MSW_DIST
-        TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WXWINE__"
-    fi
+        
+        
+     else
+        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
+        echo "*** See http://www.freedesktop.org/software/pkgconfig"
+     fi
+  fi
 
-    if test "$wxUSE_MOTIF" = 1; then
+  if test $succeeded = yes; then
+     
+                        CXXFLAGS="$CXXFLAGS $PANGOX_CFLAGS"
+                        LIBS="$LIBS $PANGOX_LIBS"
+                    
+  else
+     
+                        { echo "configure: error: pangox library not found, library cannot be compiled in Unicode mode" 1>&2; exit 1; }
+                    
+                
+  fi
+
+                
+  succeeded=no
+
+  if test -z "$PKG_CONFIG"; then
+    # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:14506: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  case "$PKG_CONFIG" in
+  /*)
+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  ?:/*)			 
+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a dos path.
+  ;;
+  *)
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do 
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+  ;;
+esac
+fi
+PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+if test -n "$PKG_CONFIG"; then
+  echo "$ac_t""$PKG_CONFIG" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+  fi
+
+  if test "$PKG_CONFIG" = "no" ; then
+     echo "*** The pkg-config script could not be found. Make sure it is"
+     echo "*** in your path, or set the PKG_CONFIG environment variable"
+     echo "*** to the full path to pkg-config."
+     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
+  else
+     PKG_CONFIG_MIN_VERSION=0.9.0
+     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+        echo $ac_n "checking for pangoft2""... $ac_c" 1>&6
+echo "configure:14550: checking for pangoft2" >&5
+
+        if $PKG_CONFIG --exists "pangoft2" ; then
+            echo "$ac_t""yes" 1>&6
+            succeeded=yes
+
+            echo $ac_n "checking PANGOFT2_CFLAGS""... $ac_c" 1>&6
+echo "configure:14557: checking PANGOFT2_CFLAGS" >&5
+            PANGOFT2_CFLAGS=`$PKG_CONFIG --cflags "pangoft2"`
+            echo "$ac_t""$PANGOFT2_CFLAGS" 1>&6
+
+            echo $ac_n "checking PANGOFT2_LIBS""... $ac_c" 1>&6
+echo "configure:14562: checking PANGOFT2_LIBS" >&5
+            PANGOFT2_LIBS=`$PKG_CONFIG --libs "pangoft2"`
+            echo "$ac_t""$PANGOFT2_LIBS" 1>&6
+        else
+            PANGOFT2_CFLAGS=""
+            PANGOFT2_LIBS=""
+            ## If we have a custom action on failure, don't print errors, but 
+            ## do set a variable so people can do so.
+            PANGOFT2_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "pangoft2"`
+            
+        fi
+
+        
+        
+     else
+        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
+        echo "*** See http://www.freedesktop.org/software/pkgconfig"
+     fi
+  fi
+
+  if test $succeeded = yes; then
+     
+                        CXXFLAGS="$CXXFLAGS $PANGOFT2_CFLAGS"
+                        LIBS="$LIBS $PANGOFT2_LIBS"
+                    
+  else
+     
+                        echo "configure: warning: pangoft2 library not found, library will be compiled without printing support" 1>&2
+                        wxUSE_PRINTING_ARCHITECTURE="no"
+                    
+                
+  fi
+
+                
+  succeeded=no
+
+  if test -z "$PKG_CONFIG"; then
+    # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:14602: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  case "$PKG_CONFIG" in
+  /*)
+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  ?:/*)			 
+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a dos path.
+  ;;
+  *)
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do 
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+  ;;
+esac
+fi
+PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+if test -n "$PKG_CONFIG"; then
+  echo "$ac_t""$PKG_CONFIG" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+  fi
+
+  if test "$PKG_CONFIG" = "no" ; then
+     echo "*** The pkg-config script could not be found. Make sure it is"
+     echo "*** in your path, or set the PKG_CONFIG environment variable"
+     echo "*** to the full path to pkg-config."
+     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
+  else
+     PKG_CONFIG_MIN_VERSION=0.9.0
+     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+        echo $ac_n "checking for pangoxft""... $ac_c" 1>&6
+echo "configure:14646: checking for pangoxft" >&5
+
+        if $PKG_CONFIG --exists "pangoxft" ; then
+            echo "$ac_t""yes" 1>&6
+            succeeded=yes
+
+            echo $ac_n "checking PANGOXFT_CFLAGS""... $ac_c" 1>&6
+echo "configure:14653: checking PANGOXFT_CFLAGS" >&5
+            PANGOXFT_CFLAGS=`$PKG_CONFIG --cflags "pangoxft"`
+            echo "$ac_t""$PANGOXFT_CFLAGS" 1>&6
+
+            echo $ac_n "checking PANGOXFT_LIBS""... $ac_c" 1>&6
+echo "configure:14658: checking PANGOXFT_LIBS" >&5
+            PANGOXFT_LIBS=`$PKG_CONFIG --libs "pangoxft"`
+            echo "$ac_t""$PANGOXFT_LIBS" 1>&6
+        else
+            PANGOXFT_CFLAGS=""
+            PANGOXFT_LIBS=""
+            ## If we have a custom action on failure, don't print errors, but 
+            ## do set a variable so people can do so.
+            PANGOXFT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "pangoxft"`
+            
+        fi
+
+        
+        
+     else
+        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
+        echo "*** See http://www.freedesktop.org/software/pkgconfig"
+     fi
+  fi
+
+  if test $succeeded = yes; then
+     
+                        CXXFLAGS="$CXXFLAGS $PANGOXFT_CFLAGS"
+                        LIBS="$LIBS $PANGOXFT_LIBS"
+                    
+  else
+     
+                        echo "configure: warning: pangoxft library not found, library will be compiled without anti-aliasing support" 1>&2
+                    
+                
+  fi
+
+        fi
+
+        wxUSE_UNIVERSAL="yes"
+
+        if test "$wxUSE_NANOX" = "yes"; then
+            TOOLKIT_INCLUDE="-I\$(top_srcdir)/include/wx/x11/nanox -I\$(MICROWIN)/src/include $TOOLKIT_INCLUDE"
+            TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__NANOX__ -DMWPIXEL_FORMAT=MWPF_TRUECOLOR0888 -DHAVE_FILEIO -DHAVE_BMP_SUPPORT=1 -DHAVE_GIF_SUPPORT=1 -DHAVE_PNM_SUPPORT=1 -DHAVE_XPM_SUPPORT=1 -DLINUX=1 -DUNIX=1 -DUSE_EXPOSURE -DSCREEN_HEIGHT=480 -DSCREEN_WIDTH=640 -DSCREEN_DEPTH=4 -DX11=1"
+            GUI_TK_LIBRARY="$GUI_TK_LIBRARY \$(MICROWIN)/src/lib/libnano-X.a"
+        else
+            GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lX11$xpm_link"
+        fi
+
+        TOOLKIT_VPATH="\${top_srcdir}/src/x11"
+        TOOLKIT=X11
+        GUIDIST=X11_DIST
+    fi
+
+    if test "$wxUSE_MOTIF" = 1; then
                         if test "$no_x" = yes; then
   # Not all programs may use this symbol, but it does not hurt to define it.
   cat >> confdefs.h <<\EOF
@@ -13653,17 +14724,17 @@ else
     case "`(uname -sr) 2>/dev/null`" in
     "SunOS 5"*)
       echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6
-echo "configure:13657: checking whether -R must be followed by a space" >&5
+echo "configure:14728: checking whether -R must be followed by a space" >&5
       ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries"
       cat > conftest.$ac_ext <<EOF
-#line 13660 "configure"
+#line 14731 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:13667: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14738: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_R_nospace=yes
 else
@@ -13679,14 +14750,14 @@ rm -f conftest*
       else
 	LIBS="$ac_xsave_LIBS -R $x_libraries"
 	cat > conftest.$ac_ext <<EOF
-#line 13683 "configure"
+#line 14754 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:13690: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14761: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_R_space=yes
 else
@@ -13718,7 +14789,7 @@ rm -f conftest*
     # libraries were built with DECnet support.  And karl@cs.umb.edu says
     # the Alpha needs dnet_stub (dnet does not exist).
     echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
-echo "configure:13722: checking for dnet_ntoa in -ldnet" >&5
+echo "configure:14793: checking for dnet_ntoa in -ldnet" >&5
 ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -13726,7 +14797,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ldnet  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 13730 "configure"
+#line 14801 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -13737,7 +14808,7 @@ int main() {
 dnet_ntoa()
 ; return 0; }
 EOF
-if { (eval echo configure:13741: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14812: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -13759,7 +14830,7 @@ fi
 
     if test $ac_cv_lib_dnet_dnet_ntoa = no; then
       echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6
-echo "configure:13763: checking for dnet_ntoa in -ldnet_stub" >&5
+echo "configure:14834: checking for dnet_ntoa in -ldnet_stub" >&5
 ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -13767,7 +14838,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ldnet_stub  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 13771 "configure"
+#line 14842 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -13778,7 +14849,7 @@ int main() {
 dnet_ntoa()
 ; return 0; }
 EOF
-if { (eval echo configure:13782: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14853: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -13807,12 +14878,12 @@ fi
     # The nsl library prevents programs from opening the X display
     # on Irix 5.2, according to dickey@clark.net.
     echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
-echo "configure:13811: checking for gethostbyname" >&5
+echo "configure:14882: checking for gethostbyname" >&5
 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 13816 "configure"
+#line 14887 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname(); below.  */
@@ -13835,7 +14906,7 @@ gethostbyname();
 
 ; return 0; }
 EOF
-if { (eval echo configure:13839: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14910: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_gethostbyname=yes"
 else
@@ -13856,7 +14927,7 @@ fi
 
     if test $ac_cv_func_gethostbyname = no; then
       echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:13860: checking for gethostbyname in -lnsl" >&5
+echo "configure:14931: checking for gethostbyname in -lnsl" >&5
 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -13864,7 +14935,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 13868 "configure"
+#line 14939 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -13875,7 +14946,7 @@ int main() {
 gethostbyname()
 ; return 0; }
 EOF
-if { (eval echo configure:13879: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14950: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -13905,12 +14976,12 @@ fi
     # -lsocket must be given before -lnsl if both are needed.
     # We assume that if connect needs -lnsl, so does gethostbyname.
     echo $ac_n "checking for connect""... $ac_c" 1>&6
-echo "configure:13909: checking for connect" >&5
+echo "configure:14980: checking for connect" >&5
 if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 13914 "configure"
+#line 14985 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char connect(); below.  */
@@ -13933,7 +15004,7 @@ connect();
 
 ; return 0; }
 EOF
-if { (eval echo configure:13937: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15008: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_connect=yes"
 else
@@ -13954,7 +15025,7 @@ fi
 
     if test $ac_cv_func_connect = no; then
       echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
-echo "configure:13958: checking for connect in -lsocket" >&5
+echo "configure:15029: checking for connect in -lsocket" >&5
 ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -13962,7 +15033,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 13966 "configure"
+#line 15037 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -13973,7 +15044,7 @@ int main() {
 connect()
 ; return 0; }
 EOF
-if { (eval echo configure:13977: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15048: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -13997,12 +15068,12 @@ fi
 
     # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX.
     echo $ac_n "checking for remove""... $ac_c" 1>&6
-echo "configure:14001: checking for remove" >&5
+echo "configure:15072: checking for remove" >&5
 if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 14006 "configure"
+#line 15077 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char remove(); below.  */
@@ -14025,7 +15096,7 @@ remove();
 
 ; return 0; }
 EOF
-if { (eval echo configure:14029: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15100: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_remove=yes"
 else
@@ -14046,7 +15117,7 @@ fi
 
     if test $ac_cv_func_remove = no; then
       echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
-echo "configure:14050: checking for remove in -lposix" >&5
+echo "configure:15121: checking for remove in -lposix" >&5
 ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -14054,7 +15125,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lposix  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 14058 "configure"
+#line 15129 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -14065,7 +15136,7 @@ int main() {
 remove()
 ; return 0; }
 EOF
-if { (eval echo configure:14069: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15140: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -14089,12 +15160,12 @@ fi
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
     echo $ac_n "checking for shmat""... $ac_c" 1>&6
-echo "configure:14093: checking for shmat" >&5
+echo "configure:15164: checking for shmat" >&5
 if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 14098 "configure"
+#line 15169 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char shmat(); below.  */
@@ -14117,7 +15188,7 @@ shmat();
 
 ; return 0; }
 EOF
-if { (eval echo configure:14121: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15192: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_shmat=yes"
 else
@@ -14138,7 +15209,7 @@ fi
 
     if test $ac_cv_func_shmat = no; then
       echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
-echo "configure:14142: checking for shmat in -lipc" >&5
+echo "configure:15213: checking for shmat in -lipc" >&5
 ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -14146,7 +15217,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lipc  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 14150 "configure"
+#line 15221 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -14157,7 +15228,7 @@ int main() {
 shmat()
 ; return 0; }
 EOF
-if { (eval echo configure:14161: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15232: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -14190,7 +15261,7 @@ fi
   # libraries we check for below, so use a different variable.
   #  --interran@uluru.Stanford.EDU, kb@cs.umb.edu.
   echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6
-echo "configure:14194: checking for IceConnectionNumber in -lICE" >&5
+echo "configure:15265: checking for IceConnectionNumber in -lICE" >&5
 ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -14198,7 +15269,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 14202 "configure"
+#line 15273 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -14209,7 +15280,7 @@ int main() {
 IceConnectionNumber()
 ; return 0; }
 EOF
-if { (eval echo configure:14213: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15284: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -14238,16 +15309,16 @@ fi
           { echo "configure: error: X11 not found" 1>&2; exit 1; }
         fi
 
-        GUI_TK_LIBRARY="$X_LIBS"
-        TOOLKIT_INCLUDE="$X_CFLAGS"
+                        GUI_TK_LIBRARY=`echo $X_LIBS | sed 's/ -LNONE//'`
+        TOOLKIT_INCLUDE=`echo $X_CFLAGS | sed 's/ -INONE//'`
         AFMINSTALL=afminstall
         COMPILED_X_PROGRAM=0
 
         echo $ac_n "checking for Motif/Lesstif headers""... $ac_c" 1>&6
-echo "configure:14248: checking for Motif/Lesstif headers" >&5
+echo "configure:15319: checking for Motif/Lesstif headers" >&5
         
 ac_find_includes=
-for ac_dir in $SEARCH_INCLUDE;
+for ac_dir in $SEARCH_INCLUDE /usr/include;
   do
     if test -f "$ac_dir/Xm/Xm.h"; then
       ac_find_includes=$ac_dir
@@ -14256,10 +15327,24 @@ for ac_dir in $SEARCH_INCLUDE;
   done
 
         if test "$ac_find_includes" != "" ; then
-            echo "$ac_t""found $ac_find_includes" 1>&6
+            echo "$ac_t""found in $ac_find_includes" 1>&6
+            
+    if test "x$ac_find_includes" = "x/usr/include"; then
+    ac_path_to_include=""
+  else
+    echo "$TOOLKIT_INCLUDE" | grep "\-I$ac_find_includes" > /dev/null
+    result=$?
+    if test $result = 0; then
+      ac_path_to_include=""
+    else
+      ac_path_to_include=" -I$ac_find_includes"
+    fi
+  fi
+
+            TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE$ac_path_to_include"
         else
             cat > conftest.$ac_ext <<EOF
-#line 14263 "configure"
+#line 15348 "configure"
 #include "confdefs.h"
 
                     #include <Xm/Xm.h>
@@ -14271,7 +15356,7 @@ int main() {
                 
 ; return 0; }
 EOF
-if { (eval echo configure:14275: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:15360: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
                     echo "$ac_t""found in default search path" 1>&6
@@ -14292,10 +15377,10 @@ rm -f conftest*
 
         if test "$COMPILED_X_PROGRAM" = 0; then
             echo $ac_n "checking for Motif/Lesstif library""... $ac_c" 1>&6
-echo "configure:14296: checking for Motif/Lesstif library" >&5
+echo "configure:15381: checking for Motif/Lesstif library" >&5
             
 ac_find_libraries=
-for ac_dir in $SEARCH_LIB;
+for ac_dir in $SEARCH_LIB /usr/lib;
   do
     for ac_extension in a so sl dylib; do
       if test -f "$ac_dir/libXm.$ac_extension"; then
@@ -14306,15 +15391,7 @@ for ac_dir in $SEARCH_LIB;
   done
 
             if test "$ac_find_libraries" != "" ; then
-                
-  ac_path_to_include=$ac_find_includes
-  echo "$TOOLKIT_INCLUDE" | grep "\-I$ac_find_includes" > /dev/null
-  result=$?
-  if test $result = 0; then
-    ac_path_to_include=""
-  else
-    ac_path_to_include=" -I$ac_find_includes"
-  fi
+                echo "$ac_t""found at $ac_find_libraries" 1>&6
 
                 
   echo "$GUI_TK_LIBRARY" | grep "\-L$ac_find_libraries" > /dev/null
@@ -14325,13 +15402,13 @@ for ac_dir in $SEARCH_LIB;
     ac_path_to_link=" -L$ac_find_libraries"
   fi
 
-
                 GUI_TK_LIBRARY="$GUI_TK_LIBRARY$ac_path_to_link"
-                TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE$ac_path_to_include"
-                echo "$ac_t""found at $ac_find_libraries" 1>&6
             else
-                                                                cat > conftest.$ac_ext <<EOF
-#line 14335 "configure"
+                                                                save_CFLAGS=$CFLAGS
+                CFLAGS="$CFLAGS $TOOLKIT_INCLUDE"
+
+                cat > conftest.$ac_ext <<EOF
+#line 15412 "configure"
 #include "confdefs.h"
 
                         #include <Xm/Xm.h>
@@ -14343,7 +15420,7 @@ int main() {
                     
 ; return 0; }
 EOF
-if { (eval echo configure:14347: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:15424: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
                         echo "$ac_t""found in default search path" 1>&6
@@ -14360,15 +15437,17 @@ else
                 
 fi
 rm -f conftest*
+
+                CFLAGS=$save_CFLAGS
             fi
         fi
 
         xpm_link=
         echo $ac_n "checking for Xpm library""... $ac_c" 1>&6
-echo "configure:14369: checking for Xpm library" >&5
+echo "configure:15448: checking for Xpm library" >&5
         
 ac_find_libraries=
-for ac_dir in $SEARCH_LIB;
+for ac_dir in $SEARCH_LIB /usr/lib;
   do
     for ac_extension in a so sl dylib; do
       if test -f "$ac_dir/libXpm.$ac_extension"; then
@@ -14389,6 +15468,7 @@ for ac_dir in $SEARCH_LIB;
   fi
 
             GUI_TK_LIBRARY="$GUI_TK_LIBRARY$ac_path_to_link"
+
             xpm_link=" -lXpm"
             cat >> confdefs.h <<\EOF
 #define wxHAVE_LIB_XPM 1
@@ -14396,8 +15476,11 @@ EOF
 
             echo "$ac_t""found at $ac_find_libraries" 1>&6
         else
+            save_CFLAGS=$CFLAGS
+            CFLAGS="$CFLAGS $TOOLKIT_INCLUDE"
+
             cat > conftest.$ac_ext <<EOF
-#line 14401 "configure"
+#line 15484 "configure"
 #include "confdefs.h"
 
                     #include <X11/xpm.h>
@@ -14409,7 +15492,7 @@ int main() {
                 
 ; return 0; }
 EOF
-if { (eval echo configure:14413: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:15496: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
                     xpm_link=" -lXpm"
@@ -14431,32 +15514,180 @@ else
             
 fi
 rm -f conftest*
+
+            CFLAGS=$save_CFLAGS
+        fi
+
+        echo $ac_n "checking if we need -lXp and/or -lSM -lICE""... $ac_c" 1>&6
+echo "configure:15523: checking if we need -lXp and/or -lSM -lICE" >&5
+        libp_link=""
+        libsm_ice_link=""
+        libs_found=0
+        for libp in "" " -lXp"; do
+            if test "$libs_found" = "0"; then
+                for libsm_ice in " -lSM -lICE"; do
+                    if test "$libs_found" = "0"; then
+                        save_LIBS="$LIBS"
+                        LIBS="$GUI_TK_LIBRARY -lXm${xpm_link} ${libp} -lXmu -lXext -lXt${libsm_ice} -lX11"
+                        save_CFLAGS=$CFLAGS
+                        CFLAGS="$CFLAGS $TOOLKIT_INCLUDE"
+
+                        cat > conftest.$ac_ext <<EOF
+#line 15537 "configure"
+#include "confdefs.h"
+
+                                #include <Xm/Xm.h>
+                                #include <Xm/List.h>
+                            
+int main() {
+
+                                XmString string = NULL;
+                                Widget w = NULL;
+                                int position = 0;
+                                XmListAddItem(w, string, position);
+                            
+; return 0; }
+EOF
+if { (eval echo configure:15552: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  
+                                libp_link="$libp"
+                                libsm_ice_link="$libsm_ice"
+                                echo "$ac_t""need${libp_link}${libsm_ice_link}" 1>&6
+                                libs_found=1
+                            
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  
+                        
+fi
+rm -f conftest*
+
+                        LIBS="$save_LIBS"
+                        CFLAGS=$save_CFLAGS
+                    fi
+                done
+            fi
+        done
+
+        if test "$libs_found" = "0"; then
+            echo "$ac_t""can't find the right libraries" 1>&6
+            { echo "configure: error: can't link a simple motif program" 1>&2; exit 1; }
         fi
 
-        GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXm$xpm_link -lXmu -lXext -lXt -lX11"
-        TOOLKIT_VPATH="\${top_srcdir}/src/motif${PATH_IFS}\${top_srcdir}/src/motif/xmcombo"
+        save_CFLAGS=$CFLAGS
+        CFLAGS="$CFLAGS $TOOLKIT_INCLUDE"
+        echo $ac_n "checking for Motif 2""... $ac_c" 1>&6
+echo "configure:15584: checking for Motif 2" >&5
+        cat > conftest.$ac_ext <<EOF
+#line 15586 "configure"
+#include "confdefs.h"
+
+                        #include <Xm/Xm.h>
+                       
+int main() {
+
+                        #if XmVersion < 2000
+                        #error "Not Motif 2"
+                        #endif
+                       
+; return 0; }
+EOF
+if { (eval echo configure:15599: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  
+                        cat >> confdefs.h <<\EOF
+#define __WXMOTIF20__ 1
+EOF
+
+                        echo "$ac_t""found" 1>&6
+                       
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  
+                        cat >> confdefs.h <<\EOF
+#define __WXMOTIF20__ 0
+EOF
+
+                        echo "$ac_t""not found" 1>&6
+                       
+fi
+rm -f conftest*
+        CFLAGS=$save_CFLAGS
+
+        GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXm$xpm_link${libp_link} -lXmu -lXext -lXt${libsm_ice_link} -lX11"
+        TOOLKIT_VPATH="\${top_srcdir}/src/motif${PATH_IFS}\${top_srcdir}/src/motif/xmcombo${PATH_IFS}\${top_srcdir}/src/x11"
         TOOLKIT=MOTIF
         GUIDIST=MOTIF_DIST
+        wxHAVE_XEXT_LIB=1
+    fi
+
+    if test "$wxUSE_X11" = 1 -o "$wxUSE_MOTIF" = 1 &&
+       test "$wxHAVE_XEXT_LIB" = 1; then
+        save_CFLAGS="$CFLAGS"
+        CFLAGS="$CFLAGS $TOOLKIT_INCLUDE"
+
+        echo $ac_n "checking for X11/extensions/shape.h""... $ac_c" 1>&6
+echo "configure:15636: checking for X11/extensions/shape.h" >&5
+        cat > conftest.$ac_ext <<EOF
+#line 15638 "configure"
+#include "confdefs.h"
+
+                        #include <X11/Xlib.h> 
+                        #include <X11/extensions/shape.h>
+                       
+int main() {
+
+                        int dummy1, dummy2;
+                        XShapeQueryExtension((Display*)NULL,
+                                             (int*)NULL, (int*)NULL);
+                       
+; return 0; }
+EOF
+if { (eval echo configure:15652: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  
+                        cat >> confdefs.h <<\EOF
+#define HAVE_XSHAPE 1
+EOF
+
+                        echo "$ac_t""found" 1>&6
+                       
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  
+                        echo "$ac_t""not found" 1>&6
+                       
+fi
+rm -f conftest*
+        CFLAGS="$save_CFLAGS"
     fi
 
     if test "$wxUSE_MAC" = 1; then
-        if test "$wxUSE_PRECOMP" = "yes"; then
-            CPPFLAGS="$CPPFLAGS -cpp-precomp"
-        else
-            CPPFLAGS="$CPPFLAGS -no-cpp-precomp"
-        fi
-        CPPFLAGS="$CPPFLAGS -I/Developer/Headers/FlatCarbon -I\${top_srcdir}/src/mac/morefile"
-        CFLAGS="$CFLAGS -fpascal-strings"
-        CXXFLAGS="$CXXFLAGS -fpascal-strings"
+        CPPFLAGS="$CPPFLAGS -fpascal-strings -I\${top_srcdir}/src/mac/morefilex -I/Developer/Headers/FlatCarbon"
 
-        TOOLKIT_VPATH="\${top_srcdir}/src/mac${PATH_IFS}\${top_srcdir}/src/mac/morefile"
+        TOOLKIT_VPATH="\${top_srcdir}/src/mac${PATH_IFS}\${top_srcdir}/src/mac/morefilex"
         TOOLKIT=MAC
                 GUIDIST=MACX_DIST
     fi
 
+    if test "$wxUSE_COCOA" = 1; then
+        TOOLKIT_VPATH="\${top_srcdir}/src/cocoa"
+        TOOLKIT=COCOA
+        GUIDIST=COCOA_DIST
+    fi
+
     if test "$wxUSE_PM" = 1; then
         TOOLKIT=PM
         GUIDIST=GTK_DIST
+        echo "configure: warning: OS/2 threads are not yet supported... disabled" 1>&2
+        wxUSE_THREADS="no"
     fi
 
         if test "$TOOLKIT" = "PM" ; then
@@ -14547,24 +15778,24 @@ fi
 
 
 if test "$wxUSE_OPENGL" = "yes"; then
-    if test "$wxUSE_MAC" = 1; then
+    if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = "1"; then
         OPENGL_LIBS="-framework OpenGL -framework AGL"
     elif test "$wxUSE_MSW" = 1; then
         OPENGL_LIBS="-lopengl32 -lglu32"
     else
         ac_safe=`echo "GL/gl.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for GL/gl.h""... $ac_c" 1>&6
-echo "configure:14558: checking for GL/gl.h" >&5
+echo "configure:15789: checking for GL/gl.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 14563 "configure"
+#line 15794 "configure"
 #include "confdefs.h"
 #include <GL/gl.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14568: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:15799: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -14581,11 +15812,13 @@ fi
 if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   
+                found_gl=0
+
                 echo $ac_n "checking for -lGL""... $ac_c" 1>&6
-echo "configure:14586: checking for -lGL" >&5
+echo "configure:15819: checking for -lGL" >&5
                 
 ac_find_libraries=
-for ac_dir in $SEARCH_LIB;
+for ac_dir in $SEARCH_LIB /usr/lib;
   do
     for ac_extension in a so sl dylib; do
       if test -f "$ac_dir/libGL.$ac_extension"; then
@@ -14605,20 +15838,50 @@ for ac_dir in $SEARCH_LIB;
     ac_path_to_link=" -L$ac_find_libraries"
   fi
 
-                    if test "$ac_path_to_link" = " -L/usr/lib" ; then
-                        LDFLAGS_GL="$LDFLAGS"
-                    else
-                        LDFLAGS_GL="$LDFLAGS$ac_path_to_link"
+                    if test "$ac_path_to_link" != " -L/usr/lib" ; then
+                        LDFLAGS_GL="$ac_path_to_link"
                     fi
-                    OPENGL_LIBS="-lGL -lGLU"
-                    echo "$ac_t""yes" 1>&6
-                else
-                    echo "$ac_t""no" 1>&6
+
+                                                                                
+ac_find_libraries=
+for ac_dir in $SEARCH_LIB /usr/lib;
+  do
+    for ac_extension in a so sl dylib; do
+      if test -f "$ac_dir/libGLU.$ac_extension"; then
+        ac_find_libraries=$ac_dir
+        break 2
+      fi
+    done
+  done
+
+                    if test "$ac_find_libraries" != "" ; then
+                        
+  echo "$LDFLAGS" | grep "\-L$ac_find_libraries" > /dev/null
+  result=$?
+  if test $result = 0; then
+    ac_path_to_link=""
+  else
+    ac_path_to_link=" -L$ac_find_libraries"
+  fi
+
+                        if test "$ac_path_to_link" != " -L/usr/lib" -a \
+                                    "$ac_path_to_link" != "$LDFLAGS_GL"; then
+                            LDFLAGS_GL="$LDFLAGS_GL$ac_path_to_link"
+                        fi
+
+                        found_gl=1
+                        OPENGL_LIBS="-lGL -lGLU"
+                        echo "$ac_t""yes" 1>&6
+                    fi
+                fi
+
+                if "$found_gl" != 1; then
+                    echo "$ac_t""no" 1>&6
                     echo $ac_n "checking for -lMesaGL""... $ac_c" 1>&6
-echo "configure:14619: checking for -lMesaGL" >&5
+echo "configure:15882: checking for -lMesaGL" >&5
                     
 ac_find_libraries=
-for ac_dir in $SEARCH_LIB;
+for ac_dir in $SEARCH_LIB /usr/lib;
   do
     for ac_extension in a so sl dylib; do
       if test -f "$ac_dir/libMesaGL.$ac_extension"; then
@@ -14687,8 +15950,10 @@ if test "$wxUSE_DEBUG_FLAG" = "yes"; then
     lib_debug_suffix=d
 fi
 
-TOOLCHAIN_NAME="${TOOLKIT_DIR}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}-${WX_RELEASE}"
-TOOLCHAIN_NAME_GL="${TOOLKIT_DIR}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}_gl-${WX_RELEASE}"
+WX_VERSION_TAG=`echo WX${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}_${WX_RELEASE} | tr "[a-z]" "[A-Z]"`
+
+TOOLCHAIN_NAME="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}-${WX_RELEASE}"
+TOOLCHAIN_NAME_GL="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}_gl-${WX_RELEASE}"
 
 if test "$cross_compiling" = "yes"; then
     TOOLCHAIN_NAME="${TOOLCHAIN_NAME}-${host_alias}"
@@ -14697,6 +15962,7 @@ fi
 
 WX_LIBRARY="wx_${TOOLCHAIN_NAME}"
 WX_LIBRARY_GL="wx_${TOOLCHAIN_NAME_GL}"
+WX_LIBRARY_BASENAME="wx_${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}"
 
 WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}.${SO_SUFFIX}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}"
 WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}"
@@ -14711,7 +15977,7 @@ case "${host}" in
 
                         
         
-        if test "$cross_compiling" != "yes"; then
+        if test "$cross_compiling" != "yes" -a "$TOOLKIT_DIR" = "msw"; then
             WX_LIBRARY="wxmsw${WX_MSW_VERSION}${lib_unicode_suffix}${lib_debug_suffix}"
             WX_LIBRARY_GL="wxmsw_gl${WX_MSW_VERSION}${lib_unicode_suffix}${lib_debug_suffix}"
             WX_LIBRARY_NAME_SHARED="${WX_LIBRARY}.${SO_SUFFIX}"
@@ -14723,9 +15989,18 @@ case "${host}" in
         ;;
 
     *-*-darwin* )
+                
+        WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}.${SO_SUFFIX}"
+        WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY_GL}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}.${SO_SUFFIX}"
+
+        WX_LIBRARY_LINK1="lib${WX_LIBRARY}.${WX_CURRENT}.${SO_SUFFIX}"
+        WX_LIBRARY_LINK2="lib${WX_LIBRARY}.${SO_SUFFIX}"
+        WX_LIBRARY_LINK1_GL="lib${WX_LIBRARY_GL}.${WX_CURRENT}.${SO_SUFFIX}"
+        WX_LIBRARY_LINK2_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}"
+
                         if test "$wxUSE_MAC" = 1; then
-                        WX_RESOURCES_MACOSX_ASCII="lib${WX_LIBRARY}.r" 
-            WX_RESOURCES_MACOSX_DATA="lib${WX_LIBRARY}.rsrc"
+                                    WX_RESOURCES_MACOSX_ASCII="lib${WX_LIBRARY}.${WX_CURRENT}.r"
+            WX_RESOURCES_MACOSX_DATA="lib${WX_LIBRARY}.${WX_CURRENT}.rsrc"
         fi
         ;;
 esac
@@ -14767,12 +16042,49 @@ if test "$wxUSE_SHARED" = "yes"; then
                 PIC_FLAG="-fPIC"
     fi
 
+
+        
+  found_versioning=no
+
+                        
+    if test $found_versioning = no ; then
+      echo $ac_n "checking if the linker accepts --version-script""... $ac_c" 1>&6
+echo "configure:16053: checking if the linker accepts --version-script" >&5
+if eval "test \"`echo '$''{'wx_cv_version_script'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  
+        echo "VER_1 { *; };" >conftest.sym
+        echo "int main() { return 0; }" >conftest.cpp
+  
+        if { ac_try='
+                $CXX -o conftest.output $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.cpp
+                -Wl,--version-script,conftest.sym >/dev/null 2>conftest.stderr'; { (eval echo configure:16063: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } ; then
+          if test -s conftest.stderr ; then
+              wx_cv_version_script=no
+          else
+              wx_cv_version_script=yes
+          fi
+        else
+          wx_cv_version_script=no
+        fi
+        rm -f conftest.output conftest.stderr conftest.sym conftest.cpp
+      
+fi
+
+echo "$ac_t""$wx_cv_version_script" 1>&6
+      if test $wx_cv_version_script = yes ; then
+        LDFLAGS_VERSIONING="-Wl,--version-script,\$(top_builddir)/version-script"
+      fi
+  fi
+
+
         SHARED_LD="${CXX} -shared -o"
 
     case "${host}" in
       *-hp-hpux* )
-                if test "$GCC" == "yes"; then
-            SHARED_LD="${SHARED_LD} ${PIC_FLAG}"
+                if test "$GCC" = "yes"; then
+                        SHARED_LD="${CXX} -shared ${PIC_FLAG} -o"
         else
                         LDFLAGS="$LDFLAGS -L/usr/lib"
 
@@ -14791,13 +16103,13 @@ if test "$wxUSE_SHARED" = "yes"; then
       *-*-linux* )
         if test "$GCC" != "yes"; then
             echo $ac_n "checking for Intel compiler""... $ac_c" 1>&6
-echo "configure:14795: checking for Intel compiler" >&5
+echo "configure:16107: checking for Intel compiler" >&5
 if eval "test \"`echo '$''{'wx_cv_prog_icc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
                 cat > conftest.$ac_ext <<EOF
-#line 14801 "configure"
+#line 16113 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -14808,7 +16120,7 @@ int main() {
                     
 ; return 0; }
 EOF
-if { (eval echo configure:14812: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:16124: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   wx_cv_prog_icc=yes
 else
@@ -14847,19 +16159,21 @@ echo "$ac_t""$wx_cv_prog_icc" 1>&6
       ;;
 
       *-*-darwin* )
-                        CFLAGS="$CFLAGS -fno-common -DWXMAKINGDLL"
-        CXXFLAGS="$CXXFLAGS -fno-common -DWXMAKINGDLL"
+                        TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -DWXMAKINGDLL"
+        CFLAGS="$CFLAGS -fno-common"
+        CXXFLAGS="$CXXFLAGS -fno-common"
                                         SHARED_LD="\${top_srcdir}/distrib/mac/shared-ld-sh -undefined suppress -flat_namespace -o"
         PIC_FLAG="-dynamic -fPIC"
-        SONAME_FLAGS="-compatibility_version ${WX_RELEASE} -current_version ${WX_VERSION}"
-        SONAME_FLAGS_GL=${SONAME_FLAGS}
+                                SONAME_FLAGS="-compatibility_version ${WX_RELEASE} -current_version ${WX_VERSION} -install_name \$(libdir)/${WX_LIBRARY_LINK1}"
+        SONAME_FLAGS_GL="-compatibility_version ${WX_RELEASE} -current_version ${WX_VERSION} -install_name \$(libdir)/${WX_LIBRARY_LINK1_GL}"
       ;;
 
       *-*-aix* )
-                        # Extract the first word of "makeC++SharedLib", so it can be a program name with args.
+                if test "$GCC" != "yes"; then
+                                    # Extract the first word of "makeC++SharedLib", so it can be a program name with args.
 set dummy makeC++SharedLib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:14863: checking for $ac_word" >&5
+echo "configure:16177: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AIX_CXX_LD'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -14887,11 +16201,11 @@ else
 fi
 
 
-        SHARED_LD="$(AIX_CXX_LD) -p 0 -o"
+            SHARED_LD="$(AIX_CXX_LD) -p 0 -o"
+        fi
       ;;
 
       *-*-cygwin* | *-*-mingw32* )
-
         WX_LIBRARY_IMPORTLIB="${WX_LIBRARY_NAME_SHARED}.a"
 
         SHARED_LD="${CXX} -shared -Wl,--out-implib,lib/${WX_LIBRARY_IMPORTLIB} -o"
@@ -14899,11 +16213,11 @@ fi
 
         PIC_FLAG="-UWXUSINGDLL -DWXMAKINGDLL=1 -D_DLL=1 -D_WINDLL=1"
 
-                if test "$wxUSE_OPENGL" = "yes"; then
-            WX_ALL_INSTALLED="preinstall_gl"
-            WX_ALL="\$(build_libdir)/${WX_LIBRARY_NAME_SHARED} \$(build_libdir)/${WX_LIBRARY_NAME_SHARED_GL}"
-        else
-            WX_ALL="\$(build_libdir)/${WX_LIBRARY_NAME_SHARED}"
+                WX_ALL="\$(build_libdir)/${WX_LIBRARY_NAME_SHARED}"
+        WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
+
+        if test "$wxUSE_OPENGL" = "yes"; then
+            LIBS="${LIBS} ${OPENGL_LIBS}"
         fi
       ;;
 
@@ -14911,9 +16225,14 @@ fi
                         SHARED_LD="${LD} -shared -o"
       ;;
 
+      *-*-irix* )
+                if test "$GCC" != "yes"; then
+            PIC_FLAG="-KPIC"
+        fi
+      ;;
+
       *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | \
       *-*-sunos4* | \
-      *-*-irix5* | *-*-irix6* | \
       *-*-osf* | \
       *-*-dgux5* | \
       *-*-sysv5* )
@@ -14938,7 +16257,7 @@ if test "$wxUSE_SHARED" = "no"; then
                 WX_ALL_INSTALLED="${WX_ALL_INSTALLED} preinstall"
     fi
 
-    if test "$wxUSE_MAC" = 1; then
+    if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1 ; then
         WX_ALL_INSTALLED="${WX_ALL_INSTALLED} preinstall"
     fi
 
@@ -14954,8 +16273,15 @@ if test "$wxUSE_SHARED" = "no"; then
 
     WX_TARGET_LIBRARY_TYPE="a"
     INSTALL_LIBRARY='$(INSTALL_DATA)'
+
+            STATIC_FLAG="yes"
+else
+    STATIC_FLAG="no"
 fi
 
+MACRESCOMP="@#"
+MACSETFILE="@#"
+MACRESWXCONFIG="#"
 if test "$wxUSE_MAC" = 1; then
         LIBWXMACRES="\$(top_builddir)/lib/${WX_RESOURCES_MACOSX_ASCII}"
     WX_ALL="${WX_ALL} ${LIBWXMACRES}"
@@ -14963,7 +16289,7 @@ if test "$wxUSE_MAC" = 1; then
     # Extract the first word of "Rez", so it can be a program name with args.
 set dummy Rez; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:14967: checking for $ac_word" >&5
+echo "configure:16293: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RESCOMP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -14993,7 +16319,7 @@ fi
     # Extract the first word of "DeRez", so it can be a program name with args.
 set dummy DeRez; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:14997: checking for $ac_word" >&5
+echo "configure:16323: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_DEREZ'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -15020,28 +16346,148 @@ else
   echo "$ac_t""no" 1>&6
 fi
 
+    # Extract the first word of "SetFile", so it can be a program name with args.
+set dummy SetFile; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:16353: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_SETFILE'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test -n "$SETFILE"; then
+  ac_cv_prog_SETFILE="$SETFILE" # Let the user override the test.
+else
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_SETFILE="SetFile"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+  test -z "$ac_cv_prog_SETFILE" && ac_cv_prog_SETFILE="/Developer/Tools/SetFile"
+fi
+fi
+SETFILE="$ac_cv_prog_SETFILE"
+if test -n "$SETFILE"; then
+  echo "$ac_t""$SETFILE" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
     MACOSX_BUNDLE="bundle"
-    if test "$wxUSE_SHARED" = "yes"; then
-                LIBWXMACRESCOMP="\$(RESCOMP) -t APPL Carbon.r -o \$(BIN_PROGRAM)"
-        LIBWXMACRESWXCONFIG="${RESCOMP} -t APPL Carbon.r -o"
-    else
-                LIBWXMACRESCOMP="\$(RESCOMP) -t APPL Carbon.r ${LIBWXMACRES} -o \$(BIN_PROGRAM)"
-        LIBWXMACRESWXCONFIG="${RESCOMP} -t APPL Carbon.r \${prefix}/lib/${WX_RESOURCES_MACOSX_ASCII} -o"
+            MACRESCOMP="\$(RESCOMP) -d __DARWIN__ -t APPL Carbon.r ${LIBWXMACRES} -o"
+    MACSETFILE="\$(SETFILE)"
+    MACRESWXCONFIG="${RESCOMP} -d __DARWIN__ -t APPL Carbon.r \$(top_builddir)/lib/${WX_RESOURCES_MACOSX_ASCII}} -o"
+elif test "$wxUSE_COCOA" = 1; then
+    # Extract the first word of "Rez", so it can be a program name with args.
+set dummy Rez; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:16388: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_RESCOMP'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test -n "$RESCOMP"; then
+  ac_cv_prog_RESCOMP="$RESCOMP" # Let the user override the test.
+else
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_RESCOMP="Rez"
+      break
     fi
+  done
+  IFS="$ac_save_ifs"
+  test -z "$ac_cv_prog_RESCOMP" && ac_cv_prog_RESCOMP="/Developer/Tools/Rez"
+fi
+fi
+RESCOMP="$ac_cv_prog_RESCOMP"
+if test -n "$RESCOMP"; then
+  echo "$ac_t""$RESCOMP" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+    # Extract the first word of "DeRez", so it can be a program name with args.
+set dummy DeRez; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:16418: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_DEREZ'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test -n "$DEREZ"; then
+  ac_cv_prog_DEREZ="$DEREZ" # Let the user override the test.
+else
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_DEREZ="DeRez"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+  test -z "$ac_cv_prog_DEREZ" && ac_cv_prog_DEREZ="/Developer/Tools/DeRez"
+fi
+fi
+DEREZ="$ac_cv_prog_DEREZ"
+if test -n "$DEREZ"; then
+  echo "$ac_t""$DEREZ" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+    # Extract the first word of "SetFile", so it can be a program name with args.
+set dummy SetFile; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:16448: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_SETFILE'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test -n "$SETFILE"; then
+  ac_cv_prog_SETFILE="$SETFILE" # Let the user override the test.
+else
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_SETFILE="SetFile"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+  test -z "$ac_cv_prog_SETFILE" && ac_cv_prog_SETFILE="/Developer/Tools/SetFile"
+fi
+fi
+SETFILE="$ac_cv_prog_SETFILE"
+if test -n "$SETFILE"; then
+  echo "$ac_t""$SETFILE" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+    MACRESCOMP="echo -n | \$(RESCOMP) -d __DARWIN__ -t APPL ${LIBWXMACRES} -o"
+    MACSETFILE="\$(SETFILE)"
+    MACRESWXCONFIG="echo -n | ${RESCOMP} -d __DARWIN__ -t APPL \$(top_builddir)/lib/${WX_RESOURCES_MACOSX_ASCII}} -o"
 else
     if test "$wxUSE_PM" = 1; then
-        LIBWXMACRESCOMP="emxbind -ep \$(BIN_PROGRAM)"
+        MACRESCOMP="emxbind -ep"
     fi
 fi
 
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:15040: checking for ANSI C header files" >&5
+echo "configure:16486: checking for ANSI C header files" >&5
 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 15045 "configure"
+#line 16491 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -15049,7 +16495,7 @@ else
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:15053: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:16499: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -15066,7 +16512,7 @@ rm -f conftest*
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 15070 "configure"
+#line 16516 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -15084,7 +16530,7 @@ fi
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 15088 "configure"
+#line 16534 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -15105,7 +16551,7 @@ if test "$cross_compiling" = yes; then
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 15109 "configure"
+#line 16555 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -15116,7 +16562,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
 exit (0); }
 
 EOF
-if { (eval echo configure:15120: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:16566: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -15140,12 +16586,12 @@ EOF
 fi
 
 echo $ac_n "checking for mode_t""... $ac_c" 1>&6
-echo "configure:15144: checking for mode_t" >&5
+echo "configure:16590: checking for mode_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 15149 "configure"
+#line 16595 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -15173,12 +16619,12 @@ EOF
 fi
 
 echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:15177: checking for off_t" >&5
+echo "configure:16623: checking for off_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 15182 "configure"
+#line 16628 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -15206,12 +16652,12 @@ EOF
 fi
 
 echo $ac_n "checking for pid_t""... $ac_c" 1>&6
-echo "configure:15210: checking for pid_t" >&5
+echo "configure:16656: checking for pid_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 15215 "configure"
+#line 16661 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -15239,12 +16685,12 @@ EOF
 fi
 
 echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:15243: checking for size_t" >&5
+echo "configure:16689: checking for size_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 15248 "configure"
+#line 16694 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -15272,12 +16718,12 @@ EOF
 fi
 
 echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:15276: checking for uid_t in sys/types.h" >&5
+echo "configure:16722: checking for uid_t in sys/types.h" >&5
 if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 15281 "configure"
+#line 16727 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 EOF
@@ -15315,12 +16761,12 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes
 cross_compiling=$ac_cv_prog_cxx_cross
 
 echo $ac_n "checking if size_t is unsigned int""... $ac_c" 1>&6
-echo "configure:15319: checking if size_t is unsigned int" >&5
+echo "configure:16765: checking if size_t is unsigned int" >&5
 if eval "test \"`echo '$''{'wx_cv_size_t_is_uint'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
                           cat > conftest.$ac_ext <<EOF
-#line 15324 "configure"
+#line 16770 "configure"
 #include "confdefs.h"
 #include <stddef.h>
 int main() {
@@ -15333,7 +16779,7 @@ int main() {
         
 ; return 0; }
 EOF
-if { (eval echo configure:15337: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:16783: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   wx_cv_size_t_is_uint=no
 else
@@ -15356,12 +16802,12 @@ EOF
 
 else
     echo $ac_n "checking if size_t is unsigned long""... $ac_c" 1>&6
-echo "configure:15360: checking if size_t is unsigned long" >&5
+echo "configure:16806: checking if size_t is unsigned long" >&5
 if eval "test \"`echo '$''{'wx_cv_size_t_is_ulong'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 15365 "configure"
+#line 16811 "configure"
 #include "confdefs.h"
 #include <stddef.h>
 int main() {
@@ -15374,7 +16820,7 @@ int main() {
             
 ; return 0; }
 EOF
-if { (eval echo configure:15378: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:16824: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   wx_cv_size_t_is_ulong=no
 else
@@ -15408,13 +16854,13 @@ cross_compiling=$ac_cv_prog_cc_cross
 
 
 echo $ac_n "checking for pw_gecos in struct passwd""... $ac_c" 1>&6
-echo "configure:15412: checking for pw_gecos in struct passwd" >&5
+echo "configure:16858: checking for pw_gecos in struct passwd" >&5
 if eval "test \"`echo '$''{'wx_cv_struct_pw_gecos'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
         cat > conftest.$ac_ext <<EOF
-#line 15418 "configure"
+#line 16864 "configure"
 #include "confdefs.h"
 #include <pwd.h>
 int main() {
@@ -15425,7 +16871,7 @@ int main() {
              
 ; return 0; }
 EOF
-if { (eval echo configure:15429: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:16875: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
                 wx_cv_struct_pw_gecos=yes
@@ -15454,18 +16900,23 @@ EOF
 fi
 
 
-WCHAR_OK=0
 if test "$wx_cv_sizeof_wchar_t" != "0"; then
-        WCHAR_LINK=
+    cat >> confdefs.h <<\EOF
+#define wxUSE_WCHAR_T 1
+EOF
+
+
+        WCSLEN_FOUND=0
+    WCHAR_LINK=
     for ac_func in wcslen
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:15464: checking for $ac_func" >&5
+echo "configure:16915: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 15469 "configure"
+#line 16920 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -15488,7 +16939,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:15492: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16943: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -15506,23 +16957,17 @@ if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
   cat >> confdefs.h <<EOF
 #define $ac_tr_func 1
 EOF
- 
-                    cat >> confdefs.h <<\EOF
-#define HAVE_WCSLEN 1
-EOF
-
-                    WCHAR_OK=1
-                  
+ WCSLEN_FOUND=1
 else
   echo "$ac_t""no" 1>&6
 fi
 done
 
 
-    if test "$WCHAR_OK" = 0; then
+    if test "$WCSLEN_FOUND" = 0; then
         if test "$TOOLKIT" = "MSW"; then
             echo $ac_n "checking for wcslen in -lmsvcrt""... $ac_c" 1>&6
-echo "configure:15526: checking for wcslen in -lmsvcrt" >&5
+echo "configure:16971: checking for wcslen in -lmsvcrt" >&5
 ac_lib_var=`echo msvcrt'_'wcslen | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -15530,7 +16975,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lmsvcrt  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 15534 "configure"
+#line 16979 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -15541,7 +16986,7 @@ int main() {
 wcslen()
 ; return 0; }
 EOF
-if { (eval echo configure:15545: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:16990: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -15556,20 +17001,14 @@ LIBS="$ac_save_LIBS"
 fi
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-  
-                cat >> confdefs.h <<\EOF
-#define HAVE_WCSLEN 1
-EOF
-
-                WCHAR_OK=1
-            
+  WCHAR_OK=1
 else
   echo "$ac_t""no" 1>&6
 fi
 
         else
             echo $ac_n "checking for wcslen in -lw""... $ac_c" 1>&6
-echo "configure:15573: checking for wcslen in -lw" >&5
+echo "configure:17012: checking for wcslen in -lw" >&5
 ac_lib_var=`echo w'_'wcslen | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -15577,7 +17016,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lw  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 15581 "configure"
+#line 17020 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -15588,7 +17027,7 @@ int main() {
 wcslen()
 ; return 0; }
 EOF
-if { (eval echo configure:15592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17031: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -15604,12 +17043,8 @@ fi
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   
-                            cat >> confdefs.h <<\EOF
-#define HAVE_WCSLEN 1
-EOF
-
                             WCHAR_LINK=" -lw"
-                            WCHAR_OK=1
+                            WCSLEN_FOUND=1
                         
 else
   echo "$ac_t""no" 1>&6
@@ -15617,23 +17052,23 @@ fi
 
         fi
     fi
-fi
 
-if test "$WCHAR_OK" = 1; then
-    cat >> confdefs.h <<\EOF
-#define wxUSE_WCHAR_T 1
+    if test "$WCSLEN_FOUND" = 1; then
+        cat >> confdefs.h <<\EOF
+#define HAVE_WCSLEN 1
 EOF
 
+    fi
 
             for ac_func in wcsrtombs
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:15632: checking for $ac_func" >&5
+echo "configure:17067: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 15637 "configure"
+#line 17072 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -15656,7 +17091,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:15660: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17095: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -15681,280 +17116,219 @@ fi
 done
 
 else
-        if test "$USE_DARWIN" = 1; then
-        cat >> confdefs.h <<\EOF
-#define wxUSE_WCHAR_T 1
-EOF
-
-    else
-        echo "configure: warning: Wide character support is unavailable" 1>&2
-    fi
+    echo "configure: warning: Wide character support is unavailable" 1>&2
 fi
 
-echo $ac_n "checking for vprintf""... $ac_c" 1>&6
-echo "configure:15696: checking for vprintf" >&5
-if eval "test \"`echo '$''{'ac_cv_func_vprintf'+set}'`\" = set"; then
+
+ac_ext=C
+# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cxx_cross
+
+
+for ac_func in vsnprintf
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:17135: checking for $ac_func" >&5
+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 15701 "configure"
+#line 17140 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char vprintf(); below.  */
+    which can conflict with char $ac_func(); below.  */
 #include <assert.h>
 /* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
 /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
-char vprintf();
+char $ac_func();
 
 int main() {
 
 /* The GNU C library defines this for functions which it implements
     to always fail with ENOSYS.  Some functions are actually named
     something starting with __ and the normal name is an alias.  */
-#if defined (__stub_vprintf) || defined (__stub___vprintf)
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
 choke me
 #else
-vprintf();
+$ac_func();
 #endif
 
 ; return 0; }
 EOF
-if { (eval echo configure:15724: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17166: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  eval "ac_cv_func_vprintf=yes"
+  eval "ac_cv_func_$ac_func=yes"
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  eval "ac_cv_func_vprintf=no"
+  eval "ac_cv_func_$ac_func=no"
 fi
 rm -f conftest*
 fi
 
-if eval "test \"`echo '$ac_cv_func_'vprintf`\" = yes"; then
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-  cat >> confdefs.h <<\EOF
-#define HAVE_VPRINTF 1
+    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
 EOF
-
+ 
 else
   echo "$ac_t""no" 1>&6
 fi
+done
+
 
-if test "$ac_cv_func_vprintf" != yes; then
-echo $ac_n "checking for _doprnt""... $ac_c" 1>&6
-echo "configure:15748: checking for _doprnt" >&5
-if eval "test \"`echo '$''{'ac_cv_func__doprnt'+set}'`\" = set"; then
+if test "$ac_cv_func_vsnprintf" = "yes"; then
+        echo $ac_n "checking for vsnprintf declaration""... $ac_c" 1>&6
+echo "configure:17193: checking for vsnprintf declaration" >&5
+if eval "test \"`echo '$''{'wx_cv_func_vsnprintf_decl'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  cat > conftest.$ac_ext <<EOF
-#line 15753 "configure"
+  
+            cat > conftest.$ac_ext <<EOF
+#line 17199 "configure"
 #include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char _doprnt(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char _doprnt();
 
+                    #include <stdio.h>
+                    #include <stdarg.h>
+                
 int main() {
 
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub__doprnt) || defined (__stub____doprnt)
-choke me
-#else
-_doprnt();
-#endif
-
+                    char *buf;
+                    va_list ap;
+                    vsnprintf(buf, 10u, "%s", ap);
+                
 ; return 0; }
 EOF
-if { (eval echo configure:15776: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17213: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  eval "ac_cv_func__doprnt=yes"
+  wx_cv_func_vsnprintf_decl=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  eval "ac_cv_func__doprnt=no"
+  wx_cv_func_vsnprintf_decl=no
+            
 fi
 rm -f conftest*
+        
+    
 fi
 
-if eval "test \"`echo '$ac_cv_func_'_doprnt`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  cat >> confdefs.h <<\EOF
-#define HAVE_DOPRNT 1
-EOF
+echo "$ac_t""$wx_cv_func_vsnprintf_decl" 1>&6
 
-else
-  echo "$ac_t""no" 1>&6
-fi
+    if test "$wx_cv_func_vsnprintf_decl" = "yes"; then
+        cat >> confdefs.h <<\EOF
+#define HAVE_VSNPRINTF_DECL 1
+EOF
 
+    fi
 fi
 
-
-
-
-
-
-echo $ac_n "checking for vsnprintf""... $ac_c" 1>&6
-echo "configure:15806: checking for vsnprintf" >&5
-if eval "test \"`echo '$''{'wx_cv_func_vsnprintf'+set}'`\" = set"; then
+if test "$wxUSE_UNICODE" = yes; then
+        for ac_func in fputwc wprintf vswprintf
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:17242: checking for $ac_func" >&5
+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
-  
   cat > conftest.$ac_ext <<EOF
-#line 15812 "configure"
-#include "confdefs.h"
-
-                    #include <stdio.h>
-                    #include <stdarg.h>
-                 
-int main() {
-
-                    int wx_test_vsnprintf(const char *, ...);
-
-                    wx_test_vsnprintf("%s");
-                    return 0;
-                 }
-
-                 int wx_test_vsnprintf(const char *fmt, ...)
-                 {
-                    char *s;
-
-                    va_list argp;
-                    va_start(argp, fmt);
-                    vsnprintf(s, 42, fmt, argp);
-                    va_end(argp);
-                 
-; return 0; }
-EOF
-if { (eval echo configure:15837: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  
-                    wx_cv_func_vsnprintf=yes
-                 
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  
-                    cat > conftest.$ac_ext <<EOF
-#line 15848 "configure"
+#line 17247 "configure"
 #include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func(); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char $ac_func();
 
-                                      #include <stdio.h>
-                                      #include <stdarg.h>
-                                   
 int main() {
 
-                                      int wx_test_vsnprintf(const char *, ...);
-
-                                      wx_test_vsnprintf("%s");
-                                      return 0;
-                                   }
-
-                                   int wx_test_vsnprintf(const char *fmt, ...)
-                                   {
-                                      char *s;
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+$ac_func();
+#endif
 
-                                      va_list argp;
-                                      va_start(argp, fmt);
-                                      _vsnprintf(s, 42, fmt, argp);
-                                      va_end(argp);
-                                   
 ; return 0; }
 EOF
-if { (eval echo configure:15873: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17273: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
-  
-                                      wx_cv_func_vsnprintf=yes
-                                   
+  eval "ac_cv_func_$ac_func=yes"
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  
-                                      wx_cv_func_vsnprintf=no
-                                   
-fi
-rm -f conftest*
-                 
+  eval "ac_cv_func_$ac_func=no"
 fi
 rm -f conftest*
-
 fi
 
-echo "$ac_t""$wx_cv_func_vsnprintf" 1>&6
-
-if test "$wx_cv_func_vsnprintf" = yes; then
-    cat >> confdefs.h <<\EOF
-#define HAVE_VSNPRINTF 1
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
 EOF
-
+ 
 else
-    echo "configure: warning: unsafe function vsprintf will be used instead of vsnprintf" 1>&2
+  echo "$ac_t""no" 1>&6
 fi
+done
 
-echo $ac_n "checking for vsscanf""... $ac_c" 1>&6
-echo "configure:15905: checking for vsscanf" >&5
-if eval "test \"`echo '$''{'wx_cv_func_vsscanf'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  
-  cat > conftest.$ac_ext <<EOF
-#line 15911 "configure"
-#include "confdefs.h"
 
-                    #include <stdio.h>
-                    #include <stdarg.h>
-                
+                echo $ac_n "checking for _vsnwprintf""... $ac_c" 1>&6
+echo "configure:17299: checking for _vsnwprintf" >&5
+    cat > conftest.$ac_ext <<EOF
+#line 17301 "configure"
+#include "confdefs.h"
+#include <wchar.h>
 int main() {
-
-                    int wx_test_vsscanf(const char *, ...);
-
-                    wx_test_vsscanf("%d");
-                    return 0;
-                }
-
-                int wx_test_vsscanf(const char *fmt, ...)
-                {
-                    va_list argp;
-                    va_start(argp, fmt);
-                    vsscanf("42", fmt, argp);
-                    va_end(argp);
-                
+&_vsnwprintf;
 ; return 0; }
 EOF
-if { (eval echo configure:15934: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:17308: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  
-                    wx_cv_func_vsscanf=yes
-                
+  echo "$ac_t""yes" 1>&6
+                    cat >> confdefs.h <<\EOF
+#define HAVE__VSNWPRINTF 1
+EOF
+
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  
-                    wx_cv_func_vsscanf=no
-                
+  echo "$ac_t""no" 1>&6
 fi
-rm -f conftest*
-
+rm -f conftest*;
 fi
 
-echo "$ac_t""$wx_cv_func_vsscanf" 1>&6
+ac_ext=c
+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cc_cross
+
 
-if test "$wx_cv_func_vsscanf" = yes; then
-    cat >> confdefs.h <<\EOF
-#define HAVE_VSSCANF 1
-EOF
 
-fi
 
 if test "$TOOLKIT" != "MSW"; then
 
@@ -15982,7 +17356,7 @@ fi
 
 
   echo $ac_n "checking for iconv""... $ac_c" 1>&6
-echo "configure:15986: checking for iconv" >&5
+echo "configure:17360: checking for iconv" >&5
 if eval "test \"`echo '$''{'am_cv_func_iconv'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -15990,7 +17364,7 @@ else
     am_cv_func_iconv="no, consider installing GNU libiconv"
     am_cv_lib_iconv=no
     cat > conftest.$ac_ext <<EOF
-#line 15994 "configure"
+#line 17368 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <iconv.h>
@@ -16000,7 +17374,7 @@ iconv_t cd = iconv_open("","");
        iconv_close(cd);
 ; return 0; }
 EOF
-if { (eval echo configure:16004: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17378: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   am_cv_func_iconv=yes
 else
@@ -16012,7 +17386,7 @@ rm -f conftest*
       am_save_LIBS="$LIBS"
       LIBS="$LIBS -liconv"
       cat > conftest.$ac_ext <<EOF
-#line 16016 "configure"
+#line 17390 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <iconv.h>
@@ -16022,7 +17396,7 @@ iconv_t cd = iconv_open("","");
          iconv_close(cd);
 ; return 0; }
 EOF
-if { (eval echo configure:16026: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17400: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   am_cv_lib_iconv=yes
         am_cv_func_iconv=yes
@@ -16043,12 +17417,12 @@ echo "$ac_t""$am_cv_func_iconv" 1>&6
 EOF
 
     echo $ac_n "checking if iconv needs const""... $ac_c" 1>&6
-echo "configure:16047: checking if iconv needs const" >&5
+echo "configure:17421: checking if iconv needs const" >&5
 if eval "test \"`echo '$''{'wx_cv_func_iconv_const'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 16052 "configure"
+#line 17426 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -16067,7 +17441,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:16071: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:17445: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   wx_cv_func_iconv_const="no"
 else
@@ -16112,12 +17486,12 @@ if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes" -a "$wxUSE_UNIX" = "yes"; then
     for ac_func in sigaction
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:16116: checking for $ac_func" >&5
+echo "configure:17490: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 16121 "configure"
+#line 17495 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -16140,7 +17514,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:16144: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17518: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -16181,13 +17555,13 @@ cross_compiling=$ac_cv_prog_cxx_cross
 
 
       echo $ac_n "checking for sa_handler type""... $ac_c" 1>&6
-echo "configure:16185: checking for sa_handler type" >&5
+echo "configure:17559: checking for sa_handler type" >&5
 if eval "test \"`echo '$''{'wx_cv_type_sa_handler'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
         cat > conftest.$ac_ext <<EOF
-#line 16191 "configure"
+#line 17565 "configure"
 #include "confdefs.h"
 #include <signal.h>
 int main() {
@@ -16199,7 +17573,7 @@ int main() {
                      
 ; return 0; }
 EOF
-if { (eval echo configure:16203: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:17577: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
                         wx_cv_type_sa_handler=int
@@ -16233,71 +17607,15 @@ EOF
     fi
 fi
 
-for ac_func in vfork
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:16240: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 16245 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char $ac_func();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-$ac_func();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:16268: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
-
-
 for ac_func in mkstemp mktemp
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:16296: checking for $ac_func" >&5
+echo "configure:17614: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 16301 "configure"
+#line 17619 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -16320,7 +17638,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:16324: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17642: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -16346,12 +17664,12 @@ done
 
 
 echo $ac_n "checking for statfs""... $ac_c" 1>&6
-echo "configure:16350: checking for statfs" >&5
+echo "configure:17668: checking for statfs" >&5
 if eval "test \"`echo '$''{'wx_cv_func_statfs'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 16355 "configure"
+#line 17673 "configure"
 #include "confdefs.h"
 
              #if defined(__BSD__)
@@ -16372,7 +17690,7 @@ int main() {
         
 ; return 0; }
 EOF
-if { (eval echo configure:16376: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:17694: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
              wx_cv_func_statfs=yes
@@ -16393,45 +17711,38 @@ fi
 echo "$ac_t""$wx_cv_func_statfs" 1>&6
 
 if test "$wx_cv_func_statfs" = "yes"; then
+    wx_cv_type_statvfs_t="struct statfs"
     cat >> confdefs.h <<\EOF
 #define HAVE_STATFS 1
 EOF
 
 else
     echo $ac_n "checking for statvfs""... $ac_c" 1>&6
-echo "configure:16403: checking for statvfs" >&5
+echo "configure:17722: checking for statvfs" >&5
 if eval "test \"`echo '$''{'wx_cv_func_statvfs'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 16408 "configure"
+#line 17727 "configure"
 #include "confdefs.h"
 
-                 #include <sys/statvfs.h>
+                #include <stddef.h>
+                #include <sys/statvfs.h>
             
 int main() {
 
-                 long l;
-                 struct statvfs fs;
-                 statvfs("/", &fs);
-                 l = fs.f_bsize;
-                 l += fs.f_blocks;
-                 l += fs.f_bavail;
+                statvfs("/", NULL);
             
 ; return 0; }
 EOF
-if { (eval echo configure:16424: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:17739: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
-  
-                 wx_cv_func_statvfs=yes
-            
+  wx_cv_func_statvfs=yes
 else
   echo "configure: failed program was:" >&5
   cat conftest.$ac_ext >&5
   rm -rf conftest*
-  
-                 wx_cv_func_statvfs=no
-            
+  wx_cv_func_statvfs=no
         
 fi
 rm -f conftest*
@@ -16441,25 +17752,120 @@ fi
 echo "$ac_t""$wx_cv_func_statvfs" 1>&6
 
     if test "$wx_cv_func_statvfs" = "yes"; then
-        cat >> confdefs.h <<\EOF
+                                                                
+        ac_ext=C
+# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cxx_cross
+
+
+        echo $ac_n "checking for statvfs argument type""... $ac_c" 1>&6
+echo "configure:17766: checking for statvfs argument type" >&5
+if eval "test \"`echo '$''{'wx_cv_type_statvfs_t'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 17771 "configure"
+#include "confdefs.h"
+
+                    #include <sys/statvfs.h>
+                
+int main() {
+
+                    long l;
+                    statvfs_t fs;
+                    statvfs("/", &fs);
+                    l = fs.f_bsize;
+                    l += fs.f_blocks;
+                    l += fs.f_bavail;
+                
+; return 0; }
+EOF
+if { (eval echo configure:17787: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  wx_cv_type_statvfs_t=statvfs_t
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  
+                    cat > conftest.$ac_ext <<EOF
+#line 17796 "configure"
+#include "confdefs.h"
+
+                            #include <sys/statvfs.h>
+                        
+int main() {
+
+                            long l;
+                            struct statvfs fs;
+                            statvfs("/", &fs);
+                            l = fs.f_bsize;
+                            l += fs.f_blocks;
+                            l += fs.f_bavail;
+                        
+; return 0; }
+EOF
+if { (eval echo configure:17812: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  wx_cv_type_statvfs_t="struct statvfs"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  wx_cv_type_statvfs_t="unknown"
+                    
+fi
+rm -f conftest*
+                
+            
+fi
+rm -f conftest*
+        
+fi
+
+echo "$ac_t""$wx_cv_type_statvfs_t" 1>&6
+
+        ac_ext=c
+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cc_cross
+
+
+        if test "$wx_cv_type_statvfs_t" != "unknown"; then
+            cat >> confdefs.h <<\EOF
 #define HAVE_STATVFS 1
 EOF
 
+        fi
     else
-        echo "configure: warning: wxGetDiskSpace() function won't work without statfs()" 1>&2
+                wx_cv_type_statvfs_t="unknown"
     fi
 fi
 
+if test "$wx_cv_type_statvfs_t" != "unknown"; then
+    cat >> confdefs.h <<EOF
+#define WX_STATFS_T $wx_cv_type_statvfs_t
+EOF
+
+else
+    echo "configure: warning: wxGetDiskSpace() function won't work without statfs()" 1>&2
+fi
+
 if test "$wxUSE_SNGLINST_CHECKER" = "yes"; then
     for ac_func in fcntl flock
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:16458: checking for $ac_func" >&5
+echo "configure:17864: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 16463 "configure"
+#line 17869 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -16482,7 +17888,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:16486: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17892: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -16516,12 +17922,12 @@ fi
 for ac_func in timegm
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:16520: checking for $ac_func" >&5
+echo "configure:17926: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 16525 "configure"
+#line 17931 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -16544,7 +17950,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:16548: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:17954: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -16572,12 +17978,12 @@ done
 for ac_func in putenv setenv
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:16576: checking for $ac_func" >&5
+echo "configure:17982: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 16581 "configure"
+#line 17987 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -16600,7 +18006,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:16604: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18010: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -16647,12 +18053,12 @@ if test "$HAVE_SOME_SLEEP_FUNC" != 1; then
     for ac_func in nanosleep
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:16651: checking for $ac_func" >&5
+echo "configure:18057: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 16656 "configure"
+#line 18062 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -16675,7 +18081,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:16679: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18085: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -16700,7 +18106,7 @@ EOF
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for nanosleep in -lposix4""... $ac_c" 1>&6
-echo "configure:16704: checking for nanosleep in -lposix4" >&5
+echo "configure:18110: checking for nanosleep in -lposix4" >&5
 ac_lib_var=`echo posix4'_'nanosleep | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -16708,7 +18114,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lposix4  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 16712 "configure"
+#line 18118 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -16719,7 +18125,7 @@ int main() {
 nanosleep()
 ; return 0; }
 EOF
-if { (eval echo configure:16723: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18129: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -16747,12 +18153,12 @@ else
                     for ac_func in usleep
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:16751: checking for $ac_func" >&5
+echo "configure:18157: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 16756 "configure"
+#line 18162 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -16775,7 +18181,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:16779: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18185: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -16818,12 +18224,12 @@ fi
 for ac_func in uname gethostname
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:16822: checking for $ac_func" >&5
+echo "configure:18228: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 16827 "configure"
+#line 18233 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -16846,7 +18252,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:16850: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18256: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -16883,12 +18289,12 @@ cross_compiling=$ac_cv_prog_cxx_cross
 for ac_func in strtok_r
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:16887: checking for $ac_func" >&5
+echo "configure:18293: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 16892 "configure"
+#line 18298 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -16914,7 +18320,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:16918: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18324: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -16951,12 +18357,12 @@ INET_LINK=
 for ac_func in inet_addr
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:16955: checking for $ac_func" >&5
+echo "configure:18361: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 16960 "configure"
+#line 18366 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -16979,7 +18385,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:16983: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18389: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -17004,7 +18410,7 @@ EOF
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for inet_addr in -lnsl""... $ac_c" 1>&6
-echo "configure:17008: checking for inet_addr in -lnsl" >&5
+echo "configure:18414: checking for inet_addr in -lnsl" >&5
 ac_lib_var=`echo nsl'_'inet_addr | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -17012,7 +18418,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 17016 "configure"
+#line 18422 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -17023,7 +18429,7 @@ int main() {
 inet_addr()
 ; return 0; }
 EOF
-if { (eval echo configure:17027: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18433: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -17042,7 +18448,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for inet_addr in -lresolv""... $ac_c" 1>&6
-echo "configure:17046: checking for inet_addr in -lresolv" >&5
+echo "configure:18452: checking for inet_addr in -lresolv" >&5
 ac_lib_var=`echo resolv'_'inet_addr | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -17050,7 +18456,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lresolv  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 17054 "configure"
+#line 18460 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -17061,7 +18467,7 @@ int main() {
 inet_addr()
 ; return 0; }
 EOF
-if { (eval echo configure:17065: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -17080,7 +18486,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for inet_addr in -lsocket""... $ac_c" 1>&6
-echo "configure:17084: checking for inet_addr in -lsocket" >&5
+echo "configure:18490: checking for inet_addr in -lsocket" >&5
 ac_lib_var=`echo socket'_'inet_addr | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -17088,7 +18494,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 17092 "configure"
+#line 18498 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -17099,7 +18505,7 @@ int main() {
 inet_addr()
 ; return 0; }
 EOF
-if { (eval echo configure:17103: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18509: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -17135,12 +18541,12 @@ done
 for ac_func in inet_aton
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:17139: checking for $ac_func" >&5
+echo "configure:18545: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 17144 "configure"
+#line 18550 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -17163,7 +18569,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:17167: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18573: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -17188,7 +18594,7 @@ EOF
 else
   echo "$ac_t""no" 1>&6
             echo $ac_n "checking for inet_aton in -l$INET_LINK""... $ac_c" 1>&6
-echo "configure:17192: checking for inet_aton in -l$INET_LINK" >&5
+echo "configure:18598: checking for inet_aton in -l$INET_LINK" >&5
 ac_lib_var=`echo $INET_LINK'_'inet_aton | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -17196,7 +18602,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-l$INET_LINK  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 17200 "configure"
+#line 18606 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -17207,7 +18613,7 @@ int main() {
 inet_aton()
 ; return 0; }
 EOF
-if { (eval echo configure:17211: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18617: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -17303,10 +18709,7 @@ if test "$TOOLKIT" != "MSW"; then
     THREADS_CFLAGS=
 
     if test "$wxUSE_THREADS" = "yes" ; then
-        if test "$wxUSE_WINE" = 1 ; then
-            echo "configure: warning: Threads are not supported under WINE... disabled" 1>&2
-            wxUSE_THREADS="no"
-        elif test "$USE_BEOS" = 1; then
+        if test "$USE_BEOS" = 1; then
             echo "configure: warning: BeOS threads are not yet supported... disabled" 1>&2
             wxUSE_THREADS="no"
         fi
@@ -17327,12 +18730,29 @@ if test "$TOOLKIT" != "MSW"; then
           *-*-freebsd*)
                                                 THREAD_OPTS="-kthread lthread $THREAD_OPTS c_r"
                 ;;
-          *-*-darwin*)
-                                THREAD_OPTS=""
+          *-*-darwin* | *-*-cygwin* )
+                                                THREAD_OPTS=""
                 ;;
           *-*-aix*)
                                 THREAD_OPTS="pthreads"
                 ;;
+          *-hp-hpux* )
+                                                                if test "x$GCC" != "xyes"; then
+                    THREAD_OPTS=""
+                fi
+                ;;
+
+          *-*-irix* )
+                                                                if test "x$GCC" = "xyes"; then
+                    THREAD_OPTS=""
+                fi
+                ;;
+
+          *-*-*UnixWare*)
+                                if test "x$GCC" != "xyes"; then
+                    THREAD_OPTS="-Ethread"
+                fi
+                ;;
         esac
 
                                 THREAD_OPTS="$THREAD_OPTS pthread none"
@@ -17342,18 +18762,18 @@ if test "$TOOLKIT" != "MSW"; then
             case $flag in
                 none)
                     echo $ac_n "checking whether pthreads work without any flags""... $ac_c" 1>&6
-echo "configure:17346: checking whether pthreads work without any flags" >&5
+echo "configure:18766: checking whether pthreads work without any flags" >&5
                     ;;
 
                 -*)
                     echo $ac_n "checking whether pthreads work with $flag""... $ac_c" 1>&6
-echo "configure:17351: checking whether pthreads work with $flag" >&5
+echo "configure:18771: checking whether pthreads work with $flag" >&5
                     THREADS_CFLAGS="$flag"
                     ;;
 
                 *)
                     echo $ac_n "checking for the pthreads library -l$flag""... $ac_c" 1>&6
-echo "configure:17357: checking for the pthreads library -l$flag" >&5
+echo "configure:18777: checking for the pthreads library -l$flag" >&5
                     THREADS_LINK="-l$flag"
                     ;;
               esac
@@ -17364,14 +18784,14 @@ echo "configure:17357: checking for the pthreads library -l$flag" >&5
               CFLAGS="$THREADS_CFLAGS $CFLAGS"
 
               cat > conftest.$ac_ext <<EOF
-#line 17368 "configure"
+#line 18788 "configure"
 #include "confdefs.h"
 #include <pthread.h>
 int main() {
 pthread_create(0,0,0,0);
 ; return 0; }
 EOF
-if { (eval echo configure:17375: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18795: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   THREADS_OK=yes
 else
@@ -17396,15 +18816,26 @@ rm -f conftest*
           wxUSE_THREADS=no
           echo "configure: warning: No thread support on this system... disabled" 1>&2
       else
-                              LIBS="$THREADS_LINK $THREADS_CFLAGS $LIBS"
+                              LDFLAGS="$THREADS_CFLAGS $LDFLAGS"
+          LIBS="$THREADS_LINK $LIBS"
 
           echo $ac_n "checking if more special flags are required for pthreads""... $ac_c" 1>&6
-echo "configure:17403: checking if more special flags are required for pthreads" >&5
+echo "configure:18824: checking if more special flags are required for pthreads" >&5
           flag=no
           case "${host}" in
-            *-aix* | *-freebsd*)
+            *-aix*)
+                                                                                                                LDFLAGS="-L/usr/lib/threads $LDFLAGS"
                 flag="-D_THREAD_SAFE"
                 ;;
+            *-freebsd*)
+                flag="-D_THREAD_SAFE"
+                ;;
+            *-hp-hpux* )
+                flag="-D_REENTRANT"
+                if test "x$GCC" != "xyes"; then
+                                        flag="$flag -D_RWSTD_MULTI_THREAD"
+                fi
+                ;;
             *solaris* | alpha*-osf*)
                 flag="-D_REENTRANT"
                 ;;
@@ -17425,12 +18856,12 @@ echo "configure:17403: checking if more special flags are required for pthreads"
       for ac_func in thr_setconcurrency
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:17429: checking for $ac_func" >&5
+echo "configure:18860: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 17434 "configure"
+#line 18865 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -17453,7 +18884,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:17457: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18888: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -17482,17 +18913,17 @@ done
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:17486: checking for $ac_hdr" >&5
+echo "configure:18917: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 17491 "configure"
+#line 18922 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:17496: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:18927: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -17520,12 +18951,12 @@ done
 
       if test "$ac_cv_header_sched_h" = "yes"; then
           echo $ac_n "checking for sched_yield""... $ac_c" 1>&6
-echo "configure:17524: checking for sched_yield" >&5
+echo "configure:18955: checking for sched_yield" >&5
 if eval "test \"`echo '$''{'ac_cv_func_sched_yield'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 17529 "configure"
+#line 18960 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char sched_yield(); below.  */
@@ -17548,7 +18979,7 @@ sched_yield();
 
 ; return 0; }
 EOF
-if { (eval echo configure:17552: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:18983: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_sched_yield=yes"
 else
@@ -17570,7 +19001,7 @@ else
   echo "$ac_t""no" 1>&6
 
                 echo $ac_n "checking for sched_yield in -lposix4""... $ac_c" 1>&6
-echo "configure:17574: checking for sched_yield in -lposix4" >&5
+echo "configure:19005: checking for sched_yield in -lposix4" >&5
 ac_lib_var=`echo posix4'_'sched_yield | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -17578,7 +19009,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lposix4  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 17582 "configure"
+#line 19013 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -17589,7 +19020,7 @@ int main() {
 sched_yield()
 ; return 0; }
 EOF
-if { (eval echo configure:17593: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:19024: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -17622,12 +19053,12 @@ fi
 
                                           HAVE_PRIOR_FUNCS=0
       echo $ac_n "checking for pthread_attr_getschedpolicy""... $ac_c" 1>&6
-echo "configure:17626: checking for pthread_attr_getschedpolicy" >&5
+echo "configure:19057: checking for pthread_attr_getschedpolicy" >&5
 if eval "test \"`echo '$''{'ac_cv_func_pthread_attr_getschedpolicy'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 17631 "configure"
+#line 19062 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char pthread_attr_getschedpolicy(); below.  */
@@ -17650,7 +19081,7 @@ pthread_attr_getschedpolicy();
 
 ; return 0; }
 EOF
-if { (eval echo configure:17654: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:19085: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_pthread_attr_getschedpolicy=yes"
 else
@@ -17665,12 +19096,12 @@ fi
 if eval "test \"`echo '$ac_cv_func_'pthread_attr_getschedpolicy`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   echo $ac_n "checking for pthread_attr_setschedparam""... $ac_c" 1>&6
-echo "configure:17669: checking for pthread_attr_setschedparam" >&5
+echo "configure:19100: checking for pthread_attr_setschedparam" >&5
 if eval "test \"`echo '$''{'ac_cv_func_pthread_attr_setschedparam'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 17674 "configure"
+#line 19105 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char pthread_attr_setschedparam(); below.  */
@@ -17693,7 +19124,7 @@ pthread_attr_setschedparam();
 
 ; return 0; }
 EOF
-if { (eval echo configure:17697: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:19128: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_pthread_attr_setschedparam=yes"
 else
@@ -17708,12 +19139,12 @@ fi
 if eval "test \"`echo '$ac_cv_func_'pthread_attr_setschedparam`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   echo $ac_n "checking for sched_get_priority_max""... $ac_c" 1>&6
-echo "configure:17712: checking for sched_get_priority_max" >&5
+echo "configure:19143: checking for sched_get_priority_max" >&5
 if eval "test \"`echo '$''{'ac_cv_func_sched_get_priority_max'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 17717 "configure"
+#line 19148 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes
 else
@@ -17738,7 +19169,7 @@ sched_get_priority_max();
 
 ; return 0; }
 EOF
-if { (eval echo configure:17742: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:19173: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_sched_get_priority_max=yes"
 else
@@ -17756,7 +19187,7 @@ if eval "test \"`echo '$ac_cv_func_'sched_get_priority_max`\" = yes"; then
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for sched_get_priority_max in -lposix4""... $ac_c" 1>&6
-echo "configure:17760: checking for sched_get_priority_max in -lposix4" >&5
+echo "configure:19191: checking for sched_get_priority_max in -lposix4" >&5
 ac_lib_var=`echo posix4'_'sched_get_priority_max | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -17764,7 +19195,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lposix4  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 17768 "configure"
+#line 19199 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -17775,7 +19206,7 @@ int main() {
 sched_get_priority_max()
 ; return 0; }
 EOF
-if { (eval echo configure:17779: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:19210: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -17820,12 +19251,12 @@ EOF
       fi
 
       echo $ac_n "checking for pthread_cancel""... $ac_c" 1>&6
-echo "configure:17824: checking for pthread_cancel" >&5
+echo "configure:19255: checking for pthread_cancel" >&5
 if eval "test \"`echo '$''{'ac_cv_func_pthread_cancel'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 17829 "configure"
+#line 19260 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char pthread_cancel(); below.  */
@@ -17848,7 +19279,7 @@ pthread_cancel();
 
 ; return 0; }
 EOF
-if { (eval echo configure:17852: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:19283: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_pthread_cancel=yes"
 else
@@ -17873,13 +19304,13 @@ fi
 
 
       echo $ac_n "checking for pthread_cleanup_push/pop""... $ac_c" 1>&6
-echo "configure:17877: checking for pthread_cleanup_push/pop" >&5
+echo "configure:19308: checking for pthread_cleanup_push/pop" >&5
 if eval "test \"`echo '$''{'wx_cv_func_pthread_cleanup_push'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
         cat > conftest.$ac_ext <<EOF
-#line 17883 "configure"
+#line 19314 "configure"
 #include "confdefs.h"
 #include <pthread.h>
 int main() {
@@ -17889,7 +19320,7 @@ int main() {
                      
 ; return 0; }
 EOF
-if { (eval echo configure:17893: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:19324: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
                         wx_cv_func_pthread_cleanup_push=yes
@@ -17916,18 +19347,14 @@ EOF
       fi
 
                                                 
-                              if test "x$wx_cv_lib_glibc21" = "xyes"; then
-          CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
-      fi
-
       echo $ac_n "checking for pthread_mutexattr_t""... $ac_c" 1>&6
-echo "configure:17925: checking for pthread_mutexattr_t" >&5
+echo "configure:19352: checking for pthread_mutexattr_t" >&5
 if eval "test \"`echo '$''{'wx_cv_type_pthread_mutexattr_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
         cat > conftest.$ac_ext <<EOF
-#line 17931 "configure"
+#line 19358 "configure"
 #include "confdefs.h"
 #include <pthread.h>
 int main() {
@@ -17937,7 +19364,7 @@ int main() {
             
 ; return 0; }
 EOF
-if { (eval echo configure:17941: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:19368: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
                wx_cv_type_pthread_mutexattr_t=yes
@@ -17964,13 +19391,13 @@ EOF
 
       else
                 echo $ac_n "checking for PTHREAD_RECURSIVE_MUTEX_INITIALIZER""... $ac_c" 1>&6
-echo "configure:17968: checking for PTHREAD_RECURSIVE_MUTEX_INITIALIZER" >&5
+echo "configure:19395: checking for PTHREAD_RECURSIVE_MUTEX_INITIALIZER" >&5
 if eval "test \"`echo '$''{'wx_cv_type_pthread_rec_mutex_init'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
             cat > conftest.$ac_ext <<EOF
-#line 17974 "configure"
+#line 19401 "configure"
 #include "confdefs.h"
 #include <pthread.h>
 int main() {
@@ -17979,7 +19406,7 @@ int main() {
                 
 ; return 0; }
 EOF
-if { (eval echo configure:17983: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:19410: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
                     wx_cv_type_pthread_rec_mutex_init=yes
@@ -18009,6 +19436,53 @@ EOF
       fi
     fi
 
+else
+    if test "$wxUSE_THREADS" = "yes" ; then
+      case "${host}" in
+        *-*-mingw32* )
+                        echo $ac_n "checking if compiler supports -mthreads""... $ac_c" 1>&6
+echo "configure:19445: checking if compiler supports -mthreads" >&5
+if eval "test \"`echo '$''{'wx_cv_cflags_mthread'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  
+                    CFLAGS_OLD="$CFLAGS"
+                    CFLAGS="$CFLAGS -mthreads"
+                    cat > conftest.$ac_ext <<EOF
+#line 19453 "configure"
+#include "confdefs.h"
+
+int main() {
+
+; return 0; }
+EOF
+if { (eval echo configure:19460: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  wx_cv_cflags_mthread=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  wx_cv_cflags_mthread=no
+                    
+fi
+rm -f conftest*
+                
+            
+fi
+
+echo "$ac_t""$wx_cv_cflags_mthread" 1>&6
+
+            if test "$wx_cv_cflags_mthread" = "yes"; then
+                                CXXFLAGS="$CXXFLAGS -mthreads"
+                TOOLCHAIN_DEFS="$TOOLCHAIN_DEFS -mthreads"
+                LDFLAGS="$LDFLAGS -mthreads"
+            else
+                                CFLAGS="$CFLAGS_OLD"
+            fi
+        ;;
+      esac
+    fi
 fi
 
 if test "$wxUSE_THREADS" = "yes"; then
@@ -18021,7 +19495,7 @@ EOF
 else
       if test "$ac_cv_func_strtok_r" = "yes"; then
     echo $ac_n "checking if -D_REENTRANT is needed""... $ac_c" 1>&6
-echo "configure:18025: checking if -D_REENTRANT is needed" >&5
+echo "configure:19499: checking if -D_REENTRANT is needed" >&5
     if test "$NEEDS_D_REENTRANT_FOR_R_FUNCS" = 1; then
         TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D_REENTRANT"
         echo "$ac_t""yes" 1>&6
@@ -18121,19 +19595,26 @@ if test "$GCC" = "yes" ; then
         CODE_GEN_FLAGS="$CODE_GEN_FLAGS -fno-pcc-struct-return"
     fi
 
-                            case "${host}" in
+                                                case "${host}" in
       powerpc*-*-aix* )
         CODE_GEN_FLAGS="$CODE_GEN_FLAGS -mminimal-toc"
         ;;
+      *-hppa* )
+        CODE_GEN_FLAGS="$CODE_GEN_FLAGS -ffunction-sections"
+        ;;
     esac
 fi
 
+OPTIMISE=
 if test "$wxUSE_OPTIMISE" = "no" ; then
-    OPTIMISE=
+    if test "$GCC" = yes ; then
+                        OPTIMISE="-O0"
+    fi
 else
     if test "$GCC" = yes ; then
         OPTIMISE="-O2"
-        case "${host}" in
+
+                case "${host}" in
             i586-*-*|i686-*-* )
             OPTIMISE="${OPTIMISE} "
         ;;
@@ -18143,6 +19624,7 @@ else
     fi
 fi
 
+
 if test "$WXWIN_COMPATIBILITY_2" = "yes"; then
     cat >> confdefs.h <<\EOF
 #define WXWIN_COMPATIBILITY_2 1
@@ -18152,11 +19634,20 @@ EOF
     WXWIN_COMPATIBILITY_2_2="yes"
 fi
 
-if test "x$WXWIN_COMPATIBILITY_2_2" != "xno"; then
+if test "x$WXWIN_COMPATIBILITY_2_2" = "xyes"; then
     cat >> confdefs.h <<\EOF
 #define WXWIN_COMPATIBILITY_2_2 1
 EOF
 
+
+    WXWIN_COMPATIBILITY_2_4="yes"
+fi
+
+if test "x$WXWIN_COMPATIBILITY_2_4" != "xno"; then
+    cat >> confdefs.h <<\EOF
+#define WXWIN_COMPATIBILITY_2_4 1
+EOF
+
 fi
 
 
@@ -18224,13 +19715,6 @@ EOF
 
 fi
 
-if test "$wxUSE_TIMEDATE" = "yes"; then
-  cat >> confdefs.h <<\EOF
-#define wxUSE_TIMEDATE 1
-EOF
-
-fi
-
 if test "$wxUSE_FILE" = "yes"; then
   cat >> confdefs.h <<\EOF
 #define wxUSE_FILE 1
@@ -18406,12 +19890,12 @@ if test "$wxUSE_DATETIME" = "yes"; then
         for ac_func in strptime
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:18410: checking for $ac_func" >&5
+echo "configure:19894: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 18415 "configure"
+#line 19899 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -18434,7 +19918,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:18438: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:19922: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -18460,13 +19944,13 @@ done
 
 
             echo $ac_n "checking for timezone variable in <time.h>""... $ac_c" 1>&6
-echo "configure:18464: checking for timezone variable in <time.h>" >&5
+echo "configure:19948: checking for timezone variable in <time.h>" >&5
 if eval "test \"`echo '$''{'wx_cv_var_timezone'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
                         cat > conftest.$ac_ext <<EOF
-#line 18470 "configure"
+#line 19954 "configure"
 #include "confdefs.h"
 
                                 #include <time.h>
@@ -18478,7 +19962,7 @@ int main() {
                             
 ; return 0; }
 EOF
-if { (eval echo configure:18482: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:19966: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
                                 wx_cv_var_timezone=timezone
@@ -18489,7 +19973,7 @@ else
   rm -rf conftest*
   
                                 cat > conftest.$ac_ext <<EOF
-#line 18493 "configure"
+#line 19977 "configure"
 #include "confdefs.h"
 
                                         #include <time.h>
@@ -18501,7 +19985,7 @@ int main() {
                                     
 ; return 0; }
 EOF
-if { (eval echo configure:18505: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:19989: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
                                         wx_cv_var_timezone=_timezone
@@ -18512,7 +19996,7 @@ else
   rm -rf conftest*
   
                                         cat > conftest.$ac_ext <<EOF
-#line 18516 "configure"
+#line 20000 "configure"
 #include "confdefs.h"
 
                                                 #include <time.h>
@@ -18524,7 +20008,7 @@ int main() {
                                             
 ; return 0; }
 EOF
-if { (eval echo configure:18528: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:20012: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
                                                 wx_cv_var_timezone=__timezone
@@ -18565,12 +20049,12 @@ EOF
         for ac_func in localtime
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:18569: checking for $ac_func" >&5
+echo "configure:20053: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 18574 "configure"
+#line 20058 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -18593,7 +20077,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:18597: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:20081: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -18620,13 +20104,13 @@ done
 
     if test "$ac_cv_func_localtime" = "yes"; then
         echo $ac_n "checking for tm_gmtoff in struct tm""... $ac_c" 1>&6
-echo "configure:18624: checking for tm_gmtoff in struct tm" >&5
+echo "configure:20108: checking for tm_gmtoff in struct tm" >&5
 if eval "test \"`echo '$''{'wx_cv_struct_tm_has_gmtoff'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   
             cat > conftest.$ac_ext <<EOF
-#line 18630 "configure"
+#line 20114 "configure"
 #include "confdefs.h"
 
                     #include <time.h>
@@ -18638,7 +20122,7 @@ int main() {
                 
 ; return 0; }
 EOF
-if { (eval echo configure:18642: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:20126: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
                     wx_cv_struct_tm_has_gmtoff=yes
@@ -18667,12 +20151,12 @@ EOF
             for ac_func in gettimeofday ftime
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:18671: checking for $ac_func" >&5
+echo "configure:20155: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 18676 "configure"
+#line 20160 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -18695,7 +20179,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:18699: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:20183: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -18722,7 +20206,7 @@ done
 
     if test "$ac_cv_func_gettimeofday" = "yes"; then
         echo $ac_n "checking whether gettimeofday takes two arguments""... $ac_c" 1>&6
-echo "configure:18726: checking whether gettimeofday takes two arguments" >&5
+echo "configure:20210: checking whether gettimeofday takes two arguments" >&5
 if eval "test \"`echo '$''{'wx_cv_func_gettimeofday_has_2_args'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -18737,7 +20221,7 @@ cross_compiling=$ac_cv_prog_cxx_cross
 
 
             cat > conftest.$ac_ext <<EOF
-#line 18741 "configure"
+#line 20225 "configure"
 #include "confdefs.h"
 
                     #include <sys/time.h>
@@ -18750,7 +20234,7 @@ int main() {
                 
 ; return 0; }
 EOF
-if { (eval echo configure:18754: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:20238: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   wx_cv_func_gettimeofday_has_2_args=yes
 else
@@ -18758,7 +20242,7 @@ else
   cat conftest.$ac_ext >&5
   rm -rf conftest*
   cat > conftest.$ac_ext <<EOF
-#line 18762 "configure"
+#line 20246 "configure"
 #include "confdefs.h"
 
                         #include <sys/time.h>
@@ -18771,7 +20255,7 @@ int main() {
                     
 ; return 0; }
 EOF
-if { (eval echo configure:18775: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:20259: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   wx_cv_func_gettimeofday_has_2_args=no
 else
@@ -18808,17 +20292,13 @@ EOF
         fi
     fi
 
-    cat >> confdefs.h <<\EOF
-#define wxUSE_TIMEDATE 1
-EOF
-
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS typetest"
 fi
 
 
 if test "$wxUSE_SOCKETS" = "yes"; then
-    if test "$TOOLKIT" = "X11"; then
-        echo "configure: warning: wxSocket not yet supported under X11... disabled" 1>&2
+    if test "$wxUSE_MGL" = "1"; then
+        echo "configure: warning: wxSocket not yet supported under MGL... disabled" 1>&2
         wxUSE_SOCKETS="no"
     fi
 fi
@@ -18826,12 +20306,12 @@ fi
 if test "$wxUSE_SOCKETS" = "yes"; then
         if test "$TOOLKIT" != "MSW"; then
                 echo $ac_n "checking for socket""... $ac_c" 1>&6
-echo "configure:18830: checking for socket" >&5
+echo "configure:20310: checking for socket" >&5
 if eval "test \"`echo '$''{'ac_cv_func_socket'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 18835 "configure"
+#line 20315 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char socket(); below.  */
@@ -18854,7 +20334,7 @@ socket();
 
 ; return 0; }
 EOF
-if { (eval echo configure:18858: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:20338: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_socket=yes"
 else
@@ -18872,7 +20352,7 @@ if eval "test \"`echo '$ac_cv_func_'socket`\" = yes"; then
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
-echo "configure:18876: checking for socket in -lsocket" >&5
+echo "configure:20356: checking for socket in -lsocket" >&5
 ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -18880,7 +20360,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 18884 "configure"
+#line 20364 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -18891,7 +20371,7 @@ int main() {
 socket()
 ; return 0; }
 EOF
-if { (eval echo configure:18895: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:20375: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -18927,7 +20407,7 @@ fi
 if test "$wxUSE_SOCKETS" = "yes" ; then
                 if test "$TOOLKIT" != "MSW"; then
                 echo $ac_n "checking what is the type of the third argument of getsockname""... $ac_c" 1>&6
-echo "configure:18931: checking what is the type of the third argument of getsockname" >&5
+echo "configure:20411: checking what is the type of the third argument of getsockname" >&5
 if eval "test \"`echo '$''{'wx_cv_type_getsockname3'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -18942,7 +20422,7 @@ cross_compiling=$ac_cv_prog_cxx_cross
 
 
                 cat > conftest.$ac_ext <<EOF
-#line 18946 "configure"
+#line 20426 "configure"
 #include "confdefs.h"
 
                         #include <sys/types.h>
@@ -18955,7 +20435,7 @@ int main() {
                     
 ; return 0; }
 EOF
-if { (eval echo configure:18959: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:20439: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   wx_cv_type_getsockname3=socklen_t
 else
@@ -18963,7 +20443,7 @@ else
   cat conftest.$ac_ext >&5
   rm -rf conftest*
   cat > conftest.$ac_ext <<EOF
-#line 18967 "configure"
+#line 20447 "configure"
 #include "confdefs.h"
 
                             #include <sys/types.h>
@@ -18976,7 +20456,7 @@ int main() {
                         
 ; return 0; }
 EOF
-if { (eval echo configure:18980: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:20460: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   wx_cv_type_getsockname3=size_t
 else
@@ -18984,7 +20464,7 @@ else
   cat conftest.$ac_ext >&5
   rm -rf conftest*
   cat > conftest.$ac_ext <<EOF
-#line 18988 "configure"
+#line 20468 "configure"
 #include "confdefs.h"
 
                                 #include <sys/types.h>
@@ -18997,7 +20477,7 @@ int main() {
                             
 ; return 0; }
 EOF
-if { (eval echo configure:19001: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:20481: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   wx_cv_type_getsockname3=int
 else
@@ -19050,7 +20530,7 @@ fi
 
 if test "$wxUSE_GUI" = "yes"; then
 
-    if test "$TOOLKIT" = "MAC"; then
+    if test "$TOOLKIT" = "MAC" -o "$TOOLKIT" = "COCOA"; then
         echo "configure: warning: Joystick not yet supported under Mac OS X... disabled" 1>&2
         wxUSE_JOYSTICK=no
      fi
@@ -19069,17 +20549,17 @@ if test "$wxUSE_GUI" = "yes"; then
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:19073: checking for $ac_hdr" >&5
+echo "configure:20553: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 19078 "configure"
+#line 20558 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:19083: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:20563: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -19133,12 +20613,12 @@ if test "$TOOLKIT" != "MSW"; then
                                                 for ac_func in dlopen
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:19137: checking for $ac_func" >&5
+echo "configure:20617: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 19142 "configure"
+#line 20622 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -19161,7 +20641,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:19165: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:20645: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -19189,7 +20669,7 @@ EOF
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:19193: checking for dlopen in -ldl" >&5
+echo "configure:20673: checking for dlopen in -ldl" >&5
 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -19197,7 +20677,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ldl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 19201 "configure"
+#line 20681 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -19208,7 +20688,7 @@ int main() {
 dlopen()
 ; return 0; }
 EOF
-if { (eval echo configure:19212: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:20692: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -19237,12 +20717,12 @@ else
                                 for ac_func in shl_load
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:19241: checking for $ac_func" >&5
+echo "configure:20721: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 19246 "configure"
+#line 20726 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -19265,7 +20745,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:19269: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:20749: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -19293,7 +20773,7 @@ EOF
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for dld in -lshl_load""... $ac_c" 1>&6
-echo "configure:19297: checking for dld in -lshl_load" >&5
+echo "configure:20777: checking for dld in -lshl_load" >&5
 ac_lib_var=`echo shl_load'_'dld | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -19301,7 +20781,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lshl_load  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 19305 "configure"
+#line 20785 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -19312,7 +20792,7 @@ int main() {
 dld()
 ; return 0; }
 EOF
-if { (eval echo configure:19316: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:20796: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -19351,12 +20831,12 @@ done
             for ac_func in dlerror
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:19355: checking for $ac_func" >&5
+echo "configure:20835: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 19360 "configure"
+#line 20840 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -19379,7 +20859,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:19383: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:20863: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -19404,7 +20884,7 @@ EOF
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for dlerror in -ldl""... $ac_c" 1>&6
-echo "configure:19408: checking for dlerror in -ldl" >&5
+echo "configure:20888: checking for dlerror in -ldl" >&5
 ac_lib_var=`echo dl'_'dlerror | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -19412,7 +20892,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ldl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 19416 "configure"
+#line 20896 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -19423,7 +20903,7 @@ int main() {
 dlerror()
 ; return 0; }
 EOF
-if { (eval echo configure:19427: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:20907: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -19491,14 +20971,14 @@ if test "$wxUSE_UNICODE" = "yes" ; then
 #define wxUSE_UNICODE 1
 EOF
 
-  
+
   if test "$wxUSE_MSW" != 1; then
       wxUSE_UNICODE_MSLU=no
   fi
 
   if test "$wxUSE_MSW" = 1 -a "$wxUSE_UNICODE_MSLU" = "yes"; then
         echo $ac_n "checking for main in -lunicows""... $ac_c" 1>&6
-echo "configure:19502: checking for main in -lunicows" >&5
+echo "configure:20982: checking for main in -lunicows" >&5
 ac_lib_var=`echo unicows'_'main | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -19506,14 +20986,14 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lunicows  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 19510 "configure"
+#line 20990 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:19517: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:20997: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -19593,18 +21073,15 @@ EOF
 fi
 
 if test "$wxUSE_MDI_ARCHITECTURE" = "yes"; then
-    if test "$wxUSE_UNIVERSAL" = "yes"; then
-        echo "configure: warning: MDI not yet supported for wxUniversal... disabled" 1>&2
-        wxUSE_MDI_ARCHITECTURE=no
-    fi
 
-    if test "$wxUSE_MDI_ARCHITECTURE" = "yes"; then
-        cat >> confdefs.h <<\EOF
+
+   if test "$wxUSE_MDI_ARCHITECTURE" = "yes"; then
+       cat >> confdefs.h <<\EOF
 #define wxUSE_MDI_ARCHITECTURE 1
 EOF
 
-        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS mdi"
-    fi
+       SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS mdi"
+   fi
 fi
 
 if test "$wxUSE_DOC_VIEW_ARCHITECTURE" = "yes" ; then
@@ -19659,24 +21136,7 @@ EOF
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS printing"
 fi
 
-if test "$wxUSE_PROLOGIO" = "yes" ; then
-    cat >> confdefs.h <<\EOF
-#define wxUSE_PROLOGIO 1
-EOF
-
-fi
-
-if test "$wxUSE_RESOURCES" = "yes" ; then
-    if test "$wxUSE_NANOX" = "yes"; then
-        echo "configure: warning: Cannot use resource database functions in NanoX" 1>&2
-	else
-		cat >> confdefs.h <<\EOF
-#define wxUSE_RESOURCES 1
-EOF
 
-		SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS resource"
-    fi
-fi
 
 if test "$wxUSE_X_RESOURCES" = "yes"; then
     cat >> confdefs.h <<\EOF
@@ -19688,22 +21148,23 @@ fi
 
 if test "$wxUSE_MSW" = 1 -a \( "$wxUSE_DATAOBJ"       = "yes" \
                           -o "$wxUSE_CLIPBOARD"     = "yes" \
+                          -o "$wxUSE_OLE"     = "yes" \
                           -o "$wxUSE_DRAG_AND_DROP" = "yes" \) ; then
     for ac_hdr in ole2.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:19697: checking for $ac_hdr" >&5
+echo "configure:21158: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 19702 "configure"
+#line 21163 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:19707: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:21168: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -19732,8 +21193,45 @@ done
 
     if test "$ac_cv_header_ole2_h" = "yes" ; then
         if test "$GCC" = yes ; then
+            
+            ac_ext=C
+# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cxx_cross
+
+
+            echo $ac_n "checking if g++ requires -fvtable-thunks""... $ac_c" 1>&6
+echo "configure:21207: checking if g++ requires -fvtable-thunks" >&5
+            cat > conftest.$ac_ext <<EOF
+#line 21209 "configure"
+#include "confdefs.h"
+#include <windows.h>
+                            #include <ole2.h>
+int main() {
+
+; return 0; }
+EOF
+if { (eval echo configure:21217: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  echo "$ac_t""no" 1>&6
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  echo "$ac_t""yes" 1>&6
+                            CODE_GEN_FLAGS_CXX="$CODE_GEN_FLAGS_CXX -fvtable-thunks"
+fi
+rm -f conftest*
+            ac_ext=c
+# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+cross_compiling=$ac_cv_prog_cc_cross
+
             ALL_OBJECTS="$ALL_OBJECTS \$(OLEOBJS)"
-            CODE_GEN_FLAGS_CXX="$CODE_GEN_FLAGS_CXX -fvtable-thunks"
             LIBS=" -lrpcrt4 -loleaut32 -lole32 -luuid$LIBS"
             cat >> confdefs.h <<\EOF
 #define wxUSE_OLE 1
@@ -19752,6 +21250,7 @@ EOF
         wxUSE_CLIPBOARD=no
         wxUSE_DRAG_AND_DROP=no
         wxUSE_DATAOBJ=no
+        wxUSE_OLE=no
     fi
 
     if test "$wxUSE_METAFILE" = "yes"; then
@@ -19779,15 +21278,22 @@ EOF
 fi
 
 if test "$wxUSE_CLIPBOARD" = "yes"; then
-    cat >> confdefs.h <<\EOF
+    if test "$wxUSE_MGL" = 1; then
+        echo "configure: warning: Clipboard not yet supported under MGL... disabled" 1>&2
+        wxUSE_CLIPBOARD=no
+    fi
+
+    if test "$wxUSE_CLIPBOARD" = "yes"; then
+        cat >> confdefs.h <<\EOF
 #define wxUSE_CLIPBOARD 1
 EOF
 
 
-        cat >> confdefs.h <<\EOF
+                cat >> confdefs.h <<\EOF
 #define wxUSE_DATAOBJ 1
 EOF
 
+    fi
 fi
 
 if test "$wxUSE_DRAG_AND_DROP" = "yes" ; then
@@ -19808,6 +21314,11 @@ if test "$wxUSE_DRAG_AND_DROP" = "yes" ; then
         wxUSE_DRAG_AND_DROP=no
     fi
 
+    if test "$wxUSE_MGL" = 1; then
+        echo "configure: warning: Drag and drop not yet supported under MGL... disabled" 1>&2
+        wxUSE_DRAG_AND_DROP=no
+    fi
+
     if test "$wxUSE_DRAG_AND_DROP" = "yes"; then
         cat >> confdefs.h <<\EOF
 #define wxUSE_DRAG_AND_DROP 1
@@ -19906,22 +21417,20 @@ EOF
   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS checklst"
 fi
 
-if test "$wxUSE_GAUGE" = "yes"; then
-  cat >> confdefs.h <<\EOF
-#define wxUSE_GAUGE 1
+if test "$wxUSE_DISPLAY" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define wxUSE_DISPLAY 1
 EOF
 
-  USES_CONTROLS=1
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS display"
 fi
 
-if test "$wxUSE_NEW_GRID" = "yes"; then
-  wxUSE_GRID="yes"
+if test "$wxUSE_GAUGE" = "yes"; then
   cat >> confdefs.h <<\EOF
-#define wxUSE_NEW_GRID 1
+#define wxUSE_GAUGE 1
 EOF
 
   USES_CONTROLS=1
-  SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS newgrid"
 fi
 
 if test "$wxUSE_GRID" = "yes"; then
@@ -19970,14 +21479,6 @@ EOF
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS notebook"
 fi
 
-if test "$wxUSE_PROPSHEET" = "yes"; then
-    cat >> confdefs.h <<\EOF
-#define wxUSE_PROPSHEET 1
-EOF
-
-    USES_CONTROLS=1
-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS proplist"
-fi
 
 if test "$wxUSE_RADIOBOX" = "yes"; then
     cat >> confdefs.h <<\EOF
@@ -20069,15 +21570,11 @@ EOF
 fi
 
 if test "$wxUSE_STATLINE" = "yes"; then
-    if test "$wxUSE_WINE" = 1 ; then
-        echo "configure: warning: wxStaticLine is not supported under WINE" 1>&2
-    else
-        cat >> confdefs.h <<\EOF
+    cat >> confdefs.h <<\EOF
 #define wxUSE_STATLINE 1
 EOF
 
-        USES_CONTROLS=1
-    fi
+    USES_CONTROLS=1
 fi
 
 if test "$wxUSE_STATUSBAR" = "yes"; then
@@ -20108,7 +21605,7 @@ EOF
 fi
 
 if test "$wxUSE_TOGGLEBTN" = "yes"; then
-    if test "$wxUSE_MAC" = 1; then
+    if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1 ; then
         echo "configure: warning: Toggle button not yet supported under Mac OS X... disabled" 1>&2
         wxUSE_TOGGLEBTN=no
     fi
@@ -20161,17 +21658,13 @@ if test "$wxUSE_TOOLTIPS" = "yes"; then
     if test "$wxUSE_MOTIF" = 1; then
         echo "configure: warning: wxTooltip not supported yet under Motif... disabled" 1>&2
     else
-        if test "$wxUSE_WINE" = 1; then
-            echo "configure: warning: wxTooltip not supported under WINE... disabled" 1>&2
+        if test "$wxUSE_UNIVERSAL" = "yes"; then
+            echo "configure: warning: wxTooltip not supported yet in wxUniversal... disabled" 1>&2
         else
-            if test "$wxUSE_UNIVERSAL" = "yes"; then
-                echo "configure: warning: wxTooltip not supported yet in wxUniversal... disabled" 1>&2
-            else
-                cat >> confdefs.h <<\EOF
+            cat >> confdefs.h <<\EOF
 #define wxUSE_TOOLTIPS 1
 EOF
 
-            fi
         fi
     fi
 fi
@@ -20190,7 +21683,7 @@ EOF
 fi
 
 if test "$wxUSE_POPUPWIN" = "yes"; then
-    if test "$wxUSE_MAC" = 1; then
+    if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1 ; then
         echo "configure: warning: Popup window not yet supported under Mac OS X... disabled" 1>&2
     else
         if test "$wxUSE_MOTIF" = 1; then
@@ -20198,7 +21691,7 @@ if test "$wxUSE_POPUPWIN" = "yes"; then
         else
             if test "$wxUSE_PM" = 1; then
                 echo "configure: warning: wxPopupWindow not yet supported under PM... disabled" 1>&2
-            else 
+            else
                 cat >> confdefs.h <<\EOF
 #define wxUSE_POPUPWIN 1
 EOF
@@ -20213,7 +21706,7 @@ fi
 if test "$wxUSE_TIPWINDOW" = "yes"; then
     if test "$wxUSE_PM" = 1; then
         echo "configure: warning: wxTipWindow not yet supported under PM... disabled" 1>&2
-    else 
+    else
         cat >> confdefs.h <<\EOF
 #define wxUSE_TIPWINDOW 1
 EOF
@@ -20229,13 +21722,6 @@ EOF
 fi
 
 
-if test "$wxUSE_TREELAYOUT" = "yes"; then
-    cat >> confdefs.h <<\EOF
-#define wxUSE_TREELAYOUT 1
-EOF
-
-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS treelay"
-fi
 
 if test "$wxUSE_DRAGIMAGE" = "yes"; then
     cat >> confdefs.h <<\EOF
@@ -20538,15 +22024,262 @@ cat >> confdefs.h <<EOF
 EOF
 
 
+top_builddir=`pwd`
+
 
 
 
 if test "$wxUSE_MAC" = 1 ; then
     LDFLAGS="$LDFLAGS -framework Carbon -framework System"
 fi
+if test "$wxUSE_COCOA" = 1 ; then
+    LDFLAGS="$LDFLAGS -framework Cocoa -framework System"
+fi
+
+
+LIBS="$ZLIB_LINK $POSIX4_LINK $INET_LINK $WCHAR_LINK $DL_LINK $LIBS"
+
+have_cos=0
+have_floor=0
+for ac_func in cos
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:22048: checking for $ac_func" >&5
+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 22053 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func(); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char $ac_func();
+
+int main() {
+
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+$ac_func();
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:22076: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+ have_cos=1
+else
+  echo "$ac_t""no" 1>&6
+fi
+done
+
+for ac_func in floor
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:22103: checking for $ac_func" >&5
+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 22108 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func(); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char $ac_func();
+
+int main() {
+
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+$ac_func();
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:22131: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+ have_floor=1
+else
+  echo "$ac_t""no" 1>&6
+fi
+done
+
+echo $ac_n "checking if floating point functions link without -lm""... $ac_c" 1>&6
+echo "configure:22156: checking if floating point functions link without -lm" >&5
+if test "$have_cos" = 1 -a "$have_floor" = 1; then
+    echo "$ac_t""yes" 1>&6
+else
+    echo "$ac_t""no" 1>&6
+    LIBS="$LIBS -lm"
+    # use different functions to avoid configure caching
+    have_sin=0
+    have_ceil=0
+    for ac_func in sin
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:22168: checking for $ac_func" >&5
+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 22173 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func(); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char $ac_func();
+
+int main() {
+
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+$ac_func();
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:22196: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=no"
+fi
+rm -f conftest*
+fi
+
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+ have_sin=1
+else
+  echo "$ac_t""no" 1>&6
+fi
+done
+
+    for ac_func in ceil
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:22223: checking for $ac_func" >&5
+if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 22228 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func(); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char $ac_func();
+
+int main() {
+
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+$ac_func();
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:22251: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=no"
+fi
+rm -f conftest*
+fi
 
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+ have_ceil=1
+else
+  echo "$ac_t""no" 1>&6
+fi
+done
 
-LIBS="$ZLIB_LINK $POSIX4_LINK $INET_LINK $WCHAR_LINK $DL_LINK -lm $LIBS"
+    echo $ac_n "checking if floating point functions link with -lm""... $ac_c" 1>&6
+echo "configure:22276: checking if floating point functions link with -lm" >&5
+    if test "$have_sin" = 1 -a "$have_ceil" = 1; then
+        echo "$ac_t""yes" 1>&6
+    else
+        echo "$ac_t""no" 1>&6
+        # not sure we should warn the user, crash, etc.
+    fi
+fi
 
 if test "$wxUSE_GUI" = "yes"; then
 
@@ -20555,7 +22288,7 @@ if test "$wxUSE_GUI" = "yes"; then
         
             SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS artprov controls dialogs \
                      drawing dynamic erase event exec font image \
-                     minimal richedit rotate widgets"
+                     minimal propsize rotate shaped widgets"
 
         CPPFLAGS="$CPPFLAGS \$(EXTRADEFS) \$(APPEXTRADEFS)"
 else
@@ -20583,10 +22316,11 @@ if test "$GXX" = yes ; then
     fi
 fi
 
-EXTRA_CFLAGS="$WXDEBUG $WXODBCFLAG $PROFILE $OPTIMISE $INCLUDES"
+EXTRA_CFLAGS="$WXDEBUG $WXODBCFLAG $PROFILE $OPTIMISE"
 
-CFLAGS=`echo $CFLAGS $EXTRA_CFLAGS $CXXWARNINGS | sed 's/ \\+/ /g'`
-CXXFLAGS=`echo $CXXFLAGS $EXTRA_CFLAGS $CXXWARNINGS | sed 's/ \+/ /g'`
+CPPFLAGS=`echo $INCLUDES $CPPFLAGS | sed 's/ \\+/ /g'`
+CFLAGS=`echo $EXTRA_CFLAGS $CFLAGS $CXXWARNINGS | sed 's/ \\+/ /g'`
+CXXFLAGS=`echo $EXTRA_CFLAGS $CXXFLAGS $CXXWARNINGS | sed 's/ \+/ /g'`
 LIBS=`echo $LIBS | sed 's/ \+/ /g'`
 
 LDFLAGS="$LDFLAGS $PROFILE"
@@ -20668,6 +22402,18 @@ SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 
@@ -20682,7 +22428,7 @@ SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq
 
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:20686: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:22432: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -20722,9 +22468,18 @@ wx_cv_program_ext=$PROGRAM_EXT
 wx_cv_target_library=$WX_TARGET_LIBRARY
 wx_cv_target_library_gl=$WX_TARGET_LIBRARY_GL
 wx_cv_target_libtype=$WX_TARGET_LIBRARY_TYPE
+wx_cv_library_basename=${WX_LIBRARY_BASENAME}
+wx_cv_release=${WX_RELEASE}
+wx_cv_current=${WX_CURRENT}
+wx_cv_revision=${WX_REVISION}
+wx_cv_age=${WX_AGE}
+wx_cv_use_gui=${USE_GUI}
+wx_cv_use_resources=${wxUSE_RESOURCES}
 export wx_cv_path_samplesubdirs wx_cv_if_gnu_make \
        wx_cv_path_ifs wx_cv_program_ext \
-       wx_cv_target_library wx_cv_target_library_gl wx_cv_target_libtype
+       wx_cv_target_library wx_cv_target_library_gl wx_cv_target_libtype \
+       wx_cv_library_basename wx_cv_release wx_cv_current wx_cv_revision wx_cv_age \
+       wx_cv_use_gui wx_cv_use_resources
 
 subdirs="demos samples utils contrib"
 
@@ -20832,6 +22587,7 @@ ac_given_INSTALL="$INSTALL"
 
 trap 'rm -fr `echo "
             wx-config
+            version-script
             src/make.env
             src/makeprog.env
             src/makelib.env
@@ -20902,13 +22658,20 @@ s%@PKG_CONFIG@%$PKG_CONFIG%g
 s%@GTK_CFLAGS@%$GTK_CFLAGS%g
 s%@GTK_LIBS@%$GTK_LIBS%g
 s%@GTK_CONFIG@%$GTK_CONFIG%g
+s%@PANGOFT2_CFLAGS@%$PANGOFT2_CFLAGS%g
+s%@PANGOFT2_LIBS@%$PANGOFT2_LIBS%g
 s%@X_CFLAGS@%$X_CFLAGS%g
 s%@X_PRE_LIBS@%$X_PRE_LIBS%g
 s%@X_LIBS@%$X_LIBS%g
 s%@X_EXTRA_LIBS@%$X_EXTRA_LIBS%g
+s%@PANGOX_CFLAGS@%$PANGOX_CFLAGS%g
+s%@PANGOX_LIBS@%$PANGOX_LIBS%g
+s%@PANGOXFT_CFLAGS@%$PANGOXFT_CFLAGS%g
+s%@PANGOXFT_LIBS@%$PANGOXFT_LIBS%g
 s%@AIX_CXX_LD@%$AIX_CXX_LD%g
 s%@RESCOMP@%$RESCOMP%g
 s%@DEREZ@%$DEREZ%g
+s%@SETFILE@%$SETFILE%g
 s%@LIBICONV@%$LIBICONV%g
 s%@LEX_STEM@%$LEX_STEM%g
 s%@PATH_IFS@%$PATH_IFS%g
@@ -20917,6 +22680,7 @@ s%@WX_MINOR_VERSION_NUMBER@%$WX_MINOR_VERSION_NUMBER%g
 s%@WX_RELEASE_NUMBER@%$WX_RELEASE_NUMBER%g
 s%@WX_LIBRARY_NAME_STATIC@%$WX_LIBRARY_NAME_STATIC%g
 s%@WX_LIBRARY_NAME_SHARED@%$WX_LIBRARY_NAME_SHARED%g
+s%@WX_LIBRARY_BASENAME@%$WX_LIBRARY_BASENAME%g
 s%@WX_LIBRARY_IMPORTLIB@%$WX_LIBRARY_IMPORTLIB%g
 s%@WX_TARGET_LIBRARY@%$WX_TARGET_LIBRARY%g
 s%@WX_LIBRARY_LINK1@%$WX_LIBRARY_LINK1%g
@@ -20937,21 +22701,26 @@ s%@SONAME_FLAGS@%$SONAME_FLAGS%g
 s%@SONAME_FLAGS_GL@%$SONAME_FLAGS_GL%g
 s%@WX_TARGET_LIBRARY_SONAME@%$WX_TARGET_LIBRARY_SONAME%g
 s%@WX_TARGET_LIBRARY_TYPE@%$WX_TARGET_LIBRARY_TYPE%g
+s%@STATIC_FLAG@%$STATIC_FLAG%g
 s%@WXDEBUG_DEFINE@%$WXDEBUG_DEFINE%g
 s%@USE_GUI@%$USE_GUI%g
 s%@AFMINSTALL@%$AFMINSTALL%g
+s%@WIN32INSTALL@%$WIN32INSTALL%g
 s%@TOOLKIT@%$TOOLKIT%g
 s%@TOOLKIT_DIR@%$TOOLKIT_DIR%g
 s%@TOOLKIT_VPATH@%$TOOLKIT_VPATH%g
 s%@TOOLCHAIN_NAME@%$TOOLCHAIN_NAME%g
 s%@TOOLCHAIN_DEFS@%$TOOLCHAIN_DEFS%g
 s%@TOOLCHAIN_DLL_DEFS@%$TOOLCHAIN_DLL_DEFS%g
+s%@top_builddir@%$top_builddir%g
 s%@cross_compiling@%$cross_compiling%g
 s%@WXCONFIG_LIBS@%$WXCONFIG_LIBS%g
 s%@WXCONFIG_LIBS_GL@%$WXCONFIG_LIBS_GL%g
 s%@WXCONFIG_LIBS_STATIC@%$WXCONFIG_LIBS_STATIC%g
 s%@WXCONFIG_LIBS_STATIC_GL@%$WXCONFIG_LIBS_STATIC_GL%g
 s%@WXCONFIG_INCLUDE@%$WXCONFIG_INCLUDE%g
+s%@WXCONFIG_RPATH@%$WXCONFIG_RPATH%g
+s%@WX_LARGEFILE_FLAGS@%$WX_LARGEFILE_FLAGS%g
 s%@ALL_OBJECTS@%$ALL_OBJECTS%g
 s%@ALL_HEADERS@%$ALL_HEADERS%g
 s%@ALL_SOURCES@%$ALL_SOURCES%g
@@ -20960,24 +22729,29 @@ s%@PORT_FILES@%$PORT_FILES%g
 s%@DISTDIR@%$DISTDIR%g
 s%@SAMPLES_SUBDIRS@%$SAMPLES_SUBDIRS%g
 s%@LDFLAGS_GL@%$LDFLAGS_GL%g
+s%@LDFLAGS_VERSIONING@%$LDFLAGS_VERSIONING%g
 s%@LDFLAGS_EXE@%$LDFLAGS_EXE%g
 s%@OPENGL_LIBS@%$OPENGL_LIBS%g
 s%@DMALLOC_LIBS@%$DMALLOC_LIBS%g
 s%@EXTRADEFS@%$EXTRADEFS%g
+s%@WX_VERSION_TAG@%$WX_VERSION_TAG%g
 s%@RESFLAGS@%$RESFLAGS%g
 s%@RESPROGRAMOBJ@%$RESPROGRAMOBJ%g
 s%@WX_RESOURCES_MACOSX_ASCII@%$WX_RESOURCES_MACOSX_ASCII%g
 s%@WX_RESOURCES_MACOSX_DATA@%$WX_RESOURCES_MACOSX_DATA%g
 s%@MACOSX_BUNDLE@%$MACOSX_BUNDLE%g
 s%@LIBWXMACRES@%$LIBWXMACRES%g
-s%@LIBWXMACRESCOMP@%$LIBWXMACRESCOMP%g
-s%@LIBWXMACRESWXCONFIG@%$LIBWXMACRESWXCONFIG%g
+s%@MACRESCOMP@%$MACRESCOMP%g
+s%@MACSETFILE@%$MACSETFILE%g
+s%@MACRESWXCONFIG@%$MACRESWXCONFIG%g
+s%@GCC@%$GCC%g
 s%@DLLTOOL@%$DLLTOOL%g
 s%@AS@%$AS%g
 s%@NM@%$NM%g
 s%@LD@%$LD%g
 s%@MAKEINFO@%$MAKEINFO%g
 s%@INSTALL_LIBRARY@%$INSTALL_LIBRARY%g
+s%@INSTALL_DIR@%$INSTALL_DIR%g
 s%@SET_MAKE@%$SET_MAKE%g
 s%@subdirs@%$subdirs%g
 
@@ -21022,6 +22796,7 @@ EOF
 cat >> $CONFIG_STATUS <<EOF
 
 CONFIG_FILES=\${CONFIG_FILES-"wx-config
+            version-script
             src/make.env
             src/makeprog.env
             src/makelib.env
@@ -21331,3 +23106,26 @@ if test "$no_recursion" != yes; then
 fi
 
 
+echo
+echo "Configured wxWindows ${WX_VERSION} for \`${host}'"
+echo ""
+echo "  Which GUI toolkit should wxWindows use?                 ${TOOLKIT:-base only}"
+
+echo "  Should wxWindows be compiled in debug mode?             ${wxUSE_DEBUG:-no}"
+echo "  Should wxWindows be linked as a shared library?         ${wxUSE_SHARED:-no}"
+echo "  Should wxWindows be compiled in Unicode mode?           ${wxUSE_UNICODE:-no}"
+
+echo "  What level of wxWindows compatibility should be enabled?"
+echo "                                       wxWindows 2.0      ${WXWIN_COMPATIBILITY_2:-no}"
+echo "                                       wxWindows 2.2      ${WXWIN_COMPATIBILITY_2_2:-no}"
+echo "                                       wxWindows 2.4      ${WXWIN_COMPATIBILITY_2_4:-yes}"
+
+echo "  Which libraries should wxWindows use?"
+echo "                                       jpeg               ${wxUSE_LIBJPEG-none}"
+echo "                                       png                ${wxUSE_LIBPNG-none}"
+echo "                                       regex              ${wxUSE_REGEX}"
+echo "                                       tiff               ${wxUSE_LIBTIFF-none}"
+echo "                                       zlib               ${wxUSE_ZLIB}"
+
+echo ""
+