X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/80aa2a2f064c62766810e00aeaa8a09a62c00aeb..b796194b15ddb3bd794b2150e2f2130e809ad2a6:/configure.in diff --git a/configure.in b/configure.in index 559c17cb20..e6bf454aef 100644 --- a/configure.in +++ b/configure.in @@ -184,6 +184,11 @@ case "${host}" in AC_DEFINE(__SVR4__) DEFAULT_DEFAULT_wxUSE_MOTIF=1 ;; + *-*-qnx*) + USE_QNX=1 + AC_DEFINE(__QNX__) + DEFAULT_DEFAULT_wxUSE_X11=1 + ;; *-*-solaris2* ) USE_SUN=1 USE_SOLARIS=1 @@ -382,6 +387,7 @@ 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 @@ -1008,6 +1014,7 @@ WX_ARG_FEATURE(joystick, [ --enable-joystick use wxJoystick], wxUSE_JO WX_ARG_FEATURE(metafile, [ --enable-metafiles use wxMetaFile (Win32 only)], wxUSE_METAFILE) 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) dnl --------------------------------------------------------------------------- dnl support for image formats that do not rely on external library @@ -1229,13 +1236,22 @@ elif test "x$wxUSE_MACOSX_VERSION_MIN" = "x"; then AC_MSG_WARN([Assuming OS X 10.4, use --with-macosx-version-min to override.]) OSX_VERSION="10.4" fi - if test "$wxUSE_OSX_CARBON" = 1 -o "x$OSX_VERSION" = "x10.4"; then - # otherwise configure stops on leopard for universal_binary - wxUSE_MACOSX_VERSION_MIN=10.4 - else - # for OS X Cocoa, use 10.5 so we can get 64-bit compile on Snow Leopard - wxUSE_MACOSX_VERSION_MIN=10.5 - fi + + case "$OSX_VERSION" in + 10.4* ) + wxUSE_MACOSX_VERSION_MIN=10.4 + ;; + + * ) + if test "$wxUSE_OSX_CARBON" = 1; then + # otherwise configure stops on leopard for universal_binary + wxUSE_MACOSX_VERSION_MIN=10.4 + else + # for Cocoa, use 10.5 to be able to compile it in 64 bits too + wxUSE_MACOSX_VERSION_MIN=10.5 + fi + ;; + esac fi NEEDS_GCC40="no" @@ -1818,18 +1834,57 @@ if test "x$SUNCC" = xyes; then CFLAGS="-erroff=E_NO_EXPLICIT_TYPE_GIVEN $CFLAGS" fi -dnl SGI mipsPro compiler gives this warning for "conversion from pointer to -dnl same-sized integral type" even when there is an explicit cast and as there -dnl is no way to turn it off and there are hundreds of these warnings in wx -dnl sources, just turn it off for now +dnl SGI mipsPro compiler version 7.4.4 and later (and maybe some earlier +dnl versions too but it's known that 7.4.2 doesn't give this warning but does +dnl instead warn about "unknown warning number 3970" which explains that we +dnl don't want to do this for it) gives this warning for "conversion from +dnl pointer to same-sized integral type" even when there is an explicit cast +dnl and as there is no way to turn it off and there are hundreds of these +dnl warnings in wx sources, just turn it off for now dnl dnl a better long term solution would be to use #pragma set/reset woff in dnl wxPtrToUInt() and use it instead of casts elsewhere if test "x$SGICC" = "xyes"; then - CFLAGS="-woff 3970 $CFLAGS" + AC_CACHE_CHECK([if cc version is 7.4.4 or greater], + wx_cv_prog_sgicc744, + [ + AC_TRY_COMPILE([], + [ + #if _SGI_COMPILER_VERSION >= 744 + chock me: mipsPro is 7.4.4 or later + #endif + ], + wx_cv_prog_sgicc744=no, + wx_cv_prog_sgicc744=yes + ) + ] + ) + + if test "x$wx_cv_prog_sgicc744" = "xyes"; then + CFLAGS="-woff 3970 $CFLAGS" + fi fi if test "x$SGICXX" = "xyes"; then - CXXFLAGS="-woff 3970 $CXXFLAGS" + AC_CACHE_CHECK([if CC version is 7.4.4 or greater], + wx_cv_prog_sgicxx744, + [ + AC_LANG_PUSH(C++) + AC_TRY_COMPILE([], + [ + #if _SGI_COMPILER_VERSION >= 744 + chock me: mipsPro is 7.4.4 or later + #endif + ], + wx_cv_prog_sgicxx744=no, + wx_cv_prog_sgicxx744=yes + ) + AC_LANG_POP() + ] + ) + + if test "x$wx_cv_prog_sgicxx744" = "xyes"; then + CXXFLAGS="-woff 3970 $CXXFLAGS" + fi fi dnl HP-UX c89/aCC compiler warnings @@ -2510,7 +2565,7 @@ if test "$wxUSE_LIBPNG" != "no" ; then AC_CHECK_HEADER(png.h,,, [ ]) if test "$ac_cv_header_png_h" = "yes"; then - AC_CHECK_LIB(png, png_check_sig, PNG_LINK=" -lpng -lz", , [-lz -lm]) + AC_CHECK_LIB(png, png_sig_cmp, PNG_LINK=" -lpng -lz", , [-lz -lm]) fi if test "x$PNG_LINK" = "x" ; then @@ -2765,7 +2820,7 @@ 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. case "${host}" in - x86_64-*-mingw32* ) + x86_64-*-mingw32* ) dnl --- For mingw-w64 lctl3d32's name has changed LIBS="$LIBS -lwinspool -lwinmm -lshell32 -lcomctl32 -lcomdlg32 -lwctl3d32 -ladvapi32 -lwsock32 -lgdi32" @@ -4873,6 +4928,12 @@ if test "$TOOLKIT" != "MSW" -a "$USE_OS2" != 1; then fi ;; + *-*-qnx*) + dnl under QNX thread functions are in libc so we don't need any + dnl special options to link with them + THREAD_OPTS="" + ;; + *-*-*UnixWare*) dnl flying by man pages here: Caldera online docs use this if test "x$GCC" != "xyes"; then @@ -4881,10 +4942,22 @@ if test "$TOOLKIT" != "MSW" -a "$USE_OS2" != 1; then ;; esac - dnl simply linking with libpthread should make the test below work but - dnl it's far from certain that the threaded programs compiled without - dnl any special switches actually work, so try it after all the others - THREAD_OPTS="$THREAD_OPTS pthread none" + case "${host}" in + *-*-qnx*) + dnl -lpthread works, i.e. AC_TRY_LINK() would pass, but results + dnl in warnings and is not needed under QNX so try without it + dnl first + THREAD_OPTS="none pthread" + ;; + + *) + dnl simply linking with libpthread should make the test below + dnl work but it's far from certain that the threaded programs + dnl compiled without any special switches actually work, so try + dnl it after all the others + THREAD_OPTS="$THREAD_OPTS pthread none" + ;; + esac dnl now test for all possibilities THREADS_OK=no @@ -5553,22 +5626,33 @@ dnl File system watcher checks dnl --------------------------------------------------------------------------- if test "$wxUSE_FSWATCHER" = "yes"; then - AC_DEFINE(wxUSE_FSWATCHER) - SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS fswatcher" - - if test "$wxUSE_UNIX" = "yes"; then - AC_CHECK_HEADERS(sys/inotify.h,,, [AC_INCLUDES_DEFAULT()]) - if test "$ac_cv_header_sys_inotify_h" = "yes"; then - AC_DEFINE(wxHAS_INOTIFY) - else - AC_CHECK_HEADERS(sys/event.h,,, [AC_INCLUDES_DEFAULT()]) - if test "$ac_cv_header_sys_event_h" = "yes"; then - AC_DEFINE(wxHAS_KQUEUE) + dnl wxFileSystemWatcher is always available under MSW but we need either + dnl inotify or kqueue support in the system for it under Unix (this + dnl includes OS X which does have kqueue but no other platforms) + if test "$wxUSE_MSW" != "1"; then + if test "$wxUSE_UNIX" = "yes"; then + AC_CHECK_HEADERS(sys/inotify.h,,, [AC_INCLUDES_DEFAULT()]) + if test "$ac_cv_header_sys_inotify_h" = "yes"; then + AC_DEFINE(wxHAS_INOTIFY) else - AC_MSG_WARN([No native wxFileSystemWatcher implementation available for on this platform]) + AC_CHECK_HEADERS(sys/event.h,,, [AC_INCLUDES_DEFAULT()]) + if test "$ac_cv_header_sys_event_h" = "yes"; then + AC_DEFINE(wxHAS_KQUEUE) + else + wxUSE_FSWATCHER=no + fi fi + else + wxUSE_FSWATCHER=no fi fi + + if test "$wxUSE_FSWATCHER" = "yes"; then + AC_DEFINE(wxUSE_FSWATCHER) + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS fswatcher" + else + AC_MSG_WARN([wxFileSystemWatcher won't be available on this platform]) + fi fi dnl --------------------------------------------------------------------------- @@ -6637,6 +6721,11 @@ if test "$wxUSE_MOUSEWHEEL" = "yes" ; then AC_DEFINE(wxUSE_MOUSEWHEEL) fi +if test "$wxUSE_UIACTIONSIMULATOR" = "yes" ; then + AC_DEFINE(wxUSE_UIACTIONSIMULATOR) + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS uiaction" +fi + dnl --------------------------------------------------------------------------- dnl GUI controls dnl --------------------------------------------------------------------------- @@ -7355,7 +7444,8 @@ if test "$wxUSE_GRAPHICS_CONTEXT" = "yes"; then dnl GDI+ DLL dynamically anyhow during run-time AC_LANG_PUSH(C++) AC_TRY_COMPILE( - [#include ], + [#include + #include ], [ using namespace Gdiplus; ], @@ -7819,19 +7909,7 @@ AC_SUBST(EXTRALIBS_HILDON) AC_SUBST(UNICODE) AC_SUBST(DEBUG_INFO) AC_SUBST(DEBUG_FLAG) -TOOLKIT_LOWERCASE=xxx -if test "$TOOLKIT" = "MAC"; then - TOOLKIT_LOWERCASE=osx_carbon -fi -if test "$TOOLKIT" = "OSX_CARBON"; then - TOOLKIT_LOWERCASE=osx_carbon -fi -if test "$TOOLKIT" = "OSX_COCOA"; then - TOOLKIT_LOWERCASE=osx_cocoa -fi -if test "$TOOLKIT_LOWERCASE" = "xxx"; then - TOOLKIT_LOWERCASE=`echo $TOOLKIT | tr '[[A-Z]]' '[[a-z]]'` -fi +TOOLKIT_LOWERCASE=`echo $TOOLKIT | tr '[[A-Z]]' '[[a-z]]'` AC_SUBST(TOOLKIT_LOWERCASE) AC_SUBST(TOOLKIT_VERSION) AC_SUBST(DYLIB_RPATH_INSTALL)