renamed julian's private makefile, it's in the way

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

index eed68ae42d988ca40717143836fd53a6cd17e718..61069b7e6117840fd5dd2d1d9b6ecea20fc12d8b 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,8 @@
  dnl Process this file with autoconf to produce a configure script.
  AC_REVISION($Id$)dnl
  
  dnl Process this file with autoconf to produce a configure script.
  AC_REVISION($Id$)dnl
  
+AC_PREREQ(2.57)
+
  dnl ---------------------------------------------------------------------------
  dnl
  dnl Top-level configure.in for wxWindows by Robert Roebling, Phil Blecker,
  dnl ---------------------------------------------------------------------------
  dnl
  dnl Top-level configure.in for wxWindows by Robert Roebling, Phil Blecker,
@@ -15,11 +17,16 @@ dnl ---------------------------------------------------------------------------
  dnl initialization
  dnl ---------------------------------------------------------------------------
  
  dnl initialization
  dnl ---------------------------------------------------------------------------
  
-dnl the file passed to AC_INIT should be specific to our package
-AC_INIT([wx-config.in])
+AC_INIT([wxWindows], [2.5.0], [wx-dev@lists.wxwindows.org])
+
+dnl the file passed to AC_CONFIG_SRCDIR should be specific to our package
+AC_CONFIG_SRCDIR([wx-config.in])
  
  dnl sets build, host, target variables and the same with _alias
  
  dnl sets build, host, target variables and the same with _alias
-AC_CANONICAL_SYSTEM
+AC_CANONICAL_BUILD
+AC_CANONICAL_HOST
+AC_CANONICAL_TARGET
+
  
  dnl When making releases do:
  dnl
  
  dnl When making releases do:
  dnl
@@ -64,32 +71,36 @@ dnl ------------------------------------------------------------------------
  dnl Check platform (host system)
  dnl ------------------------------------------------------------------------
  
  dnl Check platform (host system)
  dnl ------------------------------------------------------------------------
  
-dnl assume Unix
+dnl OS (assume Unix)
  USE_UNIX=1
  USE_WIN32=0
  USE_DOS=0
  USE_BEOS=0
  USE_MAC=0
  
  USE_UNIX=1
  USE_WIN32=0
  USE_DOS=0
  USE_BEOS=0
  USE_MAC=0
  
-USE_LINUX=
-USE_SGI=
-USE_HPUX=
-USE_SYSV=
-USE_SVR4=
+dnl Unix kind
  USE_AIX=
  USE_AIX=
-USE_SUN=
-USE_SOLARIS=
-USE_SUNOS=
-USE_ALPHA=
-USE_OSF=
-USE_BSD=
-USE_DARWIN=
+USE_BSD=                            dnl any BSD
+USE_DARWIN=                         dnl a.k.a. Mac OS X
  USE_FREEBSD=
  USE_FREEBSD=
-USE_OPENBSD=
+USE_GNU=                            dnl GNU/Hurd
+USE_HPUX=
+USE_LINUX=
  USE_NETBSD=
  USE_NETBSD=
+USE_OPENBSD=
+USE_OSF=                            dnl OSF/1 (obsolete?)
+USE_SGI=
+USE_SOLARIS=                        dnl Solaris ("SunOS" >= 5)
+USE_SUN=                            dnl SunOS or Solaris
+USE_SUNOS=                          dnl old/real SunOS (obsolete)
+USE_SVR4=                           dnl SysV R4
+USE_SYSV=                           dnl any System V
  USE_VMS=
  USE_ULTRIX=
  USE_VMS=
  USE_ULTRIX=
-USE_DATA_GENERAL=
+USE_UNIXWARE=
+
+dnl hardware platform
+USE_ALPHA=
  
  dnl on some platforms xxx_r() functions are declared inside "#ifdef
  dnl _REENTRANT" and it's easier to just define this symbol for these platforms
  
  dnl on some platforms xxx_r() functions are declared inside "#ifdef
  dnl _REENTRANT" and it's easier to just define this symbol for these platforms
@@ -99,10 +110,11 @@ NEEDS_D_REENTRANT_FOR_R_FUNCS=0
  dnl the list of all available toolkits
  dnl
  dnl update NUM_TOOLKITS calculation below when adding a new toolkit here!
  dnl the list of all available toolkits
  dnl
  dnl update NUM_TOOLKITS calculation below when adding a new toolkit here!
-ALL_TOOLKITS="GTK MAC MGL MICROWIN MOTIF MSW PM X11"
+ALL_TOOLKITS="COCOA GTK MAC MGL MICROWIN MOTIF MSW PM X11"
  
  dnl NB: these wxUSE_XXX constants have value of 0 or 1 unlike all the other ones
  dnl     which are either yes or no
  
  dnl NB: these wxUSE_XXX constants have value of 0 or 1 unlike all the other ones
  dnl     which are either yes or no
+DEFAULT_wxUSE_COCOA=0
  DEFAULT_wxUSE_GTK=0
  DEFAULT_wxUSE_MAC=0
  DEFAULT_wxUSE_MGL=0
  DEFAULT_wxUSE_GTK=0
  DEFAULT_wxUSE_MAC=0
  DEFAULT_wxUSE_MGL=0
@@ -115,6 +127,7 @@ DEFAULT_wxUSE_X11=0
  dnl these are the values which are really default for the given platform -
  dnl they're not cached and are only used if no --with-toolkit was given *and*
  dnl nothing was found in the cache
  dnl these are the values which are really default for the given platform -
  dnl they're not cached and are only used if no --with-toolkit was given *and*
  dnl nothing was found in the cache
+DEFAULT_DEFAULT_wxUSE_COCOA=0
  DEFAULT_DEFAULT_wxUSE_GTK=0
  DEFAULT_DEFAULT_wxUSE_MAC=0
  DEFAULT_DEFAULT_wxUSE_MGL=0
  DEFAULT_DEFAULT_wxUSE_GTK=0
  DEFAULT_DEFAULT_wxUSE_MAC=0
  DEFAULT_DEFAULT_wxUSE_MGL=0
@@ -126,6 +139,7 @@ DEFAULT_DEFAULT_wxUSE_X11=0
  
  PROGRAM_EXT=
  SO_SUFFIX=so
  
  PROGRAM_EXT=
  SO_SUFFIX=so
+SAMPLES_RPATH_FLAG=
  
  dnl to support a new system, you need to add its canonical name (as determined
  dnl by config.sub or specified by the configure command line) to this "case"
  
  dnl to support a new system, you need to add its canonical name (as determined
  dnl by config.sub or specified by the configure command line) to this "case"
@@ -149,6 +163,16 @@ case "${host}" in
      fi
      DEFAULT_DEFAULT_wxUSE_GTK=1
    ;;
      fi
      DEFAULT_DEFAULT_wxUSE_GTK=1
    ;;
+  *-*-gnu* )
+    USE_GNU=1
+    AC_DEFINE(__GNU__)
+    TMP=`uname -m`
+    if test "x$TMP" = "xalpha"; then
+      USE_ALPHA=1
+      AC_DEFINE(__ALPHA__)
+    fi
+    DEFAULT_DEFAULT_wxUSE_GTK=1
+  ;;
    *-*-irix5* | *-*-irix6* )
      USE_SGI=1
      USE_SVR4=1
    *-*-irix5* | *-*-irix6* )
      USE_SGI=1
      USE_SVR4=1
@@ -226,7 +250,7 @@ case "${host}" in
      dnl
      dnl     Both archive libraries and shared libraries on AIX have an .a
      dnl     extension. This will explain why you can't link with an .so and
      dnl
      dnl     Both archive libraries and shared libraries on AIX have an .a
      dnl     extension. This will explain why you can't link with an .so and
-    dnl     why it works with the name changed to .a. 
+    dnl     why it works with the name changed to .a.
      SO_SUFFIX=a
      AC_DEFINE(__AIX__)
      AC_DEFINE(__SYSV__)
      SO_SUFFIX=a
      AC_DEFINE(__AIX__)
      AC_DEFINE(__SYSV__)
@@ -234,6 +258,13 @@ case "${host}" in
      DEFAULT_DEFAULT_wxUSE_MOTIF=1
    ;;
  
      DEFAULT_DEFAULT_wxUSE_MOTIF=1
    ;;
  
+  *-*-*UnixWare*)
+    USE_SYSV=1
+    USE_SVR4=1
+    USE_UNIXWARE=1
+    AC_DEFINE(__UNIXWARE__)
+  ;;
+
    *-*-cygwin* | *-*-mingw32* )
      dnl MBN: some of the defines have been moved after toolkit detection
      dnl      because for wxMotif/wxGTK/wxX11 to build on Cygwin
    *-*-cygwin* | *-*-mingw32* )
      dnl MBN: some of the defines have been moved after toolkit detection
      dnl      because for wxMotif/wxGTK/wxX11 to build on Cygwin
@@ -268,6 +299,7 @@ case "${host}" in
      AC_DEFINE(__BSD__)
      AC_DEFINE(__DARWIN__)
      AC_DEFINE(__POWERPC__)
      AC_DEFINE(__BSD__)
      AC_DEFINE(__DARWIN__)
      AC_DEFINE(__POWERPC__)
+    AC_DEFINE(TARGET_CARBON)
      DEFAULT_DEFAULT_wxUSE_MAC=1
    ;;
  
      DEFAULT_DEFAULT_wxUSE_MAC=1
    ;;
  
@@ -341,7 +373,6 @@ if test $DEBUG_CONFIGURE = 1; then
    DEFAULT_wxUSE_STD_IOSTREAM=no
    DEFAULT_wxUSE_CMDLINE_PARSER=no
    DEFAULT_wxUSE_DATETIME=no
    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
    DEFAULT_wxUSE_TIMER=no
    DEFAULT_wxUSE_STOPWATCH=no
    DEFAULT_wxUSE_FILE=no
@@ -367,7 +398,6 @@ if test $DEBUG_CONFIGURE = 1; then
    DEFAULT_wxUSE_NORMALIZED_PS_FONTS=no
    DEFAULT_wxUSE_POSTSCRIPT=no
  
    DEFAULT_wxUSE_NORMALIZED_PS_FONTS=no
    DEFAULT_wxUSE_POSTSCRIPT=no
  
-  DEFAULT_wxUSE_X_RESOURCES=no
    DEFAULT_wxUSE_CLIPBOARD=no
    DEFAULT_wxUSE_TOOLTIPS=no
    DEFAULT_wxUSE_DRAG_AND_DROP=no
    DEFAULT_wxUSE_CLIPBOARD=no
    DEFAULT_wxUSE_TOOLTIPS=no
    DEFAULT_wxUSE_DRAG_AND_DROP=no
@@ -378,7 +408,6 @@ if test $DEBUG_CONFIGURE = 1; then
    DEFAULT_wxUSE_DOC_VIEW_ARCHITECTURE=no
    DEFAULT_wxUSE_PRINTING_ARCHITECTURE=no
  
    DEFAULT_wxUSE_DOC_VIEW_ARCHITECTURE=no
    DEFAULT_wxUSE_PRINTING_ARCHITECTURE=no
  
-  DEFAULT_wxUSE_PROLOGIO=no
    DEFAULT_wxUSE_RESOURCES=no
    DEFAULT_wxUSE_CONSTRAINTS=no
    DEFAULT_wxUSE_IPC=no
    DEFAULT_wxUSE_RESOURCES=no
    DEFAULT_wxUSE_CONSTRAINTS=no
    DEFAULT_wxUSE_IPC=no
@@ -429,14 +458,13 @@ if test $DEBUG_CONFIGURE = 1; then
    DEFAULT_wxUSE_CHECKLST=no
    DEFAULT_wxUSE_CHOICE=no
    DEFAULT_wxUSE_COMBOBOX=no
    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_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_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
    DEFAULT_wxUSE_RADIOBOX=no
    DEFAULT_wxUSE_RADIOBTN=no
    DEFAULT_wxUSE_SASH=no
@@ -472,6 +500,7 @@ if test $DEBUG_CONFIGURE = 1; then
    DEFAULT_wxUSE_IFF=no
    DEFAULT_wxUSE_XPM=no
    DEFAULT_wxUSE_ICO_CUR=no
    DEFAULT_wxUSE_IFF=no
    DEFAULT_wxUSE_XPM=no
    DEFAULT_wxUSE_ICO_CUR=no
+  DEFAULT_wxUSE_ACCESSIBILITY=no
  else
    DEFAULT_wxUSE_UNIVERSAL=no
  
  else
    DEFAULT_wxUSE_UNIVERSAL=no
  
@@ -516,7 +545,6 @@ else
    DEFAULT_wxUSE_STD_IOSTREAM=no
    DEFAULT_wxUSE_CMDLINE_PARSER=yes
    DEFAULT_wxUSE_DATETIME=yes
    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
    DEFAULT_wxUSE_TIMER=yes
    DEFAULT_wxUSE_STOPWATCH=yes
    DEFAULT_wxUSE_FILE=yes
@@ -542,7 +570,6 @@ else
    DEFAULT_wxUSE_NORMALIZED_PS_FONTS=yes
    DEFAULT_wxUSE_POSTSCRIPT=yes
  
    DEFAULT_wxUSE_NORMALIZED_PS_FONTS=yes
    DEFAULT_wxUSE_POSTSCRIPT=yes
  
-  DEFAULT_wxUSE_X_RESOURCES=no
    DEFAULT_wxUSE_CLIPBOARD=yes
    DEFAULT_wxUSE_TOOLTIPS=yes
    DEFAULT_wxUSE_DRAG_AND_DROP=yes
    DEFAULT_wxUSE_CLIPBOARD=yes
    DEFAULT_wxUSE_TOOLTIPS=yes
    DEFAULT_wxUSE_DRAG_AND_DROP=yes
@@ -553,7 +580,6 @@ else
    DEFAULT_wxUSE_DOC_VIEW_ARCHITECTURE=yes
    DEFAULT_wxUSE_PRINTING_ARCHITECTURE=yes
  
    DEFAULT_wxUSE_DOC_VIEW_ARCHITECTURE=yes
    DEFAULT_wxUSE_PRINTING_ARCHITECTURE=yes
  
-  DEFAULT_wxUSE_PROLOGIO=no
    DEFAULT_wxUSE_RESOURCES=no
    DEFAULT_wxUSE_CONSTRAINTS=yes
    DEFAULT_wxUSE_IPC=yes
    DEFAULT_wxUSE_RESOURCES=no
    DEFAULT_wxUSE_CONSTRAINTS=yes
    DEFAULT_wxUSE_IPC=yes
@@ -604,14 +630,13 @@ else
    DEFAULT_wxUSE_CHECKLST=yes
    DEFAULT_wxUSE_CHOICE=yes
    DEFAULT_wxUSE_COMBOBOX=yes
    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_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_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
    DEFAULT_wxUSE_RADIOBOX=yes
    DEFAULT_wxUSE_RADIOBTN=yes
    DEFAULT_wxUSE_SASH=yes
@@ -647,6 +672,7 @@ else
    DEFAULT_wxUSE_PNM=yes
    DEFAULT_wxUSE_XPM=yes
    DEFAULT_wxUSE_ICO_CUR=yes
    DEFAULT_wxUSE_PNM=yes
    DEFAULT_wxUSE_XPM=yes
    DEFAULT_wxUSE_ICO_CUR=yes
+  DEFAULT_wxUSE_ACCESSIBILITY=no
  fi
  
  dnl WX_ARG_WITH should be used to select whether an external package will be
  fi
  
  dnl WX_ARG_WITH should be used to select whether an external package will be
@@ -684,6 +710,7 @@ WX_ARG_ENABLE(universal,   [  --enable-universal      use wxWindows GUI controls
  AC_ARG_WITH(gtk,           [  --with-gtk              use GTK+], [wxUSE_GTK="$withval" CACHE_GTK=1 TOOLKIT_GIVEN=1])
  AC_ARG_WITH(motif,         [  --with-motif            use Motif/Lesstif], [wxUSE_MOTIF="$withval" CACHE_MOTIF=1 TOOLKIT_GIVEN=1])
  AC_ARG_WITH(mac,           [  --with-mac              use Mac OS X], [wxUSE_MAC="$withval" TOOLKIT_GIVEN=1])
  AC_ARG_WITH(gtk,           [  --with-gtk              use GTK+], [wxUSE_GTK="$withval" CACHE_GTK=1 TOOLKIT_GIVEN=1])
  AC_ARG_WITH(motif,         [  --with-motif            use Motif/Lesstif], [wxUSE_MOTIF="$withval" CACHE_MOTIF=1 TOOLKIT_GIVEN=1])
  AC_ARG_WITH(mac,           [  --with-mac              use Mac OS X], [wxUSE_MAC="$withval" TOOLKIT_GIVEN=1])
+AC_ARG_WITH(cocoa,         [  --with-cocoa            use Cocoa], [wxUSE_COCOA="$withval" TOOLKIT_GIVEN=1])
  AC_ARG_WITH(wine,          [  --with-wine             use Wine], [wxUSE_WINE="$withval" CACHE_WINE=1])
  AC_ARG_WITH(msw,           [  --with-msw              use MS-Windows], [wxUSE_MSW="$withval" CACHE_MSW=1 TOOLKIT_GIVEN=1])
  AC_ARG_WITH(pm,            [  --with-pm               use OS/2 Presentation Manager], [wxUSE_PM="$withval" CACHE_PM=1 TOOLKIT_GIVEN=1])
  AC_ARG_WITH(wine,          [  --with-wine             use Wine], [wxUSE_WINE="$withval" CACHE_WINE=1])
  AC_ARG_WITH(msw,           [  --with-msw              use MS-Windows], [wxUSE_MSW="$withval" CACHE_MSW=1 TOOLKIT_GIVEN=1])
  AC_ARG_WITH(pm,            [  --with-pm               use OS/2 Presentation Manager], [wxUSE_PM="$withval" CACHE_PM=1 TOOLKIT_GIVEN=1])
@@ -705,7 +732,7 @@ dnl for GUI only
  WX_ARG_WITH(dmalloc,       [  --with-dmalloc          use dmalloc library (http://dmalloc.com/)], wxUSE_DMALLOC)
  WX_ARG_SYS_WITH(regex,     [  --with-regex            enable support for wxRegEx class], wxUSE_REGEX)
  WX_ARG_SYS_WITH(zlib,      [  --with-zlib             use zlib for LZW compression], wxUSE_ZLIB)
  WX_ARG_WITH(dmalloc,       [  --with-dmalloc          use dmalloc library (http://dmalloc.com/)], wxUSE_DMALLOC)
  WX_ARG_SYS_WITH(regex,     [  --with-regex            enable support for wxRegEx class], wxUSE_REGEX)
  WX_ARG_SYS_WITH(zlib,      [  --with-zlib             use zlib for LZW compression], wxUSE_ZLIB)
-WX_ARG_WITH(odbc,          [  --with-odbc             use the IODBC and wxODBC classes], wxUSE_ODBC)
+WX_ARG_SYS_WITH(odbc,      [  --with-odbc             use the IODBC and wxODBC classes], wxUSE_ODBC)
  
  dnl ---------------------------------------------------------------------------
  dnl compile options
  
  dnl ---------------------------------------------------------------------------
  dnl compile options
@@ -768,7 +795,6 @@ WX_ARG_ENABLE(ipc,           [  --enable-ipc            use interprocess communi
  
  WX_ARG_ENABLE(cmdline,       [  --enable-cmdline        use wxCmdLineParser class], wxUSE_CMDLINE_PARSER)
  WX_ARG_ENABLE(datetime,      [  --enable-datetime       use wxDateTime class], wxUSE_DATETIME)
  
  WX_ARG_ENABLE(cmdline,       [  --enable-cmdline        use wxCmdLineParser class], wxUSE_CMDLINE_PARSER)
  WX_ARG_ENABLE(datetime,      [  --enable-datetime       use wxDateTime class], wxUSE_DATETIME)
-WX_ARG_ENABLE(timedate,      [  --enable-timedate       use obsolete wxDate/wxTime classes], wxUSE_TIMEDATE)
  WX_ARG_ENABLE(stopwatch,     [  --enable-stopwatch      use wxStopWatch class], wxUSE_STOPWATCH)
  WX_ARG_ENABLE(dialupman,     [  --enable-dialupman      use dialup network classes], wxUSE_DIALUP_MANAGER)
  WX_ARG_ENABLE(apple_ieee,    [  --enable-apple_ieee     use the Apple IEEE codec], wxUSE_APPLE_IEEE)
  WX_ARG_ENABLE(stopwatch,     [  --enable-stopwatch      use wxStopWatch class], wxUSE_STOPWATCH)
  WX_ARG_ENABLE(dialupman,     [  --enable-dialupman      use dialup network classes], wxUSE_DIALUP_MANAGER)
  WX_ARG_ENABLE(apple_ieee,    [  --enable-apple_ieee     use the Apple IEEE codec], wxUSE_APPLE_IEEE)
@@ -845,20 +871,18 @@ dnl ---------------------------------------------------------------------------
  dnl resources
  dnl ---------------------------------------------------------------------------
  
  dnl resources
  dnl ---------------------------------------------------------------------------
  
-WX_ARG_ENABLE(prologio,    [  --enable-prologio       use Prolog IO library], wxUSE_PROLOGIO)
-WX_ARG_ENABLE(resources,   [  --enable-resources      use wxWindows resources], wxUSE_RESOURCES)
-
-WX_ARG_ENABLE(xresources,  [  --enable-xresources     use X resources for save (default for gtk+)], wxUSE_X_RESOURCES)
+WX_ARG_ENABLE(prologio,    [  --enable-prologio       not available; see contrib], wxUSE_PROLOGIO)
+WX_ARG_ENABLE(resources,   [  --enable-resources      not available; see contrib], wxUSE_RESOURCES)
  
  dnl ---------------------------------------------------------------------------
  dnl IPC &c
  dnl ---------------------------------------------------------------------------
  
  
  dnl ---------------------------------------------------------------------------
  dnl IPC &c
  dnl ---------------------------------------------------------------------------
  
-WX_ARG_ENABLE(clipboard,   [  --enable-clipboard      use wxClipboard classes], wxUSE_CLIPBOARD)
+WX_ARG_ENABLE(clipboard,   [  --enable-clipboard      use wxClipboard class], wxUSE_CLIPBOARD)
  WX_ARG_ENABLE(dnd,         [  --enable-dnd            use Drag'n'Drop classes], wxUSE_DRAG_AND_DROP)
  WX_ARG_ENABLE(metafile,    [  --enable-metafile       use win32 metafiles], wxUSE_METAFILE)
  
  WX_ARG_ENABLE(dnd,         [  --enable-dnd            use Drag'n'Drop classes], wxUSE_DRAG_AND_DROP)
  WX_ARG_ENABLE(metafile,    [  --enable-metafile       use win32 metafiles], wxUSE_METAFILE)
  
-WX_ARG_ENABLE(treelayout,  [  --enable-treelayout     use wxTreeLayout classes], wxUSE_TREELAYOUT)
+dnl WX_ARG_ENABLE(treelayout,  [  --enable-treelayout     use wxTreeLayout class], wxUSE_TREELAYOUT)
  
  dnl ---------------------------------------------------------------------------
  dnl optional GUI controls (in alphabetical order except the first one)
  
  dnl ---------------------------------------------------------------------------
  dnl optional GUI controls (in alphabetical order except the first one)
@@ -881,12 +905,10 @@ if test "$wxUSE_CONTROLS" = "yes"; then
    DEFAULT_wxUSE_CHOICE=yes
    DEFAULT_wxUSE_GAUGE=yes
    DEFAULT_wxUSE_GRID=yes
    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_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
    DEFAULT_wxUSE_RADIOBOX=yes
    DEFAULT_wxUSE_RADIOBTN=yes
    DEFAULT_wxUSE_SASH=yes
@@ -920,12 +942,10 @@ elif test "$wxUSE_CONTROLS" = "no"; then
    DEFAULT_wxUSE_CHOICE=no
    DEFAULT_wxUSE_GAUGE=no
    DEFAULT_wxUSE_GRID=no
    DEFAULT_wxUSE_CHOICE=no
    DEFAULT_wxUSE_GAUGE=no
    DEFAULT_wxUSE_GRID=no
-  DEFAULT_wxUSE_NEW_GRID=no
    DEFAULT_wxUSE_IMAGLIST=no
    DEFAULT_wxUSE_LISTBOX=no
    DEFAULT_wxUSE_LISTCTRL=no
    DEFAULT_wxUSE_NOTEBOOK=no
    DEFAULT_wxUSE_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
    DEFAULT_wxUSE_RADIOBOX=no
    DEFAULT_wxUSE_RADIOBTN=no
    DEFAULT_wxUSE_SASH=no
@@ -949,6 +969,36 @@ elif test "$wxUSE_CONTROLS" = "no"; then
    DEFAULT_wxUSE_TIPWINDOW=no
  fi
  
    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
+  # Generic notebook requires tab dialog
+  DEFAULT_wxUSE_TABDIALOG=yes
+  DEFAULT_wxUSE_TOOLBAR_NATIVE=no
+  DEFAULT_wxUSE_GAUGE=no
+  DEFAULT_wxUSE_SCROLLBAR=no
+  DEFAULT_wxUSE_COMBOBOX=no
+  DEFAULT_wxUSE_CALCTRL=no
+  DEFAULT_wxUSE_SPINBTN=no
+  DEFAULT_wxUSE_SPINCTRL=no
+  DEFAULT_wxUSE_TOOLTIPS=no
+  DEFAULT_wxUSE_DRAGIMAGE=no
+  DEFAULT_wxUSE_FINDREPLDLG=no
+  DEFAULT_wxUSE_FONTDLG=no
+  DEFAULT_wxUSE_GRID=no
+  DEFAULT_wxUSE_NUMBERDLG=no
+  DEFAULT_wxUSE_PROGRESSDLG=no
+  DEFAULT_wxUSE_SASH=no
+  DEFAULT_wxUSE_SPLITTER=no
+  DEFAULT_wxUSE_WIZARDDLG=no
+  DEFAULT_wxUSE_SPLITTER=no
+  DEFAULT_wxUSE_STARTUP_TIPS=no
+fi
+
  WX_ARG_ENABLE(accel,       [  --enable-accel          use accelerators], wxUSE_ACCEL)
  WX_ARG_ENABLE(button,      [  --enable-button         use wxButton class], wxUSE_BUTTON)
  WX_ARG_ENABLE(bmpbutton,   [  --enable-bmpbutton      use wxBitmapButton class], wxUSE_BMPBUTTON)
  WX_ARG_ENABLE(accel,       [  --enable-accel          use accelerators], wxUSE_ACCEL)
  WX_ARG_ENABLE(button,      [  --enable-button         use wxButton class], wxUSE_BUTTON)
  WX_ARG_ENABLE(bmpbutton,   [  --enable-bmpbutton      use wxBitmapButton class], wxUSE_BMPBUTTON)
@@ -957,15 +1007,14 @@ WX_ARG_ENABLE(caret,       [  --enable-caret          use wxCaret class], wxUSE_
  WX_ARG_ENABLE(checkbox,    [  --enable-checkbox       use wxCheckBox class], wxUSE_CHECKBOX)
  WX_ARG_ENABLE(checklst,    [  --enable-checklst       use wxCheckListBox (listbox with checkboxes) class], wxUSE_CHECKLST)
  WX_ARG_ENABLE(choice,      [  --enable-choice         use wxChoice class], wxUSE_CHOICE)
  WX_ARG_ENABLE(checkbox,    [  --enable-checkbox       use wxCheckBox class], wxUSE_CHECKBOX)
  WX_ARG_ENABLE(checklst,    [  --enable-checklst       use wxCheckListBox (listbox with checkboxes) class], wxUSE_CHECKLST)
  WX_ARG_ENABLE(choice,      [  --enable-choice         use wxChoice class], wxUSE_CHOICE)
-WX_ARG_ENABLE(combobox,    [  --enable-combobox       use wxComboBox classes], wxUSE_COMBOBOX)
+WX_ARG_ENABLE(combobox,    [  --enable-combobox       use wxComboBox class], wxUSE_COMBOBOX)
+WX_ARG_ENABLE(display,     [  --enable-display        use wxDisplay class], wxUSE_DISPLAY)
  WX_ARG_ENABLE(gauge,       [  --enable-gauge          use wxGauge class], wxUSE_GAUGE)
  WX_ARG_ENABLE(grid,        [  --enable-grid           use wxGrid class], wxUSE_GRID)
  WX_ARG_ENABLE(gauge,       [  --enable-gauge          use wxGauge class], wxUSE_GAUGE)
  WX_ARG_ENABLE(grid,        [  --enable-grid           use wxGrid class], wxUSE_GRID)
-WX_ARG_ENABLE(newgrid,     [  --enable-newgrid        use new wxGrid class], wxUSE_NEW_GRID)
  WX_ARG_ENABLE(imaglist,    [  --enable-imaglist       use wxImageList class], wxUSE_IMAGLIST)
  WX_ARG_ENABLE(listbox,     [  --enable-listbox        use wxListBox class], wxUSE_LISTBOX)
  WX_ARG_ENABLE(listctrl,    [  --enable-listctrl       use wxListCtrl class], wxUSE_LISTCTRL)
  WX_ARG_ENABLE(notebook,    [  --enable-notebook       use wxNotebook class], wxUSE_NOTEBOOK)
  WX_ARG_ENABLE(imaglist,    [  --enable-imaglist       use wxImageList class], wxUSE_IMAGLIST)
  WX_ARG_ENABLE(listbox,     [  --enable-listbox        use wxListBox class], wxUSE_LISTBOX)
  WX_ARG_ENABLE(listctrl,    [  --enable-listctrl       use wxListCtrl class], wxUSE_LISTCTRL)
  WX_ARG_ENABLE(notebook,    [  --enable-notebook       use wxNotebook class], wxUSE_NOTEBOOK)
-WX_ARG_ENABLE(propsheet,   [  --enable-propsheet      use wxPropertySheet class], wxUSE_PROPSHEET)
  WX_ARG_ENABLE(radiobox,    [  --enable-radiobox       use wxRadioBox class], wxUSE_RADIOBOX)
  WX_ARG_ENABLE(radiobtn,    [  --enable-radiobtn       use wxRadioButton class], wxUSE_RADIOBTN)
  WX_ARG_ENABLE(sash,        [  --enable-sash           use wxSashWindow class], wxUSE_SASH)
  WX_ARG_ENABLE(radiobox,    [  --enable-radiobox       use wxRadioBox class], wxUSE_RADIOBOX)
  WX_ARG_ENABLE(radiobtn,    [  --enable-radiobtn       use wxRadioButton class], wxUSE_RADIOBTN)
  WX_ARG_ENABLE(sash,        [  --enable-sash           use wxSashWindow class], wxUSE_SASH)
@@ -1021,6 +1070,7 @@ WX_ARG_ENABLE(busyinfo,    [  --enable-busyinfo       use wxBusyInfo], wxUSE_BUS
  WX_ARG_ENABLE(joystick,    [  --enable-joystick       use wxJoystick (Linux only)], wxUSE_JOYSTICK)
  WX_ARG_ENABLE(metafile,    [  --enable-metafiles      use wxMetaFile (Windows only)], wxUSE_METAFILE)
  WX_ARG_ENABLE(dragimage,   [  --enable-dragimage      use wxDragImage], wxUSE_DRAGIMAGE)
  WX_ARG_ENABLE(joystick,    [  --enable-joystick       use wxJoystick (Linux only)], wxUSE_JOYSTICK)
  WX_ARG_ENABLE(metafile,    [  --enable-metafiles      use wxMetaFile (Windows only)], wxUSE_METAFILE)
  WX_ARG_ENABLE(dragimage,   [  --enable-dragimage      use wxDragImage], wxUSE_DRAGIMAGE)
+WX_ARG_ENABLE(accessibility,[  --enable-accessibility  enable accessibility support], wxUSE_ACCESSIBILITY)
  
  dnl ---------------------------------------------------------------------------
  dnl support for image formats that do not rely on external library
  
  dnl ---------------------------------------------------------------------------
  dnl support for image formats that do not rely on external library
@@ -1097,8 +1147,9 @@ if test "$wxUSE_GUI" = "yes"; then
  
      dnl we suppose that expr is available (maybe there is a better way to do
      dnl this? what about using ALL_TOOLKITS? TODO)
  
      dnl we suppose that expr is available (maybe there is a better way to do
      dnl this? what about using ALL_TOOLKITS? TODO)
-    NUM_TOOLKITS=`expr ${wxUSE_GTK:-0} + ${wxUSE_MOTIF:-0} + ${wxUSE_MAC:-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}`
  
      dnl Allow wxUSE_PM only for OS/2 with EMX.
      case "${host}" in
  
      dnl Allow wxUSE_PM only for OS/2 with EMX.
      case "${host}" in
@@ -1258,14 +1309,27 @@ dnl install checks
  dnl   defines INSTALL with the appropriate command
  AC_PROG_INSTALL
  
  dnl   defines INSTALL with the appropriate command
  AC_PROG_INSTALL
  
-dnl   make install path absolute (if not already); will fail with MSDOS paths
+dnl   make install path absolute (if not already);
+dnl   will fail with (some) MSDOS paths
  case ${INSTALL} in
    /* ) # Absolute
       ;;
  case ${INSTALL} in
    /* ) # Absolute
       ;;
+  ?:* ) # Drive letter, considered as absolute.
+     ;;
    *)
       INSTALL=`pwd`/${INSTALL} ;;
  esac
  
    *)
       INSTALL=`pwd`/${INSTALL} ;;
  esac
  
+dnl HP-UX install doesn't handle the "-d" switch so don't use it there
+case ${host} in
+    *-hp-hpux* )
+        INSTALL_DIR="mkdir"
+        ;;
+
+    *)  INSTALL_DIR="$INSTALL -d"
+        ;;
+esac
+
  
  case "${host}" in
  
  
  case "${host}" in
  
@@ -1384,10 +1448,24 @@ dnl ------------------------------------------------------------------------
  dnl test for strings.h needed under AIX, but do not check for it wxMac as
  dnl it exists but is only a simple redirection to string.h and it is in
  dnl conflict with Strings.h in FlatCarbon headers
  dnl test for strings.h needed under AIX, but do not check for it wxMac as
  dnl it exists but is only a simple redirection to string.h and it is in
  dnl conflict with Strings.h in FlatCarbon headers
-if test "$wxUSE_MAC" != 1; then
-  dnl defines HAVE_STRINGS_H
-  AC_CHECK_HEADERS(strings.h)
+dnl
+dnl Autoconf 2.5 tends to check for strings.h on its own, so avoiding the 
+dnl test (as the current configure script does) is not possible.  Instead, 
+dnl you must remind autoconf that strings.h is NOT valid.  The autoconf 
+dnl test succeeds because there is a strings.h file that simply includes 
+dnl string.h.  Unfortunately, there is also a strings.h as part of the 
+dnl FlatCarbon headers.                                    -- David Elliott
+if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1; then
+    AC_CACHE_CHECK([for strings.h], ac_cv_header_strings_h, 
+                   [ac_cv_header_strings_h=no])
+    if test "$ac_cv_header_strings_h" = "no"; then
+        AC_MSG_RESULT([forced no into cache])
+    else
+        AC_MSG_WARN([strings.h is not compatible with Mac OS X])
+    fi
  fi
  fi
+dnl defines HAVE_STRINGS_H
+AC_CHECK_HEADERS(strings.h)
  
  dnl defines HAVE_STDLIB_H
  AC_CHECK_HEADERS(stdlib.h)
  
  dnl defines HAVE_STDLIB_H
  AC_CHECK_HEADERS(stdlib.h)
@@ -1414,6 +1492,15 @@ fi
  dnl defines HAVE_LANGINFO_H (GNU libc locale parameters)
  AC_CHECK_HEADERS(langinfo.h)
  
  dnl defines HAVE_LANGINFO_H (GNU libc locale parameters)
  AC_CHECK_HEADERS(langinfo.h)
  
+case "${host}" in
+  *-pc-os2_emx | *-pc-os2-emx )
+      dnl Explicitly link -lintl if langinfo.h is available.
+      if test $ac_cv_header_langinfo_h = "yes"; then
+          LIBS="$LIBS -lintl"
+      fi
+  ;;
+esac
+
  if test "$wxUSE_GUI" = "yes"; then
      if test "$wxUSE_UNIX" = "yes"; then
          dnl defines HAVE_X11_XKBLIB_H
  if test "$wxUSE_GUI" = "yes"; then
      if test "$wxUSE_UNIX" = "yes"; then
          dnl defines HAVE_X11_XKBLIB_H
@@ -1529,6 +1616,9 @@ WX_CPP_BOOL
  dnl check whether C++ compiler supports explicit keyword
  WX_CPP_EXPLICIT
  
  dnl check whether C++ compiler supports explicit keyword
  WX_CPP_EXPLICIT
  
+dnl check whether C++ compiler supports C++ casts
+AC_CXX_CONST_CAST
+
  dnl ---------------------------------------------------------------------------
  dnl Define search path for includes and libraries: all headers and libs will be
  dnl looked for in all directories of this path
  dnl ---------------------------------------------------------------------------
  dnl Define search path for includes and libraries: all headers and libs will be
  dnl looked for in all directories of this path
@@ -1618,7 +1708,7 @@ dnl check for glibc version
  dnl
  dnl VZ: I have no idea why had this check been there originally, but now
  dnl     we could probably do without it by just always adding _GNU_SOURCE
  dnl
  dnl VZ: I have no idea why had this check been there originally, but now
  dnl     we could probably do without it by just always adding _GNU_SOURCE
-if test "$USE_LINUX" = 1; then
+if test "$USE_LINUX" = 1 -o "$USE_GNU" = 1; then
      AC_CACHE_CHECK([for glibc 2.1 or later], wx_cv_lib_glibc21,[
          AC_TRY_COMPILE([#include <features.h>],
              [
      AC_CACHE_CHECK([for glibc 2.1 or later], wx_cv_lib_glibc21,[
          AC_TRY_COMPILE([#include <features.h>],
              [
@@ -1684,7 +1774,7 @@ if test "$wxUSE_REGEX" != "no"; then
      if test "$wxUSE_REGEX" = "sys" -o "$wxUSE_REGEX" = "yes" ; then
          dnl according to Unix 98 specs, regcomp() is in libc but I believe that
          dnl on some old systems it may be in libregex - check for it too?
      if test "$wxUSE_REGEX" = "sys" -o "$wxUSE_REGEX" = "yes" ; then
          dnl according to Unix 98 specs, regcomp() is in libc but I believe that
          dnl on some old systems it may be in libregex - check for it too?
-        AC_CHECK_HEADER(regex.h, AC_CHECK_FUNCS(regcomp))
+        AC_CHECK_HEADER(regex.h, [AC_CHECK_FUNCS(regcomp)])
  
          if test "x$ac_cv_func_regcomp" != "xyes"; then
              if test "$wxUSE_REGEX" = "sys" ; then
  
          if test "x$ac_cv_func_regcomp" != "xyes"; then
              if test "$wxUSE_REGEX" = "sys" ; then
@@ -1729,14 +1819,12 @@ if test "$wxUSE_ZLIB" != "no" ; then
              dnl has anything more ancient (1.1.3 was released in July 1998)
              dnl anyhow
              AC_CACHE_CHECK([for zlib.h >= 1.1.4], ac_cv_header_zlib_h,
              dnl has anything more ancient (1.1.3 was released in July 1998)
              dnl anyhow
              AC_CACHE_CHECK([for zlib.h >= 1.1.4], ac_cv_header_zlib_h,
-                AC_TRY_RUN(
+                [AC_TRY_RUN(
+                    dnl zlib.h defines ZLIB_VERSION="x.y.z"
                      [
                      [
-                        dnl zlib.h defines ZLIB_VERSION="x.y.z"
                          #include <zlib.h>
                          #include <stdio.h>
  
                          #include <zlib.h>
                          #include <stdio.h>
  
-                        dnl don't use the brackets as quotes, we need them
-                        changequote(,)
                          int main()
                          {
                              FILE *f=fopen("conftestval", "w");
                          int main()
                          {
                              FILE *f=fopen("conftestval", "w");
@@ -1748,13 +1836,12 @@ if test "$wxUSE_ZLIB" != "no" ; then
                                       ZLIB_VERSION[4] >= '4')) ? "yes" : "no");
                              exit(0);
                          }
                                       ZLIB_VERSION[4] >= '4')) ? "yes" : "no");
                              exit(0);
                          }
-                        changequote([,])
                      ],
                      ac_cv_header_zlib_h=`cat conftestval`,
                      ac_cv_header_zlib_h=no,
                      dnl cross-compiling: don't have an answer, try later
                      unset ac_cv_header_zlib_h
                      ],
                      ac_cv_header_zlib_h=`cat conftestval`,
                      ac_cv_header_zlib_h=no,
                      dnl cross-compiling: don't have an answer, try later
                      unset ac_cv_header_zlib_h
-                )
+                )]
              )
              dnl If the test above did not come up with a value (e.g. cross
              dnl compiling) then this should give a definitive answer
              )
              dnl If the test above did not come up with a value (e.g. cross
              dnl compiling) then this should give a definitive answer
@@ -1813,9 +1900,9 @@ if test "$wxUSE_LIBPNG" != "no" ; then
              dnl libpng version 0.9 is known to not work, if an even newer
              dnl version is required, just bump it up in the test below
              AC_CACHE_CHECK([for png.h > 0.90], ac_cv_header_png_h,
              dnl libpng version 0.9 is known to not work, if an even newer
              dnl version is required, just bump it up in the test below
              AC_CACHE_CHECK([for png.h > 0.90], ac_cv_header_png_h,
-                AC_TRY_RUN(
+                [AC_TRY_RUN(
+                    dnl png.h defines PNG_LIBPNG_VER=number
                      [
                      [
-                        dnl png.h defines PNG_LIBPNG_VER=number
                          #include <png.h>
                          #include <stdio.h>
  
                          #include <png.h>
                          #include <stdio.h>
  
@@ -1832,7 +1919,7 @@ if test "$wxUSE_LIBPNG" != "no" ; then
                      ac_cv_header_png_h=no,
                      dnl cross-compiling: test (later) if we have any png.h
                      unset ac_cv_header_png_h
                      ac_cv_header_png_h=no,
                      dnl cross-compiling: test (later) if we have any png.h
                      unset ac_cv_header_png_h
-                )
+                )]
              )
              AC_CHECK_HEADER(png.h)
  
              )
              AC_CHECK_HEADER(png.h)
  
@@ -2011,6 +2098,10 @@ if test "$USE_WIN32" = 1 ; then
      dnl ---        some of them should probably be included conditionally.
      LIBS="$LIBS -lwinspool -lwinmm -lshell32 -lcomctl32 -lctl3d32 -ladvapi32 -lwsock32"
  
      dnl ---        some of them should probably be included conditionally.
      LIBS="$LIBS -lwinspool -lwinmm -lshell32 -lcomctl32 -lctl3d32 -ladvapi32 -lwsock32"
  
+    if test "$wxUSE_ACCESSIBILITY" = "yes" ; then
+        LIBS="$LIBS -loleacc"
+    fi
+
      case "${host}" in
          *-*-cygwin* )
              dnl Cygwin doesn't include these by default
      case "${host}" in
          *-*-cygwin* )
              dnl Cygwin doesn't include these by default
@@ -2019,9 +2110,14 @@ if test "$USE_WIN32" = 1 ; then
      esac
  
      dnl add extra odbc libs if we have compiled in odbc
      esac
  
      dnl add extra odbc libs if we have compiled in odbc
+    if test "$wxUSE_ODBC" = "sys" ; then
+        wxUSE_ODBC = "yes"
+    fi
      if test "$wxUSE_ODBC" = "yes" ; then
          LIBS=" -lodbc32 -lole32 -loleaut32 $LIBS"
      if test "$wxUSE_ODBC" = "yes" ; then
          LIBS=" -lodbc32 -lole32 -loleaut32 $LIBS"
+        AC_DEFINE(wxUSE_ODBC)
      fi
      fi
+    dnl We might want to abort here if wxUSE_ODBC="builtin" isn't supported on msw.
  
      RESFLAGS="--include-dir \$(top_srcdir)/include --include-dir \$(top_srcdir)/\$(program_dir) --define __WIN32__ --define __WIN95__ --define __GNUWIN32__"
      RESPROGRAMOBJ="\$(PROGRAM)_resources.o"
  
      RESFLAGS="--include-dir \$(top_srcdir)/include --include-dir \$(top_srcdir)/\$(program_dir) --define __WIN32__ --define __WIN95__ --define __GNUWIN32__"
      RESPROGRAMOBJ="\$(PROGRAM)_resources.o"
@@ -2216,7 +2312,7 @@ equivalent variable and GTK+ is version 1.2.3 or above.
              AC_MSG_ERROR([Cannot find MGL libraries, make sure they are compiled.])
          fi
          AC_MSG_RESULT("$MGL_ROOT/lib/$mgl_lib_type/$mgl_os")
              AC_MSG_ERROR([Cannot find MGL libraries, make sure they are compiled.])
          fi
          AC_MSG_RESULT("$MGL_ROOT/lib/$mgl_lib_type/$mgl_os")
- 
+
          wxUSE_UNIVERSAL="yes"
  
          TOOLKIT_INCLUDE="-I$MGL_ROOT/include"
          wxUSE_UNIVERSAL="yes"
  
          TOOLKIT_INCLUDE="-I$MGL_ROOT/include"
@@ -2310,6 +2406,13 @@ equivalent variable and GTK+ is version 1.2.3 or above.
              )
          fi
  
              )
          fi
  
+        AC_CHECK_LIB([Xext], [XShapeQueryExtension],
+                     [
+                      GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXext"
+                      wxHAVE_XEXT_LIB=1
+                     ],
+                     [], [$GUI_TK_LIBRARY -lX11])
+
          if test "$wxUSE_UNICODE" = "yes"; then
                  PKG_CHECK_MODULES(PANGOX, pangox,
                      [
          if test "$wxUSE_UNICODE" = "yes"; then
                  PKG_CHECK_MODULES(PANGOX, pangox,
                      [
@@ -2345,7 +2448,7 @@ equivalent variable and GTK+ is version 1.2.3 or above.
  
          if test "$wxUSE_NANOX" = "yes"; then
              TOOLKIT_INCLUDE="-I\$(top_srcdir)/include/wx/x11/nanox -I\$(MICROWIN)/src/include $TOOLKIT_INCLUDE"
  
          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"
+            TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__NANOX__ -DMWPIXEL_FORMAT=MWPF_TRUECOLOR0888 -DHAVE_FILEIO -DHAVE_BMP_SUPPORT=1 -DHAVE_GIF_SUPPORT=1 -DHAVE_PNM_SUPPORT=1 -DHAVE_XPM_SUPPORT=1 -DUNIX=1 -DUSE_EXPOSURE -DSCREEN_HEIGHT=480 -DSCREEN_WIDTH=640 -DSCREEN_DEPTH=4 -DX11=1"
              GUI_TK_LIBRARY="$GUI_TK_LIBRARY \$(MICROWIN)/src/lib/libnano-X.a"
          else
              GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lX11$xpm_link"
              GUI_TK_LIBRARY="$GUI_TK_LIBRARY \$(MICROWIN)/src/lib/libnano-X.a"
          else
              GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lX11$xpm_link"
@@ -2517,10 +2620,57 @@ equivalent variable and GTK+ is version 1.2.3 or above.
              AC_MSG_ERROR([can't link a simple motif program])
          fi
  
              AC_MSG_ERROR([can't link a simple motif program])
          fi
  
+        save_CFLAGS=$CFLAGS
+        CFLAGS="$CFLAGS $TOOLKIT_INCLUDE"
+        AC_MSG_CHECKING([for Motif 2])
+        AC_TRY_COMPILE([
+                        #include <Xm/Xm.h>
+                       ],
+                       [
+                        #if XmVersion < 2000
+                        #error "Not Motif 2"
+                        #endif
+                       ],
+                       [
+                        AC_DEFINE(__WXMOTIF20__,1)
+                        AC_MSG_RESULT([found])
+                       ],
+                       [
+                        AC_DEFINE(__WXMOTIF20__,0)
+                        AC_MSG_RESULT([not found])
+                       ])
+        CFLAGS=$save_CFLAGS
+
          GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXm$xpm_link${libp_link} -lXmu -lXext -lXt${libsm_ice_link} -lX11"
          GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXm$xpm_link${libp_link} -lXmu -lXext -lXt${libsm_ice_link} -lX11"
-        TOOLKIT_VPATH="\${top_srcdir}/src/motif${PATH_IFS}\${top_srcdir}/src/motif/xmcombo"
+        TOOLKIT_VPATH="\${top_srcdir}/src/motif${PATH_IFS}\${top_srcdir}/src/motif/xmcombo${PATH_IFS}\${top_srcdir}/src/x11"
          TOOLKIT=MOTIF
          GUIDIST=MOTIF_DIST
          TOOLKIT=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"
+
+        AC_MSG_CHECKING([for X11/extensions/shape.h])
+        AC_TRY_COMPILE([
+                        #include <X11/Xlib.h> 
+                        #include <X11/extensions/shape.h>
+                       ],
+                       [
+                        int dummy1, dummy2;
+                        XShapeQueryExtension((Display*)NULL,
+                                             (int*)NULL, (int*)NULL);
+                       ],
+                       [
+                        AC_DEFINE(HAVE_XSHAPE)
+                        AC_MSG_RESULT([found])
+                       ],
+                       [
+                        AC_MSG_RESULT([not found])
+                       ])
+        CFLAGS="$save_CFLAGS"
      fi
  
      if test "$wxUSE_MAC" = 1; then
      fi
  
      if test "$wxUSE_MAC" = 1; then
@@ -2532,12 +2682,15 @@ equivalent variable and GTK+ is version 1.2.3 or above.
          GUIDIST=MACX_DIST
      fi
  
          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
      if test "$wxUSE_PM" = 1; then
          TOOLKIT=PM
          GUIDIST=GTK_DIST
-        AC_MSG_WARN([OS/2 PM requires old resource format, re-enabled])
-        wxUSE_PROLOGIO="yes"
-        wxUSE_RESOURCES="yes"
          AC_MSG_WARN([OS/2 threads are not yet supported... disabled])
          wxUSE_THREADS="no"
      fi
          AC_MSG_WARN([OS/2 threads are not yet supported... disabled])
          wxUSE_THREADS="no"
      fi
@@ -2632,9 +2785,42 @@ dnl ---------------------------------------------------------------------------
  dnl Optional libraries included when system library is not used
  dnl ---------------------------------------------------------------------------
  
  dnl Optional libraries included when system library is not used
  dnl ---------------------------------------------------------------------------
  
-dnl ODBC objects are Unix only
-if test "$TOOLKIT" != "MSW" -a "$wxUSE_ODBC" = "yes" ; then
-    ALL_OBJECTS="${ALL_OBJECTS} \$(IODBCOBJS)"
+
+dnl ----------------------------------------------------------------
+dnl iODBC support
+dnl ----------------------------------------------------------------
+
+IODBC_C_SRC=""
+
+
+dnl ODBC is handled seperately for MSW 
+if test "$TOOLKIT" != "MSW" ; then
+
+    if test "$wxUSE_ODBC" != "no" ; then
+        AC_DEFINE(wxUSE_ODBC)
+        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS db"
+    
+        dnl is this still necessary in 2.5?
+        WXODBCFLAG="-D_IODBC_"
+
+
+        if test "$wxUSE_ODBC" = "sys" ; then
+            dnl This is not ideal we really ough to use the unixodbc-config
+            dnl  or iodbc-config if they exist.
+
+            AC_CHECK_HEADER(sql.h)
+            AC_SEARCH_LIBS(SQLAllocEnv,iodbc unixodbc odbc , , [ 
+                wxUSE_ODBC=builtin; 
+                AC_MSG_WARN( [ can't find system Odbc library falling back to builtin ])
+            ] )
+        fi
+        dnl Not "no" either...
+        if test "$wxUSE_ODBC" != "sys" ; then
+            ALL_OBJECTS="${ALL_OBJECTS} \$(IODBCOBJS)"
+        fi
+
+    fi
+    
  fi
  
  if test "$wxUSE_REGEX" = "builtin" ; then
  fi
  
  if test "$wxUSE_REGEX" = "builtin" ; then
@@ -2649,28 +2835,57 @@ dnl OpenGL libraries
  dnl ---------------------------------------------------------------------------
  
  if test "$wxUSE_OPENGL" = "yes"; then
  dnl ---------------------------------------------------------------------------
  
  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
          OPENGL_LIBS="-framework OpenGL -framework AGL"
      elif test "$wxUSE_MSW" = 1; then
          OPENGL_LIBS="-lopengl32 -lglu32"
      else
+        dnl David Elliott: Without this snippet AC_CHECK_HEADER fails to find
+        dnl GL/gl.h on Mac OS X where it is located in
+        dnl /usr/X11R6/include/GL/gl.h:
+
+        WX_PATH_FIND_INCLUDES($SEARCH_INCLUDE, GL/gl.h)
+        if test "$ac_find_includes" != "" ; then
+            AC_MSG_RESULT(found in $ac_find_includes)
+            set -x
+            WX_INCLUDE_PATH_EXIST($ac_find_includes, $CPPFLAGS)
+            CPPFLAGS="$CPPFLAGS$ac_path_to_include"
+            set +x
+        fi
+
          AC_CHECK_HEADER(GL/gl.h,
              [
          AC_CHECK_HEADER(GL/gl.h,
              [
+                found_gl=0
+
                  AC_MSG_CHECKING([for -lGL])
                  AC_MSG_CHECKING([for -lGL])
-                WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],[GL])
+                WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],GL)
                  if test "$ac_find_libraries" != "" ; then
                      WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS])
                  if test "$ac_find_libraries" != "" ; then
                      WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS])
-                    if test "$ac_path_to_link" = " -L/usr/lib" ; then
-                        LDFLAGS_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
                      fi
-                    OPENGL_LIBS="-lGL -lGLU"
-                    AC_MSG_RESULT([yes])
-                else
+
+                    dnl don't suppose that libGL and libGLU are always in the
+                    dnl same directory -- this is not true for some common
+                    dnl distributions
+                    WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],GLU)
+                    if test "$ac_find_libraries" != "" ; then
+                        WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS])
+                        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"
+                        AC_MSG_RESULT([yes])
+                    fi
+                fi
+
+                if "$found_gl" != 1; then
                      AC_MSG_RESULT([no])
                      AC_MSG_CHECKING([for -lMesaGL])
                      AC_MSG_RESULT([no])
                      AC_MSG_CHECKING([for -lMesaGL])
-                    WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],[MesaGL])
+                    WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],MesaGL)
                      if test "$ac_find_libraries" != "" ; then
                          WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS])
                          LDFLAGS_GL="$LDFLAGS$ac_path_to_link"
                      if test "$ac_find_libraries" != "" ; then
                          WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS])
                          LDFLAGS_GL="$LDFLAGS$ac_path_to_link"
@@ -2706,14 +2921,18 @@ if test -n "$TOOLKIT" ; then
      TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WX${TOOLKIT}__"
  fi
  
      TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WX${TOOLKIT}__"
  fi
  
+UNICODE=0
  lib_unicode_suffix=
  if test "$wxUSE_UNICODE" = "yes"; then
      lib_unicode_suffix=u
  lib_unicode_suffix=
  if test "$wxUSE_UNICODE" = "yes"; then
      lib_unicode_suffix=u
+    UNICODE=1
  fi
  
  lib_debug_suffix=
  fi
  
  lib_debug_suffix=
+BUILD=release
  if test "$wxUSE_DEBUG_FLAG" = "yes"; then
      lib_debug_suffix=d
  if test "$wxUSE_DEBUG_FLAG" = "yes"; then
      lib_debug_suffix=d
+    BUILD=debug
  fi
  
  WX_VERSION_TAG=`echo WX${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}_${WX_RELEASE} | tr "[[a-z]]" "[[A-Z]]"`
  fi
  
  WX_VERSION_TAG=`echo WX${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}_${WX_RELEASE} | tr "[[a-z]]" "[[A-Z]]"`
@@ -2764,7 +2983,7 @@ case "${host}" in
      *-*-darwin* )
          dnl Under Mac OS X, the naming conventions for shared libraries
          dnl are different: the number precedes the suffix.
      *-*-darwin* )
          dnl Under Mac OS X, the naming conventions for shared libraries
          dnl are different: the number precedes the suffix.
-        
+
          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_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}"
  
@@ -2811,7 +3030,9 @@ if test "$wxUSE_SHARED" = "yes"; then
      esac
  fi
  
      esac
  fi
  
+SHARED=0
  if test "$wxUSE_SHARED" = "yes"; then
  if test "$wxUSE_SHARED" = "yes"; then
+    SHARED=1
  
      dnl install targets
      if test "$wxUSE_OPENGL" = "yes"; then
  
      dnl install targets
      if test "$wxUSE_OPENGL" = "yes"; then
@@ -2830,7 +3051,7 @@ if test "$wxUSE_SHARED" = "yes"; then
  
  
      dnl use versioned symbols if available on the platform
  
  
      dnl use versioned symbols if available on the platform
-    WX_VERSIONED_SYMBOLS([\$(top_builddir)/version-script])
+    WX_VERSIONED_SYMBOLS([\$(top_builddir)version-script])
  
      dnl the command to use for creating the shared library
      SHARED_LD="${CXX} -shared -o"
  
      dnl the command to use for creating the shared library
      SHARED_LD="${CXX} -shared -o"
@@ -2858,7 +3079,7 @@ if test "$wxUSE_SHARED" = "yes"; then
          fi
        ;;
  
          fi
        ;;
  
-      *-*-linux* )
+      *-*-linux* | *-*-gnu* )
          if test "$GCC" != "yes"; then
              AC_CACHE_CHECK([for Intel compiler], wx_cv_prog_icc,
              [
          if test "$GCC" != "yes"; then
              AC_CACHE_CHECK([for Intel compiler], wx_cv_prog_icc,
              [
@@ -2883,6 +3104,7 @@ if test "$wxUSE_SHARED" = "yes"; then
              dnl substitute this in makelib.env for the contrib libs
              WX_TARGET_LIBRARY_SONAME="-Wl,-soname,\$(TARGETLIB_LINK1)"
          fi
              dnl substitute this in makelib.env for the contrib libs
              WX_TARGET_LIBRARY_SONAME="-Wl,-soname,\$(TARGETLIB_LINK1)"
          fi
+        SAMPLES_RPATH_FLAG="-Wl,-rpath,\$(top_builddir)lib"
        ;;
  
        *-*-solaris2* )
        ;;
  
        *-*-solaris2* )
@@ -2890,11 +3112,38 @@ if test "$wxUSE_SHARED" = "yes"; then
              dnl newer versions of gcc need -isystem to compile X headers on
              dnl Solaris (which use old style C syntax)
              CPPFLAGS="$CPPFLAGS -isystem /usr/openwin/include"
              dnl newer versions of gcc need -isystem to compile X headers on
              dnl Solaris (which use old style C syntax)
              CPPFLAGS="$CPPFLAGS -isystem /usr/openwin/include"
+
+            dnl gcc may use Sun's ld, in which case -rpath gives a confusing
+            dnl error message. We have to try both -Wl,-rpath and -Wl,-R:
+            saveLdflags="$LDFLAGS"
+            LDFLAGS="$saveLdflags -Wl,-rpath,/"
+            AC_MSG_CHECKING([if the linker accepts -rpath])
+            AC_TRY_LINK(
+                [],[],
+                [
+                    AC_MSG_RESULT([yes])
+                    SAMPLES_RPATH_FLAG="-Wl,-rpath,\$(top_builddir)lib"
+                ],
+                [
+                    AC_MSG_RESULT([no])
+                    AC_MSG_CHECKING([if the linker accepts -R])
+                    LDFLAGS="$saveLdflags -Wl,-R,/"
+                    AC_TRY_LINK(
+                        [],[],
+                        [
+                             AC_MSG_RESULT([yes])
+                             SAMPLES_RPATH_FLAG="-Wl,-R,\$(top_builddir)lib"],
+                        [
+                            AC_MSG_RESULT([no])
+                        ])                    
+                ])
+            LDFLAGS="$saveLdflags"
          else
              SHARED_LD="${CXX} -G -o"
              PIC_FLAG="-KPIC"
              SONAME_FLAGS="-h ${WX_LIBRARY_NAME_SHARED}"
              SONAME_FLAGS_GL="-h ${WX_LIBRARY_NAME_SHARED_GL}"
          else
              SHARED_LD="${CXX} -G -o"
              PIC_FLAG="-KPIC"
              SONAME_FLAGS="-h ${WX_LIBRARY_NAME_SHARED}"
              SONAME_FLAGS_GL="-h ${WX_LIBRARY_NAME_SHARED_GL}"
+            SAMPLES_RPATH_FLAG="-R\$(top_builddir)lib"
          fi
        ;;
  
          fi
        ;;
  
@@ -2991,7 +3240,7 @@ if test "$wxUSE_SHARED" = "no"; then
          WX_ALL_INSTALLED="${WX_ALL_INSTALLED} preinstall"
      fi
  
          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
  
          WX_ALL_INSTALLED="${WX_ALL_INSTALLED} preinstall"
      fi
  
@@ -3015,13 +3264,13 @@ else
      STATIC_FLAG="no"
  fi
  
      STATIC_FLAG="no"
  fi
  
-dnl default value is comment for makefile
-MACRESCOMP="#"
-MACSETFILE="#"
+dnl default value is to (silently) do nothing in the makefile
+MACRESCOMP="@#"
+MACSETFILE="@#"
  MACRESWXCONFIG="#"
  if test "$wxUSE_MAC" = 1; then
      dnl add the resources target for wxMac
  MACRESWXCONFIG="#"
  if test "$wxUSE_MAC" = 1; then
      dnl add the resources target for wxMac
-    LIBWXMACRES="\$(top_builddir)/lib/${WX_RESOURCES_MACOSX_ASCII}"
+    LIBWXMACRES="\$(top_builddir)lib/${WX_RESOURCES_MACOSX_ASCII}"
      WX_ALL="${WX_ALL} ${LIBWXMACRES}"
      WX_ALL_INSTALLED="${WX_ALL_INSTALLED} preinstall_res"
      AC_CHECK_PROG(RESCOMP, Rez, Rez, /Developer/Tools/Rez)
      WX_ALL="${WX_ALL} ${LIBWXMACRES}"
      WX_ALL_INSTALLED="${WX_ALL_INSTALLED} preinstall_res"
      AC_CHECK_PROG(RESCOMP, Rez, Rez, /Developer/Tools/Rez)
@@ -3032,7 +3281,14 @@ if test "$wxUSE_MAC" = 1; then
      dnl since the carb resource *must* be included in the application
      MACRESCOMP="\$(RESCOMP) -d __DARWIN__ -t APPL Carbon.r ${LIBWXMACRES} -o"
      MACSETFILE="\$(SETFILE)"
      dnl since the carb resource *must* be included in the application
      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"
+    MACRESWXCONFIG="${RESCOMP} -d __DARWIN__ -t APPL Carbon.r \${exec_prefix}/lib/${WX_RESOURCES_MACOSX_ASCII} -o"
+elif test "$wxUSE_COCOA" = 1; then
+    AC_CHECK_PROG(RESCOMP, Rez, Rez, /Developer/Tools/Rez)
+    AC_CHECK_PROG(DEREZ, DeRez, DeRez, /Developer/Tools/DeRez)
+    AC_CHECK_PROG(SETFILE, SetFile, SetFile, /Developer/Tools/SetFile)
+    MACRESCOMP="echo -n | \$(RESCOMP) -d __DARWIN__ -t APPL ${LIBWXMACRES} -o"
+    MACSETFILE="\$(SETFILE)"
+    MACRESWXCONFIG="echo -n | ${RESCOMP} -d __DARWIN__ -t APPL \${exec_prefix}/lib/${WX_RESOURCES_MACOSX_ASCII} -o"
  else
      if test "$wxUSE_PM" = 1; then
          MACRESCOMP="emxbind -ep"
  else
      if test "$wxUSE_PM" = 1; then
          MACRESCOMP="emxbind -ep"
@@ -3055,11 +3311,12 @@ dnl   defines uid_t and gid_t if not already defined
  AC_TYPE_UID_T
  
  dnl check what exactly size_t is on this machine - this is necessary to avoid
  AC_TYPE_UID_T
  
  dnl check what exactly size_t is on this machine - this is necessary to avoid
-dnl ambiguos overloads in several places, notably wx/string.h and wx/array.h
+dnl ambiguous overloads in several places, notably wx/string.h and wx/array.h
  AC_LANG_SAVE
  AC_LANG_CPLUSPLUS
  AC_CACHE_CHECK([if size_t is unsigned int],
      wx_cv_size_t_is_uint,
  AC_LANG_SAVE
  AC_LANG_CPLUSPLUS
  AC_CACHE_CHECK([if size_t is unsigned int],
      wx_cv_size_t_is_uint,
+    [
      dnl an obvious check like AC_TRY_COMPILE[struct Foo { ... };] doesn't work
      dnl with egcs (at least) up to 1.1.1 as it allows you to compile duplicate
      dnl methods in a local class (i.e. class inside a function) declaration
      dnl an obvious check like AC_TRY_COMPILE[struct Foo { ... };] doesn't work
      dnl with egcs (at least) up to 1.1.1 as it allows you to compile duplicate
      dnl methods in a local class (i.e. class inside a function) declaration
@@ -3077,6 +3334,7 @@ AC_CACHE_CHECK([if size_t is unsigned int],
          wx_cv_size_t_is_uint=no,
          wx_cv_size_t_is_uint=yes
      )
          wx_cv_size_t_is_uint=no,
          wx_cv_size_t_is_uint=yes
      )
+    ]
  )
  
  if test "$wx_cv_size_t_is_uint" = "yes"; then
  )
  
  if test "$wx_cv_size_t_is_uint" = "yes"; then
@@ -3482,6 +3740,20 @@ fi
  fi
  dnl if !MSW
  
  fi
  dnl if !MSW
  
+
+dnl ------------------------------------------
+dnl Checks specific to contrib libs (MMedia)
+dnl ------------------------------------------
+
+dnl Check for ESD:
+ESD_LINK=
+AC_CHECK_HEADER([esd.h], [
+  AC_CHECK_LIB(esd, esd_close, [
+    ESD_LINK="-lesd"
+  ])
+])
+
+
  dnl ===========================================================================
  dnl Now we have all the info we need - use it!
  dnl ===========================================================================
  dnl ===========================================================================
  dnl Now we have all the info we need - use it!
  dnl ===========================================================================
@@ -3553,6 +3825,30 @@ if test "$TOOLKIT" != "MSW"; then
                  dnl AIX calls the library libpthreads - thanks IBM!
                  THREAD_OPTS="pthreads"
                  ;;
                  dnl AIX calls the library libpthreads - thanks IBM!
                  THREAD_OPTS="pthreads"
                  ;;
+          *-hp-hpux* )
+                dnl HP-UX aCC only gives a warning, not an error about
+                dnl -pthread but it doesn't work and we have to use -lpthread
+                dnl there
+                if test "x$GCC" != "xyes"; then
+                    THREAD_OPTS=""
+                fi
+                ;;
+
+          *-*-irix* )
+                dnl gcc under IRIX doesn't seem to like -pthread, but it
+                dnl doesn't give an error for it neither, just a warning
+                dnl message -- but this is still very annoying
+                if test "x$GCC" = "xyes"; then
+                    THREAD_OPTS=""
+                fi
+                ;;
+
+          *-*-*UnixWare*)
+                dnl flying by man pages here: Caldera online docs use this
+                if test "x$GCC" != "xyes"; then
+                    THREAD_OPTS="-Ethread"
+                fi
+                ;;
          esac
  
          dnl simply linking with libpthread should make the test below work but
          esac
  
          dnl simply linking with libpthread should make the test below work but
@@ -3627,6 +3923,10 @@ if test "$TOOLKIT" != "MSW"; then
                  ;;
              *-hp-hpux* )
                  flag="-D_REENTRANT"
                  ;;
              *-hp-hpux* )
                  flag="-D_REENTRANT"
+                if test "x$GCC" != "xyes"; then
+                    dnl see http://docs.hp.com/hpux/onlinedocs/2213/threads.htm
+                    flag="$flag -D_RWSTD_MULTI_THREAD"
+                fi
                  ;;
              *solaris* | alpha*-osf*)
                  flag="-D_REENTRANT"
                  ;;
              *solaris* | alpha*-osf*)
                  flag="-D_REENTRANT"
@@ -3671,17 +3971,17 @@ if test "$TOOLKIT" != "MSW"; then
        dnl   3. pthread_attr_getschedparam and pthread_attr_setschedparam
        HAVE_PRIOR_FUNCS=0
        AC_CHECK_FUNC(pthread_attr_getschedpolicy,
        dnl   3. pthread_attr_getschedparam and pthread_attr_setschedparam
        HAVE_PRIOR_FUNCS=0
        AC_CHECK_FUNC(pthread_attr_getschedpolicy,
-                     AC_CHECK_FUNC(pthread_attr_setschedparam,
-                       AC_CHECK_FUNC(sched_get_priority_max,
+                     [AC_CHECK_FUNC(pthread_attr_setschedparam,
+                       [AC_CHECK_FUNC(sched_get_priority_max,
                             HAVE_PRIOR_FUNCS=1,
                             HAVE_PRIOR_FUNCS=1,
-                           AC_CHECK_LIB([posix4], sched_get_priority_max,
+                           [AC_CHECK_LIB([posix4], sched_get_priority_max,
                               [
                                  HAVE_PRIOR_FUNCS=1
                                  POSIX4_LINK=" -lposix4"
                               ],
                               [
                                  HAVE_PRIOR_FUNCS=1
                                  POSIX4_LINK=" -lposix4"
                               ],
-                           )
-                       )
-                     )
+                           )]
+                       )]
+                     )]
                     )
  
        if test "$HAVE_PRIOR_FUNCS" = 1; then
                     )
  
        if test "$HAVE_PRIOR_FUNCS" = 1; then
@@ -3900,11 +4200,18 @@ if test "$GCC" = "yes" ; then
      esac
  fi
  
      esac
  fi
  
+OPTIMISE=
  if test "$wxUSE_OPTIMISE" = "no" ; then
  if test "$wxUSE_OPTIMISE" = "no" ; then
-    OPTIMISE=
+    if test "$GCC" = yes ; then
+        dnl use -O0 because compiling with it is faster than compiling with no
+        dnl optimization options at all (at least with g++ 3.2)
+        OPTIMISE="-O0"
+    fi
  else
      if test "$GCC" = yes ; then
          OPTIMISE="-O2"
  else
      if test "$GCC" = yes ; then
          OPTIMISE="-O2"
+
+        dnl VZ: does anybody know what does this do??
          case "${host}" in
              i586-*-*|i686-*-* )
              OPTIMISE="${OPTIMISE} "
          case "${host}" in
              i586-*-*|i686-*-* )
              OPTIMISE="${OPTIMISE} "
@@ -3993,10 +4300,6 @@ if test "$wxUSE_DATETIME" = "yes"; then
    AC_DEFINE(wxUSE_DATETIME)
  fi
  
    AC_DEFINE(wxUSE_DATETIME)
  fi
  
-if test "$wxUSE_TIMEDATE" = "yes"; then
-  AC_DEFINE(wxUSE_TIMEDATE)
-fi
-
  if test "$wxUSE_FILE" = "yes"; then
    AC_DEFINE(wxUSE_FILE)
  fi
  if test "$wxUSE_FILE" = "yes"; then
    AC_DEFINE(wxUSE_FILE)
  fi
@@ -4240,7 +4543,6 @@ if test "$wxUSE_DATETIME" = "yes"; then
          fi
      fi
  
          fi
      fi
  
-    AC_DEFINE(wxUSE_TIMEDATE)
      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS typetest"
  fi
  
      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS typetest"
  fi
  
@@ -4283,9 +4585,6 @@ if test "$wxUSE_SOCKETS" = "yes" ; then
          AC_CACHE_CHECK([what is the type of the third argument of getsockname],
                         wx_cv_type_getsockname3,
              [
          AC_CACHE_CHECK([what is the type of the third argument of getsockname],
                         wx_cv_type_getsockname3,
              [
-                AC_LANG_SAVE
-                AC_LANG_CPLUSPLUS
-
                  AC_TRY_COMPILE(
                      [
                          #include <sys/types.h>
                  AC_TRY_COMPILE(
                      [
                          #include <sys/types.h>
@@ -4296,32 +4595,45 @@ if test "$wxUSE_SOCKETS" = "yes" ; then
                          getsockname(0, 0, &len);
                      ],
                      wx_cv_type_getsockname3=socklen_t,
                          getsockname(0, 0, &len);
                      ],
                      wx_cv_type_getsockname3=socklen_t,
-                    AC_TRY_COMPILE(
-                        [
-                            #include <sys/types.h>
-                            #include <sys/socket.h>
-                        ],
-                        [
-                            size_t len;
-                            getsockname(0, 0, &len);
-                        ],
-                        wx_cv_type_getsockname3=size_t,
+                    [
+                        dnl the compiler will compile the version with size_t
+                        dnl even if the real type of the last parameter is int
+                        dnl but it should give at least a warning about
+                        dnl converting between incompatible pointer types, so
+                        dnl try to use it to get the correct behaviour at
+                        dnl least with gcc (otherwise we'd always use size_t)
+                        CFLAGS_OLD="$CFLAGS"
+                        if test "$GCC" = yes ; then
+                            CFLAGS="$CFLAGS -Werror"
+                        fi
+
                          AC_TRY_COMPILE(
                              [
                                  #include <sys/types.h>
                                  #include <sys/socket.h>
                              ],
                              [
                          AC_TRY_COMPILE(
                              [
                                  #include <sys/types.h>
                                  #include <sys/socket.h>
                              ],
                              [
-                                int len;
+                                size_t len;
                                  getsockname(0, 0, &len);
                              ],
                                  getsockname(0, 0, &len);
                              ],
-                            wx_cv_type_getsockname3=int,
-                            wx_cv_type_getsockname3=unknown
+                            wx_cv_type_getsockname3=size_t,
+                            AC_TRY_COMPILE(
+                                [
+                                    #include <sys/types.h>
+                                    #include <sys/socket.h>
+                                ],
+                                [
+                                    int len;
+                                    getsockname(0, 0, &len);
+                                ],
+                                wx_cv_type_getsockname3=int,
+                                wx_cv_type_getsockname3=unknown
+                            )
                          )
                          )
-                    )
-                )
  
  
-                AC_LANG_RESTORE
+                        CFLAGS="$CFLAGS_OLD"
+                    ]
+                )
              ])
  
          if test "$wx_cv_type_getsockname3" = "unknown"; then
              ])
  
          if test "$wx_cv_type_getsockname3" = "unknown"; then
@@ -4344,7 +4656,7 @@ dnl ---------------------------------------------------------------------------
  
  if test "$wxUSE_GUI" = "yes"; then
  
  
  if test "$wxUSE_GUI" = "yes"; then
  
-    if test "$TOOLKIT" = "MAC"; then
+    if test "$TOOLKIT" = "MAC" -o "$TOOLKIT" = "COCOA"; then
          AC_MSG_WARN([Joystick not yet supported under Mac OS X... disabled])
          wxUSE_JOYSTICK=no
       fi
          AC_MSG_WARN([Joystick not yet supported under Mac OS X... disabled])
          wxUSE_JOYSTICK=no
       fi
@@ -4480,18 +4792,6 @@ if test "$wxUSE_wxUSE_EXPERIMENTAL_PRINTF" = "yes"; then
    AC_DEFINE(wxUSE_EXPERIMENTAL_PRINTF)
  fi
  
    AC_DEFINE(wxUSE_EXPERIMENTAL_PRINTF)
  fi
  
-
-dnl ----------------------------------------------------------------
-dnl iODBC support
-dnl ----------------------------------------------------------------
-
-IODBC_C_SRC=""
-if test "$wxUSE_ODBC" = "yes" ; then
-    AC_DEFINE(wxUSE_ODBC)
-    WXODBCFLAG="-D_IODBC_"
-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS db"
-fi
-
  dnl ----------------------------------------------------------------
  dnl Register PostScript options for makefiles and setup.h
  dnl ----------------------------------------------------------------
  dnl ----------------------------------------------------------------
  dnl Register PostScript options for makefiles and setup.h
  dnl ----------------------------------------------------------------
@@ -4564,25 +4864,8 @@ if test "$wxUSE_PRINTING_ARCHITECTURE" = "yes" ; then
      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS printing"
  fi
  
      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS printing"
  fi
  
-if test "$wxUSE_PROLOGIO" = "yes" ; then
-    AC_DEFINE(wxUSE_PROLOGIO)
-    ALL_OBJECTS="$ALL_OBJECTS parser.o"
-fi
-
-if test "$wxUSE_RESOURCES" = "yes" ; then
-    if test "$wxUSE_NANOX" = "yes"; then
-        AC_MSG_WARN([Cannot use resource database functions in NanoX])
-    else
-        AC_DEFINE(wxUSE_RESOURCES)
-        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS resource"
-    fi
-    if test "$wxUSE_PROLOGIO" != "yes" ; then
-        ALL_OBJECTS="$ALL_OBJECTS parser.o"
-    fi
-fi
-
-if test "$wxUSE_X_RESOURCES" = "yes"; then
-    AC_DEFINE(wxUSE_X_RESOURCES)
+if test "$wxUSE_PROLOGIO" = "yes" -o  "$wxUSE_RESOURCES" = "yes"; then
+    AC_MSG_ERROR([wxExpr and old-style resources are now available in contrib only])
  fi
  
  dnl ---------------------------------------------------------------------------
  fi
  
  dnl ---------------------------------------------------------------------------
@@ -4748,16 +5031,14 @@ if test "$wxUSE_CHECKLST" = "yes"; then
    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS checklst"
  fi
  
    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS checklst"
  fi
  
-if test "$wxUSE_GAUGE" = "yes"; then
-  AC_DEFINE(wxUSE_GAUGE)
-  USES_CONTROLS=1
+if test "$wxUSE_DISPLAY" = "yes"; then
+    AC_DEFINE(wxUSE_DISPLAY)
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS display"
  fi
  
  fi
  
-if test "$wxUSE_NEW_GRID" = "yes"; then
-  wxUSE_GRID="yes"
-  AC_DEFINE(wxUSE_NEW_GRID)
+if test "$wxUSE_GAUGE" = "yes"; then
+  AC_DEFINE(wxUSE_GAUGE)
    USES_CONTROLS=1
    USES_CONTROLS=1
-  SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS newgrid"
  fi
  
  if test "$wxUSE_GRID" = "yes"; then
  fi
  
  if test "$wxUSE_GRID" = "yes"; then
@@ -4791,11 +5072,11 @@ if test "$wxUSE_NOTEBOOK" = "yes"; then
      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS notebook"
  fi
  
      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS notebook"
  fi
  
-if test "$wxUSE_PROPSHEET" = "yes"; then
-    AC_DEFINE(wxUSE_PROPSHEET)
-    USES_CONTROLS=1
-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS proplist"
-fi
+dnl if test "$wxUSE_PROPSHEET" = "yes"; then
+dnl     AC_DEFINE(wxUSE_PROPSHEET)
+dnl     USES_CONTROLS=1
+dnl     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS proplist"
+dnl fi
  
  if test "$wxUSE_RADIOBOX" = "yes"; then
      AC_DEFINE(wxUSE_RADIOBOX)
  
  if test "$wxUSE_RADIOBOX" = "yes"; then
      AC_DEFINE(wxUSE_RADIOBOX)
@@ -4877,7 +5158,7 @@ if test "$wxUSE_TEXTCTRL" = "yes"; then
  fi
  
  if test "$wxUSE_TOGGLEBTN" = "yes"; then
  fi
  
  if test "$wxUSE_TOGGLEBTN" = "yes"; then
-    if test "$wxUSE_MAC" = 1; then
+    if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1 ; then
          AC_MSG_WARN([Toggle button not yet supported under Mac OS X... disabled])
          wxUSE_TOGGLEBTN=no
      fi
          AC_MSG_WARN([Toggle button not yet supported under Mac OS X... disabled])
          wxUSE_TOGGLEBTN=no
      fi
@@ -4938,7 +5219,7 @@ if test "$wxUSE_TREECTRL" = "yes"; then
  fi
  
  if test "$wxUSE_POPUPWIN" = "yes"; then
  fi
  
  if test "$wxUSE_POPUPWIN" = "yes"; then
-    if test "$wxUSE_MAC" = 1; then
+    if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1 ; then
          AC_MSG_WARN([Popup window not yet supported under Mac OS X... disabled])
      else
          if test "$wxUSE_MOTIF" = 1; then
          AC_MSG_WARN([Popup window not yet supported under Mac OS X... disabled])
      else
          if test "$wxUSE_MOTIF" = 1; then
@@ -4971,16 +5252,21 @@ dnl ---------------------------------------------------------------------------
  dnl misc options
  dnl ---------------------------------------------------------------------------
  
  dnl misc options
  dnl ---------------------------------------------------------------------------
  
-if test "$wxUSE_TREELAYOUT" = "yes"; then
-    AC_DEFINE(wxUSE_TREELAYOUT)
-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS treelay"
-fi
+dnl if test "$wxUSE_TREELAYOUT" = "yes"; then
+dnl     AC_DEFINE(wxUSE_TREELAYOUT)
+dnl     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS treelay"
+dnl fi
  
  if test "$wxUSE_DRAGIMAGE" = "yes"; then
      AC_DEFINE(wxUSE_DRAGIMAGE)
      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dragimag"
  fi
  
  
  if test "$wxUSE_DRAGIMAGE" = "yes"; then
      AC_DEFINE(wxUSE_DRAGIMAGE)
      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dragimag"
  fi
  
+if test "$wxUSE_ACCESSIBILITY" = "yes"; then
+    AC_DEFINE(wxUSE_ACCESSIBILITY)
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS access"
+fi
+
  if test "$wxUSE_MENUS" = "yes"; then
      AC_DEFINE(wxUSE_MENUS)
      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS menu"
  if test "$wxUSE_MENUS" = "yes"; then
      AC_DEFINE(wxUSE_MENUS)
      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS menu"
@@ -5040,7 +5326,7 @@ fi
  
  if test "$wxUSE_HTML" = "yes"; then
      AC_DEFINE(wxUSE_HTML)
  
  if test "$wxUSE_HTML" = "yes"; then
      AC_DEFINE(wxUSE_HTML)
-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS html"
+    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS html htlbox"
  fi
  
  if test "$wxUSE_VALIDATORS" = "yes"; then
  fi
  
  if test "$wxUSE_VALIDATORS" = "yes"; then
@@ -5182,7 +5468,7 @@ fi
  AC_DEFINE_UNQUOTED(wxINSTALL_PREFIX, "$wxPREFIX")
  
  dnl define the variables used in wx-config
  AC_DEFINE_UNQUOTED(wxINSTALL_PREFIX, "$wxPREFIX")
  
  dnl define the variables used in wx-config
-top_builddir=`pwd`
+top_builddir_wxconfig=`pwd`
  
  dnl ---------------------------------------------------------------------------
  dnl Output the makefiles and such from the results found above
  
  dnl ---------------------------------------------------------------------------
  dnl Output the makefiles and such from the results found above
@@ -5196,6 +5482,9 @@ dnl extended.c uses floor() and is always linked in
  if test "$wxUSE_MAC" = 1 ; then
      LDFLAGS="$LDFLAGS -framework Carbon -framework System"
  fi
  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
  
  dnl FIXME: should this be covered by the conditional above
  dnl given the -lm comment there?  Or should that comment (and
  
  dnl FIXME: should this be covered by the conditional above
  dnl given the -lm comment there?  Or should that comment (and
@@ -5255,10 +5544,7 @@ if test "$wxUSE_GUI" = "yes"; then
      dnl      ipc, mfc, nativdlg, oleauto, ownerdrw
      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS artprov controls dialogs \
                       drawing dynamic erase event exec font image \
      dnl      ipc, mfc, nativdlg, oleauto, ownerdrw
      SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS artprov controls dialogs \
                       drawing dynamic erase event exec font image \
-                     minimal propsize rotate widgets"
-
-    dnl this is needed to be able to find AFM files
-    CPPFLAGS="$CPPFLAGS \$(EXTRADEFS) \$(APPEXTRADEFS)"
+                     minimal propsize rotate shaped widgets"
  else
      SAMPLES_SUBDIRS="console"
  fi
  else
      SAMPLES_SUBDIRS="console"
  fi
@@ -5271,7 +5557,7 @@ dnl and other stuff for the built in libraries should come first to avoid
  dnl including the system headers with the same name (it is particularly
  dnl important for zlib because XFree 4.2.0 has its own, horribly old and
  dnl incompatible, zlib.h) and the wxWindows headers should come first anyhow
  dnl including the system headers with the same name (it is particularly
  dnl important for zlib because XFree 4.2.0 has its own, horribly old and
  dnl incompatible, zlib.h) and the wxWindows headers should come first anyhow
-INCLUDES="-I\${top_builddir}/lib/wx/include/${TOOLCHAIN_NAME} \
+INCLUDES="-I\${top_builddir}lib/wx/include/${TOOLCHAIN_NAME} \
  -I\${top_srcdir}/include \
  $REGEX_INCLUDE $ZLIB_INCLUDE $PNG_INCLUDE $JPEG_INCLUDE $TIFF_INCLUDE \
  $TOOLKIT_INCLUDE"
  -I\${top_srcdir}/include \
  $REGEX_INCLUDE $ZLIB_INCLUDE $PNG_INCLUDE $JPEG_INCLUDE $TIFF_INCLUDE \
  $TOOLKIT_INCLUDE"
@@ -5283,19 +5569,43 @@ else
      WXCONFIG_INCLUDE="$TOOLKIT_INCLUDE"
  fi
  
      WXCONFIG_INCLUDE="$TOOLKIT_INCLUDE"
  fi
  
+if test "x$wxUSE_UNIVERSAL" = "xyes" ; then
+    WXUNIV=1
+else
+    WXUNIV=0
+fi
+
+AC_SUBST(wxUSE_ZLIB)
+AC_SUBST(wxUSE_REGEX)
+AC_SUBST(wxUSE_ODBC)
+AC_SUBST(wxUSE_LIBJPEG)
+AC_SUBST(wxUSE_LIBPNG)
+AC_SUBST(wxUSE_LIBTIFF)
+
+EXTRALIBS="$LDFLAGS $LDFLAGS_VERSIONING $LIBS $DMALLOC_LIBS"
+
+dnl FIXME -- must use configure option!
+MONOLITHIC=1
+
+AC_SUBST(WXUNIV)
+AC_SUBST(MONOLITHIC)
+AC_SUBST(EXTRALIBS)
+AC_SUBST(UNICODE)
+AC_SUBST(BUILD)
+AC_SUBST(SHARED)
+TOOLKIT_LOWERCASE=`echo $TOOLKIT | tr [[A-Z]] [[a-z]]`
+AC_SUBST(TOOLKIT_LOWERCASE)
+AC_SUBST(TOOLKIT_VERSION)
+AC_SUBST(SAMPLES_RPATH_FLAG)
+
+AC_BAKEFILE
+
  dnl C/C++ compiler options used to compile wxWindows
  if test "$GXX" = yes ; then
      dnl CXXWARNINGS="-Wall -W -Wcast-qual -Werror"
      CXXWARNINGS="-Wall"
      dnl should enable this one day...
      dnl CXXWARNINGS="-Wall -Werror"
  dnl C/C++ compiler options used to compile wxWindows
  if test "$GXX" = yes ; then
      dnl CXXWARNINGS="-Wall -W -Wcast-qual -Werror"
      CXXWARNINGS="-Wall"
      dnl should enable this one day...
      dnl CXXWARNINGS="-Wall -Werror"
-
-    dnl Add this *after* all compile tests, we don't need or want generated
-    dnl depfiles until actually building the lib
-    if test "$wxUSE_NO_DEPS" = "no" ; then
-        CFLAGS="-MMD $CFLAGS"
-        CXXFLAGS="-MMD $CXXFLAGS"
-    fi
  fi
  
  EXTRA_CFLAGS="$WXDEBUG $WXODBCFLAG $PROFILE $OPTIMISE"
  fi
  
  EXTRA_CFLAGS="$WXDEBUG $WXODBCFLAG $PROFILE $OPTIMISE"
@@ -5373,7 +5683,7 @@ AC_SUBST(TOOLCHAIN_DEFS)
  AC_SUBST(TOOLCHAIN_DLL_DEFS)
  
  dnl wx-config options
  AC_SUBST(TOOLCHAIN_DLL_DEFS)
  
  dnl wx-config options
-AC_SUBST(top_builddir)
+AC_SUBST(top_builddir_wxconfig)
  AC_SUBST(host_alias)
  AC_SUBST(cross_compiling)
  AC_SUBST(WXCONFIG_LIBS)
  AC_SUBST(host_alias)
  AC_SUBST(cross_compiling)
  AC_SUBST(WXCONFIG_LIBS)
@@ -5404,7 +5714,6 @@ AC_SUBST(LDFLAGS_VERSIONING)
  AC_SUBST(LDFLAGS_EXE)
  AC_SUBST(OPENGL_LIBS)
  AC_SUBST(DMALLOC_LIBS)
  AC_SUBST(LDFLAGS_EXE)
  AC_SUBST(OPENGL_LIBS)
  AC_SUBST(DMALLOC_LIBS)
-AC_SUBST(EXTRADEFS)
  AC_SUBST(WX_VERSION_TAG)
  
  dnl additional resurces settings
  AC_SUBST(WX_VERSION_TAG)
  
  dnl additional resurces settings
@@ -5430,6 +5739,11 @@ AC_SUBST(NM)
  AC_SUBST(LD)
  AC_SUBST(MAKEINFO)
  AC_SUBST(INSTALL_LIBRARY)
  AC_SUBST(LD)
  AC_SUBST(MAKEINFO)
  AC_SUBST(INSTALL_LIBRARY)
+AC_SUBST(INSTALL_DIR)
+
+dnl contrib tests results:
+AC_SUBST(ESD_LINK)
+
  
  dnl MAKE_SET will be replaced with "MAKE=..." or nothing if make sets MAKE
  dnl itself (this macro is required if SUBDIRS variable is used in Makefile.am
  
  dnl MAKE_SET will be replaced with "MAKE=..." or nothing if make sets MAKE
  dnl itself (this macro is required if SUBDIRS variable is used in Makefile.am
@@ -5441,45 +5755,18 @@ if test -f lib/wx/include/${TOOLCHAIN_NAME}/wx/setup.h; then
      mv -f lib/wx/include/${TOOLCHAIN_NAME}/wx/setup.h setup.h
  fi
  
      mv -f lib/wx/include/${TOOLCHAIN_NAME}/wx/setup.h setup.h
  fi
  
-AC_CONFIG_HEADER(setup.h:setup.h.in)
-
-dnl we need to pass SAMPLES_SUBDIRS (and some other) to the configure in
-dnl samples and the only way to do it is to use the environment (another
-dnl idea could have been to use the cache but this wouldn't work when
-dnl configure doesn't use cache at all which is the default with autoconf 2.50)
-wx_cv_path_samplesubdirs=$SAMPLES_SUBDIRS
-wx_cv_if_gnu_make=$IF_GNU_MAKE
-wx_cv_path_ifs=$PATH_IFS
-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_library_basename wx_cv_release wx_cv_current wx_cv_revision wx_cv_age \
-       wx_cv_use_gui wx_cv_use_resources
-
-AC_CONFIG_SUBDIRS(demos samples utils contrib)
+AC_CONFIG_HEADERS([setup.h])
  
  dnl create each of the files in the space separated list from the file.in
  dnl (the original file name may be overriden by appending another name after a
  dnl colon)
  
  dnl create each of the files in the space separated list from the file.in
  dnl (the original file name may be overriden by appending another name after a
  dnl colon)
-AC_OUTPUT([
+AC_CONFIG_FILES([
              wx-config
              version-script
              wx-config
              version-script
-            src/make.env
-            src/makeprog.env
-            src/makelib.env
              Makefile
              Makefile
-          ],
+          ])
+
+AC_CONFIG_COMMANDS([default],
            [
              dnl This test is required to make the following idempotent.
              dnl Otherwise running config.status or rerunning configure
            [
              dnl This test is required to make the following idempotent.
              dnl Otherwise running config.status or rerunning configure
@@ -5519,6 +5806,177 @@ AC_OUTPUT([
            ]
           )
  
            ]
           )
  
+
+dnl Configure samples if their sources are present:
+if test -d ${srcdir}/samples ; then
+    AC_CONFIG_FILES([
+        samples/Makefile
+        samples/access/Makefile
+        samples/artprov/Makefile
+        samples/caret/Makefile
+        samples/calendar/Makefile
+        samples/checklst/Makefile
+        samples/config/Makefile
+        samples/controls/Makefile
+        samples/console/Makefile
+        samples/db/Makefile
+        samples/dialogs/Makefile
+        samples/dialup/Makefile
+        samples/docview/Makefile
+        samples/docvwmdi/Makefile
+        samples/dnd/Makefile
+        samples/dragimag/Makefile
+        samples/drawing/Makefile
+        samples/dynamic/Makefile
+        samples/erase/Makefile
+        samples/event/Makefile
+        samples/exec/Makefile
+        samples/font/Makefile
+        samples/grid/Makefile
+        samples/help/Makefile
+        samples/image/Makefile
+        samples/internat/Makefile
+        samples/ipc/Makefile
+        samples/joytest/Makefile
+        samples/keyboard/Makefile
+        samples/layout/Makefile
+        samples/listctrl/Makefile
+        samples/mdi/Makefile
+        samples/menu/Makefile
+        samples/memcheck/Makefile
+        samples/minifram/Makefile
+        samples/minimal/Makefile
+        samples/mobile/Makefile
+        samples/mobile/wxedit/Makefile
+        samples/mobile/styles/Makefile
+        samples/multimon/Makefile
+        samples/notebook/Makefile
+        samples/oleauto/Makefile
+        samples/ownerdrw/Makefile
+        samples/png/Makefile
+        samples/printing/Makefile
+        samples/propsize/Makefile
+        samples/regtest/Makefile
+        samples/rotate/Makefile
+        samples/sashtest/Makefile
+        samples/shaped/Makefile
+        samples/scroll/Makefile
+        samples/scrollsub/Makefile
+        samples/sockets/Makefile
+        samples/splitter/Makefile
+        samples/statbar/Makefile
+        samples/taskbar/Makefile
+        samples/text/Makefile
+        samples/thread/Makefile
+        samples/toolbar/Makefile
+        samples/treectrl/Makefile
+        samples/typetest/Makefile
+        samples/validate/Makefile
+        samples/widgets/Makefile
+        samples/wizard/Makefile
+        samples/htlbox/Makefile
+        samples/html/Makefile
+        samples/html/about/Makefile
+        samples/html/help/Makefile
+        samples/html/printing/Makefile
+        samples/html/helpview/Makefile
+        samples/html/test/Makefile
+        samples/html/zip/Makefile
+        samples/html/virtual/Makefile
+        samples/html/widget/Makefile
+        samples/opengl/Makefile
+        samples/opengl/cube/Makefile
+        samples/opengl/penguin/Makefile
+        samples/opengl/isosurf/Makefile
+    ])
+fi
+
+dnl Configure demos if their sources are present:
+if test -d ${srcdir}/demos ; then
+    AC_CONFIG_FILES([
+        demos/Makefile
+        demos/bombs/Makefile
+        demos/dbbrowse/Makefile
+        demos/forty/Makefile
+        demos/fractal/Makefile
+        demos/life/Makefile
+        demos/poem/Makefile
+    ])
+fi
+
+dnl Configure utils if their sources are present:
+if test -d ${srcdir}/utils ; then
+    AC_CONFIG_FILES([
+        utils/Makefile
+        utils/makegen/Makefile
+        utils/HelpGen/Makefile
+        utils/HelpGen/src/Makefile
+        utils/tex2rtf/Makefile
+        utils/tex2rtf/src/Makefile
+        utils/hhp2cached/Makefile
+        utils/dialoged/Makefile
+        utils/dialoged/src/Makefile
+        utils/emulator/Makefile
+        utils/emulator/src/Makefile
+        utils/helpview/Makefile
+        utils/helpview/src/Makefile
+        utils/configtool/Makefile
+        utils/configtool/src/Makefile
+    ])
+fi
+
+dnl Configure contrib libs & samples if their sources are present:
+if test -d ${srcdir}/contrib ; then
+    AC_CONFIG_FILES([
+        contrib/src/Makefile
+        contrib/src/deprecated/Makefile
+        contrib/src/ogl/Makefile
+        contrib/src/mmedia/Makefile
+        contrib/src/stc/Makefile
+        contrib/src/svg/Makefile           
+        contrib/src/xrc/Makefile
+        contrib/src/gizmos/Makefile
+        contrib/src/plot/Makefile
+        contrib/src/applet/Makefile
+        contrib/src/fl/Makefile
+        contrib/src/net/Makefile
+        contrib/samples/Makefile
+        contrib/samples/deprecated/Makefile
+        contrib/samples/deprecated/proplist/Makefile
+        contrib/samples/deprecated/resource/Makefile
+        contrib/samples/deprecated/treelay/Makefile
+        contrib/samples/mmedia/Makefile
+        contrib/samples/ogl/Makefile
+        contrib/samples/ogl/ogledit/Makefile
+        contrib/samples/ogl/studio/Makefile
+        contrib/samples/stc/Makefile
+        contrib/samples/svg/Makefile
+        contrib/samples/gizmos/Makefile
+        contrib/samples/gizmos/editlbox/Makefile
+        contrib/samples/gizmos/dynsash/Makefile
+        contrib/samples/gizmos/dynsash_switch/Makefile
+        contrib/samples/gizmos/multicell/Makefile
+        contrib/samples/gizmos/splittree/Makefile
+        contrib/samples/gizmos/led/Makefile
+        contrib/samples/xrc/Makefile
+        contrib/samples/plot/Makefile
+        contrib/samples/applet/Makefile
+        contrib/samples/fl/Makefile
+        contrib/samples/fl/fl_demo1/Makefile
+        contrib/samples/fl/fl_demo2/Makefile
+        contrib/samples/fl/fl_sample1/Makefile
+        contrib/samples/fl/fl_sample2/Makefile
+        contrib/samples/fl/fl_sample3/Makefile
+        contrib/utils/Makefile
+        contrib/utils/wxrc/Makefile
+        contrib/utils/wxrcedit/Makefile
+        contrib/utils/convertrc/Makefile
+    ])
+fi
+
+
+AC_OUTPUT
+
  dnl report on what we decided to do
  echo
  echo "Configured wxWindows ${WX_VERSION} for \`${host}'"
  dnl report on what we decided to do
  echo
  echo "Configured wxWindows ${WX_VERSION} for \`${host}'"
@@ -5540,6 +5998,7 @@ echo "                                       png                ${wxUSE_LIBPNG-n
  echo "                                       regex              ${wxUSE_REGEX}"
  echo "                                       tiff               ${wxUSE_LIBTIFF-none}"
  echo "                                       zlib               ${wxUSE_ZLIB}"
  echo "                                       regex              ${wxUSE_REGEX}"
  echo "                                       tiff               ${wxUSE_LIBTIFF-none}"
  echo "                                       zlib               ${wxUSE_ZLIB}"
+echo "                                       odbc               ${wxUSE_ODBC}"
  
  echo ""
  
  
  echo ""