dnl Process this file with autoconf to produce a configure script.
AC_REVISION($Id$)dnl
+AC_PREREQ(2.57)
+
dnl ---------------------------------------------------------------------------
dnl
dnl Top-level configure.in for wxWindows by Robert Roebling, Phil Blecker,
dnl initialization
dnl ---------------------------------------------------------------------------
-dnl the file passed to AC_INIT should be specific to our package
-AC_INIT([wx-config.in])
+AC_INIT([wxWindows], [2.5.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])
dnl sets build, host, target variables and the same with _alias
-AC_CANONICAL_SYSTEM
+AC_CANONICAL_BUILD
+AC_CANONICAL_HOST
+AC_CANONICAL_TARGET
+
dnl When making releases do:
dnl
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
dnl Check platform (host system)
dnl ------------------------------------------------------------------------
-dnl assume Unix
+dnl OS (assume Unix)
USE_UNIX=1
+USE_OS2=0
USE_WIN32=0
USE_DOS=0
USE_BEOS=0
USE_MAC=0
-USE_LINUX=
-USE_SGI=
-USE_HPUX=
-USE_SYSV=
-USE_SVR4=
+dnl Unix kind
USE_AIX=
-USE_SUN=
-USE_SOLARIS=
-USE_SUNOS=
-USE_ALPHA=
-USE_OSF=
-USE_BSD=
-USE_DARWIN=
+USE_BSD= dnl any BSD
+USE_DARWIN= dnl a.k.a. Mac OS X
USE_FREEBSD=
-USE_OPENBSD=
+USE_GNU= dnl GNU/Hurd
+USE_HPUX=
+USE_LINUX=
USE_NETBSD=
+USE_OPENBSD=
+USE_OSF= dnl OSF/1 (obsolete?)
+USE_SGI=
+USE_SOLARIS= dnl Solaris ("SunOS" >= 5)
+USE_SUN= dnl SunOS or Solaris
+USE_SUNOS= dnl old/real SunOS (obsolete)
+USE_SVR4= dnl SysV R4
+USE_SYSV= dnl any System V
USE_VMS=
USE_ULTRIX=
-USE_DATA_GENERAL=
+USE_UNIXWARE=
+
+dnl hardware platform
+USE_ALPHA=
dnl on some platforms xxx_r() functions are declared inside "#ifdef
dnl _REENTRANT" and it's easier to just define this symbol for these platforms
dnl the list of all available toolkits
dnl
dnl update NUM_TOOLKITS calculation below when adding a new toolkit here!
-ALL_TOOLKITS="GTK MAC MGL MICROWIN MOTIF MSW PM WINE X11"
+ALL_TOOLKITS="COCOA GTK MAC MGL MICROWIN MOTIF MSW PM X11"
dnl NB: these wxUSE_XXX constants have value of 0 or 1 unlike all the other ones
dnl which are either yes or no
+DEFAULT_wxUSE_COCOA=0
DEFAULT_wxUSE_GTK=0
DEFAULT_wxUSE_MAC=0
DEFAULT_wxUSE_MGL=0
DEFAULT_wxUSE_MOTIF=0
DEFAULT_wxUSE_MSW=0
DEFAULT_wxUSE_PM=0
-DEFAULT_wxUSE_WINE=0
DEFAULT_wxUSE_X11=0
dnl these are the values which are really default for the given platform -
dnl they're not cached and are only used if no --with-toolkit was given *and*
dnl nothing was found in the cache
+DEFAULT_DEFAULT_wxUSE_COCOA=0
DEFAULT_DEFAULT_wxUSE_GTK=0
DEFAULT_DEFAULT_wxUSE_MAC=0
DEFAULT_DEFAULT_wxUSE_MGL=0
DEFAULT_DEFAULT_wxUSE_MOTIF=0
DEFAULT_DEFAULT_wxUSE_MSW=0
DEFAULT_DEFAULT_wxUSE_PM=0
-DEFAULT_DEFAULT_wxUSE_WINE=0
DEFAULT_DEFAULT_wxUSE_X11=0
PROGRAM_EXT=
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"
fi
DEFAULT_DEFAULT_wxUSE_GTK=1
;;
+ *-*-gnu* )
+ USE_GNU=1
+ AC_DEFINE(__GNU__)
+ TMP=`uname -m`
+ if test "x$TMP" = "xalpha"; then
+ USE_ALPHA=1
+ AC_DEFINE(__ALPHA__)
+ fi
+ DEFAULT_DEFAULT_wxUSE_GTK=1
+ ;;
*-*-irix5* | *-*-irix6* )
USE_SGI=1
USE_SVR4=1
dnl
dnl Both archive libraries and shared libraries on AIX have an .a
dnl extension. This will explain why you can't link with an .so and
- dnl why it works with the name changed to .a.
+ dnl why it works with the name changed to .a.
SO_SUFFIX=a
AC_DEFINE(__AIX__)
AC_DEFINE(__SYSV__)
DEFAULT_DEFAULT_wxUSE_MOTIF=1
;;
+ *-*-*UnixWare*)
+ USE_SYSV=1
+ USE_SVR4=1
+ USE_UNIXWARE=1
+ AC_DEFINE(__UNIXWARE__)
+ ;;
+
*-*-cygwin* | *-*-mingw32* )
dnl MBN: some of the defines have been moved after toolkit detection
dnl because for wxMotif/wxGTK/wxX11 to build on Cygwin
*-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* )
AC_DEFINE(__BSD__)
AC_DEFINE(__DARWIN__)
AC_DEFINE(__POWERPC__)
+ AC_DEFINE(TARGET_CARBON)
DEFAULT_DEFAULT_wxUSE_MAC=1
;;
DEBUG_CONFIGURE=0
if test $DEBUG_CONFIGURE = 1; then
DEFAULT_wxUSE_UNIVERSAL=no
+ DEFAULT_wxUSE_STL=no
DEFAULT_wxUSE_NANOX=no
DEFAULT_wxUSE_THREADS=yes
DEFAULT_wxUSE_SHARED=yes
- DEFAULT_wxUSE_SONAME=no
DEFAULT_wxUSE_OPTIMISE=no
DEFAULT_wxUSE_PROFILE=no
DEFAULT_wxUSE_NO_DEPS=no
DEFAULT_wxUSE_MEM_TRACING=no
DEFAULT_wxUSE_DEBUG_CONTEXT=no
DEFAULT_wxUSE_DMALLOC=no
- DEFAULT_wxUSE_PRECOMP=no
DEFAULT_wxUSE_APPLE_IEEE=no
+ DEFAULT_wxUSE_EXCEPTIONS=no
DEFAULT_wxUSE_LOG=yes
DEFAULT_wxUSE_LOGWINDOW=no
DEFAULT_wxUSE_LOGGUI=no
DEFAULT_wxUSE_CONTROLS=no
DEFAULT_wxUSE_REGEX=no
+ DEFAULT_wxUSE_XML=no
+ DEFAULT_wxUSE_EXPAT=no
DEFAULT_wxUSE_ZLIB=no
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
DEFAULT_wxUSE_STD_IOSTREAM=no
DEFAULT_wxUSE_CMDLINE_PARSER=no
DEFAULT_wxUSE_DATETIME=no
- DEFAULT_wxUSE_TIMEDATE=no
DEFAULT_wxUSE_TIMER=no
DEFAULT_wxUSE_STOPWATCH=no
DEFAULT_wxUSE_FILE=no
DEFAULT_wxUSE_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
DEFAULT_wxUSE_NORMALIZED_PS_FONTS=no
DEFAULT_wxUSE_POSTSCRIPT=no
- DEFAULT_wxUSE_X_RESOURCES=no
DEFAULT_wxUSE_CLIPBOARD=no
DEFAULT_wxUSE_TOOLTIPS=no
DEFAULT_wxUSE_DRAG_AND_DROP=no
DEFAULT_wxUSE_DOC_VIEW_ARCHITECTURE=no
DEFAULT_wxUSE_PRINTING_ARCHITECTURE=no
- DEFAULT_wxUSE_PROLOGIO=no
DEFAULT_wxUSE_RESOURCES=no
DEFAULT_wxUSE_CONSTRAINTS=no
DEFAULT_wxUSE_IPC=no
DEFAULT_wxUSE_FS_ZIP=no
DEFAULT_wxUSE_BUSYINFO=no
DEFAULT_wxUSE_ZIPSTREAM=no
+ DEFAULT_wxUSE_GZSTREAM=no
DEFAULT_wxUSE_VALIDATORS=no
DEFAULT_wxUSE_ACCEL=no
DEFAULT_wxUSE_CHECKLST=no
DEFAULT_wxUSE_CHOICE=no
DEFAULT_wxUSE_COMBOBOX=no
+ DEFAULT_wxUSE_DISPLAY=no
DEFAULT_wxUSE_GAUGE=no
DEFAULT_wxUSE_GRID=no
- DEFAULT_wxUSE_NEW_GRID=no
DEFAULT_wxUSE_IMAGLIST=no
+ DEFAULT_wxUSE_LISTBOOK=no
DEFAULT_wxUSE_LISTBOX=no
DEFAULT_wxUSE_LISTCTRL=no
DEFAULT_wxUSE_NOTEBOOK=no
- DEFAULT_wxUSE_PROPSHEET=no
DEFAULT_wxUSE_RADIOBOX=no
DEFAULT_wxUSE_RADIOBTN=no
DEFAULT_wxUSE_SASH=no
DEFAULT_wxUSE_IFF=no
DEFAULT_wxUSE_XPM=no
DEFAULT_wxUSE_ICO_CUR=no
+ DEFAULT_wxUSE_ACCESSIBILITY=no
+
+ DEFAULT_wxUSE_MONOLITHIC=no
+ DEFAULT_wxUSE_PLUGINS=no
+ DEFAULT_wxUSE_OFFICIAL_BUILD=no
else
DEFAULT_wxUSE_UNIVERSAL=no
+ DEFAULT_wxUSE_STL=no
DEFAULT_wxUSE_NANOX=no
DEFAULT_wxUSE_THREADS=yes
DEFAULT_wxUSE_SHARED=yes
- DEFAULT_wxUSE_SONAME=no
DEFAULT_wxUSE_OPTIMISE=yes
DEFAULT_wxUSE_PROFILE=no
DEFAULT_wxUSE_NO_DEPS=no
DEFAULT_wxUSE_MEM_TRACING=no
DEFAULT_wxUSE_DEBUG_CONTEXT=no
DEFAULT_wxUSE_DMALLOC=no
- DEFAULT_wxUSE_PRECOMP=no
DEFAULT_wxUSE_APPLE_IEEE=yes
+ DEFAULT_wxUSE_EXCEPTIONS=yes
DEFAULT_wxUSE_LOG=yes
DEFAULT_wxUSE_LOGWINDOW=yes
DEFAULT_wxUSE_LOGGUI=yes
DEFAULT_wxUSE_GUI=yes
DEFAULT_wxUSE_REGEX=yes
+ DEFAULT_wxUSE_XML=yes
+ DEFAULT_wxUSE_EXPAT=yes
DEFAULT_wxUSE_ZLIB=yes
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
DEFAULT_wxUSE_STD_IOSTREAM=no
DEFAULT_wxUSE_CMDLINE_PARSER=yes
DEFAULT_wxUSE_DATETIME=yes
- DEFAULT_wxUSE_TIMEDATE=no
DEFAULT_wxUSE_TIMER=yes
DEFAULT_wxUSE_STOPWATCH=yes
DEFAULT_wxUSE_FILE=yes
DEFAULT_wxUSE_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
DEFAULT_wxUSE_NORMALIZED_PS_FONTS=yes
DEFAULT_wxUSE_POSTSCRIPT=yes
- DEFAULT_wxUSE_X_RESOURCES=no
DEFAULT_wxUSE_CLIPBOARD=yes
DEFAULT_wxUSE_TOOLTIPS=yes
DEFAULT_wxUSE_DRAG_AND_DROP=yes
DEFAULT_wxUSE_DOC_VIEW_ARCHITECTURE=yes
DEFAULT_wxUSE_PRINTING_ARCHITECTURE=yes
- DEFAULT_wxUSE_PROLOGIO=no
DEFAULT_wxUSE_RESOURCES=no
DEFAULT_wxUSE_CONSTRAINTS=yes
DEFAULT_wxUSE_IPC=yes
DEFAULT_wxUSE_FS_ZIP=yes
DEFAULT_wxUSE_BUSYINFO=yes
DEFAULT_wxUSE_ZIPSTREAM=yes
+ DEFAULT_wxUSE_GZSTREAM=yes
DEFAULT_wxUSE_VALIDATORS=yes
DEFAULT_wxUSE_ACCEL=yes
DEFAULT_wxUSE_CHECKLST=yes
DEFAULT_wxUSE_CHOICE=yes
DEFAULT_wxUSE_COMBOBOX=yes
+ DEFAULT_wxUSE_DISPLAY=no
DEFAULT_wxUSE_GAUGE=yes
DEFAULT_wxUSE_GRID=yes
- DEFAULT_wxUSE_NEW_GRID=yes
DEFAULT_wxUSE_IMAGLIST=yes
+ DEFAULT_wxUSE_LISTBOOK=yes
DEFAULT_wxUSE_LISTBOX=yes
DEFAULT_wxUSE_LISTCTRL=yes
DEFAULT_wxUSE_NOTEBOOK=yes
- DEFAULT_wxUSE_PROPSHEET=yes
DEFAULT_wxUSE_RADIOBOX=yes
DEFAULT_wxUSE_RADIOBTN=yes
DEFAULT_wxUSE_SASH=yes
DEFAULT_wxUSE_PNM=yes
DEFAULT_wxUSE_XPM=yes
DEFAULT_wxUSE_ICO_CUR=yes
+ DEFAULT_wxUSE_ACCESSIBILITY=no
+
+ DEFAULT_wxUSE_MONOLITHIC=no
+ DEFAULT_wxUSE_PLUGINS=no
+ DEFAULT_wxUSE_OFFICIAL_BUILD=no
fi
dnl WX_ARG_WITH should be used to select whether an external package will be
dnl ---------------------------------------------------------------------------
WX_ARG_ENABLE(gui, [ --enable-gui use GUI classes], wxUSE_GUI)
+WX_ARG_ENABLE(monolithic, [ --enable-monolithic build wxWindows as single library], wxUSE_MONOLITHIC)
+WX_ARG_ENABLE(plugins, [ --enable-plugins build parts of wxWindows as loadable components], wxUSE_PLUGINS)
if test "$wxUSE_GUI" = "yes"; then
AC_ARG_WITH(gtk, [ --with-gtk use GTK+], [wxUSE_GTK="$withval" CACHE_GTK=1 TOOLKIT_GIVEN=1])
AC_ARG_WITH(motif, [ --with-motif use Motif/Lesstif], [wxUSE_MOTIF="$withval" CACHE_MOTIF=1 TOOLKIT_GIVEN=1])
AC_ARG_WITH(mac, [ --with-mac use Mac OS X], [wxUSE_MAC="$withval" TOOLKIT_GIVEN=1])
-AC_ARG_WITH(wine, [ --with-wine use WINE], [wxUSE_WINE="$withval" CACHE_WINE=1 TOOLKIT_GIVEN=1])
+AC_ARG_WITH(cocoa, [ --with-cocoa use Cocoa], [wxUSE_COCOA="$withval" TOOLKIT_GIVEN=1])
+AC_ARG_WITH(wine, [ --with-wine use Wine], [wxUSE_WINE="$withval" CACHE_WINE=1])
AC_ARG_WITH(msw, [ --with-msw use MS-Windows], [wxUSE_MSW="$withval" CACHE_MSW=1 TOOLKIT_GIVEN=1])
AC_ARG_WITH(pm, [ --with-pm use OS/2 Presentation Manager], [wxUSE_PM="$withval" CACHE_PM=1 TOOLKIT_GIVEN=1])
AC_ARG_WITH(mgl, [ --with-mgl use SciTech MGL], [wxUSE_MGL="$withval" wxUSE_UNIVERSAL="yes" CACHE_MGL=1 TOOLKIT_GIVEN=1])
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
WX_ARG_WITH(dmalloc, [ --with-dmalloc use dmalloc library (http://dmalloc.com/)], wxUSE_DMALLOC)
WX_ARG_SYS_WITH(regex, [ --with-regex enable support for wxRegEx class], wxUSE_REGEX)
WX_ARG_SYS_WITH(zlib, [ --with-zlib use zlib for LZW compression], wxUSE_ZLIB)
-WX_ARG_WITH(odbc, [ --with-odbc use the IODBC and wxODBC classes], wxUSE_ODBC)
+WX_ARG_SYS_WITH(odbc, [ --with-odbc use the IODBC and wxODBC classes], wxUSE_ODBC)
+WX_ARG_SYS_WITH(expat, [ --with-expat enable XML support using expat parser], wxUSE_EXPAT)
dnl ---------------------------------------------------------------------------
dnl compile options
dnl ---------------------------------------------------------------------------
WX_ARG_ENABLE(shared, [ --enable-shared create shared library code], wxUSE_SHARED)
-WX_ARG_ENABLE(soname, [ --enable-soname set the DT_SONAME field in ELF shared libraries], wxUSE_SONAME)
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)
-
-dnl allow the precompiled header option to be disabled under Mac OS X/Darwin
-WX_ARG_ENABLE(precomp, [ --enable-precomp enable use of precompiled headers (Mac OS X/Darwin)], wxUSE_PRECOMP)
+WX_ARG_ENABLE(stl, [ --enable-stl use STL for containers], wxUSE_STL)
if test "$wxUSE_DEBUG" = "yes"; then
DEFAULT_wxUSE_DEBUG_FLAG=yes
DEFAULT_wxUSE_DEBUG_INFO=yes
+ BUILD=debug
elif test "$wxUSE_DEBUG" = "no"; then
DEFAULT_wxUSE_DEBUG_FLAG=no
DEFAULT_wxUSE_DEBUG_INFO=no
+ BUILD=release
fi
WX_ARG_ENABLE(debug_flag, [ --enable-debug_flag set __WXDEBUG__ flag (recommended for developers!)], wxUSE_DEBUG_FLAG)
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, [ --disable-compat22 disable wxWindows 2.2 compatibility], WXWIN_COMPATIBILITY_2_2, disable)
+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)
AC_ARG_ENABLE(rpath, [ --enable-rpath=DIR output the rpath flag from wx-config], [wxRPATH_DIR="$enableval"])
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(timedate, [ --enable-timedate use obsolete wxDate/wxTime classes], wxUSE_TIMEDATE)
-WX_ARG_ENABLE(stopwatch, [ --enable-stopwatch use wxStopWatch class], wxUSE_STOPWATCH)
WX_ARG_ENABLE(dialupman, [ --enable-dialupman use dialup network classes], wxUSE_DIALUP_MANAGER)
-WX_ARG_ENABLE(apple_ieee, [ --enable-apple_ieee use the Apple IEEE codec], wxUSE_APPLE_IEEE)
-WX_ARG_ENABLE(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(sound, [ --enable-sound use wxSound class], wxUSE_SOUND)
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)
dnl resources
dnl ---------------------------------------------------------------------------
-WX_ARG_ENABLE(prologio, [ --enable-prologio use Prolog IO library], wxUSE_PROLOGIO)
-WX_ARG_ENABLE(resources, [ --enable-resources use wxWindows resources], wxUSE_RESOURCES)
-
-WX_ARG_ENABLE(xresources, [ --enable-xresources use X resources for save (default for gtk+)], wxUSE_X_RESOURCES)
+WX_ARG_ENABLE(prologio, [ --enable-prologio not available; see contrib], wxUSE_PROLOGIO)
+WX_ARG_ENABLE(resources, [ --enable-resources not available; see contrib], wxUSE_RESOURCES)
dnl ---------------------------------------------------------------------------
dnl IPC &c
dnl ---------------------------------------------------------------------------
-WX_ARG_ENABLE(clipboard, [ --enable-clipboard use wxClipboard classes], wxUSE_CLIPBOARD)
+WX_ARG_ENABLE(clipboard, [ --enable-clipboard use wxClipboard class], wxUSE_CLIPBOARD)
WX_ARG_ENABLE(dnd, [ --enable-dnd use Drag'n'Drop classes], wxUSE_DRAG_AND_DROP)
WX_ARG_ENABLE(metafile, [ --enable-metafile use win32 metafiles], wxUSE_METAFILE)
-WX_ARG_ENABLE(treelayout, [ --enable-treelayout use wxTreeLayout classes], wxUSE_TREELAYOUT)
+dnl WX_ARG_ENABLE(treelayout, [ --enable-treelayout use wxTreeLayout class], wxUSE_TREELAYOUT)
dnl ---------------------------------------------------------------------------
dnl optional GUI controls (in alphabetical order except the first one)
DEFAULT_wxUSE_CHOICE=yes
DEFAULT_wxUSE_GAUGE=yes
DEFAULT_wxUSE_GRID=yes
- DEFAULT_wxUSE_NEW_GRID=yes
DEFAULT_wxUSE_IMAGLIST=yes
+ DEFAULT_wxUSE_LISTBOOK=yes
DEFAULT_wxUSE_LISTBOX=yes
DEFAULT_wxUSE_LISTCTRL=yes
DEFAULT_wxUSE_NOTEBOOK=yes
- DEFAULT_wxUSE_PROPSHEET=yes
DEFAULT_wxUSE_RADIOBOX=yes
DEFAULT_wxUSE_RADIOBTN=yes
DEFAULT_wxUSE_SASH=yes
DEFAULT_wxUSE_CHOICE=no
DEFAULT_wxUSE_GAUGE=no
DEFAULT_wxUSE_GRID=no
- DEFAULT_wxUSE_NEW_GRID=no
DEFAULT_wxUSE_IMAGLIST=no
+ DEFAULT_wxUSE_LISTBOOK=no
DEFAULT_wxUSE_LISTBOX=no
DEFAULT_wxUSE_LISTCTRL=no
DEFAULT_wxUSE_NOTEBOOK=no
- DEFAULT_wxUSE_PROPSHEET=no
DEFAULT_wxUSE_RADIOBOX=no
DEFAULT_wxUSE_RADIOBTN=no
DEFAULT_wxUSE_SASH=no
DEFAULT_wxUSE_TIPWINDOW=no
fi
+## FIXME: This is a blatant hack
+if test "x$wxUSE_COCOA" != "x" -a "$wxUSE_COCOA" != "0" ; then
+ wxUSE_PRINTING_ARCHITECTURE=no
+ wxUSE_DRAG_AND_DROP=no
+ # Generic notebook requires tab dialog
+ DEFAULT_wxUSE_TABDIALOG=yes
+ DEFAULT_wxUSE_SCROLLBAR=no
+ DEFAULT_wxUSE_TOOLTIPS=no
+ DEFAULT_wxUSE_DRAGIMAGE=no
+fi
+
WX_ARG_ENABLE(accel, [ --enable-accel use accelerators], wxUSE_ACCEL)
WX_ARG_ENABLE(button, [ --enable-button use wxButton class], wxUSE_BUTTON)
WX_ARG_ENABLE(bmpbutton, [ --enable-bmpbutton use wxBitmapButton class], wxUSE_BMPBUTTON)
WX_ARG_ENABLE(checkbox, [ --enable-checkbox use wxCheckBox class], wxUSE_CHECKBOX)
WX_ARG_ENABLE(checklst, [ --enable-checklst use wxCheckListBox (listbox with checkboxes) class], wxUSE_CHECKLST)
WX_ARG_ENABLE(choice, [ --enable-choice use wxChoice class], wxUSE_CHOICE)
-WX_ARG_ENABLE(combobox, [ --enable-combobox use wxComboBox classes], wxUSE_COMBOBOX)
+WX_ARG_ENABLE(combobox, [ --enable-combobox use wxComboBox class], wxUSE_COMBOBOX)
+WX_ARG_ENABLE(display, [ --enable-display use wxDisplay class], wxUSE_DISPLAY)
WX_ARG_ENABLE(gauge, [ --enable-gauge use wxGauge class], wxUSE_GAUGE)
WX_ARG_ENABLE(grid, [ --enable-grid use wxGrid class], wxUSE_GRID)
-WX_ARG_ENABLE(newgrid, [ --enable-newgrid use new wxGrid class], wxUSE_NEW_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)
-WX_ARG_ENABLE(propsheet, [ --enable-propsheet use wxPropertySheet class], wxUSE_PROPSHEET)
WX_ARG_ENABLE(radiobox, [ --enable-radiobox use wxRadioBox class], wxUSE_RADIOBOX)
WX_ARG_ENABLE(radiobtn, [ --enable-radiobtn use wxRadioButton class], wxUSE_RADIOBTN)
WX_ARG_ENABLE(sash, [ --enable-sash use wxSashWindow class], wxUSE_SASH)
WX_ARG_ENABLE(joystick, [ --enable-joystick use wxJoystick (Linux only)], wxUSE_JOYSTICK)
WX_ARG_ENABLE(metafile, [ --enable-metafiles use wxMetaFile (Windows only)], wxUSE_METAFILE)
WX_ARG_ENABLE(dragimage, [ --enable-dragimage use wxDragImage], wxUSE_DRAGIMAGE)
+WX_ARG_ENABLE(accessibility,[ --enable-accessibility enable accessibility support], wxUSE_ACCESSIBILITY)
dnl ---------------------------------------------------------------------------
dnl support for image formats that do not rely on external library
fi
+dnl ---------------------------------------------------------------------------
+dnl some win32 settings
+dnl ---------------------------------------------------------------------------
+
+WX_ARG_ENABLE(official_build, [ --enable-official_build official build of wxWindows (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
-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
AC_MSG_CHECKING(for toolkit)
+# In Wine, we need to default to MSW, not GTK or MOTIF
+if test "$wxUSE_WINE" = "yes"; then
+ DEFAULT_DEFAULT_wxUSE_GTK=0
+ DEFAULT_DEFAULT_wxUSE_MOTIF=0
+ DEFAULT_DEFAULT_wxUSE_MSW=1
+ wxUSE_SHARED=no
+fi
+
if test "$wxUSE_GUI" = "yes"; then
if test "$USE_BEOS" = 1; then
dnl we suppose that expr is available (maybe there is a better way to do
dnl this? what about using ALL_TOOLKITS? TODO)
- NUM_TOOLKITS=`expr ${wxUSE_GTK:-0} + ${wxUSE_MOTIF:-0} + ${wxUSE_MAC:-0} \
- + ${wxUSE_WINE:-0} + ${wxUSE_MSW:-0} + ${wxUSE_MGL:-0} + ${wxUSE_MICROWIN:-0} + ${wxUSE_X11:-0}`
+ NUM_TOOLKITS=`expr ${wxUSE_COCOA:-0} + ${wxUSE_GTK:-0} + ${wxUSE_MAC:-0} \
+ + ${wxUSE_MGL:-0} + ${wxUSE_MICROWIN:-0} \
+ + ${wxUSE_MOTIF:-0} + ${wxUSE_MSW:-0} + ${wxUSE_X11:-0}`
dnl Allow wxUSE_PM only for OS/2 with EMX.
case "${host}" in
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
done
else
- AC_MSG_RESULT(base ($host_alias hosted) only)
+ if test "x$host_alias" != "x"; then
+ AC_MSG_RESULT(base ($host_alias hosted) only)
+ else
+ AC_MSG_RESULT(base only)
+ fi
fi
dnl ---------------------------------------------------------------------------
;;
esac
+dnl ---------------------------------------------------------------------------
+dnl Wine is a virtual platform, we need to patch things up a bit
+dnl ---------------------------------------------------------------------------
+if test "$wxUSE_WINE" = "yes"; then
+ wants_win32=1
+ dnl FIXME: we should do a better job of testing for these
+ CC=winegcc
+ CXX=wineg++
+ RESCOMP=wrc
+ LDFLAGS_GUI="-mwindows"
+fi
+
dnl NB: The two tests bellow are *NOT* mutually exclusive! They should only
dnl take effect on Cygwin/Mingw and not other platforms.
if test "$wants_win32" = 1 ; then
AC_LANG_RESTORE
+dnl check if compiler includes /usr/local/include in
+dnl default include files search path.
+AC_MSG_CHECKING([for /usr/local/include in default include path])
+GCC_SEARCHES_USR_LOCAL_INCLUDE="no"
+if test "$GCC" = "yes" ; then
+ echo | gcc -v -x c++ -E - 2>&1 | sed -n '/^#include </,$p' | \
+ sed -n '1,/End of search list\./p' | \
+ grep '^ */usr/local/include$' 2>&1 /dev/null \
+ && GCC_SEARCHES_USR_LOCAL_INCLUDE="yes"
+fi
+AC_MSG_RESULT([$GCC_SEARCHES_USR_LOCAL_INCLUDE])
+
dnl ranlib command
dnl defines RANLIB with the appropriate command
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
AC_PROG_INSTALL
-dnl make install path absolute (if not already); will fail with MSDOS paths
+dnl make install path absolute (if not already);
+dnl will fail with (some) MSDOS paths
case ${INSTALL} in
/* ) # Absolute
;;
+ ?:* ) # Drive letter, considered as absolute.
+ ;;
*)
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
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 ---------------------------------------------------------------------------
-dnl (OS/2-only piece)
+dnl ------------------------------------------------------------------------
+dnl Platform specific tests
+dnl ------------------------------------------------------------------------
+
case "${host}" in
*-pc-os2_emx | *-pc-os2-emx )
- dnl Explicitly link -lstdcpp, since we are using "gcc" not "g++"/"c++".
- LIBS="$LIBS -lstdcpp"
+ 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).
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
+ 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 <string.h>
+ ],
+ [
+ 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 <strings.h>
+ ],
+ [
+ strcasecmp("foo", "bar");
+ ],
+ ac_cv_strings_strcasecmp=yes,
+ ac_cv_strings_strcasecmp=no
+ )
+ ])
+
+ if test x"$ac_cv_string_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
-if test "$wxUSE_MAC" != 1; then
- dnl defines HAVE_STRINGS_H
- AC_CHECK_HEADERS(strings.h)
-fi
-
dnl defines HAVE_STDLIB_H
AC_CHECK_HEADERS(stdlib.h)
dnl defines HAVE_MALLOC_H
dnl defines HAVE_LANGINFO_H (GNU libc locale parameters)
AC_CHECK_HEADERS(langinfo.h)
+case "${host}" in
+ *-pc-os2_emx | *-pc-os2-emx )
+ dnl Explicitly link -lintl if langinfo.h is available.
+ if test $ac_cv_header_langinfo_h = "yes"; then
+ LIBS="$LIBS -lintl"
+ fi
+ ;;
+esac
+
if test "$wxUSE_GUI" = "yes"; then
- if test "$wxUSE_UNIX" = "yes"; then
+ 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 <X11/Xlib.h>
+ #endif
+ ])
fi
fi
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* )
dnl check whether C++ compiler supports explicit keyword
WX_CPP_EXPLICIT
+dnl check whether C++ compiler supports C++ casts
+AC_CXX_CONST_CAST
+AC_CXX_STATIC_CAST
+
+dnl check various STL features
+if test "$wxUSE_STL" = "yes"; then
+ AC_LANG_PUSH(C++)
+
+ dnl check for basic STL functionality
+ AC_MSG_CHECKING([for basic STL functionality])
+ AC_TRY_COMPILE([#include <string>
+ #include <functional>
+ #include <algorithm>
+ #include <vector>
+ #include <list>],
+ [std::vector<int> moo;
+ std::list<int> foo;
+ std::vector<int>::iterator it =
+ std::find_if(moo.begin(), moo.end(),
+ std::bind2nd(std::less<int>(), 3));],
+ [AC_MSG_RESULT([yes])],
+ [AC_MSG_RESULT([no])
+ AC_MSG_ERROR([Basic STL functionality missing])])
+
+ dnl check if <string> declares std::wstring
+ AC_MSG_CHECKING([for std::wstring in <string>])
+ AC_TRY_COMPILE([#include <string>],
+ [std::wstring foo;],
+ [AC_MSG_RESULT(yes)
+ AC_DEFINE(HAVE_STD_WSTRING)],
+ [AC_MSG_RESULT(no)])
+
+ dnl check for compliant std::string::compare
+ AC_MSG_CHECKING([for compliant std::string::compare])
+ AC_TRY_COMPILE([#include <string>],
+ [std::string foo, bar;
+ foo.compare(bar);
+ foo.compare(1, 1, bar);
+ foo.compare(1, 1, bar, 1, 1);
+ foo.compare("");
+ foo.compare(1, 1, "");
+ foo.compare(1, 1, "", 2);],
+ [AC_MSG_RESULT(yes)
+ AC_DEFINE(HAVE_STD_STRING_COMPARE)],
+ [AC_MSG_RESULT(no)])
+
+ AC_LANG_POP
+fi
+
dnl ---------------------------------------------------------------------------
dnl Define search path for includes and libraries: all headers and libs will be
dnl looked for in all directories of this path
dnl
dnl 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 \
\
\
/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
dnl
dnl VZ: I have no idea why had this check been there originally, but now
dnl we could probably do without it by just always adding _GNU_SOURCE
-if test "$USE_LINUX" = 1; then
+if test "$USE_LINUX" = 1 -o "$USE_GNU" = 1; then
AC_CACHE_CHECK([for glibc 2.1 or later], wx_cv_lib_glibc21,[
AC_TRY_COMPILE([#include <features.h>],
[
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
dnl on some old systems it may be in libregex - check for it too?
- AC_CHECK_HEADER(regex.h, AC_CHECK_FUNCS(regcomp))
+ AC_CHECK_HEADER(regex.h, [AC_CHECK_FUNCS(regcomp)])
if test "x$ac_cv_func_regcomp" != "xyes"; then
if test "$wxUSE_REGEX" = "sys" ; then
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)
dnl has anything more ancient (1.1.3 was released in July 1998)
dnl anyhow
AC_CACHE_CHECK([for zlib.h >= 1.1.4], ac_cv_header_zlib_h,
- AC_TRY_RUN(
+ [AC_TRY_RUN(
+ dnl zlib.h defines ZLIB_VERSION="x.y.z"
[
- dnl zlib.h defines ZLIB_VERSION="x.y.z"
#include <zlib.h>
#include <stdio.h>
- dnl don't use the brackets as quotes, we need them
- changequote(,)
int main()
{
FILE *f=fopen("conftestval", "w");
ZLIB_VERSION[4] >= '4')) ? "yes" : "no");
exit(0);
}
- changequote([,])
],
ac_cv_header_zlib_h=`cat conftestval`,
ac_cv_header_zlib_h=no,
- dnl cross-compiling: test if we have any zlib.h
- AC_CHECK_HEADER(zlib.h)
- )
+ dnl cross-compiling: don't have an answer, try later
+ unset ac_cv_header_zlib_h
+ )]
)
+ dnl If the test above did not come up with a value (e.g. cross
+ dnl compiling) then this should give a definitive answer
+ AC_CHECK_HEADER(zlib.h)
system_zlib_h_ok=$ac_cv_header_zlib_h
fi
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)
dnl libpng version 0.9 is known to not work, if an even newer
dnl version is required, just bump it up in the test below
AC_CACHE_CHECK([for png.h > 0.90], ac_cv_header_png_h,
- AC_TRY_RUN(
+ [AC_TRY_RUN(
+ dnl png.h defines PNG_LIBPNG_VER=number
[
- dnl png.h defines PNG_LIBPNG_VER=number
#include <png.h>
#include <stdio.h>
],
ac_cv_header_png_h=`cat conftestval`,
ac_cv_header_png_h=no,
- dnl cross-compiling: test if we have any png.h
- AC_CHECK_HEADER(png.h)
- )
+ dnl cross-compiling: test (later) if we have any png.h
+ unset ac_cv_header_png_h
+ )]
)
+ 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])
fi
fi
- if test "$wxUSE_LIBPNG" = "builtin" ; then
- PNG_INCLUDE="-I\${top_srcdir}/src/png"
- fi
-
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS png"
fi
dnl Check for jpeg library
dnl ------------------------------------------------------------------------
-JPEG_INCLUDE=
JPEG_LINK=
if test "$wxUSE_LIBJPEG" != "no" ; then
AC_DEFINE(wxUSE_LIBJPEG)
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
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
wxUSE_LIBTIFF=sys
fi
fi
+fi
- if test "$wxUSE_LIBTIFF" = "builtin" ; then
- TIFF_INCLUDE="-I\${top_srcdir}/src/tiff"
+dnl ------------------------------------------------------------------------
+dnl Check for expat libraries
+dnl ------------------------------------------------------------------------
+
+if test "$wxUSE_EXPAT" != "no"; then
+ wxUSE_XML=yes
+ AC_DEFINE(wxUSE_EXPAT)
+ AC_DEFINE(wxUSE_XML)
+
+ if test "$wxUSE_EXPAT" = "sys" -o "$wxUSE_EXPAT" = "yes" ; then
+ AC_CHECK_HEADER([expat.h], [found_expat_h=1])
+ if test "x$found_expat_h" = "x1"; then
+ dnl Expat 1.95.6 comes with broken expat.h:
+ AC_CACHE_CHECK([if expat.h is valid C++ header],
+ wx_cv_expat_is_not_broken,
+ [
+ AC_LANG_SAVE
+ AC_LANG_CPLUSPLUS
+ AC_TRY_COMPILE([#include <expat.h>],[],
+ wx_cv_expat_is_not_broken=yes,
+ wx_cv_expat_is_not_broken=no
+ )
+ AC_LANG_RESTORE
+ ]
+ )
+ if test "$wx_cv_expat_is_not_broken" = "yes" ; then
+ AC_CHECK_LIB(expat, XML_ParserCreate, EXPAT_LINK=" -lexpat")
+ fi
+ fi
+ if test "x$EXPAT_LINK" = "x" ; then
+ if test "$wxUSE_EXPAT" = "sys" ; then
+ AC_MSG_ERROR([system expat library not found! Use --with-expat=builtin to use built-in version])
+ else
+ AC_MSG_WARN([system expat library not found, will use built-in instead])
+ wxUSE_EXPAT=builtin
+ fi
+ else
+ dnl we are using the system library
+ wxUSE_EXPAT=sys
+ fi
+ fi
+ if test "$wxUSE_EXPAT" = "builtin" ; then
+ dnl Expat needs this:
+ AC_CONFIG_SUBDIRS([src/expat])
+ fi
+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 ----------------------------------------------------------------
AC_MSG_ERROR(please set CFLAGS to contain the location of windows.h)
])
- dnl check if can use _WIN32_IE macro
- AC_CACHE_CHECK([if w32api has good enough MSIE support], wx_cv_w32api_win32_ie,
- [
- AC_TRY_COMPILE([#include <w32api.h>],
- [
- #define wxCHECK_W32API_VERSION( major, minor ) \
- ( defined( __W32API_MAJOR_VERSION ) && defined( __W32API_MINOR_VERSION ) \
- && ( ( __W32API_MAJOR_VERSION > (major) ) \
- || ( __W32API_MAJOR_VERSION == (major) && __W32API_MINOR_VERSION >= (minor))))
-
- #if !wxCHECK_W32API_VERSION(1,1)
- #error You need w32api 1.1 or newer
- #endif
- ], [
- wx_cv_w32api_win32_ie=yes
- ], [
- wx_cv_w32api_win32_ie=no
- ])
- ])
- if test "$wx_cv_w32api_win32_ie" = "yes" ; then
- CPPFLAGS="$CPPFLAGS -D_WIN32_IE=0x400"
- fi
-
dnl --- FIXME: This is still a somewhat random list of libs,
dnl --- some of them should probably be included conditionally.
- LIBS="$LIBS -lwinspool -lwinmm -lshell32 -lcomctl32 -lctl3d32 -ladvapi32 -lwsock32"
+ LIBS="$LIBS -lwinspool -lwinmm -lshell32 -lcomctl32 -lcomdlg32 -lctl3d32 -ladvapi32 -lwsock32 -lgdi32"
+
+ if test "$wxUSE_ACCESSIBILITY" = "yes" ; then
+ LIBS="$LIBS -loleacc"
+ fi
case "${host}" in
*-*-cygwin* )
dnl Cygwin doesn't include these by default
- LIBS="$LIBS -lkernel32 -luser32 -lgdi32 -lcomdlg32"
+ LIBS="$LIBS -lkernel32 -luser32"
TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WIN95__"
esac
dnl add extra odbc libs if we have compiled in odbc
+ if test "$wxUSE_ODBC" = "sys" ; then
+ wxUSE_ODBC = "yes"
+ fi
if test "$wxUSE_ODBC" = "yes" ; then
LIBS=" -lodbc32 -lole32 -loleaut32 $LIBS"
+ AC_DEFINE(wxUSE_ODBC)
fi
+ dnl We might want to abort here if wxUSE_ODBC="builtin" isn't supported on msw.
RESFLAGS="--include-dir \$(top_srcdir)/include --include-dir \$(top_srcdir)/\$(program_dir) --define __WIN32__ --define __WIN95__ --define __GNUWIN32__"
RESPROGRAMOBJ="\$(PROGRAM)_resources.o"
WIN32INSTALL=win32install
fi
-if test "$USE_DARWIN" = 1; then
- dnl Mac OS X/Darwin GCC uses precompiled headers by default
- dnl this can cause problems both when compiling wxMac and wxBase
- if test "$wxUSE_PRECOMP" = "yes"; then
- CPPFLAGS="$CPPFLAGS -cpp-precomp"
- else
- CPPFLAGS="$CPPFLAGS -no-cpp-precomp"
- fi
-fi
-
if test "$wxUSE_GUI" = "yes"; then
USE_GUI=1
dnl remove this comment :-)
case "${host}" in
*-*-mingw32* )
- LDFLAGS="$LDFLAGS -Wl,--subsystem,windows -mwindows"
+ WXCONFIG_LDFLAGS_GUI="$LDFLAGS -Wl,--subsystem,windows -mwindows"
esac
fi
PKG_CHECK_MODULES(PANGOFT2, pangoft2,
[
CXXFLAGS="$CXXFLAGS $PANGOFT2_CFLAGS"
- LIBS="$LIBS $PANGOFT2_LIBS"
+ GUI_TK_LIBRARY="$GUI_TK_LIBRARY $PANGOFT2_LIBS"
],
[
AC_MSG_WARN([pangoft2 library not found, library will be compiled without printing support])
fi
TOOLKIT_INCLUDE="$wx_cv_cflags_gtk"
- GUI_TK_LIBRARY="$wx_cv_libs_gtk"
+ GUI_TK_LIBRARY="$wx_cv_libs_gtk $GUI_TK_LIBRARY"
AFMINSTALL=afminstall
TOOLKIT=GTK
fi
if test "$wxUSE_MGL" = 1; then
- AC_MSG_CHECKING(for SciTech MGL library)
+ AC_MSG_CHECKING(for SciTech MGL library)
if test "x$MGL_ROOT" = x ; then
AC_MSG_RESULT(not found)
AC_MSG_ERROR([Cannot find MGL library. Make sure MGL_ROOT is set.])
AC_MSG_RESULT($MGL_ROOT)
fi
+ 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* )
- mgl_os="linux/gcc/glibc*"
+ 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/x86/so linux/gcc/x86/a linux/gcc/glibc.so linux/gcc/glibc"
+ else
+ mgl_os_candidates="linux/gcc/x86/a linux/gcc/x86/so linux/gcc/glibc linux/gcc/glibc.so"
+ fi
;;
*-pc-msdosdjgpp )
- mgl_os=dos32/dj2
+ mgl_os_candidates="dos32/dj2"
;;
*)
AC_MSG_ERROR(This system type ${host} is not yet supported by wxMGL.)
esac
mgl_lib_type=""
-
- if test "$wxUSE_DEBUG_FLAG" = yes ; then
- if test -f $MGL_ROOT/lib/debug/$mgl_os/libmgl.a -o \
- -f $MGL_ROOT/lib/debug/$mgl_os/libmgl.so; then
- mgl_lib_type=debug
- fi
- fi
- if test "x$mgl_lib_type" = x ; then
- if test -f $MGL_ROOT/lib/release/$mgl_os/libmgl.a -o \
- -f $MGL_ROOT/lib/release/$mgl_os/libmgl.so; then
- mgl_lib_type=release
- else
- AC_MSG_ERROR([Cannot find MGL libraries, make sure they are compiled.])
+ mgl_os=""
+
+ for mgl_os_i in $mgl_os_candidates ; do
+ if test "x$mgl_os" = x ; then
+ if test "$wxUSE_DEBUG_FLAG" = yes ; then
+ if test -f $MGL_ROOT/lib/debug/$mgl_os_i/libmgl.a -o \
+ -f $MGL_ROOT/lib/debug/$mgl_os_i/libmgl.so; then
+ mgl_lib_type=debug
+ mgl_os=$mgl_os_i
+ fi
+ fi
+ if test "x$mgl_lib_type" = x ; then
+ if test -f $MGL_ROOT/lib/release/$mgl_os_i/libmgl.a -o \
+ -f $MGL_ROOT/lib/release/$mgl_os_i/libmgl.so; then
+ mgl_lib_type=release
+ mgl_os=$mgl_os_i
+ fi
+ fi
fi
+ done
+
+ if test "x$mgl_os" = x ; then
+ AC_MSG_RESULT(not found)
+ AC_MSG_ERROR([Cannot find MGL libraries, make sure they are compiled.])
fi
+ AC_MSG_RESULT("$MGL_ROOT/lib/$mgl_lib_type/$mgl_os")
wxUSE_UNIVERSAL="yes"
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 <X11/xpm.h>
- ],
- [
- 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
-
if test "$wxUSE_UNICODE" = "yes"; then
PKG_CHECK_MODULES(PANGOX, pangox,
[
CXXFLAGS="$CXXFLAGS $PANGOX_CFLAGS"
- LIBS="$LIBS $PANGOX_LIBS"
+ GUI_TK_LIBRARY="$GUI_TK_LIBRARY $PANGOX_LIBS"
],
[
AC_MSG_ERROR([pangox library not found, library cannot be compiled in Unicode mode])
PKG_CHECK_MODULES(PANGOFT2, pangoft2,
[
CXXFLAGS="$CXXFLAGS $PANGOFT2_CFLAGS"
- LIBS="$LIBS $PANGOFT2_LIBS"
+ GUI_TK_LIBRARY="$GUI_TK_LIBRARY $PANGOFT2_LIBS"
],
[
AC_MSG_WARN([pangoft2 library not found, library will be compiled without printing support])
PKG_CHECK_MODULES(PANGOXFT, pangoxft,
[
CXXFLAGS="$CXXFLAGS $PANGOXFT_CFLAGS"
- LIBS="$LIBS $PANGOXFT_LIBS"
+ GUI_TK_LIBRARY="$GUI_TK_LIBRARY $PANGOXFT_LIBS"
],
[
AC_MSG_WARN([pangoxft library not found, library will be compiled without anti-aliasing support])
if test "$wxUSE_NANOX" = "yes"; then
TOOLKIT_INCLUDE="-I\$(top_srcdir)/include/wx/x11/nanox -I\$(MICROWIN)/src/include $TOOLKIT_INCLUDE"
- TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__NANOX__ -DMWPIXEL_FORMAT=MWPF_TRUECOLOR0888 -DHAVE_FILEIO -DHAVE_BMP_SUPPORT=1 -DHAVE_GIF_SUPPORT=1 -DHAVE_PNM_SUPPORT=1 -DHAVE_XPM_SUPPORT=1 -DLINUX=1 -DUNIX=1 -DUSE_EXPOSURE -DSCREEN_HEIGHT=480 -DSCREEN_WIDTH=640 -DSCREEN_DEPTH=4 -DX11=1"
+ TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__NANOX__ -DMWPIXEL_FORMAT=MWPF_TRUECOLOR0888 -DHAVE_FILEIO -DHAVE_BMP_SUPPORT=1 -DHAVE_GIF_SUPPORT=1 -DHAVE_PNM_SUPPORT=1 -DHAVE_XPM_SUPPORT=1 -DUNIX=1 -DUSE_EXPOSURE -DSCREEN_HEIGHT=480 -DSCREEN_WIDTH=640 -DSCREEN_DEPTH=4 -DX11=1"
GUI_TK_LIBRARY="$GUI_TK_LIBRARY \$(MICROWIN)/src/lib/libnano-X.a"
else
- GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lX11$xpm_link"
+ GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lX11"
fi
TOOLKIT_VPATH="\${top_srcdir}/src/x11"
GUIDIST=X11_DIST
fi
- if test "$wxUSE_WINE" = 1; then
- AC_CHECK_HEADER(windows.h, [],
- [
- AC_MSG_ERROR(please set CFLAGS to contain the location of windows.h)
- ])
-
- xpm_link=
- AC_MSG_CHECKING(for Xpm library)
- WX_PATH_FIND_LIBRARIES($SEARCH_LIB,Xpm)
- if test "$ac_find_libraries" != "" ; then
- GUI_TK_LIBRARY="-L$ac_find_libraries"
- xpm_link=" -lXpm"
- AC_DEFINE(wxHAVE_LIB_XPM)
- AC_MSG_RESULT(found at $ac_find_libraries)
- else
- AC_MSG_RESULT(no)
- AC_MSG_WARN(library will be compiled without support for images in XPM format)
- fi
-
- mesa_link=
- AC_MSG_CHECKING(for Mesa library)
- WX_PATH_FIND_LIBRARIES($SEARCH_LIB,MesaGL)
- if test "$ac_find_libraries" != "" ; then
- GUI_TK_LIBRARY="$GUI_TK_LIBRARY -L$ac_find_libraries"
- mesa_link=" -lMesaGL"
- AC_MSG_RESULT(found at $ac_find_libraries)
- else
- mesa_link=""
- AC_MSG_RESULT(no)
- AC_MSG_WARN(library will be compiled without Mesa support)
- fi
-
- GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lwine$mesa_link$xpm_link -lXxf86dga -lXxf86vm -lSM -lICE -lXext -lXmu -lX11 -lncurses"
- TOOLKIT=MSW
- GUIDIST=MSW_DIST
- TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WINE__"
- 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
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 <X11/xpm.h>
- ],
- [
- 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"
AC_MSG_ERROR([can't link a simple motif program])
fi
- GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXm$xpm_link${libp_link} -lXmu -lXext -lXt${libsm_ice_link} -lX11"
- TOOLKIT_VPATH="\${top_srcdir}/src/motif${PATH_IFS}\${top_srcdir}/src/motif/xmcombo"
- TOOLKIT=MOTIF
+ save_CFLAGS=$CFLAGS
+ CFLAGS="$CFLAGS $TOOLKIT_INCLUDE"
+ AC_MSG_CHECKING([for Motif 2])
+ AC_TRY_COMPILE([
+ #include <Xm/Xm.h>
+ ],
+ [
+ #if XmVersion < 2000
+ #error "Not Motif 2"
+ #endif
+ ],
+ [
+ AC_DEFINE(__WXMOTIF20__,1)
+ AC_MSG_RESULT([found])
+ ],
+ [
+ AC_DEFINE(__WXMOTIF20__,0)
+ AC_MSG_RESULT([not found])
+ ])
+ CFLAGS=$save_CFLAGS
+
+ GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXm${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
fi
+ 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_CACHE_CHECK([for X11/xpm.h],
+ wx_cv_x11_xpm_h,
+ [
+ save_CFLAGS=$CFLAGS
+ CFLAGS="$CFLAGS $TOOLKIT_INCLUDE"
+
+ AC_TRY_COMPILE(
+ [
+ #include <X11/xpm.h>
+ ],
+ [
+ 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 <X11/Xlib.h>
+ #include <X11/extensions/shape.h>
+ ],
+ [
+ int dummy1, dummy2;
+ XShapeQueryExtension((Display*)NULL,
+ (int*)NULL, (int*)NULL);
+ ],
+ [
+ AC_DEFINE(HAVE_XSHAPE)
+ AC_MSG_RESULT([found])
+ ],
+ [
+ AC_MSG_RESULT([not found])
+ ])
+ CFLAGS="$save_CFLAGS"
+
+ fi
+ 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
dnl we can't call this MAC_DIST or autoconf thinks its a macro
GUIDIST=MACX_DIST
+ dnl wxMac version of wxBase and wxCocoa or wxBase-only built on Darwin
+ dnl are different, so they need different names:
+ WXBASEPORT="_carbon"
+ 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 PM requires old resource format, re-enabled])
- wxUSE_PROLOGIO="yes"
- wxUSE_RESOURCES="yes"
- AC_MSG_WARN([OS/2 threads are not yet supported... disabled])
- wxUSE_THREADS="no"
fi
dnl the name of the directory where the files for this toolkit live
dnl Optional libraries included when system library is not used
dnl ---------------------------------------------------------------------------
-dnl ODBC objects are Unix only
-if test "$TOOLKIT" != "MSW" -a "$wxUSE_ODBC" = "yes" ; then
- ALL_OBJECTS="${ALL_OBJECTS} \$(IODBCOBJS)"
+
+dnl ----------------------------------------------------------------
+dnl iODBC support
+dnl ----------------------------------------------------------------
+
+IODBC_C_SRC=""
+
+
+dnl ODBC is handled seperately for MSW
+if test "$TOOLKIT" != "MSW" ; then
+
+ if test "$wxUSE_ODBC" = "sys" -o "$wxUSE_ODBC" = "yes" ; then
+ dnl This is not ideal we really ough to use the unixodbc-config
+ dnl or iodbc-config if they exist.
+
+ AC_CHECK_HEADER([sql.h], [found_sql_h=1])
+ if test "x$found_sql_h" = "x1" ; then
+ AC_CHECK_LIB(iodbc, SQLAllocEnv, ODBC_LINK=" -liodbc",
+ [
+ AC_CHECK_LIB(unixodbc, SQLAllocEnv, ODBC_LINK=" -lunixodbc",
+ [
+ AC_CHECK_LIB(odbc, SQLAllocEnv, ODBC_LINK=" -lodbc")
+ ])
+ ])
+ fi
+ if test "x$ODBC_LINK" = "x" ; then
+ if test "$wxUSE_ODBC" = "sys" ; then
+ AC_MSG_ERROR([system ODBC library not found! Use --with-odbc=builtin to use built-in version])
+ else
+ AC_MSG_WARN([system ODBC library not found, will use built-in instead])
+ wxUSE_ODBC=builtin
+ fi
+ else
+ dnl we are using the system library
+ wxUSE_ODBC=sys
+ fi
+ 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?
+ WXODBCFLAG="-D_IODBC_"
+ fi
fi
if test "$wxUSE_REGEX" = "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 <X11/Xlib.h>
+ #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 ---------------------------------------------------------------------------
+USE_OPENGL=0
if test "$wxUSE_OPENGL" = "yes"; then
- if test "$wxUSE_MAC" = 1; then
+ if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = "1"; then
OPENGL_LIBS="-framework OpenGL -framework AGL"
elif test "$wxUSE_MSW" = 1; then
OPENGL_LIBS="-lopengl32 -lglu32"
else
+ dnl David Elliott: Without this snippet AC_CHECK_HEADER fails to find
+ dnl GL/gl.h on Mac OS X where it is located in
+ dnl /usr/X11R6/include/GL/gl.h:
+
+ WX_PATH_FIND_INCLUDES($SEARCH_INCLUDE, GL/gl.h)
+ if test "$ac_find_includes" != "" ; then
+ AC_MSG_RESULT(found in $ac_find_includes)
+ WX_INCLUDE_PATH_EXIST($ac_find_includes, $CPPFLAGS)
+ CPPFLAGS="$CPPFLAGS$ac_path_to_include"
+ fi
+
AC_CHECK_HEADER(GL/gl.h,
[
+ found_gl=0
+
AC_MSG_CHECKING([for -lGL])
- WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],[GL])
+ WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],GL)
if test "$ac_find_libraries" != "" ; then
WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS])
- if test "$ac_path_to_link" = " -L/usr/lib" ; then
- LDFLAGS_GL="$LDFLAGS"
- else
- LDFLAGS_GL="$LDFLAGS$ac_path_to_link"
+ if test "$ac_path_to_link" != " -L/usr/lib" ; then
+ LDFLAGS_GL="$ac_path_to_link"
fi
- OPENGL_LIBS="-lGL -lGLU"
- AC_MSG_RESULT([yes])
- else
+
+ dnl don't suppose that libGL and libGLU are always in the
+ dnl same directory -- this is not true for some common
+ dnl distributions
+ WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],GLU)
+ if test "$ac_find_libraries" != "" ; then
+ WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS])
+ if test "$ac_path_to_link" != " -L/usr/lib" -a \
+ "$ac_path_to_link" != "$LDFLAGS_GL"; then
+ LDFLAGS_GL="$LDFLAGS_GL$ac_path_to_link"
+ fi
+
+ found_gl=1
+ OPENGL_LIBS="-lGL -lGLU"
+ AC_MSG_RESULT([yes])
+ fi
+ fi
+
+ if test "$found_gl" != 1; then
AC_MSG_RESULT([no])
AC_MSG_CHECKING([for -lMesaGL])
- WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],[MesaGL])
+ WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],MesaGL)
if test "$ac_find_libraries" != "" ; then
WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS])
LDFLAGS_GL="$LDFLAGS$ac_path_to_link"
fi
if test "$wxUSE_OPENGL" = "yes"; then
+ USE_OPENGL=1
AC_DEFINE(wxUSE_OPENGL)
AC_DEFINE(wxUSE_GLCANVAS)
- SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS opengl"
+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS opengl opengl/cube opengl/penguin opengl/isosurf"
fi
fi
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
-WX_VERSION_TAG=`echo WX${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}_${WX_RELEASE} | tr "[[a-z]]" "[[A-Z]]"`
+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="wx_${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}"
+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}"
case "${host}" in
*-*-cygwin* | *-*-mingw32* )
-
- dnl If we are cross compiling we want to use the 'full' unix type name for the
- dnl lib, but for a native install use the windows style naming convention.
- dnl (excepting again that we strip the ELF style version numbers off it).
-
- dnl FIXME: is this GL stuff actually even used for wxMSW? should it be??
-
- if test "$cross_compiling" != "yes" -a "$TOOLKIT_DIR" = "msw"; then
- WX_LIBRARY="wxmsw${WX_MSW_VERSION}${lib_unicode_suffix}${lib_debug_suffix}"
- WX_LIBRARY_GL="wxmsw_gl${WX_MSW_VERSION}${lib_unicode_suffix}${lib_debug_suffix}"
- WX_LIBRARY_NAME_SHARED="${WX_LIBRARY}.${SO_SUFFIX}"
- WX_LIBRARY_NAME_SHARED_GL="${WX_LIBRARY_GL}.${SO_SUFFIX}"
- else
- WX_LIBRARY_NAME_SHARED="lib${WX_LIBRARY}.${SO_SUFFIX}"
- WX_LIBRARY_NAME_SHARED_GL="lib${WX_LIBRARY_GL}.${SO_SUFFIX}"
- fi
+ 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_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 the name of the resources file for wxMac
- WX_RESOURCES_MACOSX_ASCII="lib${WX_LIBRARY}.r"
- WX_RESOURCES_MACOSX_DATA="lib${WX_LIBRARY}.rsrc"
+ dnl base name of the resource file for wxMac must be the same
+ dnl as library installation base name (-install_name)
+ if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = "1"; then
+ WX_RESOURCES_MACOSX_ASCII="lib${WX_LIBRARY}.${WX_CURRENT}.r"
+ WX_RESOURCES_MACOSX_DATA="lib${WX_LIBRARY}.${WX_CURRENT}.rsrc"
fi
;;
esac
esac
fi
+SHARED=0
if test "$wxUSE_SHARED" = "yes"; then
-
- dnl install targets
- if test "$wxUSE_OPENGL" = "yes"; then
- WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS CREATE_INSTALLED_LINKS_GL"
- WX_ALL="\$(build_libdir)/${WX_LIBRARY_LINK1} \$(build_libdir)/${WX_LIBRARY_LINK1_GL}"
- else
- WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
- WX_ALL="\$(build_libdir)/${WX_LIBRARY_LINK1}"
- fi
-
- dnl the extra compiler flags needed for compilation of shared library
- if test "$GCC" = "yes"; then
- dnl the switch for gcc is the same under all platforms
- PIC_FLAG="-fPIC"
- fi
-
+ SHARED=1
dnl use versioned symbols if available on the platform
- WX_VERSIONED_SYMBOLS([\$(top_builddir)/version-script])
-
- dnl the command to use for creating the shared library
- SHARED_LD="${CXX} -shared -o"
+ WX_VERSIONED_SYMBOLS([\$(top_builddir)version-script])
case "${host}" in
- *-hp-hpux* )
- dnl default settings are good for gcc but not for the native HP-UX
- if test "$GCC" = "yes"; then
- dnl -o flag must be after PIC flag
- SHARED_LD="${CXX} -shared ${PIC_FLAG} -o"
- else
- dnl no idea why it wants it, but it does
- LDFLAGS="$LDFLAGS -L/usr/lib"
-
- SHARED_LD="${CXX} -b -o"
- PIC_FLAG="+Z"
- fi
-
- dnl install shared libs without symlinks
- if test "$wxUSE_OPENGL" = "yes"; then
- WX_ALL_INSTALLED="preinstall_gl"
- WX_ALL="\$(build_libdir)/${WX_LIBRARY_NAME_SHARED} \$(build_libdir)/${WX_LIBRARY_NAME_SHARED_GL}"
- else
- WX_ALL="\$(build_libdir)/${WX_LIBRARY_NAME_SHARED}"
- fi
- ;;
-
- *-*-linux* )
- if test "$GCC" != "yes"; then
- AC_CACHE_CHECK([for Intel compiler], wx_cv_prog_icc,
- [
- AC_TRY_COMPILE([],
- [
- #ifndef __INTEL_COMPILER
- #error Not icc
- #endif
- ],
- wx_cv_prog_icc=yes,
- wx_cv_prog_icc=no
- )
- ])
- if test "$wx_cv_prog_icc" = "yes"; then
- PIC_FLAG="-KPIC"
- fi
- fi
-
- if test "$wxUSE_SONAME" = "yes" ; then
- SONAME_FLAGS="-Wl,-soname,${WX_LIBRARY_LINK1}"
- SONAME_FLAGS_GL="-Wl,-soname,${WX_LIBRARY_LINK1_GL}"
- dnl substitute this in makelib.env for the contrib libs
- WX_TARGET_LIBRARY_SONAME="-Wl,-soname,\$(TARGETLIB_LINK1)"
- fi
- ;;
+ *-*-linux* | *-*-gnu* )
+ SAMPLES_RPATH_FLAG="-Wl,-rpath,\$(top_builddir)lib"
+ ;;
*-*-solaris2* )
if test "$GCC" = yes ; then
dnl newer versions of gcc need -isystem to compile X headers on
dnl Solaris (which use old style C syntax)
CPPFLAGS="$CPPFLAGS -isystem /usr/openwin/include"
+
+ dnl gcc may use Sun's ld, in which case -rpath gives a confusing
+ dnl error message. We have to try both -Wl,-rpath and -Wl,-R:
+ saveLdflags="$LDFLAGS"
+ LDFLAGS="$saveLdflags -Wl,-rpath,/"
+ AC_MSG_CHECKING([if the linker accepts -rpath])
+ AC_TRY_LINK(
+ [],[],
+ [
+ AC_MSG_RESULT([yes])
+ SAMPLES_RPATH_FLAG="-Wl,-rpath,\$(top_builddir)lib"
+ ],
+ [
+ AC_MSG_RESULT([no])
+ AC_MSG_CHECKING([if the linker accepts -R])
+ LDFLAGS="$saveLdflags -Wl,-R,/"
+ AC_TRY_LINK(
+ [],[],
+ [
+ AC_MSG_RESULT([yes])
+ SAMPLES_RPATH_FLAG="-Wl,-R,\$(top_builddir)lib"],
+ [
+ AC_MSG_RESULT([no])
+ ])
+ ])
+ LDFLAGS="$saveLdflags"
else
SHARED_LD="${CXX} -G -o"
PIC_FLAG="-KPIC"
- SONAME_FLAGS="-h ${WX_LIBRARY_NAME_SHARED}"
- SONAME_FLAGS_GL="-h ${WX_LIBRARY_NAME_SHARED_GL}"
- fi
- ;;
-
- *-*-darwin* )
- dnl For Unix to MacOS X porting instructions, see:
- dnl http://fink.sourceforge.net/doc/porting/porting.html
- TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -DWXMAKINGDLL"
- CFLAGS="$CFLAGS -fno-common"
- CXXFLAGS="$CXXFLAGS -fno-common"
- dnl wxWindows must be fully binded (lazy binding breaks RTTI classinfo)
- dnl this can be done either with the exe linker flag -Wl,-bind_at_load
- dnl or with a double stage link in order to create a single module
- dnl "-init _wxWindowsDylibInit" not useful with lazy linking solved
- SHARED_LD="\${top_srcdir}/distrib/mac/shared-ld-sh -undefined suppress -flat_namespace -o"
- PIC_FLAG="-dynamic -fPIC"
- SONAME_FLAGS="-compatibility_version ${WX_RELEASE} -current_version ${WX_VERSION} -install_name \$(libdir)/${WX_LIBRARY_LINK1}"
- SONAME_FLAGS_GL="-compatibility_version ${WX_RELEASE} -current_version ${WX_VERSION} -install_name \$(libdir)/${WX_LIBRARY_LINK1_GL}"
- ;;
-
- *-*-aix* )
- dnl default settings are ok for gcc
- if test "$GCC" != "yes"; then
- dnl the abs path below used to be hardcoded here so I guess it must
- dnl be some sort of standard location under AIX?
- AC_CHECK_PROG(AIX_CXX_LD, makeC++SharedLib,
- makeC++SharedLib, /usr/lpp/xlC/bin/makeC++SharedLib)
-
- SHARED_LD="$(AIX_CXX_LD) -p 0 -o"
- fi
- ;;
-
- *-*-cygwin* | *-*-mingw32* )
- WX_LIBRARY_IMPORTLIB="${WX_LIBRARY_NAME_SHARED}.a"
-
- SHARED_LD="${CXX} -shared -Wl,--out-implib,lib/${WX_LIBRARY_IMPORTLIB} -o"
- TOOLCHAIN_DLL_DEFS="${TOOLCHAIN_DLL_DEFS} -DWXUSINGDLL=1"
-
- PIC_FLAG="-UWXUSINGDLL -DWXMAKINGDLL=1 -D_DLL=1 -D_WINDLL=1"
-
- dnl Don't build seperate GL library
- WX_ALL="\$(build_libdir)/${WX_LIBRARY_NAME_SHARED}"
- WX_ALL_INSTALLED="CREATE_INSTALLED_LINKS"
-
- if test "$wxUSE_OPENGL" = "yes"; then
- LIBS="${LIBS} ${OPENGL_LIBS}"
- fi
- ;;
-
- *-*-beos* )
- dnl can't use gcc under BeOS for shared library creation because it
- dnl complains about missing 'main'
- SHARED_LD="${LD} -shared -o"
- ;;
-
- *-*-irix* )
- dnl default settings are ok for gcc
- if test "$GCC" != "yes"; then
- PIC_FLAG="-KPIC"
+ SAMPLES_RPATH_FLAG="-R\$(top_builddir)lib"
fi
;;
-
- *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | \
- *-*-sunos4* | \
- *-*-osf* | \
- *-*-dgux5* | \
- *-*-sysv5* )
- dnl defaults are ok
+
+ powerpc-*-darwin* )
+ SAMPLES_RPATH_POSTLINK="\$(top_builddir)change-install-names \$(LIBDIRNAME) \$(prefix) \$@"
+ cat <<EOF >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
;;
-
- *)
- AC_MSG_ERROR(unknown system type $host.)
+
esac
dnl set target to shared if not explicitly chose static before
WX_ALL_INSTALLED="${WX_ALL_INSTALLED} preinstall"
fi
- if test "$wxUSE_MAC" = 1; then
+ if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1 ; then
WX_ALL_INSTALLED="${WX_ALL_INSTALLED} preinstall"
fi
STATIC_FLAG="no"
fi
-if test "$wxUSE_MAC" = 1; then
+if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1; then
dnl add the resources target for wxMac
- LIBWXMACRES="\$(top_builddir)/lib/${WX_RESOURCES_MACOSX_ASCII}"
+ LIBWXMACRES="\$(top_builddir)lib/${WX_RESOURCES_MACOSX_ASCII}"
WX_ALL="${WX_ALL} ${LIBWXMACRES}"
WX_ALL_INSTALLED="${WX_ALL_INSTALLED} preinstall_res"
+
AC_CHECK_PROG(RESCOMP, Rez, Rez, /Developer/Tools/Rez)
AC_CHECK_PROG(DEREZ, DeRez, DeRez, /Developer/Tools/DeRez)
- MACOSX_BUNDLE="bundle"
+ AC_CHECK_PROG(SETFILE, SetFile, SetFile, /Developer/Tools/SetFile)
+
+ MACSETFILE="\$(SETFILE)"
+
dnl resources are bundled both with shared library and applications
dnl since the carb resource *must* be included in the application
- LIBWXMACRESCOMP="\$(RESCOMP) -t APPL Carbon.r ${LIBWXMACRES} -o \$(BIN_PROGRAM)"
- LIBWXMACRESWXCONFIG="${RESCOMP} -t APPL Carbon.r \${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
- LIBWXMACRESCOMP="emxbind -ep \$(BIN_PROGRAM)"
+ MACRESCOMP="emxbind -ep"
+ else
+ MACRESCOMP="@#"
fi
fi
+
dnl ---------------------------------------------------------------------------
dnl Checks for typedefs
dnl ---------------------------------------------------------------------------
AC_TYPE_UID_T
dnl check what exactly size_t is on this machine - this is necessary to avoid
-dnl ambiguos overloads in several places, notably wx/string.h and wx/array.h
+dnl ambiguous overloads in several places, notably wx/string.h and wx/array.h
AC_LANG_SAVE
AC_LANG_CPLUSPLUS
AC_CACHE_CHECK([if size_t is unsigned int],
wx_cv_size_t_is_uint,
+ [
dnl an obvious check like AC_TRY_COMPILE[struct Foo { ... };] doesn't work
dnl with egcs (at least) up to 1.1.1 as it allows you to compile duplicate
dnl methods in a local class (i.e. class inside a function) declaration
wx_cv_size_t_is_uint=no,
wx_cv_size_t_is_uint=yes
)
+ ]
)
if test "$wx_cv_size_t_is_uint" = "yes"; then
AC_LANG_CPLUSPLUS
dnl check for vsnprintf() -- a safe version of vsprintf())
+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
+dnl so we first check if the function is in the library
AC_CHECK_FUNCS(vsnprintf)
+if test "$ac_cv_func_vsnprintf" = "yes"; then
+ dnl yes it is -- now check if it is in the headers
+ AC_CACHE_CHECK([for vsnprintf declaration], wx_cv_func_vsnprintf_decl,
+ [
+ AC_TRY_COMPILE(
+ [
+ #include <stdio.h>
+ #include <stdarg.h>
+ ],
+ [
+ char *buf;
+ va_list ap;
+ vsnprintf(buf, 10u, "%s", ap);
+ ],
+ wx_cv_func_vsnprintf_decl=yes,
+ wx_cv_func_vsnprintf_decl=no
+ )
+ ]
+ )
+
+ if test "$wx_cv_func_vsnprintf_decl" = "yes"; then
+ AC_DEFINE(HAVE_VSNPRINTF_DECL)
+ fi
+fi
+
if test "$wxUSE_UNICODE" = yes; then
dnl also look if we have wide char IO functions
AC_CHECK_FUNCS(fputwc wprintf vswprintf)
+
dnl MinGW has a vswprintf with a different prototype, and
dnl a _vsnwprintf with the correct prototype, but AC_CHECK_FUNCS
dnl finds it even if it is not declared in some versions...
)
if test "$wx_cv_func_statfs" = "yes"; then
+ wx_cv_type_statvfs_t="struct statfs"
AC_DEFINE(HAVE_STATFS)
else
AC_CACHE_CHECK(for statvfs, wx_cv_func_statvfs,
AC_TRY_COMPILE(
[
- #include <sys/statvfs.h>
- ],
- [
- long l;
- struct statvfs fs;
- statvfs("/", &fs);
- l = fs.f_bsize;
- l += fs.f_blocks;
- l += fs.f_bavail;
+ #include <stddef.h>
+ #include <sys/statvfs.h>
],
[
- wx_cv_func_statvfs=yes
+ statvfs("/", NULL);
],
- [
- wx_cv_func_statvfs=no
- ]
+ wx_cv_func_statvfs=yes,
+ wx_cv_func_statvfs=no
)
)
if test "$wx_cv_func_statvfs" = "yes"; then
- AC_DEFINE(HAVE_STATVFS)
+ dnl we also have to check whether we should use statvfs_t (works under
+ dnl Solaris 8, doesn't work under Solaris 7) or "struct statvfs" (vice
+ dnl versa) as the argument for statvfs in 64 bit off_t mode (in 32 bit
+ dnl mode both work fine)
+ dnl
+ dnl for this check C++ compiler has to be used as passing incompatible
+ dnl pointers is just a warning and not an error in C
+ AC_LANG_SAVE
+ AC_LANG_CPLUSPLUS
+
+ AC_CACHE_CHECK(for statvfs argument type, wx_cv_type_statvfs_t,
+ AC_TRY_COMPILE(
+ [
+ #include <sys/statvfs.h>
+ ],
+ [
+ long l;
+ statvfs_t fs;
+ statvfs("/", &fs);
+ l = fs.f_bsize;
+ l += fs.f_blocks;
+ l += fs.f_bavail;
+ ],
+ wx_cv_type_statvfs_t=statvfs_t,
+ [
+ AC_TRY_COMPILE(
+ [
+ #include <sys/statvfs.h>
+ ],
+ [
+ long l;
+ struct statvfs fs;
+ statvfs("/", &fs);
+ l = fs.f_bsize;
+ l += fs.f_blocks;
+ l += fs.f_bavail;
+ ],
+ wx_cv_type_statvfs_t="struct statvfs",
+ wx_cv_type_statvfs_t="unknown"
+ )
+ ]
+ )
+ )
+
+ AC_LANG_RESTORE
+
+ if test "$wx_cv_type_statvfs_t" != "unknown"; then
+ AC_DEFINE(HAVE_STATVFS)
+ fi
else
- AC_MSG_WARN([wxGetDiskSpace() function won't work without statfs()])
+ dnl set it for the test below
+ wx_cv_type_statvfs_t="unknown"
fi
fi
+if test "$wx_cv_type_statvfs_t" != "unknown"; then
+ AC_DEFINE_UNQUOTED(WX_STATFS_T, $wx_cv_type_statvfs_t)
+else
+ AC_MSG_WARN([wxGetDiskSpace() function won't work without statfs()])
+fi
+
dnl check for fcntl() or at least flock() needed by Unix implementation of
dnl wxSingleInstanceChecker
if test "$wxUSE_SNGLINST_CHECKER" = "yes"; then
[
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"
+ )
+ ]
)
- )
+ ]
)
]
)
fi
dnl if !MSW
+
+dnl ------------------------------------------
+dnl Checks specific to contrib libs (MMedia)
+dnl ------------------------------------------
+
+dnl Check for ESD:
+EXTRALIBS_ESD=
+AC_CHECK_LIB(esd, esd_close, [
+ AC_CHECK_HEADERS([esd.h], [
+ EXTRALIBS_ESD="-lesd"
+ ])
+])
+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 <linux/cdrom.h>
+ #else
+ /* For Solaris */
+ #include <sys/cdio.h>
+ #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!
dnl ===========================================================================
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
THREADS_CFLAGS=
if test "$wxUSE_THREADS" = "yes" ; then
- if test "$wxUSE_WINE" = 1 ; then
- AC_MSG_WARN([Threads are not supported under WINE... disabled])
- wxUSE_THREADS="no"
- elif test "$USE_BEOS" = 1; then
+ if test "$USE_BEOS" = 1; then
AC_MSG_WARN([BeOS threads are not yet supported... disabled])
wxUSE_THREADS="no"
fi
dnl AIX calls the library libpthreads - thanks IBM!
THREAD_OPTS="pthreads"
;;
+ *-hp-hpux* )
+ dnl HP-UX aCC only gives a warning, not an error about
+ dnl -pthread but it doesn't work and we have to use -lpthread
+ dnl there
+ if test "x$GCC" != "xyes"; then
+ THREAD_OPTS=""
+ fi
+ ;;
+
+ *-*-irix* )
+ dnl gcc under IRIX doesn't seem to like -pthread, but it
+ dnl doesn't give an error for it neither, just a warning
+ dnl message -- but this is still very annoying
+ if test "x$GCC" = "xyes"; then
+ THREAD_OPTS=""
+ fi
+ ;;
+
+ *-*-*UnixWare*)
+ dnl flying by man pages here: Caldera online docs use this
+ if test "x$GCC" != "xyes"; then
+ THREAD_OPTS="-Ethread"
+ fi
+ ;;
esac
dnl simply linking with libpthread should make the test below work but
;;
*-hp-hpux* )
flag="-D_REENTRANT"
+ if test "x$GCC" != "xyes"; then
+ dnl see http://docs.hp.com/hpux/onlinedocs/2213/threads.htm
+ flag="$flag -D_RWSTD_MULTI_THREAD"
+ fi
;;
*solaris* | alpha*-osf*)
flag="-D_REENTRANT"
dnl 3. pthread_attr_getschedparam and pthread_attr_setschedparam
HAVE_PRIOR_FUNCS=0
AC_CHECK_FUNC(pthread_attr_getschedpolicy,
- AC_CHECK_FUNC(pthread_attr_setschedparam,
- AC_CHECK_FUNC(sched_get_priority_max,
+ [AC_CHECK_FUNC(pthread_attr_setschedparam,
+ [AC_CHECK_FUNC(sched_get_priority_max,
HAVE_PRIOR_FUNCS=1,
- AC_CHECK_LIB([posix4], sched_get_priority_max,
+ [AC_CHECK_LIB([posix4], sched_get_priority_max,
[
HAVE_PRIOR_FUNCS=1
POSIX4_LINK=" -lposix4"
],
- )
- )
- )
+ )]
+ )]
+ )]
)
if test "$HAVE_PRIOR_FUNCS" = 1; then
AC_DEFINE(HAVE_PTHREAD_CANCEL),
AC_MSG_WARN([wxThread::Kill() will not work properly]))
- AC_CACHE_CHECK([for pthread_cleanup_push/pop], wx_cv_func_pthread_cleanup_push,
- [
- AC_TRY_COMPILE([#include <pthread.h>],
- [
- pthread_cleanup_push(NULL, NULL);
- pthread_cleanup_pop(0);
- ], [
- wx_cv_func_pthread_cleanup_push=yes
- ], [
- wx_cv_func_pthread_cleanup_push=no
- ])
- ])
-
- if test "$wx_cv_func_pthread_cleanup_push" = "yes"; then
- AC_DEFINE(HAVE_THREAD_CLEANUP_FUNCTIONS)
- fi
+ 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 <pthread.h>],
+ 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:
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
if test "$wxUSE_PERMISSIVE" = "yes" ; then
CODE_GEN_FLAGS="$CODE_GEN_FLAGS -fpermissive"
fi
- if test "$USE_WIN32" = 1 ; then
- # I'm not even really sure what this was ever added to solve,
- # but someone added it for mingw native builds, so I guess
- # they had a reason, right??
- CODE_GEN_FLAGS="$CODE_GEN_FLAGS -fno-pcc-struct-return"
- fi
dnl Ian Brown <ian.brown@printsoft.de> reports that versions of gcc before
dnl 3.0 overflow the table of contents on rs6000 as they create an entry
esac
fi
+OPTIMISE=
if test "$wxUSE_OPTIMISE" = "no" ; then
- OPTIMISE=
+ if test "$GCC" = yes ; then
+ dnl use -O0 because compiling with it is faster than compiling with no
+ dnl optimization options at all (at least with g++ 3.2)
+ OPTIMISE="-O0"
+ fi
else
if test "$GCC" = yes ; then
OPTIMISE="-O2"
+
+ dnl VZ: does anybody know what does this do??
case "${host}" in
i586-*-*|i686-*-* )
OPTIMISE="${OPTIMISE} "
fi
fi
-if test "$WXWIN_COMPATIBILITY_2" = "yes"; then
- AC_DEFINE(WXWIN_COMPATIBILITY_2)
+dnl ---------------------------------------------------------------------------
+dnl compatibility level
+dnl ---------------------------------------------------------------------------
- WXWIN_COMPATIBILITY_2_2="yes"
+if test "x$WXWIN_COMPATIBILITY_2_2" = "xyes"; then
+ AC_DEFINE(WXWIN_COMPATIBILITY_2_2)
+
+ WXWIN_COMPATIBILITY_2_4="yes"
fi
-if test "x$WXWIN_COMPATIBILITY_2_2" != "xno"; then
- AC_DEFINE(WXWIN_COMPATIBILITY_2_2)
+if test "x$WXWIN_COMPATIBILITY_2_4" != "xno"; then
+ AC_DEFINE(WXWIN_COMPATIBILITY_2_4)
fi
dnl ---------------------------------------------------------------------------
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 ---------------------------------------------------------------------------
+if test "$wxUSE_STL" = "yes"; then
+ AC_DEFINE(wxUSE_STL)
+fi
+
if test "$wxUSE_APPLE_IEEE" = "yes"; then
AC_DEFINE(wxUSE_APPLE_IEEE)
fi
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
AC_DEFINE(wxUSE_DATETIME)
fi
-if test "$wxUSE_TIMEDATE" = "yes"; then
- AC_DEFINE(wxUSE_TIMEDATE)
-fi
-
if test "$wxUSE_FILE" = "yes"; then
AC_DEFINE(wxUSE_FILE)
fi
AC_DEFINE(wxUSE_FILESYSTEM)
fi
-if test "$wxUSE_FS_INET" = "yes"; then
- AC_DEFINE(wxUSE_FS_INET)
-fi
-
if test "$wxUSE_FS_ZIP" = "yes"; then
AC_DEFINE(wxUSE_FS_ZIP)
fi
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
fi
fi
- AC_DEFINE(wxUSE_TIMEDATE)
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS typetest"
fi
dnl wxSocket
dnl ------------------------------------------------------------------------
-dnl VZ: the GUI hooks wxSocket needs are not implemented yet in wxMGL
+dnl VZ: the GUI hooks wxSocket needs are not implemented yet in some toolkits
if test "$wxUSE_SOCKETS" = "yes"; then
if test "$wxUSE_MGL" = "1"; then
AC_MSG_WARN([wxSocket not yet supported under MGL... disabled])
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
AC_CACHE_CHECK([what is the type of the third argument of getsockname],
wx_cv_type_getsockname3,
[
- AC_LANG_SAVE
- AC_LANG_CPLUSPLUS
-
AC_TRY_COMPILE(
[
#include <sys/types.h>
getsockname(0, 0, &len);
],
wx_cv_type_getsockname3=socklen_t,
- AC_TRY_COMPILE(
- [
- #include <sys/types.h>
- #include <sys/socket.h>
- ],
- [
- size_t len;
- getsockname(0, 0, &len);
- ],
- wx_cv_type_getsockname3=size_t,
+ [
+ dnl the compiler will compile the version with size_t
+ dnl even if the real type of the last parameter is int
+ dnl but it should give at least a warning about
+ dnl converting between incompatible pointer types, so
+ dnl try to use it to get the correct behaviour at
+ dnl least with gcc (otherwise we'd always use size_t)
+ CFLAGS_OLD="$CFLAGS"
+ if test "$GCC" = yes ; then
+ CFLAGS="$CFLAGS -Werror"
+ fi
+
AC_TRY_COMPILE(
[
#include <sys/types.h>
#include <sys/socket.h>
],
[
- int len;
+ size_t len;
getsockname(0, 0, &len);
],
- wx_cv_type_getsockname3=int,
- wx_cv_type_getsockname3=unknown
+ wx_cv_type_getsockname3=size_t,
+ AC_TRY_COMPILE(
+ [
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ ],
+ [
+ int len;
+ getsockname(0, 0, &len);
+ ],
+ wx_cv_type_getsockname3=int,
+ wx_cv_type_getsockname3=unknown
+ )
)
- )
- )
- AC_LANG_RESTORE
+ CFLAGS="$CFLAGS_OLD"
+ ]
+ )
])
if test "$wx_cv_type_getsockname3" = "unknown"; then
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS sockets"
fi
+if test "$wxUSE_PROTOCOL" = "yes"; then
+ if test "$wxUSE_SOCKETS" != "yes"; then
+ AC_MSG_WARN(Protocol classes require sockets... disabled)
+ wxUSE_PROTOCOL=no
+ fi
+fi
+
+if test "$wxUSE_PROTOCOL" = "yes"; then
+ AC_DEFINE(wxUSE_PROTOCOL)
+
+ if test "$wxUSE_PROTOCOL_HTTP" = "yes"; then
+ AC_DEFINE(wxUSE_PROTOCOL_HTTP)
+ fi
+ if test "$wxUSE_PROTOCOL_FTP" = "yes"; then
+ AC_DEFINE(wxUSE_PROTOCOL_FTP)
+ fi
+ if test "$wxUSE_PROTOCOL_FILE" = "yes"; then
+ AC_DEFINE(wxUSE_PROTOCOL_FILE)
+ fi
+else
+ if test "$wxUSE_FS_INET" = "yes"; then
+ AC_MSG_WARN([HTTP filesystem require protocol classes... disabled])
+ wxUSE_FS_INET="no"
+ fi
+fi
+
+if test "$wxUSE_URL" = "yes"; then
+ if test "$wxUSE_PROTOCOL" != "yes"; then
+ AC_MSG_WARN(wxURL class requires wxProtocol... disabled)
+ wxUSE_URL=no
+ fi
+ if test "$wxUSE_URL" = "yes"; then
+ AC_DEFINE(wxUSE_URL)
+ fi
+fi
+
+if test "$wxUSE_FS_INET" = "yes"; then
+ AC_DEFINE(wxUSE_FS_INET)
+fi
+
dnl ---------------------------------------------------------------------------
dnl Joystick support
dnl ---------------------------------------------------------------------------
if test "$wxUSE_GUI" = "yes"; then
- if test "$TOOLKIT" = "MAC"; then
+ if test "$TOOLKIT" = "MAC" -o "$TOOLKIT" = "COCOA"; then
AC_MSG_WARN([Joystick not yet supported under Mac OS X... disabled])
wxUSE_JOYSTICK=no
fi
- if test "$TOOLKIT" = "MOTIF"; then
- AC_MSG_WARN([Joystick not yet supported under Motif... disabled])
- wxUSE_JOYSTICK=no
- fi
- if test "$TOOLKIT" = "X11"; then
- AC_MSG_WARN([Joystick not yet supported under X11... disabled])
- wxUSE_JOYSTICK=no
- fi
-
- dnl under MSW we always have joystick support
+
+ dnl under MSW we always have joystick support
if test "$TOOLKIT" != "MSW"; then
if test "$wxUSE_JOYSTICK" = "yes"; then
dnl joystick support is only for Linux 2.1.x or greater
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)
-elif test "$wxUSE_DYNLIB_CLASS" = "yes" ; then
- AC_DEFINE(wxUSE_DYNLIB_CLASS)
-fi
dnl ---------------------------------------------------------------------------
dnl String stuff
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)
AC_DEFINE(wxUSE_EXPERIMENTAL_PRINTF)
fi
-
-dnl ----------------------------------------------------------------
-dnl iODBC support
-dnl ----------------------------------------------------------------
-
-IODBC_C_SRC=""
-if test "$wxUSE_ODBC" = "yes" ; then
- AC_DEFINE(wxUSE_ODBC)
- WXODBCFLAG="-D_IODBC_"
- SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS db"
-fi
-
dnl ----------------------------------------------------------------
dnl Register PostScript options for makefiles and setup.h
dnl ----------------------------------------------------------------
fi
if test "$wxUSE_MDI_ARCHITECTURE" = "yes"; then
-
-dnl There is now experimental generic MDI support
-dnl if test "$wxUSE_UNIVERSAL" = "yes"; then
-dnl AC_MSG_WARN(MDI not yet supported for wxUniversal... disabled)
-dnl wxUSE_MDI_ARCHITECTURE=no
-dnl fi
-
- if test "$wxUSE_MDI_ARCHITECTURE" = "yes"; then
- AC_DEFINE(wxUSE_MDI_ARCHITECTURE)
- SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS mdi"
- fi
+ AC_DEFINE(wxUSE_MDI_ARCHITECTURE)
+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS mdi"
fi
if test "$wxUSE_DOC_VIEW_ARCHITECTURE" = "yes" ; then
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS printing"
fi
-if test "$wxUSE_PROLOGIO" = "yes" ; then
- AC_DEFINE(wxUSE_PROLOGIO)
- ALL_OBJECTS="$ALL_OBJECTS parser.o"
-fi
-
-if test "$wxUSE_RESOURCES" = "yes" ; then
- if test "$wxUSE_NANOX" = "yes"; then
- AC_MSG_WARN([Cannot use resource database functions in NanoX])
- else
- AC_DEFINE(wxUSE_RESOURCES)
- SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS resource"
- fi
- if test "$wxUSE_PROLOGIO" != "yes" ; then
- ALL_OBJECTS="$ALL_OBJECTS parser.o"
- fi
-fi
-
-if test "$wxUSE_X_RESOURCES" = "yes"; then
- AC_DEFINE(wxUSE_X_RESOURCES)
+if test "$wxUSE_PROLOGIO" = "yes" -o "$wxUSE_RESOURCES" = "yes"; then
+ AC_MSG_ERROR([wxExpr and old-style resources are now available in contrib only])
fi
dnl ---------------------------------------------------------------------------
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
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)
- else
- AC_MSG_WARN([Some features disabled because OLE headers not found])
-
- wxUSE_CLIPBOARD=no
- wxUSE_DRAG_AND_DROP=no
- wxUSE_DATAOBJ=no
- wxUSE_OLE=no
- fi
-
- if test "$wxUSE_METAFILE" = "yes"; then
- AC_DEFINE(wxUSE_METAFILE)
-
- dnl this one should probably be made separately configurable
- AC_DEFINE(wxUSE_ENH_METAFILE)
- fi
-fi
-
-if test "$wxUSE_WINE" = 1 -a \( "$wxUSE_DATAOBJ" = "yes" \
- -o "$wxUSE_CLIPBOARD" = "yes" \
- -o "$wxUSE_OLE" = "yes" \
- -o "$wxUSE_DRAG_AND_DROP" = "yes" \) ; then
- AC_CHECK_HEADERS(ole2.h)
-
- if test "$ac_cv_header_ole2_h" = "yes" ; then
- if test "$GCC" = yes ; then
- AC_LANG_SAVE
- AC_LANG_CPLUSPLUS
-
- AC_MSG_CHECKING([if g++ requires -fvtable-thunks])
- AC_TRY_COMPILE([#include <windows.h>
- #include <ole2.h>],
- [],
- [AC_MSG_RESULT(no)],
- [AC_MSG_RESULT(yes)
- CODE_GEN_FLAGS_CXX="$CODE_GEN_FLAGS_CXX -fvtable-thunks"])
- AC_LANG_RESTORE
- ALL_OBJECTS="$ALL_OBJECTS \$(OLEOBJS)"
- LIBS=" -lwine_uuid$LIBS"
- AC_DEFINE(wxUSE_OLE)
-
+ if test "$wxUSE_DATAOBJ" = "yes" ; then
+ AC_DEFINE(wxUSE_DATAOBJ)
fi
-
- dnl for OLE clipboard and dnd
- AC_DEFINE(wxUSE_DATAOBJ)
else
AC_MSG_WARN([Some features disabled because OLE headers not found])
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS checklst"
fi
-if test "$wxUSE_GAUGE" = "yes"; then
- AC_DEFINE(wxUSE_GAUGE)
- USES_CONTROLS=1
+if test "$wxUSE_DISPLAY" = "yes"; then
+ AC_DEFINE(wxUSE_DISPLAY)
+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS display"
fi
-if test "$wxUSE_NEW_GRID" = "yes"; then
- wxUSE_GRID="yes"
- AC_DEFINE(wxUSE_NEW_GRID)
+if test "$wxUSE_GAUGE" = "yes"; then
+ AC_DEFINE(wxUSE_GAUGE)
USES_CONTROLS=1
- SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS newgrid"
fi
if test "$wxUSE_GRID" = "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
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS notebook"
fi
-if test "$wxUSE_PROPSHEET" = "yes"; then
- AC_DEFINE(wxUSE_PROPSHEET)
- USES_CONTROLS=1
- SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS proplist"
-fi
+dnl if test "$wxUSE_PROPSHEET" = "yes"; then
+dnl AC_DEFINE(wxUSE_PROPSHEET)
+dnl USES_CONTROLS=1
+dnl SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS proplist"
+dnl fi
if test "$wxUSE_RADIOBOX" = "yes"; then
AC_DEFINE(wxUSE_RADIOBOX)
fi
if test "$wxUSE_STATLINE" = "yes"; then
- if test "$wxUSE_WINE" = 1 ; then
- AC_MSG_WARN([wxStaticLine is not supported under WINE])
- else
- AC_DEFINE(wxUSE_STATLINE)
- USES_CONTROLS=1
- fi
+ AC_DEFINE(wxUSE_STATLINE)
+ USES_CONTROLS=1
fi
if test "$wxUSE_STATUSBAR" = "yes"; then
fi
if test "$wxUSE_TOGGLEBTN" = "yes"; then
- if test "$wxUSE_MAC" = 1; then
+ if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1 ; then
AC_MSG_WARN([Toggle button not yet supported under Mac OS X... disabled])
wxUSE_TOGGLEBTN=no
fi
if test "$wxUSE_MOTIF" = 1; then
AC_MSG_WARN([wxTooltip not supported yet under Motif... disabled])
else
- if test "$wxUSE_WINE" = 1; then
- AC_MSG_WARN([wxTooltip not supported under WINE... disabled])
+ if test "$wxUSE_UNIVERSAL" = "yes"; then
+ AC_MSG_WARN([wxTooltip not supported yet in wxUniversal... disabled])
else
- if test "$wxUSE_UNIVERSAL" = "yes"; then
- AC_MSG_WARN([wxTooltip not supported yet in wxUniversal... disabled])
- else
- AC_DEFINE(wxUSE_TOOLTIPS)
- fi
+ AC_DEFINE(wxUSE_TOOLTIPS)
fi
fi
fi
fi
if test "$wxUSE_POPUPWIN" = "yes"; then
- if test "$wxUSE_MAC" = 1; then
+ if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1 ; then
AC_MSG_WARN([Popup window not yet supported under Mac OS X... disabled])
else
- if test "$wxUSE_MOTIF" = 1; then
- AC_MSG_WARN([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
dnl misc options
dnl ---------------------------------------------------------------------------
-if test "$wxUSE_TREELAYOUT" = "yes"; then
- AC_DEFINE(wxUSE_TREELAYOUT)
- SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS treelay"
+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
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dragimag"
fi
+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
AC_DEFINE(wxUSE_MENUS)
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS menu"
AC_DEFINE(wxUSE_MIMETYPE)
fi
-if test "$wxUSE_SYSTEM_OPTIONS" = "yes"; then
- AC_DEFINE(wxUSE_SYSTEM_OPTIONS)
-if test "$TOOLKIT" = "MSW"; then
- SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS taskbar"
-fi
-
-fi
-
-if test "$wxUSE_PROTOCOL" = "yes"; then
- if test "$wxUSE_SOCKETS" != "yes"; then
- AC_MSG_WARN(Protocol classes require sockets... disabled)
- wxUSE_PROTOCOL=no
- fi
-
- if test "$wxUSE_PROTOCOL" = "yes"; then
- AC_DEFINE(wxUSE_PROTOCOL)
-
- if test "$wxUSE_PROTOCOL_HTTP" = "yes"; then
- AC_DEFINE(wxUSE_PROTOCOL_HTTP)
- fi
- if test "$wxUSE_PROTOCOL_FTP" = "yes"; then
- AC_DEFINE(wxUSE_PROTOCOL_FTP)
- fi
- if test "$wxUSE_PROTOCOL_FILE" = "yes"; then
- AC_DEFINE(wxUSE_PROTOCOL_FILE)
- fi
- fi
-fi
-
-if test "$wxUSE_URL" = "yes"; then
- if test "$wxUSE_PROTOCOL" != "yes"; then
- AC_MSG_WARN(wxURL class requires wxProtocol... disabled)
- wxUSE_URL=no
- fi
- if test "$wxUSE_URL" = "yes"; then
- AC_DEFINE(wxUSE_URL)
- fi
-fi
-
if test "$wxUSE_MINIFRAME" = "yes"; then
AC_DEFINE(wxUSE_MINIFRAME)
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS minifram"
fi
-if test "$wxUSE_HTML" = "yes"; then
- AC_DEFINE(wxUSE_HTML)
- SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS html"
+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"
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
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
+dnl ---------------------------------------------------------------------------
+
+CORE_BASE_LIBS="net base"
+CORE_GUI_LIBS="adv core"
+
+if test "$wxUSE_XML" = "yes" ; then
+ CORE_BASE_LIBS="xml $CORE_BASE_LIBS"
+fi
+if test "$wxUSE_ODBC" != "no" ; then
+ CORE_BASE_LIBS="odbc $CORE_BASE_LIBS"
+ CORE_GUI_LIBS="dbgrid $CORE_GUI_LIBS"
+fi
+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)
+
+
dnl ---------------------------------------------------------------------------
dnl Output the makefiles and such from the results found above
dnl ---------------------------------------------------------------------------
if test "$wxUSE_MAC" = 1 ; then
LDFLAGS="$LDFLAGS -framework Carbon -framework System"
fi
+if test "$wxUSE_COCOA" = 1 ; then
+ LDFLAGS="$LDFLAGS -framework Cocoa -framework System"
+fi
dnl FIXME: should this be covered by the conditional above
dnl given the -lm comment there? Or should that comment (and
if test "$wxUSE_GUI" = "yes"; then
- LIBS="$GUI_TK_LIBRARY $PNG_LINK $JPEG_LINK $TIFF_LINK $LIBS"
-
dnl TODO add checks that these samples will really compile (i.e. all the
dnl library features they need are present)
dnl ipc, mfc, nativdlg, oleauto, ownerdrw
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS artprov controls dialogs \
drawing dynamic erase event exec font image \
- minimal propsize rotate widgets"
+ minimal propsize rotate shaped widgets render"
- dnl this is needed to be able to find AFM files
- CPPFLAGS="$CPPFLAGS \$(EXTRADEFS) \$(APPEXTRADEFS)"
+ if test "$wxUSE_MONOLITHIC" != "yes"; then
+ SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS console"
+ fi
else
SAMPLES_SUBDIRS="console"
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 wxGTK does not need TOOLKIT includes in wx-config
-if test "$wxUSE_GTK" = 1; then
- WXCONFIG_INCLUDE=
-else
- WXCONFIG_INCLUDE="$TOOLKIT_INCLUDE"
-fi
+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 $TOOLKIT_INCLUDE"
dnl C/C++ compiler options used to compile wxWindows
if test "$GXX" = yes ; then
CXXWARNINGS="-Wall"
dnl should enable this one day...
dnl CXXWARNINGS="-Wall -Werror"
-
- dnl Add this *after* all compile tests, we don't need or want generated
- dnl depfiles until actually building the lib
- if test "$wxUSE_NO_DEPS" = "no" ; then
- CFLAGS="-MMD $CFLAGS"
- CXXFLAGS="-MMD $CXXFLAGS"
- fi
fi
EXTRA_CFLAGS="$WXDEBUG $WXODBCFLAG $PROFILE $OPTIMISE"
dnl remove the extra white space from the cc/c++/ld options
-CPPFLAGS=`echo $INCLUDES $CPPFLAGS | sed 's/ \\+/ /g'`
-CFLAGS=`echo $EXTRA_CFLAGS $CFLAGS $CXXWARNINGS | sed 's/ \\+/ /g'`
-CXXFLAGS=`echo $EXTRA_CFLAGS $CXXFLAGS $CXXWARNINGS | sed 's/ \+/ /g'`
-LIBS=`echo $LIBS | sed 's/ \+/ /g'`
+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'`
+
+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'`
+fi
+if test "$wxUSE_OPENGL" = "yes"; then
+ EXTRALIBS_OPENGL="$LDFLAGS_GL $OPENGL_LIBS"
+fi
+
LDFLAGS="$LDFLAGS $PROFILE"
+dnl wxGTK does not need TOOLKIT includes in wx-config
+if test "$wxUSE_GTK" = 1; then
+ WXCONFIG_INCLUDE=
+else
+ WXCONFIG_INCLUDE="$TOOLKIT_INCLUDE"
+fi
+
+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${lib_unicode_suffix}"
+fi
+if test "$wxUSE_EXPAT" = "builtin" ; then
+ wxconfig_3rdparty="$wxconfig_3rdparty expat"
+fi
+if test "$wxUSE_ODBC" = "builtin" ; then
+ wxconfig_3rdparty="$wxconfig_3rdparty odbc"
+fi
+if test "$wxUSE_LIBTIFF" = "builtin" ; then
+ wxconfig_3rdparty="$wxconfig_3rdparty tiff"
+fi
+if test "$wxUSE_LIBJPEG" = "builtin" ; then
+ wxconfig_3rdparty="$wxconfig_3rdparty jpeg"
+fi
+if test "$wxUSE_LIBPNG" = "builtin" ; then
+ wxconfig_3rdparty="$wxconfig_3rdparty png"
+fi
+if test "$wxUSE_ZLIB" = "builtin" ; then
+ wxconfig_3rdparty="$wxconfig_3rdparty zlib"
+fi
+if test "$wxUSE_ODBC" = "builtin" ; then
+ wxconfig_3rdparty="$wxconfig_3rdparty odbc"
+fi
+
+for i in $wxconfig_3rdparty ; do
+ WXCONFIG_EXTRALIBS="$WXCONFIG_EXTRALIBS -lwx${i}${lib_debug_suffix}${HOST_SUFFIX}"
+done
+
+
+if test "x$wxUSE_UNIVERSAL" = "xyes" ; then
+ WXUNIV=1
+else
+ WXUNIV=0
+fi
+
+AC_SUBST(wxUSE_ZLIB)
+AC_SUBST(wxUSE_REGEX)
+AC_SUBST(wxUSE_EXPAT)
+AC_SUBST(wxUSE_ODBC)
+AC_SUBST(wxUSE_LIBJPEG)
+AC_SUBST(wxUSE_LIBPNG)
+AC_SUBST(wxUSE_LIBTIFF)
+
+if test $wxUSE_MONOLITHIC = "yes" ; then
+ MONOLITHIC=1
+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
+ USE_ODBC=0
+fi
+
+if test $wxUSE_OFFICIAL_BUILD = "yes" ; then
+ OFFICIAL_BUILD=1
+else
+ OFFICIAL_BUILD=0
+fi
+
+AC_SUBST(VENDOR)
+AC_SUBST(OFFICIAL_BUILD)
+
+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]]"`
+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
dnl FIXME For some mysterious reasons, sometimes the directories are duplicated
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
AC_SUBST(WX_RELEASE_NUMBER)
AC_SUBST(WX_LIBRARY_NAME_STATIC)
AC_SUBST(WX_LIBRARY_NAME_SHARED)
-AC_SUBST(WX_LIBRARY_BASENAME)
+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(SHARED_LD)
AC_SUBST(PIC_FLAG)
-AC_SUBST(CODE_GEN_FLAGS)
-AC_SUBST(CODE_GEN_FLAGS_CXX)
-AC_SUBST(SONAME_FLAGS)
-AC_SUBST(SONAME_FLAGS_GL)
-AC_SUBST(WX_TARGET_LIBRARY_SONAME)
AC_SUBST(WX_TARGET_LIBRARY_TYPE)
AC_SUBST(STATIC_FLAG)
AC_SUBST(TOOLCHAIN_DLL_DEFS)
dnl wx-config options
+AC_SUBST(top_builddir_wxconfig)
AC_SUBST(host_alias)
AC_SUBST(cross_compiling)
+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(CODE_GEN_FLAGS)
+AC_SUBST(CODE_GEN_FLAGS_CXX)
dnl the list of files to compile/install
AC_SUBST(ALL_OBJECTS)
AC_SUBST(LDFLAGS_EXE)
AC_SUBST(OPENGL_LIBS)
AC_SUBST(DMALLOC_LIBS)
-AC_SUBST(EXTRADEFS)
AC_SUBST(WX_VERSION_TAG)
dnl additional resurces settings
dnl additional for Mac OS X
AC_SUBST(DEREZ)
-AC_SUBST(MACOSX_BUNDLE)
AC_SUBST(LIBWXMACRES)
-AC_SUBST(LIBWXMACRESCOMP)
-AC_SUBST(LIBWXMACRESWXCONFIG)
+AC_SUBST(MACRESCOMP)
+AC_SUBST(MACSETFILE)
+AC_SUBST(MACRESWXCONFIG)
dnl other tools
AC_SUBST(GCC)
+AC_SUBST(GCC_SEARCHES_USR_LOCAL_INCLUDE)
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
dnl itself (this macro is required if SUBDIRS variable is used in Makefile.am
mv -f lib/wx/include/${TOOLCHAIN_NAME}/wx/setup.h setup.h
fi
-AC_CONFIG_HEADER(setup.h:setup.h.in)
-
-dnl we need to pass SAMPLES_SUBDIRS (and some other) to the configure in
-dnl samples and the only way to do it is to use the environment (another
-dnl idea could have been to use the cache but this wouldn't work when
-dnl configure doesn't use cache at all which is the default with autoconf 2.50)
-wx_cv_path_samplesubdirs=$SAMPLES_SUBDIRS
-wx_cv_if_gnu_make=$IF_GNU_MAKE
-wx_cv_path_ifs=$PATH_IFS
-wx_cv_program_ext=$PROGRAM_EXT
-wx_cv_target_library=$WX_TARGET_LIBRARY
-wx_cv_target_library_gl=$WX_TARGET_LIBRARY_GL
-wx_cv_target_libtype=$WX_TARGET_LIBRARY_TYPE
-wx_cv_library_basename=${WX_LIBRARY_BASENAME}
-wx_cv_release=${WX_RELEASE}
-wx_cv_current=${WX_CURRENT}
-wx_cv_revision=${WX_REVISION}
-wx_cv_age=${WX_AGE}
-wx_cv_use_gui=${USE_GUI}
-wx_cv_use_resources=${wxUSE_RESOURCES}
-export wx_cv_path_samplesubdirs wx_cv_if_gnu_make \
- wx_cv_path_ifs wx_cv_program_ext \
- wx_cv_target_library wx_cv_target_library_gl wx_cv_target_libtype \
- wx_cv_library_basename wx_cv_release wx_cv_current wx_cv_revision wx_cv_age \
- wx_cv_use_gui wx_cv_use_resources
-
-AC_CONFIG_SUBDIRS(demos samples utils contrib)
+AC_CONFIG_HEADERS([setup.h])
dnl create each of the files in the space separated list from the file.in
dnl (the original file name may be overriden by appending another name after a
dnl colon)
-AC_OUTPUT([
+AC_CONFIG_FILES([
wx-config
version-script
- src/make.env
- src/makeprog.env
- src/makelib.env
Makefile
- ],
+ ])
+
+AC_CONFIG_COMMANDS([default],
[
dnl This test is required to make the following idempotent.
dnl Otherwise running config.status or rerunning configure
]
)
+
+dnl Configure samples, contrib etc. directories, but only if they are present:
+if test "$wxUSE_GUI" = "yes"; then
+ SUBDIRS="samples demos utils contrib"
+else dnl we build wxBase only
+ dnl there are no wxBase programs in contrib nor demos
+ SUBDIRS="samples utils"
+fi
+
+for subdir in `echo $SUBDIRS`; do
+ if test -d ${srcdir}/${subdir} ; then
+ if test "$wxUSE_GUI" = "yes"; then
+ 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"
+ fi
+ done
+ else dnl assume that everything compiles for utils &c
+ makefiles=`(cd $srcdir ; find $subdir -name Makefile.in)`
+ fi
+ else dnl we build wxBase only
+ dnl don't take all samples/utils, just those which build with
+ dnl wxBase
+ if test ${subdir} = "samples"; then
+ makefiles="samples/Makefile.in samples/console/Makefile.in"
+ else dnl utils
+ makefiles="utils/HelpGen/Makefile.in \
+ utils/HelpGen/src/Makefile.in \
+ utils/tex2rtf/Makefile.in \
+ utils/tex2rtf/src/Makefile.in"
+ fi
+ fi
+
+ for mkin in $makefiles ; do
+ mk=`echo $mkin | sed 's/Makefile\.in/Makefile/g'`
+ AC_CONFIG_FILES([$mk])
+ done
+ fi
+done
+
+
+AC_OUTPUT
+
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}"
echo " Should wxWindows be linked as a shared library? ${wxUSE_SHARED:-no}"
echo " Should wxWindows be compiled in Unicode mode? ${wxUSE_UNICODE:-no}"
echo " What level of wxWindows compatibility should be enabled?"
-echo " wxWindows 2.0 ${WXWIN_COMPATIBILITY_2:-no}"
-echo " wxWindows 2.2 ${WXWIN_COMPATIBILITY_2_2:-yes}"
+echo " wxWindows 2.2 ${WXWIN_COMPATIBILITY_2_2:-no}"
+echo " wxWindows 2.4 ${WXWIN_COMPATIBILITY_2_4:-yes}"
echo " Which libraries should wxWindows use?"
echo " jpeg ${wxUSE_LIBJPEG-none}"
echo " png ${wxUSE_LIBPNG-none}"
echo " regex ${wxUSE_REGEX}"
echo " tiff ${wxUSE_LIBTIFF-none}"
+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 ""
projects / wxWidgets.git / blobdiff