X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0bdb08e7ef02ec704542326d899d357136acdaa5..f530fa27a92ea58071c83aa7bfe0a859626b39e7:/configure.in diff --git a/configure.in b/configure.in index 24673db5f2..a3670e48e4 100644 --- a/configure.in +++ b/configure.in @@ -1,14 +1,14 @@ dnl Process this file with autoconf to produce a configure script. AC_REVISION($Id$)dnl -AC_PREREQ(2.57) +AC_PREREQ(2.58) dnl --------------------------------------------------------------------------- dnl -dnl Top-level configure.in for wxWindows by Robert Roebling, Phil Blecker, +dnl Top-level configure.in for wxWidgets by Robert Roebling, Phil Blecker, dnl Vadim Zeitlin and Ron Lee dnl -dnl This script is under the wxWindows licence. +dnl This script is under the wxWidgets licence. dnl dnl Version: $Id$ dnl --------------------------------------------------------------------------- @@ -17,7 +17,7 @@ dnl --------------------------------------------------------------------------- dnl initialization dnl --------------------------------------------------------------------------- -AC_INIT([wxWindows], [2.5.0], [wx-dev@lists.wxwindows.org]) +AC_INIT([wxWidgets], [2.5.3], [wx-dev@lists.wxwidgets.org]) dnl the file passed to AC_CONFIG_SRCDIR should be specific to our package AC_CONFIG_SRCDIR([wx-config.in]) @@ -30,9 +30,9 @@ AC_CANONICAL_TARGET dnl When making releases do: dnl -dnl WX_RELEASE_NUMBER += 1 +dnl wx_release_number += 1 dnl -dnl ..and update WX_CURRENT, WX_RELEASE and WX_AGE according to the +dnl ..and update WX_CURRENT, WX_REVISION and WX_AGE according to the dnl following rules: dnl dnl If any changes have been made to the public interface, that is if any @@ -53,16 +53,18 @@ dnl dnl The resulting library name will be of the form: dnl libwx_$(TOOLKIT)-$(WX_RELEASE).so.$(WX_CURRENT).$(WX_REVISION).$(WX_AGE) -WX_MAJOR_VERSION_NUMBER=2 -WX_MINOR_VERSION_NUMBER=5 -WX_RELEASE_NUMBER=0 +wx_major_version_number=2 +wx_minor_version_number=5 +wx_release_number=3 +wx_subrelease_number=0 -WX_VERSION=$WX_MAJOR_VERSION_NUMBER.$WX_MINOR_VERSION_NUMBER.$WX_RELEASE_NUMBER -WX_RELEASE=$WX_MAJOR_VERSION_NUMBER.$WX_MINOR_VERSION_NUMBER +WX_RELEASE=$wx_major_version_number.$wx_minor_version_number +WX_VERSION=$WX_RELEASE.$wx_release_number +WX_SUBVERSION=$WX_VERSION.$wx_subrelease_number -WX_MSW_VERSION=$WX_MAJOR_VERSION_NUMBER$WX_MINOR_VERSION_NUMBER$WX_RELEASE_NUMBER +WX_MSW_VERSION=$wx_major_version_number$wx_minor_version_number$wx_release_number -WX_CURRENT=0 +WX_CURRENT=3 WX_REVISION=0 WX_AGE=0 @@ -73,6 +75,7 @@ dnl ------------------------------------------------------------------------ dnl OS (assume Unix) USE_UNIX=1 +USE_OS2=0 USE_WIN32=0 USE_DOS=0 USE_BEOS=0 @@ -164,9 +167,8 @@ case "${host}" in fi DEFAULT_DEFAULT_wxUSE_GTK=1 ;; - *-*-gnu* ) + *-*-gnu* | *-*-k*bsd*-gnu ) USE_GNU=1 - AC_DEFINE(__GNU__) TMP=`uname -m` if test "x$TMP" = "xalpha"; then USE_ALPHA=1 @@ -288,12 +290,13 @@ case "${host}" in *-pc-os2_emx | *-pc-os2-emx ) AC_DEFINE(__EMX__) + USE_OS2=1 + AC_DEFINE(__OS2__) PROGRAM_EXT=".exe" DEFAULT_DEFAULT_wxUSE_PM=1 dnl "c++" wrapper is not always available, so always use plain gcc. CXX=gcc - dnl Explicitly link -lstdcpp, since we are using "gcc" not "g++"/"c++". - LIBS="$LIBS -lstdcpp" + LDFLAGS="$LDFLAGS -Zcrtdll" dnl dnl Some special code that's automatically added by autoconf-2.57 for OS/2 dnl and hopefully also by autoconf-2.58 and newer on all other platforms. @@ -304,7 +307,7 @@ case "${host}" in dnl This strange code is necessary to deal with handling of dnl backslashes by ksh and pdksh's sh variant. ac_save_IFS="$IFS" - IFS="\\" + IFS='\\' ac_TEMP_PATH= for ac_dir in $PATH; do IFS=$ac_save_IFS @@ -378,6 +381,7 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_DMALLOC=no DEFAULT_wxUSE_APPLE_IEEE=no + DEFAULT_wxUSE_EXCEPTIONS=no DEFAULT_wxUSE_LOG=yes DEFAULT_wxUSE_LOGWINDOW=no DEFAULT_wxUSE_LOGGUI=no @@ -393,6 +397,9 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_LIBPNG=no DEFAULT_wxUSE_LIBJPEG=no DEFAULT_wxUSE_LIBTIFF=no + DEFAULT_wxUSE_LIBXPM=no + DEFAULT_wxUSE_LIBMSPACK=no + DEFAULT_wxUSE_LIBSDL=no DEFAULT_wxUSE_ODBC=no DEFAULT_wxUSE_OPENGL=no @@ -407,7 +414,7 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_FFILE=no DEFAULT_wxUSE_TEXTBUFFER=no DEFAULT_wxUSE_TEXTFILE=no - DEFAULT_wxUSE_WAVE=no + DEFAULT_wxUSE_SOUND=no DEFAULT_wxUSE_INTL=no DEFAULT_wxUSE_CONFIG=no DEFAULT_wxUSE_FONTMAP=no @@ -432,6 +439,7 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_DRAGIMAGE=no DEFAULT_wxUSE_SPLINES=no + DEFAULT_wxUSE_MDI=no DEFAULT_wxUSE_MDI_ARCHITECTURE=no DEFAULT_wxUSE_DOC_VIEW_ARCHITECTURE=no DEFAULT_wxUSE_PRINTING_ARCHITECTURE=no @@ -470,6 +478,8 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_MENUS=no DEFAULT_wxUSE_MINIFRAME=no DEFAULT_wxUSE_HTML=no + DEFAULT_wxUSE_XRC=no + DEFAULT_wxUSE_WEBKIT=no DEFAULT_wxUSE_FILESYSTEM=no DEFAULT_wxUSE_FS_INET=no DEFAULT_wxUSE_FS_ZIP=no @@ -485,6 +495,7 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_CHECKBOX=no DEFAULT_wxUSE_CHECKLST=no DEFAULT_wxUSE_CHOICE=no + DEFAULT_wxUSE_CHOICEBOOK=no DEFAULT_wxUSE_COMBOBOX=no DEFAULT_wxUSE_DISPLAY=no DEFAULT_wxUSE_GAUGE=no @@ -532,6 +543,7 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_ACCESSIBILITY=no DEFAULT_wxUSE_MONOLITHIC=no + DEFAULT_wxUSE_PLUGINS=no DEFAULT_wxUSE_OFFICIAL_BUILD=no else DEFAULT_wxUSE_UNIVERSAL=no @@ -556,6 +568,7 @@ else DEFAULT_wxUSE_DMALLOC=no DEFAULT_wxUSE_APPLE_IEEE=yes + DEFAULT_wxUSE_EXCEPTIONS=yes DEFAULT_wxUSE_LOG=yes DEFAULT_wxUSE_LOGWINDOW=yes DEFAULT_wxUSE_LOGGUI=yes @@ -570,6 +583,9 @@ else DEFAULT_wxUSE_LIBPNG=yes DEFAULT_wxUSE_LIBJPEG=yes DEFAULT_wxUSE_LIBTIFF=yes + DEFAULT_wxUSE_LIBXPM=yes + DEFAULT_wxUSE_LIBMSPACK=yes + DEFAULT_wxUSE_LIBSDL=no DEFAULT_wxUSE_ODBC=no DEFAULT_wxUSE_OPENGL=no @@ -584,7 +600,7 @@ else DEFAULT_wxUSE_FFILE=yes DEFAULT_wxUSE_TEXTBUFFER=yes DEFAULT_wxUSE_TEXTFILE=yes - DEFAULT_wxUSE_WAVE=no + DEFAULT_wxUSE_SOUND=yes DEFAULT_wxUSE_INTL=yes DEFAULT_wxUSE_CONFIG=yes DEFAULT_wxUSE_FONTMAP=yes @@ -609,6 +625,7 @@ else DEFAULT_wxUSE_DRAGIMAGE=yes DEFAULT_wxUSE_SPLINES=yes + DEFAULT_wxUSE_MDI=yes DEFAULT_wxUSE_MDI_ARCHITECTURE=yes DEFAULT_wxUSE_DOC_VIEW_ARCHITECTURE=yes DEFAULT_wxUSE_PRINTING_ARCHITECTURE=yes @@ -647,6 +664,8 @@ else DEFAULT_wxUSE_MENUS=yes DEFAULT_wxUSE_MINIFRAME=yes DEFAULT_wxUSE_HTML=yes + DEFAULT_wxUSE_XRC=yes + DEFAULT_wxUSE_WEBKIT=yes DEFAULT_wxUSE_FILESYSTEM=yes DEFAULT_wxUSE_FS_INET=yes DEFAULT_wxUSE_FS_ZIP=yes @@ -662,8 +681,9 @@ else DEFAULT_wxUSE_CHECKBOX=yes DEFAULT_wxUSE_CHECKLST=yes DEFAULT_wxUSE_CHOICE=yes + DEFAULT_wxUSE_CHOICEBOOK=yes DEFAULT_wxUSE_COMBOBOX=yes - DEFAULT_wxUSE_DISPLAY=no + DEFAULT_wxUSE_DISPLAY=yes DEFAULT_wxUSE_GAUGE=yes DEFAULT_wxUSE_GRID=yes DEFAULT_wxUSE_IMAGLIST=yes @@ -709,7 +729,11 @@ else DEFAULT_wxUSE_ACCESSIBILITY=no DEFAULT_wxUSE_MONOLITHIC=no + DEFAULT_wxUSE_PLUGINS=no DEFAULT_wxUSE_OFFICIAL_BUILD=no + + dnl Appliable only when --with-gtk was used: + DEFAULT_wxUSE_GTK2=yes fi dnl WX_ARG_WITH should be used to select whether an external package will be @@ -732,7 +756,7 @@ for toolkit in `echo $ALL_TOOLKITS`; do done dnl --------------------------------------------------------------------------- -dnl --disable-gui will build only non-GUI part of wxWindows: check for this +dnl --disable-gui will build only non-GUI part of wxWidgets: check for this dnl first to disable many other switches if it's given dnl dnl NB: this is still in testing stage, don't use if you don't know what you're @@ -740,11 +764,12 @@ dnl doing dnl --------------------------------------------------------------------------- WX_ARG_ENABLE(gui, [ --enable-gui use GUI classes], wxUSE_GUI) -WX_ARG_ENABLE(monolithic, [ --disable-monolithic don't build wxWindows as single library], wxUSE_MONOLITHIC) +WX_ARG_ENABLE(monolithic, [ --enable-monolithic build wxWidgets as single library], wxUSE_MONOLITHIC) +WX_ARG_ENABLE(plugins, [ --enable-plugins build parts of wxWidgets as loadable components], wxUSE_PLUGINS) if test "$wxUSE_GUI" = "yes"; then -WX_ARG_ENABLE(universal, [ --enable-universal use wxWindows GUI controls instead of native ones], wxUSE_UNIVERSAL) +WX_ARG_ENABLE(universal, [ --enable-universal use wxWidgets GUI controls instead of native ones], wxUSE_UNIVERSAL) AC_ARG_WITH(gtk, [ --with-gtk use GTK+], [wxUSE_GTK="$withval" CACHE_GTK=1 TOOLKIT_GIVEN=1]) AC_ARG_WITH(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]) @@ -757,11 +782,15 @@ AC_ARG_WITH(microwin, [ --with-microwin use MicroWindows], [wxUSE_ AC_ARG_WITH(x11, [ --with-x11 use X11], [wxUSE_X11="$withval" wxUSE_UNIVERSAL="yes" CACHE_X11=1 TOOLKIT_GIVEN=1]) WX_ARG_ENABLE(nanox, [ --enable-nanox use NanoX], wxUSE_NANOX) -WX_ARG_ENABLE(gtk2, [ --enable-gtk2 use GTK+ 2.0 if available (EXPERIMENTAL)], wxUSE_GTK2) +WX_ARG_ENABLE(gtk2, [ --disable-gtk2 use GTK+ 1.2 instead of 2.0], wxUSE_GTK2) +WX_ARG_ENABLE(gpe, [ --enable-gpe use GNOME PDA Environment features if possible], wxUSE_GPE) WX_ARG_SYS_WITH(libpng, [ --with-libpng use libpng (PNG image format)], wxUSE_LIBPNG) WX_ARG_SYS_WITH(libjpeg, [ --with-libjpeg use libjpeg (JPEG file format)], wxUSE_LIBJPEG) WX_ARG_SYS_WITH(libtiff, [ --with-libtiff use libtiff (TIFF file format)], wxUSE_LIBTIFF) +WX_ARG_SYS_WITH(libxpm, [ --with-libxpm use libxpm (XPM file format)], wxUSE_LIBXPM) +WX_ARG_WITH(libmspack, [ --with-libmspack use libmspack (CHM help files loading)], wxUSE_LIBMSPACK) +WX_ARG_WITH(sdl, [ --with-sdl use SDL for audio on Unix], wxUSE_LIBSDL) WX_ARG_WITH(opengl, [ --with-opengl use OpenGL (or Mesa)], wxUSE_OPENGL) fi @@ -781,6 +810,9 @@ WX_ARG_ENABLE(shared, [ --enable-shared create shared library code WX_ARG_ENABLE(optimise, [ --enable-optimise create optimised code], wxUSE_OPTIMISE) WX_ARG_ENABLE(debug, [ --enable-debug same as debug_flag and debug_info], wxUSE_DEBUG) WX_ARG_ENABLE(stl, [ --enable-stl use STL for containers], wxUSE_STL) +if test "$USE_OS2" = "1"; then + WX_ARG_ENABLE(omf, [ --enable-omf use OMF object format], wxUSE_OMF) +fi if test "$wxUSE_DEBUG" = "yes"; then DEFAULT_wxUSE_DEBUG_FLAG=yes @@ -803,12 +835,12 @@ WX_ARG_ENABLE(no_exceptions, [ --enable-no_exceptions create code without C++ WX_ARG_ENABLE(permissive, [ --enable-permissive compile code disregarding strict ANSI], wxUSE_PERMISSIVE) WX_ARG_ENABLE(no_deps, [ --enable-no_deps create code without dependency information], wxUSE_NO_DEPS) -WX_ARG_ENABLE(compat22, [ --enable-compat22 enable wxWindows 2.2 compatibility], WXWIN_COMPATIBILITY_2_2) -WX_ARG_ENABLE(compat24, [ --disable-compat24 disable wxWindows 2.4 compatibility], WXWIN_COMPATIBILITY_2_4, disable) +WX_ARG_ENABLE(compat22, [ --enable-compat22 enable wxWidgets 2.2 compatibility], WXWIN_COMPATIBILITY_2_2) +WX_ARG_ENABLE(compat24, [ --disable-compat24 disable wxWidgets 2.4 compatibility], WXWIN_COMPATIBILITY_2_4, disable) AC_ARG_ENABLE(rpath, [ --enable-rpath=DIR output the rpath flag from wx-config], [wxRPATH_DIR="$enableval"]) -if test "$wxRPATH_DIR" != "" -a "$wxRPATH_DIR" != "disable"; then +if test "$wxRPATH_DIR" != "" -a "$wxRPATH_DIR" != "disable" -a "$wxRPATH_DIR" != "no"; then WXCONFIG_RPATH="-Wl,-rpath -Wl,$wxRPATH_DIR" fi @@ -825,45 +857,44 @@ WX_ARG_ENABLE(ftp, [ --enable-ftp use wxFTP (requires wxPr WX_ARG_ENABLE(http, [ --enable-http use wxHTTP (requires wxProtocol], wxUSE_PROTOCOL_HTTP) WX_ARG_ENABLE(fileproto, [ --enable-fileproto use wxFileProto class (requires wxProtocol], wxUSE_PROTOCOL_FILE) WX_ARG_ENABLE(sockets, [ --enable-sockets use socket/network classes], wxUSE_SOCKETS) -WX_ARG_ENABLE(ole, [ --enable-ole use OLE classes], wxUSE_OLE) +WX_ARG_ENABLE(ole, [ --enable-ole use OLE classes (Win32 only)], wxUSE_OLE) WX_ARG_ENABLE(dataobj, [ --enable-dataobj use data object classes], wxUSE_DATAOBJ) WX_ARG_ENABLE(ipc, [ --enable-ipc use interprocess communication (wxSocket etc.)], wxUSE_IPC) +dnl please keep the settings below in alphabetical order +WX_ARG_ENABLE(apple_ieee, [ --enable-apple_ieee use the Apple IEEE codec], wxUSE_APPLE_IEEE) +WX_ARG_ENABLE(catch_segvs, [ --enable-catch_segvs catch signals in wxApp::OnFatalException (Unix only)], wxUSE_ON_FATAL_EXCEPTION) WX_ARG_ENABLE(cmdline, [ --enable-cmdline use wxCmdLineParser class], wxUSE_CMDLINE_PARSER) WX_ARG_ENABLE(datetime, [ --enable-datetime use wxDateTime class], wxUSE_DATETIME) -WX_ARG_ENABLE(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(timer, [ --enable-timer use wxTimer class], wxUSE_TIMER) -WX_ARG_ENABLE(wave, [ --enable-wave use wxWave class], wxUSE_WAVE) -WX_ARG_ENABLE(fraction, [ --enable-fraction use wxFraction class], wxUSE_FRACTION) WX_ARG_ENABLE(dynlib, [ --enable-dynlib use wxLibrary class for DLL loading], wxUSE_DYNLIB_CLASS) WX_ARG_ENABLE(dynamicloader, [ --enable-dynamicloader use (new) wxDynamicLibrary class], wxUSE_DYNAMIC_LOADER) -WX_ARG_ENABLE(longlong, [ --enable-longlong use wxLongLong class], wxUSE_LONGLONG) +WX_ARG_ENABLE(exceptions, [ --enable-exceptions build exception-safe library], wxUSE_EXCEPTIONS) +WX_ARG_ENABLE(ffile, [ --enable-ffile use wxFFile class], wxUSE_FFILE) +WX_ARG_ENABLE(file, [ --enable-file use wxFile class], wxUSE_FILE) +WX_ARG_ENABLE(filesystem, [ --enable-filesystem use virtual file systems classes], wxUSE_FILESYSTEM) +WX_ARG_ENABLE(fontmap, [ --enable-fontmap use font encodings conversion classes], wxUSE_FONTMAP) +WX_ARG_ENABLE(fs_inet, [ --enable-fs_inet use virtual HTTP/FTP filesystems], wxUSE_FS_INET) +WX_ARG_ENABLE(fs_zip, [ --enable-fs_zip use virtual ZIP filesystems], wxUSE_FS_ZIP) WX_ARG_ENABLE(geometry, [ --enable-geometry use geometry class], wxUSE_GEOMETRY) WX_ARG_ENABLE(log, [ --enable-log use logging system], wxUSE_LOG) +WX_ARG_ENABLE(longlong, [ --enable-longlong use wxLongLong class], wxUSE_LONGLONG) +WX_ARG_ENABLE(mimetype, [ --enable-mimetype use wxMimeTypesManager], wxUSE_MIMETYPE) +WX_ARG_ENABLE(mslu, [ --enable-mslu use MS Layer for Unicode on Windows 9x (Win32 only)], wxUSE_UNICODE_MSLU) +WX_ARG_ENABLE(snglinst, [ --enable-snglinst use wxSingleInstanceChecker class], wxUSE_SNGLINST_CHECKER) WX_ARG_ENABLE(streams, [ --enable-streams use wxStream etc classes], wxUSE_STREAMS) -WX_ARG_ENABLE(file, [ --enable-file use wxFile classes], wxUSE_FILE) -WX_ARG_ENABLE(ffile, [ --enable-ffile use wxFFile classes], wxUSE_FFILE) +WX_ARG_ENABLE(std_iostreams, [ --enable-std_iostreams use standard C++ stream classes], wxUSE_STD_IOSTREAM) +WX_ARG_ENABLE(stopwatch, [ --enable-stopwatch use wxStopWatch class], wxUSE_STOPWATCH) +WX_ARG_ENABLE(system_options,[ --enable-sysoptions use wxSystemOptions], wxUSE_SYSTEM_OPTIONS) WX_ARG_ENABLE(textbuf, [ --enable-textbuf use wxTextBuffer class], wxUSE_TEXTBUFFER) WX_ARG_ENABLE(textfile, [ --enable-textfile use wxTextFile class], wxUSE_TEXTFILE) -WX_ARG_ENABLE(fontmap, [ --enable-fontmap use font encodings conversion classes], wxUSE_FONTMAP) +WX_ARG_ENABLE(timer, [ --enable-timer use wxTimer class], wxUSE_TIMER) WX_ARG_ENABLE(unicode, [ --enable-unicode compile wxString with Unicode support], wxUSE_UNICODE) -WX_ARG_ENABLE(mslu, [ --enable-mslu use MS Layer for Unicode on Windows 9x (win32 only)], wxUSE_UNICODE_MSLU) -WX_ARG_ENABLE(wxprintfv, [ --enable-wxprintfv use wxWindows implementation of vprintf()], wxUSE_EXPERIMENTAL_PRINTF) -WX_ARG_ENABLE(std_iostreams, [ --enable-std_iostreams use standard C++ stream classes], wxUSE_STD_IOSTREAM) -WX_ARG_ENABLE(filesystem, [ --enable-filesystem use virtual file systems classes], wxUSE_FILESYSTEM) -WX_ARG_ENABLE(fs_inet, [ --enable-fs_inet use virtual HTTP/FTP filesystems], wxUSE_FS_INET) -WX_ARG_ENABLE(fs_zip, [ --enable-fs_zip use virtual ZIP filesystems], wxUSE_FS_ZIP) +WX_ARG_ENABLE(sound, [ --enable-sound use wxSound class], wxUSE_SOUND) +WX_ARG_ENABLE(wxprintfv, [ --enable-wxprintfv use wxWidgets implementation of vprintf()], wxUSE_EXPERIMENTAL_PRINTF) WX_ARG_ENABLE(zipstream, [ --enable-zipstream use wxZipInputStream], wxUSE_ZIPSTREAM) -WX_ARG_ENABLE(catch_segvs, [ --enable-catch_segvs catch signals and pass them to wxApp::OnFatalException], wxUSE_ON_FATAL_EXCEPTION) -WX_ARG_ENABLE(snglinst, [ --enable-snglinst use wxSingleInstanceChecker class], wxUSE_SNGLINST_CHECKER) - -WX_ARG_ENABLE(mimetype, [ --enable-mimetype use wxMimeTypesManager], wxUSE_MIMETYPE) -WX_ARG_ENABLE(system_options,[ --enable-sysoptions use wxSystemOptions], wxUSE_SYSTEM_OPTIONS) - WX_ARG_ENABLE(url, [ --enable-url use wxURL class], wxUSE_URL) WX_ARG_ENABLE(protocol, [ --enable-protocol use wxProtocol class], wxUSE_PROTOCOL) WX_ARG_ENABLE(protocol_http, [ --enable-protocol-http HTTP support in wxProtocol], wxUSE_PROTOCOL_HTTP) @@ -888,12 +919,15 @@ WX_ARG_ENABLE(help, [ --enable-help use help subsystem], wxUSE WX_ARG_ENABLE(mshtmlhelp, [ --enable-mshtmlhelp use MS HTML Help (win32)], wxUSE_MS_HTML_HELP) WX_ARG_ENABLE(html, [ --enable-html use wxHTML sub-library], wxUSE_HTML) WX_ARG_ENABLE(htmlhelp, [ --enable-htmlhelp use wxHTML-based help], wxUSE_WXHTML_HELP) +WX_ARG_ENABLE(xrc, [ --enable-xrc use XRC resources sub-library], wxUSE_XRC) WX_ARG_ENABLE(constraints, [ --enable-constraints use layout-constraints system], wxUSE_CONSTRAINTS) WX_ARG_ENABLE(printarch, [ --enable-printarch use printing architecture], wxUSE_PRINTING_ARCHITECTURE) -WX_ARG_ENABLE(mdi, [ --enable-mdi use multiple document interface architecture], wxUSE_MDI_ARCHITECTURE) +WX_ARG_ENABLE(mdi, [ --enable-mdi use multiple document interface architecture], wxUSE_MDI) +WX_ARG_ENABLE(mdidoc, [ --enable-mdidoc use docview architecture with MDI], 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) +WX_ARG_ENABLE(webkit, [ --enable-webkit use wxWebKitCtrl (Mac)], wxUSE_WEBKIT) dnl --------------------------------------------------------------------------- dnl PostScript options @@ -940,6 +974,7 @@ if test "$wxUSE_CONTROLS" = "yes"; then DEFAULT_wxUSE_CHECKBOX=yes DEFAULT_wxUSE_CHECKLISTBOX=yes DEFAULT_wxUSE_CHOICE=yes + DEFAULT_wxUSE_CHOICEBOOK=yes DEFAULT_wxUSE_GAUGE=yes DEFAULT_wxUSE_GRID=yes DEFAULT_wxUSE_IMAGLIST=yes @@ -978,6 +1013,7 @@ elif test "$wxUSE_CONTROLS" = "no"; then DEFAULT_wxUSE_CHECKBOX=no DEFAULT_wxUSE_CHECKLISTBOX=no DEFAULT_wxUSE_CHOICE=no + DEFAULT_wxUSE_CHOICEBOOK=no DEFAULT_wxUSE_GAUGE=no DEFAULT_wxUSE_GRID=no DEFAULT_wxUSE_IMAGLIST=no @@ -1012,10 +1048,6 @@ fi if test "x$wxUSE_COCOA" != "x" -a "$wxUSE_COCOA" != "0" ; then wxUSE_PRINTING_ARCHITECTURE=no wxUSE_DRAG_AND_DROP=no - # Generic notebook requires tab dialog - DEFAULT_wxUSE_TABDIALOG=yes - DEFAULT_wxUSE_TOOLBAR_NATIVE=no - DEFAULT_wxUSE_SCROLLBAR=no DEFAULT_wxUSE_TOOLTIPS=no DEFAULT_wxUSE_DRAGIMAGE=no fi @@ -1028,6 +1060,7 @@ 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(choicebook, [ --enable-choicebook use wxChoicebook class], wxUSE_CHOICEBOOK) 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) @@ -1109,26 +1142,25 @@ WX_ARG_ENABLE(ico_cur, [ --enable-icocur use Windows ICO and CUR fo fi +dnl --------------------------------------------------------------------------- +dnl flavour support +dnl --------------------------------------------------------------------------- + +dnl Should this be --enable? I flip-flopped a couple of times and this seems +dnl in the spirit if not the letter, we have gtk-prefix and the like in this group. +dnl It doesn't actually change anything but the output file names. +AC_ARG_WITH(flavour, [ --with-flavour=NAME specify a name to identify this build], [WX_FLAVOUR="$withval"]) + dnl --------------------------------------------------------------------------- dnl some win32 settings dnl --------------------------------------------------------------------------- -WX_ARG_ENABLE(official_build, [ --enable-official_build official build of wxWindows (win32 DLL only)], wxUSE_OFFICIAL_BUILD) +WX_ARG_ENABLE(official_build, [ --enable-official_build official build of wxWidgets (win32 DLL only)], wxUSE_OFFICIAL_BUILD) AC_ARG_ENABLE(vendor, [ --enable-vendor=VENDOR vendor name (win32 DLL only)], [VENDOR="$enableval"]) if test "x$VENDOR" = "x"; then VENDOR="custom" fi -dnl General settings (needed for GUI and non-GUI compilations alike). -dnl Path separator; ':' for unix, ';' for OS/2 -case "${host}" in - *-pc-os2_emx | *-pc-os2-emx ) - PATH_IFS=';' - ;; - *) - PATH_IFS=':' - ;; -esac dnl for GUI only @@ -1145,6 +1177,7 @@ if test "$wxUSE_WINE" = "yes"; then DEFAULT_DEFAULT_wxUSE_GTK=0 DEFAULT_DEFAULT_wxUSE_MOTIF=0 DEFAULT_DEFAULT_wxUSE_MSW=1 + wxUSE_SHARED=no fi if test "$wxUSE_GUI" = "yes"; then @@ -1205,7 +1238,7 @@ if test "$wxUSE_GUI" = "yes"; then echo "$var=$value" >> ${wx_arg_cache_file} fi if test "$value" = 1; then - toolkit_echo=`echo $toolkit | tr [[A-Z]] [[a-z]]` + toolkit_echo=`echo $toolkit | tr "[[A-Z]]" "[[a-z]]"` AC_MSG_RESULT($toolkit_echo) fi fi @@ -1247,6 +1280,7 @@ if test "$wxUSE_WINE" = "yes"; then CC=winegcc CXX=wineg++ RESCOMP=wrc + LDFLAGS_GUI="-mwindows" fi dnl NB: The two tests bellow are *NOT* mutually exclusive! They should only @@ -1289,8 +1323,6 @@ if test "$build" != "$host" ; then RANLIB=$host_alias-ranlib DLLTOOL=$host_alias-dlltool RESCOMP=$host_alias-windres - LD=$host_alias-ld - NM=$host_alias-nm STRIP=$host_alias-strip else AC_MSG_ERROR($build_alias -> $host_alias cross compilation not supported yet.) @@ -1336,7 +1368,7 @@ dnl ar command dnl defines AR with the appropriate command AC_CHECK_PROG(AR, ar, ar) if test "x$AR" = "x" ; then - AC_MSG_ERROR([ar is needed to build wxWindows]) + AC_MSG_ERROR([ar is needed to build wxWidgets]) fi dnl install checks @@ -1354,16 +1386,6 @@ case ${INSTALL} in 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 @@ -1445,13 +1467,20 @@ fi dnl not GNU make dnl needed for making link to setup.h AC_PROG_LN_S -dnl --------------------------------------------------------------------------- -dnl When we are using gcc on OS/2, we want to be either using resources (PM) -dnl or a more complete POSIX emulation for Motif/GTK+/X11 -dnl --------------------------------------------------------------------------- -dnl (OS/2-only piece) +dnl ------------------------------------------------------------------------ +dnl Platform specific tests +dnl ------------------------------------------------------------------------ + case "${host}" in *-pc-os2_emx | *-pc-os2-emx ) + dnl --------------------------------------------------------------------- + dnl When we are using gcc on OS/2, we want to be either using resources + dnl (PM) or a more complete POSIX emulation for Motif/GTK+/X11. + dnl Moreover we need to link explicitly against either stdcpp.a or + dnl stdcxx.a (depending on compiler version), since we are using "gcc", + dnl not "g++/c++". + dnl --------------------------------------------------------------------- + dnl (OS/2-only piece) if test "$wxUSE_MOTIF" = 1 -o "$wxUSE_GTK" = 1 -o "$wxUSE_X11" = 1; then dnl More complete Unix emulation for unix-like ports dnl by linking in POSIX/2's cExt (if available). @@ -1460,36 +1489,103 @@ case "${host}" in dnl Include resources for the "native" port (wxPM). RESPROGRAMOBJ="\${top_srcdir}/include/wx/os2/wx.res" fi + AC_CACHE_CHECK([for gcc version], wx_cv_gccversion,[ + AC_TRY_COMPILE([], + [ + #if (__GNUC__ < 3) + #error old gcc + #endif + ], + [ + AC_TRY_COMPILE([], + [ + #if (__GNUC__==3) && ((__GNUC_MINOR__ < 2) || ((__GNUC_MINOR__==2) && (__GNUC_PATCHLEVEL__<2))) + #error intermediate gcc + #endif + ], + [ + wx_cv_gccversion=Innotek + ], + [ + wx_cv_gccversion=3 + ] + ) + ], + [ + wx_cv_gccversion=2 + ] + ) + ]) + if test "$wx_cv_gccversion" = "2"; then + LIBS="$LIBS -lstdcpp" + LDFLAGS="$LDFLAGS -Zsysv-signals" + else + if test "$wx_cv_gccversion" = "3"; then + LIBS="$LIBS -lstdcxx" + LDFLAGS="$LDFLAGS -Zsysv-signals" + else + LIBS="$LIBS -lstdc++" + fi + fi + if test "$wxUSE_OMF" = "yes"; then + LDFLAGS="$LDFLAGS -Zomf -Zlinker /PMTYPE:PM -Zlinker /EXEPACK" + fi + dnl (end of OS/2-only piece) + ;; + *) + dnl --------------------------------------------------------------------- + dnl look for strcasecmp() in string.h and then strings.h if it's not + dnl there. Don't do this on OS/2, where "stricmp" is the function to be + dnl used. + dnl --------------------------------------------------------------------- + dnl (non-OS/2-only piece) + + AC_LANG_SAVE + AC_LANG_CPLUSPLUS + + AC_CACHE_CHECK([for strcasecmp() in string.h], ac_cv_string_strcasecmp, [ + AC_TRY_LINK([ + #include + ], + [ + strcasecmp("foo", "bar"); + ], + ac_cv_string_strcasecmp=yes, + ac_cv_string_strcasecmp=no + ) + ]) + + if test x"$ac_cv_string_strcasecmp" = "xyes"; then + AC_DEFINE(HAVE_STRCASECMP_IN_STRING_H) + else + AC_CACHE_CHECK([for strcasecmp() in strings.h], ac_cv_strings_strcasecmp, [ + AC_TRY_LINK([ + #include + ], + [ + strcasecmp("foo", "bar"); + ], + ac_cv_strings_strcasecmp=yes, + ac_cv_strings_strcasecmp=no + ) + ]) + + if test x"$ac_cv_strings_strcasecmp" = "xyes"; then + AC_DEFINE(HAVE_STRCASECMP_IN_STRINGS_H) + else + AC_MSG_ERROR([No case-insensitive string comparison function found.]) + fi + fi + + AC_LANG_RESTORE + dnl (end of non-OS/2-only piece) ;; esac -dnl (end of OS/2-only piece) dnl ------------------------------------------------------------------------ dnl Check for headers 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 -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 -dnl defines HAVE_STRINGS_H -AC_CHECK_HEADERS(strings.h) - dnl defines HAVE_STDLIB_H AC_CHECK_HEADERS(stdlib.h) dnl defines HAVE_MALLOC_H @@ -1525,7 +1621,7 @@ case "${host}" in esac if test "$wxUSE_GUI" = "yes"; then - if test "$wxUSE_UNIX" = "yes"; then + if test "$wxUSE_UNIX" = "yes" -a "$wxUSE_PM" != 1; then dnl defines HAVE_X11_XKBLIB_H AC_CHECK_HEADERS(X11/Xlib.h) AC_CHECK_HEADERS([X11/XKBlib.h], [], [], @@ -1554,6 +1650,7 @@ AC_CHECK_SIZEOF(short, 2) AC_CHECK_SIZEOF(void *, 4) AC_CHECK_SIZEOF(int, 4) AC_CHECK_SIZEOF(long, 4) +AC_CHECK_SIZEOF(size_t, 4) case "${host}" in arm-*-linux* ) @@ -1647,6 +1744,8 @@ WX_CPP_EXPLICIT dnl check whether C++ compiler supports C++ casts AC_CXX_CONST_CAST +AC_CXX_REINTERPRET_CAST +AC_CXX_STATIC_CAST dnl check various STL features if test "$wxUSE_STL" = "yes"; then @@ -1690,6 +1789,31 @@ if test "$wxUSE_STL" = "yes"; then AC_DEFINE(HAVE_STD_STRING_COMPARE)], [AC_MSG_RESULT(no)]) + dnl check for hash_map and hash_set headers + AC_CHECK_HEADER([hash_map], + [AC_MSG_CHECKING([for hash_map and hash_set]) + AC_TRY_COMPILE([#include + #include ], + [std::hash_map, std::equal_to > test1; + std::hash_set, std::equal_to > test2;], + [AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_HASH_MAP) + AC_DEFINE(HAVE_STD_HASH_MAP)], + [AC_MSG_RESULT(no)]) + ]) + + AC_CHECK_HEADER([ext/hash_map], + [AC_MSG_CHECKING([for hash_map and hash_set]) + AC_TRY_COMPILE([#include + #include ], + [__gnu_cxx::hash_map, std::equal_to > test1; + __gnu_cxx::hash_set, std::equal_to > test2;], + [AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_EXT_HASH_MAP) + AC_DEFINE(HAVE_GNU_CXX_HASH_MAP)], + [AC_MSG_RESULT(no)]) + ]) + AC_LANG_POP fi @@ -1704,18 +1828,19 @@ dnl headers are included instead of the "fixed" (ANSI-fied) gcc ones. dnl dnl Also try to put all directories which may contain X11R6 before those which dnl may contain X11R5/4 - we want to use R6 on machines which have both! +dnl +dnl In the same vein. Motif 2.1 should be tried before Motif 1.2 for the +dnl systems which have both (AIX 4.x does) SEARCH_INCLUDE="\ /usr/local/include \ \ - /usr/Motif-1.2/include \ /usr/Motif-2.1/include \ - \ + /usr/Motif-1.2/include \ /usr/include/Motif1.2 \ /opt/xpm/include/X11 \ /opt/GBxpm/include/ \ /opt/GBxpm/X11/include/ \ \ - /usr/Motif1.2/include \ /usr/dt/include \ /usr/openwin/include \ \ @@ -1758,6 +1883,8 @@ SEARCH_INCLUDE="\ /usr/include/qt \ /usr/local/include/qt \ \ + /usr/local/arm/3.3.2/include \ + \ /usr/include/windows \ /usr/include/wine \ /usr/local/include/wine \ @@ -1769,7 +1896,13 @@ SEARCH_INCLUDE="\ \ /usr/openwin/share/include" -SEARCH_LIB="`echo "$SEARCH_INCLUDE" | sed s/include/lib/g` " +dnl prepend lib and lib32 for IRIX where the files in these directories should +dnl be found before the ones in lib64 for 32bit compilation -- of course, this +dnl probably/surely breaks 64bit compilation... IMO the only real solution is to +dnl stop using WX_PATH_FIND_LIBRARIES() at all and use AC_CHECK_LIB() instead +dnl +dnl add 64 bit versions for Linux on AMD (this is not perfect but well...) +SEARCH_LIB="/usr/lib /usr/lib32 `echo "$SEARCH_INCLUDE" | sed s/include/lib/g` /usr/lib64 /usr/X11R6/lib64" dnl ------------------------------------------------------------------------ dnl Check for libraries @@ -1841,9 +1974,13 @@ dnl ------------------------------------------------------------------------ dnl Check for regex libraries dnl ------------------------------------------------------------------------ -REGEX_INCLUDE= if test "$wxUSE_REGEX" != "no"; then AC_DEFINE(wxUSE_REGEX) + + if test "$wxUSE_UNICODE" = "yes" -a "$wxUSE_REGEX" = "yes"; then + AC_MSG_WARN([Defaulting to the the builtin regex library for Unicode build.]) + wxUSE_REGEX=builtin + fi if test "$wxUSE_REGEX" = "sys" -o "$wxUSE_REGEX" = "yes" ; then dnl according to Unix 98 specs, regcomp() is in libc but I believe that @@ -1860,19 +1997,16 @@ if test "$wxUSE_REGEX" != "no"; then else dnl we are using the system library wxUSE_REGEX=sys + dnl only the built-in supports advanced REs + AC_DEFINE(WX_NO_REGEX_ADVANCED) fi fi - - if test "$wxUSE_REGEX" = "builtin" ; then - REGEX_INCLUDE="-I\${top_srcdir}/src/regex" - fi fi dnl ------------------------------------------------------------------------ dnl Check for zlib compression library dnl ------------------------------------------------------------------------ -ZLIB_INCLUDE= ZLIB_LINK= if test "$wxUSE_ZLIB" != "no" ; then AC_DEFINE(wxUSE_ZLIB) @@ -1940,17 +2074,12 @@ if test "$wxUSE_ZLIB" != "no" ; then wxUSE_ZLIB=sys fi fi - - if test "$wxUSE_ZLIB" = "builtin" ; then - ZLIB_INCLUDE="-I\${top_srcdir}/src/zlib" - fi fi dnl ------------------------------------------------------------------------ dnl Check for png library dnl ------------------------------------------------------------------------ -PNG_INCLUDE= PNG_LINK= if test "$wxUSE_LIBPNG" != "no" ; then AC_DEFINE(wxUSE_LIBPNG) @@ -1998,7 +2127,7 @@ if test "$wxUSE_LIBPNG" != "no" ; then AC_CHECK_HEADER(png.h) if test "$ac_cv_header_png_h" = "yes"; then - AC_CHECK_LIB(png, png_check_sig, PNG_LINK=" -lpng", , [-lz -lm]) + AC_CHECK_LIB(png, png_check_sig, PNG_LINK=" -lpng -lz", , [-lz -lm]) fi if test "x$PNG_LINK" = "x" ; then @@ -2015,10 +2144,6 @@ if test "$wxUSE_LIBPNG" != "no" ; then fi fi - if test "$wxUSE_LIBPNG" = "builtin" ; then - PNG_INCLUDE="-I\${top_srcdir}/src/png" - fi - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS png" fi @@ -2026,7 +2151,6 @@ dnl ------------------------------------------------------------------------ dnl Check for jpeg library dnl ------------------------------------------------------------------------ -JPEG_INCLUDE= JPEG_LINK= if test "$wxUSE_LIBJPEG" != "no" ; then AC_DEFINE(wxUSE_LIBJPEG) @@ -2075,17 +2199,12 @@ if test "$wxUSE_LIBJPEG" != "no" ; then fi fi fi - - if test "$wxUSE_LIBJPEG" = "builtin" ; then - JPEG_INCLUDE="-I\${top_srcdir}/src/jpeg" - fi fi dnl ------------------------------------------------------------------------ dnl Check for tiff library dnl ------------------------------------------------------------------------ -TIFF_INCLUDE= TIFF_LINK= TIFF_PREREQ_LINKS=-lm if test "$wxUSE_LIBTIFF" != "no" ; then @@ -2121,10 +2240,6 @@ if test "$wxUSE_LIBTIFF" != "no" ; then wxUSE_LIBTIFF=sys fi fi - - if test "$wxUSE_LIBTIFF" = "builtin" ; then - TIFF_INCLUDE="-I\${top_srcdir}/src/tiff" - fi fi dnl ------------------------------------------------------------------------ @@ -2175,6 +2290,25 @@ if test "$wxUSE_EXPAT" != "no"; then fi +dnl ------------------------------------------------------------------------ +dnl Check for libmspack +dnl ------------------------------------------------------------------------ + +if test "$wxUSE_LIBMSPACK" != "no"; then + + AC_CHECK_HEADER([mspack.h], [found_mspack_h=1]) + if test "x$found_mspack_h" = "x1"; then + AC_CHECK_LIB(mspack, mspack_create_chm_decompressor, + MSPACK_LINK=" -lmspack") + fi + if test "x$MSPACK_LINK" = "x" ; then + wxUSE_LIBMSPACK=no + else + AC_DEFINE(wxUSE_LIBMSPACK) + fi +fi + + dnl ---------------------------------------------------------------- dnl search for toolkit (widget sets) dnl ---------------------------------------------------------------- @@ -2235,14 +2369,13 @@ if test "$wxUSE_GUI" = "yes"; then WXGTK12= WXGTK127= WXGTK20= + WXGPE= if test "$wxUSE_MSW" = 1 ; then TOOLKIT=MSW GUIDIST=MSW_DIST dnl -mwindows causes a heap of other default gui libs to be linked in. - dnl FIXME: If cygwin needs this, please push it above, if not, please - dnl remove this comment :-) case "${host}" in *-*-mingw32* ) WXCONFIG_LDFLAGS_GUI="$LDFLAGS -Wl,--subsystem,windows -mwindows" @@ -2321,6 +2454,11 @@ equivalent variable and GTK+ is version 1.2.3 or above. PKG_CHECK_MODULES(PANGOFT2, pangoft2, [ CXXFLAGS="$CXXFLAGS $PANGOFT2_CFLAGS" + # FIXME: GTK_LIBS already has a lot of what this is + # about to add, but we go ahead and just add + # it all again anyway. + # This is not a good way to manage things. And simply + # uniq'ing the list later is hardly better. GUI_TK_LIBRARY="$GUI_TK_LIBRARY $PANGOFT2_LIBS" ], [ @@ -2329,6 +2467,14 @@ equivalent variable and GTK+ is version 1.2.3 or above. ] ) fi + + save_CFLAGS="$CFLAGS" + save_LIBS="$LIBS" + CFLAGS="$CFLAGS $GTK_CFLAGS" + LIBS="$LIBS $GTK_LIBS" + AC_CHECK_FUNCS([pango_font_family_is_monospace]) + CFLAGS="$save_CFLAGS" + LIBS="$save_LIBS" else if test "$wxUSE_UNICODE" = "yes"; then AC_MSG_WARN([Unicode configuration not supported with GTK+ 1.x]) @@ -2351,6 +2497,33 @@ equivalent variable and GTK+ is version 1.2.3 or above. dnl test for XIM support in libgdk AC_CHECK_LIB(gdk, gdk_im_open, AC_DEFINE(HAVE_XIM)) + + + dnl test for external libxpm if we're configured to use it + if test "$wxUSE_GPE" = "yes"; then + AC_MSG_CHECKING(for gpewidget library) + WX_PATH_FIND_LIBRARIES($SEARCH_LIB,gpewidget) + if test "$ac_find_libraries" != "" ; then + WX_LINK_PATH_EXIST($ac_find_libraries,$GUI_TK_LIBRARY) + dnl -lgpewidget must be before all GTK libs and + dnl we guess its path from the prefix + GUI_TK_LIBRARY="-L${prefix}/lib -lgpewidget $GUI_TK_LIBRARY" + WXGPE=1 + AC_MSG_RESULT(found at $ac_find_libraries) + else + AC_MSG_RESULT(not found) + fi + + dnl AC_MSG_CHECKING(for gpe library) + dnl WX_PATH_FIND_LIBRARIES($SEARCH_LIB,gpe) + dnl if test "$ac_find_libraries" != "" ; then + dnl WX_LINK_PATH_EXIST($ac_find_libraries,$GUI_TK_LIBRARY) + dnl GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lgpe" + dnl AC_MSG_RESULT(found at $ac_find_libraries) + dnl else + dnl AC_MSG_RESULT(not found) + dnl fi + fi fi if test "$wxUSE_MGL" = 1; then @@ -2364,13 +2537,16 @@ equivalent variable and GTK+ is version 1.2.3 or above. AC_MSG_CHECKING(for libmgl location) dnl Find MGL library that we want - dnl FIXME_MGL - test for MGL variants for freebsd etc. + dnl FIXME_MGL - test for MGL variants for freebsd etc.; + dnl and for non-x86 versions case "${host}" in *-*-linux* ) + dnl glibc.so, glibc are for older versions of MGL, + dnl x86/a, x86/so are used by >= 5.0 R11 if test "x$wxUSE_SHARED" = xyes ; then - mgl_os_candidates="linux/gcc/glibc.so linux/gcc/glibc" + mgl_os_candidates="linux/gcc/x86/so linux/gcc/x86/a linux/gcc/glibc.so linux/gcc/glibc" else - mgl_os_candidates="linux/gcc/glibc linux/gcc/glibc.so" + mgl_os_candidates="linux/gcc/x86/a linux/gcc/x86/so linux/gcc/glibc linux/gcc/glibc.so" fi ;; *-pc-msdosdjgpp ) @@ -2445,20 +2621,28 @@ equivalent variable and GTK+ is version 1.2.3 or above. TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WXMSW__ -D__WIN95__ -D__WIN32__ -DMWIN -DMICROWIN_NOCONTROLS -DMICROWIN_TODO=1" fi - if test "$wxUSE_X11" = 1; then - dnl use standard macros to check for X headers/libs, this brings support - dnl for the standard configure options --x-includes and --x-libraries + dnl common part of X11 and Motif port checks + if test "$wxUSE_X11" = 1 -o "$wxUSE_MOTIF" = 1; then + dnl use standard macros to check for X headers/libs, this brings + dnl support for the standard configure options --x-includes, + dnl --x-libraries and --no-x AC_PATH_XTRA if test "$no_x" = "yes"; then AC_MSG_ERROR(X11 not found, please use --x-includes and/or --x-libraries options) fi - GUI_TK_LIBRARY="$X_LIBS" - TOOLKIT_INCLUDE="$X_CFLAGS" + dnl for some reason AC_PATH_XTRA seems to add -INONE and -LNONE (and + dnl also sometimes -RNONE) to X_CFLAGS and X_LIBS respectively, filter + dnl this junk out + GUI_TK_LIBRARY=`echo $X_LIBS | sed 's/ -LNONE//' | sed 's/ -RNONE//'` + TOOLKIT_INCLUDE=`echo $X_CFLAGS | sed 's/ -INONE//'` AFMINSTALL=afminstall COMPILED_X_PROGRAM=0 + fi + + if test "$wxUSE_X11" = 1; then if test "$wxUSE_NANOX" = "yes"; then AC_MSG_CHECKING(for MicroWindows/NanoX distribution) if test "x$MICROWIN" = x ; then @@ -2470,44 +2654,6 @@ equivalent variable and GTK+ is version 1.2.3 or above. fi fi - xpm_link= - AC_MSG_CHECKING(for Xpm library) - WX_PATH_FIND_LIBRARIES($SEARCH_LIB,Xpm) - if test "$ac_find_libraries" != "" ; then - WX_LINK_PATH_EXIST($ac_find_libraries,$GUI_TK_LIBRARY) - GUI_TK_LIBRARY="$GUI_TK_LIBRARY$ac_path_to_link" - xpm_link=" -lXpm" - AC_DEFINE(wxHAVE_LIB_XPM) - AC_MSG_RESULT(found at $ac_find_libraries) - else - AC_TRY_COMPILE( - [ - #include - ], - [ - int version; - version = XpmLibraryVersion(); - ], - [ - xpm_link=" -lXpm" - AC_DEFINE(wxHAVE_LIB_XPM) - AC_MSG_RESULT(found in default search path) - COMPILED_X_PROGRAM=0 - ], - [ - AC_MSG_RESULT(no) - AC_MSG_WARN(library will be compiled without support for images in XPM format) - ] - ) - fi - - AC_CHECK_LIB([Xext], [XShapeQueryExtension], - [ - GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXext" - wxHAVE_XEXT_LIB=1 - ], - [], [$GUI_TK_LIBRARY -lX11]) - if test "$wxUSE_UNICODE" = "yes"; then PKG_CHECK_MODULES(PANGOX, pangox, [ @@ -2537,6 +2683,13 @@ equivalent variable and GTK+ is version 1.2.3 or above. AC_MSG_WARN([pangoxft library not found, library will be compiled without anti-aliasing support]) ] ) + save_CFLAGS="$CFLAGS" + save_LIBS="$LIBS" + CFLAGS="$CFLAGS $PANGOX_CFLAGS" + LIBS="$LIBS $PANGOX_LIBS" + AC_CHECK_FUNCS([pango_font_family_is_monospace]) + CFLAGS="$save_CFLAGS" + LIBS="$save_LIBS" fi wxUSE_UNIVERSAL="yes" @@ -2546,30 +2699,14 @@ equivalent variable and GTK+ is version 1.2.3 or above. TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__NANOX__ -DMWPIXEL_FORMAT=MWPF_TRUECOLOR0888 -DHAVE_FILEIO -DHAVE_BMP_SUPPORT=1 -DHAVE_GIF_SUPPORT=1 -DHAVE_PNM_SUPPORT=1 -DHAVE_XPM_SUPPORT=1 -DUNIX=1 -DUSE_EXPOSURE -DSCREEN_HEIGHT=480 -DSCREEN_WIDTH=640 -DSCREEN_DEPTH=4 -DX11=1" GUI_TK_LIBRARY="$GUI_TK_LIBRARY \$(MICROWIN)/src/lib/libnano-X.a" else - GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lX11$xpm_link" + GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lX11" fi - TOOLKIT_VPATH="\${top_srcdir}/src/x11" TOOLKIT=X11 GUIDIST=X11_DIST fi if test "$wxUSE_MOTIF" = 1; then - dnl use standard macros to check for X headers/libs, this brings support - dnl for the standard configure options --x-includes and --x-libraries - AC_PATH_XTRA - - if test "$no_x" = "yes"; then - AC_MSG_ERROR(X11 not found, please use --x-includes and/or --x-libraries options) - fi - - dnl for some reason AC_PATH_XTRA seems to add -INONE and -LNONE to - dnl X_LIBS and X_CFLAGS respectively -- what for?? - GUI_TK_LIBRARY=`echo $X_LIBS | sed 's/ -LNONE//'` - TOOLKIT_INCLUDE=`echo $X_CFLAGS | sed 's/ -INONE//'` - AFMINSTALL=afminstall - COMPILED_X_PROGRAM=0 - AC_MSG_CHECKING(for Motif/Lesstif headers) WX_PATH_FIND_INCLUDES($SEARCH_INCLUDE, Xm/Xm.h) if test "$ac_find_includes" != "" ; then @@ -2633,53 +2770,16 @@ equivalent variable and GTK+ is version 1.2.3 or above. fi fi - xpm_link= - AC_MSG_CHECKING(for Xpm library) - WX_PATH_FIND_LIBRARIES($SEARCH_LIB,Xpm) - if test "$ac_find_libraries" != "" ; then - WX_LINK_PATH_EXIST($ac_find_libraries,$GUI_TK_LIBRARY) - GUI_TK_LIBRARY="$GUI_TK_LIBRARY$ac_path_to_link" - - xpm_link=" -lXpm" - AC_DEFINE(wxHAVE_LIB_XPM) - AC_MSG_RESULT(found at $ac_find_libraries) - else - save_CFLAGS=$CFLAGS - CFLAGS="$CFLAGS $TOOLKIT_INCLUDE" - - AC_TRY_COMPILE( - [ - #include - ], - [ - int version; - version = XpmLibraryVersion(); - ], - [ - xpm_link=" -lXpm" - AC_DEFINE(wxHAVE_LIB_XPM) - AC_MSG_RESULT(found in default search path) - COMPILED_X_PROGRAM=0 - ], - [ - AC_MSG_RESULT(no) - AC_MSG_WARN(library will be compiled without support for images in XPM format) - ] - ) - - CFLAGS=$save_CFLAGS - fi - AC_MSG_CHECKING([if we need -lXp and/or -lSM -lICE]) libp_link="" libsm_ice_link="" libs_found=0 for libp in "" " -lXp"; do if test "$libs_found" = "0"; then - for libsm_ice in " -lSM -lICE"; do + for libsm_ice in "" " -lSM -lICE"; do if test "$libs_found" = "0"; then save_LIBS="$LIBS" - LIBS="$GUI_TK_LIBRARY -lXm${xpm_link} ${libp} -lXmu -lXext -lXt${libsm_ice} -lX11" + LIBS="$GUI_TK_LIBRARY -lXm ${libp} -lXmu -lXext -lXt${libsm_ice} -lX11" save_CFLAGS=$CFLAGS CFLAGS="$CFLAGS $TOOLKIT_INCLUDE" @@ -2736,42 +2836,102 @@ equivalent variable and GTK+ is version 1.2.3 or above. ]) CFLAGS=$save_CFLAGS - GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXm$xpm_link${libp_link} -lXmu -lXext -lXt${libsm_ice_link} -lX11" - TOOLKIT_VPATH="\${top_srcdir}/src/motif${PATH_IFS}\${top_srcdir}/src/motif/xmcombo${PATH_IFS}\${top_srcdir}/src/x11" + GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXm${libp_link} -lXmu -lXext -lXt${libsm_ice_link} -lX11" 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" + dnl more tests common to X11 and Motif: + if test "$wxUSE_X11" = 1 -o "$wxUSE_MOTIF" = 1; then + dnl test for external libxpm if we're configured to use it + if test "$wxUSE_LIBXPM" = "sys"; then + AC_MSG_CHECKING(for Xpm library) + WX_PATH_FIND_LIBRARIES($SEARCH_LIB,Xpm) + if test "$ac_find_libraries" != "" ; then + WX_LINK_PATH_EXIST($ac_find_libraries,$GUI_TK_LIBRARY) + GUI_TK_LIBRARY="$GUI_TK_LIBRARY$ac_path_to_link" + AC_MSG_RESULT(found at $ac_find_libraries) - AC_MSG_CHECKING([for X11/extensions/shape.h]) - AC_TRY_COMPILE([ - #include - #include - ], - [ - int dummy1, dummy2; - XShapeQueryExtension((Display*)NULL, - (int*)NULL, (int*)NULL); - ], - [ - AC_DEFINE(HAVE_XSHAPE) - AC_MSG_RESULT([found]) - ], - [ - AC_MSG_RESULT([not found]) - ]) - CFLAGS="$save_CFLAGS" + AC_CACHE_CHECK([for X11/xpm.h], + wx_cv_x11_xpm_h, + [ + save_CFLAGS=$CFLAGS + CFLAGS="$CFLAGS $TOOLKIT_INCLUDE" + + AC_TRY_COMPILE( + [ + #include + ], + [ + int version; + version = XpmLibraryVersion(); + ], + wx_cv_x11_xpm_h=yes, + wx_cv_x11_xpm_h=no + ) + + CFLAGS=$save_CFLAGS + ] + ) + + if test $wx_cv_x11_xpm_h = "yes"; then + GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXpm" + AC_DEFINE(wxHAVE_LIB_XPM) + else + AC_MSG_WARN([built-in less efficient XPM decoder will be used]) + fi + fi + + fi + + dnl XShapeQueryExtension checks: first the library, then prototype + AC_CHECK_LIB([Xext], [XShapeQueryExtension], + [ + GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXext" + wxHAVE_XEXT_LIB=1 + ], + [], [$GUI_TK_LIBRARY -lX11]) + + if test "$wxHAVE_XEXT_LIB" = 1; then + save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $TOOLKIT_INCLUDE" + + AC_MSG_CHECKING([for X11/extensions/shape.h]) + AC_TRY_COMPILE([ + #include + #include + ], + [ + int dummy1, dummy2; + XShapeQueryExtension((Display*)NULL, + (int*)NULL, (int*)NULL); + ], + [ + AC_DEFINE(HAVE_XSHAPE) + AC_MSG_RESULT([found]) + ], + [ + AC_MSG_RESULT([not found]) + ]) + CFLAGS="$save_CFLAGS" + + fi fi if test "$wxUSE_MAC" = 1; then - CPPFLAGS="$CPPFLAGS -fpascal-strings -I\${top_srcdir}/src/mac/morefilex -I/Developer/Headers/FlatCarbon" + AC_MSG_CHECKING([for compiler syntax to enable Pascal strings]) + if test "$GCC" = yes; then + AC_MSG_RESULT([gcc]) + CPPFLAGS_PASCAL="-fpascal-strings" + elif test "`echo $CXX | sed -e 's@.*/@@'`" = "xlC"; then + AC_MSG_RESULT([xlc]) + CPPFLAGS_PASCAL="-qmacpstr" + else + AC_MSG_RESULT([none]) + fi + + CPPFLAGS="$CPPFLAGS $CPPFLAGS_PASCAL -I\${top_srcdir}/src/mac/carbon/morefilex -I/Developer/Headers/FlatCarbon" - TOOLKIT_VPATH="\${top_srcdir}/src/mac${PATH_IFS}\${top_srcdir}/src/mac/morefilex" TOOLKIT=MAC dnl we can't call this MAC_DIST or autoconf thinks its a macro GUIDIST=MACX_DIST @@ -2781,16 +2941,33 @@ equivalent variable and GTK+ is version 1.2.3 or above. 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 - AC_MSG_WARN([OS/2 threads are not yet supported... disabled]) - wxUSE_THREADS="no" + GUIDIST=PM_DIST + AC_CACHE_CHECK([for type SPBCDATA], + wx_cv_spbcdata, + [ + AC_TRY_COMPILE( + [ + #define INCL_PM + #include + ], + [ + SPBCDATA test; + ], + wx_cv_spbcdata=yes, + wx_cv_spbcdata=no + ) + ] + ) + + if test $wx_cv_spbcdata = "yes"; then + AC_DEFINE(HAVE_SPBCDATA) + fi fi dnl the name of the directory where the files for this toolkit live @@ -2800,57 +2977,16 @@ equivalent variable and GTK+ is version 1.2.3 or above. TOOLKIT_DIR=`echo ${TOOLKIT} | tr "[[A-Z]]" "[[a-z]]"` fi - dnl misc other files depending on the port - PORT_FILES="\${top_srcdir}/src/\$(TOOLKITDIR)/files.lst" - if test "$wxUSE_UNIVERSAL" = "yes"; then - ALL_OBJECTS="\$(GUI_LOWLEVEL_OBJS) \${UNIVOBJS}" - - dnl ALL_SOURCES and ALL_HEADERS shouldn't include really all sources - dnl and headers as some/most are not needed for wxUniv but I don't - dnl have time to add GUI_LOWLEVEL_SOURCES/HEADERS stuff now (TODO!) - ALL_SOURCES="\$(ALL_SOURCES) \${UNIV_SOURCES}" - ALL_HEADERS="\$(ALL_HEADERS) \${UNIV_HEADERS}" - - PORT_FILES="${PORT_FILES} \${top_srcdir}/src/univ/files.lst" - if test "$wxUSE_X11" = 1; then - TOOLKIT_VPATH="\${top_srcdir}/src/${TOOLKIT_DIR}${PATH_IFS}\${top_srcdir}/src/univ${PATH_IFS}\${top_srcdir}/src/univ/themes" - else - TOOLKIT_VPATH="\${top_srcdir}/src/univ${PATH_IFS}\${top_srcdir}/src/univ/themes${PATH_IFS}\${top_srcdir}/src/${TOOLKIT_DIR}" - fi TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WXUNIVERSAL__" WIDGET_SET=univ - else - ALL_OBJECTS="\$(GUIOBJS)" - ALL_SOURCES="\$(ALL_SOURCES)" - ALL_HEADERS="\$(ALL_HEADERS)" fi - ALL_OBJECTS="${ALL_OBJECTS} \$(COMMONOBJS) \$(GENERICOBJS)" - - if test "$TOOLKIT" != "MSW" -a "$USE_DOS" != 1; then - ALL_OBJECTS="${ALL_OBJECTS} \$(UNIXOBJS)" - fi - - if test "$wxUSE_HTML" = "yes"; then - ALL_OBJECTS="${ALL_OBJECTS} \$(HTMLOBJS)" - fi - - if test "$wxUSE_LIBJPEG" = "builtin" ; then - ALL_OBJECTS="${ALL_OBJECTS} \$(JPEGOBJS)" - fi - if test "$wxUSE_LIBTIFF" = "builtin" ; then - ALL_OBJECTS="${ALL_OBJECTS} \$(TIFFOBJS)" - fi - if test "$wxUSE_LIBPNG" = "builtin" ; then - ALL_OBJECTS="${ALL_OBJECTS} \$(PNGOBJS)" - fi - - dnl distribute samples/demos/utils with GUI versions - GUIDIST="${GUIDIST} SAMPLES_DIST DEMOS_DIST UTILS_DIST MISC_DIST" - DISTDIR="wx\$(TOOLKIT)" -else - USE_GUI=0 + dnl distribute samples/demos/utils with GUI versions + GUIDIST="${GUIDIST} SAMPLES_DIST DEMOS_DIST UTILS_DIST MISC_DIST" + DISTDIR="wx\$(TOOLKIT)" +else + USE_GUI=0 dnl this doesn't quite work right for wxBase, but the places dnl where it is wrong aren't fatal (yet) though. @@ -2858,22 +2994,11 @@ else dnl the sources, their dependenices and the headers if test "$USE_WIN32" = 1 ; then - ALL_OBJECTS="\${BASE_OBJS} \${BASE_MSW_OBJS}" - TOOLKIT_VPATH="\${top_srcdir}/src/msw" - dnl yes, the toolkit for wxBase on win32 is actually MSW dnl wxBase on unix does not need a 'TOOLKIT' defined. TOOLKIT="MSW" - else - ALL_OBJECTS="\${BASE_OBJS} \${BASE_UNIX_OBJS}" - TOOLKIT_VPATH="\${top_srcdir}/src/unix" fi - ALL_SOURCES="\$(ALL_SOURCES)" - ALL_HEADERS="\$(ALL_HEADERS)" - - PORT_FILES="\${top_srcdir}/src/files.lst" - dnl distribute only wxBase sources/headers GUIDIST="BASE_DIST" DISTDIR="wxBase" @@ -2900,11 +3025,11 @@ if test "$TOOLKIT" != "MSW" ; then AC_CHECK_HEADER([sql.h], [found_sql_h=1]) if test "x$found_sql_h" = "x1" ; then - AC_CHECK_LIB(SQLAllocEnv, iodbc, ODBC_LINK=" -liodbc", + AC_CHECK_LIB(iodbc, SQLAllocEnv, ODBC_LINK=" -liodbc", [ - AC_CHECK_LIB(SQLAllocEnv, unixodbc, ODBC_LINK=" -lunixodbc", + AC_CHECK_LIB(unixodbc, SQLAllocEnv, ODBC_LINK=" -lunixodbc", [ - AC_CHECK_LIB(SQLAllocEnv, odbc, ODBC_LINK=" -lodbc") + AC_CHECK_LIB(odbc, SQLAllocEnv, ODBC_LINK=" -lodbc") ]) ]) fi @@ -2932,11 +3057,58 @@ if test "$TOOLKIT" != "MSW" ; then fi fi -if test "$wxUSE_REGEX" = "builtin" ; then - ALL_OBJECTS="${ALL_OBJECTS} \$(REGEXOBJS)" -fi -if test "$wxUSE_ZLIB" = "builtin" ; then - ALL_OBJECTS="${ALL_OBJECTS} \$(ZLIBOBJS)" + +dnl --------------------------------------------------------------------------- +dnl wxDisplay Sanity checks +dnl --------------------------------------------------------------------------- + +if test "$wxUSE_DISPLAY" = "yes"; then +dnl --------------------------------------------------------------------------- +dnl Xinerama (for unix ) - Brian Victor +dnl --------------------------------------------------------------------------- + if test "$wxUSE_UNIX" = "yes" -a "$wxUSE_MAC" != 1 -a "$wxUSE_COCOA" != 1; then + AC_MSG_CHECKING([for Xinerama]) + WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],Xinerama) + if test "$ac_find_libraries" != "" ; then + WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS]) + if test "$ac_path_to_link" != " -L/usr/lib" ; then + LDFLAGS="$LDFLAGS $ac_path_to_link" + fi + GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXinerama" + AC_MSG_RESULT([yes]) + + AC_MSG_CHECKING([for Xxf86vm extension]) + WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],Xxf86vm) + if test "$ac_find_libraries" != "" ; then + AC_MSG_RESULT([yes]) + AC_CHECK_HEADERS([X11/extensions/xf86vmode.h], + [ + GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXxf86vm" + ], + [], + [ + #if HAVE_X11_XLIB_H + #include + #endif + ]) + else + AC_MSG_RESULT([no]) + fi + + else + AC_MSG_RESULT([no]) + AC_MSG_WARN([Xinerama not found; disabling wxDisplay]) + wxUSE_DISPLAY="no" + fi + elif test "$wxUSE_MSW" = 1; then +dnl --------------------------------------------------------------------------- +dnl DirectDraw / Multimon for MSW +dnl --------------------------------------------------------------------------- + AC_CHECK_HEADERS([multimon.h ddraw.h], [], [ + wxUSE_DISPLAY="no" + AC_MSG_WARN([ddraw.h or multimon.h not found; disabling wxDisplay]) + ] ) + fi fi dnl --------------------------------------------------------------------------- @@ -3021,109 +3193,17 @@ if test "$wxUSE_OPENGL" = "yes"; then fi fi -if test -z "$TOOLKIT_VPATH" ; then - TOOLKIT_VPATH="\${top_srcdir}/src/${TOOLKIT_DIR}" -fi dnl the symbol which allows conditional compilation for the given toolkit if test -n "$TOOLKIT" ; then TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WX${TOOLKIT}__" fi -UNICODE=0 -lib_unicode_suffix= -if test "$wxUSE_UNICODE" = "yes"; then - lib_unicode_suffix=u - UNICODE=1 -fi - -lib_debug_suffix= -DEBUG_FLAG=0 -if test "$wxUSE_DEBUG_FLAG" = "yes"; then - lib_debug_suffix=d - DEBUG_FLAG=1 -fi - -DEBUG_INFO=0 -if test "$wxUSE_DEBUG_INFO" = "yes"; then - DEBUG_INFO=1 -fi - -WX_VERSION_TAG=`echo WX${lib_unicode_suffix}${lib_debug_suffix}_${WX_RELEASE} | tr "[[a-z]]" "[[A-Z]]"` - -TOOLCHAIN_NAME="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}-${WX_RELEASE}" -TOOLCHAIN_NAME_GL="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}_gl-${WX_RELEASE}" - -if test "$cross_compiling" = "yes"; then - TOOLCHAIN_NAME="${TOOLCHAIN_NAME}-${host_alias}" - TOOLCHAIN_NAME_GL="${TOOLCHAIN_NAME_GL}-${host_alias}" - HOST_SUFFIX="-${host_alias}" -fi - -dnl library link name -WX_LIBRARY="wx_${TOOLCHAIN_NAME}" -WX_LIBRARY_GL="wx_${TOOLCHAIN_NAME_GL}" -WX_LIBRARY_BASENAME_NOGUI="wx_base${WXBASEPORT}${lib_unicode_suffix}${lib_debug_suffix}" -WX_LIBRARY_BASENAME_GUI="wx_${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}" - -dnl the name of the shared library -WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}.${SO_SUFFIX}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}" -WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}.${WX_CURRENT}.${WX_REVISION}.${WX_AGE}" - -dnl the name of the links to the shared library -WX_LIBRARY_LINK1="lib${WX_LIBRARY}.${SO_SUFFIX}.${WX_CURRENT}" -WX_LIBRARY_LINK2="lib${WX_LIBRARY}.${SO_SUFFIX}" -WX_LIBRARY_LINK1_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}.${WX_CURRENT}" -WX_LIBRARY_LINK2_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}" - -case "${host}" in - *-*-cygwin* | *-*-mingw32* ) - WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}.${SO_SUFFIX}" - WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY_GL}.${SO_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_LINK1="lib${WX_LIBRARY}.${WX_CURRENT}.${SO_SUFFIX}" - WX_LIBRARY_LINK2="lib${WX_LIBRARY}.${SO_SUFFIX}" - WX_LIBRARY_LINK1_GL="lib${WX_LIBRARY_GL}.${WX_CURRENT}.${SO_SUFFIX}" - WX_LIBRARY_LINK2_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}" - - dnl Under Mac OS X, we should build real frameworks instead of simple - dnl dynamic shared libraries (in order to embed the resources) - if test "$wxUSE_MAC" = 1; then - dnl base name of the resource file for wxMac must be the same - dnl as library installation base name (-install_name) - WX_RESOURCES_MACOSX_ASCII="lib${WX_LIBRARY}.${WX_CURRENT}.r" - WX_RESOURCES_MACOSX_DATA="lib${WX_LIBRARY}.${WX_CURRENT}.rsrc" - 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 case "${host}" in - *-pc-os2_emx | *-pc-os2-emx | \ *-pc-msdosdjgpp ) dnl only static for now wxUSE_SHARED=no @@ -3132,9 +3212,7 @@ if test "$wxUSE_SHARED" = "yes"; then esac fi -SHARED=0 if test "$wxUSE_SHARED" = "yes"; then - SHARED=1 dnl use versioned symbols if available on the platform WX_VERSIONED_SYMBOLS([\$(top_builddir)version-script]) @@ -3176,8 +3254,6 @@ if test "$wxUSE_SHARED" = "yes"; then ]) LDFLAGS="$saveLdflags" else - SHARED_LD="${CXX} -G -o" - PIC_FLAG="-KPIC" SAMPLES_RPATH_FLAG="-R\$(top_builddir)lib" fi ;; @@ -3196,83 +3272,109 @@ EOF chmod +x change-install-names ;; + *-*-cygwin* | *-*-mingw32* ) + TOOLCHAIN_DLL_DEFS="${TOOLCHAIN_DLL_DEFS} -DWXUSINGDLL=1" + ;; + esac - - dnl set target to shared if not explicitly chose static before - if test "x$WX_TARGET_LIBRARY" = "x"; then - WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_SHARED}" - WX_TARGET_LIBRARY_GL="${WX_LIBRARY_NAME_SHARED_GL}" - fi - - 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. if test "$wxUSE_SHARED" = "no"; then + config_linkage_component="-static" + SHARED=0 +else + SHARED=1 +fi - dnl give static wxBase and wxMSW build a working install target - if test "$wxUSE_GUI" = "no" -o "$USE_WIN32" = 1 ; then - dnl we're here because WX_ALL_INSTALLED is empty, but play safe anyway - WX_ALL_INSTALLED="${WX_ALL_INSTALLED} preinstall" - fi - if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1 ; then - WX_ALL_INSTALLED="${WX_ALL_INSTALLED} preinstall" - fi +UNICODE=0 +lib_unicode_suffix= +WX_CHARTYPE="ansi" +if test "$wxUSE_UNICODE" = "yes"; then + lib_unicode_suffix=u + WX_CHARTYPE="unicode" + UNICODE=1 +fi - if test "$wxUSE_OPENGL" = "yes"; then - WX_ALL_INSTALLED="${WX_ALL_INSTALLED} preinstall_gl" - WX_ALL="\$(build_libdir)/${WX_LIBRARY_NAME_STATIC} \$(build_libdir)/${WX_LIBRARY_NAME_STATIC_GL}" - else - WX_ALL="\$(build_libdir)/${WX_LIBRARY_NAME_STATIC}" - fi +lib_debug_suffix= +WX_DEBUGTYPE="release" +DEBUG_FLAG=0 +if test "$wxUSE_DEBUG_FLAG" = "yes"; then + lib_debug_suffix=d + WX_DEBUGTYPE="debug" + DEBUG_FLAG=1 +fi + +WX_FLAVOUR=${WX_FLAVOUR:+-$WX_FLAVOUR} +WX_LIB_FLAVOUR=`echo $WX_FLAVOUR | tr '-' '_'` + +DEBUG_INFO=0 +if test "$wxUSE_DEBUG_INFO" = "yes"; then + DEBUG_INFO=1 +fi - WX_TARGET_LIBRARY="${WX_LIBRARY_NAME_STATIC}" - WX_TARGET_LIBRARY_GL="${WX_LIBRARY_NAME_STATIC_GL}" +WX_VERSION_TAG=`echo WX${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}_${WX_RELEASE} | tr "[[a-z]]" "[[A-Z]]"` - WX_TARGET_LIBRARY_TYPE="a" - INSTALL_LIBRARY='$(INSTALL_DATA)' +TOOLCHAIN_NAME="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}-${WX_RELEASE}" - dnl wx-config should assume the --static flag by default if we don't have - dnl any shared libs anyhow - STATIC_FLAG="yes" -else - STATIC_FLAG="no" +TOOLCHAIN_FULLNAME="${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}-${WX_CHARTYPE}-${WX_DEBUGTYPE}${config_linkage_component}-${WX_RELEASE}${WX_FLAVOUR}" + +if test "$cross_compiling" = "yes"; then + HOST_SUFFIX="-$host_alias" + TOOLCHAIN_NAME="$TOOLCHAIN_NAME$HOST_SUFFIX" + TOOLCHAIN_FULLNAME="${host_alias}-$TOOLCHAIN_FULLNAME" fi -dnl default value is to (silently) do nothing in the makefile -MACRESCOMP="@#" -MACSETFILE="@#" -MACRESWXCONFIG="#" -if test "$wxUSE_MAC" = 1; then +dnl library link name +dnl These just save us from exporting lib_{unicode,debug,flavour}_suffix. +dnl If we ever need to do that, we won't need to keep these. +WX_LIBRARY_BASENAME_NOGUI="wx_base${WXBASEPORT}${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}" +WX_LIBRARY_BASENAME_GUI="wx_${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}" + + + +if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1; then + dnl base name of the resource file for wxMac must be the same + dnl as library installation base name (-install_name) + WX_RESOURCES_MACOSX_ASCII="libwx_${TOOLCHAIN_NAME}.${WX_CURRENT}.r" + WX_RESOURCES_MACOSX_DATA="libwx_${TOOLCHAIN_NAME}.${WX_CURRENT}.rsrc" + dnl add the resources target for wxMac 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) AC_CHECK_PROG(DEREZ, DeRez, DeRez, /Developer/Tools/DeRez) AC_CHECK_PROG(SETFILE, SetFile, SetFile, /Developer/Tools/SetFile) - MACOSX_BUNDLE="bundle" + + MACSETFILE="\$(SETFILE)" + dnl resources are bundled both with shared library and applications 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 \${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" + if test "$wxUSE_MAC" = 1; then + MACRESCOMP="\$(RESCOMP) -d __DARWIN__ -t APPL Carbon.r ${LIBWXMACRES} -o" + + dnl this command is used to implement `wx-config --rezflags` and it is + dnl eval'd there so escape any metacharacters inside + MACRESWXCONFIG="${RESCOMP} -d __DARWIN__ -t APPL Carbon.r \\\${exec_prefix}/lib/${WX_RESOURCES_MACOSX_ASCII} -o" + else + MACRESCOMP="echo -n | \$(RESCOMP) -d __DARWIN__ -t APPL ${LIBWXMACRES} -o" + MACRESWXCONFIG="echo -n \\\| ${RESCOMP} -d __DARWIN__ -t APPL \\\${exec_prefix}/lib/${WX_RESOURCES_MACOSX_ASCII} -o" + fi else + dnl default value is to (silently) do nothing in the makefile + MACSETFILE="@#" + MACRESWXCONFIG="#" + + dnl confusingly, wxOS2 also uses MACRESCOMP in its post-link step if test "$wxUSE_PM" = 1; then MACRESCOMP="emxbind -ep" + else + MACRESCOMP="@#" fi fi + dnl --------------------------------------------------------------------------- dnl Checks for typedefs dnl --------------------------------------------------------------------------- @@ -3395,6 +3497,11 @@ if test "$wx_cv_sizeof_wchar_t" != "0"; then AC_DEFINE(HAVE_WCSLEN) fi + dnl HP-UX aCC needs this define to find mbstrtowcs() &c + if test "$USE_HPUX" = 1 -a "x$GCC" != "xyes"; then + CPPFLAGS="$CPPFLAGS -D_INCLUDE__STDC_A1_SOURCE " + fi + dnl try to use wcsrtombs instead of wcstombs which is buggy in old GNU dnl libc versions if possible AC_CHECK_FUNCS(wcsrtombs) @@ -3413,7 +3520,7 @@ dnl dnl the trouble here is that on some systems (notable HP-UX) this function is dnl present in libc but not in the system headers and so AC_CHECK_FUNCS (which, dnl stupidly, provides a dummy function declaration inside its extension) -dnl succeeds, even with C++ compiler, but the compilation of wxWindows fails +dnl succeeds, even with C++ compiler, but the compilation of wxWidgets fails dnl dnl so we first check if the function is in the library AC_CHECK_FUNCS(vsnprintf) @@ -3445,7 +3552,7 @@ fi if test "$wxUSE_UNICODE" = yes; then dnl also look if we have wide char IO functions - AC_CHECK_FUNCS(fputwc wprintf vswprintf) + AC_CHECK_FUNCS(wputc wputchar putws fputws wprintf vswprintf) dnl MinGW has a vswprintf with a different prototype, and dnl a _vsnwprintf with the correct prototype, but AC_CHECK_FUNCS @@ -3736,6 +3843,19 @@ AC_CHECK_LIB(esd, esd_close, [ ]) AC_SUBST(EXTRALIBS_ESD) +dnl check for known CD-ROM interface +AC_MSG_CHECKING([for known CD-ROM interface]) +AC_TRY_COMPILE([#ifdef __linux__ + #include + #else + /* For Solaris */ + #include + #endif + ], + [struct cdrom_tocentry entry, old_entry;], + [AC_MSG_RESULT([yes]) + AC_DEFINE(HAVE_KNOWN_CDROM_INTERFACE)], + [AC_MSG_RESULT([no])]) dnl =========================================================================== dnl Now we have all the info we need - use it! @@ -3745,12 +3865,13 @@ dnl flush the cache AC_CACHE_SAVE dnl --------------------------------------------------------------------------- -dnl thread support for Unix (for Win32 see past the next matching "else") +dnl thread support for Unix (for Win32 and OS/2 see past +dnl the next matching "else") dnl --------------------------------------------------------------------------- dnl under MSW (except mingw32) we always have thread support CPP_MT_FLAG= -if test "$TOOLKIT" != "MSW"; then +if test "$TOOLKIT" != "MSW" -a "$USE_OS2" != 1; then dnl the code below: dnl @@ -3909,6 +4030,10 @@ if test "$TOOLKIT" != "MSW"; then if test "x$GCC" != "xyes"; then dnl see http://docs.hp.com/hpux/onlinedocs/2213/threads.htm flag="$flag -D_RWSTD_MULTI_THREAD" + + dnl we also need -lcma for user threads (-lpthread is for + dnl kernel threads only) according to Ian Brown + LIBS="$LIBS -lcma" fi ;; *solaris* | alpha*-osf*) @@ -3977,22 +4102,26 @@ if test "$TOOLKIT" != "MSW"; then 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_cleanup_push(NULL, NULL); - pthread_cleanup_pop(0); - ], [ - wx_cv_func_pthread_cleanup_push=yes - ], [ - wx_cv_func_pthread_cleanup_push=no - ]) - ]) - - if test "$wx_cv_func_pthread_cleanup_push" = "yes"; then - AC_DEFINE(HAVE_THREAD_CLEANUP_FUNCTIONS) - fi + dnl we don't use pthread_cleanup_push/pop() any more in the code, but I + dnl the code here for now in case we need it again soon; otherwise it + dnl should be removed in a couple of months (VZ in Sep 2003) + dnl + dnl AC_CACHE_CHECK([for pthread_cleanup_push/pop], wx_cv_func_pthread_cleanup_push, + dnl [ + dnl AC_TRY_COMPILE([#include ], + dnl [ + dnl pthread_cleanup_push(NULL, NULL); + dnl pthread_cleanup_pop(0); + dnl ], [ + dnl wx_cv_func_pthread_cleanup_push=yes + dnl ], [ + dnl wx_cv_func_pthread_cleanup_push=no + dnl ]) + dnl ]) + dnl + dnl if test "$wx_cv_func_pthread_cleanup_push" = "yes"; then + dnl AC_DEFINE(HAVE_THREAD_CLEANUP_FUNCTIONS) + dnl fi dnl mutexattr_t initialization is done in quite different ways on different dnl platforms, so check for a few things: @@ -4071,6 +4200,11 @@ else CFLAGS="$CFLAGS_OLD" fi ;; + *-pc-os2*emx ) + CFLAGS="$CFLAGS -Zmt -D__ST_MT_ERRNO__" + CXXFLAGS="$CXXFLAGS -Zmt -D__ST_MT_ERRNO__" + LDFLAGS="$LDFLAGS -Zmt" + ;; esac fi fi @@ -4106,6 +4240,10 @@ if test "$WXGTK127" = 1 ; then AC_DEFINE_UNQUOTED(__WXGTK127__,$WXGTK127) fi +if test "$WXGPE" = 1 ; then + AC_DEFINE_UNQUOTED(__WXGPE__,$WXGPE) +fi + WXDEBUG= if test "$wxUSE_DEBUG_INFO" = "yes" ; then @@ -4243,6 +4381,106 @@ if test "$wxUSE_UNIX" = "yes"; then AC_DEFINE(wxUSE_UNIX) fi +dnl ------------------------------------------------------------------------ +dnl DLL support +dnl ------------------------------------------------------------------------ + +dnl under MSW we always have LoadLibrary/GetProcAddress +if test "$TOOLKIT" != "MSW" -a "$USE_OS2" != 1; then + + HAVE_DL_FUNCS=0 + HAVE_SHL_FUNCS=0 + if test "$wxUSE_DYNAMIC_LOADER" = "yes" -o "$wxUSE_DYNLIB_CLASS" = "yes" ; then + if test "$USE_DARWIN" = 1; then + dnl dlopen/dlerror is implemented in dynlib.cpp for Darwin/Mac OS X + HAVE_DL_FUNCS=1 + else + dnl the test is a bit complicated because we check for dlopen() both with + dnl and without -ldl and we also try to find shl_load() if there is no + dnl dlopen() on this system + AC_CHECK_FUNCS(dlopen, + [ + AC_DEFINE(HAVE_DLOPEN) + HAVE_DL_FUNCS=1 + ], + [ + AC_CHECK_LIB(dl, dlopen, + [ + AC_DEFINE(HAVE_DLOPEN) + HAVE_DL_FUNCS=1 + DL_LINK=" -ldl$DL_LINK" + ], + [ + AC_CHECK_FUNCS(shl_load, + [ + AC_DEFINE(HAVE_SHL_LOAD) + HAVE_SHL_FUNCS=1 + ], + [ + AC_CHECK_LIB(shl_load, dld, + [ + HAVE_SHL_FUNCS=1 + DL_LINK=" -ldld$DL_LINK" + ]) + ]) + ]) + ]) + + dnl check also for dlerror() + if test "$HAVE_DL_FUNCS" = 1; then + AC_CHECK_FUNCS(dlerror, + AC_DEFINE(HAVE_DLERROR), + [ + AC_CHECK_LIB(dl, dlerror, AC_DEFINE(HAVE_DLERROR)) + ] + ) + fi + fi + + if test "$HAVE_DL_FUNCS" = 0; then + if test "$HAVE_SHL_FUNCS" = 0; then + if test "$USE_UNIX" = 1; then + AC_MSG_WARN([Missing dynamic loading support, several features will be disabled]) + wxUSE_DYNAMIC_LOADER=no + wxUSE_DYNLIB_CLASS=no + else + AC_MSG_WARN([Assuming wxLibrary class works on this platform]) + fi + fi + fi + fi +fi + +if test "$wxUSE_DYNAMIC_LOADER" = "yes" ; then + AC_DEFINE(wxUSE_DYNAMIC_LOADER) +fi +if test "$wxUSE_DYNLIB_CLASS" = "yes" ; then + AC_DEFINE(wxUSE_DYNLIB_CLASS) +fi + + +dnl --------------------------------------------------------------------------- +dnl Verify consistency of plugins/monolithic/shared settings: +dnl --------------------------------------------------------------------------- + +if test "$wxUSE_PLUGINS" = "yes" ; then + if test "$wxUSE_SHARED" = "no" ; then + AC_MSG_WARN([plugins supported only in shared build, disabling]) + wxUSE_PLUGINS=no + fi + if test "$wxUSE_MONOLITHIC" = "yes" ; then + AC_MSG_WARN([plugins not supported monolithic build, disabling]) + wxUSE_PLUGINS=no + fi + if test "$wxUSE_DYNLIB_CLASS" = "no" ; then + AC_MSG_WARN([plugins require wxDynamicLibrary, disabling]) + wxUSE_PLUGINS=no + fi + if test "$wxUSE_PLUGINS" = "yes" ; then + AC_DEFINE(wxUSE_PLUGINS) + fi +fi + dnl --------------------------------------------------------------------------- dnl Register non-GUI class options for makefiles and setup.h dnl --------------------------------------------------------------------------- @@ -4259,8 +4497,29 @@ if test "$wxUSE_TIMER" = "yes"; then AC_DEFINE(wxUSE_TIMER) fi -if test "$wxUSE_WAVE" = "yes"; then - AC_DEFINE(wxUSE_WAVE) +WITH_PLUGIN_SDL=0 +if test "$wxUSE_SOUND" = "yes"; then + dnl Unix implementation needs additional checks because audio support + dnl comes in many favours: + if test "$USE_UNIX" = "1" ; then + AC_CHECK_HEADERS([sys/soundcard.h]) + + if test "$wxUSE_LIBSDL" != "no"; then + AM_PATH_SDL([1.2.0], + [ + EXTRALIBS_SDL="$SDL_LIBS" + CXXFLAGS="$CXXFLAGS $SDL_CFLAGS" + AC_DEFINE(wxUSE_LIBSDL) + ], + [wxUSE_LIBSDL="no"]) + if test "$wxUSE_LIBSDL" = "yes" -a "$wxUSE_PLUGINS" = "yes" ; then + WITH_PLUGIN_SDL=1 + fi + fi + fi + + AC_DEFINE(wxUSE_SOUND) + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS sound" fi if test "$wxUSE_CMDLINE_PARSER" = "yes"; then @@ -4527,10 +4786,6 @@ if test "$wxUSE_SOCKETS" = "yes"; then AC_MSG_WARN([wxSocket not yet supported under MGL... disabled]) wxUSE_SOCKETS="no" fi - if test "$wxUSE_COCOA" = "1"; then - AC_MSG_WARN([wxSocket not yet supported under Cocoa... disabled]) - wxUSE_SOCKETS="no" - fi fi if test "$wxUSE_SOCKETS" = "yes"; then @@ -4559,6 +4814,10 @@ if test "$wxUSE_SOCKETS" = "yes" ; then dnl like mingw does.. -- RL if test "$TOOLKIT" != "MSW"; then dnl determine the type of third argument for getsockname + dnl This test needs to be done in C++ mode since gsocket.cpp now + dnl is C++ code and pointer cast that are possible even without + dnl warning in C still fail in C++. + AC_LANG_PUSH(C++) AC_CACHE_CHECK([what is the type of the third argument of getsockname], wx_cv_type_getsockname3, [ @@ -4619,6 +4878,7 @@ if test "$wxUSE_SOCKETS" = "yes" ; then else AC_DEFINE_UNQUOTED(SOCKLEN_T, $wx_cv_type_getsockname3) fi + AC_LANG_POP fi fi @@ -4696,82 +4956,6 @@ if test "$wxUSE_GUI" = "yes"; then fi fi -dnl ------------------------------------------------------------------------ -dnl DLL support -dnl ------------------------------------------------------------------------ - -dnl under MSW we always have LoadLibrary/GetProcAddress -if test "$TOOLKIT" != "MSW"; then - - HAVE_DL_FUNCS=0 - HAVE_SHL_FUNCS=0 - if test "$wxUSE_DYNAMIC_LOADER" = "yes" -o "$wxUSE_DYNLIB_CLASS" = "yes" ; then - if test "$USE_DARWIN" = 1; then - dnl dlopen/dlerror is implemented in dynlib.cpp for Darwin/Mac OS X - HAVE_DL_FUNCS=1 - else - dnl the test is a bit complicated because we check for dlopen() both with - dnl and without -ldl and we also try to find shl_load() if there is no - dnl dlopen() on this system - AC_CHECK_FUNCS(dlopen, - [ - AC_DEFINE(HAVE_DLOPEN) - HAVE_DL_FUNCS=1 - ], - [ - AC_CHECK_LIB(dl, dlopen, - [ - AC_DEFINE(HAVE_DLOPEN) - HAVE_DL_FUNCS=1 - DL_LINK=" -ldl$DL_LINK" - ], - [ - AC_CHECK_FUNCS(shl_load, - [ - AC_DEFINE(HAVE_SHL_LOAD) - HAVE_SHL_FUNCS=1 - ], - [ - AC_CHECK_LIB(shl_load, dld, - [ - HAVE_SHL_FUNCS=1 - DL_LINK=" -ldld$DL_LINK" - ]) - ]) - ]) - ]) - - dnl check also for dlerror() - if test "$HAVE_DL_FUNCS" = 1; then - AC_CHECK_FUNCS(dlerror, - AC_DEFINE(HAVE_DLERROR), - [ - AC_CHECK_LIB(dl, dlerror, AC_DEFINE(HAVE_DLERROR)) - ] - ) - fi - fi - - if test "$HAVE_DL_FUNCS" = 0; then - if test "$HAVE_SHL_FUNCS" = 0; then - if test "$USE_UNIX" = 1; then - AC_MSG_WARN([Missing dynamic loading support, several features will be disabled]) - wxUSE_DYNAMIC_LOADER=no - wxUSE_DYNLIB_CLASS=no - else - AC_MSG_WARN([Assuming wxLibrary class works on this platform]) - fi - fi - fi - fi -fi - -if test "$wxUSE_DYNAMIC_LOADER" = "yes" ; then - AC_DEFINE(wxUSE_DYNAMIC_LOADER) -fi -if test "$wxUSE_DYNLIB_CLASS" = "yes" ; then - AC_DEFINE(wxUSE_DYNLIB_CLASS) -fi dnl --------------------------------------------------------------------------- dnl String stuff @@ -4826,9 +5010,13 @@ if test "$wxUSE_CONSTRAINTS" = "yes"; then SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS layout" fi -if test "$wxUSE_MDI_ARCHITECTURE" = "yes"; then - AC_DEFINE(wxUSE_MDI_ARCHITECTURE) - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS mdi" +if test "$wxUSE_MDI" = "yes"; then + AC_DEFINE(wxUSE_MDI) + + if test "$wxUSE_MDI_ARCHITECTURE" = "yes"; then + AC_DEFINE(wxUSE_MDI_ARCHITECTURE) + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS mdi" + fi fi if test "$wxUSE_DOC_VIEW_ARCHITECTURE" = "yes" ; then @@ -4878,7 +5066,7 @@ 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) -if test "$wxUSE_MSW" = 1 -a \( "$wxUSE_DATAOBJ" = "yes" \ +if test "$USE_WIN32" = 1 -a \( "$wxUSE_DATAOBJ" = "yes" \ -o "$wxUSE_CLIPBOARD" = "yes" \ -o "$wxUSE_OLE" = "yes" \ -o "$wxUSE_DRAG_AND_DROP" = "yes" \) ; then @@ -4897,14 +5085,16 @@ if test "$wxUSE_MSW" = 1 -a \( "$wxUSE_DATAOBJ" = "yes" \ [AC_MSG_RESULT(yes) CODE_GEN_FLAGS_CXX="$CODE_GEN_FLAGS_CXX -fvtable-thunks"]) AC_LANG_RESTORE - ALL_OBJECTS="$ALL_OBJECTS \$(OLEOBJS)" LIBS=" -lrpcrt4 -loleaut32 -lole32 -luuid$LIBS" - AC_DEFINE(wxUSE_OLE) - + if test "$wxUSE_OLE" = "yes" ; then + AC_DEFINE(wxUSE_OLE) + fi fi dnl for OLE clipboard and dnd - AC_DEFINE(wxUSE_DATAOBJ) + if test "$wxUSE_DATAOBJ" = "yes" ; then + AC_DEFINE(wxUSE_DATAOBJ) + fi else AC_MSG_WARN([Some features disabled because OLE headers not found]) @@ -4924,7 +5114,7 @@ fi if test "$wxUSE_IPC" = "yes"; then if test "$wxUSE_SOCKETS" != "yes"; then - AC_MSG_WARN(wxWindows IPC classes require sockets... disabled) + AC_MSG_WARN(wxWidgets IPC classes require sockets... disabled) fi AC_DEFINE(wxUSE_IPC) @@ -4969,11 +5159,14 @@ if test "$wxUSE_DRAG_AND_DROP" = "yes" ; then if test "$wxUSE_DRAG_AND_DROP" = "yes"; then AC_DEFINE(wxUSE_DRAG_AND_DROP) - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dnd" fi fi +if test "$wxUSE_DRAG_AND_DROP" = "yes" -o "$wxUSE_CLIPBOARD" = "yes"; then + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dnd" +fi + if test "$wxUSE_SPLINES" = "yes" ; then AC_DEFINE(wxUSE_SPLINES) fi @@ -5024,6 +5217,11 @@ if test "$wxUSE_CHOICE" = "yes"; then USES_CONTROLS=1 fi +if test "$wxUSE_CHOICEBOOK" = "yes"; then + AC_DEFINE(wxUSE_CHOICEBOOK) + USES_CONTROLS=1 +fi + if test "$wxUSE_CHECKBOX" = "yes"; then AC_DEFINE(wxUSE_CHECKBOX) USES_CONTROLS=1 @@ -5167,9 +5365,14 @@ if test "$wxUSE_TEXTCTRL" = "yes"; then fi if test "$wxUSE_TOGGLEBTN" = "yes"; then - if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1 ; then + if test "$wxUSE_COCOA" = 1 ; then AC_MSG_WARN([Toggle button not yet supported under Mac OS X... disabled]) wxUSE_TOGGLEBTN=no + else + if test "$wxUSE_PM" = 1; then + AC_MSG_WARN([Toggle button not yet supported under PM... disabled]) + wxUSE_TOGGLEBTN=no + fi fi if test "$wxUSE_UNIVERSAL" = "yes"; then AC_MSG_WARN([Toggle button not yet supported under wxUniversal... disabled]) @@ -5231,16 +5434,12 @@ if test "$wxUSE_POPUPWIN" = "yes"; then if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1 ; then AC_MSG_WARN([Popup window not yet supported under Mac OS X... disabled]) else - if test "$wxUSE_MOTIF" = 1; then - AC_MSG_WARN([wxPopupWindow not yet supported under Motif... disabled]) + if test "$wxUSE_PM" = 1; then + AC_MSG_WARN([wxPopupWindow not yet supported under PM... disabled]) else - if test "$wxUSE_PM" = 1; then - AC_MSG_WARN([wxPopupWindow not yet supported under PM... disabled]) - else - AC_DEFINE(wxUSE_POPUPWIN) + AC_DEFINE(wxUSE_POPUPWIN) - USES_CONTROLS=1 - fi + USES_CONTROLS=1 fi fi fi @@ -5261,19 +5460,67 @@ dnl --------------------------------------------------------------------------- dnl misc options dnl --------------------------------------------------------------------------- -dnl if test "$wxUSE_TREELAYOUT" = "yes"; then -dnl AC_DEFINE(wxUSE_TREELAYOUT) -dnl SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS treelay" -dnl fi +dnl please keep the settings below in alphabetical order +if test "$wxUSE_ACCESSIBILITY" = "yes"; then + AC_DEFINE(wxUSE_ACCESSIBILITY) + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS access" +fi if test "$wxUSE_DRAGIMAGE" = "yes"; then AC_DEFINE(wxUSE_DRAGIMAGE) SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dragimag" fi -if test "$wxUSE_ACCESSIBILITY" = "yes"; then - AC_DEFINE(wxUSE_ACCESSIBILITY) - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS access" +if test "$wxUSE_EXCEPTIONS" = "yes"; then + if test "$wxUSE_NO_EXCEPTIONS" = "yes" ; then + AC_MSG_WARN([--enable-exceptions can't be used with --enable-no_exceptions]) + else + AC_DEFINE(wxUSE_EXCEPTIONS) + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS except" + fi +fi + +USE_HTML=0 +if test "$wxUSE_HTML" = "yes"; then + AC_DEFINE(wxUSE_HTML) + USE_HTML=1 + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS html html/about html/help html/helpview html/printing html/test html/virtual html/widget html/zip htlbox" + if test "$wxUSE_MAC" = 1; then + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS html/htmlctrl" + fi +fi +if test "$wxUSE_WEBKIT" = "yes"; then + if test "$wxUSE_MAC" = 1; then + old_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS -x objective-c++" + AC_CHECK_HEADER([WebKit/HIWebView.h], + [ + AC_DEFINE(wxUSE_WEBKIT) + WEBKIT_LINK="-framework WebKit" + ], + [ + AC_MSG_WARN([WebKit headers not found; disabling wxWebKit]) + wxUSE_WEBKIT=no + ], + [#include ]) + CPPFLAGS="$old_CPPFLAGS" + elif test "$wxUSE_COCOA" = 1; then + AC_DEFINE(wxUSE_WEBKIT) + else + wxUSE_WEBKIT=no + fi +fi + +USE_XRC=0 +if test "$wxUSE_XRC" = "yes"; then + if test "$wxUSE_XML" != "yes"; then + AC_MSG_WARN([XML library not built, XRC resources disabled]) + wxUSE_XRC=no + else + AC_DEFINE(wxUSE_XRC) + USE_XRC=1 + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS xrc" + fi fi if test "$wxUSE_MENUS" = "yes"; then @@ -5289,27 +5536,20 @@ if test "$wxUSE_MIMETYPE" = "yes"; then AC_DEFINE(wxUSE_MIMETYPE) fi -if test "$wxUSE_SYSTEM_OPTIONS" = "yes"; then - AC_DEFINE(wxUSE_SYSTEM_OPTIONS) -if test "$TOOLKIT" = "MSW" -o "$TOOLKIT" = "GTK" -o "$TOOLKIT" = "X11" -o \ - "$TOOLKIT" = "MOTIF"; then - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS taskbar" -fi - -fi - if test "$wxUSE_MINIFRAME" = "yes"; then AC_DEFINE(wxUSE_MINIFRAME) SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS minifram" fi -USE_HTML=0 -if test "$wxUSE_HTML" = "yes"; then - AC_DEFINE(wxUSE_HTML) - USE_HTML=1 - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS html html/about html/help html/helpview html/printing html/test html/virtual html/widget html/zip htlbox" +if test "$wxUSE_SYSTEM_OPTIONS" = "yes"; then + AC_DEFINE(wxUSE_SYSTEM_OPTIONS) + if test "$TOOLKIT" = "MSW" -o "$TOOLKIT" = "GTK" -o "$TOOLKIT" = "X11" -o \ + "$TOOLKIT" = "MOTIF"; then + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS taskbar" + fi fi + if test "$wxUSE_VALIDATORS" = "yes"; then AC_DEFINE(wxUSE_VALIDATORS) SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS validate" @@ -5319,41 +5559,45 @@ if test "$wxUSE_PALETTE" = "yes" ; then AC_DEFINE(wxUSE_PALETTE) fi -if test "$wxUSE_IMAGE" = "yes" ; then - AC_DEFINE(wxUSE_IMAGE) +if test "$wxUSE_UNICODE" = "yes" -a "$wxUSE_UNICODE_MSLU" = "yes" ; then + dnl Must be done this late because -lunicows must be before all the other libs + LIBS=" -lunicows $LIBS" fi -if test "$wxUSE_GIF" = "yes" ; then - AC_DEFINE(wxUSE_GIF) -fi +dnl --------------------------------------------------------------------------- +dnl wxImage options +dnl --------------------------------------------------------------------------- -if test "$wxUSE_PCX" = "yes" ; then - AC_DEFINE(wxUSE_PCX) -fi +if test "$wxUSE_IMAGE" = "yes" ; then + AC_DEFINE(wxUSE_IMAGE) -if test "$wxUSE_IFF" = "yes" ; then - AC_DEFINE(wxUSE_IFF) -fi + if test "$wxUSE_GIF" = "yes" ; then + AC_DEFINE(wxUSE_GIF) + fi -if test "$wxUSE_PNM" = "yes" ; then - AC_DEFINE(wxUSE_PNM) -fi + if test "$wxUSE_PCX" = "yes" ; then + AC_DEFINE(wxUSE_PCX) + fi -if test "$wxUSE_XPM" = "yes" ; then - AC_DEFINE(wxUSE_XPM) -fi + if test "$wxUSE_IFF" = "yes" ; then + AC_DEFINE(wxUSE_IFF) + fi -if test "$wxUSE_ICO_CUR" = "yes" ; then - AC_DEFINE(wxUSE_ICO_CUR) -fi + if test "$wxUSE_PNM" = "yes" ; then + AC_DEFINE(wxUSE_PNM) + fi -if test "$wxUSE_UNICODE" = "yes" -a "$wxUSE_UNICODE_MSLU" = "yes" ; then - dnl Must be done this late because -lunicows must be before all the other libs - LIBS=" -lunicows $LIBS" + if test "$wxUSE_XPM" = "yes" ; then + AC_DEFINE(wxUSE_XPM) + fi + + if test "$wxUSE_ICO_CUR" = "yes" ; then + AC_DEFINE(wxUSE_ICO_CUR) + fi fi dnl --------------------------------------------------------------------------- -dnl common dialog +dnl common dialogs dnl --------------------------------------------------------------------------- if test "$wxUSE_CHOICEDLG" = "yes"; then @@ -5402,6 +5646,7 @@ fi if test "$wxUSE_SPLASH" = "yes"; then AC_DEFINE(wxUSE_SPLASH) + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS splash" fi if test "$wxUSE_STARTUP_TIPS" = "yes"; then @@ -5448,9 +5693,6 @@ fi AC_DEFINE_UNQUOTED(wxINSTALL_PREFIX, "$wxPREFIX") -dnl define the variables used in wx-config -top_builddir_wxconfig=`pwd` - dnl --------------------------------------------------------------------------- dnl define variables with all built libraries for wx-config @@ -5469,6 +5711,13 @@ fi if test "$wxUSE_HTML" = "yes" ; then CORE_GUI_LIBS="html $CORE_GUI_LIBS" fi +if test "$wxUSE_XRC" = "yes" ; then + CORE_GUI_LIBS="xrc $CORE_GUI_LIBS" +fi + +if test "$wxUSE_GUI" != "yes"; then + CORE_GUI_LIBS="" +fi AC_SUBST(CORE_BASE_LIBS) AC_SUBST(CORE_GUI_LIBS) @@ -5478,13 +5727,19 @@ dnl --------------------------------------------------------------------------- dnl Output the makefiles and such from the results found above dnl --------------------------------------------------------------------------- -dnl all additional libraries (except wxWindows itself) we link with +dnl all additional libraries (except wxWidgets itself) we link with dnl note that we always link with -lm except for Mac OS X dnl extended.c uses floor() and is always linked in if test "$wxUSE_MAC" = 1 ; then - LDFLAGS="$LDFLAGS -framework Carbon -framework System" + if test "$wxUSE_SOUND" = "yes"; then + LDFLAGS="$LDFLAGS -framework QuickTime" + fi + if test "$USE_DARWIN" = 1; then + LDFLAGS="$LDFLAGS -framework IOKit" + fi + LDFLAGS="$LDFLAGS -framework Carbon -framework Cocoa -framework System" fi if test "$wxUSE_COCOA" = 1 ; then LDFLAGS="$LDFLAGS -framework Cocoa -framework System" @@ -5558,17 +5813,14 @@ fi dnl all -I options we must pass to the compiler dnl -dnl note that the order is somewhat important, in particular the ZLIB_INCLUDE -dnl and other stuff for the built in libraries should come first to avoid -dnl including the system headers with the same name (it is particularly -dnl important for zlib because XFree 4.2.0 has its own, horribly old and -dnl incompatible, zlib.h) and the wxWindows headers should come first anyhow -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" - -dnl C/C++ compiler options used to compile wxWindows +dnl note that the order is somewhat important: wxWidgets headers should +dnl come first and the one with setup.h should be before $(top_srcdir)/include +dnl in case the latter contains setup.h used by non-autoconf makefiles (e.g. +dnl CodeWarrior): +INCLUDES="-I\${top_builddir}lib/wx/include/${TOOLCHAIN_FULLNAME} \ +-I\${top_srcdir}/include $TOOLKIT_INCLUDE" + +dnl C/C++ compiler options used to compile wxWidgets if test "$GXX" = yes ; then dnl CXXWARNINGS="-Wall -W -Wcast-qual -Werror" CXXWARNINGS="-Wall" @@ -5579,17 +5831,18 @@ fi EXTRA_CFLAGS="$WXDEBUG $WXODBCFLAG $PROFILE $OPTIMISE" dnl remove the extra white space from the cc/c++/ld options -CPPFLAGS=`echo $WXDEBUG_DEFINE $INCLUDES $CPPFLAGS | sed 's/ \\+/ /g'` -CFLAGS=`echo $CODE_GEN_FLAGS $EXTRA_CFLAGS $CFLAGS $CXXWARNINGS | sed 's/ \\+/ /g'` -CXXFLAGS=`echo $CODE_GEN_FLAGS $CODE_GEN_FLAGS_CXX $EXTRA_CFLAGS $CXXFLAGS $CXXWARNINGS | sed 's/ \+/ /g'` +CPPFLAGS=`echo $WXDEBUG_DEFINE $INCLUDES $CPPFLAGS` +CFLAGS=`echo $CODE_GEN_FLAGS $EXTRA_CFLAGS $CFLAGS $CXXWARNINGS` +CXXFLAGS=`echo $CODE_GEN_FLAGS $CODE_GEN_FLAGS_CXX $EXTRA_CFLAGS $CXXFLAGS $CXXWARNINGS` -LIBS=`echo $LIBS | sed 's/ \+/ /g'` +LIBS=`echo $LIBS` EXTRALIBS="$LDFLAGS $LDFLAGS_VERSIONING $LIBS $DMALLOC_LIBS" EXTRALIBS_XML="$EXPAT_LINK" +EXTRALIBS_HTML="$MSPACK_LINK" EXTRALIBS_ODBC="$ODBC_LINK" if test "$wxUSE_GUI" = "yes"; then - EXTRALIBS_GUI=`echo $GUI_TK_LIBRARY $PNG_LINK $JPEG_LINK $TIFF_LINK | sed 's/ \+/ /g'` + EXTRALIBS_GUI=`echo $GUI_TK_LIBRARY $PNG_LINK $JPEG_LINK $TIFF_LINK $WEBKIT_LINK` fi if test "$wxUSE_OPENGL" = "yes"; then EXTRALIBS_OPENGL="$LDFLAGS_GL $OPENGL_LIBS" @@ -5608,7 +5861,7 @@ WXCONFIG_EXTRALIBS="$LIBS" dnl wx-config must output builtin 3rd party libs in --libs in static build: if test "$wxUSE_REGEX" = "builtin" ; then - wxconfig_3rdparty="$wxconfig_3rdparty regex" + wxconfig_3rdparty="$wxconfig_3rdparty regex${lib_unicode_suffix}" fi if test "$wxUSE_EXPAT" = "builtin" ; then wxconfig_3rdparty="$wxconfig_3rdparty expat" @@ -5633,7 +5886,7 @@ if test "$wxUSE_ODBC" = "builtin" ; then fi for i in $wxconfig_3rdparty ; do - WXCONFIG_EXTRALIBS="$WXCONFIG_EXTRALIBS -lwx${i}${lib_debug_suffix}${HOST_SUFFIX}" + WXCONFIG_EXTRALIBS="$WXCONFIG_EXTRALIBS -lwx${i}${lib_debug_suffix}${WX_LIB_FLAVOUR}-${WX_RELEASE}${HOST_SUFFIX}" done @@ -5657,6 +5910,12 @@ else MONOLITHIC=0 fi +if test $wxUSE_PLUGINS = "yes" ; then + USE_PLUGINS=1 +else + USE_PLUGINS=0 +fi + if test $wxUSE_ODBC != "no" ; then USE_ODBC=1 else @@ -5671,50 +5930,102 @@ fi AC_SUBST(VENDOR) AC_SUBST(OFFICIAL_BUILD) +AC_SUBST(WX_FLAVOUR) +AC_SUBST(WX_LIB_FLAVOUR) AC_SUBST(WXUNIV) AC_SUBST(MONOLITHIC) +AC_SUBST(USE_PLUGINS) AC_SUBST(LIBS) AC_SUBST(EXTRALIBS) AC_SUBST(EXTRALIBS_XML) +AC_SUBST(EXTRALIBS_HTML) AC_SUBST(EXTRALIBS_ODBC) AC_SUBST(EXTRALIBS_GUI) AC_SUBST(EXTRALIBS_OPENGL) +AC_SUBST(EXTRALIBS_SDL) +AC_SUBST(WITH_PLUGIN_SDL) AC_SUBST(UNICODE) AC_SUBST(BUILD) AC_SUBST(DEBUG_INFO) AC_SUBST(DEBUG_FLAG) -AC_SUBST(SHARED) -TOOLKIT_LOWERCASE=`echo $TOOLKIT | tr [[A-Z]] [[a-z]]` +TOOLKIT_LOWERCASE=`echo $TOOLKIT | tr "[[A-Z]]" "[[a-z]]"` AC_SUBST(TOOLKIT_LOWERCASE) AC_SUBST(TOOLKIT_VERSION) AC_SUBST(SAMPLES_RPATH_FLAG) AC_SUBST(SAMPLES_RPATH_POSTLINK) AC_SUBST(HOST_SUFFIX) +AC_SUBST(CPPUNIT_CFLAGS) +AC_SUBST(CPPUNIT_LIBS) + +case "$TOOLKIT" in + GTK) + TOOLKIT_USER="GTK+" + if test "$WXGTK20" = 1; then + TOOLKIT_USER="$TOOLKIT_USER 2" + fi + ;; + + *) + TOOLKIT_USER=$TOOLKIT_LOWERCASE + ;; +esac AC_BAKEFILE +if test "$wxUSE_SHARED" = "yes"; then + + dnl We get the shared build linker from bakefile, since it + dnl moved all the logic for this out of this file and into + dnl its own macro. But it can't decide on whether to return + dnl us $(VAR), ${VAR}, or the present expansion of VAR. + dnl So normalise and expand everything here now, because its + dnl not going to change inside wx-config anyway. + sanitised_bakefile_mess=`echo "$SHARED_LD_CXX" | tr -d '()'` + EXE_LINKER=`eval echo "$sanitised_bakefile_mess"` + +else + + dnl No bakefile support for static builds, but this should be ok for most. + EXE_LINKER="$CXX -o" +fi + +GCC_PRAGMA_FLAGS="" dnl Find out if we have to define NO_GCC_PRAGMA and WX_PRECOMP: if test $GCC_PCH = 1 ; then - CPPFLAGS="-DWX_PRECOMP -DNO_GCC_PRAGMA $CPPFLAGS" + GCC_PRAGMA_FLAGS="-DWX_PRECOMP -DNO_GCC_PRAGMA" else case "${host}" in powerpc-*-darwin* ) dnl Some Apple's GCC version are broken and can't handle the dnl pragmas: - CPPFLAGS="-DNO_GCC_PRAGMA $CPPFLAGS" + GCC_PRAGMA_FLAGS="-DNO_GCC_PRAGMA" + ;; + *-*-mingw32* ) + dnl MinGW GCC versions >= 3.2 have problems with + dnl static member of classes derived from templates + dnl in combination with #pragma interface/implementation + dnl (the test case uses 4 files) + dnl ... and with exceptions handling (undefined symbols needed + dnl to correctly calls dtors when unwinding) as well + if test "$wxUSE_STL" = "yes" -o \ + "$wxUSE_NO_EXCEPTIONS" != "yes" -o \ + "$wxUSE_NO_RTTI" != "yes"; then + AC_MSG_CHECKING([if this MinGW version needs -DNO_GCC_PRAGMA]) + AC_TRY_COMPILE([], + [#if !(__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 2)) + #error "Not GCC 3.2 or greater" + #endif + ], + [GCC_PRAGMA_FLAGS="-DNO_GCC_PRAGMA" + AC_MSG_RESULT([yes])], + [AC_MSG_RESULT([no])]) + fi ;; esac fi -dnl We have to output NO_GCC_PRAGMA with wx-config on Apple, too: -case "${host}" in - powerpc-*-darwin* ) - dnl Some Apple's GCC version are broken and can't handle the - dnl pragmas: - CODE_GEN_FLAGS_CXX="-DNO_GCC_PRAGMA $CODE_GEN_FLAGS_CXX" - ;; -esac +CPPFLAGS="$GCC_PRAGMA_FLAGS $CPPFLAGS" dnl for convenience, sort the samples in alphabetical order @@ -5727,40 +6038,15 @@ dnl tr ' ' '\n' introduces DOS-like line breaks, whereas tr '\n' ' ' dnl only removes the Unix-like part of the introduced line break. SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq | tr '\n' ' '| tr -d '\r'`" -dnl makefile variables -AC_SUBST(PATH_IFS) +dnl subtle bakefile goop. +dnl Used in wx-config now too, as its STATIC_FLAG with different makeup. +dnl I wish we would have called it something less likely to clash with +dnl things though. +AC_SUBST(SHARED) dnl global options -AC_SUBST(WX_MAJOR_VERSION_NUMBER) -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_LIBRARY_BASENAME_NOGUI) AC_SUBST(WX_LIBRARY_BASENAME_GUI) -AC_SUBST(WX_LIBRARY_IMPORTLIB) -AC_SUBST(WX_TARGET_LIBRARY) -AC_SUBST(WX_LIBRARY_LINK1) -AC_SUBST(WX_LIBRARY_LINK2) -AC_SUBST(PROGRAM_EXT) - -dnl global gl options -AC_SUBST(WX_LIBRARY_NAME_STATIC_GL) -AC_SUBST(WX_LIBRARY_NAME_SHARED_GL) -AC_SUBST(WX_TARGET_LIBRARY_GL) -AC_SUBST(WX_LIBRARY_LINK1_GL) -AC_SUBST(WX_LIBRARY_LINK2_GL) - -dnl are we supposed to create the links? -AC_SUBST(WX_ALL) -AC_SUBST(WX_ALL_INSTALLED) - -AC_SUBST(SHARED_LD) -AC_SUBST(PIC_FLAG) - -AC_SUBST(WX_TARGET_LIBRARY_TYPE) - -AC_SUBST(STATIC_FLAG) dnl debugging options AC_SUBST(WXDEBUG_DEFINE) @@ -5771,35 +6057,32 @@ AC_SUBST(AFMINSTALL) AC_SUBST(WIN32INSTALL) AC_SUBST(TOOLKIT) AC_SUBST(TOOLKIT_DIR) -AC_SUBST(TOOLKIT_VPATH) AC_SUBST(TOOLCHAIN_NAME) +AC_SUBST(TOOLCHAIN_FULLNAME) AC_SUBST(TOOLCHAIN_DEFS) AC_SUBST(TOOLCHAIN_DLL_DEFS) dnl wx-config options -AC_SUBST(top_builddir_wxconfig) AC_SUBST(host_alias) AC_SUBST(cross_compiling) +AC_SUBST(WIDGET_SET) +AC_SUBST(WX_RELEASE) +AC_SUBST(WX_VERSION) +AC_SUBST(WX_SUBVERSION) +AC_SUBST(WX_CHARTYPE) +AC_SUBST(WX_DEBUGTYPE) AC_SUBST(WXCONFIG_EXTRALIBS) -AC_SUBST(WXCONFIG_LIBS) -AC_SUBST(WXCONFIG_LIBS_GL) -AC_SUBST(WXCONFIG_LIBS_STATIC) -AC_SUBST(WXCONFIG_LIBS_STATIC_GL) AC_SUBST(WXCONFIG_INCLUDE) AC_SUBST(WXCONFIG_RPATH) AC_SUBST(WXCONFIG_LDFLAGS_GUI) AC_SUBST(WX_LARGEFILE_FLAGS) +AC_SUBST(GCC_PRAGMA_FLAGS) AC_SUBST(CODE_GEN_FLAGS) AC_SUBST(CODE_GEN_FLAGS_CXX) - -dnl the list of files to compile/install -AC_SUBST(ALL_OBJECTS) -AC_SUBST(ALL_HEADERS) -AC_SUBST(ALL_SOURCES) +AC_SUBST(EXE_LINKER) dnl distribution vars AC_SUBST(GUIDIST) -AC_SUBST(PORT_FILES) AC_SUBST(DISTDIR) dnl additional subdirectories where we will build @@ -5808,8 +6091,6 @@ AC_SUBST(SAMPLES_SUBDIRS) dnl additional libraries and linker settings AC_SUBST(LDFLAGS) AC_SUBST(LDFLAGS_GL) -AC_SUBST(LDFLAGS_VERSIONING) -AC_SUBST(LDFLAGS_EXE) AC_SUBST(OPENGL_LIBS) AC_SUBST(DMALLOC_LIBS) AC_SUBST(WX_VERSION_TAG) @@ -5823,7 +6104,6 @@ AC_SUBST(WX_RESOURCES_MACOSX_DATA) dnl additional for Mac OS X AC_SUBST(DEREZ) -AC_SUBST(MACOSX_BUNDLE) AC_SUBST(LIBWXMACRES) AC_SUBST(MACRESCOMP) AC_SUBST(MACSETFILE) @@ -5832,12 +6112,6 @@ AC_SUBST(MACRESWXCONFIG) dnl other tools AC_SUBST(GCC) AC_SUBST(DLLTOOL) -AC_SUBST(AS) -AC_SUBST(NM) -AC_SUBST(LD) -AC_SUBST(MAKEINFO) -AC_SUBST(INSTALL_LIBRARY) -AC_SUBST(INSTALL_DIR) dnl MAKE_SET will be replaced with "MAKE=..." or nothing if make sets MAKE @@ -5845,61 +6119,34 @@ 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 move setup.h back if available -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 -AC_CONFIG_HEADERS([setup.h]) +AC_CONFIG_HEADERS([lib/wx/include/${TOOLCHAIN_FULLNAME}/wx/setup.h:setup.h.in]) -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_CONFIG_FILES([ - wx-config - version-script - Makefile - ]) +AC_CONFIG_FILES([ lib/wx/config/${TOOLCHAIN_FULLNAME}:wx-config.in ], + [ chmod +x lib/wx/config/${TOOLCHAIN_FULLNAME} ], + [ TOOLCHAIN_FULLNAME="${TOOLCHAIN_FULLNAME}" ]) -AC_CONFIG_COMMANDS([default], - [ - dnl This test is required to make the following idempotent. - dnl Otherwise running config.status or rerunning configure - dnl would stomp the wx-config link or try to move it onto - dnl itself. - dnl Use -h instead of -L to test for link (GD) - dnl -h is documented as obsolete under Mac OS X but works - dnl -L is obsolete under Solaris8 - if test ! -h wx-config; then - chmod +x wx-config - mv wx-config wx${TOOLCHAIN_NAME}-config - ${LN_S} wx${TOOLCHAIN_NAME}-config wx-config - fi +AC_CONFIG_FILES([ lib/wx/config/inplace-${TOOLCHAIN_FULLNAME}:wx-config-inplace.in ], + [ chmod +x lib/wx/config/inplace-${TOOLCHAIN_FULLNAME} ], + [ TOOLCHAIN_FULLNAME="${TOOLCHAIN_FULLNAME}" ]) - if test ! -d lib; then - mkdir lib - fi - if test ! -d lib/wx; then - mkdir lib/wx - fi - if test ! -d lib/wx/include; then - mkdir lib/wx/include - fi - if test ! -d lib/wx/include/${TOOLCHAIN_NAME}; then - mkdir lib/wx/include/${TOOLCHAIN_NAME} - fi - if test ! -d lib/wx/include/${TOOLCHAIN_NAME}/wx; then - mkdir lib/wx/include/${TOOLCHAIN_NAME}/wx - fi - if test -f setup.h; then - mv -f setup.h lib/wx/include/${TOOLCHAIN_NAME}/wx/setup.h - fi - ], - [ - TOOLCHAIN_NAME="${TOOLCHAIN_NAME}" - LN_S="${LN_S}" - ] - ) +AC_CONFIG_FILES([ version-script Makefile ]) + +AC_CONFIG_COMMANDS([ wx-config + ], + [ rm -f wx-config + ${LN_S} lib/wx/config/inplace-${TOOLCHAIN_FULLNAME} wx-config + ], + [ TOOLCHAIN_FULLNAME="${TOOLCHAIN_FULLNAME}" + LN_S="${LN_S}" + ]) + +dnl This would give us us build dir that in every significant way +dnl resembles an installed wx in prefix=$builddir. It is troublesome +dnl though in this form because AC_CONFIG_LINKS will fail for directories +dnl on platforms that do not have symlinks. +dnl AC_CONFIG_LINKS([ include/wx-$WX_RELEASE$WX_FLAVOUR:include ]) +dnl AC_CONFIG_LINKS([ contrib/include ]) dnl Configure samples, contrib etc. directories, but only if they are present: @@ -5909,6 +6156,8 @@ else dnl we build wxBase only dnl there are no wxBase programs in contrib nor demos SUBDIRS="samples utils" fi +dnl Add tests to the list of subdirs if cppunit 1.8.0+ is detected +AM_PATH_CPPUNIT(1.8.0, [SUBDIRS="$SUBDIRS tests"]) for subdir in `echo $SUBDIRS`; do if test -d ${srcdir}/${subdir} ; then @@ -5930,10 +6179,13 @@ for subdir in `echo $SUBDIRS`; do dnl wxBase if test ${subdir} = "samples"; then makefiles="samples/Makefile.in samples/console/Makefile.in" - else dnl utils + elif test ${subdir} = "utils"; then makefiles="utils/HelpGen/Makefile.in \ utils/HelpGen/src/Makefile.in \ - utils/makegen/Makefile.in" + utils/tex2rtf/Makefile.in \ + utils/tex2rtf/src/Makefile.in" + else dnl assume that everything compiles for tests + makefiles=`(cd $srcdir ; find $subdir -name Makefile.in)` fi fi @@ -5947,29 +6199,34 @@ done AC_OUTPUT -dnl report on what we decided to do +dnl report how we have been configured echo -echo "Configured wxWindows ${WX_VERSION} for \`${host}'" +echo "Configured wxWidgets ${WX_VERSION} for \`${host}'" echo "" -echo " Which GUI toolkit should wxWindows use? ${TOOLKIT:-base only}" -echo " Should wxWindows be compiled into single library? ${wxUSE_MONOLITHIC:-yes}" +echo " Which GUI toolkit should wxWidgets use? ${TOOLKIT_USER:-base only}" +echo " Should wxWidgets be compiled into single library? ${wxUSE_MONOLITHIC:-yes}" -echo " Should wxWindows be compiled in debug mode? ${wxUSE_DEBUG:-no}" -echo " Should wxWindows be linked as a shared library? ${wxUSE_SHARED:-no}" -echo " Should wxWindows be compiled in Unicode mode? ${wxUSE_UNICODE:-no}" +echo " Should wxWidgets be compiled in debug mode? ${wxUSE_DEBUG:-no}" +echo " Should wxWidgets be linked as a shared library? ${wxUSE_SHARED:-no}" +echo " Should wxWidgets be compiled in Unicode mode? ${wxUSE_UNICODE:-no}" -echo " What level of wxWindows compatibility should be enabled?" -echo " wxWindows 2.2 ${WXWIN_COMPATIBILITY_2_2:-no}" -echo " wxWindows 2.4 ${WXWIN_COMPATIBILITY_2_4:-yes}" +echo " What level of wxWidgets compatibility should be enabled?" +echo " wxWidgets 2.2 ${WXWIN_COMPATIBILITY_2_2:-no}" +echo " wxWidgets 2.4 ${WXWIN_COMPATIBILITY_2_4:-yes}" -echo " Which libraries should wxWindows use?" +echo " Which libraries should wxWidgets use?" echo " jpeg ${wxUSE_LIBJPEG-none}" echo " png ${wxUSE_LIBPNG-none}" echo " regex ${wxUSE_REGEX}" echo " tiff ${wxUSE_LIBTIFF-none}" +if test "$wxUSE_X11" = 1 -o "$wxUSE_MOTIF" = 1; then +echo " xpm ${wxUSE_LIBXPM-none}" +fi echo " zlib ${wxUSE_ZLIB}" echo " odbc ${wxUSE_ODBC}" echo " expat ${wxUSE_EXPAT}" +echo " libmspack ${wxUSE_LIBMSPACK}" +echo " sdl ${wxUSE_LIBSDL}" echo ""