X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/41d170ce0f929eade1bd67e7695c04c60d46141c..7ddb15416407390de67cc26b04e91ea99a521f57:/configure

diff --git a/configure b/configure
index 01c267b5e4..5adab9ed6d 100755
--- a/configure
+++ b/configure
@@ -1,14 +1,12 @@
 #! /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.5.
+# Generated by GNU Autoconf 2.69 for wxWidgets 2.9.5.
 #
 # Report bugs to <wx-dev@lists.wxwidgets.org>.
 #
 #
-# 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 +90,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 +135,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 +193,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 +239,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 +360,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 +489,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 +527,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 +548,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'"
@@ -647,12 +675,6 @@ COND_wxUSE_LIBTIFF_builtin
 COND_wxUSE_LIBPNG_builtin
 COND_wxUSE_LIBJPEG_builtin
 COND_wxUSE_EXPAT_builtin
-COND_WXUSE_ZLIB_BUILTIN
-COND_WXUSE_REGEX_BUILTIN
-COND_WXUSE_LIBTIFF_BUILTIN
-COND_WXUSE_LIBPNG_BUILTIN
-COND_WXUSE_LIBJPEG_BUILTIN
-COND_WXUSE_EXPAT_BUILTIN
 COND_WXUNIV_1
 COND_WXUNIV_0
 COND_WITH_PLUGIN_SDL_1
@@ -675,9 +697,6 @@ COND_USE_OPENGL_1
 COND_USE_GUI_1_wxUSE_LIBTIFF_builtin
 COND_USE_GUI_1_wxUSE_LIBPNG_builtin
 COND_USE_GUI_1_wxUSE_LIBJPEG_builtin
-COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN
-COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN
-COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN
 COND_USE_GUI_1_WXUNIV_1
 COND_USE_GUI_1_WXUNIV_0
 COND_USE_GUI_1_USE_OPENGL_1
@@ -718,7 +737,9 @@ COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_WXUNIV_0
 COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1_WXUNIV_0
 COND_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1
 COND_TOOLKIT_GTK_TOOLKIT_VERSION_3
+COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_1
 COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0
+COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_1
 COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0
 COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1
 COND_TOOLKIT_GTK_TOOLKIT_VERSION_2
@@ -744,8 +765,13 @@ COND_SHARED_0_TOOLKIT_PM_WXUNIV_0
 COND_SHARED_0_TOOLKIT_MSW_WXUNIV_0
 COND_SHARED_0_TOOLKIT_MAC_WXUNIV_0
 COND_SHARED_0
+COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1
+COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_3
+COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1
+COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_2
 COND_PLATFORM_WIN32_1_SHARED_0
 COND_PLATFORM_WIN32_1
+COND_PLATFORM_WIN32_0_TOOLKIT_GTK_TOOLKIT_VERSION_3
 COND_PLATFORM_WIN32_0
 COND_PLATFORM_UNIX_1_USE_PLUGINS_0
 COND_PLATFORM_UNIX_1_USE_GUI_1
@@ -760,7 +786,6 @@ COND_PLATFORM_MSDOS_1
 COND_PLATFORM_MSDOS_0
 COND_PLATFORM_MAC_1
 COND_PLATFORM_MAC_0
-COND_PLATFORM_MACOS_1
 COND_PLATFORM_MACOSX_1_USE_SOVERSION_1
 COND_PLATFORM_MACOSX_1_USE_OPENGL_1
 COND_PLATFORM_MACOSX_1_USE_GUI_1
@@ -770,6 +795,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
@@ -823,26 +852,11 @@ COND_DEPS_TRACKING_1
 COND_DEPS_TRACKING_0
 COND_DEBUG_INFO_1
 COND_DEBUG_INFO_0
-COND_DEBUG_FLAG_1
 COND_DEBUG_FLAG_0
-COND_BUILD_release_UNICODE_1
-COND_BUILD_release_UNICODE_0
 COND_BUILD_release_DEBUG_INFO_default
 COND_BUILD_release
-COND_BUILD_debug_UNICODE_1
-COND_BUILD_debug_UNICODE_0
 COND_BUILD_debug_DEBUG_INFO_default
-COND_BUILD_debug_DEBUG_FLAG_default
 COND_BUILD_debug
-COND_BUILD_RELEASE_UNICODE_1
-COND_BUILD_RELEASE_UNICODE_0
-COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT
-COND_BUILD_RELEASE
-COND_BUILD_DEBUG_UNICODE_1
-COND_BUILD_DEBUG_UNICODE_0
-COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT
-COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT
-COND_BUILD_DEBUG
 BK_MAKE_PCH
 ICC_PCH_USE_SWITCH
 ICC_PCH_CREATE_SWITCH
@@ -909,10 +923,6 @@ TOOLKIT_LOWERCASE
 DEBUG_FLAG
 DEBUG_INFO
 UNICODE
-EXTRALIBS_HILDON
-EXTRALIBS_GNOMEVFS
-EXTRALIBS_GNOMEPRINT
-EXTRALIBS_GTKPRINT
 WITH_PLUGIN_SDL
 EXTRALIBS_STC
 EXTRALIBS_SDL
@@ -952,6 +962,8 @@ HILDON2_LIBS
 HILDON2_CFLAGS
 HILDON_LIBS
 HILDON_CFLAGS
+LIBNOTIFY_LIBS
+LIBNOTIFY_CFLAGS
 GNOMEVFS_LIBS
 GNOMEVFS_CFLAGS
 LIBGNOMEPRINTUI_LIBS
@@ -1098,6 +1110,7 @@ with_libmspack
 with_gtkprint
 with_gnomeprint
 with_gnomevfs
+with_libnotify
 with_hildon
 with_opengl
 with_dmalloc
@@ -1177,6 +1190,7 @@ enable_fontmap
 enable_fs_archive
 enable_fs_inet
 enable_fs_zip
+enable_fsvolume
 enable_fswatcher
 enable_geometry
 enable_log
@@ -1401,6 +1415,8 @@ LIBGNOMEPRINTUI_CFLAGS
 LIBGNOMEPRINTUI_LIBS
 GNOMEVFS_CFLAGS
 GNOMEVFS_LIBS
+LIBNOTIFY_CFLAGS
+LIBNOTIFY_LIBS
 HILDON_CFLAGS
 HILDON_LIBS
 HILDON2_CFLAGS
@@ -1816,7 +1832,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 +1883,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
@@ -2110,6 +2124,7 @@ Optional Features:
   --enable-fs_archive     use virtual archive filesystems
   --enable-fs_inet        use virtual HTTP/FTP filesystems
   --enable-fs_zip         now replaced by fs_archive
+  --enable-fsvolume       use wxFSVolume class
   --enable-fswatcher      use wxFileSystemWatcher class
   --enable-geometry       use geometry class
   --enable-log            use logging system
@@ -2263,7 +2278,7 @@ Optional Features:
   --enable-accessibility  enable accessibility support
   --enable-uiactionsim    use wxUIActionSimulator (experimental)
   --enable-dctransform    use wxDC::SetTransformMatrix and related
-  --enable-webview-webkit use wxWebView WebKit backend
+  --enable-webviewwebkit  use wxWebView WebKit backend
   --enable-palette        use wxPalette class
   --enable-image          use wxImage class
   --enable-gif            use gif images (GIF file format)
@@ -2278,7 +2293,7 @@ Optional Features:
   --enable-ownerdrawn     use owner drawn controls (Win32 and OS/2 only)
   --enable-uxtheme        enable support for Windows XP themed look (Win32 only)
   --enable-wxdib          use wxDIB class (Win32 only)
-  --enable-webview-ie     use wxWebView IE backend (Win32 only)
+  --enable-webviewie      use wxWebView IE backend (Win32 only)
   --enable-autoidman      use automatic ids management
   --disable-largefile     omit support for large files
   --disable-gtktest       do not try to compile and run a test GTK+ program
@@ -2323,6 +2338,7 @@ Optional Packages:
   --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/)
@@ -2399,6 +2415,10 @@ Some influential environment variables:
               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
@@ -2482,9 +2502,9 @@ test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
 wxWidgets configure 2.9.5
-generated by GNU Autoconf 2.67
+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 +2548,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 +2585,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 +2623,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 +2655,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 +2669,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 +2701,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 +2715,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 +2757,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 +2771,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 +2789,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 +2841,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 +2858,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 +2885,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 +2902,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 +2937,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 +3002,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 +3016,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 +3057,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 +3093,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 +3106,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 +3176,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 +3185,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 +3197,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 +3252,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 +3265,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 +3306,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 +3347,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
@@ -3331,7 +3356,7 @@ 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.5, which was
-generated by GNU Autoconf 2.67.  Invocation command line was
+generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
 
@@ -3589,7 +3614,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 +3741,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 +3757,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 +3775,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 +3790,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='-'
@@ -5150,6 +5175,50 @@ fi
 $as_echo "$result" >&6; }
 
 
+          withstring=
+          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}-libnotify" >&5
+$as_echo_n "checking for --${withstring:-with}-libnotify... " >&6; }
+
+# Check whether --with-libnotify was given.
+if test "${with_libnotify+set}" = set; then :
+  withval=$with_libnotify;
+                        if test "$withval" = yes; then
+                          wx_cv_use_libnotify='wxUSE_LIBNOTIFY=yes'
+                        else
+                          wx_cv_use_libnotify='wxUSE_LIBNOTIFY=no'
+                        fi
+
+else
+
+                        wx_cv_use_libnotify='wxUSE_LIBNOTIFY=${'DEFAULT_wxUSE_LIBNOTIFY":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_libnotify"
+
+          if test x"$withstring" = xwithout; then
+            if test $wxUSE_LIBNOTIFY = yes; then
+              result=no
+            else
+              result=yes
+            fi
+          else
+            result=$wxUSE_LIBNOTIFY
+          fi
+
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
+
+
           withstring=
           defaultval=$wxUSE_ALL_FEATURES
           if test -z "$defaultval"; then
@@ -8526,6 +8595,50 @@ fi
 $as_echo "$result" >&6; }
 
 
+          enablestring=
+          defaultval=$wxUSE_ALL_FEATURES
+          if test -z "$defaultval"; then
+              if test x"$enablestring" = xdisable; then
+                  defaultval=yes
+              else
+                  defaultval=no
+              fi
+          fi
+
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --${enablestring:-enable}-fsvolume" >&5
+$as_echo_n "checking for --${enablestring:-enable}-fsvolume... " >&6; }
+          # Check whether --enable-fsvolume was given.
+if test "${enable_fsvolume+set}" = set; then :
+  enableval=$enable_fsvolume;
+                          if test "$enableval" = yes; then
+                            wx_cv_use_fsvolume='wxUSE_FSVOLUME=yes'
+                          else
+                            wx_cv_use_fsvolume='wxUSE_FSVOLUME=no'
+                          fi
+
+else
+
+                          wx_cv_use_fsvolume='wxUSE_FSVOLUME=${'DEFAULT_wxUSE_FSVOLUME":-$defaultval}"
+
+fi
+
+
+          eval "$wx_cv_use_fsvolume"
+
+          if test x"$enablestring" = xdisable; then
+            if test $wxUSE_FSVOLUME = no; then
+              result=yes
+            else
+              result=no
+            fi
+          else
+            result=$wxUSE_FSVOLUME
+          fi
+
+          { $as_echo "$as_me:${as_lineno-$LINENO}: result: $result" >&5
+$as_echo "$result" >&6; }
+
+
           enablestring=
           defaultval=$wxUSE_ALL_FEATURES
           if test -z "$defaultval"; then
@@ -16167,10 +16280,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 +16313,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 +16325,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 +16353,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 +16365,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 +16406,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 +16418,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 +16446,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 +16459,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 +16505,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 +16517,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 +16549,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 +16561,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 +16604,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 +16719,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 +16762,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 +16821,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 +16832,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 +16873,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 +16883,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 +16920,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 +16998,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 +17007,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdarg.h>
 #include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
+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 +17107,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 +17162,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 +17215,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 +17264,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 +17297,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 +17320,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 +17411,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 +17467,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 +17521,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 +17578,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 +17635,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 +17692,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 +17748,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 +17804,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 +17865,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 +17981,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 +17993,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 +18007,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 +18056,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 +18073,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 +18124,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 +18181,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 +18193,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 +18225,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 +18237,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 +18303,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 +18340,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 +18437,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 +18492,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 +18545,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 +18594,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 +18627,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 +18650,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 +18741,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 +18797,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 +18851,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 +18908,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 +18965,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 +19022,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 +19078,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 +19134,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 +19193,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 +19205,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 +19233,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 +19245,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
@@ -19230,7 +19353,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; }
@@ -19317,7 +19440,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
@@ -19354,7 +19477,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
@@ -19471,7 +19594,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
@@ -19491,7 +19614,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
 
@@ -19573,7 +19696,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
@@ -19607,7 +19730,7 @@ 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
 
@@ -19616,7 +19739,7 @@ fi
       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
 
@@ -19683,7 +19806,7 @@ $as_echo "$as_me: WARNING: Building DLLs requires OMF mode, enabled" >&2;}
 
       { $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 :
+if ${ac_cv_string_strcasecmp+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -19721,7 +19844,7 @@ $as_echo "$ac_cv_string_strcasecmp" >&6; }
       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 :
+if ${ac_cv_strings_strcasecmp+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -19767,7 +19890,7 @@ 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
@@ -19914,7 +20037,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
@@ -19937,11 +20060,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
@@ -19950,12 +20073,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
@@ -19964,11 +20113,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;
@@ -19985,8 +20134,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;
@@ -20002,10 +20152,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;
@@ -20035,7 +20185,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
@@ -20082,7 +20232,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 :
@@ -20092,7 +20242,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
@@ -20115,7 +20265,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 :
@@ -20125,7 +20275,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
@@ -20148,7 +20298,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 :
@@ -20158,7 +20308,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
@@ -20181,7 +20331,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 :
@@ -20191,7 +20341,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
@@ -20214,7 +20364,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 :
@@ -20224,7 +20374,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
@@ -20250,7 +20400,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 :
@@ -20260,7 +20410,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
@@ -20285,7 +20435,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 :
@@ -20295,7 +20445,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
@@ -20323,7 +20473,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 :
@@ -20333,7 +20483,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
@@ -20358,7 +20508,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"        "
@@ -20385,7 +20535,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
@@ -20410,7 +20560,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
 
@@ -20466,7 +20616,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
 
@@ -20521,7 +20671,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
 
@@ -20586,7 +20736,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
 
@@ -20629,7 +20779,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
 
@@ -20692,7 +20842,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
 
@@ -20751,7 +20901,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
@@ -20830,7 +20980,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
@@ -20928,7 +21078,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
@@ -20956,7 +21106,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
 
@@ -21044,7 +21194,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
 
@@ -21083,7 +21233,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
 
@@ -21161,7 +21311,7 @@ if test "$wxUSE_STD_STRING" = "yes" -o "$wxUSE_STL" = "yes"; then
 
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $std_string in <string>" >&5
 $as_echo_n "checking for $std_string in <string>... " >&6; }
-if test "${wx_cv_class_stdstring+set}" = set; then :
+if ${wx_cv_class_stdstring+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -21197,7 +21347,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
 
@@ -21255,7 +21405,7 @@ fi
 if test "$wxUSE_STD_IOSTREAM" = "yes"; then
     ac_fn_cxx_check_type "$LINENO" "std::istream" "ac_cv_type_std__istream" "#include <iostream>
 "
-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
@@ -21267,7 +21417,7 @@ else
 fi
 ac_fn_cxx_check_type "$LINENO" "std::ostream" "ac_cv_type_std__ostream" "#include <iostream>
 "
-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
@@ -21292,7 +21442,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
@@ -21332,7 +21482,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
@@ -21379,10 +21529,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
@@ -21422,10 +21572,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
@@ -21468,10 +21618,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
@@ -21512,10 +21662,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
@@ -21558,7 +21708,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
@@ -21674,7 +21824,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
@@ -21703,7 +21853,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
 
@@ -21800,7 +21950,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
 
@@ -21986,10 +22136,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;}
@@ -22002,7 +22163,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
@@ -22013,7 +22174,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
@@ -22036,7 +22197,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
@@ -22047,7 +22208,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
@@ -22079,7 +22240,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
 
@@ -22136,7 +22297,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
 
@@ -22210,7 +22371,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`
@@ -22255,7 +22416,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 :
@@ -22296,7 +22457,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
 
@@ -22308,7 +22469,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
@@ -22342,7 +22503,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
 
@@ -22377,7 +22538,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 :
@@ -22415,7 +22576,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
 
@@ -22424,7 +22585,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
@@ -22458,7 +22619,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
 
@@ -22487,7 +22648,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
@@ -22522,7 +22683,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
@@ -22556,7 +22717,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
 
@@ -22576,7 +22737,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 <windows.h>
 "
-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
@@ -22589,7 +22750,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"        "
@@ -22604,7 +22765,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
@@ -22650,11 +22811,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
@@ -22688,7 +22849,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
 
@@ -22714,6 +22875,89 @@ $as_echo "$as_me: WARNING: system tiff library not found, will use built-in inst
                                                                                     ac_configure_args="$ac_configure_args --disable-jpeg"
         fi
 
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lzma_code in -llzma" >&5
+$as_echo_n "checking for lzma_code in -llzma... " >&6; }
+if ${ac_cv_lib_lzma_lzma_code+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-llzma  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char lzma_code ();
+int
+main ()
+{
+return lzma_code ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_lzma_lzma_code=yes
+else
+  ac_cv_lib_lzma_lzma_code=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lzma_lzma_code" >&5
+$as_echo "$ac_cv_lib_lzma_lzma_code" >&6; }
+if test "x$ac_cv_lib_lzma_lzma_code" = xyes; then :
+  LIBS="$LIBS -llzma"
+fi
+
+
+                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jbg_dec_init in -ljbig" >&5
+$as_echo_n "checking for jbg_dec_init in -ljbig... " >&6; }
+if ${ac_cv_lib_jbig_jbg_dec_init+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-ljbig  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char jbg_dec_init ();
+int
+main ()
+{
+return jbg_dec_init ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_jbig_jbg_dec_init=yes
+else
+  ac_cv_lib_jbig_jbg_dec_init=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jbig_jbg_dec_init" >&5
+$as_echo "$ac_cv_lib_jbig_jbg_dec_init" >&6; }
+if test "x$ac_cv_lib_jbig_jbg_dec_init" = xyes; then :
+  LIBS="$LIBS -ljbig"
+fi
+
+
+
 
 subdirs="$subdirs src/tiff"
 
@@ -22731,7 +22975,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
 
@@ -22739,7 +22983,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
 
@@ -22781,7 +23025,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
@@ -22815,7 +23059,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
 
@@ -22844,7 +23088,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
 
@@ -22852,7 +23096,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
@@ -22886,7 +23130,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
 
@@ -22915,7 +23159,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
@@ -22926,7 +23170,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
 
@@ -23003,7 +23247,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
 
@@ -23055,7 +23299,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
@@ -23069,7 +23313,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
@@ -23317,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
@@ -23331,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
@@ -23608,7 +23852,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
@@ -23622,7 +23866,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
@@ -23880,7 +24124,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
@@ -23894,7 +24138,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
@@ -24242,7 +24486,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
@@ -24276,7 +24520,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
@@ -24286,7 +24530,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
@@ -24353,7 +24597,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
@@ -24367,7 +24611,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
@@ -24396,7 +24640,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
@@ -24410,7 +24654,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
@@ -24592,8 +24836,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.
@@ -24870,7 +25114,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
@@ -24904,14 +25148,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
@@ -24945,7 +25189,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
 
@@ -24964,14 +25208,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
@@ -25005,14 +25249,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
@@ -25046,7 +25290,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
 
@@ -25061,14 +25305,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
@@ -25102,7 +25346,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
 
@@ -25110,14 +25354,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
@@ -25151,7 +25395,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
 
@@ -25159,14 +25403,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
@@ -25200,7 +25444,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
 
@@ -25218,7 +25462,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
@@ -25252,7 +25496,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
 
@@ -25297,7 +25541,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
@@ -25311,7 +25555,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
@@ -25340,7 +25584,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
@@ -25354,7 +25598,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
@@ -25656,7 +25900,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
@@ -25887,7 +26131,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
@@ -25921,7 +26165,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
 
@@ -25931,7 +26175,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
@@ -25970,7 +26214,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
@@ -26051,7 +26295,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
 
@@ -26103,7 +26347,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
@@ -26137,7 +26381,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
@@ -26238,7 +26482,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
 
@@ -26311,7 +26555,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
@@ -26328,7 +26572,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
@@ -26357,7 +26601,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
@@ -26371,7 +26615,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
@@ -26400,7 +26644,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
@@ -26414,7 +26658,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
@@ -26529,7 +26773,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
@@ -26563,7 +26807,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
 
@@ -26600,7 +26844,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
@@ -26634,7 +26878,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
 
@@ -26714,7 +26958,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 <windows.h>
 "
-if test "x$ac_cv_header_ddraw_h" = x""yes; then :
+if test "x$ac_cv_header_ddraw_h" = xyes; then :
 
 fi
 
@@ -26736,7 +26980,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
@@ -26750,7 +26994,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
@@ -26779,7 +27023,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
@@ -26793,7 +27037,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
@@ -26908,7 +27152,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
@@ -26942,7 +27186,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
 
@@ -26979,7 +27223,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
@@ -27013,7 +27257,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
 
@@ -27073,7 +27317,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
@@ -27102,7 +27346,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
@@ -27116,7 +27360,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
@@ -27145,7 +27389,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
@@ -27159,7 +27403,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
@@ -27274,7 +27518,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
@@ -27308,7 +27552,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
 
@@ -27345,7 +27589,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
@@ -27379,7 +27623,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
 
@@ -27508,11 +27752,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
 
@@ -27528,7 +27772,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
@@ -27542,7 +27786,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
@@ -27571,7 +27815,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
@@ -27585,7 +27829,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
@@ -27700,7 +27944,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
@@ -27734,7 +27978,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
 
@@ -27771,7 +28015,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
@@ -27805,7 +28049,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
 
@@ -27888,7 +28132,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
@@ -27902,7 +28146,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
@@ -27931,7 +28175,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
@@ -27945,7 +28189,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
@@ -28060,7 +28304,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
@@ -28094,7 +28338,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
 
@@ -28131,7 +28375,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
@@ -28165,7 +28409,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
 
@@ -28255,7 +28499,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
@@ -28269,7 +28513,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
@@ -28298,7 +28542,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
@@ -28312,7 +28556,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
@@ -28427,7 +28671,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
@@ -28461,7 +28705,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
 
@@ -28498,7 +28742,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
@@ -28532,7 +28776,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
 
@@ -28672,7 +28916,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
 
@@ -28757,7 +29001,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
 
@@ -28824,7 +29068,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
 
@@ -28877,7 +29121,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
 
@@ -29167,7 +29411,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
@@ -29184,7 +29428,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
 
@@ -29195,7 +29439,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
 
@@ -29206,7 +29450,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
 
@@ -29217,7 +29461,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
 
@@ -29229,7 +29473,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
@@ -29246,7 +29490,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
 
@@ -29286,7 +29530,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
@@ -29326,7 +29570,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
@@ -29378,7 +29622,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
 
@@ -29425,7 +29669,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
@@ -29438,7 +29682,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
@@ -29472,14 +29716,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
@@ -29513,7 +29757,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
@@ -29547,7 +29791,7 @@ fi
 
 ac_fn_c_check_type "$LINENO" "mbstate_t" "ac_cv_type_mbstate_t" "#include <wchar.h>
 "
-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
@@ -29556,7 +29800,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
@@ -29589,7 +29833,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
 
@@ -29630,7 +29874,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
 
@@ -29682,7 +29926,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
 
@@ -29731,7 +29975,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
 
@@ -29785,7 +30029,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
 
@@ -29848,7 +30092,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
@@ -29868,7 +30112,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
 
@@ -29951,7 +30195,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
 
@@ -30015,7 +30259,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
 
@@ -30092,7 +30336,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
 
@@ -30152,7 +30396,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
@@ -30214,7 +30458,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
@@ -30232,7 +30476,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
 
@@ -30289,79 +30533,139 @@ fi
 if test "$wxUSE_STACKWALKER" = "yes" -a "$wxUSE_UNIX" = "yes"; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for backtrace() in <execinfo.h>" >&5
 $as_echo_n "checking for backtrace() in <execinfo.h>... " >&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 <execinfo.h>
 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 <cxxabi.h>" >&5
+        if test "$ac_cv_header_cxxabi_h" = "yes"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __cxa_demangle() in <cxxabi.h>" >&5
 $as_echo_n "checking for __cxa_demangle() in <cxxabi.h>... " >&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 <cxxabi.h>
 int
 main ()
 {
 
-                        int rc;
-                        __cxxabiv1::__cxa_demangle("foo", 0, 0, &rc);
+                            int rc;
+                            __cxxabiv1::__cxa_demangle("foo", 0, 0, &rc);
 
   ;
   return 0;
@@ -30375,7 +30679,7 @@ else
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-                ac_ext=c
+                    ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -30386,6 +30690,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $wx_cv_func_cxa_demangle" >&5
 $as_echo "$wx_cv_func_cxa_demangle" >&6; }
+        else
+            wx_cv_func_cxa_demangle=no
+        fi
 
         if test "$wx_cv_func_cxa_demangle" = "yes"; then
             $as_echo "#define HAVE_CXA_DEMANGLE 1" >>confdefs.h
@@ -30416,7 +30723,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
@@ -30459,7 +30766,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
@@ -30518,7 +30825,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
@@ -30552,7 +30859,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
@@ -30683,7 +30990,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
@@ -30711,7 +31018,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
@@ -30721,7 +31028,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
@@ -30755,7 +31062,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
 
@@ -30768,7 +31075,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
 
@@ -30837,7 +31144,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
 
@@ -30894,7 +31201,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
 
@@ -30952,7 +31259,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
 
@@ -31008,7 +31315,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
@@ -31018,7 +31325,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
@@ -31052,13 +31359,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
@@ -31092,13 +31399,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
@@ -31132,7 +31439,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
@@ -31154,7 +31461,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
@@ -31165,7 +31472,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
@@ -31221,7 +31528,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
 
@@ -31279,7 +31586,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
 
@@ -31336,7 +31643,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
 
@@ -31400,7 +31707,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
 
@@ -31528,10 +31835,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;}
@@ -31714,7 +32032,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
@@ -31725,7 +32043,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
@@ -31744,7 +32062,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
 
@@ -31801,7 +32119,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
@@ -31812,14 +32130,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
@@ -31853,7 +32171,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
@@ -31870,16 +32188,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
@@ -31913,7 +32231,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"
@@ -31939,7 +32257,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
@@ -31949,7 +32267,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
@@ -31959,7 +32277,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
@@ -31968,7 +32286,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
 
@@ -32004,7 +32322,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
 
@@ -32040,7 +32358,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
 
@@ -32094,7 +32412,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
 
@@ -32198,7 +32516,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
 
@@ -32241,6 +32559,59 @@ $as_echo "yes, it works" >&6; }
 
           fi
         fi
+
+        if test "$ac_cv_header_cxxabi_h" = "yes"; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for abi::__forced_unwind() in <cxxabi.h>" >&5
+$as_echo_n "checking for abi::__forced_unwind() in <cxxabi.h>... " >&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 <cxxabi.h>
+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
@@ -32251,7 +32622,7 @@ else
         *-*-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
 
@@ -32297,13 +32668,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
@@ -32320,7 +32691,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
 
@@ -32512,7 +32883,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
@@ -32521,7 +32892,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
 
@@ -32637,7 +33008,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
@@ -32829,7 +33200,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
@@ -32842,7 +33213,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
@@ -32876,7 +33247,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
 
@@ -32888,7 +33259,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
@@ -32901,7 +33272,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
@@ -32935,7 +33306,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"
@@ -32958,7 +33329,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
@@ -32968,7 +33339,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
@@ -33002,7 +33373,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
@@ -33076,7 +33447,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
@@ -33093,7 +33464,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
@@ -33159,7 +33530,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
 
@@ -33276,7 +33647,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
@@ -33290,7 +33661,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
@@ -33513,7 +33884,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
@@ -33527,7 +33898,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
@@ -33556,7 +33927,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
@@ -33570,7 +33941,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
@@ -33708,6 +34079,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
@@ -33810,6 +34182,7 @@ else
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 
+                        GUI_TK_LIBRARY="$GUI_TK_LIBRARY $LIBGNOMEPRINTUI_LIBS"
                         CFLAGS="$LIBGNOMEPRINTUI_CFLAGS $CFLAGS"
                         CXXFLAGS="$LIBGNOMEPRINTUI_CFLAGS $CXXFLAGS"
                         $as_echo "#define wxUSE_LIBGNOMEPRINT 1" >>confdefs.h
@@ -33900,6 +34273,7 @@ else
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 
+                        GUI_TK_LIBRARY="$GUI_TK_LIBRARY $GNOMEVFS_LIBS"
                         CFLAGS="$GNOMEVFS_CFLAGS $CFLAGS"
                         CXXFLAGS="$GNOMEVFS_CFLAGS $CXXFLAGS"
                         $as_echo "#define wxUSE_LIBGNOMEVFS 1" >>confdefs.h
@@ -33909,6 +34283,243 @@ fi
         fi
     fi
 
+    if test "$wxUSE_NOTIFICATION_MESSAGE" = "yes" ; then
+        if test "$wxUSE_LIBNOTIFY" = "yes" ; then
+            HAVE_LIBNOTIFY=0
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBNOTIFY" >&5
+$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 LIBNOTIFY" >&5
+$as_echo_n "checking for LIBNOTIFY... " >&6; }
+
+if test -n "$PKG_CONFIG"; then
+    if test -n "$LIBNOTIFY_CFLAGS"; then
+        pkg_cv_LIBNOTIFY_CFLAGS="$LIBNOTIFY_CFLAGS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify >= 0.4\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libnotify >= 0.4") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_LIBNOTIFY_CFLAGS=`$PKG_CONFIG --cflags "libnotify >= 0.4" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+    fi
+else
+	pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+    if test -n "$LIBNOTIFY_LIBS"; then
+        pkg_cv_LIBNOTIFY_LIBS="$LIBNOTIFY_LIBS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify >= 0.4\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libnotify >= 0.4") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_LIBNOTIFY_LIBS=`$PKG_CONFIG --libs "libnotify >= 0.4" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+    fi
+else
+	pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libnotify >= 0.4"`
+        else
+	        LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libnotify >= 0.4"`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$LIBNOTIFY_PKG_ERRORS" >&5
+
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libnotify not found, wxNotificationMessage will use generic implementation." >&5
+$as_echo "$as_me: WARNING: libnotify not found, wxNotificationMessage will use generic implementation." >&2;}
+
+elif test $pkg_failed = untried; then
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libnotify not found, wxNotificationMessage will use generic implementation." >&5
+$as_echo "$as_me: WARNING: libnotify not found, wxNotificationMessage will use generic implementation." >&2;}
+
+else
+	LIBNOTIFY_CFLAGS=$pkg_cv_LIBNOTIFY_CFLAGS
+	LIBNOTIFY_LIBS=$pkg_cv_LIBNOTIFY_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	HAVE_LIBNOTIFY=1
+fi
+
+
+elif test $pkg_failed = untried; then
+
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBNOTIFY" >&5
+$as_echo_n "checking for LIBNOTIFY... " >&6; }
+
+if test -n "$PKG_CONFIG"; then
+    if test -n "$LIBNOTIFY_CFLAGS"; then
+        pkg_cv_LIBNOTIFY_CFLAGS="$LIBNOTIFY_CFLAGS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify >= 0.4\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libnotify >= 0.4") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_LIBNOTIFY_CFLAGS=`$PKG_CONFIG --cflags "libnotify >= 0.4" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+    fi
+else
+	pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+    if test -n "$LIBNOTIFY_LIBS"; then
+        pkg_cv_LIBNOTIFY_LIBS="$LIBNOTIFY_LIBS"
+    else
+        if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify >= 0.4\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libnotify >= 0.4") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_LIBNOTIFY_LIBS=`$PKG_CONFIG --libs "libnotify >= 0.4" 2>/dev/null`
+else
+  pkg_failed=yes
+fi
+    fi
+else
+	pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libnotify >= 0.4"`
+        else
+	        LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libnotify >= 0.4"`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$LIBNOTIFY_PKG_ERRORS" >&5
+
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libnotify not found, wxNotificationMessage will use generic implementation." >&5
+$as_echo "$as_me: WARNING: libnotify not found, wxNotificationMessage will use generic implementation." >&2;}
+
+elif test $pkg_failed = untried; then
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libnotify not found, wxNotificationMessage will use generic implementation." >&5
+$as_echo "$as_me: WARNING: libnotify not found, wxNotificationMessage will use generic implementation." >&2;}
+
+else
+	LIBNOTIFY_CFLAGS=$pkg_cv_LIBNOTIFY_CFLAGS
+	LIBNOTIFY_LIBS=$pkg_cv_LIBNOTIFY_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	HAVE_LIBNOTIFY=1
+fi
+
+
+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
+
     if test "$wxUSE_LIBHILDON" = "yes" ; then
 
 pkg_failed=no
@@ -33990,7 +34601,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
@@ -34078,7 +34689,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
@@ -34184,6 +34795,11 @@ $as_echo "$as_me: WARNING: wxZipFSHandler requires wxArchiveFSHandler... disable
   fi
 fi
 
+if test "$wxUSE_FSVOLUME" = "yes"; then
+  $as_echo "#define wxUSE_FSVOLUME 1" >>confdefs.h
+
+fi
+
 if test "$wxUSE_ON_FATAL_EXCEPTION" = "yes"; then
   if test "$USE_UNIX" != 1; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Catching fatal exceptions not currently supported on this system, wxApp::OnFatalException will not be called" >&5
@@ -34311,7 +34927,7 @@ if test "$wxUSE_XLOCALE" = "yes" ; then
     ac_fn_c_check_type "$LINENO" "locale_t" "ac_cv_type_locale_t" "#include <xlocale.h>
                     #include <locale.h>
 "
-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
@@ -34390,7 +35006,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
@@ -34427,7 +35043,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
 
@@ -34496,7 +35112,7 @@ fi
 if test "$wxUSE_DATETIME" = "yes"; then
             { $as_echo "$as_me:${as_lineno-$LINENO}: checking for timezone variable in <time.h>" >&5
 $as_echo_n "checking for timezone variable in <time.h>... " >&6; }
-if test "${wx_cv_var_timezone+set}" = set; then :
+if ${wx_cv_var_timezone+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -34610,7 +35226,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
@@ -34622,7 +35238,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
 
@@ -34666,16 +35282,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
@@ -34709,7 +35338,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
@@ -34733,7 +35362,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
 
@@ -34845,7 +35474,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
 
@@ -34955,7 +35584,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
 
@@ -35107,7 +35736,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
@@ -35151,7 +35780,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
@@ -35179,7 +35808,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
 
@@ -35303,7 +35932,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
 
@@ -35997,7 +36626,7 @@ if test "$wxUSE_WEBKIT" = "yes"; then
                            #include <WebKit/WebKit.h>
 
 "
-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
 
@@ -36073,7 +36702,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
@@ -36087,7 +36716,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
@@ -36269,7 +36898,7 @@ fi
                                 #include <WebKit/WebKit.h>
 
 "
-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"
@@ -36493,7 +37122,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
 
@@ -36618,7 +37247,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
@@ -36843,6 +37472,9 @@ fi
         else
             USE_MEDIA=0
         fi
+
+    elif test "$wxUSE_MAC" = 1; then
+                           GST_LIBS="-framework QTKit"
     fi
 
     if test $USE_MEDIA = 1; then
@@ -36963,7 +37595,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
@@ -37011,7 +37643,7 @@ if test "$wxUSE_GUI" = "yes"; then
 
 
         SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS artprov controls dialogs drawing \
-                     erase event exec font image minimal render \
+                     erase event exec font image minimal preferences render \
                      shaped svg taborder vscroll widgets wrapsizer"
 
     if test "$wxUSE_MONOLITHIC" != "yes"; then
@@ -37049,7 +37681,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"
@@ -37149,7 +37781,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"
@@ -37252,10 +37884,6 @@ fi
 
 
 
-
-
-
-
 
 
 
@@ -37290,6 +37918,9 @@ case "$TOOLKIT" in
             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
@@ -37320,7 +37951,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
 
@@ -37380,7 +38011,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
@@ -37400,7 +38031,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.
@@ -37477,7 +38108,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
@@ -37489,7 +38120,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
@@ -37517,7 +38148,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
@@ -37529,7 +38160,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
@@ -37581,7 +38212,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
@@ -37624,7 +38255,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
@@ -37636,7 +38267,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
@@ -37664,7 +38295,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
@@ -37676,7 +38307,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
@@ -37720,7 +38351,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
@@ -37732,7 +38363,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
@@ -37760,7 +38391,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
@@ -37772,7 +38403,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
@@ -37812,7 +38443,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
@@ -37824,7 +38455,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
@@ -37852,7 +38483,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
@@ -37864,7 +38495,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
@@ -37914,7 +38545,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
 
@@ -38271,7 +38902,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
 
@@ -38339,7 +38970,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
@@ -38351,7 +38982,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
@@ -39159,7 +39790,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
@@ -39171,7 +39802,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
@@ -39199,7 +39830,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
@@ -39211,7 +39842,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
@@ -39253,7 +39884,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
@@ -39265,7 +39896,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
@@ -39291,7 +39922,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
@@ -39303,7 +39934,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
@@ -39497,76 +40128,16 @@ EOF
 
 
 
-    COND_BUILD_DEBUG="#"
-    if test "x$BUILD" = "xdebug" ; then
-        COND_BUILD_DEBUG=""
-    fi
-
-    COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT="#"
-    if test "x$BUILD" = "xdebug" -a "x$DEBUG_FLAG" = "xdefault" ; then
-        COND_BUILD_DEBUG_DEBUG_FLAG_DEFAULT=""
-    fi
-
-    COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT="#"
-    if test "x$BUILD" = "xdebug" -a "x$DEBUG_INFO" = "xdefault" ; then
-        COND_BUILD_DEBUG_DEBUG_INFO_DEFAULT=""
-    fi
-
-    COND_BUILD_DEBUG_UNICODE_0="#"
-    if test "x$BUILD" = "xdebug" -a "x$UNICODE" = "x0" ; then
-        COND_BUILD_DEBUG_UNICODE_0=""
-    fi
-
-    COND_BUILD_DEBUG_UNICODE_1="#"
-    if test "x$BUILD" = "xdebug" -a "x$UNICODE" = "x1" ; then
-        COND_BUILD_DEBUG_UNICODE_1=""
-    fi
-
-    COND_BUILD_RELEASE="#"
-    if test "x$BUILD" = "xrelease" ; then
-        COND_BUILD_RELEASE=""
-    fi
-
-    COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT="#"
-    if test "x$BUILD" = "xrelease" -a "x$DEBUG_INFO" = "xdefault" ; then
-        COND_BUILD_RELEASE_DEBUG_INFO_DEFAULT=""
-    fi
-
-    COND_BUILD_RELEASE_UNICODE_0="#"
-    if test "x$BUILD" = "xrelease" -a "x$UNICODE" = "x0" ; then
-        COND_BUILD_RELEASE_UNICODE_0=""
-    fi
-
-    COND_BUILD_RELEASE_UNICODE_1="#"
-    if test "x$BUILD" = "xrelease" -a "x$UNICODE" = "x1" ; then
-        COND_BUILD_RELEASE_UNICODE_1=""
-    fi
-
     COND_BUILD_debug="#"
     if test "x$BUILD" = "xdebug" ; then
         COND_BUILD_debug=""
     fi
 
-    COND_BUILD_debug_DEBUG_FLAG_default="#"
-    if test "x$BUILD" = "xdebug" -a "x$DEBUG_FLAG" = "xdefault" ; then
-        COND_BUILD_debug_DEBUG_FLAG_default=""
-    fi
-
     COND_BUILD_debug_DEBUG_INFO_default="#"
     if test "x$BUILD" = "xdebug" -a "x$DEBUG_INFO" = "xdefault" ; then
         COND_BUILD_debug_DEBUG_INFO_default=""
     fi
 
-    COND_BUILD_debug_UNICODE_0="#"
-    if test "x$BUILD" = "xdebug" -a "x$UNICODE" = "x0" ; then
-        COND_BUILD_debug_UNICODE_0=""
-    fi
-
-    COND_BUILD_debug_UNICODE_1="#"
-    if test "x$BUILD" = "xdebug" -a "x$UNICODE" = "x1" ; then
-        COND_BUILD_debug_UNICODE_1=""
-    fi
-
     COND_BUILD_release="#"
     if test "x$BUILD" = "xrelease" ; then
         COND_BUILD_release=""
@@ -39577,26 +40148,11 @@ EOF
         COND_BUILD_release_DEBUG_INFO_default=""
     fi
 
-    COND_BUILD_release_UNICODE_0="#"
-    if test "x$BUILD" = "xrelease" -a "x$UNICODE" = "x0" ; then
-        COND_BUILD_release_UNICODE_0=""
-    fi
-
-    COND_BUILD_release_UNICODE_1="#"
-    if test "x$BUILD" = "xrelease" -a "x$UNICODE" = "x1" ; then
-        COND_BUILD_release_UNICODE_1=""
-    fi
-
     COND_DEBUG_FLAG_0="#"
     if test "x$DEBUG_FLAG" = "x0" ; then
         COND_DEBUG_FLAG_0=""
     fi
 
-    COND_DEBUG_FLAG_1="#"
-    if test "x$DEBUG_FLAG" = "x1" ; then
-        COND_DEBUG_FLAG_1=""
-    fi
-
     COND_DEBUG_INFO_0="#"
     if test "x$DEBUG_INFO" = "x0" ; then
         COND_DEBUG_INFO_0=""
@@ -39862,6 +40418,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=""
@@ -39907,11 +40483,6 @@ EOF
         COND_PLATFORM_MACOSX_1_USE_SOVERSION_1=""
     fi
 
-    COND_PLATFORM_MACOS_1="#"
-    if test "x$PLATFORM_MACOS" = "x1" ; then
-        COND_PLATFORM_MACOS_1=""
-    fi
-
     COND_PLATFORM_MAC_0="#"
     if test "x$PLATFORM_MAC" = "x0" ; then
         COND_PLATFORM_MAC_0=""
@@ -39982,6 +40553,11 @@ EOF
         COND_PLATFORM_WIN32_0=""
     fi
 
+    COND_PLATFORM_WIN32_0_TOOLKIT_GTK_TOOLKIT_VERSION_3="#"
+    if test "x$PLATFORM_WIN32" = "x0" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x3" ; then
+        COND_PLATFORM_WIN32_0_TOOLKIT_GTK_TOOLKIT_VERSION_3=""
+    fi
+
     COND_PLATFORM_WIN32_1="#"
     if test "x$PLATFORM_WIN32" = "x1" ; then
         COND_PLATFORM_WIN32_1=""
@@ -39992,6 +40568,26 @@ EOF
         COND_PLATFORM_WIN32_1_SHARED_0=""
     fi
 
+    COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_2="#"
+    if test "x$PLATFORM_WIN32" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x2" ; then
+        COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_2=""
+    fi
+
+    COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1="#"
+    if test "x$PLATFORM_WIN32" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x2" -a "x$USE_GUI" = "x1" ; then
+        COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1=""
+    fi
+
+    COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_3="#"
+    if test "x$PLATFORM_WIN32" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x3" ; then
+        COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_3=""
+    fi
+
+    COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1="#"
+    if test "x$PLATFORM_WIN32" = "x1" -a "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x3" -a "x$USE_GUI" = "x1" ; then
+        COND_PLATFORM_WIN32_1_TOOLKIT_GTK_TOOLKIT_VERSION_3_USE_GUI_1=""
+    fi
+
     COND_SHARED_0="#"
     if test "x$SHARED" = "x0" ; then
         COND_SHARED_0=""
@@ -40117,11 +40713,21 @@ EOF
         COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_0=""
     fi
 
+    COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_1="#"
+    if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x2" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x1" ; then
+        COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_USE_GUI_1_WXUNIV_1=""
+    fi
+
     COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0="#"
     if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x2" -a "x$WXUNIV" = "x0" ; then
         COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_0=""
     fi
 
+    COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_1="#"
+    if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x2" -a "x$WXUNIV" = "x1" ; then
+        COND_TOOLKIT_GTK_TOOLKIT_VERSION_2_WXUNIV_1=""
+    fi
+
     COND_TOOLKIT_GTK_TOOLKIT_VERSION_3="#"
     if test "x$TOOLKIT" = "xGTK" -a "x$TOOLKIT_VERSION" = "x3" ; then
         COND_TOOLKIT_GTK_TOOLKIT_VERSION_3=""
@@ -40322,21 +40928,6 @@ EOF
         COND_USE_GUI_1_WXUNIV_1=""
     fi
 
-    COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN="#"
-    if test "x$USE_GUI" = "x1" -a "x$wxUSE_LIBJPEG" = "xbuiltin" ; then
-        COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN=""
-    fi
-
-    COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN="#"
-    if test "x$USE_GUI" = "x1" -a "x$wxUSE_LIBPNG" = "xbuiltin" ; then
-        COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN=""
-    fi
-
-    COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN="#"
-    if test "x$USE_GUI" = "x1" -a "x$wxUSE_LIBTIFF" = "xbuiltin" ; then
-        COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN=""
-    fi
-
     COND_USE_GUI_1_wxUSE_LIBJPEG_builtin="#"
     if test "x$USE_GUI" = "x1" -a "x$wxUSE_LIBJPEG" = "xbuiltin" ; then
         COND_USE_GUI_1_wxUSE_LIBJPEG_builtin=""
@@ -40447,36 +41038,6 @@ EOF
         COND_WXUNIV_1=""
     fi
 
-    COND_WXUSE_EXPAT_BUILTIN="#"
-    if test "x$wxUSE_EXPAT" = "xbuiltin" ; then
-        COND_WXUSE_EXPAT_BUILTIN=""
-    fi
-
-    COND_WXUSE_LIBJPEG_BUILTIN="#"
-    if test "x$wxUSE_LIBJPEG" = "xbuiltin" ; then
-        COND_WXUSE_LIBJPEG_BUILTIN=""
-    fi
-
-    COND_WXUSE_LIBPNG_BUILTIN="#"
-    if test "x$wxUSE_LIBPNG" = "xbuiltin" ; then
-        COND_WXUSE_LIBPNG_BUILTIN=""
-    fi
-
-    COND_WXUSE_LIBTIFF_BUILTIN="#"
-    if test "x$wxUSE_LIBTIFF" = "xbuiltin" ; then
-        COND_WXUSE_LIBTIFF_BUILTIN=""
-    fi
-
-    COND_WXUSE_REGEX_BUILTIN="#"
-    if test "x$wxUSE_REGEX" = "xbuiltin" ; then
-        COND_WXUSE_REGEX_BUILTIN=""
-    fi
-
-    COND_WXUSE_ZLIB_BUILTIN="#"
-    if test "x$wxUSE_ZLIB" = "xbuiltin" ; then
-        COND_WXUSE_ZLIB_BUILTIN=""
-    fi
-
     COND_wxUSE_EXPAT_builtin="#"
     if test "x$wxUSE_EXPAT" = "xbuiltin" ; then
         COND_wxUSE_EXPAT_builtin=""
@@ -40547,7 +41108,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
@@ -40559,7 +41120,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
@@ -40750,7 +41311,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
@@ -40849,7 +41410,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
@@ -40863,7 +41424,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
@@ -41053,10 +41614,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;}
@@ -41088,7 +41660,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"
@@ -41189,6 +41761,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
@@ -41384,16 +41957,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
@@ -41453,28 +42026,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'"
@@ -41496,7 +42057,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # values after options handling.
 ac_log="
 This file was extended by wxWidgets $as_me 2.9.5, which was
-generated by GNU Autoconf 2.67.  Invocation command line was
+generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -41562,10 +42123,10 @@ 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.5
-configured by $0, generated by GNU Autoconf 2.67,
+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."
 
@@ -41654,7 +42215,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'
@@ -41708,7 +42269,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
 
@@ -41731,9 +42292,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
 }
@@ -41741,12 +42303,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.
@@ -41768,7 +42331,7 @@ else
   ac_cs_awk_cr=$ac_cr
 fi
 
-echo 'BEGIN {' >"$tmp/subs1.awk" &&
+echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
 _ACEOF
 
 
@@ -41796,7 +42359,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
@@ -41844,7 +42407,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 = ""
 
@@ -41876,7 +42439,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
 
@@ -41910,7 +42473,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
 
@@ -41922,8 +42485,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
@@ -42024,7 +42587,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
@@ -42043,7 +42606,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 `:'.
@@ -42052,7 +42615,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'"
@@ -42078,8 +42641,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
@@ -42209,21 +42772,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
  ;;
@@ -42234,20 +42798,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
  ;;