X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/afbf46a31740bb05af12a8ba0069345a2c9aba46..7ddb15416407390de67cc26b04e91ea99a521f57:/configure?ds=sidebyside diff --git a/configure b/configure index 785a45cfa7..5adab9ed6d 100755 --- a/configure +++ b/configure @@ -675,12 +675,6 @@ COND_wxUSE_LIBTIFF_builtin COND_wxUSE_LIBPNG_builtin COND_wxUSE_LIBJPEG_builtin COND_wxUSE_EXPAT_builtin -COND_WXUSE_ZLIB_BUILTIN -COND_WXUSE_REGEX_BUILTIN -COND_WXUSE_LIBTIFF_BUILTIN -COND_WXUSE_LIBPNG_BUILTIN -COND_WXUSE_LIBJPEG_BUILTIN -COND_WXUSE_EXPAT_BUILTIN COND_WXUNIV_1 COND_WXUNIV_0 COND_WITH_PLUGIN_SDL_1 @@ -703,9 +697,6 @@ COND_USE_OPENGL_1 COND_USE_GUI_1_wxUSE_LIBTIFF_builtin COND_USE_GUI_1_wxUSE_LIBPNG_builtin COND_USE_GUI_1_wxUSE_LIBJPEG_builtin -COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN -COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN -COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN COND_USE_GUI_1_WXUNIV_1 COND_USE_GUI_1_WXUNIV_0 COND_USE_GUI_1_USE_OPENGL_1 @@ -746,7 +737,9 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_WXUNIV_0 COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1 COND_TOOLKIT_GTK_TOOLKIT_VERSION_3 +COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_1 COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0 +COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_1 COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1 COND_TOOLKIT_GTK_TOOLKIT_VERSION_2 @@ -772,8 +765,13 @@ COND_SHARED_0_TOOLKIT_PM_WXUNIV_0 COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0 COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0 COND_SHARED_0 +COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1 +COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_3 +COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1 +COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_2 COND_PLATFORM_WIN32_1_SHARED_0 COND_PLATFORM_WIN32_1 +COND_PLATFORM_WIN32_0_TOOLKIT_GTK_TOOLKIT_VERSION_3 COND_PLATFORM_WIN32_0 COND_PLATFORM_UNIX_1_USE_PLUGINS_0 COND_PLATFORM_UNIX_1_USE_GUI_1 @@ -788,7 +786,6 @@ COND_PLATFORM_MSDOS_1 COND_PLATFORM_MSDOS_0 COND_PLATFORM_MAC_1 COND_PLATFORM_MAC_0 -COND_PLATFORM_MACOS_1 COND_PLATFORM_MACOSX_1_USE_SOVERSION_1 COND_PLATFORM_MACOSX_1_USE_OPENGL_1 COND_PLATFORM_MACOSX_1_USE_GUI_1 @@ -855,26 +852,11 @@ COND_DEPS_TRACKING_1 COND_DEPS_TRACKING_0 COND_DEBUG_INFO_1 COND_DEBUG_INFO_0 -COND_DEBUG_FLAG_1 COND_DEBUG_FLAG_0 -COND_BUILD_release_UNICODE_1 -COND_BUILD_release_UNICODE_0 COND_BUILD_release_DEBUG_INFO_default COND_BUILD_release -COND_BUILD_debug_UNICODE_1 -COND_BUILD_debug_UNICODE_0 COND_BUILD_debug_DEBUG_INFO_default -COND_BUILD_debug_DEBUG_FLAG_default COND_BUILD_debug -COND_BUILD_RELEASE_UNICODE_1 -COND_BUILD_RELEASE_UNICODE_0 -COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT -COND_BUILD_RELEASE -COND_BUILD_DEBUG_UNICODE_1 -COND_BUILD_DEBUG_UNICODE_0 -COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT -COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT -COND_BUILD_DEBUG BK_MAKE_PCH ICC_PCH_USE_SWITCH ICC_PCH_CREATE_SWITCH @@ -1208,6 +1190,7 @@ enable_fontmap enable_fs_archive enable_fs_inet enable_fs_zip +enable_fsvolume enable_fswatcher enable_geometry enable_log @@ -2141,6 +2124,7 @@ Optional Features: --enable-fs_archive use virtual archive filesystems --enable-fs_inet use virtual HTTP/FTP filesystems --enable-fs_zip now replaced by fs_archive + --enable-fsvolume use wxFSVolume class --enable-fswatcher use wxFileSystemWatcher class --enable-geometry use geometry class --enable-log use logging system @@ -2294,7 +2278,7 @@ Optional Features: --enable-accessibility enable accessibility support --enable-uiactionsim use wxUIActionSimulator (experimental) --enable-dctransform use wxDC::SetTransformMatrix and related - --enable-webview_webkit use wxWebView WebKit backend + --enable-webviewwebkit use wxWebView WebKit backend --enable-palette use wxPalette class --enable-image use wxImage class --enable-gif use gif images (GIF file format) @@ -2309,7 +2293,7 @@ Optional Features: --enable-ownerdrawn use owner drawn controls (Win32 and OS/2 only) --enable-uxtheme enable support for Windows XP themed look (Win32 only) --enable-wxdib use wxDIB class (Win32 only) - --enable-webview_ie use wxWebView IE backend (Win32 only) + --enable-webviewie use wxWebView IE backend (Win32 only) --enable-autoidman use automatic ids management --disable-largefile omit support for large files --disable-gtktest do not try to compile and run a test GTK+ program @@ -2809,6 +2793,37 @@ $as_echo "$ac_res" >&6; } } # ac_fn_c_check_header_compile +# ac_fn_cxx_check_header_compile LINENO HEADER VAR INCLUDES +# --------------------------------------------------------- +# Tests whether HEADER exists and can be compiled using the include files in +# INCLUDES, setting the cache variable VAR accordingly. +ac_fn_cxx_check_header_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +#include <$2> +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + eval "$3=yes" +else + eval "$3=no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_cxx_check_header_compile + # ac_fn_c_compute_int LINENO EXPR VAR INCLUDES # -------------------------------------------- # Tries to find the compile-time value of EXPR in a program that includes @@ -2992,37 +3007,6 @@ rm -f conftest.val } # ac_fn_c_compute_int -# ac_fn_cxx_check_header_compile LINENO HEADER VAR INCLUDES -# --------------------------------------------------------- -# Tests whether HEADER exists and can be compiled using the include files in -# INCLUDES, setting the cache variable VAR accordingly. -ac_fn_cxx_check_header_compile () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -#include <$2> -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - eval "$3=yes" -else - eval "$3=no" -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - -} # ac_fn_cxx_check_header_compile - # ac_fn_cxx_check_type LINENO TYPE VAR INCLUDES # --------------------------------------------- # Tests whether TYPE exists after having included INCLUDES, setting cache @@ -8611,6 +8595,50 @@ fi $as_echo "$result" >&6; } + enablestring= + defaultval=$wxUSE_ALL_FEATURES + if test -z "$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-fsvolume" >&5 +$as_echo_n "checking for --${enablestring:-enable}-fsvolume... " >&6; } + # Check whether --enable-fsvolume was given. +if test "${enable_fsvolume+set}" = set; then : + enableval=$enable_fsvolume; + if test "$enableval" = yes; then + wx_cv_use_fsvolume='wxUSE_FSVOLUME=yes' + else + wx_cv_use_fsvolume='wxUSE_FSVOLUME=no' + fi + +else + + wx_cv_use_fsvolume='wxUSE_FSVOLUME=${'DEFAULT_wxUSE_FSVOLUME":-$defaultval}" + +fi + + + eval "$wx_cv_use_fsvolume" + + if test x"$enablestring" = xdisable; then + if test $wxUSE_FSVOLUME = no; then + result=yes + else + result=no + fi + else + result=$wxUSE_FSVOLUME + fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5 +$as_echo "$result" >&6; } + + enablestring= defaultval=$wxUSE_ALL_FEATURES if test -z "$defaultval"; then @@ -20032,7 +20060,7 @@ case "${host}" in esac if test "$USE_UNIX" = 1 ; then - for ac_header in sys/select.h + for ac_header in sys/select.h do : ac_fn_c_check_header_compile "$LINENO" "sys/select.h" "ac_cv_header_sys_select_h" "$ac_includes_default " @@ -20045,6 +20073,32 @@ fi done + + ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + + for ac_header in cxxabi.h +do : + ac_fn_cxx_check_header_compile "$LINENO" "cxxabi.h" "ac_cv_header_cxxabi_h" "$ac_includes_default +" +if test "x$ac_cv_header_cxxabi_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_CXXABI_H 1 +_ACEOF + +fi + +done + + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + fi @@ -22821,6 +22875,89 @@ $as_echo "$as_me: WARNING: system tiff library not found, will use built-in inst ac_configure_args="$ac_configure_args --disable-jpeg" fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lzma_code in -llzma" >&5 +$as_echo_n "checking for lzma_code in -llzma... " >&6; } +if ${ac_cv_lib_lzma_lzma_code+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-llzma $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char lzma_code (); +int +main () +{ +return lzma_code (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_lzma_lzma_code=yes +else + ac_cv_lib_lzma_lzma_code=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lzma_lzma_code" >&5 +$as_echo "$ac_cv_lib_lzma_lzma_code" >&6; } +if test "x$ac_cv_lib_lzma_lzma_code" = xyes; then : + LIBS="$LIBS -llzma" +fi + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jbg_dec_init in -ljbig" >&5 +$as_echo_n "checking for jbg_dec_init in -ljbig... " >&6; } +if ${ac_cv_lib_jbig_jbg_dec_init+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-ljbig $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char jbg_dec_init (); +int +main () +{ +return jbg_dec_init (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_jbig_jbg_dec_init=yes +else + ac_cv_lib_jbig_jbg_dec_init=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jbig_jbg_dec_init" >&5 +$as_echo "$ac_cv_lib_jbig_jbg_dec_init" >&6; } +if test "x$ac_cv_lib_jbig_jbg_dec_init" = xyes; then : + LIBS="$LIBS -ljbig" +fi + + + subdirs="$subdirs src/tiff" @@ -30400,75 +30537,135 @@ if ${wx_cv_func_backtrace+:} false; then : $as_echo_n "(cached) " >&6 else - ac_ext=cpp + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing backtrace" >&5 +$as_echo_n "checking for library containing backtrace... " >&6; } +if ${ac_cv_search_backtrace+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char backtrace (); +int +main () +{ +return backtrace (); + ; + return 0; +} +_ACEOF +for ac_lib in '' execinfo; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_backtrace=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if ${ac_cv_search_backtrace+:} false; then : + break +fi +done +if ${ac_cv_search_backtrace+:} false; then : + +else + ac_cv_search_backtrace=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_backtrace" >&5 +$as_echo "$ac_cv_search_backtrace" >&6; } +ac_res=$ac_cv_search_backtrace +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int main () { - void *trace[1]; - char **messages; - - backtrace(trace, 1); - messages = backtrace_symbols(trace, 1); + void *trace[1]; + char **messages; + backtrace(trace, 1); + messages = backtrace_symbols(trace, 1); ; return 0; } _ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : +if ac_fn_cxx_try_link "$LINENO"; then : wx_cv_func_backtrace=yes else wx_cv_func_backtrace=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_ext=c +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu +else + wx_cv_func_backtrace=no + +fi + + fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_func_backtrace" >&5 $as_echo "$wx_cv_func_backtrace" >&6; } - if test "$wx_cv_func_backtrace" = "no"; then { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: backtrace() is not available, wxStackWalker will not be available" >&5 $as_echo "$as_me: WARNING: backtrace() is not available, wxStackWalker will not be available" >&2;} wxUSE_STACKWALKER=no else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __cxa_demangle() in " >&5 + if test "$ac_cv_header_cxxabi_h" = "yes"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __cxa_demangle() in " >&5 $as_echo_n "checking for __cxa_demangle() in ... " >&6; } if ${wx_cv_func_cxa_demangle+:} false; then : $as_echo_n "(cached) " >&6 else - ac_ext=cpp + ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int main () { - int rc; - __cxxabiv1::__cxa_demangle("foo", 0, 0, &rc); + int rc; + __cxxabiv1::__cxa_demangle("foo", 0, 0, &rc); ; return 0; @@ -30482,7 +30679,7 @@ else fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - ac_ext=c + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -30493,6 +30690,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_func_cxa_demangle" >&5 $as_echo "$wx_cv_func_cxa_demangle" >&6; } + else + wx_cv_func_cxa_demangle=no + fi if test "$wx_cv_func_cxa_demangle" = "yes"; then $as_echo "#define HAVE_CXA_DEMANGLE 1" >>confdefs.h @@ -32359,6 +32559,59 @@ $as_echo "yes, it works" >&6; } fi fi + + if test "$ac_cv_header_cxxabi_h" = "yes"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for abi::__forced_unwind() in " >&5 +$as_echo_n "checking for abi::__forced_unwind() in ... " >&6; } +if ${wx_cv_type_abi_forced_unwind+:} false; then : + $as_echo_n "(cached) " >&6 +else + + ac_ext=cpp +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ + + void foo(abi::__forced_unwind&); + + ; + return 0; +} +_ACEOF +if ac_fn_cxx_try_compile "$LINENO"; then : + wx_cv_type_abi_forced_unwind=yes +else + wx_cv_type_abi_forced_unwind=no + +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_type_abi_forced_unwind" >&5 +$as_echo "$wx_cv_type_abi_forced_unwind" >&6; } + else + wx_cv_type_abi_forced_unwind=no + fi + + if test "$wx_cv_type_abi_forced_unwind" = "yes"; then + $as_echo "#define HAVE_ABI_FORCEDUNWIND 1" >>confdefs.h + + fi fi else @@ -34032,6 +34285,7 @@ fi if test "$wxUSE_NOTIFICATION_MESSAGE" = "yes" ; then if test "$wxUSE_LIBNOTIFY" = "yes" ; then + HAVE_LIBNOTIFY=0 pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBNOTIFY" >&5 @@ -34092,29 +34346,177 @@ fi echo "$LIBNOTIFY_PKG_ERRORS" >&5 - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libnotify not found, wxNotificationMessage will use generic implementation." >&5 + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBNOTIFY" >&5 +$as_echo_n "checking for LIBNOTIFY... " >&6; } + +if test -n "$PKG_CONFIG"; then + if test -n "$LIBNOTIFY_CFLAGS"; then + pkg_cv_LIBNOTIFY_CFLAGS="$LIBNOTIFY_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify >= 0.4\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libnotify >= 0.4") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_LIBNOTIFY_CFLAGS=`$PKG_CONFIG --cflags "libnotify >= 0.4" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi +if test -n "$PKG_CONFIG"; then + if test -n "$LIBNOTIFY_LIBS"; then + pkg_cv_LIBNOTIFY_LIBS="$LIBNOTIFY_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify >= 0.4\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libnotify >= 0.4") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_LIBNOTIFY_LIBS=`$PKG_CONFIG --libs "libnotify >= 0.4" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libnotify >= 0.4"` + else + LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libnotify >= 0.4"` + fi + # Put the nasty error message in config.log where it belongs + echo "$LIBNOTIFY_PKG_ERRORS" >&5 + + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libnotify not found, wxNotificationMessage will use generic implementation." >&5 $as_echo "$as_me: WARNING: libnotify not found, wxNotificationMessage will use generic implementation." >&2;} +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libnotify not found, wxNotificationMessage will use generic implementation." >&5 +$as_echo "$as_me: WARNING: libnotify not found, wxNotificationMessage will use generic implementation." >&2;} + +else + LIBNOTIFY_CFLAGS=$pkg_cv_LIBNOTIFY_CFLAGS + LIBNOTIFY_LIBS=$pkg_cv_LIBNOTIFY_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + HAVE_LIBNOTIFY=1 +fi + elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libnotify not found, wxNotificationMessage will use generic implementation." >&5 + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBNOTIFY" >&5 +$as_echo_n "checking for LIBNOTIFY... " >&6; } + +if test -n "$PKG_CONFIG"; then + if test -n "$LIBNOTIFY_CFLAGS"; then + pkg_cv_LIBNOTIFY_CFLAGS="$LIBNOTIFY_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify >= 0.4\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libnotify >= 0.4") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_LIBNOTIFY_CFLAGS=`$PKG_CONFIG --cflags "libnotify >= 0.4" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi +if test -n "$PKG_CONFIG"; then + if test -n "$LIBNOTIFY_LIBS"; then + pkg_cv_LIBNOTIFY_LIBS="$LIBNOTIFY_LIBS" + else + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify >= 0.4\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libnotify >= 0.4") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_LIBNOTIFY_LIBS=`$PKG_CONFIG --libs "libnotify >= 0.4" 2>/dev/null` +else + pkg_failed=yes +fi + fi +else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libnotify >= 0.4"` + else + LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libnotify >= 0.4"` + fi + # Put the nasty error message in config.log where it belongs + echo "$LIBNOTIFY_PKG_ERRORS" >&5 + + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libnotify not found, wxNotificationMessage will use generic implementation." >&5 $as_echo "$as_me: WARNING: libnotify not found, wxNotificationMessage will use generic implementation." >&2;} +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libnotify not found, wxNotificationMessage will use generic implementation." >&5 +$as_echo "$as_me: WARNING: libnotify not found, wxNotificationMessage will use generic implementation." >&2;} else LIBNOTIFY_CFLAGS=$pkg_cv_LIBNOTIFY_CFLAGS LIBNOTIFY_LIBS=$pkg_cv_LIBNOTIFY_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } + HAVE_LIBNOTIFY=1 +fi - GUI_TK_LIBRARY="$GUI_TK_LIBRARY $LIBNOTIFY_LIBS" - CFLAGS="$LIBNOTIFY_CFLAGS $CFLAGS" - CXXFLAGS="$LIBNOTIFY_CFLAGS $CXXFLAGS" - $as_echo "#define wxUSE_LIBNOTIFY 1" >>confdefs.h + +else + LIBNOTIFY_CFLAGS=$pkg_cv_LIBNOTIFY_CFLAGS + LIBNOTIFY_LIBS=$pkg_cv_LIBNOTIFY_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + + HAVE_LIBNOTIFY=1 + $as_echo "#define wxUSE_LIBNOTIFY_0_7 1" >>confdefs.h fi + + if test "$HAVE_LIBNOTIFY" = "1" ; then + GUI_TK_LIBRARY="$GUI_TK_LIBRARY $LIBNOTIFY_LIBS" + CFLAGS="$LIBNOTIFY_CFLAGS $CFLAGS" + CXXFLAGS="$LIBNOTIFY_CFLAGS $CXXFLAGS" + $as_echo "#define wxUSE_LIBNOTIFY 1" >>confdefs.h + + fi fi fi @@ -34393,6 +34795,11 @@ $as_echo "$as_me: WARNING: wxZipFSHandler requires wxArchiveFSHandler... disable fi fi +if test "$wxUSE_FSVOLUME" = "yes"; then + $as_echo "#define wxUSE_FSVOLUME 1" >>confdefs.h + +fi + if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes"; then if test "$USE_UNIX" != 1; then { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Catching fatal exceptions not currently supported on this system, wxApp::OnFatalException will not be called" >&5 @@ -34875,6 +35282,19 @@ $as_echo "$wx_cv_struct_tm_has_gmtoff" >&6; } fi +for ac_func in setpriority +do : + ac_fn_c_check_func "$LINENO" "setpriority" "ac_cv_func_setpriority" +if test "x$ac_cv_func_setpriority" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_SETPRIORITY 1 +_ACEOF + +fi +done + + + if test "$wxUSE_SOCKETS" = "yes"; then if test "$TOOLKIT" != "MSW"; then ac_fn_c_check_func "$LINENO" "socket" "ac_cv_func_socket" @@ -37052,6 +37472,9 @@ fi else USE_MEDIA=0 fi + + elif test "$wxUSE_MAC" = 1; then + GST_LIBS="-framework QTKit" fi if test $USE_MEDIA = 1; then @@ -37220,7 +37643,7 @@ if test "$wxUSE_GUI" = "yes"; then SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS artprov controls dialogs drawing \ - erase event exec font image minimal render \ + erase event exec font image minimal preferences render \ shaped svg taborder vscroll widgets wrapsizer" if test "$wxUSE_MONOLITHIC" != "yes"; then @@ -39705,76 +40128,16 @@ EOF - COND_BUILD_DEBUG="#" - if test "x$BUILD" = "xdebug" ; then - COND_BUILD_DEBUG="" - fi - - COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT="#" - if test "x$BUILD" = "xdebug" -a "x$DEBUG_FLAG" = "xdefault" ; then - COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT="" - fi - - COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT="#" - if test "x$BUILD" = "xdebug" -a "x$DEBUG_INFO" = "xdefault" ; then - COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT="" - fi - - COND_BUILD_DEBUG_UNICODE_0="#" - if test "x$BUILD" = "xdebug" -a "x$UNICODE" = "x0" ; then - COND_BUILD_DEBUG_UNICODE_0="" - fi - - COND_BUILD_DEBUG_UNICODE_1="#" - if test "x$BUILD" = "xdebug" -a "x$UNICODE" = "x1" ; then - COND_BUILD_DEBUG_UNICODE_1="" - fi - - COND_BUILD_RELEASE="#" - if test "x$BUILD" = "xrelease" ; then - COND_BUILD_RELEASE="" - fi - - COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT="#" - if test "x$BUILD" = "xrelease" -a "x$DEBUG_INFO" = "xdefault" ; then - COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT="" - fi - - COND_BUILD_RELEASE_UNICODE_0="#" - if test "x$BUILD" = "xrelease" -a "x$UNICODE" = "x0" ; then - COND_BUILD_RELEASE_UNICODE_0="" - fi - - COND_BUILD_RELEASE_UNICODE_1="#" - if test "x$BUILD" = "xrelease" -a "x$UNICODE" = "x1" ; then - COND_BUILD_RELEASE_UNICODE_1="" - fi - COND_BUILD_debug="#" if test "x$BUILD" = "xdebug" ; then COND_BUILD_debug="" fi - COND_BUILD_debug_DEBUG_FLAG_default="#" - if test "x$BUILD" = "xdebug" -a "x$DEBUG_FLAG" = "xdefault" ; then - COND_BUILD_debug_DEBUG_FLAG_default="" - fi - COND_BUILD_debug_DEBUG_INFO_default="#" if test "x$BUILD" = "xdebug" -a "x$DEBUG_INFO" = "xdefault" ; then COND_BUILD_debug_DEBUG_INFO_default="" fi - COND_BUILD_debug_UNICODE_0="#" - if test "x$BUILD" = "xdebug" -a "x$UNICODE" = "x0" ; then - COND_BUILD_debug_UNICODE_0="" - fi - - COND_BUILD_debug_UNICODE_1="#" - if test "x$BUILD" = "xdebug" -a "x$UNICODE" = "x1" ; then - COND_BUILD_debug_UNICODE_1="" - fi - COND_BUILD_release="#" if test "x$BUILD" = "xrelease" ; then COND_BUILD_release="" @@ -39785,26 +40148,11 @@ EOF COND_BUILD_release_DEBUG_INFO_default="" fi - COND_BUILD_release_UNICODE_0="#" - if test "x$BUILD" = "xrelease" -a "x$UNICODE" = "x0" ; then - COND_BUILD_release_UNICODE_0="" - fi - - COND_BUILD_release_UNICODE_1="#" - if test "x$BUILD" = "xrelease" -a "x$UNICODE" = "x1" ; then - COND_BUILD_release_UNICODE_1="" - fi - COND_DEBUG_FLAG_0="#" if test "x$DEBUG_FLAG" = "x0" ; then COND_DEBUG_FLAG_0="" fi - COND_DEBUG_FLAG_1="#" - if test "x$DEBUG_FLAG" = "x1" ; then - COND_DEBUG_FLAG_1="" - fi - COND_DEBUG_INFO_0="#" if test "x$DEBUG_INFO" = "x0" ; then COND_DEBUG_INFO_0="" @@ -40135,11 +40483,6 @@ EOF COND_PLATFORM_MACOSX_1_USE_SOVERSION_1="" fi - COND_PLATFORM_MACOS_1="#" - if test "x$PLATFORM_MACOS" = "x1" ; then - COND_PLATFORM_MACOS_1="" - fi - COND_PLATFORM_MAC_0="#" if test "x$PLATFORM_MAC" = "x0" ; then COND_PLATFORM_MAC_0="" @@ -40210,6 +40553,11 @@ EOF COND_PLATFORM_WIN32_0="" fi + COND_PLATFORM_WIN32_0_TOOLKIT_GTK_TOOLKIT_VERSION_3="#" + if test "x$PLATFORM_WIN32" = "x0" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x3" ; then + COND_PLATFORM_WIN32_0_TOOLKIT_GTK_TOOLKIT_VERSION_3="" + fi + COND_PLATFORM_WIN32_1="#" if test "x$PLATFORM_WIN32" = "x1" ; then COND_PLATFORM_WIN32_1="" @@ -40220,6 +40568,26 @@ EOF COND_PLATFORM_WIN32_1_SHARED_0="" fi + COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_2="#" + if test "x$PLATFORM_WIN32" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x2" ; then + COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_2="" + fi + + COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1="#" + if test "x$PLATFORM_WIN32" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x2" -a "x$USE_GUI" = "x1" ; then + COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1="" + fi + + COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_3="#" + if test "x$PLATFORM_WIN32" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x3" ; then + COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_3="" + fi + + COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1="#" + if test "x$PLATFORM_WIN32" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x3" -a "x$USE_GUI" = "x1" ; then + COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1="" + fi + COND_SHARED_0="#" if test "x$SHARED" = "x0" ; then COND_SHARED_0="" @@ -40345,11 +40713,21 @@ EOF COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0="" fi + COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_1="#" + if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x2" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x1" ; then + COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_1="" + fi + COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0="#" if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x2" -a "x$WXUNIV" = "x0" ; then COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0="" fi + COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_1="#" + if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x2" -a "x$WXUNIV" = "x1" ; then + COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_1="" + fi + COND_TOOLKIT_GTK_TOOLKIT_VERSION_3="#" if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x3" ; then COND_TOOLKIT_GTK_TOOLKIT_VERSION_3="" @@ -40550,21 +40928,6 @@ EOF COND_USE_GUI_1_WXUNIV_1="" fi - COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN="#" - if test "x$USE_GUI" = "x1" -a "x$wxUSE_LIBJPEG" = "xbuiltin" ; then - COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN="" - fi - - COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN="#" - if test "x$USE_GUI" = "x1" -a "x$wxUSE_LIBPNG" = "xbuiltin" ; then - COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN="" - fi - - COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN="#" - if test "x$USE_GUI" = "x1" -a "x$wxUSE_LIBTIFF" = "xbuiltin" ; then - COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN="" - fi - COND_USE_GUI_1_wxUSE_LIBJPEG_builtin="#" if test "x$USE_GUI" = "x1" -a "x$wxUSE_LIBJPEG" = "xbuiltin" ; then COND_USE_GUI_1_wxUSE_LIBJPEG_builtin="" @@ -40675,36 +41038,6 @@ EOF COND_WXUNIV_1="" fi - COND_WXUSE_EXPAT_BUILTIN="#" - if test "x$wxUSE_EXPAT" = "xbuiltin" ; then - COND_WXUSE_EXPAT_BUILTIN="" - fi - - COND_WXUSE_LIBJPEG_BUILTIN="#" - if test "x$wxUSE_LIBJPEG" = "xbuiltin" ; then - COND_WXUSE_LIBJPEG_BUILTIN="" - fi - - COND_WXUSE_LIBPNG_BUILTIN="#" - if test "x$wxUSE_LIBPNG" = "xbuiltin" ; then - COND_WXUSE_LIBPNG_BUILTIN="" - fi - - COND_WXUSE_LIBTIFF_BUILTIN="#" - if test "x$wxUSE_LIBTIFF" = "xbuiltin" ; then - COND_WXUSE_LIBTIFF_BUILTIN="" - fi - - COND_WXUSE_REGEX_BUILTIN="#" - if test "x$wxUSE_REGEX" = "xbuiltin" ; then - COND_WXUSE_REGEX_BUILTIN="" - fi - - COND_WXUSE_ZLIB_BUILTIN="#" - if test "x$wxUSE_ZLIB" = "xbuiltin" ; then - COND_WXUSE_ZLIB_BUILTIN="" - fi - COND_wxUSE_EXPAT_builtin="#" if test "x$wxUSE_EXPAT" = "xbuiltin" ; then COND_wxUSE_EXPAT_builtin=""