X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a83354f85cdffa8bf3b64560cb1c23ea2f1f3804..e733c4ce1e24cf7e4b0b0d8362fc59aaa7a7641c:/configure diff --git a/configure b/configure index ec0570ae82..33a41b441b 100755 --- a/configure +++ b/configure @@ -1,14 +1,11 @@ #! /bin/sh -# From configure.in Id. # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.67 for wxWidgets 2.9.4. +# Generated by GNU Autoconf 2.69 for wxWidgets 3.0.0. # # Report bugs to . # # -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software -# Foundation, Inc. +# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. # # # This configure script is free software; the Free Software Foundation @@ -92,6 +89,7 @@ fi IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. +as_myself= case $0 in #(( *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -136,6 +134,31 @@ export LANGUAGE # CDPATH. (unset CDPATH) >/dev/null 2>&1 && unset CDPATH +# Use a proper internal environment variable to ensure we don't fall + # into an infinite loop, continuously re-executing ourselves. + if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then + _as_can_reexec=no; export _as_can_reexec; + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +as_fn_exit 255 + fi + # We don't want this to propagate to other subprocesses. + { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : emulate sh @@ -169,7 +192,8 @@ if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : else exitcode=1; echo positional parameters were not saved. fi -test x\$exitcode = x0 || exit 1" +test x\$exitcode = x0 || exit 1 +test -x / || exit 1" as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && @@ -214,14 +238,25 @@ IFS=$as_save_IFS if test "x$CONFIG_SHELL" != x; then : - # We cannot yet assume a decent shell, so we have to provide a - # neutralization value for shells without unset; and this also - # works around shells that cannot unset nonexistent variables. - BASH_ENV=/dev/null - ENV=/dev/null - (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV - export CONFIG_SHELL - exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} + export CONFIG_SHELL + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +exit 255 fi if test x$as_have_required = xno; then : @@ -324,6 +359,14 @@ $as_echo X"$as_dir" | } # as_fn_mkdir_p + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p # as_fn_append VAR VALUE # ---------------------- # Append the text in VALUE to the end of the definition contained in VAR. Take @@ -445,6 +488,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits chmod +x "$as_me.lineno" || { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + # If we had to re-execute with $CONFIG_SHELL, we're ensured to have + # already done that, so ensure we don't try to do so again and fall + # in an infinite loop. This has already happened in practice. + _as_can_reexec=no; export _as_can_reexec # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the # original and so on. Autoconf is especially sensitive to this). @@ -479,16 +526,16 @@ if (echo >conf$$.file) 2>/dev/null; then # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -500,28 +547,8 @@ else as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -553,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='wxWidgets' PACKAGE_TARNAME='wxwidgets' -PACKAGE_VERSION='2.9.4' -PACKAGE_STRING='wxWidgets 2.9.4' +PACKAGE_VERSION='3.0.0' +PACKAGE_STRING='wxWidgets 3.0.0' PACKAGE_BUGREPORT='wx-dev@lists.wxwidgets.org' PACKAGE_URL='' @@ -606,8 +633,6 @@ POSTLINK_COMMAND LIBWXMACRES WX_RESOURCES_MACOSX_DATA WX_RESOURCES_MACOSX_ASCII -RESPROGRAMOBJ -RESFLAGS RESCOMP WX_VERSION_TAG DMALLOC_LIBS @@ -634,8 +659,6 @@ TOOLCHAIN_FULLNAME TOOLCHAIN_NAME TOOLKIT_DIR TOOLKIT -WIN32INSTALL -AFMINSTALL USE_GUI WX_LIBRARY_BASENAME_GUI WX_LIBRARY_BASENAME_NOGUI @@ -647,12 +670,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 @@ -675,9 +692,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 @@ -687,6 +701,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 @@ -718,7 +734,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 @@ -744,8 +762,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 @@ -760,7 +783,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 @@ -770,6 +792,10 @@ COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1_WXUNIV_0 COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_COCOA_USE_GUI_1 COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1_WXUNIV_0 COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1 +COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1 +COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3 +COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1 +COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2 COND_PLATFORM_MACOSX_1_PLATFORM_WIN32_1_SHARED_0 COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0 COND_PLATFORM_MACOSX_1 @@ -777,6 +803,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 @@ -823,26 +850,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 @@ -909,10 +921,6 @@ TOOLKIT_LOWERCASE DEBUG_FLAG DEBUG_INFO UNICODE -EXTRALIBS_HILDON -EXTRALIBS_GNOMEVFS -EXTRALIBS_GNOMEPRINT -EXTRALIBS_GTKPRINT WITH_PLUGIN_SDL EXTRALIBS_STC EXTRALIBS_SDL @@ -952,10 +960,10 @@ HILDON2_LIBS HILDON2_CFLAGS HILDON_LIBS HILDON_CFLAGS +LIBNOTIFY_LIBS +LIBNOTIFY_CFLAGS GNOMEVFS_LIBS GNOMEVFS_CFLAGS -LIBGNOMEPRINTUI_LIBS -LIBGNOMEPRINTUI_CFLAGS GTKPRINT_LIBS GTKPRINT_CFLAGS SDL_LIBS @@ -1092,12 +1100,14 @@ enable_gpe with_libpng with_libjpeg with_libtiff +with_libjbig +with_liblzma with_libxpm with_libiconv with_libmspack with_gtkprint -with_gnomeprint with_gnomevfs +with_libnotify with_hildon with_opengl with_dmalloc @@ -1177,6 +1187,7 @@ enable_fontmap enable_fs_archive enable_fs_inet enable_fs_zip +enable_fsvolume enable_fswatcher enable_geometry enable_log @@ -1273,6 +1284,7 @@ enable_notebook enable_notifmsg enable_odcombobox enable_popupwin +enable_prefseditor enable_radiobox enable_radiobtn enable_richmsgdlg @@ -1397,10 +1409,10 @@ MesaGL_CFLAGS MesaGL_LIBS GTKPRINT_CFLAGS GTKPRINT_LIBS -LIBGNOMEPRINTUI_CFLAGS -LIBGNOMEPRINTUI_LIBS GNOMEVFS_CFLAGS GNOMEVFS_LIBS +LIBNOTIFY_CFLAGS +LIBNOTIFY_LIBS HILDON_CFLAGS HILDON_LIBS HILDON2_CFLAGS @@ -1816,7 +1828,7 @@ Try \`$0 --help' for more information" $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 - : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} + : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" ;; esac @@ -1867,8 +1879,6 @@ target=$target_alias if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used" >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -1954,7 +1964,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures wxWidgets 2.9.4 to adapt to many kinds of systems. +\`configure' configures wxWidgets 3.0.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -2023,7 +2033,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of wxWidgets 2.9.4:";; + short | recursive ) echo "Configuration of wxWidgets 3.0.0:";; esac cat <<\_ACEOF @@ -2110,6 +2120,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 @@ -2206,6 +2217,7 @@ Optional Features: --enable-notifmsg use wxNotificationMessage class --enable-odcombobox use wxOwnerDrawnComboBox class --enable-popupwin use wxPopUpWindow class + --enable-prefseditor use wxPreferencesEditor class --enable-radiobox use wxRadioBox class --enable-radiobtn use wxRadioButton class --enable-richmsgdlg use wxRichMessageDialog class @@ -2263,7 +2275,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) @@ -2278,7 +2290,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 @@ -2317,12 +2329,14 @@ 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) --without-gtkprint don't use GTK printing support - --without-gnomeprint don't use GNOME printing libraries --with-gnomevfs use GNOME VFS for associating MIME types + --with-libnotify use libnotify for notifications --with-hildon use Hildon framework for Nokia 770/800/810 --with-opengl use OpenGL (or Mesa) --with-dmalloc use dmalloc library (http://dmalloc.com/) @@ -2391,14 +2405,14 @@ Some influential environment variables: C compiler flags for GTKPRINT, overriding pkg-config GTKPRINT_LIBS linker flags for GTKPRINT, overriding pkg-config - LIBGNOMEPRINTUI_CFLAGS - C compiler flags for LIBGNOMEPRINTUI, overriding pkg-config - LIBGNOMEPRINTUI_LIBS - linker flags for LIBGNOMEPRINTUI, overriding pkg-config GNOMEVFS_CFLAGS C compiler flags for GNOMEVFS, overriding pkg-config GNOMEVFS_LIBS linker flags for GNOMEVFS, overriding pkg-config + LIBNOTIFY_CFLAGS + C compiler flags for LIBNOTIFY, overriding pkg-config + LIBNOTIFY_LIBS + linker flags for LIBNOTIFY, overriding pkg-config HILDON_CFLAGS C compiler flags for HILDON, overriding pkg-config HILDON_LIBS linker flags for HILDON, overriding pkg-config @@ -2481,10 +2495,10 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -wxWidgets configure 2.9.4 -generated by GNU Autoconf 2.67 +wxWidgets configure 3.0.0 +generated by GNU Autoconf 2.69 -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -2528,7 +2542,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 fi - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval } # ac_fn_c_try_compile @@ -2565,7 +2579,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 fi - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval } # ac_fn_c_try_cpp @@ -2603,7 +2617,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 fi - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval } # ac_fn_cxx_try_compile @@ -2635,7 +2649,7 @@ $as_echo "$ac_try_echo"; } >&5 test ! -s conftest.err } && test -s conftest$ac_exeext && { test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext + test -x conftest$ac_exeext }; then : ac_retval=0 else @@ -2649,7 +2663,7 @@ fi # interfere with the next link command; also delete a directory that is # left behind by Apple's compiler. We do this before executing the actions. rm -rf conftest.dSYM conftest_ipa8_conftest.oo - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval } # ac_fn_c_try_link @@ -2681,7 +2695,7 @@ $as_echo "$ac_try_echo"; } >&5 test ! -s conftest.err } && test -s conftest$ac_exeext && { test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext + test -x conftest$ac_exeext }; then : ac_retval=0 else @@ -2695,7 +2709,7 @@ fi # interfere with the next link command; also delete a directory that is # left behind by Apple's compiler. We do this before executing the actions. rm -rf conftest.dSYM conftest_ipa8_conftest.oo - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval } # ac_fn_cxx_try_link @@ -2737,7 +2751,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=$ac_status fi rm -rf conftest.dSYM conftest_ipa8_conftest.oo - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval } # ac_fn_c_try_run @@ -2751,7 +2765,7 @@ ac_fn_c_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 "test \"\${$3+set}\"" = set; then : +if eval \${$3+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -2769,10 +2783,41 @@ 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; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # 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 @@ -2790,7 +2835,8 @@ int main () { static int test_array [1 - 2 * !(($2) >= 0)]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -2806,7 +2852,8 @@ int main () { static int test_array [1 - 2 * !(($2) <= $ac_mid)]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -2832,7 +2879,8 @@ int main () { static int test_array [1 - 2 * !(($2) < 0)]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -2848,7 +2896,8 @@ int main () { static int test_array [1 - 2 * !(($2) >= $ac_mid)]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -2882,7 +2931,8 @@ int main () { static int test_array [1 - 2 * !(($2) <= $ac_mid)]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -2946,42 +2996,11 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ rm -f conftest.val fi - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval } # 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 "test \"\${$3+set}\"" = set; 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; test "x$as_lineno_stack" = x && { as_lineno=; 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 @@ -2991,7 +3010,7 @@ ac_fn_cxx_check_type () 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 "test \"\${$3+set}\"" = set; then : +if eval \${$3+:} false; then : $as_echo_n "(cached) " >&6 else eval "$3=no" @@ -3032,7 +3051,7 @@ 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; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_cxx_check_type @@ -3068,7 +3087,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 fi - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval } # ac_fn_cxx_try_cpp @@ -3081,10 +3100,10 @@ fi ac_fn_cxx_check_header_mongrel () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if eval "test \"\${$3+set}\"" = set; then : + if eval \${$3+:} false; then : { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if eval "test \"\${$3+set}\"" = set; then : +if eval \${$3+:} false; then : $as_echo_n "(cached) " >&6 fi eval ac_res=\$$3 @@ -3151,7 +3170,7 @@ $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} esac { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if eval "test \"\${$3+set}\"" = set; then : +if eval \${$3+:} false; then : $as_echo_n "(cached) " >&6 else eval "$3=\$ac_header_compiler" @@ -3160,7 +3179,7 @@ eval ac_res=\$$3 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } fi - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_cxx_check_header_mongrel @@ -3172,7 +3191,7 @@ ac_fn_c_check_func () 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 "test \"\${$3+set}\"" = set; then : +if eval \${$3+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -3227,7 +3246,7 @@ 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; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_func @@ -3240,7 +3259,7 @@ ac_fn_c_check_type () 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 "test \"\${$3+set}\"" = set; then : +if eval \${$3+:} false; then : $as_echo_n "(cached) " >&6 else eval "$3=no" @@ -3281,7 +3300,7 @@ 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; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_type @@ -3322,7 +3341,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=$ac_status fi rm -rf conftest.dSYM conftest_ipa8_conftest.oo - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval } # ac_fn_cxx_try_run @@ -3330,8 +3349,8 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by wxWidgets $as_me 2.9.4, which was -generated by GNU Autoconf 2.67. Invocation command line was +It was created by wxWidgets $as_me 3.0.0, which was +generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3589,7 +3608,7 @@ $as_echo "$as_me: loading site script $ac_site_file" >&6;} || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "failed to load site script $ac_site_file -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } fi done @@ -3716,7 +3735,7 @@ $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 $as_echo_n "checking build system type... " >&6; } -if test "${ac_cv_build+set}" = set; then : +if ${ac_cv_build+:} false; then : $as_echo_n "(cached) " >&6 else ac_build_alias=$build_alias @@ -3732,7 +3751,7 @@ fi $as_echo "$ac_cv_build" >&6; } case $ac_cv_build in *-*-*) ;; -*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;; +*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; esac build=$ac_cv_build ac_save_IFS=$IFS; IFS='-' @@ -3750,7 +3769,7 @@ case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac { $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 $as_echo_n "checking host system type... " >&6; } -if test "${ac_cv_host+set}" = set; then : +if ${ac_cv_host+:} false; then : $as_echo_n "(cached) " >&6 else if test "x$host_alias" = x; then @@ -3765,7 +3784,7 @@ fi $as_echo "$ac_cv_host" >&6; } case $ac_cv_host in *-*-*) ;; -*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;; +*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; esac host=$ac_cv_host ac_save_IFS=$IFS; IFS='-' @@ -3791,9 +3810,9 @@ else fi -wx_major_version_number=2 -wx_minor_version_number=9 -wx_release_number=4 +wx_major_version_number=3 +wx_minor_version_number=0 +wx_release_number=0 wx_subrelease_number=0 WX_RELEASE=$wx_major_version_number.$wx_minor_version_number @@ -4074,7 +4093,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* ) @@ -4886,6 +4905,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; } @@ -5062,7 +5169,7 @@ fi $as_echo "$result" >&6; } - withstring=without + withstring= defaultval=$wxUSE_ALL_FEATURES if test -z "$defaultval"; then if test x"$withstring" = xwithout; then @@ -5071,35 +5178,35 @@ $as_echo "$result" >&6; } defaultval=no fi fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${withstring:-with}-gnomeprint" >&5 -$as_echo_n "checking for --${withstring:-with}-gnomeprint... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${withstring:-with}-gnomevfs" >&5 +$as_echo_n "checking for --${withstring:-with}-gnomevfs... " >&6; } -# Check whether --with-gnomeprint was given. -if test "${with_gnomeprint+set}" = set; then : - withval=$with_gnomeprint; +# Check whether --with-gnomevfs was given. +if test "${with_gnomevfs+set}" = set; then : + withval=$with_gnomevfs; if test "$withval" = yes; then - wx_cv_use_gnomeprint='wxUSE_LIBGNOMEPRINT=yes' + wx_cv_use_gnomevfs='wxUSE_LIBGNOMEVFS=yes' else - wx_cv_use_gnomeprint='wxUSE_LIBGNOMEPRINT=no' + wx_cv_use_gnomevfs='wxUSE_LIBGNOMEVFS=no' fi else - wx_cv_use_gnomeprint='wxUSE_LIBGNOMEPRINT=${'DEFAULT_wxUSE_LIBGNOMEPRINT":-$defaultval}" + wx_cv_use_gnomevfs='wxUSE_LIBGNOMEVFS=${'DEFAULT_wxUSE_LIBGNOMEVFS":-$defaultval}" fi - eval "$wx_cv_use_gnomeprint" + eval "$wx_cv_use_gnomevfs" if test x"$withstring" = xwithout; then - if test $wxUSE_LIBGNOMEPRINT = yes; then + if test $wxUSE_LIBGNOMEVFS = yes; then result=no else result=yes fi else - result=$wxUSE_LIBGNOMEPRINT + result=$wxUSE_LIBGNOMEVFS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5 @@ -5115,35 +5222,35 @@ $as_echo "$result" >&6; } defaultval=no fi fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${withstring:-with}-gnomevfs" >&5 -$as_echo_n "checking for --${withstring:-with}-gnomevfs... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${withstring:-with}-libnotify" >&5 +$as_echo_n "checking for --${withstring:-with}-libnotify... " >&6; } -# Check whether --with-gnomevfs was given. -if test "${with_gnomevfs+set}" = set; then : - withval=$with_gnomevfs; +# Check whether --with-libnotify was given. +if test "${with_libnotify+set}" = set; then : + withval=$with_libnotify; if test "$withval" = yes; then - wx_cv_use_gnomevfs='wxUSE_LIBGNOMEVFS=yes' + wx_cv_use_libnotify='wxUSE_LIBNOTIFY=yes' else - wx_cv_use_gnomevfs='wxUSE_LIBGNOMEVFS=no' + wx_cv_use_libnotify='wxUSE_LIBNOTIFY=no' fi else - wx_cv_use_gnomevfs='wxUSE_LIBGNOMEVFS=${'DEFAULT_wxUSE_LIBGNOMEVFS":-$defaultval}" + wx_cv_use_libnotify='wxUSE_LIBNOTIFY=${'DEFAULT_wxUSE_LIBNOTIFY":-$defaultval}" fi - eval "$wx_cv_use_gnomevfs" + eval "$wx_cv_use_libnotify" if test x"$withstring" = xwithout; then - if test $wxUSE_LIBGNOMEVFS = yes; then + if test $wxUSE_LIBNOTIFY = yes; then result=no else result=yes fi else - result=$wxUSE_LIBGNOMEVFS + result=$wxUSE_LIBNOTIFY fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5 @@ -8526,6 +8633,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 @@ -12831,6 +12982,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}-prefseditor" >&5 +$as_echo_n "checking for --${enablestring:-enable}-prefseditor... " >&6; } + # Check whether --enable-prefseditor was given. +if test "${enable_prefseditor+set}" = set; then : + enableval=$enable_prefseditor; + if test "$enableval" = yes; then + wx_cv_use_prefseditor='wxUSE_PREFERENCES_EDITOR=yes' + else + wx_cv_use_prefseditor='wxUSE_PREFERENCES_EDITOR=no' + fi + +else + + wx_cv_use_prefseditor='wxUSE_PREFERENCES_EDITOR=${'DEFAULT_wxUSE_PREFERENCES_EDITOR":-$defaultval}" + +fi + + + eval "$wx_cv_use_prefseditor" + + if test x"$enablestring" = xdisable; then + if test $wxUSE_PREFERENCES_EDITOR = no; then + result=yes + else + result=no + fi + else + result=$wxUSE_PREFERENCES_EDITOR + 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 @@ -16167,10 +16362,21 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; :end' >>confcache if diff "$cache_file" confcache >/dev/null 2>&1; then :; else if test -w "$cache_file"; then - test "x$cache_file" != "x/dev/null" && + if test "x$cache_file" != "x/dev/null"; then { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 $as_echo "$as_me: updating cache $cache_file" >&6;} - cat confcache >$cache_file + if test ! -f "$cache_file" || test -h "$cache_file"; then + cat confcache >"$cache_file" + else + case $cache_file in #( + */* | ?:*) + mv -f confcache "$cache_file"$$ && + mv -f "$cache_file"$$ "$cache_file" ;; #( + *) + mv -f confcache "$cache_file" ;; + esac + fi + fi else { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} @@ -16189,7 +16395,7 @@ if test -n "$ac_tool_prefix"; then set dummy ${ac_tool_prefix}gcc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -16201,7 +16407,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -16229,7 +16435,7 @@ if test -z "$ac_cv_prog_CC"; then set dummy gcc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : +if ${ac_cv_prog_ac_ct_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -16241,7 +16447,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -16282,7 +16488,7 @@ if test -z "$CC"; then set dummy ${ac_tool_prefix}cc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -16294,7 +16500,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}cc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -16322,7 +16528,7 @@ if test -z "$CC"; then set dummy cc; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -16335,7 +16541,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue @@ -16381,7 +16587,7 @@ if test -z "$CC"; then set dummy $ac_tool_prefix$ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -16393,7 +16599,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -16425,7 +16631,7 @@ do set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : +if ${ac_cv_prog_ac_ct_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -16437,7 +16643,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -16480,7 +16686,7 @@ fi test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "no acceptable C compiler found in \$PATH -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } # Provide some information about the compiler. $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 @@ -16595,7 +16801,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error 77 "C compiler cannot create executables -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } @@ -16638,7 +16844,7 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } fi rm -f conftest conftest$ac_cv_exeext { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 @@ -16697,7 +16903,7 @@ $as_echo "$ac_try_echo"; } >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot run C compiled programs. If you meant to cross compile, use \`--host'. -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } fi fi fi @@ -16708,7 +16914,7 @@ rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out ac_clean_files=$ac_clean_files_save { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 $as_echo_n "checking for suffix of object files... " >&6; } -if test "${ac_cv_objext+set}" = set; then : +if ${ac_cv_objext+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -16749,7 +16955,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of object files: cannot compile -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi @@ -16759,7 +16965,7 @@ OBJEXT=$ac_cv_objext ac_objext=$OBJEXT { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; } -if test "${ac_cv_c_compiler_gnu+set}" = set; then : +if ${ac_cv_c_compiler_gnu+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -16796,7 +17002,7 @@ ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 $as_echo_n "checking whether $CC accepts -g... " >&6; } -if test "${ac_cv_prog_cc_g+set}" = set; then : +if ${ac_cv_prog_cc_g+:} false; then : $as_echo_n "(cached) " >&6 else ac_save_c_werror_flag=$ac_c_werror_flag @@ -16874,7 +17080,7 @@ else fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -if test "${ac_cv_prog_cc_c89+set}" = set; then : +if ${ac_cv_prog_cc_c89+:} false; then : $as_echo_n "(cached) " >&6 else ac_cv_prog_cc_c89=no @@ -16883,8 +17089,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include -#include -#include +struct stat; /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ struct buf { int x; }; FILE * (*rcsopen) (struct buf *, struct stat *, int); @@ -16984,7 +17189,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the Intel C compiler" >&5 $as_echo_n "checking whether we are using the Intel C compiler... " >&6; } -if test "${bakefile_cv_c_compiler___INTEL_COMPILER+set}" = set; then : +if ${bakefile_cv_c_compiler___INTEL_COMPILER+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -17039,7 +17244,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using Intel C compiler v8 or later" >&5 $as_echo_n "checking whether we are using Intel C compiler v8 or later... " >&6; } -if test "${bakefile_cv_c_compiler___INTEL_COMPILER_lt_800+set}" = set; then : +if ${bakefile_cv_c_compiler___INTEL_COMPILER_lt_800+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -17092,7 +17297,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using Intel C compiler v10 or later" >&5 $as_echo_n "checking whether we are using Intel C compiler v10 or later... " >&6; } -if test "${bakefile_cv_c_compiler___INTEL_COMPILER_lt_1000+set}" = set; then : +if ${bakefile_cv_c_compiler___INTEL_COMPILER_lt_1000+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -17141,7 +17346,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu if test "xCC" = "xC"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the C compiler requires -ext o" >&5 $as_echo_n "checking if the C compiler requires -ext o... " >&6; } -if test "${bakefile_cv_c_exto+set}" = set; then : +if ${bakefile_cv_c_exto+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -17174,7 +17379,7 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot figure out if compiler needs -ext o: cannot compile -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } fi rm -f conftest.$ac_ext.o conftest.$ac_objext conftest.$ac_ext @@ -17197,7 +17402,7 @@ fi ac_save_CFLAGS=$CFLAGS { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 $as_echo_n "checking whether $CC accepts -g... " >&6; } -if test "${ac_cv_prog_cc_g+set}" = set; then : +if ${ac_cv_prog_cc_g+:} false; then : $as_echo_n "(cached) " >&6 else ac_save_c_werror_flag=$ac_c_werror_flag @@ -17288,7 +17493,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the IBM xlC C compiler" >&5 $as_echo_n "checking whether we are using the IBM xlC C compiler... " >&6; } -if test "${bakefile_cv_c_compiler___xlC__+set}" = set; then : +if ${bakefile_cv_c_compiler___xlC__+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -17344,7 +17549,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the Metrowerks C compiler" >&5 $as_echo_n "checking whether we are using the Metrowerks C compiler... " >&6; } -if test "${bakefile_cv_c_compiler___MWERKS__+set}" = set; then : +if ${bakefile_cv_c_compiler___MWERKS__+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -17398,7 +17603,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the IBM xlC C compiler" >&5 $as_echo_n "checking whether we are using the IBM xlC C compiler... " >&6; } -if test "${bakefile_cv_c_compiler___xlC__+set}" = set; then : +if ${bakefile_cv_c_compiler___xlC__+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -17455,7 +17660,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the SGI C compiler" >&5 $as_echo_n "checking whether we are using the SGI C compiler... " >&6; } -if test "${bakefile_cv_c_compiler__SGI_COMPILER_VERSION+set}" = set; then : +if ${bakefile_cv_c_compiler__SGI_COMPILER_VERSION+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -17512,7 +17717,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the Sun C compiler" >&5 $as_echo_n "checking whether we are using the Sun C compiler... " >&6; } -if test "${bakefile_cv_c_compiler___SUNPRO_C+set}" = set; then : +if ${bakefile_cv_c_compiler___SUNPRO_C+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -17569,7 +17774,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the HP C compiler" >&5 $as_echo_n "checking whether we are using the HP C compiler... " >&6; } -if test "${bakefile_cv_c_compiler___HP_cc+set}" = set; then : +if ${bakefile_cv_c_compiler___HP_cc+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -17625,7 +17830,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the Compaq C compiler" >&5 $as_echo_n "checking whether we are using the Compaq C compiler... " >&6; } -if test "${bakefile_cv_c_compiler___DECC+set}" = set; then : +if ${bakefile_cv_c_compiler___DECC+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -17681,7 +17886,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the Sun C compiler" >&5 $as_echo_n "checking whether we are using the Sun C compiler... " >&6; } -if test "${bakefile_cv_c_compiler___SUNPRO_C+set}" = set; then : +if ${bakefile_cv_c_compiler___SUNPRO_C+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -17742,7 +17947,7 @@ if test -n "$CPP" && test -d "$CPP"; then CPP= fi if test -z "$CPP"; then - if test "${ac_cv_prog_CPP+set}" = set; then : + if ${ac_cv_prog_CPP+:} false; then : $as_echo_n "(cached) " >&6 else # Double quotes because CPP needs to be expanded @@ -17858,7 +18063,7 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } fi ac_ext=c @@ -17870,7 +18075,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 $as_echo_n "checking for grep that handles long lines and -e... " >&6; } -if test "${ac_cv_path_GREP+set}" = set; then : +if ${ac_cv_path_GREP+:} false; then : $as_echo_n "(cached) " >&6 else if test -z "$GREP"; then @@ -17884,7 +18089,7 @@ do for ac_prog in grep ggrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue + as_fn_executable_p "$ac_path_GREP" || continue # Check for GNU ac_path_GREP and select it if it is found. # Check for GNU $ac_path_GREP case `"$ac_path_GREP" --version 2>&1` in @@ -17933,7 +18138,7 @@ $as_echo "$ac_cv_path_GREP" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 $as_echo_n "checking for egrep... " >&6; } -if test "${ac_cv_path_EGREP+set}" = set; then : +if ${ac_cv_path_EGREP+:} false; then : $as_echo_n "(cached) " >&6 else if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 @@ -17950,7 +18155,7 @@ do for ac_prog in egrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue + as_fn_executable_p "$ac_path_EGREP" || continue # Check for GNU ac_path_EGREP and select it if it is found. # Check for GNU $ac_path_EGREP case `"$ac_path_EGREP" --version 2>&1` in @@ -18001,7 +18206,7 @@ $as_echo "$ac_cv_path_EGREP" >&6; } if test $ac_cv_c_compiler_gnu = yes; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC needs -traditional" >&5 $as_echo_n "checking whether $CC needs -traditional... " >&6; } -if test "${ac_cv_prog_gcc_traditional+set}" = set; then : +if ${ac_cv_prog_gcc_traditional+:} false; then : $as_echo_n "(cached) " >&6 else ac_pattern="Autoconf.*'x'" @@ -18058,7 +18263,7 @@ if test -z "$CXX"; then set dummy $ac_tool_prefix$ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CXX+set}" = set; then : +if ${ac_cv_prog_CXX+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CXX"; then @@ -18070,7 +18275,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -18102,7 +18307,7 @@ do set dummy $ac_prog; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then : +if ${ac_cv_prog_ac_ct_CXX+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CXX"; then @@ -18114,7 +18319,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CXX="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -18180,7 +18385,7 @@ done { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5 $as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } -if test "${ac_cv_cxx_compiler_gnu+set}" = set; then : +if ${ac_cv_cxx_compiler_gnu+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -18217,7 +18422,7 @@ ac_test_CXXFLAGS=${CXXFLAGS+set} ac_save_CXXFLAGS=$CXXFLAGS { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5 $as_echo_n "checking whether $CXX accepts -g... " >&6; } -if test "${ac_cv_prog_cxx_g+set}" = set; then : +if ${ac_cv_prog_cxx_g+:} false; then : $as_echo_n "(cached) " >&6 else ac_save_cxx_werror_flag=$ac_cxx_werror_flag @@ -18314,7 +18519,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the Intel C++ compiler" >&5 $as_echo_n "checking whether we are using the Intel C++ compiler... " >&6; } -if test "${bakefile_cv_cxx_compiler___INTEL_COMPILER+set}" = set; then : +if ${bakefile_cv_cxx_compiler___INTEL_COMPILER+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -18369,7 +18574,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using Intel C++ compiler v8 or later" >&5 $as_echo_n "checking whether we are using Intel C++ compiler v8 or later... " >&6; } -if test "${bakefile_cv_cxx_compiler___INTEL_COMPILER_lt_800+set}" = set; then : +if ${bakefile_cv_cxx_compiler___INTEL_COMPILER_lt_800+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -18422,7 +18627,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using Intel C++ compiler v10 or later" >&5 $as_echo_n "checking whether we are using Intel C++ compiler v10 or later... " >&6; } -if test "${bakefile_cv_cxx_compiler___INTEL_COMPILER_lt_1000+set}" = set; then : +if ${bakefile_cv_cxx_compiler___INTEL_COMPILER_lt_1000+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -18471,7 +18676,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu if test "xCXX" = "xC"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the C compiler requires -ext o" >&5 $as_echo_n "checking if the C compiler requires -ext o... " >&6; } -if test "${bakefile_cv_c_exto+set}" = set; then : +if ${bakefile_cv_c_exto+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -18504,7 +18709,7 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot figure out if compiler needs -ext o: cannot compile -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } fi rm -f conftest.$ac_ext.o conftest.$ac_objext conftest.$ac_ext @@ -18527,7 +18732,7 @@ fi ac_save_CFLAGS=$CFLAGS { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 $as_echo_n "checking whether $CC accepts -g... " >&6; } -if test "${ac_cv_prog_cc_g+set}" = set; then : +if ${ac_cv_prog_cc_g+:} false; then : $as_echo_n "(cached) " >&6 else ac_save_c_werror_flag=$ac_c_werror_flag @@ -18618,7 +18823,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the IBM xlC C++ compiler" >&5 $as_echo_n "checking whether we are using the IBM xlC C++ compiler... " >&6; } -if test "${bakefile_cv_cxx_compiler___xlC__+set}" = set; then : +if ${bakefile_cv_cxx_compiler___xlC__+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -18674,7 +18879,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the Metrowerks C++ compiler" >&5 $as_echo_n "checking whether we are using the Metrowerks C++ compiler... " >&6; } -if test "${bakefile_cv_cxx_compiler___MWERKS__+set}" = set; then : +if ${bakefile_cv_cxx_compiler___MWERKS__+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -18728,7 +18933,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the IBM xlC C++ compiler" >&5 $as_echo_n "checking whether we are using the IBM xlC C++ compiler... " >&6; } -if test "${bakefile_cv_cxx_compiler___xlC__+set}" = set; then : +if ${bakefile_cv_cxx_compiler___xlC__+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -18785,7 +18990,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the SGI C++ compiler" >&5 $as_echo_n "checking whether we are using the SGI C++ compiler... " >&6; } -if test "${bakefile_cv_cxx_compiler__SGI_COMPILER_VERSION+set}" = set; then : +if ${bakefile_cv_cxx_compiler__SGI_COMPILER_VERSION+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -18842,7 +19047,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the Sun C++ compiler" >&5 $as_echo_n "checking whether we are using the Sun C++ compiler... " >&6; } -if test "${bakefile_cv_cxx_compiler___SUNPRO_CC+set}" = set; then : +if ${bakefile_cv_cxx_compiler___SUNPRO_CC+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -18899,7 +19104,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the HP C++ compiler" >&5 $as_echo_n "checking whether we are using the HP C++ compiler... " >&6; } -if test "${bakefile_cv_cxx_compiler___HP_aCC+set}" = set; then : +if ${bakefile_cv_cxx_compiler___HP_aCC+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -18955,7 +19160,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the Compaq C++ compiler" >&5 $as_echo_n "checking whether we are using the Compaq C++ compiler... " >&6; } -if test "${bakefile_cv_cxx_compiler___DECCXX+set}" = set; then : +if ${bakefile_cv_cxx_compiler___DECCXX+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -19011,7 +19216,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the Sun C++ compiler" >&5 $as_echo_n "checking whether we are using the Sun C++ compiler... " >&6; } -if test "${bakefile_cv_cxx_compiler___SUNPRO_CC+set}" = set; then : +if ${bakefile_cv_cxx_compiler___SUNPRO_CC+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -19070,7 +19275,7 @@ if test "x$SUNCXX" != xyes; then set dummy ${ac_tool_prefix}ar; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_AR+set}" = set; then : +if ${ac_cv_prog_AR+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$AR"; then @@ -19082,7 +19287,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_AR="${ac_tool_prefix}ar" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -19110,7 +19315,7 @@ if test -z "$ac_cv_prog_AR"; then set dummy ar; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : +if ${ac_cv_prog_ac_ct_AR+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_AR"; then @@ -19122,7 +19327,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_AR="ar" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -19189,10 +19394,6 @@ $as_echo_n "checking for architectures to use in universal binary... " >&6; } $as_echo "$OSX_ARCH_OPTS" >&6; } retest_macosx_linking=yes - - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Disabling precompiled headers due to universal binary build." >&5 -$as_echo "$as_me: WARNING: Disabling precompiled headers due to universal binary build." >&2;} - bk_use_pch=no else if test "x$wxUSE_MAC_ARCH" != xno; then OSX_ARCH_OPTS=$wxUSE_MAC_ARCH @@ -19201,11 +19402,18 @@ fi if test "x$OSX_ARCH_OPTS" != "x"; then if echo $OSX_ARCH_OPTS | grep -q ","; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Disabling dependency tracking due to universal binary build." >&5 +$as_echo "$as_me: WARNING: Disabling dependency tracking due to universal binary build." >&2;} disable_macosx_deps=yes + + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Disabling precompiled headers due to universal binary build." >&5 +$as_echo "$as_me: WARNING: Disabling precompiled headers due to universal binary build." >&2;} + bk_use_pch=no fi OSX_ARCH_OPTS=`echo $OSX_ARCH_OPTS | sed -e 's/^/-arch /' -e 's/,/ -arch /g'` + CPPFLAGS="$OSX_ARCH_OPTS $CPPFLAGS" CXXFLAGS="$OSX_ARCH_OPTS $CXXFLAGS" CFLAGS="$OSX_ARCH_OPTS $CFLAGS" OBJCXXFLAGS="$OSX_ARCH_OPTS $OBJCXXFLAGS" @@ -19228,7 +19436,7 @@ $as_echo_n "checking for SDK directory $wxUSE_MACOSX_SDK... " >&6; } { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "not found -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: exists" >&5 $as_echo "exists" >&6; } @@ -19315,7 +19523,7 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "no. Try a different SDK -See \`config.log' for more details" "$LINENO" 5 ; }; exit 1 +See \`config.log' for more details" "$LINENO" 5; }; exit 1 fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -19352,7 +19560,7 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "no. Try a different SDK -See \`config.log' for more details" "$LINENO" 5 ; }; exit 1 +See \`config.log' for more details" "$LINENO" 5; }; exit 1 fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -19469,7 +19677,7 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "no. CoreFoundation not available. -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext @@ -19489,7 +19697,7 @@ case "${host}" in else { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -mno-cygwin is in effect" >&5 $as_echo_n "checking if -mno-cygwin is in effect... " >&6; } -if test "${wx_cv_nocygwin+set}" = set; then : +if ${wx_cv_nocygwin+:} false; then : $as_echo_n "(cached) " >&6 else @@ -19546,8 +19754,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 @@ -19571,7 +19777,7 @@ case "${host}" in if test "$wxUSE_MOTIF" = 1 -o "$wxUSE_GTK" = 1 -o "$wxUSE_X11" = 1; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for drand48 in -lcExt" >&5 $as_echo_n "checking for drand48 in -lcExt... " >&6; } -if test "${ac_cv_lib_cExt_drand48+set}" = set; then : +if ${ac_cv_lib_cExt_drand48+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -19605,16 +19811,14 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_cExt_drand48" >&5 $as_echo "$ac_cv_lib_cExt_drand48" >&6; } -if test "x$ac_cv_lib_cExt_drand48" = x""yes; then : +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; } -if test "${wx_cv_gccversion+set}" = set; then : +if ${wx_cv_gccversion+:} false; then : $as_echo_n "(cached) " >&6 else @@ -19676,96 +19880,13 @@ $as_echo "$as_me: WARNING: Building DLLs requires OMF mode, enabled" >&2;} wxUSE_OMF=yes enable_omf=yes fi - ;; - *) - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for strcasecmp() in string.h" >&5 -$as_echo_n "checking for strcasecmp() in string.h... " >&6; } -if test "${ac_cv_string_strcasecmp+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - #include - -int -main () -{ - - strcasecmp("foo", "bar"); - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_string_strcasecmp=yes -else - ac_cv_string_strcasecmp=no - -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_string_strcasecmp" >&5 -$as_echo "$ac_cv_string_strcasecmp" >&6; } - - if test x"$ac_cv_string_strcasecmp" = "xyes"; then - $as_echo "#define HAVE_STRCASECMP_IN_STRING_H 1" >>confdefs.h - - else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for strcasecmp() in strings.h" >&5 -$as_echo_n "checking for strcasecmp() in strings.h... " >&6; } -if test "${ac_cv_strings_strcasecmp+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - #include - -int -main () -{ - - strcasecmp("foo", "bar"); - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_strings_strcasecmp=yes -else - ac_cv_strings_strcasecmp=no - -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_strings_strcasecmp" >&5 -$as_echo "$ac_cv_strings_strcasecmp" >&6; } - - if test x"$ac_cv_strings_strcasecmp" = "xyes"; then - $as_echo "#define HAVE_STRCASECMP_IN_STRINGS_H 1" >>confdefs.h - - else - as_fn_error $? "No case-insensitive string comparison function found." "$LINENO" 5 - fi - fi - ;; esac { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 $as_echo_n "checking for ANSI C header files... " >&6; } -if test "${ac_cv_header_stdc+set}" = set; then : +if ${ac_cv_header_stdc+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -19912,7 +20033,7 @@ if test "$ac_cv_header_wchar_h" != "yes"; then do : ac_fn_c_check_header_compile "$LINENO" "wcstr.h" "ac_cv_header_wcstr_h" "$ac_includes_default " -if test "x$ac_cv_header_wcstr_h" = x""yes; then : +if test "x$ac_cv_header_wcstr_h" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_WCSTR_H 1 _ACEOF @@ -19935,11 +20056,11 @@ 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 " -if test "x$ac_cv_header_sys_select_h" = x""yes; then : +if test "x$ac_cv_header_sys_select_h" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_SYS_SELECT_H 1 _ACEOF @@ -19948,12 +20069,38 @@ 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 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5 $as_echo_n "checking for an ANSI C-conforming const... " >&6; } -if test "${ac_cv_c_const+set}" = set; then : +if ${ac_cv_c_const+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -19962,11 +20109,11 @@ else int main () { -/* FIXME: Include the comments suggested by Paul. */ + #ifndef __cplusplus - /* Ultrix mips cc rejects this. */ + /* Ultrix mips cc rejects this sort of thing. */ typedef int charset[2]; - const charset cs; + const charset cs = { 0, 0 }; /* SunOS 4.1.1 cc rejects this. */ char const *const *pcpcc; char **ppc; @@ -19983,8 +20130,9 @@ main () ++pcpcc; ppc = (char**) pcpcc; pcpcc = (char const *const *) ppc; - { /* SCO 3.2v4 cc rejects this. */ - char *t; + { /* SCO 3.2v4 cc rejects this sort of thing. */ + char tx; + char *t = &tx; char const *s = 0 ? (char *) 0 : (char const *) 0; *t++ = 0; @@ -20000,10 +20148,10 @@ main () iptr p = 0; ++p; } - { /* AIX XL C 1.02.0.0 rejects this saying + { /* AIX XL C 1.02.0.0 rejects this sort of thing, saying "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ - struct s { int j; const int *ap[3]; }; - struct s *b; b->j = 5; + struct s { int j; const int *ap[3]; } bx; + struct s *b = &bx; b->j = 5; } { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ const int foo = 10; @@ -20033,7 +20181,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5 $as_echo_n "checking for inline... " >&6; } -if test "${ac_cv_c_inline+set}" = set; then : +if ${ac_cv_c_inline+:} false; then : $as_echo_n "(cached) " >&6 else ac_cv_c_inline=no @@ -20080,7 +20228,7 @@ esac # This bug is HP SR number 8606223364. { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of short" >&5 $as_echo_n "checking size of short... " >&6; } -if test "${ac_cv_sizeof_short+set}" = set; then : +if ${ac_cv_sizeof_short+:} false; then : $as_echo_n "(cached) " >&6 else if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (short))" "ac_cv_sizeof_short" "$ac_includes_default"; then : @@ -20090,7 +20238,7 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error 77 "cannot compute sizeof (short) -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } else ac_cv_sizeof_short=0 fi @@ -20113,7 +20261,7 @@ _ACEOF # This bug is HP SR number 8606223364. { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of void *" >&5 $as_echo_n "checking size of void *... " >&6; } -if test "${ac_cv_sizeof_void_p+set}" = set; then : +if ${ac_cv_sizeof_void_p+:} false; then : $as_echo_n "(cached) " >&6 else if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (void *))" "ac_cv_sizeof_void_p" "$ac_includes_default"; then : @@ -20123,7 +20271,7 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error 77 "cannot compute sizeof (void *) -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } else ac_cv_sizeof_void_p=0 fi @@ -20146,7 +20294,7 @@ _ACEOF # This bug is HP SR number 8606223364. { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of int" >&5 $as_echo_n "checking size of int... " >&6; } -if test "${ac_cv_sizeof_int+set}" = set; then : +if ${ac_cv_sizeof_int+:} false; then : $as_echo_n "(cached) " >&6 else if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (int))" "ac_cv_sizeof_int" "$ac_includes_default"; then : @@ -20156,7 +20304,7 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error 77 "cannot compute sizeof (int) -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } else ac_cv_sizeof_int=0 fi @@ -20179,7 +20327,7 @@ _ACEOF # This bug is HP SR number 8606223364. { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5 $as_echo_n "checking size of long... " >&6; } -if test "${ac_cv_sizeof_long+set}" = set; then : +if ${ac_cv_sizeof_long+:} false; then : $as_echo_n "(cached) " >&6 else if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long" "$ac_includes_default"; then : @@ -20189,7 +20337,7 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error 77 "cannot compute sizeof (long) -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } else ac_cv_sizeof_long=0 fi @@ -20212,7 +20360,7 @@ _ACEOF # This bug is HP SR number 8606223364. { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of size_t" >&5 $as_echo_n "checking size of size_t... " >&6; } -if test "${ac_cv_sizeof_size_t+set}" = set; then : +if ${ac_cv_sizeof_size_t+:} false; then : $as_echo_n "(cached) " >&6 else if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (size_t))" "ac_cv_sizeof_size_t" "$ac_includes_default"; then : @@ -20222,7 +20370,7 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error 77 "cannot compute sizeof (size_t) -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } else ac_cv_sizeof_size_t=0 fi @@ -20248,7 +20396,7 @@ case "${host}" in # This bug is HP SR number 8606223364. { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long long" >&5 $as_echo_n "checking size of long long... " >&6; } -if test "${ac_cv_sizeof_long_long+set}" = set; then : +if ${ac_cv_sizeof_long_long+:} false; then : $as_echo_n "(cached) " >&6 else if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long long))" "ac_cv_sizeof_long_long" "$ac_includes_default"; then : @@ -20258,7 +20406,7 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error 77 "cannot compute sizeof (long long) -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } else ac_cv_sizeof_long_long=0 fi @@ -20283,7 +20431,7 @@ _ACEOF # This bug is HP SR number 8606223364. { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long long" >&5 $as_echo_n "checking size of long long... " >&6; } -if test "${ac_cv_sizeof_long_long+set}" = set; then : +if ${ac_cv_sizeof_long_long+:} false; then : $as_echo_n "(cached) " >&6 else if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long long))" "ac_cv_sizeof_long_long" "$ac_includes_default"; then : @@ -20293,7 +20441,7 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error 77 "cannot compute sizeof (long long) -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } else ac_cv_sizeof_long_long=0 fi @@ -20321,7 +20469,7 @@ _ACEOF # This bug is HP SR number 8606223364. { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long long" >&5 $as_echo_n "checking size of long long... " >&6; } -if test "${ac_cv_sizeof_long_long+set}" = set; then : +if ${ac_cv_sizeof_long_long+:} false; then : $as_echo_n "(cached) " >&6 else if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long long))" "ac_cv_sizeof_long_long" "$ac_includes_default"; then : @@ -20331,7 +20479,7 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error 77 "cannot compute sizeof (long long) -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } else ac_cv_sizeof_long_long=0 fi @@ -20356,7 +20504,7 @@ esac # This bug is HP SR number 8606223364. { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of wchar_t" >&5 $as_echo_n "checking size of wchar_t... " >&6; } -if test "${ac_cv_sizeof_wchar_t+set}" = set; then : +if ${ac_cv_sizeof_wchar_t+:} false; then : $as_echo_n "(cached) " >&6 else if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (wchar_t))" "ac_cv_sizeof_wchar_t" " @@ -20383,7 +20531,7 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error 77 "cannot compute sizeof (wchar_t) -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } else ac_cv_sizeof_wchar_t=0 fi @@ -20408,7 +20556,7 @@ $as_echo "#define wxUSE_WCHAR_T 1" >>confdefs.h { $as_echo "$as_me:${as_lineno-$LINENO}: checking for va_copy" >&5 $as_echo_n "checking for va_copy... " >&6; } -if test "${wx_cv_func_va_copy+set}" = set; then : +if ${wx_cv_func_va_copy+:} false; then : $as_echo_n "(cached) " >&6 else @@ -20464,7 +20612,7 @@ if test $wx_cv_func_va_copy = "yes"; then else { $as_echo "$as_me:${as_lineno-$LINENO}: checking if va_list can be copied by value" >&5 $as_echo_n "checking if va_list can be copied by value... " >&6; } -if test "${wx_cv_type_va_list_lvalue+set}" = set; then : +if ${wx_cv_type_va_list_lvalue+:} false; then : $as_echo_n "(cached) " >&6 else @@ -20519,7 +20667,7 @@ if test "$wxUSE_VARARG_MACROS" = "yes"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports variadic macros" >&5 $as_echo_n "checking whether the compiler supports variadic macros... " >&6; } -if test "${wx_cv_have_variadic_macros+set}" = set; then : +if ${wx_cv_have_variadic_macros+:} false; then : $as_echo_n "(cached) " >&6 else @@ -20571,6 +20719,9 @@ if test $wx_cv_have_variadic_macros = "yes"; then fi +else + $as_echo "#define wxNO_VARIADIC_MACROS 1" >>confdefs.h + fi LARGEFILE_CPPFLAGS= @@ -20584,7 +20735,7 @@ if test "$enable_largefile" != no; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5 $as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; } -if test "${ac_cv_sys_file_offset_bits+set}" = set; then : +if ${ac_cv_sys_file_offset_bits+:} false; then : $as_echo_n "(cached) " >&6 else @@ -20627,7 +20778,7 @@ _ACEOF { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5 $as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; } -if test "${ac_cv_sys_large_files+set}" = set; then : +if ${ac_cv_sys_large_files+:} false; then : $as_echo_n "(cached) " >&6 else @@ -20690,7 +20841,7 @@ if test -n "$LARGEFILE_CPPFLAGS"; then if test "$USE_HPUX" = 1 -a "$GXX" = "yes"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -D__STDC_EXT__ is required" >&5 $as_echo_n "checking if -D__STDC_EXT__ is required... " >&6; } -if test "${wx_cv_STDC_EXT_required+set}" = set; then : +if ${wx_cv_STDC_EXT_required+:} false; then : $as_echo_n "(cached) " >&6 else @@ -20749,7 +20900,7 @@ old_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $LARGEFILE_CPPFLAGS" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGEFILE_SOURCE value needed for large files" >&5 $as_echo_n "checking for _LARGEFILE_SOURCE value needed for large files... " >&6; } -if test "${ac_cv_sys_largefile_source+set}" = set; then : +if ${ac_cv_sys_largefile_source+:} false; then : $as_echo_n "(cached) " >&6 else while :; do @@ -20828,7 +20979,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5 $as_echo_n "checking whether byte ordering is bigendian... " >&6; } -if test "${ac_cv_c_bigendian+set}" = set; then : +if ${ac_cv_c_bigendian+:} false; then : $as_echo_n "(cached) " >&6 else ac_cv_c_bigendian=unknown @@ -20926,7 +21077,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu do : ac_fn_cxx_check_header_compile "$LINENO" "iostream" "ac_cv_header_iostream" " " -if test "x$ac_cv_header_iostream" = x""yes; then : +if test "x$ac_cv_header_iostream" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_IOSTREAM 1 _ACEOF @@ -20954,7 +21105,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu { $as_echo "$as_me:${as_lineno-$LINENO}: checking if C++ compiler supports the explicit keyword" >&5 $as_echo_n "checking if C++ compiler supports the explicit keyword... " >&6; } -if test "${wx_cv_explicit+set}" = set; then : +if ${wx_cv_explicit+:} false; then : $as_echo_n "(cached) " >&6 else @@ -21042,7 +21193,7 @@ fi if test "x$SGICC" = "xyes"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking if cc version is 7.4.4 or greater" >&5 $as_echo_n "checking if cc version is 7.4.4 or greater... " >&6; } -if test "${wx_cv_prog_sgicc744+set}" = set; then : +if ${wx_cv_prog_sgicc744+:} false; then : $as_echo_n "(cached) " >&6 else @@ -21081,7 +21232,7 @@ fi if test "x$SGICXX" = "xyes"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking if CC version is 7.4.4 or greater" >&5 $as_echo_n "checking if CC version is 7.4.4 or greater... " >&6; } -if test "${wx_cv_prog_sgicxx744+set}" = set; then : +if ${wx_cv_prog_sgicxx744+:} false; then : $as_echo_n "(cached) " >&6 else @@ -21159,7 +21310,7 @@ if test "$wxUSE_STD_STRING" = "yes" -o "$wxUSE_STL" = "yes"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $std_string in " >&5 $as_echo_n "checking for $std_string in ... " >&6; } -if test "${wx_cv_class_stdstring+set}" = set; then : +if ${wx_cv_class_stdstring+:} false; then : $as_echo_n "(cached) " >&6 else @@ -21195,7 +21346,7 @@ $as_echo "$wx_cv_class_stdstring" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: checking if std::basic_string<$char_type> works" >&5 $as_echo_n "checking if std::basic_string<$char_type> works... " >&6; } -if test "${wx_cv_class_stdbasicstring+set}" = set; then : +if ${wx_cv_class_stdbasicstring+:} false; then : $as_echo_n "(cached) " >&6 else @@ -21253,7 +21404,7 @@ fi if test "$wxUSE_STD_IOSTREAM" = "yes"; then ac_fn_cxx_check_type "$LINENO" "std::istream" "ac_cv_type_std__istream" "#include " -if test "x$ac_cv_type_std__istream" = x""yes; then : +if test "x$ac_cv_type_std__istream" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_STD__ISTREAM 1 @@ -21265,7 +21416,7 @@ else fi ac_fn_cxx_check_type "$LINENO" "std::ostream" "ac_cv_type_std__ostream" "#include " -if test "x$ac_cv_type_std__ostream" = x""yes; then : +if test "x$ac_cv_type_std__ostream" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_STD__OSTREAM 1 @@ -21290,7 +21441,7 @@ fi if test "$wxUSE_STL" = "yes"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for basic STL functionality" >&5 $as_echo_n "checking for basic STL functionality... " >&6; } -if test "${wx_cv_lib_stl+set}" = set; then : +if ${wx_cv_lib_stl+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -21330,7 +21481,7 @@ $as_echo "$wx_cv_lib_stl" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking for compliant std::string::compare" >&5 $as_echo_n "checking for compliant std::string::compare... " >&6; } -if test "${wx_cv_func_stdstring_compare+set}" = set; then : +if ${wx_cv_func_stdstring_compare+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -21377,10 +21528,10 @@ $as_echo "$wx_cv_func_stdstring_compare" >&6; } ac_fn_cxx_check_header_compile "$LINENO" "unordered_map" "ac_cv_header_unordered_map" " " -if test "x$ac_cv_header_unordered_map" = x""yes; then : +if test "x$ac_cv_header_unordered_map" = xyes; then : { $as_echo "$as_me:${as_lineno-$LINENO}: checking for unordered_map and unordered_set in std" >&5 $as_echo_n "checking for unordered_map and unordered_set in std... " >&6; } -if test "${wx_cv_class_stdunorderedmapset+set}" = set; then : +if ${wx_cv_class_stdunorderedmapset+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -21420,10 +21571,10 @@ fi ac_fn_cxx_check_header_compile "$LINENO" "tr1/unordered_map" "ac_cv_header_tr1_unordered_map" " " -if test "x$ac_cv_header_tr1_unordered_map" = x""yes; then : +if test "x$ac_cv_header_tr1_unordered_map" = xyes; then : { $as_echo "$as_me:${as_lineno-$LINENO}: checking for unordered_map and unordered_set in std::tr1" >&5 $as_echo_n "checking for unordered_map and unordered_set in std::tr1... " >&6; } -if test "${wx_cv_class_tr1unorderedmapset+set}" = set; then : +if ${wx_cv_class_tr1unorderedmapset+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -21466,10 +21617,10 @@ fi ac_fn_cxx_check_header_compile "$LINENO" "hash_map" "ac_cv_header_hash_map" " " -if test "x$ac_cv_header_hash_map" = x""yes; then : +if test "x$ac_cv_header_hash_map" = xyes; then : { $as_echo "$as_me:${as_lineno-$LINENO}: checking for std::hash_map and hash_set" >&5 $as_echo_n "checking for std::hash_map and hash_set... " >&6; } -if test "${wx_cv_class_stdhashmapset+set}" = set; then : +if ${wx_cv_class_stdhashmapset+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -21510,10 +21661,10 @@ fi ac_fn_cxx_check_header_compile "$LINENO" "ext/hash_map" "ac_cv_header_ext_hash_map" " " -if test "x$ac_cv_header_ext_hash_map" = x""yes; then : +if test "x$ac_cv_header_ext_hash_map" = xyes; then : { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU hash_map and hash_set" >&5 $as_echo_n "checking for GNU hash_map and hash_set... " >&6; } -if test "${wx_cv_class_gnuhashmapset+set}" = set; then : +if ${wx_cv_class_gnuhashmapset+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -21556,7 +21707,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5 $as_echo_n "checking how to run the C++ preprocessor... " >&6; } if test -z "$CXXCPP"; then - if test "${ac_cv_prog_CXXCPP+set}" = set; then : + if ${ac_cv_prog_CXXCPP+:} false; then : $as_echo_n "(cached) " >&6 else # Double quotes because CXXCPP needs to be expanded @@ -21672,7 +21823,7 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } fi ac_ext=cpp @@ -21690,7 +21841,7 @@ if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF - + break fi done @@ -21701,7 +21852,7 @@ done if test -n "$GCC"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __sync_fetch_and_add and __sync_sub_and_fetch builtins" >&5 $as_echo_n "checking for __sync_fetch_and_add and __sync_sub_and_fetch builtins... " >&6; } - if test "${wx_cv_cc_gcc_atomic_builtins+set}" = set; then : + if ${wx_cv_cc_gcc_atomic_builtins+:} false; then : $as_echo_n "(cached) " >&6 else @@ -21717,7 +21868,7 @@ main () __sync_fetch_and_add(&value, 2); __sync_sub_and_fetch(&value, 1); /* but wxAtomicDec does, so mimic that: */ - unsigned int r2 = __sync_sub_and_fetch(&value, 1); + volatile unsigned int r2 = __sync_sub_and_fetch(&value, 1); ; return 0; @@ -21798,7 +21949,7 @@ $as_echo_n "checking for libraries directories... " >&6; } case "${host}" in *-*-irix6* ) - if test "${wx_cv_std_libpath+set}" = set; then : + if ${wx_cv_std_libpath+:} false; then : $as_echo_n "(cached) " >&6 else @@ -21984,10 +22135,21 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; :end' >>confcache if diff "$cache_file" confcache >/dev/null 2>&1; then :; else if test -w "$cache_file"; then - test "x$cache_file" != "x/dev/null" && + if test "x$cache_file" != "x/dev/null"; then { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 $as_echo "$as_me: updating cache $cache_file" >&6;} - cat confcache >$cache_file + if test ! -f "$cache_file" || test -h "$cache_file"; then + cat confcache >"$cache_file" + else + case $cache_file in #( + */* | ?:*) + mv -f confcache "$cache_file"$$ && + mv -f "$cache_file"$$ "$cache_file" ;; #( + *) + mv -f confcache "$cache_file" ;; + esac + fi + fi else { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} @@ -22000,7 +22162,7 @@ have_floor=0 for ac_func in cos do : ac_fn_c_check_func "$LINENO" "cos" "ac_cv_func_cos" -if test "x$ac_cv_func_cos" = x""yes; then : +if test "x$ac_cv_func_cos" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_COS 1 _ACEOF @@ -22011,7 +22173,7 @@ done for ac_func in floor do : ac_fn_c_check_func "$LINENO" "floor" "ac_cv_func_floor" -if test "x$ac_cv_func_floor" = x""yes; then : +if test "x$ac_cv_func_floor" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_FLOOR 1 _ACEOF @@ -22034,7 +22196,7 @@ $as_echo "no" >&6; } for ac_func in sin do : ac_fn_c_check_func "$LINENO" "sin" "ac_cv_func_sin" -if test "x$ac_cv_func_sin" = x""yes; then : +if test "x$ac_cv_func_sin" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_SIN 1 _ACEOF @@ -22045,7 +22207,7 @@ done for ac_func in ceil do : ac_fn_c_check_func "$LINENO" "ceil" "ac_cv_func_ceil" -if test "x$ac_cv_func_ceil" = x""yes; then : +if test "x$ac_cv_func_ceil" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_CEIL 1 _ACEOF @@ -22077,7 +22239,7 @@ if test "wxUSE_UNICODE" = "yes"; then do { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $wx_func" >&5 $as_echo_n "checking for $wx_func... " >&6; } -if eval "test \"\${wx_cv_func_$wx_func+set}\"" = set; then : +if eval \${wx_cv_func_$wx_func+:} false; then : $as_echo_n "(cached) " >&6 else @@ -22134,7 +22296,7 @@ else do { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $wx_func" >&5 $as_echo_n "checking for $wx_func... " >&6; } -if eval "test \"\${wx_cv_func_$wx_func+set}\"" = set; then : +if eval \${wx_cv_func_$wx_func+:} false; then : $as_echo_n "(cached) " >&6 else @@ -22208,7 +22370,7 @@ $as_echo "$as_me: WARNING: Defaulting to the builtin regex library for Unicode b if test "$wxUSE_REGEX" = "sys" -o "$wxUSE_REGEX" = "yes" ; then ac_fn_c_check_header_compile "$LINENO" "regex.h" "ac_cv_header_regex_h" " " -if test "x$ac_cv_header_regex_h" = x""yes; then : +if test "x$ac_cv_header_regex_h" = xyes; then : for ac_func in regcomp re_search do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` @@ -22253,7 +22415,7 @@ if test "$wxUSE_ZLIB" != "no" ; then else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for zlib.h >= 1.1.4" >&5 $as_echo_n "checking for zlib.h >= 1.1.4... " >&6; } -if test "${ac_cv_header_zlib_h+set}" = set; then : +if ${ac_cv_header_zlib_h+:} false; then : $as_echo_n "(cached) " >&6 else if test "$cross_compiling" = yes; then : @@ -22294,7 +22456,7 @@ fi $as_echo "$ac_cv_header_zlib_h" >&6; } ac_fn_c_check_header_compile "$LINENO" "zlib.h" "ac_cv_header_zlib_h" " " -if test "x$ac_cv_header_zlib_h" = x""yes; then : +if test "x$ac_cv_header_zlib_h" = xyes; then : fi @@ -22306,7 +22468,7 @@ fi if test "$system_zlib_h_ok" = "yes"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for deflate in -lz" >&5 $as_echo_n "checking for deflate in -lz... " >&6; } -if test "${ac_cv_lib_z_deflate+set}" = set; then : +if ${ac_cv_lib_z_deflate+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -22340,7 +22502,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_deflate" >&5 $as_echo "$ac_cv_lib_z_deflate" >&6; } -if test "x$ac_cv_lib_z_deflate" = x""yes; then : +if test "x$ac_cv_lib_z_deflate" = xyes; then : ZLIB_LINK=" -lz" fi @@ -22375,7 +22537,7 @@ $as_echo "$as_me: WARNING: system png library doesn't work without system zlib, if test "$wxUSE_LIBPNG" = "sys" -o "$wxUSE_LIBPNG" = "yes" ; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for png.h > 0.90" >&5 $as_echo_n "checking for png.h > 0.90... " >&6; } -if test "${ac_cv_header_png_h+set}" = set; then : +if ${ac_cv_header_png_h+:} false; then : $as_echo_n "(cached) " >&6 else if test "$cross_compiling" = yes; then : @@ -22413,7 +22575,7 @@ fi $as_echo "$ac_cv_header_png_h" >&6; } ac_fn_c_check_header_compile "$LINENO" "png.h" "ac_cv_header_png_h" " " -if test "x$ac_cv_header_png_h" = x""yes; then : +if test "x$ac_cv_header_png_h" = xyes; then : fi @@ -22422,7 +22584,7 @@ fi if test "$ac_cv_header_png_h" = "yes"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for png_sig_cmp in -lpng" >&5 $as_echo_n "checking for png_sig_cmp in -lpng... " >&6; } -if test "${ac_cv_lib_png_png_sig_cmp+set}" = set; then : +if ${ac_cv_lib_png_png_sig_cmp+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -22456,7 +22618,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_png_png_sig_cmp" >&5 $as_echo "$ac_cv_lib_png_png_sig_cmp" >&6; } -if test "x$ac_cv_lib_png_png_sig_cmp" = x""yes; then : +if test "x$ac_cv_lib_png_png_sig_cmp" = xyes; then : PNG_LINK=" -lpng -lz" fi @@ -22485,7 +22647,7 @@ if test "$wxUSE_LIBJPEG" != "no" ; then if test "$wxUSE_LIBJPEG" = "sys" -o "$wxUSE_LIBJPEG" = "yes" ; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jpeglib.h" >&5 $as_echo_n "checking for jpeglib.h... " >&6; } - if test "${ac_cv_header_jpeglib_h+set}" = set; then : + if ${ac_cv_header_jpeglib_h+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -22520,7 +22682,7 @@ $as_echo "$ac_cv_header_jpeglib_h" >&6; } if test "$ac_cv_header_jpeglib_h" = "yes"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jpeg_read_header in -ljpeg" >&5 $as_echo_n "checking for jpeg_read_header in -ljpeg... " >&6; } -if test "${ac_cv_lib_jpeg_jpeg_read_header+set}" = set; then : +if ${ac_cv_lib_jpeg_jpeg_read_header+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -22554,7 +22716,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jpeg_jpeg_read_header" >&5 $as_echo "$ac_cv_lib_jpeg_jpeg_read_header" >&6; } -if test "x$ac_cv_lib_jpeg_jpeg_read_header" = x""yes; then : +if test "x$ac_cv_lib_jpeg_jpeg_read_header" = xyes; then : JPEG_LINK=" -ljpeg" fi @@ -22574,7 +22736,7 @@ $as_echo "$as_me: WARNING: system jpeg library not found, will use built-in inst if test "$wxUSE_MSW" = 1; then ac_fn_c_check_type "$LINENO" "boolean" "ac_cv_type_boolean" "#include " -if test "x$ac_cv_type_boolean" = x""yes; then : +if test "x$ac_cv_type_boolean" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_BOOLEAN 1 @@ -22587,7 +22749,7 @@ _ACEOF # This bug is HP SR number 8606223364. { $as_echo "$as_me:${as_lineno-$LINENO}: checking size of boolean" >&5 $as_echo_n "checking size of boolean... " >&6; } -if test "${ac_cv_sizeof_boolean+set}" = set; then : +if ${ac_cv_sizeof_boolean+:} false; then : $as_echo_n "(cached) " >&6 else if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (boolean))" "ac_cv_sizeof_boolean" " @@ -22602,7 +22764,7 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error 77 "cannot compute sizeof (boolean) -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } else ac_cv_sizeof_boolean=0 fi @@ -22648,11 +22810,11 @@ if test "$wxUSE_LIBTIFF" != "no" ; then ac_fn_c_check_header_compile "$LINENO" "tiffio.h" "ac_cv_header_tiffio_h" " " -if test "x$ac_cv_header_tiffio_h" = x""yes; then : +if test "x$ac_cv_header_tiffio_h" = xyes; then : { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TIFFError in -ltiff" >&5 $as_echo_n "checking for TIFFError in -ltiff... " >&6; } -if test "${ac_cv_lib_tiff_TIFFError+set}" = set; then : +if ${ac_cv_lib_tiff_TIFFError+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -22686,7 +22848,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tiff_TIFFError" >&5 $as_echo "$ac_cv_lib_tiff_TIFFError" >&6; } -if test "x$ac_cv_lib_tiff_TIFFError" = x""yes; then : +if test "x$ac_cv_lib_tiff_TIFFError" = xyes; then : TIFF_LINK=" -ltiff" fi @@ -22712,6 +22874,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" @@ -22729,7 +22982,7 @@ if test "$wxUSE_EXPAT" != "no"; then if test "$wxUSE_EXPAT" = "sys" -o "$wxUSE_EXPAT" = "yes" ; then ac_fn_c_check_header_compile "$LINENO" "expat.h" "ac_cv_header_expat_h" " " -if test "x$ac_cv_header_expat_h" = x""yes; then : +if test "x$ac_cv_header_expat_h" = xyes; then : found_expat_h=1 fi @@ -22737,7 +22990,7 @@ fi if test "x$found_expat_h" = "x1"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking if expat.h is valid C++ header" >&5 $as_echo_n "checking if expat.h is valid C++ header... " >&6; } -if test "${wx_cv_expat_is_not_broken+set}" = set; then : +if ${wx_cv_expat_is_not_broken+:} false; then : $as_echo_n "(cached) " >&6 else @@ -22779,7 +23032,7 @@ $as_echo "$wx_cv_expat_is_not_broken" >&6; } if test "$wx_cv_expat_is_not_broken" = "yes" ; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XML_ParserCreate in -lexpat" >&5 $as_echo_n "checking for XML_ParserCreate in -lexpat... " >&6; } -if test "${ac_cv_lib_expat_XML_ParserCreate+set}" = set; then : +if ${ac_cv_lib_expat_XML_ParserCreate+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -22813,7 +23066,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_expat_XML_ParserCreate" >&5 $as_echo "$ac_cv_lib_expat_XML_ParserCreate" >&6; } -if test "x$ac_cv_lib_expat_XML_ParserCreate" = x""yes; then : +if test "x$ac_cv_lib_expat_XML_ParserCreate" = xyes; then : EXPAT_LINK=" -lexpat" fi @@ -22842,7 +23095,7 @@ fi if test "$wxUSE_LIBMSPACK" != "no"; then ac_fn_c_check_header_compile "$LINENO" "mspack.h" "ac_cv_header_mspack_h" " " -if test "x$ac_cv_header_mspack_h" = x""yes; then : +if test "x$ac_cv_header_mspack_h" = xyes; then : found_mspack_h=1 fi @@ -22850,7 +23103,7 @@ fi if test "x$found_mspack_h" = "x1"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mspack_create_chm_decompressor in -lmspack" >&5 $as_echo_n "checking for mspack_create_chm_decompressor in -lmspack... " >&6; } -if test "${ac_cv_lib_mspack_mspack_create_chm_decompressor+set}" = set; then : +if ${ac_cv_lib_mspack_mspack_create_chm_decompressor+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -22884,7 +23137,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mspack_mspack_create_chm_decompressor" >&5 $as_echo "$ac_cv_lib_mspack_mspack_create_chm_decompressor" >&6; } -if test "x$ac_cv_lib_mspack_mspack_create_chm_decompressor" = x""yes; then : +if test "x$ac_cv_lib_mspack_mspack_create_chm_decompressor" = xyes; then : MSPACK_LINK=" -lmspack" fi @@ -22901,9 +23154,6 @@ fi -AFMINSTALL= -WIN32INSTALL= - TOOLKIT= TOOLKIT_INCLUDE= WIDGET_SET= @@ -22913,7 +23163,7 @@ if test "$USE_WIN32" = 1 ; then do : ac_fn_c_check_header_compile "$LINENO" "w32api.h" "ac_cv_header_w32api_h" " " -if test "x$ac_cv_header_w32api_h" = x""yes; then : +if test "x$ac_cv_header_w32api_h" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_W32API_H 1 _ACEOF @@ -22924,7 +23174,7 @@ done ac_fn_c_check_header_compile "$LINENO" "windows.h" "ac_cv_header_windows_h" " " -if test "x$ac_cv_header_windows_h" = x""yes; then : +if test "x$ac_cv_header_windows_h" = xyes; then : else @@ -22937,8 +23187,7 @@ fi LIBS="$LIBS -lwinspool -lwinmm -lshell32 -lcomctl32 -lcomdlg32 -ladvapi32 -lwsock32 -lgdi32" case "${host}" in x86_64-*-mingw32* ) - WINDRES_CPU_DEFINE="--define WX_CPU_AMD64" - ;; + ;; esac if test "$wxUSE_ACCESSIBILITY" = "yes" ; then LIBS="$LIBS -loleacc" @@ -22949,12 +23198,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 @@ -23001,7 +23245,7 @@ $as_echo "$as_me: WARNING: wxDragImage not supported under wxCocoa yet, disabled $as_echo_n "checking for GTK+ version... " >&6; } gtk_version_cached=1 - if test "${wx_cv_lib_gtk+set}" = set; then : + if ${wx_cv_lib_gtk+:} false; then : $as_echo_n "(cached) " >&6 else @@ -23053,7 +23297,7 @@ fi set dummy pkg-config; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : +if ${ac_cv_path_PKG_CONFIG+:} false; then : $as_echo_n "(cached) " >&6 else case $PKG_CONFIG in @@ -23067,7 +23311,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -23103,7 +23347,7 @@ fi no_gtk=yes fi - min_gtk_version=2.4.0 + min_gtk_version=2.6.0 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK+ - version >= $min_gtk_version" >&5 $as_echo_n "checking for GTK+ - version >= $min_gtk_version... " >&6; } @@ -23299,12 +23543,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 @@ -23315,7 +23561,7 @@ fi set dummy pkg-config; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : +if ${ac_cv_path_PKG_CONFIG+:} false; then : $as_echo_n "(cached) " >&6 else case $PKG_CONFIG in @@ -23329,7 +23575,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -23375,8 +23621,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 @@ -23606,7 +23851,7 @@ fi set dummy gtk-config; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_GTK_CONFIG+set}" = set; then : +if ${ac_cv_path_GTK_CONFIG+:} false; then : $as_echo_n "(cached) " >&6 else case $GTK_CONFIG in @@ -23620,7 +23865,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_GTK_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -23878,7 +24123,7 @@ fi set dummy gtk-config; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_GTK_CONFIG+set}" = set; then : +if ${ac_cv_path_GTK_CONFIG+:} false; then : $as_echo_n "(cached) " >&6 else case $GTK_CONFIG in @@ -23892,7 +24137,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_GTK_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -24147,8 +24392,6 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config $as_echo "#define __WXGTK210__ 1" >>confdefs.h - $as_echo "#define __WXGTK26__ 1" >>confdefs.h - elif test "$WXGTK2" = 1; then save_CFLAGS="$CFLAGS" save_LIBS="$LIBS" @@ -24180,8 +24423,6 @@ if ac_fn_c_try_compile "$LINENO"; then : $as_echo "#define __WXGTK210__ 1" >>confdefs.h - $as_echo "#define __WXGTK26__ 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } ac_wxgtk218=1 @@ -24219,8 +24460,6 @@ if ac_fn_c_try_compile "$LINENO"; then : $as_echo "#define __WXGTK210__ 1" >>confdefs.h - $as_echo "#define __WXGTK26__ 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } ac_wxgtk210=1 @@ -24233,44 +24472,6 @@ $as_echo "no" >&6; } fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - - if test "$ac_wxgtk210" = 0; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if GTK+ is version >= 2.6" >&5 -$as_echo_n "checking if GTK+ is version >= 2.6... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - #include - -int -main () -{ - - #if !GTK_CHECK_VERSION(2,6,0) - Not GTK+ 2.6 - #endif - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - - $as_echo "#define __WXGTK26__ 1" >>confdefs.h - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - ac_wxgtk26=1 - -else - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - ac_wxgtk26=0 - -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi fi CFLAGS="$save_CFLAGS" @@ -24284,7 +24485,7 @@ $as_echo "$as_me: WARNING: Unicode configuration not supported with GTK+ 1.x" >& { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdk_im_open in -lgdk" >&5 $as_echo_n "checking for gdk_im_open in -lgdk... " >&6; } -if test "${ac_cv_lib_gdk_gdk_im_open+set}" = set; then : +if ${ac_cv_lib_gdk_gdk_im_open+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -24318,7 +24519,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gdk_gdk_im_open" >&5 $as_echo "$ac_cv_lib_gdk_gdk_im_open" >&6; } -if test "x$ac_cv_lib_gdk_gdk_im_open" = x""yes; then : +if test "x$ac_cv_lib_gdk_gdk_im_open" = xyes; then : $as_echo "#define HAVE_XIM 1" >>confdefs.h fi @@ -24328,7 +24529,7 @@ fi for ac_func in poll do : ac_fn_c_check_func "$LINENO" "poll" "ac_cv_func_poll" -if test "x$ac_cv_func_poll" = x""yes; then : +if test "x$ac_cv_func_poll" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_POLL 1 _ACEOF @@ -24341,7 +24542,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 @@ -24395,7 +24595,7 @@ if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : +if ${ac_cv_path_PKG_CONFIG+:} false; then : $as_echo_n "(cached) " >&6 else case $PKG_CONFIG in @@ -24409,7 +24609,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -24438,7 +24638,7 @@ if test -z "$ac_cv_path_PKG_CONFIG"; then set dummy pkg-config; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then : +if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : $as_echo_n "(cached) " >&6 else case $ac_pt_PKG_CONFIG in @@ -24452,7 +24652,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -24611,7 +24811,6 @@ $as_echo "MicroWindows' libraries found." >&6; } wxUSE_UNIVERSAL="yes" - AFMINSTALL=afminstall TOOLKIT=MICROWIN GUIDIST=MICROWIN_DIST @@ -24634,8 +24833,8 @@ if test "x$with_x" = xno; then have_x=disabled else case $x_includes,$x_libraries in #( - *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5 ;; #( - *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then : + *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5;; #( + *,NONE | NONE,*) if ${ac_cv_have_x+:} false; then : $as_echo_n "(cached) " >&6 else # One or both of the vars are not set, and there is no cached value. @@ -24912,7 +25111,7 @@ if ac_fn_c_try_link "$LINENO"; then : else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet" >&5 $as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; } -if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then : +if ${ac_cv_lib_dnet_dnet_ntoa+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -24946,14 +25145,14 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 $as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; } -if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""yes; then : +if test "x$ac_cv_lib_dnet_dnet_ntoa" = xyes; then : X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" fi if test $ac_cv_lib_dnet_dnet_ntoa = no; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet_stub" >&5 $as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; } -if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then : +if ${ac_cv_lib_dnet_stub_dnet_ntoa+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -24987,7 +25186,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 $as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; } -if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = x""yes; then : +if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = xyes; then : X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" fi @@ -25006,14 +25205,14 @@ rm -f core conftest.err conftest.$ac_objext \ # The functions gethostbyname, getservbyname, and inet_addr are # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking. ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname" -if test "x$ac_cv_func_gethostbyname" = x""yes; then : +if test "x$ac_cv_func_gethostbyname" = xyes; then : fi if test $ac_cv_func_gethostbyname = no; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5 $as_echo_n "checking for gethostbyname in -lnsl... " >&6; } -if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then : +if ${ac_cv_lib_nsl_gethostbyname+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -25047,14 +25246,14 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5 $as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; } -if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then : +if test "x$ac_cv_lib_nsl_gethostbyname" = xyes; then : X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" fi if test $ac_cv_lib_nsl_gethostbyname = no; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lbsd" >&5 $as_echo_n "checking for gethostbyname in -lbsd... " >&6; } -if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then : +if ${ac_cv_lib_bsd_gethostbyname+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -25088,7 +25287,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_gethostbyname" >&5 $as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; } -if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then : +if test "x$ac_cv_lib_bsd_gethostbyname" = xyes; then : X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd" fi @@ -25103,14 +25302,14 @@ fi # must be given before -lnsl if both are needed. We assume that # if connect needs -lnsl, so does gethostbyname. ac_fn_c_check_func "$LINENO" "connect" "ac_cv_func_connect" -if test "x$ac_cv_func_connect" = x""yes; then : +if test "x$ac_cv_func_connect" = xyes; then : fi if test $ac_cv_func_connect = no; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5 $as_echo_n "checking for connect in -lsocket... " >&6; } -if test "${ac_cv_lib_socket_connect+set}" = set; then : +if ${ac_cv_lib_socket_connect+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -25144,7 +25343,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_connect" >&5 $as_echo "$ac_cv_lib_socket_connect" >&6; } -if test "x$ac_cv_lib_socket_connect" = x""yes; then : +if test "x$ac_cv_lib_socket_connect" = xyes; then : X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" fi @@ -25152,14 +25351,14 @@ fi # Guillermo Gomez says -lposix is necessary on A/UX. ac_fn_c_check_func "$LINENO" "remove" "ac_cv_func_remove" -if test "x$ac_cv_func_remove" = x""yes; then : +if test "x$ac_cv_func_remove" = xyes; then : fi if test $ac_cv_func_remove = no; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for remove in -lposix" >&5 $as_echo_n "checking for remove in -lposix... " >&6; } -if test "${ac_cv_lib_posix_remove+set}" = set; then : +if ${ac_cv_lib_posix_remove+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -25193,7 +25392,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix_remove" >&5 $as_echo "$ac_cv_lib_posix_remove" >&6; } -if test "x$ac_cv_lib_posix_remove" = x""yes; then : +if test "x$ac_cv_lib_posix_remove" = xyes; then : X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" fi @@ -25201,14 +25400,14 @@ fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. ac_fn_c_check_func "$LINENO" "shmat" "ac_cv_func_shmat" -if test "x$ac_cv_func_shmat" = x""yes; then : +if test "x$ac_cv_func_shmat" = xyes; then : fi if test $ac_cv_func_shmat = no; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shmat in -lipc" >&5 $as_echo_n "checking for shmat in -lipc... " >&6; } -if test "${ac_cv_lib_ipc_shmat+set}" = set; then : +if ${ac_cv_lib_ipc_shmat+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -25242,7 +25441,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ipc_shmat" >&5 $as_echo "$ac_cv_lib_ipc_shmat" >&6; } -if test "x$ac_cv_lib_ipc_shmat" = x""yes; then : +if test "x$ac_cv_lib_ipc_shmat" = xyes; then : X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" fi @@ -25260,7 +25459,7 @@ fi # John Interrante, Karl Berry { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IceConnectionNumber in -lICE" >&5 $as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; } -if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then : +if ${ac_cv_lib_ICE_IceConnectionNumber+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -25294,7 +25493,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 $as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; } -if test "x$ac_cv_lib_ICE_IceConnectionNumber" = x""yes; then : +if test "x$ac_cv_lib_ICE_IceConnectionNumber" = xyes; then : X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" fi @@ -25309,7 +25508,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 @@ -25339,7 +25537,7 @@ if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : +if ${ac_cv_path_PKG_CONFIG+:} false; then : $as_echo_n "(cached) " >&6 else case $PKG_CONFIG in @@ -25353,7 +25551,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -25382,7 +25580,7 @@ if test -z "$ac_cv_path_PKG_CONFIG"; then set dummy pkg-config; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then : +if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : $as_echo_n "(cached) " >&6 else case $ac_pt_PKG_CONFIG in @@ -25396,7 +25594,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -25698,7 +25896,7 @@ fi for ac_func in pango_font_family_is_monospace do : ac_fn_c_check_func "$LINENO" "pango_font_family_is_monospace" "ac_cv_func_pango_font_family_is_monospace" -if test "x$ac_cv_func_pango_font_family_is_monospace" = x""yes; then : +if test "x$ac_cv_func_pango_font_family_is_monospace" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_PANGO_FONT_FAMILY_IS_MONOSPACE 1 _ACEOF @@ -25929,7 +26127,7 @@ $as_echo "can't find the right libraries" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SgCreateList in -lSgm" >&5 $as_echo_n "checking for SgCreateList in -lSgm... " >&6; } -if test "${ac_cv_lib_Sgm_SgCreateList+set}" = set; then : +if ${ac_cv_lib_Sgm_SgCreateList+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -25963,7 +26161,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Sgm_SgCreateList" >&5 $as_echo "$ac_cv_lib_Sgm_SgCreateList" >&6; } -if test "x$ac_cv_lib_Sgm_SgCreateList" = x""yes; then : +if test "x$ac_cv_lib_Sgm_SgCreateList" = xyes; then : libsgm_link=" -lSgm" fi @@ -25973,7 +26171,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Motif 2" >&5 $as_echo_n "checking for Motif 2... " >&6; } -if test "${wx_cv_lib_motif2+set}" = set; then : +if ${wx_cv_lib_motif2+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -26012,7 +26210,7 @@ $as_echo "$wx_cv_lib_motif2" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether Motif is Lesstif" >&5 $as_echo_n "checking whether Motif is Lesstif... " >&6; } -if test "${wx_cv_lib_lesstif+set}" = set; then : +if ${wx_cv_lib_lesstif+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -26093,7 +26291,7 @@ $as_echo "found in $ac_find_libraries" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking for X11/xpm.h" >&5 $as_echo_n "checking for X11/xpm.h... " >&6; } -if test "${wx_cv_x11_xpm_h+set}" = set; then : +if ${wx_cv_x11_xpm_h+:} false; then : $as_echo_n "(cached) " >&6 else @@ -26145,7 +26343,7 @@ $as_echo "$as_me: WARNING: built-in less efficient XPM decoder will be used" >&2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XShapeQueryExtension in -lXext" >&5 $as_echo_n "checking for XShapeQueryExtension in -lXext... " >&6; } -if test "${ac_cv_lib_Xext_XShapeQueryExtension+set}" = set; then : +if ${ac_cv_lib_Xext_XShapeQueryExtension+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -26179,7 +26377,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xext_XShapeQueryExtension" >&5 $as_echo "$ac_cv_lib_Xext_XShapeQueryExtension" >&6; } -if test "x$ac_cv_lib_Xext_XShapeQueryExtension" = x""yes; then : +if test "x$ac_cv_lib_Xext_XShapeQueryExtension" = xyes; then : GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXext" wxHAVE_XEXT_LIB=1 @@ -26280,7 +26478,7 @@ $as_echo "none" >&6; } GUIDIST=PM_DIST { $as_echo "$as_me:${as_lineno-$LINENO}: checking for type SPBCDATA" >&5 $as_echo_n "checking for type SPBCDATA... " >&6; } -if test "${wx_cv_spbcdata+set}" = set; then : +if ${wx_cv_spbcdata+:} false; then : $as_echo_n "(cached) " >&6 else @@ -26353,7 +26551,7 @@ if test "$wxUSE_GUI" = "yes"; then do : ac_fn_c_check_header_compile "$LINENO" "X11/Xlib.h" "ac_cv_header_X11_Xlib_h" " " -if test "x$ac_cv_header_X11_Xlib_h" = x""yes; then : +if test "x$ac_cv_header_X11_Xlib_h" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_X11_XLIB_H 1 _ACEOF @@ -26370,7 +26568,7 @@ do : #endif " -if test "x$ac_cv_header_X11_XKBlib_h" = x""yes; then : +if test "x$ac_cv_header_X11_XKBlib_h" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_X11_XKBLIB_H 1 _ACEOF @@ -26399,7 +26597,7 @@ if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : +if ${ac_cv_path_PKG_CONFIG+:} false; then : $as_echo_n "(cached) " >&6 else case $PKG_CONFIG in @@ -26413,7 +26611,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -26442,7 +26640,7 @@ if test -z "$ac_cv_path_PKG_CONFIG"; then set dummy pkg-config; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then : +if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : $as_echo_n "(cached) " >&6 else case $ac_pt_PKG_CONFIG in @@ -26456,7 +26654,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -26571,7 +26769,7 @@ fi if test "xXineramaQueryScreens" != "x"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XineramaQueryScreens in -lXinerama" >&5 $as_echo_n "checking for XineramaQueryScreens in -lXinerama... " >&6; } -if test "${ac_cv_lib_Xinerama_XineramaQueryScreens+set}" = set; then : +if ${ac_cv_lib_Xinerama_XineramaQueryScreens+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -26605,7 +26803,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xinerama_XineramaQueryScreens" >&5 $as_echo "$ac_cv_lib_Xinerama_XineramaQueryScreens" >&6; } -if test "x$ac_cv_lib_Xinerama_XineramaQueryScreens" = x""yes; then : +if test "x$ac_cv_lib_Xinerama_XineramaQueryScreens" = xyes; then : ac_find_libraries="std" fi @@ -26642,7 +26840,7 @@ elif test $pkg_failed = untried; then if test "xXineramaQueryScreens" != "x"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XineramaQueryScreens in -lXinerama" >&5 $as_echo_n "checking for XineramaQueryScreens in -lXinerama... " >&6; } -if test "${ac_cv_lib_Xinerama_XineramaQueryScreens+set}" = set; then : +if ${ac_cv_lib_Xinerama_XineramaQueryScreens+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -26676,7 +26874,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xinerama_XineramaQueryScreens" >&5 $as_echo "$ac_cv_lib_Xinerama_XineramaQueryScreens" >&6; } -if test "x$ac_cv_lib_Xinerama_XineramaQueryScreens" = x""yes; then : +if test "x$ac_cv_lib_Xinerama_XineramaQueryScreens" = xyes; then : ac_find_libraries="std" fi @@ -26756,7 +26954,7 @@ $as_echo "$as_me: WARNING: Xinerama not found; disabling wxDisplay" >&2;} elif test "$wxUSE_MSW" = 1; then ac_fn_c_check_header_compile "$LINENO" "ddraw.h" "ac_cv_header_ddraw_h" "#include " -if test "x$ac_cv_header_ddraw_h" = x""yes; then : +if test "x$ac_cv_header_ddraw_h" = xyes; then : fi @@ -26778,7 +26976,7 @@ if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : +if ${ac_cv_path_PKG_CONFIG+:} false; then : $as_echo_n "(cached) " >&6 else case $PKG_CONFIG in @@ -26792,7 +26990,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -26821,7 +27019,7 @@ if test -z "$ac_cv_path_PKG_CONFIG"; then set dummy pkg-config; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then : +if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : $as_echo_n "(cached) " >&6 else case $ac_pt_PKG_CONFIG in @@ -26835,7 +27033,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -26950,7 +27148,7 @@ fi if test "xXF86VidModeQueryExtension" != "x"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XF86VidModeQueryExtension in -lXxf86vm" >&5 $as_echo_n "checking for XF86VidModeQueryExtension in -lXxf86vm... " >&6; } -if test "${ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension+set}" = set; then : +if ${ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -26984,7 +27182,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension" >&5 $as_echo "$ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension" >&6; } -if test "x$ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension" = x""yes; then : +if test "x$ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension" = xyes; then : ac_find_libraries="std" fi @@ -27021,7 +27219,7 @@ elif test $pkg_failed = untried; then if test "xXF86VidModeQueryExtension" != "x"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XF86VidModeQueryExtension in -lXxf86vm" >&5 $as_echo_n "checking for XF86VidModeQueryExtension in -lXxf86vm... " >&6; } -if test "${ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension+set}" = set; then : +if ${ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -27055,7 +27253,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension" >&5 $as_echo "$ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension" >&6; } -if test "x$ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension" = x""yes; then : +if test "x$ac_cv_lib_Xxf86vm_XF86VidModeQueryExtension" = xyes; then : ac_find_libraries="std" fi @@ -27115,7 +27313,7 @@ do : #endif " -if test "x$ac_cv_header_X11_extensions_xf86vmode_h" = x""yes; then : +if test "x$ac_cv_header_X11_extensions_xf86vmode_h" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_X11_EXTENSIONS_XF86VMODE_H 1 _ACEOF @@ -27144,7 +27342,7 @@ if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : +if ${ac_cv_path_PKG_CONFIG+:} false; then : $as_echo_n "(cached) " >&6 else case $PKG_CONFIG in @@ -27158,7 +27356,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -27187,7 +27385,7 @@ if test -z "$ac_cv_path_PKG_CONFIG"; then set dummy pkg-config; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then : +if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : $as_echo_n "(cached) " >&6 else case $ac_pt_PKG_CONFIG in @@ -27201,7 +27399,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -27316,7 +27514,7 @@ fi if test "xSmcOpenConnection" != "x"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SmcOpenConnection in -lSM" >&5 $as_echo_n "checking for SmcOpenConnection in -lSM... " >&6; } -if test "${ac_cv_lib_SM_SmcOpenConnection+set}" = set; then : +if ${ac_cv_lib_SM_SmcOpenConnection+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -27350,7 +27548,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_SM_SmcOpenConnection" >&5 $as_echo "$ac_cv_lib_SM_SmcOpenConnection" >&6; } -if test "x$ac_cv_lib_SM_SmcOpenConnection" = x""yes; then : +if test "x$ac_cv_lib_SM_SmcOpenConnection" = xyes; then : ac_find_libraries="std" fi @@ -27387,7 +27585,7 @@ elif test $pkg_failed = untried; then if test "xSmcOpenConnection" != "x"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SmcOpenConnection in -lSM" >&5 $as_echo_n "checking for SmcOpenConnection in -lSM... " >&6; } -if test "${ac_cv_lib_SM_SmcOpenConnection+set}" = set; then : +if ${ac_cv_lib_SM_SmcOpenConnection+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -27421,7 +27619,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_SM_SmcOpenConnection" >&5 $as_echo "$ac_cv_lib_SM_SmcOpenConnection" >&6; } -if test "x$ac_cv_lib_SM_SmcOpenConnection" = x""yes; then : +if test "x$ac_cv_lib_SM_SmcOpenConnection" = xyes; then : ac_find_libraries="std" fi @@ -27550,11 +27748,11 @@ $as_echo "not found" >&6; } ac_fn_c_check_header_compile "$LINENO" "GL/gl.h" "ac_cv_header_GL_gl_h" " " -if test "x$ac_cv_header_GL_gl_h" = x""yes; then : +if test "x$ac_cv_header_GL_gl_h" = xyes; then : ac_fn_c_check_header_compile "$LINENO" "GL/glu.h" "ac_cv_header_GL_glu_h" " " -if test "x$ac_cv_header_GL_glu_h" = x""yes; then : +if test "x$ac_cv_header_GL_glu_h" = xyes; then : found_gl=0 @@ -27570,7 +27768,7 @@ if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : +if ${ac_cv_path_PKG_CONFIG+:} false; then : $as_echo_n "(cached) " >&6 else case $PKG_CONFIG in @@ -27584,7 +27782,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -27613,7 +27811,7 @@ if test -z "$ac_cv_path_PKG_CONFIG"; then set dummy pkg-config; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then : +if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : $as_echo_n "(cached) " >&6 else case $ac_pt_PKG_CONFIG in @@ -27627,7 +27825,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -27742,7 +27940,7 @@ fi if test "xglBegin" != "x"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for glBegin in -lGL" >&5 $as_echo_n "checking for glBegin in -lGL... " >&6; } -if test "${ac_cv_lib_GL_glBegin+set}" = set; then : +if ${ac_cv_lib_GL_glBegin+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -27776,7 +27974,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_GL_glBegin" >&5 $as_echo "$ac_cv_lib_GL_glBegin" >&6; } -if test "x$ac_cv_lib_GL_glBegin" = x""yes; then : +if test "x$ac_cv_lib_GL_glBegin" = xyes; then : ac_find_libraries="std" fi @@ -27813,7 +28011,7 @@ elif test $pkg_failed = untried; then if test "xglBegin" != "x"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for glBegin in -lGL" >&5 $as_echo_n "checking for glBegin in -lGL... " >&6; } -if test "${ac_cv_lib_GL_glBegin+set}" = set; then : +if ${ac_cv_lib_GL_glBegin+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -27847,7 +28045,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_GL_glBegin" >&5 $as_echo "$ac_cv_lib_GL_glBegin" >&6; } -if test "x$ac_cv_lib_GL_glBegin" = x""yes; then : +if test "x$ac_cv_lib_GL_glBegin" = xyes; then : ac_find_libraries="std" fi @@ -27930,7 +28128,7 @@ if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : +if ${ac_cv_path_PKG_CONFIG+:} false; then : $as_echo_n "(cached) " >&6 else case $PKG_CONFIG in @@ -27944,7 +28142,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -27973,7 +28171,7 @@ if test -z "$ac_cv_path_PKG_CONFIG"; then set dummy pkg-config; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then : +if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : $as_echo_n "(cached) " >&6 else case $ac_pt_PKG_CONFIG in @@ -27987,7 +28185,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -28102,7 +28300,7 @@ fi if test "xgluBeginCurve" != "x"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gluBeginCurve in -lGLU" >&5 $as_echo_n "checking for gluBeginCurve in -lGLU... " >&6; } -if test "${ac_cv_lib_GLU_gluBeginCurve+set}" = set; then : +if ${ac_cv_lib_GLU_gluBeginCurve+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -28136,7 +28334,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_GLU_gluBeginCurve" >&5 $as_echo "$ac_cv_lib_GLU_gluBeginCurve" >&6; } -if test "x$ac_cv_lib_GLU_gluBeginCurve" = x""yes; then : +if test "x$ac_cv_lib_GLU_gluBeginCurve" = xyes; then : ac_find_libraries="std" fi @@ -28173,7 +28371,7 @@ elif test $pkg_failed = untried; then if test "xgluBeginCurve" != "x"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gluBeginCurve in -lGLU" >&5 $as_echo_n "checking for gluBeginCurve in -lGLU... " >&6; } -if test "${ac_cv_lib_GLU_gluBeginCurve+set}" = set; then : +if ${ac_cv_lib_GLU_gluBeginCurve+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -28207,7 +28405,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_GLU_gluBeginCurve" >&5 $as_echo "$ac_cv_lib_GLU_gluBeginCurve" >&6; } -if test "x$ac_cv_lib_GLU_gluBeginCurve" = x""yes; then : +if test "x$ac_cv_lib_GLU_gluBeginCurve" = xyes; then : ac_find_libraries="std" fi @@ -28297,7 +28495,7 @@ if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : +if ${ac_cv_path_PKG_CONFIG+:} false; then : $as_echo_n "(cached) " >&6 else case $PKG_CONFIG in @@ -28311,7 +28509,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -28340,7 +28538,7 @@ if test -z "$ac_cv_path_PKG_CONFIG"; then set dummy pkg-config; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then : +if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : $as_echo_n "(cached) " >&6 else case $ac_pt_PKG_CONFIG in @@ -28354,7 +28552,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -28469,7 +28667,7 @@ fi if test "xglEnable" != "x"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for glEnable in -lMesaGL" >&5 $as_echo_n "checking for glEnable in -lMesaGL... " >&6; } -if test "${ac_cv_lib_MesaGL_glEnable+set}" = set; then : +if ${ac_cv_lib_MesaGL_glEnable+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -28503,7 +28701,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_MesaGL_glEnable" >&5 $as_echo "$ac_cv_lib_MesaGL_glEnable" >&6; } -if test "x$ac_cv_lib_MesaGL_glEnable" = x""yes; then : +if test "x$ac_cv_lib_MesaGL_glEnable" = xyes; then : ac_find_libraries="std" fi @@ -28540,7 +28738,7 @@ elif test $pkg_failed = untried; then if test "xglEnable" != "x"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for glEnable in -lMesaGL" >&5 $as_echo_n "checking for glEnable in -lMesaGL... " >&6; } -if test "${ac_cv_lib_MesaGL_glEnable+set}" = set; then : +if ${ac_cv_lib_MesaGL_glEnable+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -28574,7 +28772,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_MesaGL_glEnable" >&5 $as_echo "$ac_cv_lib_MesaGL_glEnable" >&6; } -if test "x$ac_cv_lib_MesaGL_glEnable" = x""yes; then : +if test "x$ac_cv_lib_MesaGL_glEnable" = xyes; then : ac_find_libraries="std" fi @@ -28714,7 +28912,7 @@ if test "$wxUSE_SHARED" = "yes"; then *) { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker accepts --version-script" >&5 $as_echo_n "checking if the linker accepts --version-script... " >&6; } -if test "${wx_cv_version_script+set}" = set; then : +if ${wx_cv_version_script+:} false; then : $as_echo_n "(cached) " >&6 else @@ -28799,7 +28997,7 @@ $as_echo "$wx_cv_version_script" >&6; } CXXFLAGS_VISIBILITY="-fvisibility=hidden -fvisibility-inlines-hidden" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for symbols visibility support" >&5 $as_echo_n "checking for symbols visibility support... " >&6; } - if test "${wx_cv_cc_visibility+set}" = set; then : + if ${wx_cv_cc_visibility+:} false; then : $as_echo_n "(cached) " >&6 else @@ -28866,7 +29064,7 @@ $as_echo "$wx_cv_cc_visibility" >&6; } if test $wx_cv_cc_visibility = yes; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for broken libstdc++ visibility" >&5 $as_echo_n "checking for broken libstdc++ visibility... " >&6; } - if test "${wx_cv_cc_broken_libstdcxx_visibility+set}" = set; then : + if ${wx_cv_cc_broken_libstdcxx_visibility+:} false; then : $as_echo_n "(cached) " >&6 else @@ -28919,7 +29117,7 @@ $as_echo "$wx_cv_cc_broken_libstdcxx_visibility" >&6; } if test $wx_cv_cc_broken_libstdcxx_visibility = yes; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we can work around it" >&5 $as_echo_n "checking whether we can work around it... " >&6; } - if test "${wx_cv_cc_visibility_workaround+set}" = set; then : + if ${wx_cv_cc_visibility_workaround+:} false; then : $as_echo_n "(cached) " >&6 else @@ -29071,16 +29269,18 @@ rm -f core conftest.err conftest.$ac_objext \ DYLIB_RPATH_POSTLINK="${HOST_PREFIX}install_name_tool -id \$@ \$@" cat <change-install-names #!/bin/sh -libnames=\`cd \${2} ; ls -1 | grep '\.[0-9][0-9]*\.dylib\$'\` +libnames=\`cd \${1} ; ls -1 | grep '\.[0-9][0-9]*\.dylib\$'\` +changes='' +for dep in \${libnames} ; do + changes="\${changes} -change \${4}/\${dep} \${3}/\${dep}" +done for i in \${libnames} ; do - ${HOST_PREFIX}install_name_tool -id \${3}/\${i} \${1}/\${i} - for dep in \${libnames} ; do - ${HOST_PREFIX}install_name_tool -change \${2}/\${dep} \${3}/\${dep} \${1}/\${i} - done + ${HOST_PREFIX}install_name_tool \${changes} -id \${3}/\${i} \${1}/\${i} done +${HOST_PREFIX}install_name_tool \${changes} \${2}/wxrc-${WX_RELEASE} EOF chmod +x change-install-names - DYLIB_RPATH_INSTALL="\$(wx_top_builddir)/change-install-names \${DESTDIR}\${libdir} \$(wx_top_builddir)/lib \${libdir}" + DYLIB_RPATH_INSTALL="\$(wx_top_builddir)/change-install-names \${DESTDIR}\${libdir} \${DESTDIR}\${bindir} \${libdir} \$(wx_top_builddir)/lib" fi HEADER_PAD_OPTION="-headerpad_max_install_names" @@ -29209,7 +29409,7 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "no -See \`config.log' for more details" "$LINENO" 5 ; } +See \`config.log' for more details" "$LINENO" 5; } fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext @@ -29226,7 +29426,7 @@ fi ac_fn_c_check_type "$LINENO" "mode_t" "ac_cv_type_mode_t" "$ac_includes_default" -if test "x$ac_cv_type_mode_t" = x""yes; then : +if test "x$ac_cv_type_mode_t" = xyes; then : else @@ -29237,7 +29437,7 @@ _ACEOF fi ac_fn_c_check_type "$LINENO" "off_t" "ac_cv_type_off_t" "$ac_includes_default" -if test "x$ac_cv_type_off_t" = x""yes; then : +if test "x$ac_cv_type_off_t" = xyes; then : else @@ -29248,7 +29448,7 @@ _ACEOF fi ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default" -if test "x$ac_cv_type_pid_t" = x""yes; then : +if test "x$ac_cv_type_pid_t" = xyes; then : else @@ -29259,7 +29459,7 @@ _ACEOF fi ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default" -if test "x$ac_cv_type_size_t" = x""yes; then : +if test "x$ac_cv_type_size_t" = xyes; then : else @@ -29271,7 +29471,7 @@ fi ac_fn_c_check_type "$LINENO" "ssize_t" "ac_cv_type_ssize_t" "$ac_includes_default" -if test "x$ac_cv_type_ssize_t" = x""yes; then : +if test "x$ac_cv_type_ssize_t" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_SSIZE_T 1 @@ -29288,7 +29488,7 @@ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ex ac_compiler_gnu=$ac_cv_cxx_compiler_gnu { $as_echo "$as_me:${as_lineno-$LINENO}: checking if size_t is unsigned int" >&5 $as_echo_n "checking if size_t is unsigned int... " >&6; } -if test "${wx_cv_size_t_is_uint+set}" = set; then : +if ${wx_cv_size_t_is_uint+:} false; then : $as_echo_n "(cached) " >&6 else @@ -29328,7 +29528,7 @@ if test "$wx_cv_size_t_is_uint" = "yes"; then else { $as_echo "$as_me:${as_lineno-$LINENO}: checking if size_t is unsigned long" >&5 $as_echo_n "checking if size_t is unsigned long... " >&6; } -if test "${wx_cv_size_t_is_ulong+set}" = set; then : +if ${wx_cv_size_t_is_ulong+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -29368,7 +29568,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking if wchar_t is separate type" >&5 $as_echo_n "checking if wchar_t is separate type... " >&6; } -if test "${wx_cv_wchar_t_is_separate_type+set}" = set; then : +if ${wx_cv_wchar_t_is_separate_type+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -29420,7 +29620,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pw_gecos in struct passwd" >&5 $as_echo_n "checking for pw_gecos in struct passwd... " >&6; } -if test "${wx_cv_struct_pw_gecos+set}" = set; then : +if ${wx_cv_struct_pw_gecos+:} false; then : $as_echo_n "(cached) " >&6 else @@ -29467,7 +29667,7 @@ WCHAR_LINK= for ac_func in wcslen do : ac_fn_c_check_func "$LINENO" "wcslen" "ac_cv_func_wcslen" -if test "x$ac_cv_func_wcslen" = x""yes; then : +if test "x$ac_cv_func_wcslen" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_WCSLEN 1 _ACEOF @@ -29480,7 +29680,7 @@ if test "$WCSLEN_FOUND" = 0; then if test "$TOOLKIT" = "MSW"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wcslen in -lmsvcrt" >&5 $as_echo_n "checking for wcslen in -lmsvcrt... " >&6; } -if test "${ac_cv_lib_msvcrt_wcslen+set}" = set; then : +if ${ac_cv_lib_msvcrt_wcslen+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -29514,14 +29714,14 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_msvcrt_wcslen" >&5 $as_echo "$ac_cv_lib_msvcrt_wcslen" >&6; } -if test "x$ac_cv_lib_msvcrt_wcslen" = x""yes; then : +if test "x$ac_cv_lib_msvcrt_wcslen" = xyes; then : WCHAR_OK=1 fi else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wcslen in -lw" >&5 $as_echo_n "checking for wcslen in -lw... " >&6; } -if test "${ac_cv_lib_w_wcslen+set}" = set; then : +if ${ac_cv_lib_w_wcslen+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -29555,7 +29755,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_w_wcslen" >&5 $as_echo "$ac_cv_lib_w_wcslen" >&6; } -if test "x$ac_cv_lib_w_wcslen" = x""yes; then : +if test "x$ac_cv_lib_w_wcslen" = xyes; then : WCHAR_LINK=" -lw" WCSLEN_FOUND=1 @@ -29570,7 +29770,20 @@ if test "$WCSLEN_FOUND" = 1; then fi -for ac_func in wcsdup wcsftime strnlen wcsnlen wcscasecmp wcsncasecmp +for ac_func in wcsftime +do : + ac_fn_c_check_func "$LINENO" "wcsftime" "ac_cv_func_wcsftime" +if test "x$ac_cv_func_wcsftime" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_WCSFTIME 1 +_ACEOF + +fi +done + + +if test "$wxUSE_MAC" != 1; then + for ac_func in strnlen wcsdup wcsnlen wcscasecmp wcsncasecmp do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" @@ -29582,6 +29795,7 @@ _ACEOF fi done +fi if test "$USE_HPUX" = 1 -a "$GCC" != "yes"; then CPPFLAGS="-D_INCLUDE__STDC_A1_SOURCE $CPPFLAGS" @@ -29589,7 +29803,7 @@ fi ac_fn_c_check_type "$LINENO" "mbstate_t" "ac_cv_type_mbstate_t" "#include " -if test "x$ac_cv_type_mbstate_t" = x""yes; then : +if test "x$ac_cv_type_mbstate_t" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_MBSTATE_T 1 @@ -29598,7 +29812,7 @@ _ACEOF for ac_func in wcsrtombs do : ac_fn_c_check_func "$LINENO" "wcsrtombs" "ac_cv_func_wcsrtombs" -if test "x$ac_cv_func_wcsrtombs" = x""yes; then : +if test "x$ac_cv_func_wcsrtombs" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_WCSRTOMBS 1 _ACEOF @@ -29631,7 +29845,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu if test "$ac_cv_func_vsnprintf" = "yes"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for vsnprintf declaration" >&5 $as_echo_n "checking for vsnprintf declaration... " >&6; } -if test "${wx_cv_func_vsnprintf_decl+set}" = set; then : +if ${wx_cv_func_vsnprintf_decl+:} false; then : $as_echo_n "(cached) " >&6 else @@ -29672,7 +29886,7 @@ $as_echo "$wx_cv_func_vsnprintf_decl" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking if vsnprintf declaration is broken" >&5 $as_echo_n "checking if vsnprintf declaration is broken... " >&6; } -if test "${wx_cv_func_broken_vsnprintf_decl+set}" = set; then : +if ${wx_cv_func_broken_vsnprintf_decl+:} false; then : $as_echo_n "(cached) " >&6 else @@ -29724,7 +29938,7 @@ fi if test "$ac_cv_func_snprintf" = "yes"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for snprintf declaration" >&5 $as_echo_n "checking for snprintf declaration... " >&6; } -if test "${wx_cv_func_snprintf_decl+set}" = set; then : +if ${wx_cv_func_snprintf_decl+:} false; then : $as_echo_n "(cached) " >&6 else @@ -29773,7 +29987,7 @@ $as_echo "$wx_cv_func_snprintf_decl" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking if snprintf supports positional arguments" >&5 $as_echo_n "checking if snprintf supports positional arguments... " >&6; } -if test "${wx_cv_func_snprintf_pos_params+set}" = set; then : +if ${wx_cv_func_snprintf_pos_params+:} false; then : $as_echo_n "(cached) " >&6 else @@ -29827,7 +30041,7 @@ fi if test "$ac_cv_func_vsscanf" = "yes"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for vsscanf declaration" >&5 $as_echo_n "checking for vsscanf declaration... " >&6; } -if test "${wx_cv_func_vsscanf_decl+set}" = set; then : +if ${wx_cv_func_vsscanf_decl+:} false; then : $as_echo_n "(cached) " >&6 else @@ -29890,7 +30104,7 @@ if test "$wxUSE_UNICODE" = yes; then do : ac_fn_c_check_header_compile "$LINENO" "widec.h" "ac_cv_header_widec_h" "$ac_includes_default " -if test "x$ac_cv_header_widec_h" = x""yes; then : +if test "x$ac_cv_header_widec_h" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_WIDEC_H 1 _ACEOF @@ -29910,7 +30124,7 @@ done do { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $wx_func" >&5 $as_echo_n "checking for $wx_func... " >&6; } -if eval "test \"\${wx_cv_func_$wx_func+set}\"" = set; then : +if eval \${wx_cv_func_$wx_func+:} false; then : $as_echo_n "(cached) " >&6 else @@ -29993,7 +30207,7 @@ if test "$wxUSE_FILE" = "yes"; then do { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $wx_func" >&5 $as_echo_n "checking for $wx_func... " >&6; } -if eval "test \"\${wx_cv_func_$wx_func+set}\"" = set; then : +if eval \${wx_cv_func_$wx_func+:} false; then : $as_echo_n "(cached) " >&6 else @@ -30057,7 +30271,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu do { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $wx_func" >&5 $as_echo_n "checking for $wx_func... " >&6; } -if eval "test \"\${wx_cv_func_$wx_func+set}\"" = set; then : +if eval \${wx_cv_func_$wx_func+:} false; then : $as_echo_n "(cached) " >&6 else @@ -30134,7 +30348,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5 $as_echo_n "checking for iconv... " >&6; } -if test "${am_cv_func_iconv+set}" = set; then : +if ${am_cv_func_iconv+:} false; then : $as_echo_n "(cached) " >&6 else @@ -30194,7 +30408,7 @@ $as_echo "#define HAVE_ICONV 1" >>confdefs.h { $as_echo "$as_me:${as_lineno-$LINENO}: checking if iconv needs const" >&5 $as_echo_n "checking if iconv needs const... " >&6; } -if test "${wx_cv_func_iconv_const+set}" = set; then : +if ${wx_cv_func_iconv_const+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -30256,7 +30470,7 @@ if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes" -a "$wxUSE_UNIX" = "yes"; then for ac_func in sigaction do : ac_fn_c_check_func "$LINENO" "sigaction" "ac_cv_func_sigaction" -if test "x$ac_cv_func_sigaction" = x""yes; then : +if test "x$ac_cv_func_sigaction" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_SIGACTION 1 _ACEOF @@ -30274,7 +30488,7 @@ $as_echo "$as_me: WARNING: No POSIX signal functions on this system, wxApp::OnFa if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sa_handler type" >&5 $as_echo_n "checking for sa_handler type... " >&6; } -if test "${wx_cv_type_sa_handler+set}" = set; then : +if ${wx_cv_type_sa_handler+:} false; then : $as_echo_n "(cached) " >&6 else @@ -30331,79 +30545,139 @@ fi if test "$wxUSE_STACKWALKER" = "yes" -a "$wxUSE_UNIX" = "yes"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for backtrace() in " >&5 $as_echo_n "checking for backtrace() in ... " >&6; } -if test "${wx_cv_func_backtrace+set}" = set; then : +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 test "${wx_cv_func_cxa_demangle+set}" = set; then : +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; @@ -30417,7 +30691,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' @@ -30428,6 +30702,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 @@ -30458,7 +30735,7 @@ done { $as_echo "$as_me:${as_lineno-$LINENO}: checking for statfs" >&5 $as_echo_n "checking for statfs... " >&6; } -if test "${wx_cv_func_statfs+set}" = set; then : +if ${wx_cv_func_statfs+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -30501,7 +30778,7 @@ $as_echo "$wx_cv_func_statfs" >&6; } if test "$wx_cv_func_statfs" = "yes"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for statfs declaration" >&5 $as_echo_n "checking for statfs declaration... " >&6; } -if test "${wx_cv_func_statfs_decl+set}" = set; then : +if ${wx_cv_func_statfs_decl+:} false; then : $as_echo_n "(cached) " >&6 else ac_ext=cpp @@ -30560,7 +30837,7 @@ $as_echo "$wx_cv_func_statfs_decl" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for statvfs" >&5 $as_echo_n "checking for statvfs... " >&6; } -if test "${wx_cv_func_statvfs+set}" = set; then : +if ${wx_cv_func_statvfs+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -30594,7 +30871,7 @@ $as_echo "$wx_cv_func_statvfs" >&6; } if test "$wx_cv_func_statvfs" = "yes"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for statvfs argument type" >&5 $as_echo_n "checking for statvfs argument type... " >&6; } -if test "${wx_cv_type_statvfs_t+set}" = set; then : +if ${wx_cv_type_statvfs_t+:} false; then : $as_echo_n "(cached) " >&6 else ac_ext=cpp @@ -30725,7 +31002,7 @@ if test "$ac_cv_func_setenv" = "yes"; then for ac_func in unsetenv do : ac_fn_c_check_func "$LINENO" "unsetenv" "ac_cv_func_unsetenv" -if test "x$ac_cv_func_unsetenv" = x""yes; then : +if test "x$ac_cv_func_unsetenv" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_UNSETENV 1 _ACEOF @@ -30753,7 +31030,7 @@ if test "$HAVE_SOME_SLEEP_FUNC" != 1; then for ac_func in nanosleep do : ac_fn_c_check_func "$LINENO" "nanosleep" "ac_cv_func_nanosleep" -if test "x$ac_cv_func_nanosleep" = x""yes; then : +if test "x$ac_cv_func_nanosleep" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_NANOSLEEP 1 _ACEOF @@ -30763,7 +31040,7 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nanosleep in -lposix4" >&5 $as_echo_n "checking for nanosleep in -lposix4... " >&6; } -if test "${ac_cv_lib_posix4_nanosleep+set}" = set; then : +if ${ac_cv_lib_posix4_nanosleep+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -30797,7 +31074,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix4_nanosleep" >&5 $as_echo "$ac_cv_lib_posix4_nanosleep" >&6; } -if test "x$ac_cv_lib_posix4_nanosleep" = x""yes; then : +if test "x$ac_cv_lib_posix4_nanosleep" = xyes; then : $as_echo "#define HAVE_NANOSLEEP 1" >>confdefs.h @@ -30810,7 +31087,7 @@ else do { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $wx_func" >&5 $as_echo_n "checking for $wx_func... " >&6; } -if eval "test \"\${wx_cv_func_$wx_func+set}\"" = set; then : +if eval \${wx_cv_func_$wx_func+:} false; then : $as_echo_n "(cached) " >&6 else @@ -30879,7 +31156,7 @@ fi do { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $wx_func" >&5 $as_echo_n "checking for $wx_func... " >&6; } -if eval "test \"\${wx_cv_func_$wx_func+set}\"" = set; then : +if eval \${wx_cv_func_$wx_func+:} false; then : $as_echo_n "(cached) " >&6 else @@ -30936,7 +31213,7 @@ if test "$wx_cv_func_uname" != yes; then do { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $wx_func" >&5 $as_echo_n "checking for $wx_func... " >&6; } -if eval "test \"\${wx_cv_func_$wx_func+set}\"" = set; then : +if eval \${wx_cv_func_$wx_func+:} false; then : $as_echo_n "(cached) " >&6 else @@ -30994,7 +31271,7 @@ fi do { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $wx_func" >&5 $as_echo_n "checking for $wx_func... " >&6; } -if eval "test \"\${wx_cv_func_$wx_func+set}\"" = set; then : +if eval \${wx_cv_func_$wx_func+:} false; then : $as_echo_n "(cached) " >&6 else @@ -31050,7 +31327,7 @@ INET_LINK= for ac_func in inet_addr do : ac_fn_c_check_func "$LINENO" "inet_addr" "ac_cv_func_inet_addr" -if test "x$ac_cv_func_inet_addr" = x""yes; then : +if test "x$ac_cv_func_inet_addr" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_INET_ADDR 1 _ACEOF @@ -31060,7 +31337,7 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inet_addr in -lnsl" >&5 $as_echo_n "checking for inet_addr in -lnsl... " >&6; } -if test "${ac_cv_lib_nsl_inet_addr+set}" = set; then : +if ${ac_cv_lib_nsl_inet_addr+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -31094,13 +31371,13 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_inet_addr" >&5 $as_echo "$ac_cv_lib_nsl_inet_addr" >&6; } -if test "x$ac_cv_lib_nsl_inet_addr" = x""yes; then : +if test "x$ac_cv_lib_nsl_inet_addr" = xyes; then : INET_LINK="nsl" else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inet_addr in -lresolv" >&5 $as_echo_n "checking for inet_addr in -lresolv... " >&6; } -if test "${ac_cv_lib_resolv_inet_addr+set}" = set; then : +if ${ac_cv_lib_resolv_inet_addr+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -31134,13 +31411,13 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_inet_addr" >&5 $as_echo "$ac_cv_lib_resolv_inet_addr" >&6; } -if test "x$ac_cv_lib_resolv_inet_addr" = x""yes; then : +if test "x$ac_cv_lib_resolv_inet_addr" = xyes; then : INET_LINK="resolv" else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inet_addr in -lsocket" >&5 $as_echo_n "checking for inet_addr in -lsocket... " >&6; } -if test "${ac_cv_lib_socket_inet_addr+set}" = set; then : +if ${ac_cv_lib_socket_inet_addr+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -31174,7 +31451,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_inet_addr" >&5 $as_echo "$ac_cv_lib_socket_inet_addr" >&6; } -if test "x$ac_cv_lib_socket_inet_addr" = x""yes; then : +if test "x$ac_cv_lib_socket_inet_addr" = xyes; then : INET_LINK="socket" fi @@ -31196,7 +31473,7 @@ done for ac_func in inet_aton do : ac_fn_c_check_func "$LINENO" "inet_aton" "ac_cv_func_inet_aton" -if test "x$ac_cv_func_inet_aton" = x""yes; then : +if test "x$ac_cv_func_inet_aton" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_INET_ATON 1 _ACEOF @@ -31207,7 +31484,7 @@ else as_ac_Lib=`$as_echo "ac_cv_lib_$INET_LINK''_inet_aton" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inet_aton in -l$INET_LINK" >&5 $as_echo_n "checking for inet_aton in -l$INET_LINK... " >&6; } -if eval "test \"\${$as_ac_Lib+set}\"" = set; then : +if eval \${$as_ac_Lib+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -31263,7 +31540,7 @@ fi do { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $wx_func" >&5 $as_echo_n "checking for $wx_func... " >&6; } -if eval "test \"\${wx_cv_func_$wx_func+set}\"" = set; then : +if eval \${wx_cv_func_$wx_func+:} false; then : $as_echo_n "(cached) " >&6 else @@ -31321,7 +31598,7 @@ if test "$wxUSE_TARSTREAM" = "yes"; then do { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $wx_func" >&5 $as_echo_n "checking for $wx_func... " >&6; } -if eval "test \"\${wx_cv_func_$wx_func+set}\"" = set; then : +if eval \${wx_cv_func_$wx_func+:} false; then : $as_echo_n "(cached) " >&6 else @@ -31378,7 +31655,7 @@ _ACEOF do { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $wx_func" >&5 $as_echo_n "checking for $wx_func... " >&6; } -if eval "test \"\${wx_cv_func_$wx_func+set}\"" = set; then : +if eval \${wx_cv_func_$wx_func+:} false; then : $as_echo_n "(cached) " >&6 else @@ -31442,7 +31719,7 @@ _ACEOF do { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $wx_func" >&5 $as_echo_n "checking for $wx_func... " >&6; } -if eval "test \"\${wx_cv_func_$wx_func+set}\"" = set; then : +if eval \${wx_cv_func_$wx_func+:} false; then : $as_echo_n "(cached) " >&6 else @@ -31570,10 +31847,21 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; :end' >>confcache if diff "$cache_file" confcache >/dev/null 2>&1; then :; else if test -w "$cache_file"; then - test "x$cache_file" != "x/dev/null" && + if test "x$cache_file" != "x/dev/null"; then { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 $as_echo "$as_me: updating cache $cache_file" >&6;} - cat confcache >$cache_file + if test ! -f "$cache_file" || test -h "$cache_file"; then + cat confcache >"$cache_file" + else + case $cache_file in #( + */* | ?:*) + mv -f confcache "$cache_file"$$ && + mv -f "$cache_file"$$ "$cache_file" ;; #( + *) + mv -f confcache "$cache_file" ;; + esac + fi + fi else { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} @@ -31756,7 +32044,7 @@ $as_echo "${flag}" >&6; } for ac_func in pthread_setconcurrency do : ac_fn_c_check_func "$LINENO" "pthread_setconcurrency" "ac_cv_func_pthread_setconcurrency" -if test "x$ac_cv_func_pthread_setconcurrency" = x""yes; then : +if test "x$ac_cv_func_pthread_setconcurrency" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_PTHREAD_SETCONCURRENCY 1 _ACEOF @@ -31767,7 +32055,7 @@ else for ac_func in thr_setconcurrency do : ac_fn_c_check_func "$LINENO" "thr_setconcurrency" "ac_cv_func_thr_setconcurrency" -if test "x$ac_cv_func_thr_setconcurrency" = x""yes; then : +if test "x$ac_cv_func_thr_setconcurrency" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_THR_SETCONCURRENCY 1 _ACEOF @@ -31786,7 +32074,7 @@ done { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_cleanup_push/pop" >&5 $as_echo_n "checking for pthread_cleanup_push/pop... " >&6; } -if test "${wx_cv_func_pthread_cleanup+set}" = set; then : +if ${wx_cv_func_pthread_cleanup+:} false; then : $as_echo_n "(cached) " >&6 else @@ -31843,7 +32131,7 @@ $as_echo "$wx_cv_func_pthread_cleanup" >&6; } do : ac_fn_c_check_header_compile "$LINENO" "sched.h" "ac_cv_header_sched_h" "$ac_includes_default " -if test "x$ac_cv_header_sched_h" = x""yes; then : +if test "x$ac_cv_header_sched_h" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_SCHED_H 1 _ACEOF @@ -31854,14 +32142,14 @@ done if test "$ac_cv_header_sched_h" = "yes"; then ac_fn_c_check_func "$LINENO" "sched_yield" "ac_cv_func_sched_yield" -if test "x$ac_cv_func_sched_yield" = x""yes; then : +if test "x$ac_cv_func_sched_yield" = xyes; then : $as_echo "#define HAVE_SCHED_YIELD 1" >>confdefs.h else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sched_yield in -lposix4" >&5 $as_echo_n "checking for sched_yield in -lposix4... " >&6; } -if test "${ac_cv_lib_posix4_sched_yield+set}" = set; then : +if ${ac_cv_lib_posix4_sched_yield+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -31895,7 +32183,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix4_sched_yield" >&5 $as_echo "$ac_cv_lib_posix4_sched_yield" >&6; } -if test "x$ac_cv_lib_posix4_sched_yield" = x""yes; then : +if test "x$ac_cv_lib_posix4_sched_yield" = xyes; then : $as_echo "#define HAVE_SCHED_YIELD 1" >>confdefs.h POSIX4_LINK=" -lposix4" else @@ -31912,16 +32200,16 @@ fi HAVE_PRIOR_FUNCS=0 ac_fn_c_check_func "$LINENO" "pthread_attr_getschedpolicy" "ac_cv_func_pthread_attr_getschedpolicy" -if test "x$ac_cv_func_pthread_attr_getschedpolicy" = x""yes; then : +if test "x$ac_cv_func_pthread_attr_getschedpolicy" = xyes; then : ac_fn_c_check_func "$LINENO" "pthread_attr_setschedparam" "ac_cv_func_pthread_attr_setschedparam" -if test "x$ac_cv_func_pthread_attr_setschedparam" = x""yes; then : +if test "x$ac_cv_func_pthread_attr_setschedparam" = xyes; then : ac_fn_c_check_func "$LINENO" "sched_get_priority_max" "ac_cv_func_sched_get_priority_max" -if test "x$ac_cv_func_sched_get_priority_max" = x""yes; then : +if test "x$ac_cv_func_sched_get_priority_max" = xyes; then : HAVE_PRIOR_FUNCS=1 else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sched_get_priority_max in -lposix4" >&5 $as_echo_n "checking for sched_get_priority_max in -lposix4... " >&6; } -if test "${ac_cv_lib_posix4_sched_get_priority_max+set}" = set; then : +if ${ac_cv_lib_posix4_sched_get_priority_max+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -31955,7 +32243,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix4_sched_get_priority_max" >&5 $as_echo "$ac_cv_lib_posix4_sched_get_priority_max" >&6; } -if test "x$ac_cv_lib_posix4_sched_get_priority_max" = x""yes; then : +if test "x$ac_cv_lib_posix4_sched_get_priority_max" = xyes; then : HAVE_PRIOR_FUNCS=1 POSIX4_LINK=" -lposix4" @@ -31981,7 +32269,7 @@ $as_echo "$as_me: WARNING: Setting thread priority will not work" >&2;} fi ac_fn_c_check_func "$LINENO" "pthread_cancel" "ac_cv_func_pthread_cancel" -if test "x$ac_cv_func_pthread_cancel" = x""yes; then : +if test "x$ac_cv_func_pthread_cancel" = xyes; then : $as_echo "#define HAVE_PTHREAD_CANCEL 1" >>confdefs.h else @@ -31991,7 +32279,7 @@ fi ac_fn_c_check_func "$LINENO" "pthread_mutex_timedlock" "ac_cv_func_pthread_mutex_timedlock" -if test "x$ac_cv_func_pthread_mutex_timedlock" = x""yes; then : +if test "x$ac_cv_func_pthread_mutex_timedlock" = xyes; then : $as_echo "#define HAVE_PTHREAD_MUTEX_TIMEDLOCK 1" >>confdefs.h else @@ -32001,7 +32289,7 @@ fi ac_fn_c_check_func "$LINENO" "pthread_attr_setstacksize" "ac_cv_func_pthread_attr_setstacksize" -if test "x$ac_cv_func_pthread_attr_setstacksize" = x""yes; then : +if test "x$ac_cv_func_pthread_attr_setstacksize" = xyes; then : $as_echo "#define HAVE_PTHREAD_ATTR_SETSTACKSIZE 1" >>confdefs.h fi @@ -32010,7 +32298,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_mutexattr_t" >&5 $as_echo_n "checking for pthread_mutexattr_t... " >&6; } -if test "${wx_cv_type_pthread_mutexattr_t+set}" = set; then : +if ${wx_cv_type_pthread_mutexattr_t+:} false; then : $as_echo_n "(cached) " >&6 else @@ -32046,7 +32334,7 @@ $as_echo "$wx_cv_type_pthread_mutexattr_t" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_mutexattr_settype declaration" >&5 $as_echo_n "checking for pthread_mutexattr_settype declaration... " >&6; } -if test "${wx_cv_func_pthread_mutexattr_settype_decl+set}" = set; then : +if ${wx_cv_func_pthread_mutexattr_settype_decl+:} false; then : $as_echo_n "(cached) " >&6 else @@ -32082,7 +32370,7 @@ $as_echo "$wx_cv_func_pthread_mutexattr_settype_decl" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PTHREAD_RECURSIVE_MUTEX_INITIALIZER" >&5 $as_echo_n "checking for PTHREAD_RECURSIVE_MUTEX_INITIALIZER... " >&6; } -if test "${wx_cv_type_pthread_rec_mutex_init+set}" = set; then : +if ${wx_cv_type_pthread_rec_mutex_init+:} false; then : $as_echo_n "(cached) " >&6 else @@ -32136,7 +32424,7 @@ $as_echo "$as_me: WARNING: Disabling TLS under NetBSD, please contact wx-dev if if test "$wxUSE_COMPILER_TLS" = "yes"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __thread keyword" >&5 $as_echo_n "checking for __thread keyword... " >&6; } -if test "${wx_cv_cc___thread+set}" = set; then : +if ${wx_cv_cc___thread+:} false; then : $as_echo_n "(cached) " >&6 else @@ -32240,7 +32528,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking gxx version" >&5 $as_echo_n "checking gxx version... " >&6; } -if test "${ax_cv_gxx_version+set}" = set; then : +if ${ax_cv_gxx_version+:} false; then : $as_echo_n "(cached) " >&6 else @@ -32283,17 +32571,68 @@ $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 if test "$wxUSE_THREADS" = "yes" ; then case "${host}" in - x86_64-*-mingw32* ) - ;; *-*-mingw32* ) { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler supports -mthreads" >&5 $as_echo_n "checking if compiler supports -mthreads... " >&6; } -if test "${wx_cv_cflags_mthread+set}" = set; then : +if ${wx_cv_cflags_mthread+:} false; then : $as_echo_n "(cached) " >&6 else @@ -32339,13 +32678,13 @@ $as_echo "$wx_cv_cflags_mthread" >&6; } fi ac_fn_c_check_func "$LINENO" "localtime_r" "ac_cv_func_localtime_r" -if test "x$ac_cv_func_localtime_r" = x""yes; then : +if test "x$ac_cv_func_localtime_r" = xyes; then : $as_echo "#define HAVE_LOCALTIME_R 1" >>confdefs.h fi ac_fn_c_check_func "$LINENO" "gmtime_r" "ac_cv_func_gmtime_r" -if test "x$ac_cv_func_gmtime_r" = x""yes; then : +if test "x$ac_cv_func_gmtime_r" = xyes; then : $as_echo "#define HAVE_GMTIME_R 1" >>confdefs.h fi @@ -32362,7 +32701,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu { $as_echo "$as_me:${as_lineno-$LINENO}: checking how many arguments gethostbyname_r() takes" >&5 $as_echo_n "checking how many arguments gethostbyname_r() takes... " >&6; } - if test "${ac_cv_func_which_gethostbyname_r+set}" = set; then : + if ${ac_cv_func_which_gethostbyname_r+:} false; then : $as_echo_n "(cached) " >&6 else @@ -32554,7 +32893,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu if test "x$ac_cv_func_which_gethostbyname_r" = "xno" -o \ "x$ac_cv_func_which_gethostbyname_r" = "xunknown" ; then ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname" -if test "x$ac_cv_func_gethostbyname" = x""yes; then : +if test "x$ac_cv_func_gethostbyname" = xyes; then : $as_echo "#define HAVE_GETHOSTBYNAME 1" >>confdefs.h fi @@ -32563,7 +32902,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking how many arguments getservbyname_r() takes" >&5 $as_echo_n "checking how many arguments getservbyname_r() takes... " >&6; } -if test "${ac_cv_func_which_getservbyname_r+set}" = set; then : +if ${ac_cv_func_which_getservbyname_r+:} false; then : $as_echo_n "(cached) " >&6 else @@ -32679,7 +33018,7 @@ fi for ac_func in getservbyname do : ac_fn_c_check_func "$LINENO" "getservbyname" "ac_cv_func_getservbyname" -if test "x$ac_cv_func_getservbyname" = x""yes; then : +if test "x$ac_cv_func_getservbyname" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_GETSERVBYNAME 1 _ACEOF @@ -32871,7 +33210,7 @@ if test "$TOOLKIT" != "MSW" -a "$USE_OS2" != 1; then for ac_func in dlopen do : ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen" -if test "x$ac_cv_func_dlopen" = x""yes; then : +if test "x$ac_cv_func_dlopen" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_DLOPEN 1 _ACEOF @@ -32884,7 +33223,7 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 $as_echo_n "checking for dlopen in -ldl... " >&6; } -if test "${ac_cv_lib_dl_dlopen+set}" = set; then : +if ${ac_cv_lib_dl_dlopen+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -32918,7 +33257,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 $as_echo "$ac_cv_lib_dl_dlopen" >&6; } -if test "x$ac_cv_lib_dl_dlopen" = x""yes; then : +if test "x$ac_cv_lib_dl_dlopen" = xyes; then : $as_echo "#define HAVE_DLOPEN 1" >>confdefs.h @@ -32930,7 +33269,7 @@ else for ac_func in shl_load do : ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load" -if test "x$ac_cv_func_shl_load" = x""yes; then : +if test "x$ac_cv_func_shl_load" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_SHL_LOAD 1 _ACEOF @@ -32943,7 +33282,7 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld in -lshl_load" >&5 $as_echo_n "checking for dld in -lshl_load... " >&6; } -if test "${ac_cv_lib_shl_load_dld+set}" = set; then : +if ${ac_cv_lib_shl_load_dld+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -32977,7 +33316,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_shl_load_dld" >&5 $as_echo "$ac_cv_lib_shl_load_dld" >&6; } -if test "x$ac_cv_lib_shl_load_dld" = x""yes; then : +if test "x$ac_cv_lib_shl_load_dld" = xyes; then : HAVE_SHL_FUNCS=1 DL_LINK=" -ldld$DL_LINK" @@ -33000,7 +33339,7 @@ done for ac_func in dlerror do : ac_fn_c_check_func "$LINENO" "dlerror" "ac_cv_func_dlerror" -if test "x$ac_cv_func_dlerror" = x""yes; then : +if test "x$ac_cv_func_dlerror" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_DLERROR 1 _ACEOF @@ -33010,7 +33349,7 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlerror in -ldl" >&5 $as_echo_n "checking for dlerror in -ldl... " >&6; } -if test "${ac_cv_lib_dl_dlerror+set}" = set; then : +if ${ac_cv_lib_dl_dlerror+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -33044,7 +33383,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlerror" >&5 $as_echo "$ac_cv_lib_dl_dlerror" >&6; } -if test "x$ac_cv_lib_dl_dlerror" = x""yes; then : +if test "x$ac_cv_lib_dl_dlerror" = xyes; then : $as_echo "#define HAVE_DLERROR 1" >>confdefs.h fi @@ -33118,7 +33457,7 @@ if test "$wxUSE_FSWATCHER" = "yes"; then do : ac_fn_c_check_header_compile "$LINENO" "sys/inotify.h" "ac_cv_header_sys_inotify_h" "$ac_includes_default " -if test "x$ac_cv_header_sys_inotify_h" = x""yes; then : +if test "x$ac_cv_header_sys_inotify_h" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_SYS_INOTIFY_H 1 _ACEOF @@ -33135,7 +33474,7 @@ done do : ac_fn_c_check_header_compile "$LINENO" "sys/event.h" "ac_cv_header_sys_event_h" "$ac_includes_default " -if test "x$ac_cv_header_sys_event_h" = x""yes; then : +if test "x$ac_cv_header_sys_event_h" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_SYS_EVENT_H 1 _ACEOF @@ -33201,7 +33540,7 @@ fi if test "$USE_UNIX" = 1 ; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SNDCTL_DSP_SPEED in sys/soundcard.h" >&5 $as_echo_n "checking for SNDCTL_DSP_SPEED in sys/soundcard.h... " >&6; } -if test "${ac_cv_header_sys_soundcard+set}" = set; then : +if ${ac_cv_header_sys_soundcard+:} false; then : $as_echo_n "(cached) " >&6 else @@ -33318,7 +33657,7 @@ fi set dummy sdl-config; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_SDL_CONFIG+set}" = set; then : +if ${ac_cv_path_SDL_CONFIG+:} false; then : $as_echo_n "(cached) " >&6 else case $SDL_CONFIG in @@ -33332,7 +33671,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_SDL_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -33555,7 +33894,7 @@ if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : +if ${ac_cv_path_PKG_CONFIG+:} false; then : $as_echo_n "(cached) " >&6 else case $PKG_CONFIG in @@ -33569,7 +33908,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -33598,7 +33937,7 @@ if test -z "$ac_cv_path_PKG_CONFIG"; then set dummy pkg-config; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then : +if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : $as_echo_n "(cached) " >&6 else case $ac_pt_PKG_CONFIG in @@ -33612,7 +33951,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -33750,6 +34089,7 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } + GUI_TK_LIBRARY="$GUI_TK_LIBRARY $GTKPRINT_LIBS" CFLAGS="$GTKPRINT_CFLAGS $CFLAGS" CXXFLAGS="$GTKPRINT_CFLAGS $CXXFLAGS" $as_echo "#define wxUSE_GTKPRINT 1" >>confdefs.h @@ -33757,29 +34097,27 @@ $as_echo "yes" >&6; } fi fi + fi - if test "$WXGTK3" = 1; then - wxUSE_LIBGNOMEPRINT=no - fi - - if test "$wxUSE_LIBGNOMEPRINT" = "yes" ; then + if test "$wxUSE_MIMETYPE" = "yes" ; then + if test "$wxUSE_LIBGNOMEVFS" = "yes" ; then pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBGNOMEPRINTUI" >&5 -$as_echo_n "checking for LIBGNOMEPRINTUI... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNOMEVFS" >&5 +$as_echo_n "checking for GNOMEVFS... " >&6; } if test -n "$PKG_CONFIG"; then - if test -n "$LIBGNOMEPRINTUI_CFLAGS"; then - pkg_cv_LIBGNOMEPRINTUI_CFLAGS="$LIBGNOMEPRINTUI_CFLAGS" + if test -n "$GNOMEVFS_CFLAGS"; then + pkg_cv_GNOMEVFS_CFLAGS="$GNOMEVFS_CFLAGS" else if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgnomeprintui-2.2 >= 2.8\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libgnomeprintui-2.2 >= 2.8") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnome-vfs-2.0 >= 2.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gnome-vfs-2.0 >= 2.0") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_LIBGNOMEPRINTUI_CFLAGS=`$PKG_CONFIG --cflags "libgnomeprintui-2.2 >= 2.8" 2>/dev/null` + pkg_cv_GNOMEVFS_CFLAGS=`$PKG_CONFIG --cflags "gnome-vfs-2.0 >= 2.0" 2>/dev/null` else pkg_failed=yes fi @@ -33788,16 +34126,16 @@ else pkg_failed=untried fi if test -n "$PKG_CONFIG"; then - if test -n "$LIBGNOMEPRINTUI_LIBS"; then - pkg_cv_LIBGNOMEPRINTUI_LIBS="$LIBGNOMEPRINTUI_LIBS" + if test -n "$GNOMEVFS_LIBS"; then + pkg_cv_GNOMEVFS_LIBS="$GNOMEVFS_LIBS" else if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgnomeprintui-2.2 >= 2.8\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libgnomeprintui-2.2 >= 2.8") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnome-vfs-2.0 >= 2.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gnome-vfs-2.0 >= 2.0") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_LIBGNOMEPRINTUI_LIBS=`$PKG_CONFIG --libs "libgnomeprintui-2.2 >= 2.8" 2>/dev/null` + pkg_cv_GNOMEVFS_LIBS=`$PKG_CONFIG --libs "gnome-vfs-2.0 >= 2.0" 2>/dev/null` else pkg_failed=yes fi @@ -33816,70 +34154,121 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - LIBGNOMEPRINTUI_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libgnomeprintui-2.2 >= 2.8"` + GNOMEVFS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gnome-vfs-2.0 >= 2.0"` else - LIBGNOMEPRINTUI_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgnomeprintui-2.2 >= 2.8"` + GNOMEVFS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gnome-vfs-2.0 >= 2.0"` fi # Put the nasty error message in config.log where it belongs - echo "$LIBGNOMEPRINTUI_PKG_ERRORS" >&5 + echo "$GNOMEVFS_PKG_ERRORS" >&5 - if test "$wxUSE_GTKPRINT" = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - else - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libgnomeprintui not found, library will use standard PostScript printing" >&5 -$as_echo "$as_me: WARNING: libgnomeprintui not found, library will use standard PostScript printing" >&2;} - fi - wxUSE_LIBGNOMEPRINT="no" + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libgnomevfs not found, library won't be able to associate MIME type" >&5 +$as_echo "$as_me: WARNING: libgnomevfs not found, library won't be able to associate MIME type" >&2;} + wxUSE_LIBGNOMEVFS="no" elif test $pkg_failed = untried; then - if test "$wxUSE_GTKPRINT" = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - else - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libgnomeprintui not found, library will use standard PostScript printing" >&5 -$as_echo "$as_me: WARNING: libgnomeprintui not found, library will use standard PostScript printing" >&2;} - fi - wxUSE_LIBGNOMEPRINT="no" + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libgnomevfs not found, library won't be able to associate MIME type" >&5 +$as_echo "$as_me: WARNING: libgnomevfs not found, library won't be able to associate MIME type" >&2;} + wxUSE_LIBGNOMEVFS="no" else - LIBGNOMEPRINTUI_CFLAGS=$pkg_cv_LIBGNOMEPRINTUI_CFLAGS - LIBGNOMEPRINTUI_LIBS=$pkg_cv_LIBGNOMEPRINTUI_LIBS + GNOMEVFS_CFLAGS=$pkg_cv_GNOMEVFS_CFLAGS + GNOMEVFS_LIBS=$pkg_cv_GNOMEVFS_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - CFLAGS="$LIBGNOMEPRINTUI_CFLAGS $CFLAGS" - CXXFLAGS="$LIBGNOMEPRINTUI_CFLAGS $CXXFLAGS" - $as_echo "#define wxUSE_LIBGNOMEPRINT 1" >>confdefs.h + GUI_TK_LIBRARY="$GUI_TK_LIBRARY $GNOMEVFS_LIBS" + CFLAGS="$GNOMEVFS_CFLAGS $CFLAGS" + CXXFLAGS="$GNOMEVFS_CFLAGS $CXXFLAGS" + $as_echo "#define wxUSE_LIBGNOMEVFS 1" >>confdefs.h fi fi fi - if test "$wxUSE_MIMETYPE" = "yes" ; then - if test "$wxUSE_LIBGNOMEVFS" = "yes" ; then + 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 +$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.7\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libnotify >= 0.7") 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.7" 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.7\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libnotify >= 0.7") 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.7" 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.7"` + else + LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libnotify >= 0.7"` + fi + # Put the nasty error message in config.log where it belongs + echo "$LIBNOTIFY_PKG_ERRORS" >&5 + pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNOMEVFS" >&5 -$as_echo_n "checking for GNOMEVFS... " >&6; } +{ $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 "$GNOMEVFS_CFLAGS"; then - pkg_cv_GNOMEVFS_CFLAGS="$GNOMEVFS_CFLAGS" + 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 \"gnome-vfs-2.0 >= 2.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gnome-vfs-2.0 >= 2.0") 2>&5 + { { $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_GNOMEVFS_CFLAGS=`$PKG_CONFIG --cflags "gnome-vfs-2.0 >= 2.0" 2>/dev/null` + pkg_cv_LIBNOTIFY_CFLAGS=`$PKG_CONFIG --cflags "libnotify >= 0.4" 2>/dev/null` else pkg_failed=yes fi @@ -33888,16 +34277,16 @@ else pkg_failed=untried fi if test -n "$PKG_CONFIG"; then - if test -n "$GNOMEVFS_LIBS"; then - pkg_cv_GNOMEVFS_LIBS="$GNOMEVFS_LIBS" + 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 \"gnome-vfs-2.0 >= 2.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gnome-vfs-2.0 >= 2.0") 2>&5 + { { $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_GNOMEVFS_LIBS=`$PKG_CONFIG --libs "gnome-vfs-2.0 >= 2.0" 2>/dev/null` + pkg_cv_LIBNOTIFY_LIBS=`$PKG_CONFIG --libs "libnotify >= 0.4" 2>/dev/null` else pkg_failed=yes fi @@ -33916,38 +34305,125 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GNOMEVFS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gnome-vfs-2.0 >= 2.0"` + LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libnotify >= 0.4"` else - GNOMEVFS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gnome-vfs-2.0 >= 2.0"` + 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 "$GNOMEVFS_PKG_ERRORS" >&5 + 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;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libgnomevfs not found, library won't be able to associate MIME type" >&5 -$as_echo "$as_me: WARNING: libgnomevfs not found, library won't be able to associate MIME type" >&2;} - wxUSE_LIBGNOMEVFS="no" +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: libgnomevfs not found, library won't be able to associate MIME type" >&5 -$as_echo "$as_me: WARNING: libgnomevfs not found, library won't be able to associate MIME type" >&2;} - wxUSE_LIBGNOMEVFS="no" +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 - GNOMEVFS_CFLAGS=$pkg_cv_GNOMEVFS_CFLAGS - GNOMEVFS_LIBS=$pkg_cv_GNOMEVFS_LIBS + 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 - CFLAGS="$GNOMEVFS_CFLAGS $CFLAGS" - CXXFLAGS="$GNOMEVFS_CFLAGS $CXXFLAGS" - $as_echo "#define wxUSE_LIBGNOMEVFS 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 @@ -34032,7 +34508,7 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - EXTRALIBS_HILDON="$HILDON_LIBS" + GUI_TK_LIBRARY="$GUI_TK_LIBRARY $HILDON_LIBS" CFLAGS="$CFLAGS $HILDON_CFLAGS" CXXFLAGS="$CXXFLAGS $HILDON_CFLAGS" $as_echo "#define wxUSE_LIBHILDON 1" >>confdefs.h @@ -34120,7 +34596,7 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - EXTRALIBS_HILDON="$HILDON2_LIBS" + GUI_TK_LIBRARY="$GUI_TK_LIBRARY $HILDON2_LIBS" CFLAGS="$CFLAGS $HILDON2_CFLAGS" CXXFLAGS="$CXXFLAGS $HILDON2_CFLAGS" $as_echo "#define wxUSE_LIBHILDON2 1" >>confdefs.h @@ -34226,6 +34702,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 @@ -34353,7 +34834,7 @@ if test "$wxUSE_XLOCALE" = "yes" ; then ac_fn_c_check_type "$LINENO" "locale_t" "ac_cv_type_locale_t" "#include #include " -if test "x$ac_cv_type_locale_t" = x""yes; then : +if test "x$ac_cv_type_locale_t" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_LOCALE_T 1 @@ -34432,7 +34913,7 @@ if test "$wxUSE_CONSOLE_EVENTLOOP" = "yes"; then do : ac_fn_c_check_header_compile "$LINENO" "sys/epoll.h" "ac_cv_header_sys_epoll_h" "$ac_includes_default " -if test "x$ac_cv_header_sys_epoll_h" = x""yes; then : +if test "x$ac_cv_header_sys_epoll_h" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_SYS_EPOLL_H 1 _ACEOF @@ -34469,7 +34950,7 @@ done if test "$ac_cv_func_gettimeofday" = "yes"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gettimeofday takes two arguments" >&5 $as_echo_n "checking whether gettimeofday takes two arguments... " >&6; } -if test "${wx_cv_func_gettimeofday_has_2_args+set}" = set; then : +if ${wx_cv_func_gettimeofday_has_2_args+:} false; then : $as_echo_n "(cached) " >&6 else @@ -34538,7 +35019,7 @@ fi if test "$wxUSE_DATETIME" = "yes"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for timezone variable in " >&5 $as_echo_n "checking for timezone variable in ... " >&6; } -if test "${wx_cv_var_timezone+set}" = set; then : +if ${wx_cv_var_timezone+:} false; then : $as_echo_n "(cached) " >&6 else @@ -34652,7 +35133,7 @@ _ACEOF for ac_func in localtime do : ac_fn_c_check_func "$LINENO" "localtime" "ac_cv_func_localtime" -if test "x$ac_cv_func_localtime" = x""yes; then : +if test "x$ac_cv_func_localtime" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_LOCALTIME 1 _ACEOF @@ -34664,7 +35145,7 @@ done if test "$ac_cv_func_localtime" = "yes"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tm_gmtoff in struct tm" >&5 $as_echo_n "checking for tm_gmtoff in struct tm... " >&6; } -if test "${wx_cv_struct_tm_has_gmtoff+set}" = set; then : +if ${wx_cv_struct_tm_has_gmtoff+:} false; then : $as_echo_n "(cached) " >&6 else @@ -34708,16 +35189,29 @@ $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" -if test "x$ac_cv_func_socket" = x""yes; then : +if test "x$ac_cv_func_socket" = xyes; then : else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for socket in -lsocket" >&5 $as_echo_n "checking for socket in -lsocket... " >&6; } -if test "${ac_cv_lib_socket_socket+set}" = set; then : +if ${ac_cv_lib_socket_socket+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -34751,7 +35245,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_socket" >&5 $as_echo "$ac_cv_lib_socket_socket" >&6; } -if test "x$ac_cv_lib_socket_socket" = x""yes; then : +if test "x$ac_cv_lib_socket_socket" = xyes; then : if test "$INET_LINK" != " -lsocket"; then INET_LINK="$INET_LINK -lsocket" fi @@ -34775,7 +35269,7 @@ if test "$wxUSE_SOCKETS" = "yes" ; then if test "$TOOLKIT" != "MSW"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking what is the type of the third argument of getsockname" >&5 $as_echo_n "checking what is the type of the third argument of getsockname... " >&6; } -if test "${wx_cv_type_getsockname3+set}" = set; then : +if ${wx_cv_type_getsockname3+:} false; then : $as_echo_n "(cached) " >&6 else @@ -34887,7 +35381,7 @@ _ACEOF fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking what is the type of the fifth argument of getsockopt" >&5 $as_echo_n "checking what is the type of the fifth argument of getsockopt... " >&6; } -if test "${wx_cv_type_getsockopt5+set}" = set; then : +if ${wx_cv_type_getsockopt5+:} false; then : $as_echo_n "(cached) " >&6 else @@ -34997,7 +35491,7 @@ if test "$wxUSE_SOCKETS" = "yes" ; then if test "$wxUSE_IPV6" = "yes"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we have sockaddr_in6" >&5 $as_echo_n "checking whether we have sockaddr_in6... " >&6; } -if test "${wx_cv_type_sockaddr_in6+set}" = set; then : +if ${wx_cv_type_sockaddr_in6+:} false; then : $as_echo_n "(cached) " >&6 else @@ -35149,7 +35643,7 @@ $as_echo "$wxUSE_JOYSTICK" >&6; } do : ac_fn_c_check_header_compile "$LINENO" "linux/joystick.h" "ac_cv_header_linux_joystick_h" "$ac_includes_default " -if test "x$ac_cv_header_linux_joystick_h" = x""yes; then : +if test "x$ac_cv_header_linux_joystick_h" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_LINUX_JOYSTICK_H 1 _ACEOF @@ -35193,7 +35687,7 @@ if test "$wxUSE_UNICODE" = "yes" ; then if test "$USE_WIN32" = 1 -a "$wxUSE_UNICODE_MSLU" = "yes"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lunicows" >&5 $as_echo_n "checking for main in -lunicows... " >&6; } -if test "${ac_cv_lib_unicows_main+set}" = set; then : +if ${ac_cv_lib_unicows_main+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -35221,7 +35715,7 @@ LIBS=$ac_check_lib_save_LIBS fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_unicows_main" >&5 $as_echo "$ac_cv_lib_unicows_main" >&6; } -if test "x$ac_cv_lib_unicows_main" = x""yes; then : +if test "x$ac_cv_lib_unicows_main" = xyes; then : $as_echo "#define wxUSE_UNICODE_MSLU 1" >>confdefs.h @@ -35345,7 +35839,7 @@ if test "$USE_WIN32" = 1 -a \( "$wxUSE_DATAOBJ" = "yes" \ -o "$wxUSE_DRAG_AND_DROP" = "yes" \) ; then ac_fn_c_check_header_compile "$LINENO" "ole2.h" "ac_cv_header_ole2_h" " " -if test "x$ac_cv_header_ole2_h" = x""yes; then : +if test "x$ac_cv_header_ole2_h" = xyes; then : fi @@ -35953,6 +36447,12 @@ $as_echo "$as_me: WARNING: wxPopupWindow not yet supported under PM... disabled" fi fi +if test "$wxUSE_PREFERENCES_EDITOR" = "yes"; then + $as_echo "#define wxUSE_PREFERENCES_EDITOR 1" >>confdefs.h + + SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS prefseditor" +fi + if test "$wxUSE_DIALUP_MANAGER" = "yes"; then if test "$wxUSE_MAC" = 1 -o "$wxUSE_OLD_COCOA" = 1; then { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Dialup manager not supported on this platform... disabled" >&5 @@ -36039,7 +36539,7 @@ if test "$wxUSE_WEBKIT" = "yes"; then #include " -if test "x$ac_cv_header_WebKit_HIWebView_h" = x""yes; then : +if test "x$ac_cv_header_WebKit_HIWebView_h" = xyes; then : $as_echo "#define wxUSE_WEBKIT 1" >>confdefs.h @@ -36115,7 +36615,7 @@ if test "$wxUSE_STC" = "yes"; then set dummy python; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PYTHON+set}" = set; then : +if ${ac_cv_path_PYTHON+:} false; then : $as_echo_n "(cached) " >&6 else case $PYTHON in @@ -36129,7 +36629,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -36311,7 +36811,7 @@ fi #include " -if test "x$ac_cv_header_WebKit_HIWebView_h" = x""yes; then : +if test "x$ac_cv_header_WebKit_HIWebView_h" = xyes; then : USE_WEBVIEW_WEBKIT=1 WEBKIT_LINK="-framework WebKit" @@ -36535,7 +37035,7 @@ if test "$wxUSE_GRAPHICS_CONTEXT" = "yes"; then if test "$wxUSE_MSW" = 1; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking if GDI+ is available" >&5 $as_echo_n "checking if GDI+ is available... " >&6; } -if test "${wx_cv_lib_gdiplus+set}" = set; then : +if ${wx_cv_lib_gdiplus+:} false; then : $as_echo_n "(cached) " >&6 else @@ -36660,7 +37160,7 @@ fi for ac_func in cairo_push_group do : ac_fn_c_check_func "$LINENO" "cairo_push_group" "ac_cv_func_cairo_push_group" -if test "x$ac_cv_func_cairo_push_group" = x""yes; then : +if test "x$ac_cv_func_cairo_push_group" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_CAIRO_PUSH_GROUP 1 _ACEOF @@ -36885,6 +37385,9 @@ fi else USE_MEDIA=0 fi + + elif test "$wxUSE_MAC" = 1; then + GST_LIBS="-framework QTKit" fi if test $USE_MEDIA = 1; then @@ -37005,7 +37508,7 @@ if test "$wxUSE_MAC" = 1 ; then else { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we target only x86_64" >&5 $as_echo_n "checking if we target only x86_64... " >&6; } -if test "${wx_cv_target_x86_64+set}" = set; then : +if ${wx_cv_target_x86_64+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -37091,7 +37594,7 @@ elif test "$GXX" = yes ; then CXXWARNINGS="-Wall -Wundef -Wunused-parameter -Wno-ctor-dtor-privacy" { $as_echo "$as_me:${as_lineno-$LINENO}: checking CXXWARNINGS for gcc -Woverloaded-virtual" >&5 $as_echo_n "checking CXXWARNINGS for gcc -Woverloaded-virtual... " >&6; } -if test "${ac_cv_cxxflags_gcc_option__Woverloaded_virtual+set}" = set; then : +if ${ac_cv_cxxflags_gcc_option__Woverloaded_virtual+:} false; then : $as_echo_n "(cached) " >&6 else ac_cv_cxxflags_gcc_option__Woverloaded_virtual="no, unknown" @@ -37191,7 +37694,7 @@ EXTRALIBS_HTML="$MSPACK_LINK" EXTRALIBS_MEDIA="$GST_LIBS" EXTRALIBS_STC="-lwxscintilla${WX_LIB_FLAVOUR}-${WX_RELEASE}${HOST_SUFFIX}" if test "$wxUSE_GUI" = "yes"; then - EXTRALIBS_GUI=`echo $GUI_TK_LIBRARY $PNG_LINK $JPEG_LINK $TIFF_LINK $WEBKIT_LINK $EXTRALIBS_HILDON $EXTRALIBS_GNOMEVFS $EXTRALIBS_GNOMEPRINT` + EXTRALIBS_GUI=`echo $GUI_TK_LIBRARY $PNG_LINK $JPEG_LINK $TIFF_LINK $WEBKIT_LINK` fi if test "$wxUSE_OPENGL" = "yes"; then EXTRALIBS_OPENGL="$LDFLAGS_GL $OPENGL_LIBS" @@ -37294,10 +37797,6 @@ fi - - - - @@ -37326,12 +37825,12 @@ case "$TOOLKIT" in if test "$wxUSE_GTKPRINT" = "yes" ; then TOOLKIT_EXTRA="$TOOLKIT_EXTRA GTK+ printing"; fi - if test "$wxUSE_LIBGNOMEPRINT" = "yes" ; then - TOOLKIT_EXTRA="$TOOLKIT_EXTRA gnomeprint"; - fi if test "$wxUSE_LIBGNOMEVFS" = "yes" ; then TOOLKIT_EXTRA="$TOOLKIT_EXTRA gnomevfs" fi + if test "$wxUSE_LIBNOTIFY" = "yes" ; then + TOOLKIT_EXTRA="$TOOLKIT_EXTRA libnotify" + fi if test "$wxUSE_LIBHILDON" = "yes"; then TOOLKIT_EXTRA="$TOOLKIT_EXTRA hildon" fi @@ -37362,7 +37861,7 @@ if test "$wxUSE_UNICODE" = yes -a "$GCC" = yes -a "$bk_use_pch" != no then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gcc precompiled header bug" >&5 $as_echo_n "checking for gcc precompiled header bug... " >&6; } -if test "${wx_cv_gcc_pch_bug+set}" = set; then : +if ${wx_cv_gcc_pch_bug+:} false; then : $as_echo_n "(cached) " >&6 else @@ -37422,7 +37921,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 $as_echo_n "checking for a BSD-compatible install... " >&6; } if test -z "$INSTALL"; then -if test "${ac_cv_path_install+set}" = set; then : +if ${ac_cv_path_install+:} false; then : $as_echo_n "(cached) " >&6 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -37442,7 +37941,7 @@ case $as_dir/ in #(( # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then if test $ac_prog = install && grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. @@ -37519,7 +38018,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' set dummy ${ac_tool_prefix}ranlib; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_RANLIB+set}" = set; then : +if ${ac_cv_prog_RANLIB+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$RANLIB"; then @@ -37531,7 +38030,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -37559,7 +38058,7 @@ if test -z "$ac_cv_prog_RANLIB"; then set dummy ranlib; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then : +if ${ac_cv_prog_ac_ct_RANLIB+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_RANLIB"; then @@ -37571,7 +38070,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_RANLIB="ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -37623,7 +38122,7 @@ fi $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } set x ${MAKE-make} ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then : +if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then : $as_echo_n "(cached) " >&6 else cat >conftest.make <<\_ACEOF @@ -37666,7 +38165,7 @@ fi set dummy ${ac_tool_prefix}ar; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_AR+set}" = set; then : +if ${ac_cv_prog_AR+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$AR"; then @@ -37678,7 +38177,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_AR="${ac_tool_prefix}ar" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -37706,7 +38205,7 @@ if test -z "$ac_cv_prog_AR"; then set dummy ar; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_AR+set}" = set; then : +if ${ac_cv_prog_ac_ct_AR+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_AR"; then @@ -37718,7 +38217,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_AR="ar" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -37762,7 +38261,7 @@ fi set dummy ${ac_tool_prefix}strip; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_STRIP+set}" = set; then : +if ${ac_cv_prog_STRIP+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$STRIP"; then @@ -37774,7 +38273,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -37802,7 +38301,7 @@ if test -z "$ac_cv_prog_STRIP"; then set dummy strip; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then : +if ${ac_cv_prog_ac_ct_STRIP+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_STRIP"; then @@ -37814,7 +38313,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_STRIP="strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -37854,7 +38353,7 @@ fi set dummy ${ac_tool_prefix}nm; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_NM+set}" = set; then : +if ${ac_cv_prog_NM+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$NM"; then @@ -37866,7 +38365,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_NM="${ac_tool_prefix}nm" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -37894,7 +38393,7 @@ if test -z "$ac_cv_prog_NM"; then set dummy nm; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_NM+set}" = set; then : +if ${ac_cv_prog_ac_ct_NM+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_NM"; then @@ -37906,7 +38405,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_NM="nm" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -37956,7 +38455,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking if make is GNU make" >&5 $as_echo_n "checking if make is GNU make... " >&6; } -if test "${bakefile_cv_prog_makeisgnu+set}" = set; then : +if ${bakefile_cv_prog_makeisgnu+:} false; then : $as_echo_n "(cached) " >&6 else @@ -38313,7 +38812,7 @@ EOF { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gcc 3.1 or later" >&5 $as_echo_n "checking for gcc 3.1 or later... " >&6; } -if test "${bakefile_cv_gcc31+set}" = set; then : +if ${bakefile_cv_gcc31+:} false; then : $as_echo_n "(cached) " >&6 else @@ -38381,7 +38880,7 @@ $as_echo "$bakefile_cv_gcc31" >&6; } set dummy makeC++SharedLib; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_AIX_CXX_LD+set}" = set; then : +if ${ac_cv_prog_AIX_CXX_LD+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$AIX_CXX_LD"; then @@ -38393,7 +38892,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_AIX_CXX_LD="makeC++SharedLib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -38924,7 +39423,7 @@ EOF ;; powerpc-apple-macos* | \ - *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | *-*-k*bsd*-gnu | \ + *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | *-*-gnu* | *-*-k*bsd*-gnu | \ *-*-mirbsd* | \ *-*-sunos4* | \ *-*-osf* | \ @@ -38966,7 +39465,7 @@ EOF case "${BAKEFILE_HOST}" in *-*-linux* | *-*-freebsd* | *-*-openbsd* | *-*-netbsd* | \ - *-*-k*bsd*-gnu | *-*-mirbsd* ) + *-*-k*bsd*-gnu | *-*-mirbsd* | *-*-gnu* ) if test "x$SUNCXX" = "xyes"; then SONAME_FLAG="-h " else @@ -39201,7 +39700,7 @@ EOF set dummy ${ac_tool_prefix}windres; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_WINDRES+set}" = set; then : +if ${ac_cv_prog_WINDRES+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$WINDRES"; then @@ -39213,7 +39712,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_WINDRES="${ac_tool_prefix}windres" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -39241,7 +39740,7 @@ if test -z "$ac_cv_prog_WINDRES"; then set dummy windres; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_WINDRES+set}" = set; then : +if ${ac_cv_prog_ac_ct_WINDRES+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_WINDRES"; then @@ -39253,7 +39752,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_WINDRES="windres" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -39295,7 +39794,7 @@ fi set dummy Rez; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_REZ+set}" = set; then : +if ${ac_cv_prog_REZ+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$REZ"; then @@ -39307,7 +39806,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_REZ="Rez" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -39333,7 +39832,7 @@ fi set dummy SetFile; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_SETFILE+set}" = set; then : +if ${ac_cv_prog_SETFILE+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$SETFILE"; then @@ -39345,7 +39844,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_SETFILE="SetFile" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -39539,76 +40038,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="" @@ -39619,26 +40058,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="" @@ -39869,6 +40293,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="" @@ -39904,6 +40333,26 @@ EOF COND_PLATFORM_MACOSX_1_PLATFORM_WIN32_1_SHARED_0="" fi + COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2="#" + if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x2" ; then + COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2="" + fi + + COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1="#" + if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x2" -a "x$USE_GUI" = "x1" ; then + COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1="" + fi + + COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3="#" + if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x3" ; then + COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3="" + fi + + COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1="#" + if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x3" -a "x$USE_GUI" = "x1" ; then + COND_PLATFORM_MACOSX_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1="" + fi + COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1="#" if test "x$PLATFORM_MACOSX" = "x1" -a "x$TOOLKIT" = "xOSX_CARBON" -a "x$USE_GUI" = "x1" ; then COND_PLATFORM_MACOSX_1_TOOLKIT_OSX_CARBON_USE_GUI_1="" @@ -39949,11 +40398,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="" @@ -40024,6 +40468,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="" @@ -40034,6 +40483,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="" @@ -40159,11 +40628,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="" @@ -40319,6 +40798,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="" @@ -40364,21 +40853,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="" @@ -40489,36 +40963,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="" @@ -40589,7 +41033,7 @@ if test "$wxUSE_MAC" = 1 -o "$wxUSE_OLD_COCOA" = 1; then set dummy DeRez; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_DEREZ+set}" = set; then : +if ${ac_cv_prog_DEREZ+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$DEREZ"; then @@ -40601,7 +41045,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DEREZ="DeRez" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -40671,13 +41115,13 @@ $as_echo "$as_me: WARNING: *** see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=1 fi -if test "$wxUSE_MAC" = 1 ; then +if test "$DEPS_TRACKING" = 1 -a "$wxUSE_MAC" = 1 ; then if test "x$wxUSE_UNIVERSAL_BINARY" != "xno" ; then if test "x$disable_macosx_deps" = "xyes"; then - sed "s/DEPSMODE=gcc/DEPSMODE=none/" < bk-deps > temp - mv temp bk-deps + sed "s/DEPSMODE=gcc/DEPSMODE=none/" < bk-deps > temp + mv temp bk-deps chmod +x bk-deps - fi + fi fi fi @@ -40779,10 +41223,6 @@ SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq - - - - @@ -40792,7 +41232,7 @@ SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } set x ${MAKE-make} ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then : +if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then : $as_echo_n "(cached) " >&6 else cat >conftest.make <<\_ACEOF @@ -40891,7 +41331,7 @@ fi set dummy cppunit-config; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_CPPUNIT_CONFIG+set}" = set; then : +if ${ac_cv_path_CPPUNIT_CONFIG+:} false; then : $as_echo_n "(cached) " >&6 else case $CPPUNIT_CONFIG in @@ -40905,7 +41345,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_CPPUNIT_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -41095,10 +41535,21 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; :end' >>confcache if diff "$cache_file" confcache >/dev/null 2>&1; then :; else if test -w "$cache_file"; then - test "x$cache_file" != "x/dev/null" && + if test "x$cache_file" != "x/dev/null"; then { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 $as_echo "$as_me: updating cache $cache_file" >&6;} - cat confcache >$cache_file + if test ! -f "$cache_file" || test -h "$cache_file"; then + cat confcache >"$cache_file" + else + case $cache_file in #( + */* | ?:*) + mv -f confcache "$cache_file"$$ && + mv -f "$cache_file"$$ "$cache_file" ;; #( + *) + mv -f confcache "$cache_file" ;; + esac + fi + fi else { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} @@ -41130,7 +41581,7 @@ LTLIBOBJS=$ac_ltlibobjs -: ${CONFIG_STATUS=./config.status} +: "${CONFIG_STATUS=./config.status}" ac_write_fail=0 ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" @@ -41231,6 +41682,7 @@ fi IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. +as_myself= case $0 in #(( *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -41426,16 +41878,16 @@ if (echo >conf$$.file) 2>/dev/null; then # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -41495,28 +41947,16 @@ else as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -41537,8 +41977,8 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by wxWidgets $as_me 2.9.4, which was -generated by GNU Autoconf 2.67. Invocation command line was +This file was extended by wxWidgets $as_me 3.0.0, which was +generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -41603,11 +42043,11 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -wxWidgets config.status 2.9.4 -configured by $0, generated by GNU Autoconf 2.67, +wxWidgets config.status 3.0.0 +configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -41696,7 +42136,7 @@ fi _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 if \$ac_cs_recheck; then - set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion shift \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 CONFIG_SHELL='$SHELL' @@ -41750,7 +42190,7 @@ do "wx-config") CONFIG_COMMANDS="$CONFIG_COMMANDS wx-config" ;; "$mk") CONFIG_FILES="$CONFIG_FILES $mk" ;; - *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;; + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac done @@ -41773,9 +42213,10 @@ fi # after its creation but before its name has been assigned to `$tmp'. $debug || { - tmp= + tmp= ac_tmp= trap 'exit_status=$? - { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status + : "${ac_tmp:=$tmp}" + { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status ' 0 trap 'as_fn_exit 1' 1 2 13 15 } @@ -41783,12 +42224,13 @@ $debug || { tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && - test -n "$tmp" && test -d "$tmp" + test -d "$tmp" } || { tmp=./conf$$-$RANDOM (umask 077 && mkdir "$tmp") } || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 +ac_tmp=$tmp # Set up the scripts for CONFIG_FILES section. # No need to generate them if there are no CONFIG_FILES. @@ -41810,7 +42252,7 @@ else ac_cs_awk_cr=$ac_cr fi -echo 'BEGIN {' >"$tmp/subs1.awk" && +echo 'BEGIN {' >"$ac_tmp/subs1.awk" && _ACEOF @@ -41838,7 +42280,7 @@ done rm -f conf$$subs.sh cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -cat >>"\$tmp/subs1.awk" <<\\_ACAWK && +cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK && _ACEOF sed -n ' h @@ -41886,7 +42328,7 @@ t delim rm -f conf$$subs.awk cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 _ACAWK -cat >>"\$tmp/subs1.awk" <<_ACAWK && +cat >>"\$ac_tmp/subs1.awk" <<_ACAWK && for (key in S) S_is_set[key] = 1 FS = "" @@ -41918,7 +42360,7 @@ if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" else cat -fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ +fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \ || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 _ACEOF @@ -41952,7 +42394,7 @@ fi # test -n "$CONFIG_FILES" # No need to generate them if there are no CONFIG_HEADERS. # This happens for instance with `./config.status Makefile'. if test -n "$CONFIG_HEADERS"; then -cat >"$tmp/defines.awk" <<\_ACAWK || +cat >"$ac_tmp/defines.awk" <<\_ACAWK || BEGIN { _ACEOF @@ -41964,8 +42406,8 @@ _ACEOF # handling of long lines. ac_delim='%!_!# ' for ac_last_try in false false :; do - ac_t=`sed -n "/$ac_delim/p" confdefs.h` - if test -z "$ac_t"; then + ac_tt=`sed -n "/$ac_delim/p" confdefs.h` + if test -z "$ac_tt"; then break elif $ac_last_try; then as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 @@ -42066,7 +42508,7 @@ do esac case $ac_mode$ac_tag in :[FHL]*:*);; - :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;; + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac @@ -42085,7 +42527,7 @@ do for ac_f do case $ac_f in - -) ac_f="$tmp/stdin";; + -) ac_f="$ac_tmp/stdin";; *) # Look for the file first in the build tree, then in the source tree # (if the path is not absolute). The absolute path cannot be DOS-style, # because $ac_f cannot contain `:'. @@ -42094,7 +42536,7 @@ do [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;; + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; esac case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac as_fn_append ac_file_inputs " '$ac_f'" @@ -42120,8 +42562,8 @@ $as_echo "$as_me: creating $ac_file" >&6;} esac case $ac_tag in - *:-:* | *:-) cat >"$tmp/stdin" \ - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; + *:-:* | *:-) cat >"$ac_tmp/stdin" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; esac ;; esac @@ -42251,21 +42693,22 @@ s&@abs_top_builddir@&$ac_abs_top_builddir&;t t s&@INSTALL@&$ac_INSTALL&;t t $ac_datarootdir_hack " -eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 +eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \ + >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && - { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && - { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && + { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && + { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ + "$ac_tmp/out"`; test -z "$ac_out"; } && { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined" >&5 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined" >&2;} - rm -f "$tmp/stdin" + rm -f "$ac_tmp/stdin" case $ac_file in - -) cat "$tmp/out" && rm -f "$tmp/out";; - *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; + -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";; + *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";; esac \ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; @@ -42276,20 +42719,20 @@ which seems to be undefined. Please make sure it is defined" >&2;} if test x"$ac_file" != x-; then { $as_echo "/* $configure_input */" \ - && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" - } >"$tmp/config.h" \ + && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" + } >"$ac_tmp/config.h" \ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 - if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then + if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 $as_echo "$as_me: $ac_file is unchanged" >&6;} else rm -f "$ac_file" - mv "$tmp/config.h" "$ac_file" \ + mv "$ac_tmp/config.h" "$ac_file" \ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 fi else $as_echo "/* $configure_input */" \ - && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ + && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \ || as_fn_error $? "could not create -" "$LINENO" 5 fi ;;