Define SF_UNICODE if undefined
[wxWidgets.git] / configure.in
index cd0db3c0ee7cfcba718967ddda98720e82256cb2..a3bfcb7fa6cb1c340b2aaece39fd754e1b4b5aa0 100644 (file)
@@ -60,7 +60,7 @@ AC_DEFUN(WX_INCLUDE_PATH_EXIST,
   if test $result = 0; then
     ac_path_to_include=""
   else
   if test $result = 0; then
     ac_path_to_include=""
   else
-    ac_path_to_include="-I$1"
+    ac_path_to_include=" -I$1"
   fi
 ])
 
   fi
 ])
 
@@ -74,7 +74,7 @@ AC_DEFUN(WX_LINK_PATH_EXIST,
   if test $result = 0; then
     ac_path_to_link=""
   else
   if test $result = 0; then
     ac_path_to_link=""
   else
-    ac_path_to_link="-L$1"
+    ac_path_to_link=" -L$1"
   fi
 ])
 
   fi
 ])
 
@@ -370,6 +370,8 @@ WX_RELEASE_NUMBER=2
 WX_VERSION=$WX_MAJOR_VERSION_NUMBER.$WX_MINOR_VERSION_NUMBER.$WX_RELEASE_NUMBER
 WX_RELEASE=$WX_MAJOR_VERSION_NUMBER.$WX_MINOR_VERSION_NUMBER
 
 WX_VERSION=$WX_MAJOR_VERSION_NUMBER.$WX_MINOR_VERSION_NUMBER.$WX_RELEASE_NUMBER
 WX_RELEASE=$WX_MAJOR_VERSION_NUMBER.$WX_MINOR_VERSION_NUMBER
 
+WX_MSW_VERSION=$WX_MAJOR_VERSION_NUMBER$WX_MINOR_VERSION_NUMBER$WX_RELEASE_NUMBER
+
 WX_CURRENT=1
 WX_REVISION=0
 WX_AGE=0
 WX_CURRENT=1
 WX_REVISION=0
 WX_AGE=0
@@ -395,7 +397,6 @@ USE_SUN=
 USE_SOLARIS=
 USE_SUNOS=
 USE_ALPHA=
 USE_SOLARIS=
 USE_SUNOS=
 USE_ALPHA=
-USE_IA64=
 USE_OSF=
 USE_BSD=
 USE_DARWIN=
 USE_OSF=
 USE_BSD=
 USE_DARWIN=
@@ -404,8 +405,6 @@ USE_OPENBSD=
 USE_NETBSD=
 USE_VMS=
 USE_ULTRIX=
 USE_NETBSD=
 USE_VMS=
 USE_ULTRIX=
-USE_CYGWIN=
-USE_MINGW=
 USE_DATA_GENERAL=
 
 dnl on some platforms xxx_r() functions are declared inside "#ifdef
 USE_DATA_GENERAL=
 
 dnl on some platforms xxx_r() functions are declared inside "#ifdef
@@ -416,7 +415,7 @@ 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="CYGWIN GTK MAC MGL MINGW MOTIF PM WINE"
+ALL_TOOLKITS="GTK MAC MGL MOTIF MSW PM WINE"
 
 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
@@ -462,10 +461,6 @@ case "${host}" in
       USE_ALPHA=1
       AC_DEFINE(__ALPHA__)
     fi
       USE_ALPHA=1
       AC_DEFINE(__ALPHA__)
     fi
-    if test "x$TMP" = "xia64"; then
-      USE_IA64=1
-      AC_DEFINE(__IA64__)
-    fi
     DEFAULT_DEFAULT_wxUSE_GTK=1
   ;;
   *-*-irix5* | *-*-irix6* )
     DEFAULT_DEFAULT_wxUSE_GTK=1
   ;;
   *-*-irix5* | *-*-irix6* )
@@ -656,6 +651,7 @@ if test $DEBUG_CONFIGURE = 1; then
   DEFAULT_wxUSE_LOG=yes
   DEFAULT_wxUSE_LOGWINDOW=no
   DEFAULT_wxUSE_LOGGUI=no
   DEFAULT_wxUSE_LOG=yes
   DEFAULT_wxUSE_LOGWINDOW=no
   DEFAULT_wxUSE_LOGGUI=no
+  DEFAULT_wxUSE_LOGDIALOG=no
 
   DEFAULT_wxUSE_GUI=yes
   DEFAULT_wxUSE_CONTROLS=no
 
   DEFAULT_wxUSE_GUI=yes
   DEFAULT_wxUSE_CONTROLS=no
@@ -679,6 +675,7 @@ if test $DEBUG_CONFIGURE = 1; then
   DEFAULT_wxUSE_STOPWATCH=no
   DEFAULT_wxUSE_FILE=no
   DEFAULT_wxUSE_FFILE=no
   DEFAULT_wxUSE_STOPWATCH=no
   DEFAULT_wxUSE_FILE=no
   DEFAULT_wxUSE_FFILE=no
+  DEFAULT_wxUSE_TEXTBUFFER=no
   DEFAULT_wxUSE_TEXTFILE=no
   DEFAULT_wxUSE_WAVE=no
   DEFAULT_wxUSE_INTL=no
   DEFAULT_wxUSE_TEXTFILE=no
   DEFAULT_wxUSE_WAVE=no
   DEFAULT_wxUSE_INTL=no
@@ -783,6 +780,7 @@ if test $DEBUG_CONFIGURE = 1; then
   DEFAULT_wxUSE_TOOLBAR_SIMPLE=no
   DEFAULT_wxUSE_TREECTRL=no
   DEFAULT_wxUSE_POPUPWIN=no
   DEFAULT_wxUSE_TOOLBAR_SIMPLE=no
   DEFAULT_wxUSE_TREECTRL=no
   DEFAULT_wxUSE_POPUPWIN=no
+  DEFAULT_wxUSE_TIPWINDOW=no
 
   DEFAULT_wxUSE_UNICODE=no
   DEFAULT_wxUSE_WCSRTOMBS=no
 
   DEFAULT_wxUSE_UNICODE=no
   DEFAULT_wxUSE_WCSRTOMBS=no
@@ -818,6 +816,7 @@ else
   DEFAULT_wxUSE_LOG=yes
   DEFAULT_wxUSE_LOGWINDOW=yes
   DEFAULT_wxUSE_LOGGUI=yes
   DEFAULT_wxUSE_LOG=yes
   DEFAULT_wxUSE_LOGWINDOW=yes
   DEFAULT_wxUSE_LOGGUI=yes
+  DEFAULT_wxUSE_LOGDIALOG=yes
 
   DEFAULT_wxUSE_GUI=yes
 
 
   DEFAULT_wxUSE_GUI=yes
 
@@ -840,6 +839,7 @@ else
   DEFAULT_wxUSE_STOPWATCH=yes
   DEFAULT_wxUSE_FILE=yes
   DEFAULT_wxUSE_FFILE=yes
   DEFAULT_wxUSE_STOPWATCH=yes
   DEFAULT_wxUSE_FILE=yes
   DEFAULT_wxUSE_FFILE=yes
+  DEFAULT_wxUSE_TEXTBUFFER=yes
   DEFAULT_wxUSE_TEXTFILE=yes
   DEFAULT_wxUSE_WAVE=no
   DEFAULT_wxUSE_INTL=yes
   DEFAULT_wxUSE_TEXTFILE=yes
   DEFAULT_wxUSE_WAVE=no
   DEFAULT_wxUSE_INTL=yes
@@ -944,6 +944,7 @@ else
   DEFAULT_wxUSE_TOOLBAR_SIMPLE=yes
   DEFAULT_wxUSE_TREECTRL=yes
   DEFAULT_wxUSE_POPUPWIN=yes
   DEFAULT_wxUSE_TOOLBAR_SIMPLE=yes
   DEFAULT_wxUSE_TREECTRL=yes
   DEFAULT_wxUSE_POPUPWIN=yes
+  DEFAULT_wxUSE_TIPWINDOW=yes
 
   DEFAULT_wxUSE_UNICODE=no
   DEFAULT_wxUSE_WCSRTOMBS=no
 
   DEFAULT_wxUSE_UNICODE=no
   DEFAULT_wxUSE_WCSRTOMBS=no
@@ -992,8 +993,7 @@ AC_ARG_WITH(gtk,           [  --with-gtk              use GTK+], [wxUSE_GTK="$wi
 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(wine,          [  --with-wine             use WINE], [wxUSE_WINE="$withval" CACHE_WINE=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(wine,          [  --with-wine             use WINE], [wxUSE_WINE="$withval" CACHE_WINE=1 TOOLKIT_GIVEN=1])
-AC_ARG_WITH(cygwin,        [  --with-cygwin           use Cygwin for MS-Windows], [wxUSE_CYGWIN="$withval" CACHE_CYGWIN=1 TOOLKIT_GIVEN=1])
-AC_ARG_WITH(mingw,         [  --with-mingw            use GCC Minimal MS-Windows], [wxUSE_MINGW="$withval" CACHE_MINGW=1 TOOLKIT_GIVEN=1])
+AC_ARG_WITH(msw,           [  --with-msw              use MS-Windows], [wxUSE_MSW="$withval" CACHE_MSW 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(mgl,           [  --with-mgl              use SciTech MGL], [wxUSE_MGL="$withval" CACHE_MGL=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(mgl,           [  --with-mgl              use SciTech MGL], [wxUSE_MGL="$withval" CACHE_MGL=1 TOOLKIT_GIVEN=1])
 
@@ -1008,7 +1008,7 @@ WX_ARG_WITH(opengl,        [  --with-opengl           use OpenGL (or Mesa)], wxU
 fi
 dnl for GUI only
 
 fi
 dnl for GUI only
 
-WX_ARG_WITH(dmalloc,       [  --with-dmalloc          use dmalloc library (www.letters.com/dmalloc)], wxUSE_DMALLOC)
+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(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)
@@ -1074,7 +1074,8 @@ WX_ARG_ENABLE(log,           [  --enable-log            use logging system], wxU
 WX_ARG_ENABLE(streams,       [  --enable-streams        use wxStream etc classes], wxUSE_STREAMS)
 WX_ARG_ENABLE(file,          [  --enable-file           use wxFile classes], wxUSE_FILE)
 WX_ARG_ENABLE(ffile,         [  --enable-ffile          use wxFFile classes], wxUSE_FFILE)
 WX_ARG_ENABLE(streams,       [  --enable-streams        use wxStream etc classes], wxUSE_STREAMS)
 WX_ARG_ENABLE(file,          [  --enable-file           use wxFile classes], wxUSE_FILE)
 WX_ARG_ENABLE(ffile,         [  --enable-ffile          use wxFFile classes], wxUSE_FFILE)
-WX_ARG_ENABLE(textfile,      [  --enable-textfile       use wxTextFile classes], wxUSE_TEXTFILE)
+WX_ARG_ENABLE(textbuf,       [  --enable-textbuf        use wxTextBuffer class], wxUSE_TEXTBUFFER)
+WX_ARG_ENABLE(textfile,      [  --enable-textfile       use wxTextFile class], wxUSE_TEXTFILE)
 WX_ARG_ENABLE(fontmap,       [  --enable-fontmap        use font encodings conversion classes], wxUSE_FONTMAP)
 WX_ARG_ENABLE(unicode,       [  --enable-unicode        compile wxString with Unicode support], wxUSE_UNICODE)
 WX_ARG_ENABLE(wxprintfv,     [  --enable-wxprintfv      use wxWindows implementation of vprintf()], wxUSE_EXPERIMENTAL_PRINTF)
 WX_ARG_ENABLE(fontmap,       [  --enable-fontmap        use font encodings conversion classes], wxUSE_FONTMAP)
 WX_ARG_ENABLE(unicode,       [  --enable-unicode        compile wxString with Unicode support], wxUSE_UNICODE)
 WX_ARG_ENABLE(wxprintfv,     [  --enable-wxprintfv      use wxWindows implementation of vprintf()], wxUSE_EXPERIMENTAL_PRINTF)
@@ -1087,7 +1088,7 @@ WX_ARG_ENABLE(zipstream,     [  --enable-zipstream      use wxZipInputStream], w
 WX_ARG_ENABLE(catch_segvs,   [  --enable-catch_segvs    catch signals and pass them to wxApp::OnFatalException], wxUSE_ON_FATAL_EXCEPTION)
 WX_ARG_ENABLE(snglinst,      [  --enable-snglinst       use wxSingleInstanceChecker class], wxUSE_SNGLINST_CHECKER)
 
 WX_ARG_ENABLE(catch_segvs,   [  --enable-catch_segvs    catch signals and pass them to wxApp::OnFatalException], wxUSE_ON_FATAL_EXCEPTION)
 WX_ARG_ENABLE(snglinst,      [  --enable-snglinst       use wxSingleInstanceChecker class], wxUSE_SNGLINST_CHECKER)
 
-WX_ARG_ENABLE(mimetype,      [  --enable-mimetypes      use wxMimeTypesManager], wxUSE_MIMETYPE)
+WX_ARG_ENABLE(mimetype,      [  --enable-mimetype       use wxMimeTypesManager], wxUSE_MIMETYPE)
 WX_ARG_ENABLE(system_options,[  --enable-sysoptions     use wxSystemOptions], wxUSE_SYSTEM_OPTIONS)
 
 dnl ---------------------------------------------------------------------------
 WX_ARG_ENABLE(system_options,[  --enable-sysoptions     use wxSystemOptions], wxUSE_SYSTEM_OPTIONS)
 
 dnl ---------------------------------------------------------------------------
@@ -1113,6 +1114,7 @@ WX_ARG_ENABLE(printarch,   [  --enable-printarch      use printing architecture]
 WX_ARG_ENABLE(mdi,         [  --enable-mdi            use multiple document interface architecture], wxUSE_MDI_ARCHITECTURE)
 WX_ARG_ENABLE(loggui,      [  --enable-loggui         use standard GUI logger], wxUSE_LOGGUI)
 WX_ARG_ENABLE(logwin,      [  --enable-logwin         use wxLogWindow], wxUSE_LOGWINDOW)
 WX_ARG_ENABLE(mdi,         [  --enable-mdi            use multiple document interface architecture], wxUSE_MDI_ARCHITECTURE)
 WX_ARG_ENABLE(loggui,      [  --enable-loggui         use standard GUI logger], wxUSE_LOGGUI)
 WX_ARG_ENABLE(logwin,      [  --enable-logwin         use wxLogWindow], wxUSE_LOGWINDOW)
+WX_ARG_ENABLE(logdialog,   [  --enable-logdialog      use wxLogDialog], wxUSE_LOGDIALOG)
 
 dnl ---------------------------------------------------------------------------
 dnl PostScript options
 
 dnl ---------------------------------------------------------------------------
 dnl PostScript options
@@ -1189,6 +1191,7 @@ if test "$wxUSE_CONTROLS" = "yes"; then
   DEFAULT_wxUSE_TOOLTIPS=yes
   DEFAULT_wxUSE_TREECTRL=yes
   DEFAULT_wxUSE_POPUPWIN=yes
   DEFAULT_wxUSE_TOOLTIPS=yes
   DEFAULT_wxUSE_TREECTRL=yes
   DEFAULT_wxUSE_POPUPWIN=yes
+  DEFAULT_wxUSE_TIPWINDOW=yes
 elif test "$wxUSE_CONTROLS" = "no"; then
   DEFAULT_wxUSE_ACCEL=no
   DEFAULT_wxUSE_BMPBUTTON=no
 elif test "$wxUSE_CONTROLS" = "no"; then
   DEFAULT_wxUSE_ACCEL=no
   DEFAULT_wxUSE_BMPBUTTON=no
@@ -1227,6 +1230,7 @@ elif test "$wxUSE_CONTROLS" = "no"; then
   DEFAULT_wxUSE_TOOLTIPS=no
   DEFAULT_wxUSE_TREECTRL=no
   DEFAULT_wxUSE_POPUPWIN=no
   DEFAULT_wxUSE_TOOLTIPS=no
   DEFAULT_wxUSE_TREECTRL=no
   DEFAULT_wxUSE_POPUPWIN=no
+  DEFAULT_wxUSE_TIPWINDOW=no
 fi
 
 WX_ARG_ENABLE(accel,       [  --enable-accel          use accelerators], wxUSE_ACCEL)
 fi
 
 WX_ARG_ENABLE(accel,       [  --enable-accel          use accelerators], wxUSE_ACCEL)
@@ -1266,6 +1270,7 @@ WX_ARG_ENABLE(toolbar,     [  --enable-toolbar        use wxToolBar class], wxUS
 WX_ARG_ENABLE(tbarnative,  [  --enable-tbarnative     use native wxToolBar class], wxUSE_TOOLBAR_NATIVE)
 WX_ARG_ENABLE(tbarsmpl,    [  --enable-tbarsmpl       use wxToolBarSimple class], wxUSE_TOOLBAR_SIMPLE)
 WX_ARG_ENABLE(treectrl,    [  --enable-treectrl       use wxTreeCtrl class], wxUSE_TREECTRL)
 WX_ARG_ENABLE(tbarnative,  [  --enable-tbarnative     use native wxToolBar class], wxUSE_TOOLBAR_NATIVE)
 WX_ARG_ENABLE(tbarsmpl,    [  --enable-tbarsmpl       use wxToolBarSimple class], wxUSE_TOOLBAR_SIMPLE)
 WX_ARG_ENABLE(treectrl,    [  --enable-treectrl       use wxTreeCtrl class], wxUSE_TREECTRL)
+WX_ARG_ENABLE(tipwindow,   [  --enable-tipwindow      use wxTipWindow class], wxUSE_TIPWINDOW)
 WX_ARG_ENABLE(popupwin,    [  --enable-popupwin       use wxPopUpWindow class], wxUSE_POPUPWIN)
 
 dnl ---------------------------------------------------------------------------
 WX_ARG_ENABLE(popupwin,    [  --enable-popupwin       use wxPopUpWindow class], wxUSE_POPUPWIN)
 
 dnl ---------------------------------------------------------------------------
@@ -1276,7 +1281,7 @@ WX_ARG_ENABLE(commondlg,   [  --enable-commondlg      use all common dialogs], w
 WX_ARG_ENABLE(choicedlg,   [  --enable-choicedlg      use wxChoiceDialog], wxUSE_CHOICEDLG)
 WX_ARG_ENABLE(coldlg,      [  --enable-coldlg         use wxColourDialog], wxUSE_COLOURDLG)
 WX_ARG_ENABLE(filedlg,     [  --enable-filedlg        use wxFileDialog], wxUSE_FILEDLG)
 WX_ARG_ENABLE(choicedlg,   [  --enable-choicedlg      use wxChoiceDialog], wxUSE_CHOICEDLG)
 WX_ARG_ENABLE(coldlg,      [  --enable-coldlg         use wxColourDialog], wxUSE_COLOURDLG)
 WX_ARG_ENABLE(filedlg,     [  --enable-filedlg        use wxFileDialog], wxUSE_FILEDLG)
-WX_ARG_ENABLE(filedlg,     [  --enable-finddlg        use wxFindReplaceDialog], wxUSE_FINDREPLDLG)
+WX_ARG_ENABLE(finddlg,     [  --enable-finddlg        use wxFindReplaceDialog], wxUSE_FINDREPLDLG)
 WX_ARG_ENABLE(fontdlg,     [  --enable-fontdlg        use wxFontDialog], wxUSE_FONTDLG)
 WX_ARG_ENABLE(dirdlg,      [  --enable-dirdlg         use wxDirDialog], wxUSE_DIRDLG)
 WX_ARG_ENABLE(msgdlg,      [  --enable-msgdlg         use wxMessageDialog], wxUSE_MSGDLG)
 WX_ARG_ENABLE(fontdlg,     [  --enable-fontdlg        use wxFontDialog], wxUSE_FONTDLG)
 WX_ARG_ENABLE(dirdlg,      [  --enable-dirdlg         use wxDirDialog], wxUSE_DIRDLG)
 WX_ARG_ENABLE(msgdlg,      [  --enable-msgdlg         use wxMessageDialog], wxUSE_MSGDLG)
@@ -1310,7 +1315,7 @@ WX_ARG_ENABLE(image,       [  --enable-image          use wxImage class], wxUSE_
 WX_ARG_ENABLE(gif,         [  --enable-gif            use gif images (GIF file format)], wxUSE_GIF)
 WX_ARG_ENABLE(pcx,         [  --enable-pcx            use pcx images (PCX file format)], wxUSE_PCX)
 WX_ARG_ENABLE(pnm,         [  --enable-pnm            use pnm images (PNM file format)], wxUSE_PNM)
 WX_ARG_ENABLE(gif,         [  --enable-gif            use gif images (GIF file format)], wxUSE_GIF)
 WX_ARG_ENABLE(pcx,         [  --enable-pcx            use pcx images (PCX file format)], wxUSE_PCX)
 WX_ARG_ENABLE(pnm,         [  --enable-pnm            use pnm images (PNM file format)], wxUSE_PNM)
-WX_ARG_ENABLE(pnm,         [  --enable-xpm            use xpm images (XPM file format)], wxUSE_XPM)
+WX_ARG_ENABLE(xpm,         [  --enable-xpm            use xpm images (XPM file format)], wxUSE_XPM)
 
 fi
 dnl for GUI only
 
 fi
 dnl for GUI only
@@ -1351,8 +1356,7 @@ 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)
     NUM_TOOLKITS=`expr ${wxUSE_GTK:-0} + ${wxUSE_MOTIF:-0} + ${wxUSE_MAC:-0}  \
     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_WINE:-0} + ${wxUSE_MINGW:-0} + ${wxUSE_CYGWIN:-0} \
-                  + ${wxUSE_MGL:-0}`
+                  + ${wxUSE_WINE:-0} + ${wxUSE_MSW:-0} + ${wxUSE_MGL:-0}`
 
     dnl Allow wxUSE_PM only for OS/2 with EMX.
     dnl Path separator; ':' for unix.
 
     dnl Allow wxUSE_PM only for OS/2 with EMX.
     dnl Path separator; ':' for unix.
@@ -1463,6 +1467,18 @@ AC_CHECK_PROG(AR, ar, ar, ar)
 dnl install checks
 dnl   defines INSTALL with the appropriate command
 AC_PROG_INSTALL
 dnl install checks
 dnl   defines INSTALL with the appropriate command
 AC_PROG_INSTALL
+case "${host}" in
+
+    dnl The other BSD's should probably go in here too, since this is
+    dnl to workaround a strange static lib BSDism.
+    dnl Mac OS X install seems to ignore -p option...
+    powerpc-*-darwin* )
+        INSTALL_PROGRAM="cp -fp"
+        INSTALL_DATA="cp -fp"
+        ;;
+    *)
+        ;;
+esac
 
 dnl strip command
 dnl   defines STRIP as strip or nothing if not found
 
 dnl strip command
 dnl   defines STRIP as strip or nothing if not found
@@ -1663,7 +1679,7 @@ if test "$wxUSE_ZLIB" != "no" ; then
     AC_DEFINE(wxUSE_ZLIB)
 
     if test "$wxUSE_ZLIB" = "sys" -o "$wxUSE_ZLIB" = "yes" ; then
     AC_DEFINE(wxUSE_ZLIB)
 
     if test "$wxUSE_ZLIB" = "sys" -o "$wxUSE_ZLIB" = "yes" ; then
-        AC_CHECK_HEADER(zlib.h, AC_CHECK_LIB(z, deflate, ZLIB_LINK="-lz"))
+        AC_CHECK_HEADER(zlib.h, AC_CHECK_LIB(z, deflate, ZLIB_LINK=" -lz"))
 
         if test "x$ZLIB_LINK" = "x" ; then
             if test "$wxUSE_ZLIB" = "sys" ; then
 
         if test "x$ZLIB_LINK" = "x" ; then
             if test "$wxUSE_ZLIB" = "sys" ; then
@@ -1702,7 +1718,7 @@ if test "$wxUSE_LIBPNG" != "no" ; then
     if test "$wxUSE_LIBPNG" = "sys" -o "$wxUSE_LIBPNG" = "yes" ; then
         AC_CHECK_HEADER(png.h,
                         AC_CHECK_LIB(png, png_check_sig,
     if test "$wxUSE_LIBPNG" = "sys" -o "$wxUSE_LIBPNG" = "yes" ; then
         AC_CHECK_HEADER(png.h,
                         AC_CHECK_LIB(png, png_check_sig,
-                                     PNG_LINK="-lpng",
+                                     PNG_LINK=" -lpng",
                                      ,
                                      [-lz -lm])
                        )
                                      ,
                                      [-lz -lm])
                        )
@@ -1757,7 +1773,7 @@ if test "$wxUSE_LIBJPEG" != "no" ; then
         AC_MSG_RESULT($ac_cv_header_jpeglib_h)
 
         if test "$ac_cv_header_jpeglib_h" = "yes"; then
         AC_MSG_RESULT($ac_cv_header_jpeglib_h)
 
         if test "$ac_cv_header_jpeglib_h" = "yes"; then
-            AC_CHECK_LIB(jpeg, jpeg_read_header, JPEG_LINK="-ljpeg")
+            AC_CHECK_LIB(jpeg, jpeg_read_header, JPEG_LINK=" -ljpeg")
         fi
 
         if test "x$JPEG_LINK" = "x" ; then
         fi
 
         if test "x$JPEG_LINK" = "x" ; then
@@ -1790,7 +1806,7 @@ if test "$wxUSE_LIBTIFF" != "no" ; then
     if test "$wxUSE_LIBTIFF" = "sys" -o "$wxUSE_LIBTIFF" = "yes" ; then
         AC_CHECK_HEADER(tiffio.h,
                         AC_CHECK_LIB(tiff, TIFFError,
     if test "$wxUSE_LIBTIFF" = "sys" -o "$wxUSE_LIBTIFF" = "yes" ; then
         AC_CHECK_HEADER(tiffio.h,
                         AC_CHECK_LIB(tiff, TIFFError,
-                                     TIFF_LINK="-ltiff",
+                                     TIFF_LINK=" -ltiff",
                                      ,
                                      -lm)
                        )
                                      ,
                                      -lm)
                        )
@@ -1825,7 +1841,7 @@ if test "$wxUSE_FREETYPE" != "no" ; then
     if test "$wxUSE_FREETYPE" = "sys" -o "$wxUSE_FREETYPE" = "yes" ; then
         AC_CHECK_HEADER(freetype.h,
                         AC_CHECK_LIB(freetype, FT_Render_Glyph,
     if test "$wxUSE_FREETYPE" = "sys" -o "$wxUSE_FREETYPE" = "yes" ; then
         AC_CHECK_HEADER(freetype.h,
                         AC_CHECK_LIB(freetype, FT_Render_Glyph,
-                                     FREETYPE_LINK="-lfreetype",
+                                     FREETYPE_LINK=" -lfreetype",
                                      ,
                                      [-lm])
                        )
                                      ,
                                      [-lm])
                        )
@@ -1867,8 +1883,8 @@ if test "$USE_WIN32" = 1 ; then
         AC_MSG_ERROR(please set CFLAGS to contain the location of windows.h)
     ])
 
         AC_MSG_ERROR(please set CFLAGS to contain the location of windows.h)
     ])
 
-    dnl check if can use _WIN_IE macro
-    AC_CACHE_CHECK([if w32api has good enough MSIE support], wx_cv_w32api_win_ie,
+    dnl check if can use _WIN32_IE macro
+    AC_CACHE_CHECK([if w32api has good enough MSIE support], wx_cv_w32api_win32_ie,
     [
       AC_TRY_COMPILE([#include <w32api.h>],
                      [
     [
       AC_TRY_COMPILE([#include <w32api.h>],
                      [
@@ -1881,34 +1897,29 @@ if test "$USE_WIN32" = 1 ; then
                        #error You need w32api 1.1 or newer
                        #endif
                      ], [
                        #error You need w32api 1.1 or newer
                        #endif
                      ], [
-                        wx_cv_w32api_win_ie=yes
-                        CPPFLAGS="$CPPFLAGS -D_WIN_IE=0x400"
+                        wx_cv_w32api_win32_ie=yes
                      ], [
                      ], [
-                        wx_cv_w32api_win_ie=no
+                        wx_cv_w32api_win32_ie=no
                      ])
     ])
                      ])
     ])
+    if test "$wx_cv_w32api_win32_ie" = "yes" ; then
+        CPPFLAGS="$CPPFLAGS -D_WIN32_IE=0x400"
+    fi
 
     dnl --- FIXME: This is still a somewhat random list of libs,
     dnl ---        some of them should probably be included conditionally.
     LIBS="$LIBS -lwinspool -lwinmm -lshell32 -lcomctl32 -lctl3d32 -ladvapi32 -lwsock32"
 
 
     dnl --- FIXME: This is still a somewhat random list of libs,
     dnl ---        some of them should probably be included conditionally.
     LIBS="$LIBS -lwinspool -lwinmm -lshell32 -lcomctl32 -lctl3d32 -ladvapi32 -lwsock32"
 
-    dnl Cygwin doesn't link these by default
-    if test "$wxUSE_CYGWIN" = 1; then
-        LIBS="$LIBS -lkernel32 -luser32 -lgdi32 -lcomdlg32"
-    fi
+    case "${host}" in
+        *-*-cygwin* )
+            dnl Cygwin doesn't include these by default
+            LIBS="$LIBS -lkernel32 -luser32 -lgdi32 -lcomdlg32"
+            TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WIN95__"
+    esac
 
     dnl add extra odbc libs if we have compiled in odbc
     if test "$wxUSE_ODBC" = "yes" ; then
 
     dnl add extra odbc libs if we have compiled in odbc
     if test "$wxUSE_ODBC" = "yes" ; then
-        LIBS="$LIBS -lodbc32 -lole32 -loleaut32"
-    fi
-
-    dnl -mwindows is needed to avoid that spawning of a console window
-    dnl This probably doesn't belong here..  The user may actually *want*
-    dnl a console window.  People should add this to their own app makefiles
-    dnl instead.  Unless someone cries murder about it, expect this to
-    dnl disappear from here soon.
-    if test "$wxUSE_MINGW" = 1; then
-        LDFLAGS="$LDFLAGS -mwindows"
+        LIBS=" -lodbc32 -lole32 -loleaut32$LIBS"
     fi
 
     RESFLAGS="--include-dir \$(top_srcdir)/include --include-dir \$(top_srcdir)/\$(program_dir) --define __WIN32__ --define __WIN95__ --define __GNUWIN32__"
     fi
 
     RESFLAGS="--include-dir \$(top_srcdir)/include --include-dir \$(top_srcdir)/\$(program_dir) --define __WIN32__ --define __WIN95__ --define __GNUWIN32__"
@@ -1924,9 +1935,17 @@ if test "$wxUSE_GUI" = "yes"; then
     WXGTK127=
     WXGTK20=
 
     WXGTK127=
     WXGTK20=
 
-    if test "$wxUSE_CYGWIN" = 1 || test "$wxUSE_MINGW" = 1 ; then
+    if test "$wxUSE_MSW" = 1 ; then
         TOOLKIT=MSW
         GUIDIST=MSW_DIST
         TOOLKIT=MSW
         GUIDIST=MSW_DIST
+
+        dnl -mwindows causes a heap of other default gui libs to be linked in.
+        dnl FIXME: If cygwin needs this, please push it above, if not, please
+        dnl        remove this comment :-)
+        case "${host}" in
+            *-*-mingw32* )
+                LDFLAGS="$LDFLAGS -Wl,--subsystem,windows -mwindows"
+        esac
     fi
 
     if test "$wxUSE_GTK" = 1; then
     fi
 
     if test "$wxUSE_GTK" = 1; then
@@ -1938,7 +1957,7 @@ if test "$wxUSE_GUI" = "yes"; then
                 dnl stupid GTK+ AM macros produce their own messages, so we
                 dnl have to pass to the next line
                 gtk_version_cached=0
                 dnl stupid GTK+ AM macros produce their own messages, so we
                 dnl have to pass to the next line
                 gtk_version_cached=0
-                AC_MSG_RESULT("")
+                AC_MSG_RESULT()
 
                 wx_cv_lib_gtk=
                 if test "x$wxUSE_GTK2" = "xyes"; then
 
                 wx_cv_lib_gtk=
                 if test "x$wxUSE_GTK2" = "xyes"; then
@@ -2014,12 +2033,14 @@ equivalent variable and GTK+ is version 1.2.3 or above.
         mgl_lib_type=""
 
         if test "$wxUSE_DEBUG_FLAG" = yes ; then
         mgl_lib_type=""
 
         if test "$wxUSE_DEBUG_FLAG" = yes ; then
-            if test -f $MGL_ROOT/lib/debug/$mgl_os/libmgl.a ; 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
                 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 ; 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
                 AC_MSG_ERROR([Cannot find MGL libraries, make sure they are compiled.])
                 mgl_lib_type=release
             else
                 AC_MSG_ERROR([Cannot find MGL libraries, make sure they are compiled.])
@@ -2040,12 +2061,12 @@ equivalent variable and GTK+ is version 1.2.3 or above.
             AC_MSG_ERROR(please set CFLAGS to contain the location of windows.h)
         ])
 
             AC_MSG_ERROR(please set CFLAGS to contain the location of windows.h)
         ])
 
-        xpm_link=""
+        xpm_link=
         AC_MSG_CHECKING(for Xpm library)
         WX_PATH_FIND_LIBRARIES($SEARCH_LIB,Xpm)
         if test "$ac_find_libraries" != "" ; then
             GUI_TK_LIBRARY="-L$ac_find_libraries"
         AC_MSG_CHECKING(for Xpm library)
         WX_PATH_FIND_LIBRARIES($SEARCH_LIB,Xpm)
         if test "$ac_find_libraries" != "" ; then
             GUI_TK_LIBRARY="-L$ac_find_libraries"
-            xpm_link="-lXpm"
+            xpm_link=" -lXpm"
             AC_DEFINE(wxHAVE_LIB_XPM)
             AC_MSG_RESULT(found at $ac_find_libraries)
         else
             AC_DEFINE(wxHAVE_LIB_XPM)
             AC_MSG_RESULT(found at $ac_find_libraries)
         else
@@ -2053,18 +2074,18 @@ equivalent variable and GTK+ is version 1.2.3 or above.
             AC_MSG_WARN(library will be compiled without support for images in XPM format)
         fi
 
             AC_MSG_WARN(library will be compiled without support for images in XPM format)
         fi
 
-        mesa_link=""
+        mesa_link=
         AC_MSG_CHECKING(for Mesa library)
         WX_PATH_FIND_LIBRARIES($SEARCH_LIB,MesaGL)
         if test "$ac_find_libraries" != "" ; then
             GUI_TK_LIBRARY="$GUI_TK_LIBRARY -L$ac_find_libraries"
         AC_MSG_CHECKING(for Mesa library)
         WX_PATH_FIND_LIBRARIES($SEARCH_LIB,MesaGL)
         if test "$ac_find_libraries" != "" ; then
             GUI_TK_LIBRARY="$GUI_TK_LIBRARY -L$ac_find_libraries"
-            mesa_link="-lMesaGL"
+            mesa_link=" -lMesaGL"
             AC_MSG_RESULT(found at $ac_find_libraries)
         else
             AC_MSG_ERROR(no)
         fi
 
             AC_MSG_RESULT(found at $ac_find_libraries)
         else
             AC_MSG_ERROR(no)
         fi
 
-        GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lwine $mesa_link $xpm_link -lXxf86dga -lXxf86vm -lSM -lICE -lXext -lXmu -lX11 -lncurses"
+        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__"
         TOOLKIT=MSW
         GUIDIST=MSW_DIST
         TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WXWINE__"
@@ -2115,8 +2136,8 @@ equivalent variable and GTK+ is version 1.2.3 or above.
                 WX_INCLUDE_PATH_EXIST($ac_find_includes, $TOOLKIT_INCLUDE)
                 WX_LINK_PATH_EXIST($ac_find_libraries, $GUI_TK_LIBRARY)
 
                 WX_INCLUDE_PATH_EXIST($ac_find_includes, $TOOLKIT_INCLUDE)
                 WX_LINK_PATH_EXIST($ac_find_libraries, $GUI_TK_LIBRARY)
 
-                GUI_TK_LIBRARY="$GUI_TK_LIBRARY $ac_path_to_link"
-                TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE $ac_path_to_include"
+                GUI_TK_LIBRARY="$GUI_TK_LIBRARY$ac_path_to_link"
+                TOOLKIT_INCLUDE="$TOOLKIT_INCLUDE$ac_path_to_include"
                 AC_MSG_RESULT(found at $ac_find_libraries)
             else
                 dnl it might happen that we found headers in one of the standard
                 AC_MSG_RESULT(found at $ac_find_libraries)
             else
                 dnl it might happen that we found headers in one of the standard
@@ -2142,13 +2163,13 @@ equivalent variable and GTK+ is version 1.2.3 or above.
             fi
         fi
 
             fi
         fi
 
-        xpm_link=""
+        xpm_link=
         AC_MSG_CHECKING(for Xpm library)
         WX_PATH_FIND_LIBRARIES($SEARCH_LIB,Xpm)
         if test "$ac_find_libraries" != "" ; then
             WX_LINK_PATH_EXIST($ac_find_libraries,$GUI_TK_LIBRARY)
         AC_MSG_CHECKING(for Xpm library)
         WX_PATH_FIND_LIBRARIES($SEARCH_LIB,Xpm)
         if test "$ac_find_libraries" != "" ; then
             WX_LINK_PATH_EXIST($ac_find_libraries,$GUI_TK_LIBRARY)
-            GUI_TK_LIBRARY="$GUI_TK_LIBRARY $ac_path_to_link"
-            xpm_link="-lXpm "
+            GUI_TK_LIBRARY="$GUI_TK_LIBRARY$ac_path_to_link"
+            xpm_link=" -lXpm"
             AC_DEFINE(wxHAVE_LIB_XPM)
             AC_MSG_RESULT(found at $ac_find_libraries)
         else
             AC_DEFINE(wxHAVE_LIB_XPM)
             AC_MSG_RESULT(found at $ac_find_libraries)
         else
@@ -2161,7 +2182,7 @@ equivalent variable and GTK+ is version 1.2.3 or above.
                     version = XpmLibraryVersion();
                 ],
                 [
                     version = XpmLibraryVersion();
                 ],
                 [
-                    xpm_link="-lXpm "
+                    xpm_link=" -lXpm"
                     AC_DEFINE(wxHAVE_LIB_XPM)
                     AC_MSG_RESULT(found in default search path)
                     COMPILED_X_PROGRAM=0
                     AC_DEFINE(wxHAVE_LIB_XPM)
                     AC_MSG_RESULT(found in default search path)
                     COMPILED_X_PROGRAM=0
@@ -2173,7 +2194,7 @@ equivalent variable and GTK+ is version 1.2.3 or above.
             )
         fi
 
             )
         fi
 
-        GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXm $xpm_link -lXmu -lXext -lXt -lX11"
+        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"
         TOOLKIT=MOTIF
         GUIDIST=MOTIF_DIST
         TOOLKIT_VPATH="\${top_srcdir}/src/motif${PATH_IFS}\${top_srcdir}/src/motif/xmcombo"
         TOOLKIT=MOTIF
         GUIDIST=MOTIF_DIST
@@ -2181,12 +2202,12 @@ equivalent variable and GTK+ is version 1.2.3 or above.
 
     if test "$wxUSE_MAC" = 1; then
         if test "$wxUSE_PRECOMP" = "yes"; then
 
     if test "$wxUSE_MAC" = 1; then
         if test "$wxUSE_PRECOMP" = "yes"; then
-            CPPFLAGS="${CPPFLAGS} -cpp-precomp"
+            CPPFLAGS="$CPPFLAGS -cpp-precomp"
         fi
         fi
-       CPPFLAGS="${CPPFLAGS} -I/Developer/Headers/FlatCarbon -I\${top_srcdir}/src/mac/morefile"
-        CFLAGS="${CFLAGS} -fpascal-strings"
-        CXXFLAGS="${CXXFLAGS} -fpascal-strings"
-        TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -DTARGET_CARBON"
+        CPPFLAGS="$CPPFLAGS -I/Developer/Headers/FlatCarbon -I\${top_srcdir}/src/mac/morefile"
+        CFLAGS="$CFLAGS -fpascal-strings"
+        CXXFLAGS="$CXXFLAGS -fpascal-strings"
+        TOOLCHAIN_DEFS="$TOOLCHAIN_DEFS -DTARGET_CARBON"
 
         TOOLKIT_VPATH="\${top_srcdir}/src/mac${PATH_IFS}\${top_srcdir}/src/mac/morefile"
         TOOLKIT=MAC
 
         TOOLKIT_VPATH="\${top_srcdir}/src/mac${PATH_IFS}\${top_srcdir}/src/mac/morefile"
         TOOLKIT=MAC
@@ -2246,9 +2267,6 @@ equivalent variable and GTK+ is version 1.2.3 or above.
         ALL_OBJECTS="${ALL_OBJECTS} \$(FREETYPEOBJS)"
     fi
 
         ALL_OBJECTS="${ALL_OBJECTS} \$(FREETYPEOBJS)"
     fi
 
-    RPM_FILES="src/\$(TOOLKITDIR)/rpmfiles.lst"
-    RPM_SPEC="wx\$(TOOLKIT).spec"
-
     dnl distribute samples/demos/utils with GUI versions
     GUIDIST="${GUIDIST} SAMPLES_DIST DEMOS_DIST UTILS_DIST MISC_DIST"
     DISTDIR="wx\$(TOOLKIT)"
     dnl distribute samples/demos/utils with GUI versions
     GUIDIST="${GUIDIST} SAMPLES_DIST DEMOS_DIST UTILS_DIST MISC_DIST"
     DISTDIR="wx\$(TOOLKIT)"
@@ -2273,8 +2291,6 @@ else
     fi
 
     PORT_FILES="\${top_srcdir}/src/files.lst"
     fi
 
     PORT_FILES="\${top_srcdir}/src/files.lst"
-    RPM_FILES="src/rpmfiles.lst"
-    RPM_SPEC="wxBase.spec"
 
     dnl distribute only wxBase sources/headers
     GUIDIST="BASE_DIST"
 
     dnl distribute only wxBase sources/headers
     GUIDIST="BASE_DIST"
@@ -2295,33 +2311,67 @@ dnl ---------------------------------------------------------------------------
 dnl OpenGL libraries
 dnl ---------------------------------------------------------------------------
 if test "$wxUSE_OPENGL" = "yes"; then
 dnl OpenGL libraries
 dnl ---------------------------------------------------------------------------
 if test "$wxUSE_OPENGL" = "yes"; then
-  if test "$wxUSE_MAC" = 1; then
-    OPENGL_LIBS="-framework OpenGL -framework AGL"
-  else
-    dnl check for OpenGL libs availability first
-    AC_CHECK_HEADER(GL/gl.h, [
-      AC_CHECK_LIB(GL, glFlush, [
-        OPENGL_LIBS="-lGL -lGLU"
-      ], [
-        AC_CHECK_LIB(MesaGL, glFlush, [
-          OPENGL_LIBS="-lMesaGL -lMesaGLU"
-        ])
-      ])
-    ])
+    if test "$wxUSE_MAC" = 1; then
+        OPENGL_LIBS="-framework OpenGL -framework AGL"
+    else
+
+        AC_CHECK_HEADER(GL/gl.h,
+            [
+                AC_MSG_CHECKING([for -lGL])
+                WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],[GL])
+                if test "$ac_find_libraries" != "" ; then
+                    WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS])
+                    LDFLAGS_GL="$LDFLAGS$ac_path_to_link"
+                    OPENGL_LIBS="-lGL -lGLU"
+                    AC_MSG_RESULT([yes])
+                else
+                    AC_MSG_RESULT([no])
+                    AC_MSG_CHECKING([for -lMesaGL])
+                    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"
+                        OPENGL_LIBS="-lMesaGL -lMesaGLU"
+                        AC_MSG_RESULT([yes])
+                    else
+                        AC_MSG_RESULT([no])
+                    fi
+                fi
+            ])
 
 
-    if test "x$OPENGL_LIBS" = "x"; then
-        dnl it should be an error and not a warning because OpenGL is not on
-        dnl by default and so if it had been explicitely requested, we
-        dnl shouldn't just fall back to compiling the library without it
-        AC_MSG_ERROR(OpenGL libraries not available)
+    dnl check for OpenGL libs availability first
+    dnl -lGL requires -lm with soem OpenGL versions
+
+#    AC_CHECK_HEADER(GL/gl.h,
+#        [
+#            AC_CHECK_LIB(GL, glFlush,
+#                [
+#                    OPENGL_LIBS="-lGL -lGLU"
+#                ],
+#                [
+#                    AC_CHECK_LIB(MesaGL, glFlush,
+#                        [
+#                            OPENGL_LIBS="-lMesaGL -lMesaGLU"
+#                        ],
+#                        [],
+#                        [-lm])
+#                ],
+#                [-lm])
+#        ])
+
+        if test "x$OPENGL_LIBS" = "x"; then
+            dnl it should be an error and not a warning because OpenGL is not on
+            dnl by default and so if it had been explicitely requested, we
+            dnl shouldn't just fall back to compiling the library without it
+            AC_MSG_ERROR(OpenGL libraries not available)
+        fi
     fi
     fi
-  fi
 
 
-  if test "$wxUSE_OPENGL" = "yes"; then
-    AC_DEFINE(wxUSE_OPENGL)
-    AC_DEFINE(wxUSE_GLCANVAS)
-    SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS opengl"
-  fi
+    if test "$wxUSE_OPENGL" = "yes"; then
+        AC_DEFINE(wxUSE_OPENGL)
+        AC_DEFINE(wxUSE_GLCANVAS)
+        SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS opengl"
+    fi
 fi
 
 if test -z "$TOOLKIT_VPATH" ; then
 fi
 
 if test -z "$TOOLKIT_VPATH" ; then
@@ -2333,10 +2383,6 @@ if test -n "$TOOLKIT" ; then
     TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WX${TOOLKIT}__"
 fi
 
     TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WX${TOOLKIT}__"
 fi
 
-if test "$wxUSE_CYGWIN" = 1 ; then
-  TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WIN95__"
-fi
-
 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
@@ -2345,7 +2391,6 @@ fi
 lib_debug_suffix=
 if test "$wxUSE_DEBUG_FLAG" = "yes"; then
     lib_debug_suffix=d
 lib_debug_suffix=
 if test "$wxUSE_DEBUG_FLAG" = "yes"; then
     lib_debug_suffix=d
-    TOOLCHAIN_NAME="${TOOLCHAIN_NAME}d"
 fi
 
 TOOLCHAIN_NAME="${TOOLKIT_DIR}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}-${WX_RELEASE}"
 fi
 
 TOOLCHAIN_NAME="${TOOLKIT_DIR}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}-${WX_RELEASE}"
@@ -2360,17 +2405,6 @@ dnl library link name
 WX_LIBRARY="wx_${TOOLCHAIN_NAME}"
 WX_LIBRARY_GL="wx_${TOOLCHAIN_NAME_GL}"
 
 WX_LIBRARY="wx_${TOOLCHAIN_NAME}"
 WX_LIBRARY_GL="wx_${TOOLCHAIN_NAME_GL}"
 
-dnl define which libs wx-config should link.
-WXCONFIG_LIBS="-l${WX_LIBRARY}"
-
-if test "$wxUSE_OPENGL" = "yes"; then
-    WXCONFIG_LIBS_GL="-l${WX_LIBRARY_GL} $OPENGL_LIBS"
-fi
-
-dnl the name of the static library
-WX_LIBRARY_NAME_STATIC="lib${WX_LIBRARY}.a"
-WX_LIBRARY_NAME_STATIC_GL="lib${WX_LIBRARY_GL}.a"
-
 dnl the name of the shared library
 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}"
 dnl the name of the shared library
 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}"
@@ -2385,6 +2419,41 @@ dnl the name of the resources file for wxMac
 WX_RESOURCES_MACOSX="lib${WX_LIBRARY}.rsrc"
 WX_RESOURCES_MACOSX_COMPILED="lib${WX_LIBRARY}.r"
 
 WX_RESOURCES_MACOSX="lib${WX_LIBRARY}.rsrc"
 WX_RESOURCES_MACOSX_COMPILED="lib${WX_LIBRARY}.r"
 
+case "${host}" in
+    *-*-cygwin* | *-*-mingw32* )
+
+        dnl If we are cross compiling we want to use the 'full' unix type name for the
+        dnl lib, but for a native install use the windows style naming convention.
+        dnl (excepting again that we strip the ELF style version numbers off it).
+
+        dnl FIXME: is this GL stuff actually even used for wxMSW?  should it be??
+
+        if test "$cross_compiling" != "yes"; then
+            WX_LIBRARY="wxmsw${WX_MSW_VERSION}${lib_unicode_suffix}${lib_debug_suffix}"
+            WX_LIBRARY_GL="wxmsw_gl${WX_MSW_VERSION}${lib_unicode_suffix}${lib_debug_suffix}"
+            WX_LIBRARY_NAME_SHARED="${WX_LIBRARY}.${SO_SUFFIX}"
+            WX_LIBRARY_NAME_SHARED_GL="${WX_LIBRARY_GL}.${SO_SUFFIX}"
+        else
+            WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}.${SO_SUFFIX}"
+            WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}"
+        fi
+
+esac
+
+dnl the name of the static library
+WX_LIBRARY_NAME_STATIC="lib${WX_LIBRARY}.a"
+WX_LIBRARY_NAME_STATIC_GL="lib${WX_LIBRARY_GL}.a"
+
+dnl define which libs wx-config should link.
+WXCONFIG_LIBS="-l${WX_LIBRARY}"
+WXCONFIG_LIBS_STATIC="lib${WX_LIBRARY}.a"
+
+if test "$wxUSE_OPENGL" = "yes"; then
+    WXCONFIG_LIBS_GL="-l${WX_LIBRARY_GL} ${OPENGL_LIBS}"
+    WXCONFIG_LIBS_STATIC_GL="lib${WX_LIBRARY_GL}.a ${OPENGL_LIBS}"
+fi
+
+
 dnl --- the marker for quick search, leave it here: SHARED_LIB_SETUP ---
 
 if test "$wxUSE_SHARED" = "yes"; then
 dnl --- the marker for quick search, leave it here: SHARED_LIB_SETUP ---
 
 if test "$wxUSE_SHARED" = "yes"; then
@@ -2412,7 +2481,7 @@ if test "$wxUSE_SHARED" = "yes"; then
         dnl default settings are good for gcc but not for the native HP-UX
         if test "$GCC" != "yes"; then
             dnl no idea why it wants it, but it does
         dnl default settings are good for gcc but not for the native HP-UX
         if test "$GCC" != "yes"; then
             dnl no idea why it wants it, but it does
-            LDFLAGS="-L/usr/lib"
+            LDFLAGS="$LDFLAGS -L/usr/lib"
 
             SHARED_LD="${CXX} -b -o"
             PIC_FLAG="+Z"
 
             SHARED_LD="${CXX} -b -o"
             PIC_FLAG="+Z"
@@ -2468,9 +2537,9 @@ if test "$wxUSE_SHARED" = "yes"; then
       ;;
 
       *-*-darwin* )
       ;;
 
       *-*-darwin* )
-        CFLAGS="${CFLAGS} -fno-common"
-        CXXFLAGS="${CXXFLAGS} -fno-common"
-        SHARED_LD="${CXX} -dynamiclib -o"
+        CFLAGS="$CFLAGS -fno-common -DDYLIB_INIT"
+        CXXFLAGS="$CXXFLAGS -fno-common -DDYLIB_INIT"
+        SHARED_LD="$CXX -dynamiclib -init _wxWindowsDylibInit -o"
         PIC_FLAG="-dynamic -fPIC"
       ;;
 
         PIC_FLAG="-dynamic -fPIC"
       ;;
 
@@ -2479,13 +2548,13 @@ if test "$wxUSE_SHARED" = "yes"; then
       ;;
 
       *-*-cygwin* | *-*-mingw32* )
       ;;
 
       *-*-cygwin* | *-*-mingw32* )
-        WX_LIBRARY="wxmsw${WX_MAJOR_VERSION_NUMBER}${WX_MINOR_VERSION_NUMBER}${WX_RELEASE_NUMBER}${lib_unicode_suffix}${lib_debug_suffix}"
-        WX_LIBRARY_NAME_SHARED="${WX_LIBRARY}.dll"
-        WX_LIBRARY_NAME_STATIC="lib${WX_LIBRARY}.a"
-        WXCONFIG_LIBS="-l${WX_LIBRARY}"
-        SHARED_LD="${CXX} -shared -Wl,--out-implib,lib/${WX_LIBRARY_NAME_STATIC} -o"
-        TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -DWXUSINGDLL=1"
-        WXMSW_DLL_DEFINES="-UWXUSINGDLL -DWXMAKINGDLL=1 -D_DLL=1 -D_WINDLL=1"
+
+        WX_LIBRARY_IMPORTLIB="${WX_LIBRARY_NAME_SHARED}.a"
+
+        SHARED_LD="${CXX} -shared -Wl,--out-implib,lib/${WX_LIBRARY_IMPORTLIB} -o"
+        TOOLCHAIN_DLL_DEFS="${TOOLCHAIN_DLL_DEFS} -DWXUSINGDLL=1"
+
+        PIC_FLAG="-UWXUSINGDLL -DWXMAKINGDLL=1 -D_DLL=1 -D_WINDLL=1"
 
         dnl install shared libs without symlinks
         if test "$wxUSE_OPENGL" = "yes"; then
 
         dnl install shared libs without symlinks
         if test "$wxUSE_OPENGL" = "yes"; then
@@ -2494,9 +2563,6 @@ if test "$wxUSE_SHARED" = "yes"; then
         else
             WX_ALL="\$(build_libdir)/${WX_LIBRARY_NAME_SHARED}"
         fi
         else
             WX_ALL="\$(build_libdir)/${WX_LIBRARY_NAME_SHARED}"
         fi
-        dnl -fPIC is not required for mingw build -- all code is already
-        dnl position independent
-        PIC_FLAG=
       ;;
 
       *-pc-os2_emx | *-pc-os2-emx )
       ;;
 
       *-pc-os2_emx | *-pc-os2-emx )
@@ -2531,6 +2597,7 @@ if test "$wxUSE_SHARED" = "yes"; then
 
     dnl do not alter the LIBRARY_TYPE strings "so" and "a", they are magic
     WX_TARGET_LIBRARY_TYPE="so"
 
     dnl do not alter the LIBRARY_TYPE strings "so" and "a", they are magic
     WX_TARGET_LIBRARY_TYPE="so"
+    INSTALL_LIBRARY='$(INSTALL_PROGRAM)'
 fi
 
 dnl do not 'else' this, it may be changed in the above conditional.
 fi
 
 dnl do not 'else' this, it may be changed in the above conditional.
@@ -2557,6 +2624,7 @@ if test "$wxUSE_SHARED" = "no"; then
     WX_TARGET_LIBRARY_GL="${WX_LIBRARY_NAME_STATIC_GL}"
 
     WX_TARGET_LIBRARY_TYPE="a"
     WX_TARGET_LIBRARY_GL="${WX_LIBRARY_NAME_STATIC_GL}"
 
     WX_TARGET_LIBRARY_TYPE="a"
+    INSTALL_LIBRARY='$(INSTALL_DATA)'
 fi
 
 if test "$wxUSE_MAC" = 1; then
 fi
 
 if test "$wxUSE_MAC" = 1; then
@@ -2564,7 +2632,7 @@ if test "$wxUSE_MAC" = 1; then
     WX_ALL="${WX_ALL} \$(build_libdir)/lib${WX_LIBRARY}.r"
     WX_ALL_INSTALLED="${WX_ALL_INSTALLED} preinstall_res"
     AC_CHECK_PROG(RESCOMP, Rez, Rez, /Developer/Tools/Rez)
     WX_ALL="${WX_ALL} \$(build_libdir)/lib${WX_LIBRARY}.r"
     WX_ALL_INSTALLED="${WX_ALL_INSTALLED} preinstall_res"
     AC_CHECK_PROG(RESCOMP, Rez, Rez, /Developer/Tools/Rez)
-    AC_CHECK_PROG(DEREZ, Derez, Derez, /Developer/Tools/Derez)
+    AC_CHECK_PROG(DEREZ, DeRez, DeRez, /Developer/Tools/DeRez)
     LIBWXMACRES="\$(top_builddir)/lib/lib${WX_LIBRARY}.r"
     LIBWXMACRESCOMP="\$(RESCOMP) Carbon.r -t APPL ${LIBWXMACRES} -o \$(BIN_PROGRAM)"
     LIBWXMACRESWXCONFIG="${RESCOMP} Carbon.r -t APPL \${prefix}/lib/${WX_RESOURCES_MACOSX_COMPILED} -o"
     LIBWXMACRES="\$(top_builddir)/lib/lib${WX_LIBRARY}.r"
     LIBWXMACRESCOMP="\$(RESCOMP) Carbon.r -t APPL ${LIBWXMACRES} -o \$(BIN_PROGRAM)"
     LIBWXMACRESWXCONFIG="${RESCOMP} Carbon.r -t APPL \${prefix}/lib/${WX_RESOURCES_MACOSX_COMPILED} -o"
@@ -2584,12 +2652,16 @@ fi
 
 dnl defines HAVE_STDLIB_H
 AC_CHECK_HEADERS(stdlib.h)
 
 dnl defines HAVE_STDLIB_H
 AC_CHECK_HEADERS(stdlib.h)
+dnl defines HAVE_MALLOC_H
+AC_CHECK_HEADERS(malloc.h)
 dnl defines HAVE_UNISTD_H
 AC_CHECK_HEADERS(unistd.h)
 dnl defines HAVE_WCHAR_H
 AC_CHECK_HEADERS(wchar.h)
 dnl defines HAVE_WCSTR_H
 AC_CHECK_HEADERS(wcstr.h)
 dnl defines HAVE_UNISTD_H
 AC_CHECK_HEADERS(unistd.h)
 dnl defines HAVE_WCHAR_H
 AC_CHECK_HEADERS(wchar.h)
 dnl defines HAVE_WCSTR_H
 AC_CHECK_HEADERS(wcstr.h)
+dnl defined HAVE_WCTYPE_H
+AC_CHECK_HEADERS(wctype.h)
 dnl defines HAVE_FNMATCH_H
 AC_CHECK_HEADERS(fnmatch.h)
 dnl defines HAVE_ICONV_H (Unix98 encoding conversion routines)
 dnl defines HAVE_FNMATCH_H
 AC_CHECK_HEADERS(fnmatch.h)
 dnl defines HAVE_ICONV_H (Unix98 encoding conversion routines)
@@ -2620,9 +2692,22 @@ dnl   defines uid_t and gid_t if not already defined
 AC_TYPE_UID_T
 
 dnl   check for wchar_t
 AC_TYPE_UID_T
 
 dnl   check for wchar_t
+dnl   Mac OS X does not provide wchar.h and wchar_t is defined by stdlib.h (GD)
+dnl   on Cygwin wchar.h needs stddef.h to be #included by hand
 AC_CACHE_CHECK([for wchar_t], wx_cv_type_wchar_t,
 [
 AC_CACHE_CHECK([for wchar_t], wx_cv_type_wchar_t,
 [
-    AC_TRY_COMPILE([#include <wchar.h>],
+    AC_TRY_COMPILE(
+        [
+            #ifdef HAVE_WCHAR_H
+            #  ifdef __CYGWIN__
+            #    include <stddef.h>
+            #  endif
+            #  include <wchar.h>
+            #endif
+            #ifdef HAVE_STDLIB_H
+            #  include <stdlib.h>
+            #endif
+        ],
         [
             wchar_t wc, *ws;
             wc = L'a';
         [
             wchar_t wc, *ws;
             wc = L'a';
@@ -2734,13 +2819,16 @@ AC_CHECK_SIZEOF(long, 4)
 AC_CHECK_SIZEOF(long long, 0)
 
 dnl we have to do it ourselves because SGI/Irix's stdio.h does not include
 AC_CHECK_SIZEOF(long long, 0)
 
 dnl we have to do it ourselves because SGI/Irix's stdio.h does not include
-dnl wchar_t an AC_CHECK_SIZEOF only includes stdio.h
+dnl wchar_t and AC_CHECK_SIZEOF only includes stdio.h
 dnl Mac OS X does not provide wchar.h and wchar_t is defined by stdlib.h (GD)
 AC_CACHE_CHECK([size of wchar_t], wx_cv_sizeof_wchar_t,
 [
     AC_TRY_RUN(
         [
             #ifdef HAVE_WCHAR_H
 dnl Mac OS X does not provide wchar.h and wchar_t is defined by stdlib.h (GD)
 AC_CACHE_CHECK([size of wchar_t], wx_cv_sizeof_wchar_t,
 [
     AC_TRY_RUN(
         [
             #ifdef HAVE_WCHAR_H
+            #  ifdef __CYGWIN__
+            #    include <stddef.h>
+            #  endif
             #  include <wchar.h>
             #endif
             #ifdef HAVE_STDLIB_H
             #  include <wchar.h>
             #endif
             #ifdef HAVE_STDLIB_H
@@ -2779,15 +2867,15 @@ dnl ---------------------------------------------------------------------------
 dnl check for wcslen
 AC_CHECK_LIB(c, wcslen, [
             AC_DEFINE(HAVE_WCSLEN)
 dnl check for wcslen
 AC_CHECK_LIB(c, wcslen, [
             AC_DEFINE(HAVE_WCSLEN)
-            WCHAR_LINK=""
+            WCHAR_LINK=
         ], [
             AC_CHECK_LIB(w, wcslen, [
                 AC_DEFINE(HAVE_WCSLEN)
         ], [
             AC_CHECK_LIB(w, wcslen, [
                 AC_DEFINE(HAVE_WCSLEN)
-                WCHAR_LINK="-lw"
+                WCHAR_LINK=" -lw"
             ], [
                 AC_CHECK_LIB(msvcrt, wcslen, [
                     AC_DEFINE(HAVE_WCSLEN)
             ], [
                 AC_CHECK_LIB(msvcrt, wcslen, [
                     AC_DEFINE(HAVE_WCSLEN)
-                    WCHAR_LINK=""
+                    WCHAR_LINK=
                 ])
             ])
         ])
                 ])
             ])
         ])
@@ -2967,6 +3055,9 @@ fi
 dnl check for vfork() (even if it's the same as fork() in modern Unices)
 AC_CHECK_FUNCS(vfork)
 
 dnl check for vfork() (even if it's the same as fork() in modern Unices)
 AC_CHECK_FUNCS(vfork)
 
+dnl check for the function for temp files creation
+AC_CHECK_FUNCS(mkstemp mktemp, break)
+
 dnl get the library function to use for wxGetDiskSpace(): it is statfs() under
 dnl Linux and *BSD and statvfs() under Solaris
 AC_CACHE_CHECK(for statfs, wx_cv_func_statfs,
 dnl get the library function to use for wxGetDiskSpace(): it is statfs() under
 dnl Linux and *BSD and statvfs() under Solaris
 AC_CACHE_CHECK(for statfs, wx_cv_func_statfs,
@@ -3069,7 +3160,7 @@ if test "$HAVE_SOME_SLEEP_FUNC" != 1; then
             AC_CHECK_LIB(posix4, nanosleep,
                 [
                     AC_DEFINE(HAVE_NANOSLEEP)
             AC_CHECK_LIB(posix4, nanosleep,
                 [
                     AC_DEFINE(HAVE_NANOSLEEP)
-                    POSIX4_LINK="-lposix4"
+                    POSIX4_LINK=" -lposix4"
                 ],
                 [
                     AC_CHECK_FUNCS(usleep,
                 ],
                 [
                     AC_CHECK_FUNCS(usleep,
@@ -3118,7 +3209,7 @@ AC_CHECK_FUNCS(inet_aton,
 
 if test "x$INET_LINK" != "x"; then
     AC_DEFINE(HAVE_INET_ADDR)
 
 if test "x$INET_LINK" != "x"; then
     AC_DEFINE(HAVE_INET_ADDR)
-    INET_LINK="-l$INET_LINK"
+    INET_LINK=" -l$INET_LINK"
 fi
 
 fi
 fi
 
 fi
@@ -3138,204 +3229,204 @@ dnl ---------------------------------------------------------------------------
 dnl under MSW we always have thread support
 if test "$TOOLKIT" != "MSW"; then
 
 dnl under MSW we always have thread support
 if test "$TOOLKIT" != "MSW"; then
 
-dnl the code below:
-dnl   defines THREADS_OBJ which contains the object files to build
-dnl   defines THREADS_LINK which contains the thread library to link with
-dnl   defines wxUSE_THREADS=1 if thread support is activated
-
-THREADS_LINK=
-THREADS_OBJ=
-CODE_GEN_FLAGS=
-CODE_GEN_FLAGS_CXX=
-
-if test "$wxUSE_THREADS" = "yes" ; then
-    if test "$wxUSE_WINE" = 1 ; then
-        AC_MSG_WARN([Threads are not supported under WINE])
-        wxUSE_THREADS="no"
-    elif test "$USE_BEOS" = 1; then
-        AC_MSG_WARN([BeOS threads are not yet supported])
-        wxUSE_THREADS="no"
+    dnl the code below:
+    dnl   defines THREADS_OBJ which contains the object files to build
+    dnl   defines THREADS_LINK which contains the thread library to link with
+    dnl   defines wxUSE_THREADS=1 if thread support is activated
+
+    THREADS_LINK=
+    THREADS_OBJ=
+    CODE_GEN_FLAGS=
+    CODE_GEN_FLAGS_CXX=
+
+    if test "$wxUSE_THREADS" = "yes" ; then
+        if test "$wxUSE_WINE" = 1 ; then
+            AC_MSG_WARN([Threads are not supported under WINE... disabled])
+            wxUSE_THREADS="no"
+        elif test "$USE_BEOS" = 1; then
+            AC_MSG_WARN([BeOS threads are not yet supported... disabled])
+            wxUSE_THREADS="no"
+        fi
     fi
     fi
-fi
 
 
-if test "$wxUSE_THREADS" = "yes" ; then
-    dnl find if POSIX threads are available
+    if test "$wxUSE_THREADS" = "yes" ; then
+        dnl find if POSIX threads are available
 
 
-    dnl AIX calls the library libpthreads - thanks IBM!
-    if test "$USE_AIX" = 1; then
-        THREADS_LIB=pthreads
-    else
-        THREADS_LIB=pthread
-    fi
+        dnl AIX calls the library libpthreads - thanks IBM!
+        if test "$USE_AIX" = 1; then
+            THREADS_LIB=pthreads
+        else
+            THREADS_LIB=pthread
+        fi
 
 
-    dnl standard lib name is pthread
-    dnl We no longer test for pthread-0.7 as it breaks compilation on some
-    dnl glibc2 systems, especially for static linkage.
-    AC_CHECK_LIB($THREADS_LIB, pthread_create, [
-            THREADS_OBJ="threadpsx.lo"
-            THREADS_LINK=$THREADS_LIB
-        ], [
-            dnl thread functions are in libc_r under FreeBSD
-            AC_CHECK_LIB(c_r, pthread_create, [
+        dnl standard lib name is pthread
+        dnl We no longer test for pthread-0.7 as it breaks compilation on some
+        dnl glibc2 systems, especially for static linkage.
+        AC_CHECK_LIB($THREADS_LIB, pthread_create, [
                 THREADS_OBJ="threadpsx.lo"
                 THREADS_OBJ="threadpsx.lo"
-                THREADS_LINK="c_r"
+                THREADS_LINK=$THREADS_LIB
             ], [
             ], [
-                dnl VZ: SGI threads are not supported currently
-                AC_CHECK_HEADER(sys/prctl.h, [
-                    THREADS_OBJ="threadsgi.lo"
+                dnl thread functions are in libc_r under FreeBSD
+                AC_CHECK_LIB(c_r, pthread_create, [
+                    THREADS_OBJ="threadpsx.lo"
+                    THREADS_LINK="c_r"
+                ], [
+                    dnl VZ: SGI threads are not supported currently
+                    AC_CHECK_HEADER(sys/prctl.h, [
+                        THREADS_OBJ="threadsgi.lo"
+                    ])
                 ])
             ])
                 ])
             ])
-        ])
 
 
-    if test -z "$THREADS_OBJ" ; then
-        wxUSE_THREADS=no
-        AC_MSG_WARN(No thread support on this system)
+        if test -z "$THREADS_OBJ" ; then
+            wxUSE_THREADS=no
+            AC_MSG_WARN([No thread support on this system... disabled])
+        fi
     fi
     fi
-fi
 
 
-dnl do other tests only if we are using threads
-if test "$wxUSE_THREADS" = "yes" ; then
-  AC_CHECK_FUNCS(thr_setconcurrency)
-
-  dnl define autoconf macro to check for given function in both pthread and
-  dnl posix4 libraries
-  dnl usage: AC_FUNC_THREAD(FUNCTION_NAME)
-  dnl VZ: TODO
-  dnl AC_DEFUN(AC_FUNC_THREAD,
-  dnl [
-  dnl     AC_CHECK_LIB($THREADS_LINK, $1,
-  dnl            AC_DEFINE(HAVE_`'translit($1, `A-Z', 'a-z'),
-  dnl            [AC_CHECK_LIB([posix4], $1,
-  dnl                [AC_DEFINE(HAVE_`'translit($1, `A-Z', 'a-z'))
-  dnl                 POSIX4_LINK="-lposix4"
-  dnl             ])
-  dnl            ])
-  dnl ])
-
-  AC_CHECK_HEADERS(sched.h)
-
-  AC_CHECK_LIB($THREADS_LINK, sched_yield,
-               AC_DEFINE(HAVE_SCHED_YIELD),
-               [AC_CHECK_LIB([posix4], sched_yield,
-                   [AC_DEFINE(HAVE_SCHED_YIELD) POSIX4_LINK="-lposix4"],
-                   AC_MSG_WARN(wxThread::Yield will not work properly)
-                )]
-               )
-
-  dnl to be able to set the thread priority, we need to have all of the
-  dnl following functions:
-  dnl   1. pthread_attr_getschedpolicy
-  dnl   2. sched_get_priority_min and sched_get_priority_max
-  dnl      (this one can be in either libpthread or libposix4 (under Solaris))
-  dnl   3. pthread_attr_getschedparam and pthread_attr_setschedparam
-  HAVE_PRIOR_FUNCS=0
-  AC_CHECK_LIB($THREADS_LINK, pthread_attr_getschedpolicy,
-                 AC_CHECK_LIB($THREADS_LINK, pthread_attr_setschedparam,
-                   AC_CHECK_LIB($THREADS_LINK, sched_get_priority_max,
-                       HAVE_PRIOR_FUNCS=1,
-                       AC_CHECK_LIB([posix4], sched_get_priority_max,
-                         [
-                            HAVE_PRIOR_FUNCS=1
-                            POSIX4_LINK="-lposix4"
-                         ],
+    dnl do other tests only if we are using threads
+    if test "$wxUSE_THREADS" = "yes" ; then
+      AC_CHECK_FUNCS(thr_setconcurrency)
+
+      dnl define autoconf macro to check for given function in both pthread and
+      dnl posix4 libraries
+      dnl usage: AC_FUNC_THREAD(FUNCTION_NAME)
+      dnl VZ: TODO
+      dnl AC_DEFUN(AC_FUNC_THREAD,
+      dnl [
+      dnl     AC_CHECK_LIB($THREADS_LINK, $1,
+      dnl            AC_DEFINE(HAVE_`'translit($1, `A-Z', 'a-z'),
+      dnl            [AC_CHECK_LIB([posix4], $1,
+      dnl                [AC_DEFINE(HAVE_`'translit($1, `A-Z', 'a-z'))
+      dnl                 POSIX4_LINK=" -lposix4"
+      dnl             ])
+      dnl            ])
+      dnl ])
+
+      AC_CHECK_HEADERS(sched.h)
+
+      AC_CHECK_LIB($THREADS_LINK, sched_yield,
+                   AC_DEFINE(HAVE_SCHED_YIELD),
+                   [AC_CHECK_LIB([posix4], sched_yield,
+                       [AC_DEFINE(HAVE_SCHED_YIELD) POSIX4_LINK=" -lposix4"],
+                       AC_MSG_WARN(wxThread::Yield will not work properly)
+                    )]
+                   )
+
+      dnl to be able to set the thread priority, we need to have all of the
+      dnl following functions:
+      dnl   1. pthread_attr_getschedpolicy
+      dnl   2. sched_get_priority_min and sched_get_priority_max
+      dnl      (this one can be in either libpthread or libposix4 (under Solaris))
+      dnl   3. pthread_attr_getschedparam and pthread_attr_setschedparam
+      HAVE_PRIOR_FUNCS=0
+      AC_CHECK_LIB($THREADS_LINK, pthread_attr_getschedpolicy,
+                     AC_CHECK_LIB($THREADS_LINK, pthread_attr_setschedparam,
+                       AC_CHECK_LIB($THREADS_LINK, sched_get_priority_max,
+                           HAVE_PRIOR_FUNCS=1,
+                           AC_CHECK_LIB([posix4], sched_get_priority_max,
+                             [
+                                HAVE_PRIOR_FUNCS=1
+                                POSIX4_LINK=" -lposix4"
+                             ],
+                           )
                        )
                        )
+                     )
                    )
                    )
-                 )
-               )
 
 
-  if test "$HAVE_PRIOR_FUNCS" = 1; then
-    AC_DEFINE(HAVE_THREAD_PRIORITY_FUNCTIONS)
-  else
-    AC_MSG_WARN(Setting thread priority will not work)
-  fi
+      if test "$HAVE_PRIOR_FUNCS" = 1; then
+        AC_DEFINE(HAVE_THREAD_PRIORITY_FUNCTIONS)
+      else
+        AC_MSG_WARN(Setting thread priority will not work)
+      fi
 
 
-  AC_CHECK_LIB($THREADS_LINK, pthread_cancel,
-               AC_DEFINE(HAVE_PTHREAD_CANCEL),
-               AC_MSG_WARN([wxThread::Kill() will not work properly]))
+      AC_CHECK_LIB($THREADS_LINK, pthread_cancel,
+                   AC_DEFINE(HAVE_PTHREAD_CANCEL),
+                   AC_MSG_WARN([wxThread::Kill() will not work properly]))
 
 
-  AC_CACHE_CHECK([for pthread_cleanup_push/pop], wx_cv_func_pthread_cleanup_push,
-  [
-    AC_TRY_COMPILE([#include <pthread.h>],
-                 [
-                    pthread_cleanup_push(NULL, NULL);
-                    pthread_cleanup_pop(0);
-                 ], [
-                    wx_cv_func_pthread_cleanup_push=yes
-                 ], [
-                    wx_cv_func_pthread_cleanup_push=no
-                 ])
-  ])
-
-  if test "$wx_cv_func_pthread_cleanup_push" = "yes"; then
-      AC_DEFINE(HAVE_THREAD_CLEANUP_FUNCTIONS)
-  fi
+      AC_CACHE_CHECK([for pthread_cleanup_push/pop], wx_cv_func_pthread_cleanup_push,
+      [
+        AC_TRY_COMPILE([#include <pthread.h>],
+                     [
+                        pthread_cleanup_push(NULL, NULL);
+                        pthread_cleanup_pop(0);
+                     ], [
+                        wx_cv_func_pthread_cleanup_push=yes
+                     ], [
+                        wx_cv_func_pthread_cleanup_push=no
+                     ])
+      ])
 
 
-  dnl mutexattr_t initialization is done in quite different ways on different
-  dnl platforms, so check for a few things:
-  dnl
-  dnl HAVE_MUTEX_RECURSIVE means that we can create recursive mutexes
-  dnl HAVE_MUTEXATTR_SETTYPE means that we do it using
-  dnl pthread_mutexattr_settype(PTHREAD_MUTEX_RECURSIVE) and if it is not
-  dnl defined, we do it by directly assigned
-  dnl PTHREAD_MUTEX_RECURSIVE_MUTEX_INITIALIZER_NP to attr
-
-  dnl we need _GNU_SOURCE to get PTHREAD_MUTEX_RECURSIVE with glibc 2.1+
-  dnl (strictly speaking we only need _XOPEN_SOURCE=500 but just defining
-  dnl this disables _BSD_SOURCE which breaks libtiff compilation, so it is
-  dnl simpler to just define _GNU_SOURCE to get everything)
-  if test "x$wx_lib_glibc21" = "xyes"; then
-      CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
-  fi
+      if test "$wx_cv_func_pthread_cleanup_push" = "yes"; then
+          AC_DEFINE(HAVE_THREAD_CLEANUP_FUNCTIONS)
+      fi
 
 
-  AC_CACHE_CHECK([for pthread_mutexattr_t], wx_cv_type_pthread_mutexattr_t,
-  [
-    AC_TRY_COMPILE([#include <pthread.h>],
-        [
-           pthread_mutexattr_t attr;
-           pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
-        ], [
-           wx_cv_type_pthread_mutexattr_t=yes
-        ], [
-           wx_cv_type_pthread_mutexattr_t=no
-        ]
-    )
-  ])
+      dnl mutexattr_t initialization is done in quite different ways on different
+      dnl platforms, so check for a few things:
+      dnl
+      dnl HAVE_MUTEX_RECURSIVE means that we can create recursive mutexes
+      dnl HAVE_MUTEXATTR_SETTYPE means that we do it using
+      dnl pthread_mutexattr_settype(PTHREAD_MUTEX_RECURSIVE) and if it is not
+      dnl defined, we do it by directly assigned
+      dnl PTHREAD_MUTEX_RECURSIVE_MUTEX_INITIALIZER_NP to attr
+
+      dnl we need _GNU_SOURCE to get PTHREAD_MUTEX_RECURSIVE with glibc 2.1+
+      dnl (strictly speaking we only need _XOPEN_SOURCE=500 but just defining
+      dnl this disables _BSD_SOURCE which breaks libtiff compilation, so it is
+      dnl simpler to just define _GNU_SOURCE to get everything)
+      if test "x$wx_lib_glibc21" = "xyes"; then
+          CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
+      fi
 
 
-  if test "$wx_cv_type_pthread_mutexattr_t" = "yes"; then
-    AC_DEFINE(HAVE_PTHREAD_MUTEXATTR_T)
-  else
-    dnl don't despair, there may be another way to do it
-    AC_CACHE_CHECK([for PTHREAD_RECURSIVE_MUTEX_INITIALIZER],
-                   wx_cv_type_pthread_rec_mutex_init,
-    [
+      AC_CACHE_CHECK([for pthread_mutexattr_t], wx_cv_type_pthread_mutexattr_t,
+      [
         AC_TRY_COMPILE([#include <pthread.h>],
             [
         AC_TRY_COMPILE([#include <pthread.h>],
             [
-                pthread_mutex_t attr = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
+               pthread_mutexattr_t attr;
+               pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
             ], [
             ], [
-                wx_cv_type_pthread_rec_mutex_init=yes
+               wx_cv_type_pthread_mutexattr_t=yes
             ], [
             ], [
-                wx_cv_type_pthread_rec_mutex_init=no
+               wx_cv_type_pthread_mutexattr_t=no
             ]
         )
             ]
         )
-    ])
-    if test "$wx_cv_type_pthread_rec_mutex_init" = "yes"; then
-      AC_DEFINE(HAVE_PTHREAD_RECURSIVE_MUTEX_INITIALIZER)
-    else
-      dnl this may break code working elsewhere, so at least warn about it
-      AC_MSG_WARN([wxMutex won't be recursive on this platform])
-    fi
-  fi
+      ])
 
 
-  THREADS_LINK="-l$THREADS_LINK"
+      if test "$wx_cv_type_pthread_mutexattr_t" = "yes"; then
+        AC_DEFINE(HAVE_PTHREAD_MUTEXATTR_T)
+      else
+        dnl don't despair, there may be another way to do it
+        AC_CACHE_CHECK([for PTHREAD_RECURSIVE_MUTEX_INITIALIZER],
+                       wx_cv_type_pthread_rec_mutex_init,
+        [
+            AC_TRY_COMPILE([#include <pthread.h>],
+                [
+                    pthread_mutex_t attr = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
+                ], [
+                    wx_cv_type_pthread_rec_mutex_init=yes
+                ], [
+                    wx_cv_type_pthread_rec_mutex_init=no
+                ]
+            )
+        ])
+        if test "$wx_cv_type_pthread_rec_mutex_init" = "yes"; then
+          AC_DEFINE(HAVE_PTHREAD_RECURSIVE_MUTEX_INITIALIZER)
+        else
+          dnl this may break code working elsewhere, so at least warn about it
+          AC_MSG_WARN([wxMutex won't be recursive on this platform])
+        fi
+      fi
 
 
-  dnl building MT programs under Solaris with the native compiler requires -mt
-  dnl switch
-  if test "$USE_SOLARIS" = "yes" -a "$GCC" != "yes"; then
-      CPPFLAGS="${CFLAGS} -mt"
-      CXXFLAGS="${CXXFLAGS} -mt"
-      LDFLAGS="${LDFLAGS} -mt"
-  fi
-fi
+      THREADS_LINK=" -l$THREADS_LINK"
+
+      dnl building MT programs under Solaris with the native compiler requires -mt
+      dnl switch
+      if test "$USE_SOLARIS" = "yes" -a "$GCC" != "yes"; then
+          CPPFLAGS="$CFLAGS -mt"
+          CXXFLAGS="$CXXFLAGS -mt"
+          LDFLAGS="$LDFLAGS -mt"
+      fi
+    fi
 
 dnl from if !MSW
 fi
 
 dnl from if !MSW
 fi
@@ -3345,7 +3436,7 @@ if test "$wxUSE_THREADS" = "yes"; then
 
   dnl must define _REENTRANT for multithreaded code except for Darwin/Mac OS X
   if test "$USE_DARWIN" != 1; then
 
   dnl must define _REENTRANT for multithreaded code except for Darwin/Mac OS X
   if test "$USE_DARWIN" != 1; then
-    TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D_REENTRANT"
+    TOOLCHAIN_DEFS="$TOOLCHAIN_DEFS -D_REENTRANT"
   fi
 
   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS thread"
   fi
 
   SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS thread"
@@ -3405,15 +3496,15 @@ if test "$wxUSE_MEM_TRACING" = "yes" ; then
 fi
 
 if test "$wxUSE_DMALLOC" = "yes" ; then
 fi
 
 if test "$wxUSE_DMALLOC" = "yes" ; then
-    DMALLOC_LINK="-ldmalloc"
+    DMALLOC_LIBS="-ldmalloc"
 fi
 
 PROFILE=
 if test "$wxUSE_PROFILE" = "yes" ; then
 fi
 
 PROFILE=
 if test "$wxUSE_PROFILE" = "yes" ; then
-    PROFILE="-pg"
+    PROFILE=" -pg"
 fi
 
 fi
 
-if test "$GCC" = yes ; then
+if test "$GCC" = "yes" ; then
     if test "$wxUSE_NO_RTTI" = "yes" ; then
         CODE_GEN_FLAGS_CXX="$CODE_GEN_FLAGS_CXX -fno-rtti"
     fi
     if test "$wxUSE_NO_RTTI" = "yes" ; then
         CODE_GEN_FLAGS_CXX="$CODE_GEN_FLAGS_CXX -fno-rtti"
     fi
@@ -3423,10 +3514,6 @@ if test "$GCC" = yes ; then
     if test "$wxUSE_PERMISSIVE" = "yes" ; then
         CODE_GEN_FLAGS="$CODE_GEN_FLAGS -fpermissive"
     fi
     if test "$wxUSE_PERMISSIVE" = "yes" ; then
         CODE_GEN_FLAGS="$CODE_GEN_FLAGS -fpermissive"
     fi
-    if test "$wxUSE_NO_DEPS" = "no" ; then
-        CFLAGS="-MMD ${CFLAGS}"
-        CXXFLAGS="-MMD ${CXXFLAGS}"
-    fi
     if test "$USE_WIN32" = 1 ; then
         # I'm not even really sure what this was ever added to solve,
         # but someone added it for mingw native builds, so I guess
     if test "$USE_WIN32" = 1 ; then
         # I'm not even really sure what this was ever added to solve,
         # but someone added it for mingw native builds, so I guess
@@ -3565,9 +3652,13 @@ if test "$wxUSE_STD_IOSTREAM" = "yes"; then
   AC_DEFINE(wxUSE_STD_IOSTREAM)
 fi
 
   AC_DEFINE(wxUSE_STD_IOSTREAM)
 fi
 
+if test "$wxUSE_TEXTBUFFER" = "yes"; then
+    AC_DEFINE(wxUSE_TEXTBUFFER)
+fi
+
 if test "$wxUSE_TEXTFILE" = "yes"; then
 if test "$wxUSE_TEXTFILE" = "yes"; then
-  if test "$wxUSE_FILE" != "yes"; then
-    AC_MSG_WARN(wxTextFile requires wxFile and it won't be compiled without it)
+  if test "$wxUSE_FILE" != "yes" -o "$wxUSE_TEXTBUFFER" != "yes" ; then
+    AC_MSG_WARN(wxTextFile requires wxFile and wxTextBuffer... disabled)
   else
     AC_DEFINE(wxUSE_TEXTFILE)
   fi
   else
     AC_DEFINE(wxUSE_TEXTFILE)
   fi
@@ -3575,7 +3666,7 @@ fi
 
 if test "$wxUSE_CONFIG" = "yes" ; then
   if test "$wxUSE_TEXTFILE" != "yes"; then
 
 if test "$wxUSE_CONFIG" = "yes" ; then
   if test "$wxUSE_TEXTFILE" != "yes"; then
-    AC_MSG_WARN(wxConfig requires wxTextFile and it won't be compiled without it)
+    AC_MSG_WARN(wxConfig requires wxTextFile... disabled)
   else
     AC_DEFINE(wxUSE_CONFIG)
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS config"
   else
     AC_DEFINE(wxUSE_CONFIG)
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS config"
@@ -3584,7 +3675,7 @@ fi
 
 if test "$wxUSE_INTL" = "yes" ; then
   if test "$wxUSE_FILE" != "yes"; then
 
 if test "$wxUSE_INTL" = "yes" ; then
   if test "$wxUSE_FILE" != "yes"; then
-    AC_MSG_WARN(I18n code requires wxFile and it won't be compiled without it)
+    AC_MSG_WARN(I18n code requires wxFile... disabled)
   else
     AC_DEFINE(wxUSE_INTL)
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS internat"
   else
     AC_DEFINE(wxUSE_INTL)
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS internat"
@@ -3602,6 +3693,10 @@ if test "$wxUSE_LOG" = "yes"; then
     if test "$wxUSE_LOGWINDOW" = "yes"; then
       AC_DEFINE(wxUSE_LOGWINDOW)
     fi
     if test "$wxUSE_LOGWINDOW" = "yes"; then
       AC_DEFINE(wxUSE_LOGWINDOW)
     fi
+
+    if test "$wxUSE_LOGDIALOG" = "yes"; then
+      AC_DEFINE(wxUSE_LOG_DIALOG)
+    fi
 fi
 
 if test "$wxUSE_LONGLONG" = "yes"; then
 fi
 
 if test "$wxUSE_LONGLONG" = "yes"; then
@@ -3848,6 +3943,15 @@ dnl ---------------------------------------------------------------------------
 
 if test "$wxUSE_GUI" = "yes"; then
 
 
 if test "$wxUSE_GUI" = "yes"; then
 
+    if test "$TOOLKIT" = "MAC"; then
+        AC_MSG_WARN([Joystick not yet supported under Mac OS X... disabled])
+        wxUSE_JOYSTICK=no
+     fi
+    if test "$TOOLKIT" = "MOTIF"; then
+        AC_MSG_WARN([Joystick not yet supported under Motif... disabled])
+        wxUSE_JOYSTICK=no
+     fi
+
     dnl under MSW we always have joystick support
     if test "$TOOLKIT" != "MSW"; then
         if test "$wxUSE_JOYSTICK" = "yes"; then
     dnl under MSW we always have joystick support
     if test "$TOOLKIT" != "MSW"; then
         if test "$wxUSE_JOYSTICK" = "yes"; then
@@ -3855,7 +3959,7 @@ if test "$wxUSE_GUI" = "yes"; then
             AC_CHECK_HEADERS(linux/joystick.h)
             if test "$ac_cv_header_linux_joystick_h" != "yes"; then
                 wxUSE_JOYSTICK=no
             AC_CHECK_HEADERS(linux/joystick.h)
             if test "$ac_cv_header_linux_joystick_h" != "yes"; then
                 wxUSE_JOYSTICK=no
-                AC_MSG_WARN(Joystick not supported by this system, disabled)
+                AC_MSG_WARN(Joystick not supported by this system... disabled)
             fi
         fi
     fi
             fi
         fi
     fi
@@ -3893,7 +3997,7 @@ if test "$TOOLKIT" != "MSW"; then
                             [
                                 AC_DEFINE(HAVE_DLOPEN)
                                 HAVE_DL_FUNCS=1
                             [
                                 AC_DEFINE(HAVE_DLOPEN)
                                 HAVE_DL_FUNCS=1
-                                LIBS="$LIBS -ldl"
+                                DL_LINK=" -ldl$DL_LINK"
                             ],
                             [
                                 AC_CHECK_FUNCS(shl_load,
                             ],
                             [
                                 AC_CHECK_FUNCS(shl_load,
@@ -3905,7 +4009,7 @@ if test "$TOOLKIT" != "MSW"; then
                                                 AC_CHECK_LIB(shl_load, dld,
                                                              [
                                                                 HAVE_SHL_FUNCS=1
                                                 AC_CHECK_LIB(shl_load, dld,
                                                              [
                                                                 HAVE_SHL_FUNCS=1
-                                                                LIBS="$LIBS -ldld"
+                                                                DL_LINK=" -ldld$DL_LINK"
                                                              ])
                                               ])
                             ])
                                                              ])
                                               ])
                             ])
@@ -3997,7 +4101,7 @@ fi
 
 if test "$wxUSE_MDI_ARCHITECTURE" = "yes"; then
     if test "$wxUSE_UNIVERSAL" = "yes"; then
 
 if test "$wxUSE_MDI_ARCHITECTURE" = "yes"; then
     if test "$wxUSE_UNIVERSAL" = "yes"; then
-        AC_MSG_WARN(MDI is not supported for wxUNIVERSAL yet... disabled)
+        AC_MSG_WARN(MDI not yet supported for wxUNIVERSAL... disabled)
         wxUSE_MDI_ARCHITECTURE=no
     fi
 
         wxUSE_MDI_ARCHITECTURE=no
     fi
 
@@ -4019,7 +4123,7 @@ if test "$wxUSE_HELP" = "yes"; then
     AC_DEFINE(wxUSE_HELP)
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS help"
 
     AC_DEFINE(wxUSE_HELP)
     SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS help"
 
-    if test "$USE_WIN32" = 1; then
+    if test "$wxUSE_MSW" = 1; then
       if test "$wxUSE_MS_HTML_HELP" = "yes"; then
         AC_CHECK_HEADER(htmlhelp.h, 
             [
       if test "$wxUSE_MS_HTML_HELP" = "yes"; then
         AC_CHECK_HEADER(htmlhelp.h, 
             [
@@ -4070,16 +4174,16 @@ dnl ---------------------------------------------------------------------------
 
 dnl check for ole headers and disable a few features requiring it if not
 dnl present (earlier versions of mingw32 don't have ole2.h)
 
 dnl check for ole headers and disable a few features requiring it if not
 dnl present (earlier versions of mingw32 don't have ole2.h)
-if test "$USE_WIN32" = 1 -a \( "$wxUSE_DATAOBJ"       = "yes" \
-                            -o "$wxUSE_CLIPBOARD"     = "yes" \
-                            -o "$wxUSE_DRAG_AND_DROP" = "yes" \) ; then
+if test "$wxUSE_MSW" = 1 -a \( "$wxUSE_DATAOBJ"       = "yes" \
+                          -o "$wxUSE_CLIPBOARD"     = "yes" \
+                          -o "$wxUSE_DRAG_AND_DROP" = "yes" \) ; then
     AC_CHECK_HEADERS(ole2.h)
 
     if test "$ac_cv_header_ole2_h" = "yes" ; then
         if test "$GCC" = yes ; then
             ALL_OBJECTS="$ALL_OBJECTS \$(OLEOBJS)"
             CODE_GEN_FLAGS_CXX="$CODE_GEN_FLAGS_CXX -fvtable-thunks"
     AC_CHECK_HEADERS(ole2.h)
 
     if test "$ac_cv_header_ole2_h" = "yes" ; then
         if test "$GCC" = yes ; then
             ALL_OBJECTS="$ALL_OBJECTS \$(OLEOBJS)"
             CODE_GEN_FLAGS_CXX="$CODE_GEN_FLAGS_CXX -fvtable-thunks"
-            LIBS="$LIBS -lrpcrt4 -loleaut32 -lole32 -luuid"
+            LIBS=" -lrpcrt4 -loleaut32 -lole32 -luuid$LIBS"
             AC_DEFINE(wxUSE_OLE)
 
         fi
             AC_DEFINE(wxUSE_OLE)
 
         fi
@@ -4094,7 +4198,6 @@ if test "$USE_WIN32" = 1 -a \( "$wxUSE_DATAOBJ"       = "yes" \
         wxUSE_DATAOBJ=no
     fi
 
         wxUSE_DATAOBJ=no
     fi
 
-    dnl this is for MSW only, so we test for it inside "if USE_WIN32"
     if test "$wxUSE_METAFILE" = "yes"; then
         AC_DEFINE(wxUSE_METAFILE)
 
     if test "$wxUSE_METAFILE" = "yes"; then
         AC_DEFINE(wxUSE_METAFILE)
 
@@ -4105,7 +4208,7 @@ fi
 
 if test "$wxUSE_IPC" = "yes"; then
     if test "$wxUSE_SOCKETS" != "yes"; then
 
 if test "$wxUSE_IPC" = "yes"; then
     if test "$wxUSE_SOCKETS" != "yes"; then
-        AC_MSG_WARN(wxWindows IPC classes require sockets, disabled)
+        AC_MSG_WARN(wxWindows IPC classes require sockets... disabled)
     fi
 
     AC_DEFINE(wxUSE_IPC)
     fi
 
     AC_DEFINE(wxUSE_IPC)
@@ -4121,18 +4224,18 @@ fi
 if test "$wxUSE_DRAG_AND_DROP" = "yes" ; then
     if test "$wxUSE_GTK" = 1; then
         if test "$WXGTK12" != 1; then
 if test "$wxUSE_DRAG_AND_DROP" = "yes" ; then
     if test "$wxUSE_GTK" = 1; then
         if test "$WXGTK12" != 1; then
-            AC_MSG_WARN([Drag and drop is only supported under GTK+ 1.2])
+            AC_MSG_WARN([Drag and drop is only supported under GTK+ 1.2... disabled])
             wxUSE_DRAG_AND_DROP=no
         fi
     fi
 
     if test "$wxUSE_MOTIF" = 1; then
             wxUSE_DRAG_AND_DROP=no
         fi
     fi
 
     if test "$wxUSE_MOTIF" = 1; then
-        AC_MSG_WARN([Drag and drop is not yet supported under Motif])
+        AC_MSG_WARN([Drag and drop not yet supported under Motif... disabled])
         wxUSE_DRAG_AND_DROP=no
     fi
 
     if test "$wxUSE_MAC" = 1; then
         wxUSE_DRAG_AND_DROP=no
     fi
 
     if test "$wxUSE_MAC" = 1; then
-        AC_MSG_WARN([Drag and drop is not yet supported under Mac OS X])
+        AC_MSG_WARN([Drag and drop not yet supported under Mac OS X... disabled])
         wxUSE_DRAG_AND_DROP=no
     fi
 
         wxUSE_DRAG_AND_DROP=no
     fi
 
@@ -4337,8 +4440,12 @@ 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 -o "$wxUSE_UNIVERSAL" = "yes"; then
-        AC_MSG_WARN([Toggle button not yet supported under Mac OS X or wxUNIVERSAL... disabled])
+    if test "$wxUSE_MAC" = 1; then
+        AC_MSG_WARN([Toggle button not yet supported under Mac OS X... disabled])
+        wxUSE_TOGGLEBTN=no
+    fi
+    if test "$wxUSE_UNIVERSAL" = "yes"; then
+        AC_MSG_WARN([Toggle button not yet supported under wxUNIVERSAL... disabled])
         wxUSE_TOGGLEBTN=no
     fi
 
         wxUSE_TOGGLEBTN=no
     fi
 
@@ -4373,12 +4480,16 @@ fi
 
 if test "$wxUSE_TOOLTIPS" = "yes"; then
     if test "$wxUSE_MOTIF" = 1; then
 
 if test "$wxUSE_TOOLTIPS" = "yes"; then
     if test "$wxUSE_MOTIF" = 1; then
-        AC_MSG_WARN(wxTooltip not supported yet under Motif)
+        AC_MSG_WARN([wxTooltip not supported yet under Motif... disabled])
     else
         if test "$wxUSE_WINE" = 1; then
     else
         if test "$wxUSE_WINE" = 1; then
-            AC_MSG_WARN(wxTooltip not supported under WINE)
+            AC_MSG_WARN([wxTooltip not supported under WINE... disabled])
         else
         else
-            AC_DEFINE(wxUSE_TOOLTIPS)
+            if test "$wxUSE_UNIVERSAL" = "yes"; then
+                AC_MSG_WARN([wxTooltip not supported yet in wxUNIVERSAL... disabled])
+            else
+                AC_DEFINE(wxUSE_TOOLTIPS)
+            fi
         fi
     fi
 fi
         fi
     fi
 fi
@@ -4395,13 +4506,22 @@ fi
 
 if test "$wxUSE_POPUPWIN" = "yes"; then
     if test "$wxUSE_MAC" = 1; then
 
 if test "$wxUSE_POPUPWIN" = "yes"; then
     if test "$wxUSE_MAC" = 1; then
-        AC_MSG_WARN(Popup window is not yet supported under Mac OS)
+        AC_MSG_WARN([Popup window not yet supported under Mac OS X... disabled])
     else
     else
-        AC_DEFINE(wxUSE_POPUPWIN)
-        USES_CONTROLS=1
+        if test "$wxUSE_MOTIF" = 1; then
+            AC_MSG_WARN([wxPopupWindow not yet supported under Motif... disabled])
+        else
+            AC_DEFINE(wxUSE_POPUPWIN)
+
+            USES_CONTROLS=1
+        fi
     fi
 fi
 
     fi
 fi
 
+if test "$wxUSE_TIPWINDOW" = "yes"; then
+    AC_DEFINE(wxUSE_TIPWINDOW)
+fi
+
 if test "$USES_CONTROLS" = 1; then
     AC_DEFINE(wxUSE_CONTROLS)
 fi
 if test "$USES_CONTROLS" = 1; then
     AC_DEFINE(wxUSE_CONTROLS)
 fi
@@ -4580,20 +4700,24 @@ dnl ---------------------------------------------------------------------------
 dnl Output the makefiles and such from the results found above
 dnl ---------------------------------------------------------------------------
 
 dnl Output the makefiles and such from the results found above
 dnl ---------------------------------------------------------------------------
 
-GUILIBS="$GUI_TK_LIBRARY $TOOLKIT_LINK"
-
 dnl all additional libraries (except wxWindows itself) we link with
 dnl all additional libraries (except wxWindows itself) we link with
-dnl
+
 dnl note that we always link with -lm except for Mac OS X
 dnl extended.c uses floor() and is always linked in
 dnl note that we always link with -lm except for Mac OS X
 dnl extended.c uses floor() and is always linked in
-EXTRA_LIBS="$LIBS $POSIX4_LINK $INET_LINK $WCHAR_LINK $THREADS_LINK $DMALLOC_LINK $DL_LINK $ZLIB_LINK -lm"
 
 if test "$wxUSE_MAC" = 1 ; then
 
 if test "$wxUSE_MAC" = 1 ; then
-    EXTRA_LIBS="$EXTRA_LIBS -framework Carbon -framework System"
+    LDFLAGS="$LDFLAGS -framework Carbon -framework System"
 fi
 
 fi
 
+dnl FIXME: should this be covered by the conditional above
+dnl given the -lm comment there?  Or should that comment (and
+dnl this one) be removed..   [ 7 Nov 2001 ]
+
+LIBS="$ZLIB_LINK$POSIX4_LINK$INET_LINK$WCHAR_LINK$THREADS_LINK$DL_LINK -lm$LIBS"
+
 if test "$wxUSE_GUI" = "yes"; then
 if test "$wxUSE_GUI" = "yes"; then
-    EXTRA_LIBS="$GUILIBS $PNG_LINK $JPEG_LINK $TIFF_LINK $FREETYPE_LINK $EXTRA_LIBS"
+
+    LIBS=" $GUI_TK_LIBRARY$PNG_LINK$JPEG_LINK$TIFF_LINK$FREETYPE_LINK$LIBS"
 
     dnl TODO add checks that these samples will really compile (i.e. all the
     dnl      library features they need are present)
 
     dnl TODO add checks that these samples will really compile (i.e. all the
     dnl      library features they need are present)
@@ -4610,9 +4734,6 @@ else
     SAMPLES_SUBDIRS="console"
 fi
 
     SAMPLES_SUBDIRS="console"
 fi
 
-dnl all the libraries needed to link wxWindows programs when using the
-dnl makefile system without libtool
-LD_LIBS="\${top_builddir}/lib/${WX_LIBRARY_NAME_STATIC} $EXTRA_LIBS"
 
 dnl all -I options we must pass to the compiler
 INCLUDES="-I\${top_builddir}/lib/wx/include/${TOOLCHAIN_NAME} -I\${top_srcdir}/include \
 
 dnl all -I options we must pass to the compiler
 INCLUDES="-I\${top_builddir}/lib/wx/include/${TOOLCHAIN_NAME} -I\${top_srcdir}/include \
@@ -4621,7 +4742,7 @@ $FREETYPE_INCLUDE $TOOLKIT_INCLUDE"
 
 dnl wxGTK does not need TOOLKIT includes in wx-config
 if test "$wxUSE_GTK" = 1; then
 
 dnl wxGTK does not need TOOLKIT includes in wx-config
 if test "$wxUSE_GTK" = 1; then
-    WXCONFIG_INCLUDE=""
+    WXCONFIG_INCLUDE=
 else
     WXCONFIG_INCLUDE="$TOOLKIT_INCLUDE"
 fi
 else
     WXCONFIG_INCLUDE="$TOOLKIT_INCLUDE"
 fi
@@ -4632,13 +4753,21 @@ if test "$GXX" = yes ; then
     CXXWARNINGS="-Wall"
     dnl should enable this one day...
     dnl CXXWARNINGS="-Wall -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
 fi
-EXTRA_CFLAGS="$WXDEBUG $WXODBCFLAG $PROFILE $OPTIMISE $INCLUDES"
+
+EXTRA_CFLAGS="$WXDEBUG $WXODBCFLAG$PROFILE $OPTIMISE $INCLUDES"
 
 CFLAGS=`echo $CFLAGS $EXTRA_CFLAGS $CXXWARNINGS | sed 's/ \\+/ /g'`
 CXXFLAGS=`echo $CXXFLAGS $EXTRA_CFLAGS $CXXWARNINGS | sed 's/ \+/ /g'`
 
 
 CFLAGS=`echo $CFLAGS $EXTRA_CFLAGS $CXXWARNINGS | sed 's/ \\+/ /g'`
 CXXFLAGS=`echo $CXXFLAGS $EXTRA_CFLAGS $CXXWARNINGS | sed 's/ \+/ /g'`
 
-LDFLAGS="$LDFLAGS $PROFILE"
+LDFLAGS="$LDFLAGS$PROFILE"
 
 dnl for convenience, sort the samples in alphabetical order
 dnl
 
 dnl for convenience, sort the samples in alphabetical order
 dnl
@@ -4660,6 +4789,7 @@ AC_SUBST(WX_MINOR_VERSION_NUMBER)
 AC_SUBST(WX_RELEASE_NUMBER)
 AC_SUBST(WX_LIBRARY_NAME_STATIC)
 AC_SUBST(WX_LIBRARY_NAME_SHARED)
 AC_SUBST(WX_RELEASE_NUMBER)
 AC_SUBST(WX_LIBRARY_NAME_STATIC)
 AC_SUBST(WX_LIBRARY_NAME_SHARED)
+AC_SUBST(WX_LIBRARY_IMPORTLIB)
 AC_SUBST(WX_TARGET_LIBRARY)
 AC_SUBST(WX_LIBRARY_LINK1)
 AC_SUBST(WX_LIBRARY_LINK2)
 AC_SUBST(WX_TARGET_LIBRARY)
 AC_SUBST(WX_LIBRARY_LINK1)
 AC_SUBST(WX_LIBRARY_LINK2)
@@ -4697,11 +4827,15 @@ AC_SUBST(TOOLKIT_DIR)
 AC_SUBST(TOOLKIT_VPATH)
 AC_SUBST(TOOLCHAIN_NAME)
 AC_SUBST(TOOLCHAIN_DEFS)
 AC_SUBST(TOOLKIT_VPATH)
 AC_SUBST(TOOLCHAIN_NAME)
 AC_SUBST(TOOLCHAIN_DEFS)
+AC_SUBST(TOOLCHAIN_DLL_DEFS)
 
 dnl wx-config options
 
 dnl wx-config options
+AC_SUBST(host_alias)
 AC_SUBST(cross_compiling)
 AC_SUBST(WXCONFIG_LIBS)
 AC_SUBST(WXCONFIG_LIBS_GL)
 AC_SUBST(cross_compiling)
 AC_SUBST(WXCONFIG_LIBS)
 AC_SUBST(WXCONFIG_LIBS_GL)
+AC_SUBST(WXCONFIG_LIBS_STATIC)
+AC_SUBST(WXCONFIG_LIBS_STATIC_GL)
 AC_SUBST(WXCONFIG_INCLUDE)
 
 dnl what to compile
 AC_SUBST(WXCONFIG_INCLUDE)
 
 dnl what to compile
@@ -4711,20 +4845,16 @@ dnl distribution vars
 AC_SUBST(GUIDIST)
 AC_SUBST(PORT_FILES)
 AC_SUBST(DISTDIR)
 AC_SUBST(GUIDIST)
 AC_SUBST(PORT_FILES)
 AC_SUBST(DISTDIR)
-AC_SUBST(RPM_SPEC)
-AC_SUBST(RPM_FILES)
 
 dnl additional subdirectories where we will build
 AC_SUBST(SAMPLES_SUBDIRS)
 
 dnl additional libraries and linker settings
 AC_SUBST(LDFLAGS)
 
 dnl additional subdirectories where we will build
 AC_SUBST(SAMPLES_SUBDIRS)
 
 dnl additional libraries and linker settings
 AC_SUBST(LDFLAGS)
-AC_SUBST(EXTRA_LIBS)
+AC_SUBST(LDFLAGS_GL)
 AC_SUBST(OPENGL_LIBS)
 AC_SUBST(OPENGL_LIBS)
+AC_SUBST(DMALLOC_LIBS)
 AC_SUBST(EXTRADEFS)
 AC_SUBST(EXTRADEFS)
-AC_SUBST(LIBS)
-AC_SUBST(LD_LIBS)
-AC_SUBST(WXMSW_DLL_DEFINES)
 
 dnl additional resurces settings
 AC_SUBST(RESCOMP)
 
 dnl additional resurces settings
 AC_SUBST(RESCOMP)
@@ -4745,10 +4875,10 @@ AC_SUBST(AS)
 AC_SUBST(NM)
 AC_SUBST(LD)
 AC_SUBST(MAKEINFO)
 AC_SUBST(NM)
 AC_SUBST(LD)
 AC_SUBST(MAKEINFO)
-
+AC_SUBST(INSTALL_LIBRARY)
 
 dnl MAKE_SET will be replaced with "MAKE=..." or nothing if make sets MAKE
 
 dnl MAKE_SET will be replaced with "MAKE=..." or nothing if make sets MAKE
-dnl itself (this is macro is required if SUBDIRS variable is used in Makefile.am
+dnl itself (this macro is required if SUBDIRS variable is used in Makefile.am
 dnl - and we do use it)
 AC_PROG_MAKE_SET
 
 dnl - and we do use it)
 AC_PROG_MAKE_SET