X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e02ea2030c4ee8c2d01c5823e2dc3d1ba7837acf..330d01ae47051d49aaf681606f5bf64e4c89f4d3:/configure diff --git a/configure b/configure index 82e9bfec5a..04e98042bb 100755 --- a/configure +++ b/configure @@ -634,8 +634,6 @@ POSTLINK_COMMAND LIBWXMACRES WX_RESOURCES_MACOSX_DATA WX_RESOURCES_MACOSX_ASCII -RESPROGRAMOBJ -RESFLAGS RESCOMP WX_VERSION_TAG DMALLOC_LIBS @@ -662,8 +660,6 @@ TOOLCHAIN_FULLNAME TOOLCHAIN_NAME TOOLKIT_DIR TOOLKIT -WIN32INSTALL -AFMINSTALL USE_GUI WX_LIBRARY_BASENAME_GUI WX_LIBRARY_BASENAME_NOGUI @@ -675,12 +671,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 +693,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 @@ -715,6 +702,8 @@ COND_USE_EXCEPTIONS_1 COND_USE_EXCEPTIONS_0 COND_USE_CAIRO_1 COND_UNICODE_1 +COND_TOOLKIT_X11_WXUNIV_1 +COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1 COND_TOOLKIT_X11_USE_GUI_1 COND_TOOLKIT_X11 COND_TOOLKIT_WINCE_WXUNIV_0 @@ -746,7 +735,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 +763,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 +784,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 @@ -809,6 +804,7 @@ COND_PLATFORM_MACOSX_0_USE_SOVERSION_1 COND_PLATFORM_MACOSX_0_USE_SOVERCYGWIN_0_USE_SOVERSION_1 COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1 COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1 +COND_MONOLITHIC_1_USE_STC_1 COND_MONOLITHIC_1_SHARED_1 COND_MONOLITHIC_1_SHARED_0 COND_MONOLITHIC_1 @@ -855,26 +851,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 @@ -1122,6 +1103,8 @@ enable_gpe with_libpng with_libjpeg with_libtiff +with_libjbig +with_liblzma with_libxpm with_libiconv with_libmspack @@ -1208,6 +1191,7 @@ enable_fontmap enable_fs_archive enable_fs_inet enable_fs_zip +enable_fsvolume enable_fswatcher enable_geometry enable_log @@ -2141,6 +2125,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 +2279,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 +2294,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 @@ -2348,6 +2333,8 @@ Optional Packages: --with-libpng use libpng (PNG image format) --with-libjpeg use libjpeg (JPEG file format) --with-libtiff use libtiff (TIFF file format) + --without-libjbig don't use libjbig in libtiff even if available) + --without-liblzma don't use liblzma in libtiff even if available) --with-libxpm use libxpm (XPM file format) --with-libiconv use libiconv (character conversion) --with-libmspack use libmspack (CHM help files loading) @@ -4115,7 +4102,7 @@ case "${host}" in $as_echo "#define TARGET_CARBON 1" >>confdefs.h - DEFAULT_DEFAULT_wxUSE_OSX_CARBON=1 + DEFAULT_DEFAULT_wxUSE_OSX_COCOA=1 ;; *-*-beos* ) @@ -4927,6 +4914,94 @@ $as_echo "builtin version" >&6; } fi + withstring=without + defaultval=$wxUSE_ALL_FEATURES + if test -z "$defaultval"; then + if test x"$withstring" = xwithout; then + defaultval=yes + else + defaultval=no + fi + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${withstring:-with}-libjbig" >&5 +$as_echo_n "checking for --${withstring:-with}-libjbig... " >&6; } + +# Check whether --with-libjbig was given. +if test "${with_libjbig+set}" = set; then : + withval=$with_libjbig; + if test "$withval" = yes; then + wx_cv_use_libjbig='wxUSE_LIBJBIG=yes' + else + wx_cv_use_libjbig='wxUSE_LIBJBIG=no' + fi + +else + + wx_cv_use_libjbig='wxUSE_LIBJBIG=${'DEFAULT_wxUSE_LIBJBIG":-$defaultval}" + +fi + + + eval "$wx_cv_use_libjbig" + + if test x"$withstring" = xwithout; then + if test $wxUSE_LIBJBIG = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_LIBJBIG + fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5 +$as_echo "$result" >&6; } + + + withstring=without + defaultval=$wxUSE_ALL_FEATURES + if test -z "$defaultval"; then + if test x"$withstring" = xwithout; then + defaultval=yes + else + defaultval=no + fi + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${withstring:-with}-liblzma" >&5 +$as_echo_n "checking for --${withstring:-with}-liblzma... " >&6; } + +# Check whether --with-liblzma was given. +if test "${with_liblzma+set}" = set; then : + withval=$with_liblzma; + if test "$withval" = yes; then + wx_cv_use_liblzma='wxUSE_LIBLZMA=yes' + else + wx_cv_use_liblzma='wxUSE_LIBLZMA=no' + fi + +else + + wx_cv_use_liblzma='wxUSE_LIBLZMA=${'DEFAULT_wxUSE_LIBLZMA":-$defaultval}" + +fi + + + eval "$wx_cv_use_liblzma" + + if test x"$withstring" = xwithout; then + if test $wxUSE_LIBLZMA = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_LIBLZMA + fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5 +$as_echo "$result" >&6; } + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-libxpm" >&5 $as_echo_n "checking for --with-libxpm... " >&6; } @@ -8611,6 +8686,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 @@ -19643,8 +19762,6 @@ if test "$wants_win32" = 1 ; then USE_WIN32=1 $as_echo "#define __WIN32__ 1" >>confdefs.h - $as_echo "#define __WIN95__ 1" >>confdefs.h - $as_echo "#define __WINDOWS__ 1" >>confdefs.h $as_echo "#define __GNUWIN32__ 1" >>confdefs.h @@ -19706,8 +19823,6 @@ if test "x$ac_cv_lib_cExt_drand48" = xyes; then : LIBS="$LIBS -lcExt" fi - else - RESPROGRAMOBJ="\${top_srcdir}/include/wx/os2/wx.res" fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gcc/libc version" >&5 $as_echo_n "checking for gcc/libc version... " >&6; } @@ -20695,6 +20810,9 @@ if test $wx_cv_have_variadic_macros = "yes"; then fi +else + $as_echo "#define wxNO_VARIADIC_MACROS 1" >>confdefs.h + fi LARGEFILE_CPPFLAGS= @@ -22847,6 +22965,97 @@ $as_echo "$as_me: WARNING: system tiff library not found, will use built-in inst ac_configure_args="$ac_configure_args --disable-jpeg" fi + if test "$wxUSE_LIBLZMA" = "yes"; then + { $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 + + else + ac_configure_args="$ac_configure_args --disable-lzma" + fi + + if test "$wxUSE_LIBJBIG" = "yes"; then + { $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 + + else + ac_configure_args="$ac_configure_args --disable-jbig" + fi + + subdirs="$subdirs src/tiff" @@ -23036,9 +23245,6 @@ fi -AFMINSTALL= -WIN32INSTALL= - TOOLKIT= TOOLKIT_INCLUDE= WIDGET_SET= @@ -23084,12 +23290,7 @@ fi LIBS="$LIBS -lkernel32 -luser32" esac - 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" - - WXCONFIG_RESFLAGS="--define __WIN32__ --define __WIN95__ --define __GNUWIN32__ $WINDRES_CPU_DEFINE" - - WIN32INSTALL=win32install + WXCONFIG_RESFLAGS="--define __WIN32__ --define __GNUWIN32__ $WINDRES_CPU_DEFINE" fi if test "$wxUSE_GUI" = "yes"; then @@ -23434,12 +23635,14 @@ else fi - pkg_config_args=gtk+-3.0 + pkg_gtk_version=gtk+-3.0 + pkg_config_args=$pkg_gtk_version for module in . $GTK_MODULES do case "$module" in gthread) - pkg_config_args="$pkg_config_args gthread-2.0" + pkg_gthread_version=gthread-2.0 + pkg_config_args="$pkg_config_args $pkg_gthread_version" ;; esac done @@ -23510,8 +23713,7 @@ $as_echo_n "checking for GTK+ - version >= $min_gtk_version... " >&6; } echo "Will use uninstalled version of GTK+ found in PKG_CONFIG_PATH" enable_gtktest=no fi - - if $PKG_CONFIG --atleast-version $min_gtk_version $pkg_config_args; then + if $PKG_CONFIG --atleast-version $min_gtk_version $pkg_gtk_version ; then : else no_gtk=yes @@ -24432,7 +24634,6 @@ done TOOLKIT_INCLUDE="$wx_cv_cflags_gtk" GUI_TK_LIBRARY="$wx_cv_libs_gtk $GUI_TK_LIBRARY" - AFMINSTALL=afminstall TOOLKIT=GTK GUIDIST=GTK_DIST @@ -24702,7 +24903,6 @@ $as_echo "MicroWindows' libraries found." >&6; } wxUSE_UNIVERSAL="yes" - AFMINSTALL=afminstall TOOLKIT=MICROWIN GUIDIST=MICROWIN_DIST @@ -25400,7 +25600,6 @@ fi GUI_TK_LIBRARY=`echo $X_LIBS | sed 's/ -LNONE//' | sed 's/ -RNONE//'` TOOLKIT_INCLUDE=`echo $X_CFLAGS | sed 's/ -INONE//'` - AFMINSTALL=afminstall COMPILED_X_PROGRAM=0 fi @@ -30426,75 +30625,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; @@ -30508,7 +30767,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' @@ -30519,6 +30778,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 @@ -32385,6 +32647,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 @@ -34568,6 +34883,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 @@ -35050,6 +35370,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" @@ -37398,7 +37731,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 @@ -39883,76 +40216,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="" @@ -39963,26 +40236,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="" @@ -40213,6 +40471,11 @@ EOF COND_MONOLITHIC_1_SHARED_1="" fi + COND_MONOLITHIC_1_USE_STC_1="#" + if test "x$MONOLITHIC" = "x1" -a "x$USE_STC" = "x1" ; then + COND_MONOLITHIC_1_USE_STC_1="" + fi + COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1="#" if test "x$OFFICIAL_BUILD" = "x0" -a "x$PLATFORM_WIN32" = "x1" ; then COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1="" @@ -40313,11 +40576,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="" @@ -40388,6 +40646,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="" @@ -40398,6 +40661,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="" @@ -40523,11 +40806,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="" @@ -40683,6 +40976,16 @@ EOF COND_TOOLKIT_X11_USE_GUI_1="" fi + COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1="#" + if test "x$TOOLKIT" = "xX11" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x1" ; then + COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1="" + fi + + COND_TOOLKIT_X11_WXUNIV_1="#" + if test "x$TOOLKIT" = "xX11" -a "x$WXUNIV" = "x1" ; then + COND_TOOLKIT_X11_WXUNIV_1="" + fi + COND_UNICODE_1="#" if test "x$UNICODE" = "x1" ; then COND_UNICODE_1="" @@ -40728,21 +41031,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="" @@ -40853,36 +41141,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="" @@ -41143,10 +41401,6 @@ SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq - - - -