X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/520755bbd87dfdb9cfe3e517fd83842d07477603..05a019a2a85661bbd04e030c1a977c46acda20af:/configure.in?ds=sidebyside diff --git a/configure.in b/configure.in index 4a508717c3..49950ac5cd 100644 --- a/configure.in +++ b/configure.in @@ -17,7 +17,7 @@ dnl --------------------------------------------------------------------------- dnl initialization dnl --------------------------------------------------------------------------- -AC_INIT([wxWindows], [2.5.0], [wx-dev@lists.wxwindows.org]) +AC_INIT([wxWindows], [2.5.1], [wx-dev@lists.wxwindows.org]) dnl the file passed to AC_CONFIG_SRCDIR should be specific to our package AC_CONFIG_SRCDIR([wx-config.in]) @@ -55,14 +55,14 @@ 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_RELEASE_NUMBER=1 WX_VERSION=$WX_MAJOR_VERSION_NUMBER.$WX_MINOR_VERSION_NUMBER.$WX_RELEASE_NUMBER WX_RELEASE=$WX_MAJOR_VERSION_NUMBER.$WX_MINOR_VERSION_NUMBER WX_MSW_VERSION=$WX_MAJOR_VERSION_NUMBER$WX_MINOR_VERSION_NUMBER$WX_RELEASE_NUMBER -WX_CURRENT=0 +WX_CURRENT=1 WX_REVISION=0 WX_AGE=0 @@ -73,6 +73,7 @@ dnl ------------------------------------------------------------------------ dnl OS (assume Unix) USE_UNIX=1 +USE_OS2=0 USE_WIN32=0 USE_DOS=0 USE_BEOS=0 @@ -140,6 +141,7 @@ DEFAULT_DEFAULT_wxUSE_X11=0 PROGRAM_EXT= SO_SUFFIX=so SAMPLES_RPATH_FLAG= +SAMPLES_RPATH_POSTLINK= dnl to support a new system, you need to add its canonical name (as determined dnl by config.sub or specified by the configure command line) to this "case" @@ -287,8 +289,35 @@ 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 + LDFLAGS="$LDFLAGS -Zcrtdll -Zsysv-signals" + 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. + dnl For now however, we still need it to make sure the configure script + dnl works on OS/2 no matter what platform it is generated on. + ac_executable_extensions=".exe" + export ac_executable_extensions + 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='\\' + ac_TEMP_PATH= + for ac_dir in $PATH; do + IFS=$ac_save_IFS + if test -z "$ac_TEMP_PATH"; then + ac_TEMP_PATH="$ac_dir" + else + ac_TEMP_PATH="$ac_TEMP_PATH/$ac_dir" + fi + done + export PATH="$ac_TEMP_PATH" + unset ac_TEMP_PATH ;; powerpc-*-darwin* ) @@ -351,6 +380,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 @@ -366,6 +396,7 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_LIBPNG=no DEFAULT_wxUSE_LIBJPEG=no DEFAULT_wxUSE_LIBTIFF=no + DEFAULT_wxUSE_LIBXPM=no DEFAULT_wxUSE_ODBC=no DEFAULT_wxUSE_OPENGL=no @@ -448,6 +479,7 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_FS_ZIP=no DEFAULT_wxUSE_BUSYINFO=no DEFAULT_wxUSE_ZIPSTREAM=no + DEFAULT_wxUSE_GZSTREAM=no DEFAULT_wxUSE_VALIDATORS=no DEFAULT_wxUSE_ACCEL=no @@ -463,6 +495,7 @@ if test $DEBUG_CONFIGURE = 1; then DEFAULT_wxUSE_GAUGE=no DEFAULT_wxUSE_GRID=no DEFAULT_wxUSE_IMAGLIST=no + DEFAULT_wxUSE_LISTBOOK=no DEFAULT_wxUSE_LISTBOX=no DEFAULT_wxUSE_LISTCTRL=no DEFAULT_wxUSE_NOTEBOOK=no @@ -528,6 +561,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 @@ -542,6 +576,8 @@ else DEFAULT_wxUSE_LIBPNG=yes DEFAULT_wxUSE_LIBJPEG=yes DEFAULT_wxUSE_LIBTIFF=yes + DEFAULT_wxUSE_LIBXPM=yes + DEFAULT_wxUSE_LIBMSPACK=yes DEFAULT_wxUSE_ODBC=no DEFAULT_wxUSE_OPENGL=no @@ -624,6 +660,7 @@ else DEFAULT_wxUSE_FS_ZIP=yes DEFAULT_wxUSE_BUSYINFO=yes DEFAULT_wxUSE_ZIPSTREAM=yes + DEFAULT_wxUSE_GZSTREAM=yes DEFAULT_wxUSE_VALIDATORS=yes DEFAULT_wxUSE_ACCEL=yes @@ -639,6 +676,7 @@ else DEFAULT_wxUSE_GAUGE=yes DEFAULT_wxUSE_GRID=yes DEFAULT_wxUSE_IMAGLIST=yes + DEFAULT_wxUSE_LISTBOOK=yes DEFAULT_wxUSE_LISTBOX=yes DEFAULT_wxUSE_LISTCTRL=yes DEFAULT_wxUSE_NOTEBOOK=yes @@ -733,6 +771,8 @@ WX_ARG_ENABLE(gtk2, [ --enable-gtk2 use GTK+ 2.0 if available 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(opengl, [ --with-opengl use OpenGL (or Mesa)], wxUSE_OPENGL) fi @@ -774,7 +814,6 @@ 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(compat20, [ --enable-compat20 enable wxWindows 2.0 compatibility], WXWIN_COMPATIBILITY_2) 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) @@ -797,44 +836,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(wave, [ --enable-wave use wxWave class], wxUSE_WAVE) 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(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(gzstream, [ --enable-gzstream use wxGzipInputStream], wxUSE_GZSTREAM) WX_ARG_ENABLE(url, [ --enable-url use wxURL class], wxUSE_URL) WX_ARG_ENABLE(protocol, [ --enable-protocol use wxProtocol class], wxUSE_PROTOCOL) @@ -915,6 +954,7 @@ if test "$wxUSE_CONTROLS" = "yes"; then DEFAULT_wxUSE_GAUGE=yes DEFAULT_wxUSE_GRID=yes DEFAULT_wxUSE_IMAGLIST=yes + DEFAULT_wxUSE_LISTBOOK=yes DEFAULT_wxUSE_LISTBOX=yes DEFAULT_wxUSE_LISTCTRL=yes DEFAULT_wxUSE_NOTEBOOK=yes @@ -952,6 +992,7 @@ elif test "$wxUSE_CONTROLS" = "no"; then DEFAULT_wxUSE_GAUGE=no DEFAULT_wxUSE_GRID=no DEFAULT_wxUSE_IMAGLIST=no + DEFAULT_wxUSE_LISTBOOK=no DEFAULT_wxUSE_LISTBOX=no DEFAULT_wxUSE_LISTCTRL=no DEFAULT_wxUSE_NOTEBOOK=no @@ -984,7 +1025,6 @@ if test "x$wxUSE_COCOA" != "x" -a "$wxUSE_COCOA" != "0" ; then 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 @@ -1003,6 +1043,7 @@ WX_ARG_ENABLE(display, [ --enable-display use wxDisplay class], wxUS WX_ARG_ENABLE(gauge, [ --enable-gauge use wxGauge class], wxUSE_GAUGE) WX_ARG_ENABLE(grid, [ --enable-grid use wxGrid class], wxUSE_GRID) WX_ARG_ENABLE(imaglist, [ --enable-imaglist use wxImageList class], wxUSE_IMAGLIST) +WX_ARG_ENABLE(listbook, [ --enable-listbook use wxListbook class], wxUSE_LISTBOOK) WX_ARG_ENABLE(listbox, [ --enable-listbox use wxListBox class], wxUSE_LISTBOX) WX_ARG_ENABLE(listctrl, [ --enable-listctrl use wxListCtrl class], wxUSE_LISTCTRL) WX_ARG_ENABLE(notebook, [ --enable-notebook use wxNotebook class], wxUSE_NOTEBOOK) @@ -1090,17 +1131,12 @@ fi dnl General settings (needed for GUI and non-GUI compilations alike). dnl Path separator; ':' for unix, ';' for OS/2 -dnl Stem for flex output; lexyy for OS/2, lex.yy otherwise case "${host}" in *-pc-os2_emx | *-pc-os2-emx ) PATH_IFS=';' -dnl Really ought to text for this as meanwhile there are flex versions using -dnl lex.yy as well due to FAT support being more and more dropped... - LEX_STEM="lexyy" ;; *) PATH_IFS=':' - LEX_STEM="lex.yy" ;; esac @@ -1119,6 +1155,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 @@ -1179,7 +1216,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 @@ -1221,6 +1258,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 @@ -1308,7 +1346,10 @@ AC_PROG_RANLIB dnl ar command dnl defines AR with the appropriate command -AC_CHECK_PROG(AR, ar, ar, ar) +AC_CHECK_PROG(AR, ar, ar) +if test "x$AR" = "x" ; then + AC_MSG_ERROR([ar is needed to build wxWindows]) +fi dnl install checks dnl defines INSTALL with the appropriate command @@ -1413,27 +1454,18 @@ you are trying to compile. fi dnl make without VPATH fi dnl not GNU make -dnl YACC checks -dnl defines YACC with the appropriate command -AC_PROG_YACC - -dnl LEX checks -dnl defines LEX with the appropriate command -dnl defines LEXLIB with the appropriate library -AC_PROG_LEX - 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 Moreover we need to link explicitly against either stdcpp.a or stdcxx.a +dnl (depending on compiler version), since we are using "gcc", not "g++/c++". dnl --------------------------------------------------------------------------- dnl (OS/2-only piece) case "${host}" in *-pc-os2_emx | *-pc-os2-emx ) - dnl Explicitly link -lstdcpp, since we are using "gcc" not "g++"/"c++". - LIBS="$LIBS -lstdcpp" 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). @@ -1442,6 +1474,26 @@ 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 3 or later], wx_cv_gcc3,[ + AC_TRY_COMPILE([], + [ + #if (__GNUC__ < 3) + #error old gcc + #endif + ], + [ + wx_cv_gcc3=yes + ], + [ + wx_cv_gcc3=no + ] + ) + ]) + if test "$wx_cv_gcc3" = "no"; then + LIBS="$LIBS -lstdcpp" + else + LIBS="$LIBS -lstdcxx" + fi ;; esac dnl (end of OS/2-only piece) @@ -1507,9 +1559,15 @@ 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/XKBlib.h) + AC_CHECK_HEADERS(X11/Xlib.h) + AC_CHECK_HEADERS([X11/XKBlib.h], [], [], + [ + #if HAVE_X11_XLIB_H + #include + #endif + ]) fi fi @@ -1817,9 +1875,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([Unicode build requires built-in regex library, will use it instead]) + 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 @@ -1838,17 +1900,12 @@ if test "$wxUSE_REGEX" != "no"; then wxUSE_REGEX=sys 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) @@ -1916,17 +1973,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) @@ -1991,10 +2043,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 @@ -2002,7 +2050,6 @@ dnl ------------------------------------------------------------------------ dnl Check for jpeg library dnl ------------------------------------------------------------------------ -JPEG_INCLUDE= JPEG_LINK= if test "$wxUSE_LIBJPEG" != "no" ; then AC_DEFINE(wxUSE_LIBJPEG) @@ -2051,17 +2098,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 @@ -2077,10 +2119,12 @@ if test "$wxUSE_LIBTIFF" != "no" ; then TIFF_PREREQ_LINKS="$TIFF_PREREQ_LINKS $ZLIB_LINK" fi AC_CHECK_HEADER(tiffio.h, - AC_CHECK_LIB(tiff, TIFFError, - TIFF_LINK=" -ltiff", - , - $TIFF_PREREQ_LINKS) + [ + AC_CHECK_LIB(tiff, TIFFError, + TIFF_LINK=" -ltiff", + , + $TIFF_PREREQ_LINKS) + ] ) if test "x$TIFF_LINK" = "x" ; then @@ -2095,10 +2139,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 ------------------------------------------------------------------------ @@ -2106,7 +2146,7 @@ dnl Check for expat libraries dnl ------------------------------------------------------------------------ if test "$wxUSE_EXPAT" != "no"; then - wxUSE_XML=1 + wxUSE_XML=yes AC_DEFINE(wxUSE_EXPAT) AC_DEFINE(wxUSE_XML) @@ -2149,6 +2189,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 ---------------------------------------------------------------- @@ -2213,6 +2272,14 @@ if test "$wxUSE_GUI" = "yes"; then 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" + esac fi if test "$wxUSE_GTK" = 1; then @@ -2330,13 +2397,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 ) @@ -2436,44 +2506,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, [ @@ -2512,7 +2544,7 @@ 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" @@ -2599,53 +2631,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" @@ -2702,40 +2697,101 @@ 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" + GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXm${libp_link} -lXmu -lXext -lXt${libsm_ice_link} -lX11" TOOLKIT_VPATH="\${top_srcdir}/src/motif${PATH_IFS}\${top_srcdir}/src/motif/xmcombo${PATH_IFS}\${top_srcdir}/src/x11" TOOLKIT=MOTIF GUIDIST=MOTIF_DIST - wxHAVE_XEXT_LIB=1 fi - if test "$wxUSE_X11" = 1 -o "$wxUSE_MOTIF" = 1 && - test "$wxHAVE_XEXT_LIB" = 1; then - save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $TOOLKIT_INCLUDE" + 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/morefilex -I/Developer/Headers/FlatCarbon" TOOLKIT_VPATH="\${top_srcdir}/src/mac${PATH_IFS}\${top_srcdir}/src/mac/morefilex" TOOLKIT=MAC @@ -2755,8 +2811,6 @@ equivalent variable and GTK+ is version 1.2.3 or above. 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" fi dnl the name of the directory where the files for this toolkit live @@ -2866,11 +2920,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 @@ -2888,6 +2942,9 @@ if test "$TOOLKIT" != "MSW" ; then fi if test "$wxUSE_ODBC" != "no" ; then AC_DEFINE(wxUSE_ODBC) + if test "$wxUSE_ODBC" = "builtin" ; then + AC_DEFINE(wxUSE_BUILTIN_IODBC) + fi SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS db" dnl is this still necessary in 2.5? @@ -2902,6 +2959,47 @@ if test "$wxUSE_ZLIB" = "builtin" ; then ALL_OBJECTS="${ALL_OBJECTS} \$(ZLIBOBJS)" fi +dnl --------------------------------------------------------------------------- +dnl Xinerama (for unix wxDisplay) - Brian Victor +dnl --------------------------------------------------------------------------- +if test "$wxUSE_DISPLAY" = "yes"; then + if test "$wxUSE_UNIX" = "yes" -a "$wxUSE_MAC" != 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 + fi +fi + dnl --------------------------------------------------------------------------- dnl OpenGL libraries dnl --------------------------------------------------------------------------- @@ -3105,7 +3203,7 @@ if test "$wxUSE_SHARED" = "yes"; then case "${host}" in *-*-linux* | *-*-gnu* ) SAMPLES_RPATH_FLAG="-Wl,-rpath,\$(top_builddir)lib" - ;; + ;; *-*-solaris2* ) if test "$GCC" = yes ; then @@ -3144,6 +3242,21 @@ if test "$wxUSE_SHARED" = "yes"; then SAMPLES_RPATH_FLAG="-R\$(top_builddir)lib" fi ;; + + powerpc-*-darwin* ) + SAMPLES_RPATH_POSTLINK="\$(top_builddir)change-install-names \$(LIBDIRNAME) \$(prefix) \$@" + cat <change-install-names +#!/bin/sh +libnames=\`cd \${1} ; ls -1 | grep '\.[[0-9]][[0-9]]*\.dylib\$'\` +inst_cmd="install_name_tool " +for i in \${libnames} ; do + inst_cmd="\${inst_cmd} -change \${2}/lib/\${i} \${1}/\${i}" +done +\${inst_cmd} \${3} +EOF + chmod +x change-install-names + ;; + esac dnl set target to shared if not explicitly chose static before @@ -3641,12 +3754,16 @@ AC_CHECK_FUNCS(inet_addr, [ AC_CHECK_LIB(nsl, inet_addr, INET_LINK="nsl", - AC_CHECK_LIB(resolv, inet_addr, - INET_LINK="resolv", - AC_CHECK_LIB(socket, inet_addr, - INET_LINK="socket" + [ + AC_CHECK_LIB(resolv, inet_addr, + INET_LINK="resolv", + [ + AC_CHECK_LIB(socket, inet_addr, + INET_LINK="socket" + ) + ] ) - ) + ] ) ] ) @@ -3680,6 +3797,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! @@ -3689,12 +3819,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 @@ -3921,22 +4052,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: @@ -4015,6 +4150,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 @@ -4147,12 +4287,6 @@ dnl --------------------------------------------------------------------------- dnl compatibility level dnl --------------------------------------------------------------------------- -if test "$WXWIN_COMPATIBILITY_2" = "yes"; then - AC_DEFINE(WXWIN_COMPATIBILITY_2) - - WXWIN_COMPATIBILITY_2_2="yes" -fi - if test "x$WXWIN_COMPATIBILITY_2_2" = "xyes"; then AC_DEFINE(WXWIN_COMPATIBILITY_2_2) @@ -4245,6 +4379,10 @@ if test "$wxUSE_ZIPSTREAM" = "yes"; then AC_DEFINE(wxUSE_ZIPSTREAM) fi +if test "$wxUSE_GZSTREAM" = "yes"; then + AC_DEFINE(wxUSE_GZSTREAM) +fi + if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes"; then AC_DEFINE(wxUSE_ON_FATAL_EXCEPTION) fi @@ -4477,10 +4615,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 @@ -4488,15 +4622,17 @@ if test "$wxUSE_SOCKETS" = "yes"; then if test "$TOOLKIT" != "MSW"; then dnl under Solaris and OS/2, socket functions live in -lsocket AC_CHECK_FUNC(socket,, - AC_CHECK_LIB(socket, socket, - if test "$INET_LINK" != " -lsocket"; then - INET_LINK="$INET_LINK -lsocket" - fi, - [ - AC_MSG_WARN([socket library not found - sockets will be disabled]) - wxUSE_SOCKETS=no - ] - ) + [ + AC_CHECK_LIB(socket, socket, + if test "$INET_LINK" != " -lsocket"; then + INET_LINK="$INET_LINK -lsocket" + fi, + [ + AC_MSG_WARN([socket library not found - sockets will be disabled]) + wxUSE_SOCKETS=no + ] + ) + ] ) fi fi @@ -4649,7 +4785,7 @@ dnl DLL support dnl ------------------------------------------------------------------------ dnl under MSW we always have LoadLibrary/GetProcAddress -if test "$TOOLKIT" != "MSW"; then +if test "$TOOLKIT" != "MSW" -a "$USE_OS2" != 1; then HAVE_DL_FUNCS=0 HAVE_SHL_FUNCS=0 @@ -4692,8 +4828,11 @@ if test "$TOOLKIT" != "MSW"; then 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))) + AC_DEFINE(HAVE_DLERROR), + [ + AC_CHECK_LIB(dl, dlerror, AC_DEFINE(HAVE_DLERROR)) + ] + ) fi fi @@ -4729,11 +4868,11 @@ fi if test "$wxUSE_UNICODE" = "yes" ; then AC_DEFINE(wxUSE_UNICODE) - if test "$wxUSE_MSW" != 1; then + if test "$USE_WIN32" != 1; then wxUSE_UNICODE_MSLU=no fi - if test "$wxUSE_MSW" = 1 -a "$wxUSE_UNICODE_MSLU" = "yes"; then + if test "$USE_WIN32" = 1 -a "$wxUSE_UNICODE_MSLU" = "yes"; then AC_CHECK_LIB(unicows,main, [ AC_DEFINE(wxUSE_UNICODE_MSLU) @@ -5000,6 +5139,11 @@ if test "$wxUSE_IMAGLIST" = "yes"; then AC_DEFINE(wxUSE_IMAGLIST) fi +if test "$wxUSE_LISTBOOK" = "yes"; then + AC_DEFINE(wxUSE_LISTBOOK) + USES_CONTROLS=1 +fi + if test "$wxUSE_LISTBOX" = "yes"; then AC_DEFINE(wxUSE_LISTBOX) USES_CONTROLS=1 @@ -5171,16 +5315,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 @@ -5201,19 +5341,26 @@ 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 + AC_DEFINE(wxUSE_EXCEPTIONS) +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" fi if test "$wxUSE_MENUS" = "yes"; then @@ -5229,27 +5376,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" @@ -5259,41 +5399,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 @@ -5410,6 +5554,10 @@ if test "$wxUSE_HTML" = "yes" ; then CORE_GUI_LIBS="html $CORE_GUI_LIBS" fi +if test "$wxUSE_GUI" != "yes"; then + CORE_GUI_LIBS="" +fi + AC_SUBST(CORE_BASE_LIBS) AC_SUBST(CORE_GUI_LIBS) @@ -5486,7 +5634,7 @@ if test "$wxUSE_GUI" = "yes"; then dnl ipc, mfc, nativdlg, oleauto, ownerdrw SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS artprov controls dialogs \ drawing dynamic erase event exec font image \ - minimal propsize rotate shaped widgets" + minimal propsize rotate shaped widgets render" if test "$wxUSE_MONOLITHIC" != "yes"; then SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS console" @@ -5498,15 +5646,12 @@ 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 +dnl note that the order is somewhat important: wxWindows 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_NAME} \ --I\${top_srcdir}/include \ -$REGEX_INCLUDE $ZLIB_INCLUDE $PNG_INCLUDE $JPEG_INCLUDE $TIFF_INCLUDE \ -$TOOLKIT_INCLUDE" +-I\${top_srcdir}/include $TOOLKIT_INCLUDE" dnl C/C++ compiler options used to compile wxWindows if test "$GXX" = yes ; then @@ -5527,6 +5672,7 @@ CXXFLAGS=`echo $CODE_GEN_FLAGS $CODE_GEN_FLAGS_CXX $EXTRA_CFLAGS $CXXFLAGS $CXXW LIBS=`echo $LIBS | sed 's/ \+/ /g'` 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'` @@ -5617,6 +5763,7 @@ AC_SUBST(MONOLITHIC) 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) @@ -5625,15 +5772,31 @@ 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_BAKEFILE +dnl Find out if we have to define NO_GCC_PRAGMA and WX_PRECOMP: +if test $GCC_PCH = 1 ; then + CODE_GEN_FLAGS="-DWX_PRECOMP -DNO_GCC_PRAGMA $CODE_GEN_FLAGS" + CPPFLAGS="-DWX_PRECOMP -DNO_GCC_PRAGMA $CPPFLAGS" +else + case "${host}" in + powerpc-*-darwin* ) + dnl Some Apple's GCC version are broken and can't handle the + dnl pragmas: + CODE_GEN_FLAGS="-DNO_GCC_PRAGMA $CODE_GEN_FLAGS" + CPPFLAGS="-DNO_GCC_PRAGMA $CPPFLAGS" + ;; + esac +fi + dnl for convenience, sort the samples in alphabetical order dnl @@ -5646,7 +5809,6 @@ 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(LEX_STEM) AC_SUBST(PATH_IFS) dnl global options @@ -5706,6 +5868,7 @@ 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(CODE_GEN_FLAGS) AC_SUBST(CODE_GEN_FLAGS_CXX) @@ -5834,6 +5997,7 @@ for subdir in `echo $SUBDIRS`; do if test ${subdir} = "samples"; then dnl only take those samples which compile in the current dnl configuration and which exist + makefiles="samples/Makefile.in $makefiles" for sample in `echo $SAMPLES_SUBDIRS`; do if test -d $srcdir/samples/$sample; then makefiles="samples/$sample/Makefile.in $makefiles" @@ -5846,11 +6010,12 @@ for subdir in `echo $SUBDIRS`; do dnl don't take all samples/utils, just those which build with dnl wxBase if test ${subdir} = "samples"; then - makefiles="samples/console/Makefile.in" + makefiles="samples/Makefile.in samples/console/Makefile.in" else dnl utils makefiles="utils/HelpGen/Makefile.in \ utils/HelpGen/src/Makefile.in \ - utils/makegen/Makefile.in" + utils/tex2rtf/Makefile.in \ + utils/tex2rtf/src/Makefile.in" fi fi @@ -5868,7 +6033,7 @@ dnl report on what we decided to do echo echo "Configured wxWindows ${WX_VERSION} for \`${host}'" echo "" -echo " Which GUI toolkit should wxWindows use? ${TOOLKIT:-base only}" +echo " Which GUI toolkit should wxWindows use? ${TOOLKIT_LOWERCASE:-base only}" echo " Should wxWindows be compiled into single library? ${wxUSE_MONOLITHIC:-yes}" echo " Should wxWindows be compiled in debug mode? ${wxUSE_DEBUG:-no}" @@ -5876,7 +6041,6 @@ echo " Should wxWindows be linked as a shared library? ${wxUSE_SHARED:- echo " Should wxWindows be compiled in Unicode mode? ${wxUSE_UNICODE:-no}" echo " What level of wxWindows compatibility should be enabled?" -echo " wxWindows 2.0 ${WXWIN_COMPATIBILITY_2:-no}" echo " wxWindows 2.2 ${WXWIN_COMPATIBILITY_2_2:-no}" echo " wxWindows 2.4 ${WXWIN_COMPATIBILITY_2_4:-yes}" @@ -5885,9 +6049,13 @@ echo " jpeg ${wxUSE_LIBJPEG- 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 ""