X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a0219e4580a925de871080b703d14504c96ad3d6..47943187c1ccb1d885f753ec82d6e01ea15b2849:/configure.in diff --git a/configure.in b/configure.in index edbde026bb..9c35b151ce 100644 --- a/configure.in +++ b/configure.in @@ -8,7 +8,7 @@ dnl dnl Top-level configure.in for wxWidgets by Robert Roebling, Phil Blecker, dnl Vadim Zeitlin and Ron Lee dnl -dnl This script is under the wxWidgets licence. +dnl This script is under the wxWindows licence. dnl dnl Version: $Id$ dnl --------------------------------------------------------------------------- @@ -17,7 +17,7 @@ dnl --------------------------------------------------------------------------- dnl initialization dnl --------------------------------------------------------------------------- -AC_INIT([wxWidgets], [2.9.1], [wx-dev@lists.wxwidgets.org]) +AC_INIT([wxWidgets], [2.9.3], [wx-dev@lists.wxwidgets.org]) dnl the file passed to AC_CONFIG_SRCDIR should be specific to our package AC_CONFIG_SRCDIR([wx-config.in]) @@ -43,7 +43,7 @@ dnl wx_release_number += 1 wx_major_version_number=2 wx_minor_version_number=9 -wx_release_number=1 +wx_release_number=3 wx_subrelease_number=0 WX_RELEASE=$wx_major_version_number.$wx_minor_version_number @@ -372,6 +372,7 @@ dnl wxUSE_ALL_FEATURES which is the only which has to be set to "yes" by dnl default) DEFAULT_wxUSE_ALL_FEATURES=yes +DEFAULT_wxUSE_STD_CONTAINERS=no DEFAULT_wxUSE_STD_IOSTREAM=$DEFAULT_STD_FLAG DEFAULT_wxUSE_STD_STRING=$DEFAULT_STD_FLAG @@ -387,9 +388,9 @@ dnl features disabled by default DEFAULT_wxUSE_ACCESSIBILITY=no DEFAULT_wxUSE_IPV6=no DEFAULT_wxUSE_GSTREAMER8=no -DEFAULT_wxUSE_UIACTIONSIMULATOR=no dnl automatic features +DEFAULT_wxUSE_ARTPROVIDER_TANGO=auto DEFAULT_wxUSE_UNICODE_UTF8=auto DEFAULT_wxUSE_OPENGL=auto DEFAULT_wxUSE_MEDIACTRL=auto @@ -399,6 +400,7 @@ DEFAULT_wxUSE_UNICODE_UTF8_LOCALE=no dnl Mac/Cocoa users need to enable building universal binaries explicitly DEFAULT_wxUSE_UNIVERSAL_BINARY=no +DEFAULT_wxUSE_MAC_ARCH=no DEFAULT_wxUSE_OFFICIAL_BUILD=no @@ -452,6 +454,7 @@ if test "$wxUSE_ALL_FEATURES" = "no"; then dnl reset all the options with default value of auto if all features are to dnl be disabled because we can't have an option with default value of dnl "auto-or-no-if-wxUSE_ALL_FEATURES-is-disabled" + DEFAULT_wxUSE_ARTPROVIDER_TANGO=no DEFAULT_wxUSE_MEDIACTRL=no fi @@ -531,7 +534,7 @@ if test "$wxUSE_GUI" = "yes"; then fi done else - dnl try to guess the most apropriate toolkit for this platform + dnl try to guess the most appropriate toolkit for this platform for toolkit in $ALL_TOOLKITS; do var=DEFAULT_DEFAULT_wxUSE_$toolkit eval "wxUSE_$toolkit=\$${var}" @@ -563,8 +566,10 @@ if test "$wxUSE_GUI" = "yes"; then # to be removed when --disable-gtk2 isn't needed if test "x$wxUSE_GTK2" = "xyes"; then wxGTK_VERSION=2 + wxUSE_GTK1=0 elif test "x$wxUSE_GTK2" = "xno"; then wxGTK_VERSION=1 + wxUSE_GTK1=1 fi for toolkit in $ALL_TOOLKITS; do @@ -695,9 +700,16 @@ dnl global compile options dnl --------------------------------------------------------------------------- WX_ARG_DISABLE(shared, [ --disable-shared create static library instead of shared], wxUSE_SHARED) -WX_ARG_ENABLE(stl, [ --enable-stl use STL for containers], wxUSE_STL) +WX_ARG_ENABLE(stl, [ --enable-stl use standard C++ classes for everything], wxUSE_STL) +if test "$wxUSE_STL" = "yes"; then + DEFAULT_wxUSE_STD_CONTAINERS=yes + DEFAULT_wxUSE_STD_IOSTREAM=yes + DEFAULT_wxUSE_STD_STRING=yes +fi +WX_ARG_ENABLE(std_containers,[ --enable-std_containers use standard C++ container classes], wxUSE_STD_CONTAINERS) WX_ARG_ENABLE(std_iostreams, [ --enable-std_iostreams use standard C++ stream classes], wxUSE_STD_IOSTREAM) WX_ARG_ENABLE(std_string, [ --enable-std_string use standard C++ string classes], wxUSE_STD_STRING) +WX_ARG_ENABLE(std_string_conv_in_wxstring, [ --enable-std_string_conv_in_wxstring provide implicit conversion to std::string in wxString], wxUSE_STD_STRING_CONV_IN_WXSTRING) WX_ARG_DISABLE(unicode, [ --disable-unicode compile without 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_PARAM(utf8, [ --enable-utf8 use UTF-8 representation for strings (Unix only)], wxUSE_UNICODE_UTF8) @@ -716,7 +728,9 @@ WX_ARG_ENABLE(no_exceptions, [ --enable-no_exceptions create code without C++ WX_ARG_ENABLE(permissive, [ --enable-permissive compile code disregarding strict ANSI], wxUSE_PERMISSIVE) WX_ARG_ENABLE(no_deps, [ --enable-no_deps create code without dependency information], wxUSE_NO_DEPS) WX_ARG_DISABLE(vararg_macros,[ --disable-vararg_macros don't use vararg macros, even if they are supported], wxUSE_VARARG_MACROS) -WX_ARG_ENABLE_PARAM(universal_binary, [[ --enable-universal_binary create Mac PowerPC and Intel Universal binary]], wxUSE_UNIVERSAL_BINARY) + +WX_ARG_ENABLE_PARAM(universal_binary, [[ --enable-universal_binary create universal binary with Mac PPC and i386 (and x86_64 if using Cocoa) architectures ]], wxUSE_UNIVERSAL_BINARY) +WX_ARG_ENABLE_PARAM(macosx_arch, [[ --enable-macosx_arch=ARCH build for just the specified architecture]], wxUSE_MAC_ARCH) WX_ARG_ENABLE(compat26, [ --enable-compat26 enable wxWidgets 2.6 compatibility], WXWIN_COMPATIBILITY_2_6) WX_ARG_DISABLE(compat28, [ --disable-compat28 disable wxWidgets 2.8 compatibility], WXWIN_COMPATIBILITY_2_8) @@ -834,6 +848,7 @@ WX_ARG_FEATURE(richtext, [ --enable-richtext use wxRichTextCtrl], wxUS WX_ARG_FEATURE(postscript, [ --enable-postscript use wxPostscriptDC device context (default for gtk+)], wxUSE_POSTSCRIPT) WX_ARG_FEATURE(printarch, [ --enable-printarch use printing architecture], wxUSE_PRINTING_ARCHITECTURE) WX_ARG_FEATURE(svg, [ --enable-svg use wxSVGFileDC device context], wxUSE_SVG) +WX_ARG_FEATURE(web, [ --enable-web use wxWeb library], wxUSE_WEB) dnl wxDC is implemented in terms of wxGraphicsContext in wxOSX so the latter dnl can't be disabled, don't even provide an option to do it @@ -875,6 +890,7 @@ if test "$wxUSE_CONTROLS" = "no"; then DEFAULT_wxUSE_COLOURPICKERCTRL=no DEFAULT_wxUSE_COMBOBOX=no DEFAULT_wxUSE_COMBOBOX=no + DEFAULT_wxUSE_COMMANDLINKBUTTON=no DEFAULT_wxUSE_DATAVIEWCTRL=no DEFAULT_wxUSE_DATEPICKCTRL=no DEFAULT_wxUSE_DETECT_SM=no @@ -891,10 +907,12 @@ if test "$wxUSE_CONTROLS" = "no"; then DEFAULT_wxUSE_LISTBOOK=no DEFAULT_wxUSE_LISTBOX=no DEFAULT_wxUSE_LISTCTRL=no + DEFAULT_wxUSE_MARKUP=no DEFAULT_wxUSE_NOTEBOOK=no DEFAULT_wxUSE_POPUPWIN=no DEFAULT_wxUSE_RADIOBOX=no DEFAULT_wxUSE_RADIOBTN=no + DEFAULT_wxUSE_RICHMSGDLG=no DEFAULT_wxUSE_REARRANGECTRL=no DEFAULT_wxUSE_SASH=no DEFAULT_wxUSE_SCROLLBAR=no @@ -917,9 +935,14 @@ if test "$wxUSE_CONTROLS" = "no"; then DEFAULT_wxUSE_TREECTRL=no fi +dnl features affecting multiple controls +WX_ARG_FEATURE(markup, [ --enable-markup support wxControl::SetLabelMarkup], wxUSE_MARKUP) + dnl please keep the settings below in alphabetical order WX_ARG_FEATURE(accel, [ --enable-accel use accelerators], wxUSE_ACCEL) WX_ARG_FEATURE(animatectrl, [ --enable-animatectrl use wxAnimationCtrl class], wxUSE_ANIMATIONCTRL) +WX_ARG_FEATURE(artstd, [ --enable-artstd use standard XPM icons in wxArtProvider], wxUSE_ARTPROVIDER_STD) +WX_ARG_FEATURE(arttango, [ --enable-arttango use Tango icons in wxArtProvider], wxUSE_ARTPROVIDER_TANGO) WX_ARG_FEATURE(bmpbutton, [ --enable-bmpbutton use wxBitmapButton class], wxUSE_BMPBUTTON) WX_ARG_FEATURE(bmpcombobox, [ --enable-bmpcombobox use wxBitmapComboBox class], wxUSE_BITMAPCOMBOBOX) WX_ARG_FEATURE(button, [ --enable-button use wxButton class], wxUSE_BUTTON) @@ -933,6 +956,7 @@ WX_ARG_FEATURE(collpane, [ --enable-collpane use wxCollapsiblePane cla WX_ARG_FEATURE(colourpicker,[ --enable-colourpicker use wxColourPickerCtrl class], wxUSE_COLOURPICKERCTRL) WX_ARG_FEATURE(combobox, [ --enable-combobox use wxComboBox class], wxUSE_COMBOBOX) WX_ARG_FEATURE(comboctrl, [ --enable-comboctrl use wxComboCtrl class], wxUSE_COMBOCTRL) +WX_ARG_FEATURE(commandlinkbutton, [ --enable-commandlinkbutton use wxCommmandLinkButton class], wxUSE_COMMANDLINKBUTTON) WX_ARG_FEATURE(dataviewctrl,[ --enable-dataviewctrl use wxDataViewCtrl class], wxUSE_DATAVIEWCTRL) WX_ARG_FEATURE(datepick, [ --enable-datepick use wxDatePickerCtrl class], wxUSE_DATEPICKCTRL) WX_ARG_FEATURE(detect_sm, [ --enable-detect_sm use code to detect X11 session manager], wxUSE_DETECT_SM) @@ -957,6 +981,7 @@ WX_ARG_FEATURE(odcombobox, [ --enable-odcombobox use wxOwnerDrawnComboBox WX_ARG_FEATURE(popupwin, [ --enable-popupwin use wxPopUpWindow class], wxUSE_POPUPWIN) WX_ARG_FEATURE(radiobox, [ --enable-radiobox use wxRadioBox class], wxUSE_RADIOBOX) WX_ARG_FEATURE(radiobtn, [ --enable-radiobtn use wxRadioButton class], wxUSE_RADIOBTN) +WX_ARG_FEATURE(richmsgdlg, [ --enable-richmsgdlg use wxRichMessageDialog class], wxUSE_RICHMSGDLG) WX_ARG_FEATURE(rearrangectrl,[ --enable-rearrangectrl use wxRearrangeList/Ctrl/Dialog], wxUSE_REARRANGECTRL) WX_ARG_FEATURE(sash, [ --enable-sash use wxSashWindow class], wxUSE_SASH) WX_ARG_FEATURE(scrollbar, [ --enable-scrollbar use wxScrollBar class and scrollable windows], wxUSE_SCROLLBAR) @@ -1016,6 +1041,8 @@ WX_ARG_FEATURE(metafile, [ --enable-metafiles use wxMetaFile (Win32 onl WX_ARG_FEATURE(dragimage, [ --enable-dragimage use wxDragImage], wxUSE_DRAGIMAGE) WX_ARG_FEATURE(accessibility,[ --enable-accessibility enable accessibility support], wxUSE_ACCESSIBILITY) WX_ARG_FEATURE(uiactionsim, [ --enable-uiactionsim use wxUIActionSimulator (experimental)], wxUSE_UIACTIONSIMULATOR) +WX_ARG_FEATURE(dctransform, [ --enable-dctransform use wxDC::SetTransformMatrix and related], wxUSE_DC_TRANSFORM_MATRIX) +WX_ARG_FEATURE(webviewwebkit,[ --enable-webview-webkit use wxWebView WebKit backend], wxUSE_WEBVIEW_WEBKIT) dnl --------------------------------------------------------------------------- dnl support for image formats that do not rely on external library @@ -1040,6 +1067,7 @@ WX_ARG_FEATURE(ps-in-msw, [ --enable-ps-in-msw use PS printing in wxMSW WX_ARG_FEATURE(ownerdrawn, [ --enable-ownerdrawn use owner drawn controls (Win32 and OS/2 only)], wxUSE_OWNER_DRAWN) WX_ARG_FEATURE(uxtheme, [ --enable-uxtheme enable support for Windows XP themed look (Win32 only)], wxUSE_UXTHEME) WX_ARG_FEATURE(wxdib, [ --enable-wxdib use wxDIB class (Win32 only)], wxUSE_DIB) +WX_ARG_FEATURE(webviewie, [ --enable-webview-ie use wxWebView IE backend (Win32 only)], wxUSE_WEBVIEW_IE) dnl this one is not really MSW-specific but it exists mainly to be turned off dnl under MSW, it should be off by default on the other platforms @@ -1111,13 +1139,18 @@ if test "$wxUSE_MAC" = 1; then retest_macosx_linking=no +OSX_ARCH_OPTS="" +if test "x$wxUSE_MAC_ARCH" != xno; then + OSX_ARCH_OPTS="-arch $wxUSE_MAC_ARCH" +fi + dnl Support the old --enable-universal_binary in case anyone was using it. if test "x$wxUSE_UNIVERSAL_BINARY" != xno ; then dnl --enable-universal_binary uses a default SDK (currently 10.4u) dnl --enable-universal_binary=SDK names a path to an SDK if test "x$wxUSE_UNIVERSAL_BINARY" == xyes; then # Implicitly turn on the new --with-macosx-sdk using the default - # SDK which provides the behavior this option has always had. + # SDK which provides the behaviour this option has always had. if test "x$wxUSE_MACOSX_SDK" = "x"; then AC_MSG_WARN([Enabling default SDK due to --enable-universal_binary.]) AC_MSG_WARN([If you don't want this, specify --without-macosx-sdk]) @@ -1140,12 +1173,13 @@ dnl Support the old --enable-universal_binary in case anyone was using it. fi fi dnl FIXME: I think it would be better to put this into CC, CXX, and LD rather than the flags. - OSX_UNIV_OPTS="-arch ppc -arch i386" - CXXFLAGS="$OSX_UNIV_OPTS $CXXFLAGS" - CFLAGS="$OSX_UNIV_OPTS $CFLAGS" - OBJCXXFLAGS="$OSX_UNIV_OPTS $OBJCXXFLAGS" - OBJCFLAGS="$OSX_UNIV_OPTS $OBJCFLAGS" - LDFLAGS="$OSX_UNIV_OPTS $LDFLAGS" + OSX_ARCH_OPTS="-arch ppc -arch i386" + if test "$wxUSE_OSX_COCOA" = 1; then + OSX_ARCH_OPTS="$OSX_ARCH_OPTS -arch x86_64" + fi + AC_MSG_CHECKING([for universal binary architectures]) + AC_MSG_RESULT([$OSX_ARCH_OPTS]) + dnl NOTE: Only the compiler driver needs arch flags. The link editor dnl is incapable of using them but the compiler driver (which we use dnl as LD when building dynamic libraries) uses them to invoke the @@ -1169,6 +1203,12 @@ dnl Support the old --enable-universal_binary in case anyone was using it. bk_use_pch=no fi +CXXFLAGS="$OSX_ARCH_OPTS $CXXFLAGS" +CFLAGS="$OSX_ARCH_OPTS $CFLAGS" +OBJCXXFLAGS="$OSX_ARCH_OPTS $OBJCXXFLAGS" +OBJCFLAGS="$OSX_ARCH_OPTS $OBJCFLAGS" +LDFLAGS="$OSX_ARCH_OPTS $LDFLAGS" + dnl Set up the Mac OS X SDK. We do this early so configure tests will occur dnl with the SDK in place. dnl NOTE: We clobber wxUSE_MACOSX_SDK with the SDK path @@ -1187,10 +1227,8 @@ if test "x$wxUSE_MACOSX_SDK" != "x"; then else AC_MSG_RESULT([exists]) fi + dnl CC and CXX will have these flags added below, after the compiler has been chosen MACOSX_SDK_OPTS="-isysroot $wxUSE_MACOSX_SDK" - eval "CC=\"$CC $MACOSX_SDK_OPTS\"" - eval "CXX=\"$CXX $MACOSX_SDK_OPTS\"" - eval "LD=\"$LD $MACOSX_SDK_OPTS\"" retest_macosx_linking=yes dnl NOTE: When libtool is used in lieu of AR/RANLIB (i.e. in static mode) dnl the syslibroot makes no difference. We aren't using libtool now but @@ -1272,20 +1310,30 @@ if test "x$NEEDS_GCC40" == "xyes"; then CCVERSION=`$CC --version | grep 4.[[2-9]].` if test "x$CCVERSION" != "x"; then echo "$as_me:$LINENO: WARNING: gcc >= 4.2 cannot compile 10.4 compatible code. Using gcc 4.0 instead." - CC="/usr/bin/gcc-4.0" + CC="gcc-4.0" fi fi if test "x$CXX" = "xg++"; then CCVERSION=`$CXX --version | grep 4.[[2-9]].` if test "x$CCVERSION" != "x"; then - CXX="/usr/bin/g++-4.0" + CXX="g++-4.0" fi fi fi +if test "x$MACOSX_SDK_OPTS" != "x"; then + eval "CC=\"$CC $MACOSX_SDK_OPTS\"" + eval "CXX=\"$CXX $MACOSX_SDK_OPTS\"" + eval "LD=\"$LD $MACOSX_SDK_OPTS\"" +fi + if test "x$wxUSE_MACOSX_VERSION_MIN" != "x"; then - MACOSX_VERSION_MIN_OPTS="-mmacosx-version-min=$wxUSE_MACOSX_VERSION_MIN" + if test "$wxUSE_OSX_IPHONE" = 1; then + MACOSX_VERSION_MIN_OPTS="-miphoneos-version-min=$wxUSE_MACOSX_VERSION_MIN" + else + MACOSX_VERSION_MIN_OPTS="-mmacosx-version-min=$wxUSE_MACOSX_VERSION_MIN" + fi eval "CC=\"$CC $MACOSX_VERSION_MIN_OPTS\"" eval "CXX=\"$CXX $MACOSX_VERSION_MIN_OPTS\"" eval "LD=\"$LD $MACOSX_VERSION_MIN_OPTS\"" @@ -1416,7 +1464,7 @@ if test "$wxUSE_WINE" = "yes"; then LDFLAGS_GUI="-mwindows" fi -dnl NB: The two tests bellow are *NOT* mutually exclusive! They should only +dnl NB: The two tests below are *NOT* mutually exclusive! They should only dnl take effect on Cygwin/Mingw and not other platforms. if test "$wants_win32" = 1 ; then USE_UNIX=0 @@ -1640,11 +1688,10 @@ AC_CHECK_SIZEOF(wchar_t, 0, #include ] ) -if test "$ac_cv_sizeof_wchar_t" != 0; then - wxUSE_WCHAR_T=yes -else - wxUSE_WCHAR_T=no +if test "$ac_cv_sizeof_wchar_t" = 0; then + AC_MSG_ERROR([wxWidgets requires wchar_t support.]) fi +AC_DEFINE(wxUSE_WCHAR_T) dnl checks needed to define wxVaCopy AC_CACHE_CHECK([for va_copy], @@ -2131,6 +2178,8 @@ if test "$wxUSE_STL" = "yes"; then fi fi +AC_CHECK_HEADERS([type_traits tr1/type_traits]) + dnl check for atomic operations builtins for wx/atomic.h: WX_ATOMIC_BUILTINS @@ -2723,17 +2772,6 @@ dnl ------------------------------------------------------------------------ dnl Check for expat libraries dnl ------------------------------------------------------------------------ -if test "$wxUSE_WCHAR_T" != "yes"; then - if test "$wxUSE_EXPAT" != "no"; then - AC_MSG_WARN([wxWidgets requires wchar_t to use expat, disabling]) - wxUSE_EXPAT=no - fi - if test "$wxUSE_XML" != "no"; then - AC_MSG_WARN([wxWidgets requires wchar_t to use xml, disabling]) - wxUSE_XML=no - fi -fi - if test "$wxUSE_EXPAT" != "no"; then wxUSE_XML=yes AC_DEFINE(wxUSE_EXPAT) @@ -2818,21 +2856,14 @@ if test "$USE_WIN32" = 1 ; then ], [ ]) - 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 -lcomdlg32 -ladvapi32 -lwsock32 -lgdi32" case "${host}" in x86_64-*-mingw32* ) - dnl --- For mingw-w64 lctl3d32's name has changed - LIBS="$LIBS -lwinspool -lwinmm -lshell32 -lcomctl32 -lcomdlg32 -lwctl3d32 -ladvapi32 -lwsock32 -lgdi32" - dnl we need to define this to embed the manifest for correct dnl platform from wx/msw/wx.rc (this is not needed for x86 which is dnl the default in wx/msw/rcdefs.h) WINDRES_CPU_DEFINE="--define WX_CPU_AMD64" ;; - * ) - LIBS="$LIBS -lwinspool -lwinmm -lshell32 -lcomctl32 -lcomdlg32 -lctl3d32 -ladvapi32 -lwsock32 -lgdi32" - ;; esac if test "$wxUSE_ACCESSIBILITY" = "yes" ; then LIBS="$LIBS -loleacc" @@ -2845,13 +2876,13 @@ if test "$USE_WIN32" = 1 ; then esac dnl This one is still used by some sample makefiles. - RESFLAGS="--include-dir \$(top_srcdir)/include --include-dir \$(top_srcdir)/\$(program_dir) --define __WIN32__ --define __WIN95__ --define __GNUWIN32__" + RESFLAGS="--include-dir \$(top_srcdir)/include --include-dir \$(top_srcdir)/\$(program_dir) --define __WIN32__ --define __WIN95__ --define __GNUWIN32__ $WINDRES_CPU_DEFINE" RESPROGRAMOBJ="\$(PROGRAM)_resources.o" dnl This lot we export to wx-config. It must add the relevant dnl include directories at the point when they can be known. dnl (but are these (still) required anyway?) - WXCONFIG_RESFLAGS="--define __WIN32__ --define __WIN95__ --define __GNUWIN32__" + WXCONFIG_RESFLAGS="--define __WIN32__ --define __WIN95__ --define __GNUWIN32__ $WINDRES_CPU_DEFINE" dnl install Win32-specific files in "make install" WIN32INSTALL=win32install @@ -2931,13 +2962,8 @@ if test "$wxUSE_GUI" = "yes"; then AM_PATH_GTK_2_0(2.4.0, wx_cv_lib_gtk=2.0, , $GTK_MODULES) - dnl Solaris also requires -lX11 for static lib - case "${host}" in - *-*-solaris2* ) - if test "$wxUSE_SHARED" != "yes"; then - GTK_LIBS="$GTK_LIBS -lX11" - fi - esac + dnl we use symbols from X11 directly so we should link with it + GTK_LIBS="$GTK_LIBS -lX11" fi dnl detect GTK1.x @@ -2958,7 +2984,7 @@ if test "$wxUSE_GUI" = "yes"; then dnl we need to cache GTK_CFLAGS and GTK_LIBS for the dnl subsequent runs wx_cv_cflags_gtk=$GTK_CFLAGS - wx_cv_libs_gtk=`echo $GTK_LIBS | sed -e 's/ -l[[^ ]]*cairo[[^ ]]*//g'` + wx_cv_libs_gtk=$GTK_LIBS fi ] ) @@ -3712,14 +3738,13 @@ fi dnl --------------------------------------------------------------------------- -dnl wxDisplay Sanity checks +dnl wxDisplay checks dnl --------------------------------------------------------------------------- +USE_XINERAMA=0 if test "$wxUSE_DISPLAY" = "yes"; then -dnl --------------------------------------------------------------------------- -dnl Xinerama (for unix ) - Brian Victor -dnl --------------------------------------------------------------------------- - if test "$wxUSE_UNIX" = "yes" -a "$wxUSE_MAC" != 1 -a "$wxUSE_OLD_COCOA" != 1; then + dnl Xinerama is used for wxGTK1/wxX11/wxMotif only + if test "$wxUSE_MOTIF" = 1 -o "$wxUSE_X11" = 1 -o "$wxUSE_GTK1" = 1; then AC_MSG_CHECKING([for Xinerama]) WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],Xinerama) if test "$ac_find_libraries" != "" ; then @@ -3727,40 +3752,43 @@ dnl --------------------------------------------------------------------------- if test "$ac_path_to_link" != " -L/usr/lib" ; then LDFLAGS="$LDFLAGS $ac_path_to_link" fi + USE_XINERAMA=1 GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXinerama" AC_MSG_RESULT([yes]) - - AC_MSG_CHECKING([for Xxf86vm extension]) - WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],Xxf86vm) - if test "$ac_find_libraries" != "" ; then - AC_MSG_RESULT([yes]) - AC_CHECK_HEADERS([X11/extensions/xf86vmode.h], - [ - GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXxf86vm" - ], - [], - [ - #if HAVE_X11_XLIB_H - #include - #endif - ]) - else - AC_MSG_RESULT([no]) - fi - else AC_MSG_RESULT([no]) AC_MSG_WARN([Xinerama not found; disabling wxDisplay]) wxUSE_DISPLAY="no" fi elif test "$wxUSE_MSW" = 1; then -dnl --------------------------------------------------------------------------- -dnl DirectDraw for MSW - optionally used by WxDisplay. -dnl --------------------------------------------------------------------------- + dnl DirectDraw for MSW - optionally used by WxDisplay. AC_CHECK_HEADER([ddraw.h], [], [], [#include ]) fi fi +if test "$wxUSE_DISPLAY" = "yes"; then + dnl wxGTK2 needs Xxf86vm as well as Xinerama-using ports from above + if test "$USE_XINERAMA" = 1 -o "$wxUSE_GTK" = 1; then + AC_MSG_CHECKING([for Xxf86vm extension]) + WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],Xxf86vm) + if test "$ac_find_libraries" != "" ; then + AC_MSG_RESULT([yes]) + AC_CHECK_HEADERS([X11/extensions/xf86vmode.h], + [ + GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXxf86vm" + ], + [], + [ + #if HAVE_X11_XLIB_H + #include + #endif + ]) + else + AC_MSG_RESULT([no]) + fi + fi +fi + dnl --------------------------------------------------------------------------- dnl X11 session management dnl --------------------------------------------------------------------------- @@ -3979,16 +4007,16 @@ if test "$wxUSE_SHARED" = "yes"; then DYLIB_RPATH_POSTLINK="${HOST_PREFIX}install_name_tool -id \$@ \$@" cat <change-install-names #!/bin/sh -libnames=\`cd \${1} ; ls -1 | grep '\.[[0-9]][[0-9]]*\.dylib\$'\` +libnames=\`cd \${2} ; ls -1 | grep '\.[[0-9]][[0-9]]*\.dylib\$'\` for i in \${libnames} ; do - ${HOST_PREFIX}install_name_tool -id \${1}/\${i} \${1}/\${i} + ${HOST_PREFIX}install_name_tool -id \${3}/\${i} \${1}/\${i} for dep in \${libnames} ; do - ${HOST_PREFIX}install_name_tool -change \${2}/\${dep} \${1}/\${dep} \${1}/\${i} + ${HOST_PREFIX}install_name_tool -change \${2}/\${dep} \${3}/\${dep} \${1}/\${i} done done EOF chmod +x change-install-names - DYLIB_RPATH_INSTALL="\$(wx_top_builddir)/change-install-names \${libdir} \$(wx_top_builddir)/lib" + DYLIB_RPATH_INSTALL="\$(wx_top_builddir)/change-install-names \${DESTDIR}\${libdir} \$(wx_top_builddir)/lib \${libdir}" fi dnl the HEADER_PAD_OPTION is required by some wx samples to avoid the error: @@ -4220,54 +4248,47 @@ dnl --------------------------------------------------------------------------- dnl Check for functions dnl --------------------------------------------------------------------------- -dnl don't check for wchar_t functions if we haven't got wchar_t itself -if test "$wxUSE_WCHAR_T" = "yes"; then - AC_DEFINE(wxUSE_WCHAR_T) - - dnl check for wcslen in all possible places - WCSLEN_FOUND=0 - WCHAR_LINK= - AC_CHECK_FUNCS(wcslen, WCSLEN_FOUND=1) - - if test "$WCSLEN_FOUND" = 0; then - if test "$TOOLKIT" = "MSW"; then - AC_CHECK_LIB(msvcrt, wcslen, WCHAR_OK=1) - else - AC_CHECK_LIB(w, wcslen, [ - WCHAR_LINK=" -lw" - WCSLEN_FOUND=1 - ]) - fi - fi +dnl check for wcslen in all possible places +WCSLEN_FOUND=0 +WCHAR_LINK= +AC_CHECK_FUNCS(wcslen, WCSLEN_FOUND=1) - if test "$WCSLEN_FOUND" = 1; then - AC_DEFINE(HAVE_WCSLEN) +if test "$WCSLEN_FOUND" = 0; then + if test "$TOOLKIT" = "MSW"; then + AC_CHECK_LIB(msvcrt, wcslen, WCHAR_OK=1) + else + AC_CHECK_LIB(w, wcslen, [ + WCHAR_LINK=" -lw" + WCSLEN_FOUND=1 + ]) fi +fi - AC_CHECK_FUNCS([wcsdup strnlen wcsnlen wcscasecmp wcsncasecmp]) +if test "$WCSLEN_FOUND" = 1; then + AC_DEFINE(HAVE_WCSLEN) +fi - dnl On HP-UX aCC need this define to find mbstrtowcs() &c - dnl Can't be used for g++ since the mbstate_t in wchar.h can conflict - dnl with g++'s in (unless -D_INCLUDE__STDC_A1_SOURCE is in the - dnl flags when g++ is configured, it will declare it's own). - if test "$USE_HPUX" = 1 -a "$GCC" != "yes"; then - CPPFLAGS="-D_INCLUDE__STDC_A1_SOURCE $CPPFLAGS" - fi +AC_CHECK_FUNCS([wcsdup wcsftime strnlen wcsnlen wcscasecmp wcsncasecmp]) - dnl Try to use wcsrtombs instead of wcstombs which is buggy in old GNU - dnl libc versions if possible. AC_CHECK_FUNCS only checks it's in the - dnl library, not the header, so do a header check for mbstate_t first. - AC_CHECK_TYPES([mbstate_t], - [AC_CHECK_FUNCS(wcsrtombs)], - [], - [#include ]) -else - AC_MSG_WARN([Wide character support is unavailable]) +dnl On HP-UX aCC need this define to find mbstrtowcs() &c +dnl Can't be used for g++ since the mbstate_t in wchar.h can conflict +dnl with g++'s in (unless -D_INCLUDE__STDC_A1_SOURCE is in the +dnl flags when g++ is configured, it will declare its own). +if test "$USE_HPUX" = 1 -a "$GCC" != "yes"; then + CPPFLAGS="-D_INCLUDE__STDC_A1_SOURCE $CPPFLAGS" fi +dnl Try to use wcsrtombs instead of wcstombs which is buggy in old GNU +dnl libc versions if possible. AC_CHECK_FUNCS only checks it's in the +dnl library, not the header, so do a header check for mbstate_t first. +AC_CHECK_TYPES([mbstate_t], + [AC_CHECK_FUNCS(wcsrtombs)], + [], + [#include ]) + dnl check for vsnprintf() -- a safe version of vsprintf()) dnl -dnl the trouble here is that on some systems (e.g HP-UX 10) this function is +dnl the trouble here is that on some systems (e.g. HP-UX 10) 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 wxWidgets fails @@ -5383,6 +5404,8 @@ if test "$wxUSE_DEBUG_GDB" = "yes" ; then fi if test "$wxUSE_DEBUG_FLAG" = "no" ; then + WXCONFIG_CPPFLAGS="$WXCONFIG_CPPFLAGS -DwxDEBUG_LEVEL=0" + if test "$wxUSE_GTK" = 1 ; then if test "x$wxGTK_VERSION" = "x1" ; then CPPFLAGS="-DGTK_NO_CHECK_CASTS $CPPFLAGS" @@ -5649,6 +5672,11 @@ if test "$wxUSE_FSWATCHER" = "yes"; then else wxUSE_FSWATCHER=no fi + else + if test "$wxUSE_THREADS" != "yes"; then + AC_MSG_WARN([wxFileSystemWatcher disabled due to --disable-threads]) + wxUSE_FSWATCHER=no + fi fi if test "$wxUSE_FSWATCHER" = "yes"; then @@ -5956,6 +5984,10 @@ if test "$wxUSE_BUSYINFO" = "yes"; then AC_DEFINE(wxUSE_BUSYINFO) fi +if test "$wxUSE_STD_CONTAINERS" = "yes"; then + AC_DEFINE(wxUSE_STD_CONTAINERS) +fi + if test "$wxUSE_STD_IOSTREAM" = "yes"; then AC_DEFINE(wxUSE_STD_IOSTREAM) fi @@ -5964,6 +5996,10 @@ if test "$wxUSE_STD_STRING" = "yes"; then AC_DEFINE(wxUSE_STD_STRING) fi +if test "$wxUSE_STD_STRING_CONV_IN_WXSTRING" = "yes"; then + AC_DEFINE(wxUSE_STD_STRING_CONV_IN_WXSTRING) +fi + if test "$wxUSE_STDPATHS" = "yes"; then AC_DEFINE(wxUSE_STDPATHS) fi @@ -6734,6 +6770,10 @@ if test "$wxUSE_UIACTIONSIMULATOR" = "yes" ; then SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS uiaction" fi +if test "$wxUSE_DC_TRANSFORM_MATRIX" = "yes" ; then + AC_DEFINE(wxUSE_DC_TRANSFORM_MATRIX) +fi + dnl --------------------------------------------------------------------------- dnl GUI controls dnl --------------------------------------------------------------------------- @@ -6743,6 +6783,10 @@ if test "$wxUSE_CONTROLS" = "yes"; then USES_CONTROLS=1 fi +if test "$wxUSE_MARKUP" = "yes"; then + AC_DEFINE(wxUSE_MARKUP) +fi + if test "$wxUSE_ACCEL" = "yes"; then AC_DEFINE(wxUSE_ACCEL) USES_CONTROLS=1 @@ -6792,6 +6836,11 @@ if test "$wxUSE_COMBOCTRL" = "yes"; then USES_CONTROLS=1 fi +if test "$wxUSE_COMMANDLINKBUTTON" = "yes"; then + AC_DEFINE(wxUSE_COMMANDLINKBUTTON) + USES_CONTROLS=1 +fi + if test "$wxUSE_CHOICE" = "yes"; then AC_DEFINE(wxUSE_CHOICE) USES_CONTROLS=1 @@ -6951,6 +7000,10 @@ if test "$wxUSE_REARRANGECTRL" = "yes"; then AC_DEFINE(wxUSE_REARRANGECTRL) fi +if test "$wxUSE_RICHMSGDLG" = "yes"; then + AC_DEFINE(wxUSE_RICHMSGDLG) +fi + if test "$wxUSE_SASH" = "yes"; then AC_DEFINE(wxUSE_SASH) SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS sashtest" @@ -7131,6 +7184,27 @@ if test "$wxUSE_ACCESSIBILITY" = "yes"; then SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS access" fi +if test "$wxUSE_ARTPROVIDER_STD" = "yes"; then + AC_DEFINE(wxUSE_ARTPROVIDER_STD) +fi + +if test "$wxUSE_ARTPROVIDER_TANGO" = "auto"; then + dnl Tango-based art provider is not needed in GTK-based ports as the + dnl native art provider completely replaces it. + if test "$wxUSE_GTK" != 1; then + dnl It also requires support for memory-mapped PNG images. + if test "$wxUSE_LIBPNG" != no -a \ + "$wxUSE_IMAGE" = yes -a \ + "$wxUSE_STREAMS" = yes; then + wxUSE_ARTPROVIDER_TANGO="yes" + fi + fi +fi + +if test "$wxUSE_ARTPROVIDER_TANGO" = "yes"; then + AC_DEFINE(wxUSE_ARTPROVIDER_TANGO) +fi + if test "$wxUSE_DRAGIMAGE" = "yes"; then AC_DEFINE(wxUSE_DRAGIMAGE) SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS dragimag" @@ -7279,6 +7353,74 @@ if test "$wxUSE_RICHTEXT" = "yes"; then SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS richtext" fi +USE_WEB=0 +if test "$wxUSE_WEB" = "yes"; then + AC_DEFINE(wxUSE_WEB) + USE_WEB=1 + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS web" + + if test "$wxUSE_WEBVIEW_WEBKIT" = "yes" -a "$wxUSE_GTK" = 1; then + AC_DEFINE(wxUSE_WEBVIEW_WEBKIT) + AC_MSG_CHECKING([for webkitgtk libraries]) + WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],webkitgtk-1.0) + 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 -lwebkitgtk-1.0" + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + AC_MSG_WARN([libwebkitgtk-1.0 not found; disabling webkit backend]) + wxUSE_WEBVIEW_WEBKIT="no" + fi + + AC_MSG_CHECKING(for webkitgtk includes) + WX_PATH_FIND_INCLUDES([$SEARCH_INCLUDE /usr/include/webkit-1.0], webkit/webkit.h) + if test "$ac_find_includes" != "" ; then + AC_MSG_RESULT(found in $ac_find_includes) + WX_INCLUDE_PATH_EXIST($ac_find_includes, $CPPFLAGS) + CPPFLAGS="$ac_path_to_include $CPPFLAGS" + else + AC_MSG_RESULT([not found]) + fi + dnl we also depend on libsoup + AC_MSG_CHECKING(for libsoup includes) + WX_PATH_FIND_INCLUDES([$SEARCH_INCLUDE /usr/include/libsoup-2.4], libsoup/soup.h) + if test "$ac_find_includes" != "" ; then + AC_MSG_RESULT(found in $ac_find_includes) + WX_INCLUDE_PATH_EXIST($ac_find_includes, $CPPFLAGS) + CPPFLAGS="$ac_path_to_include $CPPFLAGS" + else + AC_MSG_RESULT([not found]) + fi + fi + + if test "$wxUSE_WEBVIEW_WEBKIT" = "yes" -a "$wxUSE_MAC" = 1 -a "$USE_DARWIN" = 1; then + old_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="-x objective-c++ $CPPFLAGS" + AC_CHECK_HEADER([WebKit/HIWebView.h], + [ + AC_DEFINE(wxUSE_WEBVIEW_WEBKIT) + WEBKIT_LINK="-framework WebKit" + ], + [ + AC_MSG_WARN([WebKit headers not found; disabling wxWebView WebKit]) + wxUSE_WEBVIEW_WEBKIT=no + ], + [ + #include + #include + ]) + CPPFLAGS="$old_CPPFLAGS" + elif test "$wxUSE_OLD_COCOA" = 1; then + AC_DEFINE(wxUSE_WEBVIEW_WEBKIT) + else + wxUSE_WEBVIEW_WEBKIT=no + fi +fi + dnl --------------------------------------------------------------------------- dnl wxImage options dnl --------------------------------------------------------------------------- @@ -7466,11 +7608,33 @@ if test "$wxUSE_GRAPHICS_CONTEXT" = "yes"; then if test "$wx_cv_lib_gdiplus" = "yes"; then wx_has_graphics=1 fi - elif test "$wxUSE_GTK" = 1; then + elif test "$wxUSE_GTK" = 1 -o "$wxUSE_X11" = 1; then PKG_CHECK_MODULES(CAIRO, cairo, [wx_has_graphics=1], [AC_MSG_WARN([Cairo library not found])] ) + if test "$wx_has_graphics" = 1; then + dnl Check that Cairo library is new enough: wxGraphicsContext + dnl won't compile without cairo_push_group() and + dnl cairo_pop_group_to_source() which are new in 1.2. + save_LIBS="$LIBS" + LIBS="$LIBS $CAIRO_LIBS" + AC_CHECK_FUNCS([cairo_push_group]) + LIBS="$save_LIBS" + if test "$ac_cv_func_cairo_push_group" = "no"; then + wx_has_graphics=0 + AC_MSG_WARN([Cairo library is too old and misses cairo_push_group()]) + else + AC_DEFINE(wxUSE_CAIRO) + + dnl We don't need to do this for wxGTK as we already get Cairo + dnl flags as part of GTK+ ones. + if test "$wxUSE_GTK" != 1; then + CPPFLAGS="$CAIRO_CFLAGS $CPPFLAGS" + GUI_TK_LIBRARY="$GUI_TK_LIBRARY $CAIRO_LIBS" + fi + fi + fi else dnl assume it's ok, add more checks here if needed wx_has_graphics=1 @@ -7639,6 +7803,10 @@ if test "$wxUSE_GUI" = "yes"; then if test "$wxUSE_STC" = "yes" ; then BUILT_WX_LIBS="stc $BUILT_WX_LIBS" fi + if test "$wxUSE_WEB" = "yes" ; then + STD_GUI_LIBS="web $STD_GUI_LIBS" + BUILT_WX_LIBS="web $BUILT_WX_LIBS" + fi if test "$wxUSE_XRC" = "yes" ; then STD_GUI_LIBS="xrc $STD_GUI_LIBS" BUILT_WX_LIBS="xrc $BUILT_WX_LIBS" @@ -7658,7 +7826,11 @@ dnl all additional libraries (except wxWidgets itself) we link with EXTRA_FRAMEWORKS= if test "$wxUSE_MAC" = 1 ; then if test "$USE_DARWIN" = 1; then - EXTRA_FRAMEWORKS="-framework IOKit -framework Carbon -framework Cocoa -framework AudioToolbox -framework System -framework OpenGL -framework QuickTime" + if test "$wxUSE_OSX_IPHONE" = 1; then + EXTRA_FRAMEWORKS="-framework IOKit -framework UIKit -framework CFNetwork -framework AudioToolbox -framework CoreFoundation -framework CoreGraphics -framework OpenGLES -framework Foundation -framework QuartzCore" + else + EXTRA_FRAMEWORKS="-framework IOKit -framework Carbon -framework Cocoa -framework AudioToolbox -framework System -framework OpenGL -framework QuickTime" + fi fi fi if test "$wxUSE_OLD_COCOA" = 1 ; then @@ -8035,7 +8207,7 @@ if test "$wxUSE_MSW" = 1 ; then AC_MSG_ERROR([Required windres program not found]) fi - RESCOMP="$WINDRES $WINDRES_CPU_DEFINE" + RESCOMP="$WINDRES" fi if test "$wxUSE_MAC" = 1 -o "$wxUSE_OLD_COCOA" = 1; then