X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/32d246ce52f6450f229f5eb16ee708e25e2a3085..7eae80a04b477d1200af666397cd387cf143ac0b:/configure.in diff --git a/configure.in b/configure.in index 336b340af2..1eae0beda8 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.2], [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=2 wx_subrelease_number=0 WX_RELEASE=$wx_major_version_number.$wx_minor_version_number @@ -387,7 +387,6 @@ 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_UNICODE_UTF8=auto @@ -399,6 +398,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 @@ -718,7 +718,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) @@ -877,6 +879,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 @@ -897,6 +900,7 @@ if test "$wxUSE_CONTROLS" = "no"; then 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 @@ -935,6 +939,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) @@ -959,6 +964,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) @@ -1113,6 +1119,11 @@ 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) @@ -1142,12 +1153,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 @@ -1171,6 +1183,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 @@ -1291,7 +1309,7 @@ if test "x$wxUSE_MACOSX_VERSION_MIN" != "x"; then MACOSX_VERSION_MIN_OPTS="-miphoneos-version-min=$wxUSE_MACOSX_VERSION_MIN" else MACOSX_VERSION_MIN_OPTS="-mmacosx-version-min=$wxUSE_MACOSX_VERSION_MIN" - endif + fi eval "CC=\"$CC $MACOSX_VERSION_MIN_OPTS\"" eval "CXX=\"$CXX $MACOSX_VERSION_MIN_OPTS\"" eval "LD=\"$LD $MACOSX_VERSION_MIN_OPTS\"" @@ -2826,21 +2844,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" @@ -2966,7 +2977,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 ] ) @@ -5393,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" @@ -6802,6 +6815,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 @@ -6961,6 +6979,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"