Merge lp:~n-muench/ubuntu/precise/open-vm-tools/open-vm-tools-precise.sid-sync1a into lp:ubuntu/precise/open-vm-tools

[Nate Muench (Mink)]

Hopefully, everything is in order this time.

The previous merge attemt
https://code.launchpad.net/~n-muench/ubuntu/precise/open-vm-tools/open-vm-tools-precise.sid-merge1

=== modified file 'ChangeLog'
--- ChangeLog	2011-07-22 16:41:03 +0000
+++ ChangeLog	2012-01-24 04:56:25 +0000
@@ -1,3 +1,28 @@
+2011.12.20  Marcelo Vanzin  <[e-mail]>
+	This release tag contains commits up to the following id:
+	dfca5cf9d1c2335c5d001deedd9266c84956b508
+
+
+2011.11.20  Marcelo Vanzin  <[e-mail]>
+	This release tag contains commits up to the following id:
+	6c197b8e5eccf32bfee0e2452d8926968182aada
+
+
+2011.10.26  Marcelo Vanzin  <[e-mail]>
+	This release tag contains commits up to the following id:
+	6271fde90248a4fd49e38aa61498db9e1dbf37c3
+
+
+2011.09.23  Marcelo Vanzin  <[e-mail]>
+	This release tag contains commits up to the following id:
+	05baddbed1c5e47e9789a44d30bb217d7184232a
+
+
+2011.08.21  Marcelo Vanzin  <[e-mail]>
+	This release tag contains commits up to the following id:
+	2b3d76ba776f55d06fb5b62499b189ebd6bc1c75
+
+
 2011.07.19  Marcelo Vanzin  <[e-mail]>
 	This release tag contains commits up to the following id:
 	5bed6f1369ca6e9c2c7fbaf4205d86e50f219c5f
 
=== modified file 'Makefile.in'
--- Makefile.in	2011-07-22 16:41:03 +0000
+++ Makefile.in	2012-01-24 04:56:25 +0000
@@ -170,8 +170,6 @@
 FGREP = @FGREP@
 FUSE_CPPFLAGS = @FUSE_CPPFLAGS@
 FUSE_LIBS = @FUSE_LIBS@
-GIO_CPPFLAGS = @GIO_CPPFLAGS@
-GIO_LIBS = @GIO_LIBS@
 GLIB2_CPPFLAGS = @GLIB2_CPPFLAGS@
 GLIB2_LIBS = @GLIB2_LIBS@
 GMODULE_CPPFLAGS = @GMODULE_CPPFLAGS@
@@ -200,8 +198,6 @@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
-LIBPNG_CPPFLAGS = @LIBPNG_CPPFLAGS@
-LIBPNG_LIBS = @LIBPNG_LIBS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
 LIBVMTOOLS_LIBADD = @LIBVMTOOLS_LIBADD@
@@ -252,8 +248,6 @@
 TARGET_OS = @TARGET_OS@
 TEST_PLUGIN_INSTALLDIR = @TEST_PLUGIN_INSTALLDIR@
 TOOLS_VERSION = @TOOLS_VERSION@
-URIPARSER_CPPFLAGS = @URIPARSER_CPPFLAGS@
-URIPARSER_LIBS = @URIPARSER_LIBS@
 VERSION = @VERSION@
 VIX_LIBADD = @VIX_LIBADD@
 VMSVC_PLUGIN_INSTALLDIR = @VMSVC_PLUGIN_INSTALLDIR@
@@ -268,8 +262,6 @@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ZLIB_CPPFLAGS = @ZLIB_CPPFLAGS@
-ZLIB_LIBS = @ZLIB_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 
=== modified file 'NEWS'
--- NEWS	2011-07-22 16:41:03 +0000
+++ NEWS	2012-01-24 04:56:25 +0000
@@ -1,3 +1,46 @@
+open-vm-tools 2011.12.20 changes:
+	* Updates for new Linux kernel releases, including some fixes for
+	Fedora's re-versioned 3.x kernels.
+
+	* VMCI sockets has some changes for a new socket type, targeted
+	at replacing the "backdoor" communication used by the tools services.
+
+	* HGFS has better session support.
+
+	* Miscelaneous bug fixes and small enhancements in other parts
+	of the code.
+
+open-vm-tools 2011.11.20 changes:
+	* Updates for new Linux kernel releases.
+
+	* Better Unity and DnD compatibility with newer Linux distros.
+
+	* Other minor fixes and cleanups.
+
+open-vm-tools 2011.10.26 changes:
+	* Mostly cleanups and bug fixes.
+
+	* Code can now compile with uClibc, with some caveats.
+
+open-vm-tools 2011.09.23 changes:
+	* open-vm-tools now can use the built in Linux freeze / thaw
+	support for block devices, making the vmsync driver unnecessary
+	in kernels supporting that feature.
+
+	* The VMCI driver has been simplified, removing VM-to-VM
+	communication support (which is being removed from VMware products).
+
+	* The Unity team decided to remove the Unity plugin from open-vm-tools,
+	given its partial brokenness due to reliance on internally-modified
+	version of GNOME libraries, among other reasons.
+
+	* Other bug fixes and code cleanup.
+
+open-vm-tools 2011.08.21 changes:
+	* Enabled several VIX APIs on FreeBSD.
+
+	* Minor bug fixes and code cleanup.
+
 open-vm-tools 2011.07.19 changes:
 	* Fix an issue in the HGFS driver that could lead to a kernel
 	  panic.
 
=== modified file 'autom4te.cache/output.0'
--- autom4te.cache/output.0	2011-07-22 16:41:03 +0000
+++ autom4te.cache/output.0	2012-01-24 04:56:25 +0000
@@ -1,6 +1,6 @@
 @%:@! /bin/sh
 @%:@ Guess values for system-dependent variables and create Makefiles.
-@%:@ Generated by GNU Autoconf 2.67 for open-vm-tools 2011.07.19.
+@%:@ Generated by GNU Autoconf 2.67 for open-vm-tools 2011.12.20.
 @%:@
 @%:@ Report bugs to <[e-mail]>.
 @%:@ 
@@ -701,8 +701,8 @@
 # Identity of this package.
 PACKAGE_NAME='open-vm-tools'
 PACKAGE_TARNAME='open-vm-tools'
-PACKAGE_VERSION='2011.07.19'
-PACKAGE_STRING='open-vm-tools 2011.07.19'
+PACKAGE_VERSION='2011.12.20'
+PACKAGE_STRING='open-vm-tools 2011.12.20'
 PACKAGE_BUGREPORT='[e-mail]'
 PACKAGE_URL=''
 
@@ -777,6 +777,8 @@
 TARGET_OS
 TOOLS_VERSION
 HGFS_LIBS
+USE_PRINTF_WRAPPERS_FALSE
+USE_PRINTF_WRAPPERS_TRUE
 USE_SLASH_PROC_FALSE
 USE_SLASH_PROC_TRUE
 HAVE_PAM_FALSE
@@ -795,8 +797,6 @@
 WITH_ROOT_PRIVILEGES_TRUE
 ENABLE_TESTS_FALSE
 ENABLE_TESTS_TRUE
-ENABLE_UNITY_FALSE
-ENABLE_UNITY_TRUE
 HAVE_XCOMPOSITE_FALSE
 HAVE_XCOMPOSITE_TRUE
 HAVE_XSM_FALSE
@@ -836,14 +836,6 @@
 GTKMM_CPPFLAGS
 GTK_LIBS
 GTK_CPPFLAGS
-GIO_LIBS
-GIO_CPPFLAGS
-ZLIB_LIBS
-ZLIB_CPPFLAGS
-LIBPNG_LIBS
-LIBPNG_CPPFLAGS
-URIPARSER_LIBS
-URIPARSER_CPPFLAGS
 CUNIT_LIBS
 CUNIT_CPPFLAGS
 PAM_LIBS
@@ -986,7 +978,6 @@
 with_kernel_release
 with_linuxdir
 enable_multimon
-enable_unity
 with_gtk2
 with_gtkmm
 enable_docs
@@ -1561,7 +1552,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures open-vm-tools 2011.07.19 to adapt to many kinds of systems.
+\`configure' configures open-vm-tools 2011.12.20 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1635,7 +1626,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of open-vm-tools 2011.07.19:";;
+     short | recursive ) echo "Configuration of open-vm-tools 2011.12.20:";;
    esac
   cat <<\_ACEOF
 
@@ -1644,7 +1635,6 @@
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --disable-multimon      disables multimon, enabled by default
-  --disable-unity         disables Unity, enabled by default
   --disable-docs          disables generation of API documentation; by
                           default, docs are built if doxygen is available.
   --disable-tests         disable compilation of test code.
@@ -1762,7 +1752,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-open-vm-tools configure 2011.07.19
+open-vm-tools configure 2011.12.20
 generated by GNU Autoconf 2.67
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2454,7 +2444,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by open-vm-tools $as_me 2011.07.19, which was
+It was created by open-vm-tools $as_me 2011.12.20, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   $ $0 $@
@@ -3044,14 +3034,6 @@
 fi
 
 
-@%:@ Check whether --enable-unity was given.
-if test "${enable_unity+set}" = set; then :
-  enableval=$enable_unity; enable_unity="$enableval"
-else
-  enable_unity="yes"
-fi
-
-
 
 @%:@ Check whether --with-gtk2 was given.
 if test "${with_gtk2+set}" = set; then :
@@ -3086,11 +3068,6 @@
 fi
 
 
-# If we're not going to use Gtk 2.0, disable Unity.
-if test "$with_gtk2" != "yes"; then
-   enable_unity="no"
-fi
-
 am__api_version='1.11'
 
 # Find a good install program.  We prefer a C program (faster),
@@ -3529,7 +3506,7 @@
 
 # Define the identity of the package.
  PACKAGE='open-vm-tools'
- VERSION='2011.07.19'
+ VERSION='2011.12.20'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -17819,8 +17796,7 @@
 #
 # Check for PAM.
 #
-if test "$os" = "linux"; then
-   
+
 @%:@ Check whether --with-pam was given.
 if test "${with_pam+set}" = set; then :
   withval=$with_pam; 
@@ -17829,8 +17805,8 @@
 fi
 
 
-   if test "$with_pam" = "yes"; then
-      
+if test "$with_pam" = "yes"; then
+   
    if test -z "$CUSTOM_PAM_CPPFLAGS"; then
       if test "$os" = freebsd; then
          CUSTOM_PAM_CPPFLAGS="-I/usr/local/include"
@@ -17842,7 +17818,7 @@
       fi
    fi
 
-      
+   
         
    if test -z "pam"; then
       as_fn_error $? "'library' parameter is required.'" "$LINENO" 5 
@@ -18054,7 +18030,6 @@
 
    fi
 
-   fi
 fi
 
 #
@@ -18298,7 +18273,6 @@
 # If the user explicitly disables X11, then don't try to detect the X-related libraries
 if test "$have_x" = "disabled"; then
    enable_multimon="no"
-   enable_unity="no"
 elif test "$have_x" != "yes"; then
    as_fn_error $? "The X11 libraries were not found. Please configure without X11 (using --without-x), or install the libX11 devel package(s)." "$LINENO" 5 
 else
@@ -18402,12 +18376,6 @@
   as_fn_error $? "libXinerama not found. Please configure without multimon (using --disable-multimon), configure without X11 (using --without-x), or install the libXinerama devel package(s)." "$LINENO" 5 
 fi
 
-   else
-      if test "$enable_unity" != "no"; then
-         { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Disabling Unity due to --disable-multimon." >&5
-$as_echo "$as_me: WARNING: Disabling Unity due to --disable-multimon." >&2;}
-         enable_unity="no"
-      fi
    fi
 
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XOpenDevice in -lXi" >&5
@@ -18704,939 +18672,6 @@
       have_xcomposite="yes"
    fi
 
-   # If we're building with support for Unity, we'll need a few additional
-   # libraries.
-   if test "$enable_unity" != "no"; then
-           # Unity needs the X11 Screen Saver extension library. It should be
-	   # in the same place as the X11 libraries, so no need for any fancy
-	   # path checking.
-	   
-   have_header=1
-   if test -n "X11/extensions/scrnsaver.h"; then
-      ac_fn_c_check_header_mongrel "$LINENO" "X11/extensions/scrnsaver.h" "ac_cv_header_X11_extensions_scrnsaver_h" "$ac_includes_default"
-if test "x$ac_cv_header_X11_extensions_scrnsaver_h" = x""yes; then :
-  
-else
-  
-          have_header=0;
-          as_fn_error $? "libXss or headers not found. Please configure without Unity (using --disable-unity) or install the libXss devel package." "$LINENO" 5 
-         
-fi
-
-
-   fi
-
-   if test $have_header = 1; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XScreenSaverQueryExtension in -lXss" >&5
-$as_echo_n "checking for XScreenSaverQueryExtension in -lXss... " >&6; }
-if test "${ac_cv_lib_Xss_XScreenSaverQueryExtension+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lXss $COMMON_XLIBS $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 XScreenSaverQueryExtension ();
-int
-main ()
-{
-return XScreenSaverQueryExtension ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_Xss_XScreenSaverQueryExtension=yes
-else
-  ac_cv_lib_Xss_XScreenSaverQueryExtension=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_Xss_XScreenSaverQueryExtension" >&5
-$as_echo "$ac_cv_lib_Xss_XScreenSaverQueryExtension" >&6; }
-if test "x$ac_cv_lib_Xss_XScreenSaverQueryExtension" = x""yes; then :
-  COMMON_XLIBS="-lXss $COMMON_XLIBS"
-else
-  as_fn_error $? "libXss or headers not found. Please configure without Unity (using --disable-unity) or install the libXss devel package." "$LINENO" 5 
-fi
-
-   fi
-
-
-           # Check for the uriparser library and headers. The upstream uriparser
-           # doesn't appear to ship with either a pkg-config file or a
-           # uriparser-config binary, so we'll look for it the old-fashioned
-           # way.
-           #
-           # Note that we look for uriFreeQueryListA because it's a relatively
-           # new symbol that our code needs (it isn't present in the uriparser
-           # that shipped with Ubuntu Hardy).
-           
-   if test -z "$CUSTOM_URIPARSER_CPPFLAGS"; then
-      if test "$os" = freebsd; then
-         CUSTOM_URIPARSER_CPPFLAGS="-I/usr/local/include"
-      else
-         CUSTOM_URIPARSER_CPPFLAGS="-I/usr/include"
-      fi
-      if test -n "uriparser"; then
-         CUSTOM_URIPARSER_CPPFLAGS="${CUSTOM_URIPARSER_CPPFLAGS}/uriparser"
-      fi
-   fi
-
-           
-        
-   if test -z "uriparser"; then
-      as_fn_error $? "'library' parameter is required.'" "$LINENO" 5 
-   fi
-   if test -z "URIPARSER"; then
-      as_fn_error $? "'lvar' parameter is required.'" "$LINENO" 5 
-   fi
-
-   ac_vmw_have_lib=0
-   ac_vmw_have_lib_func=0
-   ac_vmw_have_lib_header=0
-   ac_vmw_custom_libs=
-
-   #
-   # First, try any user-defined CUSTOM_* flags.
-   #
-   if test -n "${CUSTOM_URIPARSER_CPPFLAGS}" || test -n "${CUSTOM_URIPARSER_LIBS}"; then
-      ac_vmw_custom_libs="${CUSTOM_URIPARSER_LIBS} -luriparser"
-      if test -n "Uri.h"; then
-         ORIGINAL_CPPFLAGS="$CPPFLAGS"
-         CPPFLAGS="${CUSTOM_URIPARSER_CPPFLAGS} $CPPFLAGS"
-
-         ac_fn_c_check_header_mongrel "$LINENO" "Uri.h" "ac_cv_header_Uri_h" "$ac_includes_default"
-if test "x$ac_cv_header_Uri_h" = x""yes; then :
-  ac_vmw_have_lib_header=1
-fi
-
-
-
-         CPPFLAGS="$ORIGINAL_CPPFLAGS"
-      else
-         ac_vmw_have_lib_header=1
-      fi
-
-      # Check a specific function in the library if requested.
-      # If it hasn't, just pick a random function from libc, just to make
-      # sure the linker can find the library being tested.
-      if test $ac_vmw_have_lib_header -eq 1; then
-         if test -n "uriFreeQueryListA"; then
-            ac_vmw_function=uriFreeQueryListA
-         else
-            ac_vmw_function=strlen
-         fi
-         as_ac_Lib=`$as_echo "ac_cv_lib_uriparser_$ac_vmw_function" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_vmw_function in -luriparser" >&5
-$as_echo_n "checking for $ac_vmw_function in -luriparser... " >&6; }
-if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-luriparser $ac_vmw_custom_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 $ac_vmw_function ();
-int
-main ()
-{
-return $ac_vmw_function ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  eval "$as_ac_Lib=yes"
-else
-  eval "$as_ac_Lib=no"
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-eval ac_res=\$$as_ac_Lib
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
-  ac_vmw_have_lib_func=1
-fi
-
-      fi
-
-      if test $ac_vmw_have_lib_func -eq 1 && test $ac_vmw_have_lib_header -eq 1; then
-         URIPARSER_CPPFLAGS="${CUSTOM_URIPARSER_CPPFLAGS}"
-         URIPARSER_LIBS="$ac_vmw_custom_libs"
-         ac_vmw_have_lib=1
-      fi
-   fi
-
-   # If that didn't work, try with pkg-config.
-   if test $ac_vmw_have_lib -eq 0 && test "$HAVE_PKG_CONFIG" = "yes" && test -n ""; then
-      if test -n ""; then
-         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for  >=  (via pkg-config)" >&5
-$as_echo_n "checking for  >=  (via pkg-config)... " >&6; }
-         if pkg-config --exists ' >= '; then
-            ac_vmw_have_lib=1
-         fi
-      else
-         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for  (via pkg-config)" >&5
-$as_echo_n "checking for  (via pkg-config)... " >&6; }
-         if pkg-config --exists ''; then
-            ac_vmw_have_lib=1
-         fi
-      fi
-
-      if test $ac_vmw_have_lib -eq 1; then
-         # Sometimes pkg-config might fail; for example, "pkg-config gtk+-2.0 --cflags"
-         # fails on OpenSolaris B71. So be pessimistic.
-         ac_vmw_cppflags="`pkg-config --cflags `"
-         ac_vmw_ret1=$?
-         ac_vmw_libs="`pkg-config --libs `"
-         ac_vmw_ret2=$?
-         if test $ac_vmw_ret1 -eq 0 && test $ac_vmw_ret2 -eq 0; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-            URIPARSER_CPPFLAGS="$ac_vmw_cppflags"
-            URIPARSER_LIBS="$ac_vmw_libs"
-         else
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-         fi
-      else
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-      fi
-   fi
-
-   # If we still haven't found the lib, try with the library's custom "config" script.
-   # Before checking, flush the AC_PATH_PROG cached variable.
-   unset ac_cv_path_ac_vmw_lib_cfg
-   unset ac_vmw_lib_cfg
-   if test $ac_vmw_have_lib -eq 0 && test -n ""; then
-      # Extract the first word of "", so it can be a program name with args.
-set dummy ; 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_vmw_lib_cfg+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $ac_vmw_lib_cfg in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_ac_vmw_lib_cfg="$ac_vmw_lib_cfg" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-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
-    ac_cv_path_ac_vmw_lib_cfg="$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
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_path_ac_vmw_lib_cfg" && ac_cv_path_ac_vmw_lib_cfg="no"
-  ;;
-esac
-fi
-ac_vmw_lib_cfg=$ac_cv_path_ac_vmw_lib_cfg
-if test -n "$ac_vmw_lib_cfg"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_vmw_lib_cfg" >&5
-$as_echo "$ac_vmw_lib_cfg" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-      if test "$ac_vmw_lib_cfg" != "no"; then
-         # XXX: icu-config does not follow the "--cflags" and "--libs" convention,
-         # so single it out here to avoid having to replicate all the rest of the
-         # logic elsewhere.
-         if test `basename "$ac_vmw_lib_cfg"` = "icu-config"; then
-            URIPARSER_CPPFLAGS="`$ac_vmw_lib_cfg --cppflags`"
-            URIPARSER_LIBS="`$ac_vmw_lib_cfg --ldflags`"
-         else
-            URIPARSER_CPPFLAGS="`$ac_vmw_lib_cfg --cflags`"
-            URIPARSER_LIBS="`$ac_vmw_lib_cfg --libs`"
-         fi
-         ac_vmw_have_lib=1
-      fi
-   fi
-
-   # Finish by executing the user provided action. The call to "true" is needed
-   # because the actions are optional, and we need something inside the block.
-   if test $ac_vmw_have_lib -eq 1; then
-      
-      
-      true
-      
-   else
-      true
-      as_fn_error $? "uriparser library not found or is too old. Please configure without Unity (using --disable-unity) or install the liburiparser devel package." "$LINENO" 5 
-   fi
-
-
-           # Check for libpng.
-           
-        
-   if test -z "png12"; then
-      as_fn_error $? "'library' parameter is required.'" "$LINENO" 5 
-   fi
-   if test -z "LIBPNG"; then
-      as_fn_error $? "'lvar' parameter is required.'" "$LINENO" 5 
-   fi
-
-   ac_vmw_have_lib=0
-   ac_vmw_have_lib_func=0
-   ac_vmw_have_lib_header=0
-   ac_vmw_custom_libs=
-
-   #
-   # First, try any user-defined CUSTOM_* flags.
-   #
-   if test -n "${CUSTOM_LIBPNG_CPPFLAGS}" || test -n "${CUSTOM_LIBPNG_LIBS}"; then
-      ac_vmw_custom_libs="${CUSTOM_LIBPNG_LIBS} -lpng12"
-      if test -n "png.h"; then
-         ORIGINAL_CPPFLAGS="$CPPFLAGS"
-         CPPFLAGS="${CUSTOM_LIBPNG_CPPFLAGS} $CPPFLAGS"
-
-         ac_fn_c_check_header_mongrel "$LINENO" "png.h" "ac_cv_header_png_h" "$ac_includes_default"
-if test "x$ac_cv_header_png_h" = x""yes; then :
-  ac_vmw_have_lib_header=1
-fi
-
-
-
-         CPPFLAGS="$ORIGINAL_CPPFLAGS"
-      else
-         ac_vmw_have_lib_header=1
-      fi
-
-      # Check a specific function in the library if requested.
-      # If it hasn't, just pick a random function from libc, just to make
-      # sure the linker can find the library being tested.
-      if test $ac_vmw_have_lib_header -eq 1; then
-         if test -n "png_access_version_number"; then
-            ac_vmw_function=png_access_version_number
-         else
-            ac_vmw_function=strlen
-         fi
-         as_ac_Lib=`$as_echo "ac_cv_lib_png12_$ac_vmw_function" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_vmw_function in -lpng12" >&5
-$as_echo_n "checking for $ac_vmw_function in -lpng12... " >&6; }
-if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpng12 $ac_vmw_custom_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 $ac_vmw_function ();
-int
-main ()
-{
-return $ac_vmw_function ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  eval "$as_ac_Lib=yes"
-else
-  eval "$as_ac_Lib=no"
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-eval ac_res=\$$as_ac_Lib
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
-  ac_vmw_have_lib_func=1
-fi
-
-      fi
-
-      if test $ac_vmw_have_lib_func -eq 1 && test $ac_vmw_have_lib_header -eq 1; then
-         LIBPNG_CPPFLAGS="${CUSTOM_LIBPNG_CPPFLAGS}"
-         LIBPNG_LIBS="$ac_vmw_custom_libs"
-         ac_vmw_have_lib=1
-      fi
-   fi
-
-   # If that didn't work, try with pkg-config.
-   if test $ac_vmw_have_lib -eq 0 && test "$HAVE_PKG_CONFIG" = "yes" && test -n "libpng12"; then
-      if test -n ""; then
-         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libpng12 >=  (via pkg-config)" >&5
-$as_echo_n "checking for libpng12 >=  (via pkg-config)... " >&6; }
-         if pkg-config --exists 'libpng12 >= '; then
-            ac_vmw_have_lib=1
-         fi
-      else
-         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libpng12 (via pkg-config)" >&5
-$as_echo_n "checking for libpng12 (via pkg-config)... " >&6; }
-         if pkg-config --exists 'libpng12'; then
-            ac_vmw_have_lib=1
-         fi
-      fi
-
-      if test $ac_vmw_have_lib -eq 1; then
-         # Sometimes pkg-config might fail; for example, "pkg-config gtk+-2.0 --cflags"
-         # fails on OpenSolaris B71. So be pessimistic.
-         ac_vmw_cppflags="`pkg-config --cflags libpng12`"
-         ac_vmw_ret1=$?
-         ac_vmw_libs="`pkg-config --libs libpng12`"
-         ac_vmw_ret2=$?
-         if test $ac_vmw_ret1 -eq 0 && test $ac_vmw_ret2 -eq 0; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-            LIBPNG_CPPFLAGS="$ac_vmw_cppflags"
-            LIBPNG_LIBS="$ac_vmw_libs"
-         else
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-         fi
-      else
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-      fi
-   fi
-
-   # If we still haven't found the lib, try with the library's custom "config" script.
-   # Before checking, flush the AC_PATH_PROG cached variable.
-   unset ac_cv_path_ac_vmw_lib_cfg
-   unset ac_vmw_lib_cfg
-   if test $ac_vmw_have_lib -eq 0 && test -n "libpng-config"; then
-      # Extract the first word of "libpng-config", so it can be a program name with args.
-set dummy libpng-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_vmw_lib_cfg+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $ac_vmw_lib_cfg in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_ac_vmw_lib_cfg="$ac_vmw_lib_cfg" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-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
-    ac_cv_path_ac_vmw_lib_cfg="$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
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_path_ac_vmw_lib_cfg" && ac_cv_path_ac_vmw_lib_cfg="no"
-  ;;
-esac
-fi
-ac_vmw_lib_cfg=$ac_cv_path_ac_vmw_lib_cfg
-if test -n "$ac_vmw_lib_cfg"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_vmw_lib_cfg" >&5
-$as_echo "$ac_vmw_lib_cfg" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-      if test "$ac_vmw_lib_cfg" != "no"; then
-         # XXX: icu-config does not follow the "--cflags" and "--libs" convention,
-         # so single it out here to avoid having to replicate all the rest of the
-         # logic elsewhere.
-         if test `basename "$ac_vmw_lib_cfg"` = "icu-config"; then
-            LIBPNG_CPPFLAGS="`$ac_vmw_lib_cfg --cppflags`"
-            LIBPNG_LIBS="`$ac_vmw_lib_cfg --ldflags`"
-         else
-            LIBPNG_CPPFLAGS="`$ac_vmw_lib_cfg --cflags`"
-            LIBPNG_LIBS="`$ac_vmw_lib_cfg --libs`"
-         fi
-         ac_vmw_have_lib=1
-      fi
-   fi
-
-   # Finish by executing the user provided action. The call to "true" is needed
-   # because the actions are optional, and we need something inside the block.
-   if test $ac_vmw_have_lib -eq 1; then
-      
-      
-      true
-      
-   else
-      true
-      as_fn_error $? "libpng not found. Please configure without Unity (using --disable-unity) or install the libpng devel package" "$LINENO" 5 
-   fi
-
-
-           # Check for the zlib library and headers. Like uriparser, there
-           # isn't a pkg-config or zlib-config file.
-           
-   if test -z "$CUSTOM_ZLIB_CPPFLAGS"; then
-      if test "$os" = freebsd; then
-         CUSTOM_ZLIB_CPPFLAGS="-I/usr/local/include"
-      else
-         CUSTOM_ZLIB_CPPFLAGS="-I/usr/include"
-      fi
-      if test -n ""; then
-         CUSTOM_ZLIB_CPPFLAGS="${CUSTOM_ZLIB_CPPFLAGS}/"
-      fi
-   fi
-
-           
-        
-   if test -z "z"; then
-      as_fn_error $? "'library' parameter is required.'" "$LINENO" 5 
-   fi
-   if test -z "ZLIB"; then
-      as_fn_error $? "'lvar' parameter is required.'" "$LINENO" 5 
-   fi
-
-   ac_vmw_have_lib=0
-   ac_vmw_have_lib_func=0
-   ac_vmw_have_lib_header=0
-   ac_vmw_custom_libs=
-
-   #
-   # First, try any user-defined CUSTOM_* flags.
-   #
-   if test -n "${CUSTOM_ZLIB_CPPFLAGS}" || test -n "${CUSTOM_ZLIB_LIBS}"; then
-      ac_vmw_custom_libs="${CUSTOM_ZLIB_LIBS} -lz"
-      if test -n "zlib.h"; then
-         ORIGINAL_CPPFLAGS="$CPPFLAGS"
-         CPPFLAGS="${CUSTOM_ZLIB_CPPFLAGS} $CPPFLAGS"
-
-         ac_fn_c_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default"
-if test "x$ac_cv_header_zlib_h" = x""yes; then :
-  ac_vmw_have_lib_header=1
-fi
-
-
-
-         CPPFLAGS="$ORIGINAL_CPPFLAGS"
-      else
-         ac_vmw_have_lib_header=1
-      fi
-
-      # Check a specific function in the library if requested.
-      # If it hasn't, just pick a random function from libc, just to make
-      # sure the linker can find the library being tested.
-      if test $ac_vmw_have_lib_header -eq 1; then
-         if test -n "zlibVersion"; then
-            ac_vmw_function=zlibVersion
-         else
-            ac_vmw_function=strlen
-         fi
-         as_ac_Lib=`$as_echo "ac_cv_lib_z_$ac_vmw_function" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_vmw_function in -lz" >&5
-$as_echo_n "checking for $ac_vmw_function in -lz... " >&6; }
-if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lz $ac_vmw_custom_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 $ac_vmw_function ();
-int
-main ()
-{
-return $ac_vmw_function ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  eval "$as_ac_Lib=yes"
-else
-  eval "$as_ac_Lib=no"
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-eval ac_res=\$$as_ac_Lib
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
-  ac_vmw_have_lib_func=1
-fi
-
-      fi
-
-      if test $ac_vmw_have_lib_func -eq 1 && test $ac_vmw_have_lib_header -eq 1; then
-         ZLIB_CPPFLAGS="${CUSTOM_ZLIB_CPPFLAGS}"
-         ZLIB_LIBS="$ac_vmw_custom_libs"
-         ac_vmw_have_lib=1
-      fi
-   fi
-
-   # If that didn't work, try with pkg-config.
-   if test $ac_vmw_have_lib -eq 0 && test "$HAVE_PKG_CONFIG" = "yes" && test -n ""; then
-      if test -n ""; then
-         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for  >=  (via pkg-config)" >&5
-$as_echo_n "checking for  >=  (via pkg-config)... " >&6; }
-         if pkg-config --exists ' >= '; then
-            ac_vmw_have_lib=1
-         fi
-      else
-         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for  (via pkg-config)" >&5
-$as_echo_n "checking for  (via pkg-config)... " >&6; }
-         if pkg-config --exists ''; then
-            ac_vmw_have_lib=1
-         fi
-      fi
-
-      if test $ac_vmw_have_lib -eq 1; then
-         # Sometimes pkg-config might fail; for example, "pkg-config gtk+-2.0 --cflags"
-         # fails on OpenSolaris B71. So be pessimistic.
-         ac_vmw_cppflags="`pkg-config --cflags `"
-         ac_vmw_ret1=$?
-         ac_vmw_libs="`pkg-config --libs `"
-         ac_vmw_ret2=$?
-         if test $ac_vmw_ret1 -eq 0 && test $ac_vmw_ret2 -eq 0; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-            ZLIB_CPPFLAGS="$ac_vmw_cppflags"
-            ZLIB_LIBS="$ac_vmw_libs"
-         else
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-         fi
-      else
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-      fi
-   fi
-
-   # If we still haven't found the lib, try with the library's custom "config" script.
-   # Before checking, flush the AC_PATH_PROG cached variable.
-   unset ac_cv_path_ac_vmw_lib_cfg
-   unset ac_vmw_lib_cfg
-   if test $ac_vmw_have_lib -eq 0 && test -n ""; then
-      # Extract the first word of "", so it can be a program name with args.
-set dummy ; 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_vmw_lib_cfg+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $ac_vmw_lib_cfg in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_ac_vmw_lib_cfg="$ac_vmw_lib_cfg" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-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
-    ac_cv_path_ac_vmw_lib_cfg="$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
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_path_ac_vmw_lib_cfg" && ac_cv_path_ac_vmw_lib_cfg="no"
-  ;;
-esac
-fi
-ac_vmw_lib_cfg=$ac_cv_path_ac_vmw_lib_cfg
-if test -n "$ac_vmw_lib_cfg"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_vmw_lib_cfg" >&5
-$as_echo "$ac_vmw_lib_cfg" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-      if test "$ac_vmw_lib_cfg" != "no"; then
-         # XXX: icu-config does not follow the "--cflags" and "--libs" convention,
-         # so single it out here to avoid having to replicate all the rest of the
-         # logic elsewhere.
-         if test `basename "$ac_vmw_lib_cfg"` = "icu-config"; then
-            ZLIB_CPPFLAGS="`$ac_vmw_lib_cfg --cppflags`"
-            ZLIB_LIBS="`$ac_vmw_lib_cfg --ldflags`"
-         else
-            ZLIB_CPPFLAGS="`$ac_vmw_lib_cfg --cflags`"
-            ZLIB_LIBS="`$ac_vmw_lib_cfg --libs`"
-         fi
-         ac_vmw_have_lib=1
-      fi
-   fi
-
-   # Finish by executing the user provided action. The call to "true" is needed
-   # because the actions are optional, and we need something inside the block.
-   if test $ac_vmw_have_lib -eq 1; then
-      
-      
-      true
-      
-   else
-      true
-      as_fn_error $? "zlib library not found. Please configure without Unity (using --disable-unity) or install the zlib devel package." "$LINENO" 5 
-   fi
-
-
-           # Check for gio 2.24.
-           
-        
-   if test -z "gio-2.0"; then
-      as_fn_error $? "'library' parameter is required.'" "$LINENO" 5 
-   fi
-   if test -z "GIO"; then
-      as_fn_error $? "'lvar' parameter is required.'" "$LINENO" 5 
-   fi
-
-   ac_vmw_have_lib=0
-   ac_vmw_have_lib_func=0
-   ac_vmw_have_lib_header=0
-   ac_vmw_custom_libs=
-
-   #
-   # First, try any user-defined CUSTOM_* flags.
-   #
-   if test -n "${CUSTOM_GIO_CPPFLAGS}" || test -n "${CUSTOM_GIO_LIBS}"; then
-      ac_vmw_custom_libs="${CUSTOM_GIO_LIBS} -lgio-2.0"
-      if test -n "gio/gio.h"; then
-         ORIGINAL_CPPFLAGS="$CPPFLAGS"
-         CPPFLAGS="${CUSTOM_GIO_CPPFLAGS} $CPPFLAGS"
-
-         ac_fn_c_check_header_mongrel "$LINENO" "gio/gio.h" "ac_cv_header_gio_gio_h" "$ac_includes_default"
-if test "x$ac_cv_header_gio_gio_h" = x""yes; then :
-  ac_vmw_have_lib_header=1
-fi
-
-
-
-         CPPFLAGS="$ORIGINAL_CPPFLAGS"
-      else
-         ac_vmw_have_lib_header=1
-      fi
-
-      # Check a specific function in the library if requested.
-      # If it hasn't, just pick a random function from libc, just to make
-      # sure the linker can find the library being tested.
-      if test $ac_vmw_have_lib_header -eq 1; then
-         if test -n "g_desktop_app_info_get_filename"; then
-            ac_vmw_function=g_desktop_app_info_get_filename
-         else
-            ac_vmw_function=strlen
-         fi
-         as_ac_Lib=`$as_echo "ac_cv_lib_gio-2.0_$ac_vmw_function" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_vmw_function in -lgio-2.0" >&5
-$as_echo_n "checking for $ac_vmw_function in -lgio-2.0... " >&6; }
-if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lgio-2.0 $ac_vmw_custom_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 $ac_vmw_function ();
-int
-main ()
-{
-return $ac_vmw_function ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  eval "$as_ac_Lib=yes"
-else
-  eval "$as_ac_Lib=no"
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-eval ac_res=\$$as_ac_Lib
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
-  ac_vmw_have_lib_func=1
-fi
-
-      fi
-
-      if test $ac_vmw_have_lib_func -eq 1 && test $ac_vmw_have_lib_header -eq 1; then
-         GIO_CPPFLAGS="${CUSTOM_GIO_CPPFLAGS}"
-         GIO_LIBS="$ac_vmw_custom_libs"
-         ac_vmw_have_lib=1
-      fi
-   fi
-
-   # If that didn't work, try with pkg-config.
-   if test $ac_vmw_have_lib -eq 0 && test "$HAVE_PKG_CONFIG" = "yes" && test -n "gio-unix-2.0"; then
-      if test -n "2.24.0"; then
-         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gio-unix-2.0 >= 2.24.0 (via pkg-config)" >&5
-$as_echo_n "checking for gio-unix-2.0 >= 2.24.0 (via pkg-config)... " >&6; }
-         if pkg-config --exists 'gio-unix-2.0 >= 2.24.0'; then
-            ac_vmw_have_lib=1
-         fi
-      else
-         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gio-unix-2.0 (via pkg-config)" >&5
-$as_echo_n "checking for gio-unix-2.0 (via pkg-config)... " >&6; }
-         if pkg-config --exists 'gio-unix-2.0'; then
-            ac_vmw_have_lib=1
-         fi
-      fi
-
-      if test $ac_vmw_have_lib -eq 1; then
-         # Sometimes pkg-config might fail; for example, "pkg-config gtk+-2.0 --cflags"
-         # fails on OpenSolaris B71. So be pessimistic.
-         ac_vmw_cppflags="`pkg-config --cflags gio-unix-2.0`"
-         ac_vmw_ret1=$?
-         ac_vmw_libs="`pkg-config --libs gio-unix-2.0`"
-         ac_vmw_ret2=$?
-         if test $ac_vmw_ret1 -eq 0 && test $ac_vmw_ret2 -eq 0; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-            GIO_CPPFLAGS="$ac_vmw_cppflags"
-            GIO_LIBS="$ac_vmw_libs"
-         else
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-         fi
-      else
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-      fi
-   fi
-
-   # If we still haven't found the lib, try with the library's custom "config" script.
-   # Before checking, flush the AC_PATH_PROG cached variable.
-   unset ac_cv_path_ac_vmw_lib_cfg
-   unset ac_vmw_lib_cfg
-   if test $ac_vmw_have_lib -eq 0 && test -n ""; then
-      # Extract the first word of "", so it can be a program name with args.
-set dummy ; 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_vmw_lib_cfg+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $ac_vmw_lib_cfg in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_ac_vmw_lib_cfg="$ac_vmw_lib_cfg" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-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
-    ac_cv_path_ac_vmw_lib_cfg="$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
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_path_ac_vmw_lib_cfg" && ac_cv_path_ac_vmw_lib_cfg="no"
-  ;;
-esac
-fi
-ac_vmw_lib_cfg=$ac_cv_path_ac_vmw_lib_cfg
-if test -n "$ac_vmw_lib_cfg"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_vmw_lib_cfg" >&5
-$as_echo "$ac_vmw_lib_cfg" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-      if test "$ac_vmw_lib_cfg" != "no"; then
-         # XXX: icu-config does not follow the "--cflags" and "--libs" convention,
-         # so single it out here to avoid having to replicate all the rest of the
-         # logic elsewhere.
-         if test `basename "$ac_vmw_lib_cfg"` = "icu-config"; then
-            GIO_CPPFLAGS="`$ac_vmw_lib_cfg --cppflags`"
-            GIO_LIBS="`$ac_vmw_lib_cfg --ldflags`"
-         else
-            GIO_CPPFLAGS="`$ac_vmw_lib_cfg --cflags`"
-            GIO_LIBS="`$ac_vmw_lib_cfg --libs`"
-         fi
-         ac_vmw_have_lib=1
-      fi
-   fi
-
-   # Finish by executing the user provided action. The call to "true" is needed
-   # because the actions are optional, and we need something inside the block.
-   if test $ac_vmw_have_lib -eq 1; then
-      
-      
-      true
-      
-   else
-      true
-      as_fn_error $? "GLib/GIO 2.24+ not found.  Please configure without Unity (using --disable-unity) or upgrade the Glib devel package." "$LINENO" 5 
-   fi
-
-   fi # End of library checks for Unity.
-
    # Check whether we have gtk+ 2.0.
    if test "$with_gtk2" != "no"; then
       # gdk_display_get_default_group (added in gtk+ 2.4.0) is function currently
@@ -19847,53 +18882,6 @@
       as_fn_error $? "Gtk+ 2.0 library not found or too old. Please configure without Gtk+ support (using --without-gtk2) or install the Gtk+ 2.0 devel package." "$LINENO" 5 
    fi
 
-
-      # Unity requires libgdk_pixbuf_xlib, which most systems don't seem to
-      # provide via "pkg-config --libs gtk+-2.0".
-      if test "$enable_unity" != "no"; then
-         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdk_pixbuf_xlib_init in -lgdk_pixbuf_xlib-2.0" >&5
-$as_echo_n "checking for gdk_pixbuf_xlib_init in -lgdk_pixbuf_xlib-2.0... " >&6; }
-if test "${ac_cv_lib_gdk_pixbuf_xlib_2_0_gdk_pixbuf_xlib_init+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lgdk_pixbuf_xlib-2.0 $GTK_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 gdk_pixbuf_xlib_init ();
-int
-main ()
-{
-return gdk_pixbuf_xlib_init ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_gdk_pixbuf_xlib_2_0_gdk_pixbuf_xlib_init=yes
-else
-  ac_cv_lib_gdk_pixbuf_xlib_2_0_gdk_pixbuf_xlib_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_gdk_pixbuf_xlib_2_0_gdk_pixbuf_xlib_init" >&5
-$as_echo "$ac_cv_lib_gdk_pixbuf_xlib_2_0_gdk_pixbuf_xlib_init" >&6; }
-if test "x$ac_cv_lib_gdk_pixbuf_xlib_2_0_gdk_pixbuf_xlib_init" = x""yes; then :
-  GTK_LIBS="$GTK_LIBS -lgdk_pixbuf_xlib-2.0"
-else
-  as_fn_error $? "gdk_pixbuf_xlib-2.0 not found. Make sure your Gtk 2.0 installation is sane, or configure without Unity (using --disable-unity)." "$LINENO" 5 
-fi
-
-      fi
    fi
 
    #
@@ -21834,6 +20822,8 @@
 
    # Easier to give all modules the ICU defines/includes...
    CPPFLAGS="$CPPFLAGS $ICU_CPPFLAGS"
+else
+   CPPFLAGS="$CPPFLAGS -DNO_ICU"
 fi
 
 # Extract the first word of "rpcgen", so it can be a program name with args.
@@ -22090,6 +21080,50 @@
 
 fi
 
+bsdPrintfWrappers=no
+if test "$os" = "linux"; then
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ecvt in -lc" >&5
+$as_echo_n "checking for ecvt in -lc... " >&6; }
+if test "${ac_cv_lib_c_ecvt+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lc  $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 ecvt ();
+int
+main ()
+{
+return ecvt ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_c_ecvt=yes
+else
+  ac_cv_lib_c_ecvt=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_c_ecvt" >&5
+$as_echo "$ac_cv_lib_c_ecvt" >&6; }
+if test "x$ac_cv_lib_c_ecvt" = x""yes; then :
+  bsdPrintfWrappers=yes
+fi
+
+fi
+
 ###
 ### Typdefs, structs, and compiler quarks.
 ###
@@ -22555,7 +21589,7 @@
    CFLAGS="$ORIGINAL_CFLAGS$NEW_CFLAG"
 done
 CPPFLAGS="$CPPFLAGS -DVMX86_TOOLS"
-CPPFLAGS="$CPPFLAGS -DNO_CORE_ICU"
+CPPFLAGS="$CPPFLAGS"
 
 # -fvisibility is used by "core service" plugins, but not required.
 ORIGINAL_CFLAGS="$CFLAGS"
@@ -22584,6 +21618,34 @@
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 CFLAGS="$ORIGINAL_CFLAGS"
 
+# Detect "unused-but-set-variable" gcc warning and disable it.
+ORIGINAL_CFLAGS="$CFLAGS"
+CFLAGS="$CFLAGS -Wno-unused-but-set-variable"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GCC flag -Wno-unused-but-set-variable" >&5
+$as_echo_n "checking for GCC flag -Wno-unused-but-set-variable... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+return 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ORIGINAL_CFLAGS="$ORIGINAL_CFLAGS -Wno-unused-but-set-variable";
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+CFLAGS="$ORIGINAL_CFLAGS"
+
+
 BUILDDIR="`pwd`"
 
 INCLUDE_DIR="`cd $srcdir; pwd`/lib/include"
@@ -22767,6 +21829,7 @@
 fi
 
 if test "$os" = "freebsd"; then
+   LIBVMTOOLS_LIBADD="$LIBVMTOOLS_LIBADD -lkvm"
    MODULES_DIR="/boot/modules"
 
    if test "$osVersion" -ge 302000; then
@@ -22924,14 +21987,6 @@
   HAVE_XCOMPOSITE_FALSE=
 fi
 
- if test "$enable_unity" = "yes"; then
-  ENABLE_UNITY_TRUE=
-  ENABLE_UNITY_FALSE='#'
-else
-  ENABLE_UNITY_TRUE='#'
-  ENABLE_UNITY_FALSE=
-fi
-
  if test "$have_cunit" = "yes"; then
   ENABLE_TESTS_TRUE=
   ENABLE_TESTS_FALSE='#'
@@ -23004,6 +22059,14 @@
   USE_SLASH_PROC_FALSE=
 fi
 
+ if test "$bsdPrintfWrappers" = "yes"; then
+  USE_PRINTF_WRAPPERS_TRUE=
+  USE_PRINTF_WRAPPERS_FALSE='#'
+else
+  USE_PRINTF_WRAPPERS_TRUE='#'
+  USE_PRINTF_WRAPPERS_FALSE=
+fi
+
 
 if test "$have_xsm" != "yes"; then
 $as_echo "@%:@define NO_XSM 1" >>confdefs.h
@@ -23113,7 +22176,7 @@
 ###
 ### Create the Makefiles
 ###
-ac_config_files="$ac_config_files Makefile lib/Makefile lib/appUtil/Makefile lib/auth/Makefile lib/backdoor/Makefile lib/dict/Makefile lib/dynxdr/Makefile lib/err/Makefile lib/file/Makefile lib/foundryMsg/Makefile lib/guestApp/Makefile lib/guestRpc/Makefile lib/hgfs/Makefile lib/hgfsBd/Makefile lib/hgfsHelper/Makefile lib/hgfsServer/Makefile lib/hgfsServerManagerGuest/Makefile lib/hgfsServerPolicyGuest/Makefile lib/image/Makefile lib/impersonate/Makefile lib/lock/Makefile lib/message/Makefile lib/misc/Makefile lib/netUtil/Makefile lib/panic/Makefile lib/panicDefault/Makefile lib/printer/Makefile lib/procMgr/Makefile lib/raster/Makefile lib/region/Makefile lib/rpcChannel/Makefile lib/rpcIn/Makefile lib/rpcOut/Makefile lib/rpcVmx/Makefile lib/slashProc/Makefile lib/string/Makefile lib/stubs/Makefile lib/syncDriver/Makefile lib/system/Makefile lib/unicode/Makefile lib/user/Makefile lib/vmCheck/Makefile lib/vmSignal/Makefile lib/wiper/Makefile lib/xdg/Makefile services/Makefile services/vmtoolsd/Makefile services/plugins/Makefile services/plugins/desktopEvents/Makefile services/plugins/dndcp/Makefile services/plugins/guestInfo/Makefile services/plugins/guestInfo/getlib/Makefile services/plugins/hgfsServer/Makefile services/plugins/powerOps/Makefile services/plugins/resolutionSet/Makefile services/plugins/timeSync/Makefile services/plugins/unity/Makefile services/plugins/vix/Makefile services/plugins/vmbackup/Makefile vmware-user-suid-wrapper/Makefile toolbox/Makefile hgfsclient/Makefile hgfsmounter/Makefile checkvm/Makefile rpctool/Makefile libguestlib/Makefile libguestlib/vmguestlib.pc libhgfs/Makefile libvmtools/Makefile xferlogs/Makefile modules/Makefile vmblock-fuse/Makefile vmblockmounter/Makefile tests/Makefile tests/vmrpcdbg/Makefile tests/testDebug/Makefile tests/testPlugin/Makefile tests/testVmblock/Makefile docs/Makefile docs/api/Makefile scripts/Makefile scripts/build/rpcgen_wrapper.sh"
+ac_config_files="$ac_config_files Makefile lib/Makefile lib/appUtil/Makefile lib/auth/Makefile lib/backdoor/Makefile lib/dict/Makefile lib/dynxdr/Makefile lib/err/Makefile lib/file/Makefile lib/foundryMsg/Makefile lib/glibUtils/Makefile lib/guestApp/Makefile lib/guestRpc/Makefile lib/hgfs/Makefile lib/hgfsBd/Makefile lib/hgfsHelper/Makefile lib/hgfsServer/Makefile lib/hgfsServerManagerGuest/Makefile lib/hgfsServerPolicyGuest/Makefile lib/impersonate/Makefile lib/lock/Makefile lib/message/Makefile lib/misc/Makefile lib/netUtil/Makefile lib/panic/Makefile lib/panicDefault/Makefile lib/printer/Makefile lib/procMgr/Makefile lib/rpcChannel/Makefile lib/rpcIn/Makefile lib/rpcOut/Makefile lib/rpcVmx/Makefile lib/slashProc/Makefile lib/string/Makefile lib/stubs/Makefile lib/syncDriver/Makefile lib/system/Makefile lib/unicode/Makefile lib/user/Makefile lib/vmCheck/Makefile lib/vmSignal/Makefile lib/wiper/Makefile lib/xdg/Makefile services/Makefile services/vmtoolsd/Makefile services/plugins/Makefile services/plugins/desktopEvents/Makefile services/plugins/dndcp/Makefile services/plugins/guestInfo/Makefile services/plugins/guestInfo/getlib/Makefile services/plugins/hgfsServer/Makefile services/plugins/powerOps/Makefile services/plugins/resolutionSet/Makefile services/plugins/timeSync/Makefile services/plugins/vix/Makefile services/plugins/vmbackup/Makefile vmware-user-suid-wrapper/Makefile toolbox/Makefile hgfsclient/Makefile hgfsmounter/Makefile checkvm/Makefile rpctool/Makefile libguestlib/Makefile libguestlib/vmguestlib.pc libhgfs/Makefile libvmtools/Makefile xferlogs/Makefile modules/Makefile vmblock-fuse/Makefile vmblockmounter/Makefile tests/Makefile tests/vmrpcdbg/Makefile tests/testDebug/Makefile tests/testPlugin/Makefile tests/testVmblock/Makefile docs/Makefile docs/api/Makefile scripts/Makefile scripts/build/rpcgen_wrapper.sh"
 
 
 ###
@@ -23325,10 +22388,6 @@
   as_fn_error $? "conditional \"HAVE_XCOMPOSITE\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5 
 fi
-if test -z "${ENABLE_UNITY_TRUE}" && test -z "${ENABLE_UNITY_FALSE}"; then
-  as_fn_error $? "conditional \"ENABLE_UNITY\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5 
-fi
 if test -z "${ENABLE_TESTS_TRUE}" && test -z "${ENABLE_TESTS_FALSE}"; then
   as_fn_error $? "conditional \"ENABLE_TESTS\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5 
@@ -23365,6 +22424,10 @@
   as_fn_error $? "conditional \"USE_SLASH_PROC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5 
 fi
+if test -z "${USE_PRINTF_WRAPPERS_TRUE}" && test -z "${USE_PRINTF_WRAPPERS_FALSE}"; then
+  as_fn_error $? "conditional \"USE_PRINTF_WRAPPERS\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5 
+fi
 
 : ${CONFIG_STATUS=./config.status}
 ac_write_fail=0
@@ -23773,7 +22836,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by open-vm-tools $as_me 2011.07.19, which was
+This file was extended by open-vm-tools $as_me 2011.12.20, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -23830,7 +22893,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-open-vm-tools config.status 2011.07.19
+open-vm-tools config.status 2011.12.20
 configured by $0, generated by GNU Autoconf 2.67,
   with options \\"\$ac_cs_config\\"
 
@@ -24311,6 +23374,7 @@
     "lib/err/Makefile") CONFIG_FILES="$CONFIG_FILES lib/err/Makefile" ;;
     "lib/file/Makefile") CONFIG_FILES="$CONFIG_FILES lib/file/Makefile" ;;
     "lib/foundryMsg/Makefile") CONFIG_FILES="$CONFIG_FILES lib/foundryMsg/Makefile" ;;
+    "lib/glibUtils/Makefile") CONFIG_FILES="$CONFIG_FILES lib/glibUtils/Makefile" ;;
     "lib/guestApp/Makefile") CONFIG_FILES="$CONFIG_FILES lib/guestApp/Makefile" ;;
     "lib/guestRpc/Makefile") CONFIG_FILES="$CONFIG_FILES lib/guestRpc/Makefile" ;;
     "lib/hgfs/Makefile") CONFIG_FILES="$CONFIG_FILES lib/hgfs/Makefile" ;;
@@ -24319,7 +23383,6 @@
     "lib/hgfsServer/Makefile") CONFIG_FILES="$CONFIG_FILES lib/hgfsServer/Makefile" ;;
     "lib/hgfsServerManagerGuest/Makefile") CONFIG_FILES="$CONFIG_FILES lib/hgfsServerManagerGuest/Makefile" ;;
     "lib/hgfsServerPolicyGuest/Makefile") CONFIG_FILES="$CONFIG_FILES lib/hgfsServerPolicyGuest/Makefile" ;;
-    "lib/image/Makefile") CONFIG_FILES="$CONFIG_FILES lib/image/Makefile" ;;
     "lib/impersonate/Makefile") CONFIG_FILES="$CONFIG_FILES lib/impersonate/Makefile" ;;
     "lib/lock/Makefile") CONFIG_FILES="$CONFIG_FILES lib/lock/Makefile" ;;
     "lib/message/Makefile") CONFIG_FILES="$CONFIG_FILES lib/message/Makefile" ;;
@@ -24329,8 +23392,6 @@
     "lib/panicDefault/Makefile") CONFIG_FILES="$CONFIG_FILES lib/panicDefault/Makefile" ;;
     "lib/printer/Makefile") CONFIG_FILES="$CONFIG_FILES lib/printer/Makefile" ;;
     "lib/procMgr/Makefile") CONFIG_FILES="$CONFIG_FILES lib/procMgr/Makefile" ;;
-    "lib/raster/Makefile") CONFIG_FILES="$CONFIG_FILES lib/raster/Makefile" ;;
-    "lib/region/Makefile") CONFIG_FILES="$CONFIG_FILES lib/region/Makefile" ;;
     "lib/rpcChannel/Makefile") CONFIG_FILES="$CONFIG_FILES lib/rpcChannel/Makefile" ;;
     "lib/rpcIn/Makefile") CONFIG_FILES="$CONFIG_FILES lib/rpcIn/Makefile" ;;
     "lib/rpcOut/Makefile") CONFIG_FILES="$CONFIG_FILES lib/rpcOut/Makefile" ;;
@@ -24357,7 +23418,6 @@
     "services/plugins/powerOps/Makefile") CONFIG_FILES="$CONFIG_FILES services/plugins/powerOps/Makefile" ;;
     "services/plugins/resolutionSet/Makefile") CONFIG_FILES="$CONFIG_FILES services/plugins/resolutionSet/Makefile" ;;
     "services/plugins/timeSync/Makefile") CONFIG_FILES="$CONFIG_FILES services/plugins/timeSync/Makefile" ;;
-    "services/plugins/unity/Makefile") CONFIG_FILES="$CONFIG_FILES services/plugins/unity/Makefile" ;;
     "services/plugins/vix/Makefile") CONFIG_FILES="$CONFIG_FILES services/plugins/vix/Makefile" ;;
     "services/plugins/vmbackup/Makefile") CONFIG_FILES="$CONFIG_FILES services/plugins/vmbackup/Makefile" ;;
     "vmware-user-suid-wrapper/Makefile") CONFIG_FILES="$CONFIG_FILES vmware-user-suid-wrapper/Makefile" ;;
 
=== modified file 'autom4te.cache/output.1'
--- autom4te.cache/output.1	2011-07-22 16:41:03 +0000
+++ autom4te.cache/output.1	2012-01-24 04:56:25 +0000
@@ -1,6 +1,6 @@
 @%:@! /bin/sh
 @%:@ Guess values for system-dependent variables and create Makefiles.
-@%:@ Generated by GNU Autoconf 2.67 for open-vm-tools 2011.07.19.
+@%:@ Generated by GNU Autoconf 2.67 for open-vm-tools 2011.12.20.
 @%:@
 @%:@ Report bugs to <[e-mail]>.
 @%:@ 
@@ -701,8 +701,8 @@
 # Identity of this package.
 PACKAGE_NAME='open-vm-tools'
 PACKAGE_TARNAME='open-vm-tools'
-PACKAGE_VERSION='2011.07.19'
-PACKAGE_STRING='open-vm-tools 2011.07.19'
+PACKAGE_VERSION='2011.12.20'
+PACKAGE_STRING='open-vm-tools 2011.12.20'
 PACKAGE_BUGREPORT='[e-mail]'
 PACKAGE_URL=''
 
@@ -777,6 +777,8 @@
 TARGET_OS
 TOOLS_VERSION
 HGFS_LIBS
+USE_PRINTF_WRAPPERS_FALSE
+USE_PRINTF_WRAPPERS_TRUE
 USE_SLASH_PROC_FALSE
 USE_SLASH_PROC_TRUE
 HAVE_PAM_FALSE
@@ -795,8 +797,6 @@
 WITH_ROOT_PRIVILEGES_TRUE
 ENABLE_TESTS_FALSE
 ENABLE_TESTS_TRUE
-ENABLE_UNITY_FALSE
-ENABLE_UNITY_TRUE
 HAVE_XCOMPOSITE_FALSE
 HAVE_XCOMPOSITE_TRUE
 HAVE_XSM_FALSE
@@ -836,14 +836,6 @@
 GTKMM_CPPFLAGS
 GTK_LIBS
 GTK_CPPFLAGS
-GIO_LIBS
-GIO_CPPFLAGS
-ZLIB_LIBS
-ZLIB_CPPFLAGS
-LIBPNG_LIBS
-LIBPNG_CPPFLAGS
-URIPARSER_LIBS
-URIPARSER_CPPFLAGS
 CUNIT_LIBS
 CUNIT_CPPFLAGS
 PAM_LIBS
@@ -986,7 +978,6 @@
 with_kernel_release
 with_linuxdir
 enable_multimon
-enable_unity
 with_gtk2
 with_gtkmm
 enable_docs
@@ -1561,7 +1552,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures open-vm-tools 2011.07.19 to adapt to many kinds of systems.
+\`configure' configures open-vm-tools 2011.12.20 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1635,7 +1626,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of open-vm-tools 2011.07.19:";;
+     short | recursive ) echo "Configuration of open-vm-tools 2011.12.20:";;
    esac
   cat <<\_ACEOF
 
@@ -1644,7 +1635,6 @@
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --disable-multimon      disables multimon, enabled by default
-  --disable-unity         disables Unity, enabled by default
   --disable-docs          disables generation of API documentation; by
                           default, docs are built if doxygen is available.
   --disable-tests         disable compilation of test code.
@@ -1762,7 +1752,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-open-vm-tools configure 2011.07.19
+open-vm-tools configure 2011.12.20
 generated by GNU Autoconf 2.67
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2454,7 +2444,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by open-vm-tools $as_me 2011.07.19, which was
+It was created by open-vm-tools $as_me 2011.12.20, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   $ $0 $@
@@ -3044,14 +3034,6 @@
 fi
 
 
-@%:@ Check whether --enable-unity was given.
-if test "${enable_unity+set}" = set; then :
-  enableval=$enable_unity; enable_unity="$enableval"
-else
-  enable_unity="yes"
-fi
-
-
 
 @%:@ Check whether --with-gtk2 was given.
 if test "${with_gtk2+set}" = set; then :
@@ -3086,11 +3068,6 @@
 fi
 
 
-# If we're not going to use Gtk 2.0, disable Unity.
-if test "$with_gtk2" != "yes"; then
-   enable_unity="no"
-fi
-
 am__api_version='1.11'
 
 # Find a good install program.  We prefer a C program (faster),
@@ -3529,7 +3506,7 @@
 
 # Define the identity of the package.
  PACKAGE='open-vm-tools'
- VERSION='2011.07.19'
+ VERSION='2011.12.20'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -17819,8 +17796,7 @@
 #
 # Check for PAM.
 #
-if test "$os" = "linux"; then
-   
+
 @%:@ Check whether --with-pam was given.
 if test "${with_pam+set}" = set; then :
   withval=$with_pam; 
@@ -17829,8 +17805,8 @@
 fi
 
 
-   if test "$with_pam" = "yes"; then
-      
+if test "$with_pam" = "yes"; then
+   
    if test -z "$CUSTOM_PAM_CPPFLAGS"; then
       if test "$os" = freebsd; then
          CUSTOM_PAM_CPPFLAGS="-I/usr/local/include"
@@ -17842,7 +17818,7 @@
       fi
    fi
 
-      
+   
         
    if test -z "pam"; then
       as_fn_error $? "'library' parameter is required.'" "$LINENO" 5 
@@ -18054,7 +18030,6 @@
 
    fi
 
-   fi
 fi
 
 #
@@ -18298,7 +18273,6 @@
 # If the user explicitly disables X11, then don't try to detect the X-related libraries
 if test "$have_x" = "disabled"; then
    enable_multimon="no"
-   enable_unity="no"
 elif test "$have_x" != "yes"; then
    as_fn_error $? "The X11 libraries were not found. Please configure without X11 (using --without-x), or install the libX11 devel package(s)." "$LINENO" 5 
 else
@@ -18402,12 +18376,6 @@
   as_fn_error $? "libXinerama not found. Please configure without multimon (using --disable-multimon), configure without X11 (using --without-x), or install the libXinerama devel package(s)." "$LINENO" 5 
 fi
 
-   else
-      if test "$enable_unity" != "no"; then
-         { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Disabling Unity due to --disable-multimon." >&5
-$as_echo "$as_me: WARNING: Disabling Unity due to --disable-multimon." >&2;}
-         enable_unity="no"
-      fi
    fi
 
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XOpenDevice in -lXi" >&5
@@ -18704,939 +18672,6 @@
       have_xcomposite="yes"
    fi
 
-   # If we're building with support for Unity, we'll need a few additional
-   # libraries.
-   if test "$enable_unity" != "no"; then
-           # Unity needs the X11 Screen Saver extension library. It should be
-	   # in the same place as the X11 libraries, so no need for any fancy
-	   # path checking.
-	   
-   have_header=1
-   if test -n "X11/extensions/scrnsaver.h"; then
-      ac_fn_c_check_header_mongrel "$LINENO" "X11/extensions/scrnsaver.h" "ac_cv_header_X11_extensions_scrnsaver_h" "$ac_includes_default"
-if test "x$ac_cv_header_X11_extensions_scrnsaver_h" = x""yes; then :
-  
-else
-  
-          have_header=0;
-          as_fn_error $? "libXss or headers not found. Please configure without Unity (using --disable-unity) or install the libXss devel package." "$LINENO" 5 
-         
-fi
-
-
-   fi
-
-   if test $have_header = 1; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XScreenSaverQueryExtension in -lXss" >&5
-$as_echo_n "checking for XScreenSaverQueryExtension in -lXss... " >&6; }
-if test "${ac_cv_lib_Xss_XScreenSaverQueryExtension+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lXss $COMMON_XLIBS $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 XScreenSaverQueryExtension ();
-int
-main ()
-{
-return XScreenSaverQueryExtension ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_Xss_XScreenSaverQueryExtension=yes
-else
-  ac_cv_lib_Xss_XScreenSaverQueryExtension=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_Xss_XScreenSaverQueryExtension" >&5
-$as_echo "$ac_cv_lib_Xss_XScreenSaverQueryExtension" >&6; }
-if test "x$ac_cv_lib_Xss_XScreenSaverQueryExtension" = x""yes; then :
-  COMMON_XLIBS="-lXss $COMMON_XLIBS"
-else
-  as_fn_error $? "libXss or headers not found. Please configure without Unity (using --disable-unity) or install the libXss devel package." "$LINENO" 5 
-fi
-
-   fi
-
-
-           # Check for the uriparser library and headers. The upstream uriparser
-           # doesn't appear to ship with either a pkg-config file or a
-           # uriparser-config binary, so we'll look for it the old-fashioned
-           # way.
-           #
-           # Note that we look for uriFreeQueryListA because it's a relatively
-           # new symbol that our code needs (it isn't present in the uriparser
-           # that shipped with Ubuntu Hardy).
-           
-   if test -z "$CUSTOM_URIPARSER_CPPFLAGS"; then
-      if test "$os" = freebsd; then
-         CUSTOM_URIPARSER_CPPFLAGS="-I/usr/local/include"
-      else
-         CUSTOM_URIPARSER_CPPFLAGS="-I/usr/include"
-      fi
-      if test -n "uriparser"; then
-         CUSTOM_URIPARSER_CPPFLAGS="${CUSTOM_URIPARSER_CPPFLAGS}/uriparser"
-      fi
-   fi
-
-           
-        
-   if test -z "uriparser"; then
-      as_fn_error $? "'library' parameter is required.'" "$LINENO" 5 
-   fi
-   if test -z "URIPARSER"; then
-      as_fn_error $? "'lvar' parameter is required.'" "$LINENO" 5 
-   fi
-
-   ac_vmw_have_lib=0
-   ac_vmw_have_lib_func=0
-   ac_vmw_have_lib_header=0
-   ac_vmw_custom_libs=
-
-   #
-   # First, try any user-defined CUSTOM_* flags.
-   #
-   if test -n "${CUSTOM_URIPARSER_CPPFLAGS}" || test -n "${CUSTOM_URIPARSER_LIBS}"; then
-      ac_vmw_custom_libs="${CUSTOM_URIPARSER_LIBS} -luriparser"
-      if test -n "Uri.h"; then
-         ORIGINAL_CPPFLAGS="$CPPFLAGS"
-         CPPFLAGS="${CUSTOM_URIPARSER_CPPFLAGS} $CPPFLAGS"
-
-         ac_fn_c_check_header_mongrel "$LINENO" "Uri.h" "ac_cv_header_Uri_h" "$ac_includes_default"
-if test "x$ac_cv_header_Uri_h" = x""yes; then :
-  ac_vmw_have_lib_header=1
-fi
-
-
-
-         CPPFLAGS="$ORIGINAL_CPPFLAGS"
-      else
-         ac_vmw_have_lib_header=1
-      fi
-
-      # Check a specific function in the library if requested.
-      # If it hasn't, just pick a random function from libc, just to make
-      # sure the linker can find the library being tested.
-      if test $ac_vmw_have_lib_header -eq 1; then
-         if test -n "uriFreeQueryListA"; then
-            ac_vmw_function=uriFreeQueryListA
-         else
-            ac_vmw_function=strlen
-         fi
-         as_ac_Lib=`$as_echo "ac_cv_lib_uriparser_$ac_vmw_function" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_vmw_function in -luriparser" >&5
-$as_echo_n "checking for $ac_vmw_function in -luriparser... " >&6; }
-if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-luriparser $ac_vmw_custom_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 $ac_vmw_function ();
-int
-main ()
-{
-return $ac_vmw_function ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  eval "$as_ac_Lib=yes"
-else
-  eval "$as_ac_Lib=no"
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-eval ac_res=\$$as_ac_Lib
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
-  ac_vmw_have_lib_func=1
-fi
-
-      fi
-
-      if test $ac_vmw_have_lib_func -eq 1 && test $ac_vmw_have_lib_header -eq 1; then
-         URIPARSER_CPPFLAGS="${CUSTOM_URIPARSER_CPPFLAGS}"
-         URIPARSER_LIBS="$ac_vmw_custom_libs"
-         ac_vmw_have_lib=1
-      fi
-   fi
-
-   # If that didn't work, try with pkg-config.
-   if test $ac_vmw_have_lib -eq 0 && test "$HAVE_PKG_CONFIG" = "yes" && test -n ""; then
-      if test -n ""; then
-         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for  >=  (via pkg-config)" >&5
-$as_echo_n "checking for  >=  (via pkg-config)... " >&6; }
-         if pkg-config --exists ' >= '; then
-            ac_vmw_have_lib=1
-         fi
-      else
-         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for  (via pkg-config)" >&5
-$as_echo_n "checking for  (via pkg-config)... " >&6; }
-         if pkg-config --exists ''; then
-            ac_vmw_have_lib=1
-         fi
-      fi
-
-      if test $ac_vmw_have_lib -eq 1; then
-         # Sometimes pkg-config might fail; for example, "pkg-config gtk+-2.0 --cflags"
-         # fails on OpenSolaris B71. So be pessimistic.
-         ac_vmw_cppflags="`pkg-config --cflags `"
-         ac_vmw_ret1=$?
-         ac_vmw_libs="`pkg-config --libs `"
-         ac_vmw_ret2=$?
-         if test $ac_vmw_ret1 -eq 0 && test $ac_vmw_ret2 -eq 0; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-            URIPARSER_CPPFLAGS="$ac_vmw_cppflags"
-            URIPARSER_LIBS="$ac_vmw_libs"
-         else
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-         fi
-      else
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-      fi
-   fi
-
-   # If we still haven't found the lib, try with the library's custom "config" script.
-   # Before checking, flush the AC_PATH_PROG cached variable.
-   unset ac_cv_path_ac_vmw_lib_cfg
-   unset ac_vmw_lib_cfg
-   if test $ac_vmw_have_lib -eq 0 && test -n ""; then
-      # Extract the first word of "", so it can be a program name with args.
-set dummy ; 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_vmw_lib_cfg+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $ac_vmw_lib_cfg in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_ac_vmw_lib_cfg="$ac_vmw_lib_cfg" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-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
-    ac_cv_path_ac_vmw_lib_cfg="$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
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_path_ac_vmw_lib_cfg" && ac_cv_path_ac_vmw_lib_cfg="no"
-  ;;
-esac
-fi
-ac_vmw_lib_cfg=$ac_cv_path_ac_vmw_lib_cfg
-if test -n "$ac_vmw_lib_cfg"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_vmw_lib_cfg" >&5
-$as_echo "$ac_vmw_lib_cfg" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-      if test "$ac_vmw_lib_cfg" != "no"; then
-         # XXX: icu-config does not follow the "--cflags" and "--libs" convention,
-         # so single it out here to avoid having to replicate all the rest of the
-         # logic elsewhere.
-         if test `basename "$ac_vmw_lib_cfg"` = "icu-config"; then
-            URIPARSER_CPPFLAGS="`$ac_vmw_lib_cfg --cppflags`"
-            URIPARSER_LIBS="`$ac_vmw_lib_cfg --ldflags`"
-         else
-            URIPARSER_CPPFLAGS="`$ac_vmw_lib_cfg --cflags`"
-            URIPARSER_LIBS="`$ac_vmw_lib_cfg --libs`"
-         fi
-         ac_vmw_have_lib=1
-      fi
-   fi
-
-   # Finish by executing the user provided action. The call to "true" is needed
-   # because the actions are optional, and we need something inside the block.
-   if test $ac_vmw_have_lib -eq 1; then
-      
-      
-      true
-      
-   else
-      true
-      as_fn_error $? "uriparser library not found or is too old. Please configure without Unity (using --disable-unity) or install the liburiparser devel package." "$LINENO" 5 
-   fi
-
-
-           # Check for libpng.
-           
-        
-   if test -z "png12"; then
-      as_fn_error $? "'library' parameter is required.'" "$LINENO" 5 
-   fi
-   if test -z "LIBPNG"; then
-      as_fn_error $? "'lvar' parameter is required.'" "$LINENO" 5 
-   fi
-
-   ac_vmw_have_lib=0
-   ac_vmw_have_lib_func=0
-   ac_vmw_have_lib_header=0
-   ac_vmw_custom_libs=
-
-   #
-   # First, try any user-defined CUSTOM_* flags.
-   #
-   if test -n "${CUSTOM_LIBPNG_CPPFLAGS}" || test -n "${CUSTOM_LIBPNG_LIBS}"; then
-      ac_vmw_custom_libs="${CUSTOM_LIBPNG_LIBS} -lpng12"
-      if test -n "png.h"; then
-         ORIGINAL_CPPFLAGS="$CPPFLAGS"
-         CPPFLAGS="${CUSTOM_LIBPNG_CPPFLAGS} $CPPFLAGS"
-
-         ac_fn_c_check_header_mongrel "$LINENO" "png.h" "ac_cv_header_png_h" "$ac_includes_default"
-if test "x$ac_cv_header_png_h" = x""yes; then :
-  ac_vmw_have_lib_header=1
-fi
-
-
-
-         CPPFLAGS="$ORIGINAL_CPPFLAGS"
-      else
-         ac_vmw_have_lib_header=1
-      fi
-
-      # Check a specific function in the library if requested.
-      # If it hasn't, just pick a random function from libc, just to make
-      # sure the linker can find the library being tested.
-      if test $ac_vmw_have_lib_header -eq 1; then
-         if test -n "png_access_version_number"; then
-            ac_vmw_function=png_access_version_number
-         else
-            ac_vmw_function=strlen
-         fi
-         as_ac_Lib=`$as_echo "ac_cv_lib_png12_$ac_vmw_function" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_vmw_function in -lpng12" >&5
-$as_echo_n "checking for $ac_vmw_function in -lpng12... " >&6; }
-if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpng12 $ac_vmw_custom_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 $ac_vmw_function ();
-int
-main ()
-{
-return $ac_vmw_function ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  eval "$as_ac_Lib=yes"
-else
-  eval "$as_ac_Lib=no"
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-eval ac_res=\$$as_ac_Lib
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
-  ac_vmw_have_lib_func=1
-fi
-
-      fi
-
-      if test $ac_vmw_have_lib_func -eq 1 && test $ac_vmw_have_lib_header -eq 1; then
-         LIBPNG_CPPFLAGS="${CUSTOM_LIBPNG_CPPFLAGS}"
-         LIBPNG_LIBS="$ac_vmw_custom_libs"
-         ac_vmw_have_lib=1
-      fi
-   fi
-
-   # If that didn't work, try with pkg-config.
-   if test $ac_vmw_have_lib -eq 0 && test "$HAVE_PKG_CONFIG" = "yes" && test -n "libpng12"; then
-      if test -n ""; then
-         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libpng12 >=  (via pkg-config)" >&5
-$as_echo_n "checking for libpng12 >=  (via pkg-config)... " >&6; }
-         if pkg-config --exists 'libpng12 >= '; then
-            ac_vmw_have_lib=1
-         fi
-      else
-         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libpng12 (via pkg-config)" >&5
-$as_echo_n "checking for libpng12 (via pkg-config)... " >&6; }
-         if pkg-config --exists 'libpng12'; then
-            ac_vmw_have_lib=1
-         fi
-      fi
-
-      if test $ac_vmw_have_lib -eq 1; then
-         # Sometimes pkg-config might fail; for example, "pkg-config gtk+-2.0 --cflags"
-         # fails on OpenSolaris B71. So be pessimistic.
-         ac_vmw_cppflags="`pkg-config --cflags libpng12`"
-         ac_vmw_ret1=$?
-         ac_vmw_libs="`pkg-config --libs libpng12`"
-         ac_vmw_ret2=$?
-         if test $ac_vmw_ret1 -eq 0 && test $ac_vmw_ret2 -eq 0; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-            LIBPNG_CPPFLAGS="$ac_vmw_cppflags"
-            LIBPNG_LIBS="$ac_vmw_libs"
-         else
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-         fi
-      else
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-      fi
-   fi
-
-   # If we still haven't found the lib, try with the library's custom "config" script.
-   # Before checking, flush the AC_PATH_PROG cached variable.
-   unset ac_cv_path_ac_vmw_lib_cfg
-   unset ac_vmw_lib_cfg
-   if test $ac_vmw_have_lib -eq 0 && test -n "libpng-config"; then
-      # Extract the first word of "libpng-config", so it can be a program name with args.
-set dummy libpng-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_vmw_lib_cfg+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $ac_vmw_lib_cfg in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_ac_vmw_lib_cfg="$ac_vmw_lib_cfg" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-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
-    ac_cv_path_ac_vmw_lib_cfg="$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
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_path_ac_vmw_lib_cfg" && ac_cv_path_ac_vmw_lib_cfg="no"
-  ;;
-esac
-fi
-ac_vmw_lib_cfg=$ac_cv_path_ac_vmw_lib_cfg
-if test -n "$ac_vmw_lib_cfg"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_vmw_lib_cfg" >&5
-$as_echo "$ac_vmw_lib_cfg" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-      if test "$ac_vmw_lib_cfg" != "no"; then
-         # XXX: icu-config does not follow the "--cflags" and "--libs" convention,
-         # so single it out here to avoid having to replicate all the rest of the
-         # logic elsewhere.
-         if test `basename "$ac_vmw_lib_cfg"` = "icu-config"; then
-            LIBPNG_CPPFLAGS="`$ac_vmw_lib_cfg --cppflags`"
-            LIBPNG_LIBS="`$ac_vmw_lib_cfg --ldflags`"
-         else
-            LIBPNG_CPPFLAGS="`$ac_vmw_lib_cfg --cflags`"
-            LIBPNG_LIBS="`$ac_vmw_lib_cfg --libs`"
-         fi
-         ac_vmw_have_lib=1
-      fi
-   fi
-
-   # Finish by executing the user provided action. The call to "true" is needed
-   # because the actions are optional, and we need something inside the block.
-   if test $ac_vmw_have_lib -eq 1; then
-      
-      
-      true
-      
-   else
-      true
-      as_fn_error $? "libpng not found. Please configure without Unity (using --disable-unity) or install the libpng devel package" "$LINENO" 5 
-   fi
-
-
-           # Check for the zlib library and headers. Like uriparser, there
-           # isn't a pkg-config or zlib-config file.
-           
-   if test -z "$CUSTOM_ZLIB_CPPFLAGS"; then
-      if test "$os" = freebsd; then
-         CUSTOM_ZLIB_CPPFLAGS="-I/usr/local/include"
-      else
-         CUSTOM_ZLIB_CPPFLAGS="-I/usr/include"
-      fi
-      if test -n ""; then
-         CUSTOM_ZLIB_CPPFLAGS="${CUSTOM_ZLIB_CPPFLAGS}/"
-      fi
-   fi
-
-           
-        
-   if test -z "z"; then
-      as_fn_error $? "'library' parameter is required.'" "$LINENO" 5 
-   fi
-   if test -z "ZLIB"; then
-      as_fn_error $? "'lvar' parameter is required.'" "$LINENO" 5 
-   fi
-
-   ac_vmw_have_lib=0
-   ac_vmw_have_lib_func=0
-   ac_vmw_have_lib_header=0
-   ac_vmw_custom_libs=
-
-   #
-   # First, try any user-defined CUSTOM_* flags.
-   #
-   if test -n "${CUSTOM_ZLIB_CPPFLAGS}" || test -n "${CUSTOM_ZLIB_LIBS}"; then
-      ac_vmw_custom_libs="${CUSTOM_ZLIB_LIBS} -lz"
-      if test -n "zlib.h"; then
-         ORIGINAL_CPPFLAGS="$CPPFLAGS"
-         CPPFLAGS="${CUSTOM_ZLIB_CPPFLAGS} $CPPFLAGS"
-
-         ac_fn_c_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default"
-if test "x$ac_cv_header_zlib_h" = x""yes; then :
-  ac_vmw_have_lib_header=1
-fi
-
-
-
-         CPPFLAGS="$ORIGINAL_CPPFLAGS"
-      else
-         ac_vmw_have_lib_header=1
-      fi
-
-      # Check a specific function in the library if requested.
-      # If it hasn't, just pick a random function from libc, just to make
-      # sure the linker can find the library being tested.
-      if test $ac_vmw_have_lib_header -eq 1; then
-         if test -n "zlibVersion"; then
-            ac_vmw_function=zlibVersion
-         else
-            ac_vmw_function=strlen
-         fi
-         as_ac_Lib=`$as_echo "ac_cv_lib_z_$ac_vmw_function" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_vmw_function in -lz" >&5
-$as_echo_n "checking for $ac_vmw_function in -lz... " >&6; }
-if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lz $ac_vmw_custom_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 $ac_vmw_function ();
-int
-main ()
-{
-return $ac_vmw_function ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  eval "$as_ac_Lib=yes"
-else
-  eval "$as_ac_Lib=no"
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-eval ac_res=\$$as_ac_Lib
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
-  ac_vmw_have_lib_func=1
-fi
-
-      fi
-
-      if test $ac_vmw_have_lib_func -eq 1 && test $ac_vmw_have_lib_header -eq 1; then
-         ZLIB_CPPFLAGS="${CUSTOM_ZLIB_CPPFLAGS}"
-         ZLIB_LIBS="$ac_vmw_custom_libs"
-         ac_vmw_have_lib=1
-      fi
-   fi
-
-   # If that didn't work, try with pkg-config.
-   if test $ac_vmw_have_lib -eq 0 && test "$HAVE_PKG_CONFIG" = "yes" && test -n ""; then
-      if test -n ""; then
-         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for  >=  (via pkg-config)" >&5
-$as_echo_n "checking for  >=  (via pkg-config)... " >&6; }
-         if pkg-config --exists ' >= '; then
-            ac_vmw_have_lib=1
-         fi
-      else
-         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for  (via pkg-config)" >&5
-$as_echo_n "checking for  (via pkg-config)... " >&6; }
-         if pkg-config --exists ''; then
-            ac_vmw_have_lib=1
-         fi
-      fi
-
-      if test $ac_vmw_have_lib -eq 1; then
-         # Sometimes pkg-config might fail; for example, "pkg-config gtk+-2.0 --cflags"
-         # fails on OpenSolaris B71. So be pessimistic.
-         ac_vmw_cppflags="`pkg-config --cflags `"
-         ac_vmw_ret1=$?
-         ac_vmw_libs="`pkg-config --libs `"
-         ac_vmw_ret2=$?
-         if test $ac_vmw_ret1 -eq 0 && test $ac_vmw_ret2 -eq 0; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-            ZLIB_CPPFLAGS="$ac_vmw_cppflags"
-            ZLIB_LIBS="$ac_vmw_libs"
-         else
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-         fi
-      else
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-      fi
-   fi
-
-   # If we still haven't found the lib, try with the library's custom "config" script.
-   # Before checking, flush the AC_PATH_PROG cached variable.
-   unset ac_cv_path_ac_vmw_lib_cfg
-   unset ac_vmw_lib_cfg
-   if test $ac_vmw_have_lib -eq 0 && test -n ""; then
-      # Extract the first word of "", so it can be a program name with args.
-set dummy ; 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_vmw_lib_cfg+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $ac_vmw_lib_cfg in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_ac_vmw_lib_cfg="$ac_vmw_lib_cfg" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-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
-    ac_cv_path_ac_vmw_lib_cfg="$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
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_path_ac_vmw_lib_cfg" && ac_cv_path_ac_vmw_lib_cfg="no"
-  ;;
-esac
-fi
-ac_vmw_lib_cfg=$ac_cv_path_ac_vmw_lib_cfg
-if test -n "$ac_vmw_lib_cfg"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_vmw_lib_cfg" >&5
-$as_echo "$ac_vmw_lib_cfg" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-      if test "$ac_vmw_lib_cfg" != "no"; then
-         # XXX: icu-config does not follow the "--cflags" and "--libs" convention,
-         # so single it out here to avoid having to replicate all the rest of the
-         # logic elsewhere.
-         if test `basename "$ac_vmw_lib_cfg"` = "icu-config"; then
-            ZLIB_CPPFLAGS="`$ac_vmw_lib_cfg --cppflags`"
-            ZLIB_LIBS="`$ac_vmw_lib_cfg --ldflags`"
-         else
-            ZLIB_CPPFLAGS="`$ac_vmw_lib_cfg --cflags`"
-            ZLIB_LIBS="`$ac_vmw_lib_cfg --libs`"
-         fi
-         ac_vmw_have_lib=1
-      fi
-   fi
-
-   # Finish by executing the user provided action. The call to "true" is needed
-   # because the actions are optional, and we need something inside the block.
-   if test $ac_vmw_have_lib -eq 1; then
-      
-      
-      true
-      
-   else
-      true
-      as_fn_error $? "zlib library not found. Please configure without Unity (using --disable-unity) or install the zlib devel package." "$LINENO" 5 
-   fi
-
-
-           # Check for gio 2.24.
-           
-        
-   if test -z "gio-2.0"; then
-      as_fn_error $? "'library' parameter is required.'" "$LINENO" 5 
-   fi
-   if test -z "GIO"; then
-      as_fn_error $? "'lvar' parameter is required.'" "$LINENO" 5 
-   fi
-
-   ac_vmw_have_lib=0
-   ac_vmw_have_lib_func=0
-   ac_vmw_have_lib_header=0
-   ac_vmw_custom_libs=
-
-   #
-   # First, try any user-defined CUSTOM_* flags.
-   #
-   if test -n "${CUSTOM_GIO_CPPFLAGS}" || test -n "${CUSTOM_GIO_LIBS}"; then
-      ac_vmw_custom_libs="${CUSTOM_GIO_LIBS} -lgio-2.0"
-      if test -n "gio/gio.h"; then
-         ORIGINAL_CPPFLAGS="$CPPFLAGS"
-         CPPFLAGS="${CUSTOM_GIO_CPPFLAGS} $CPPFLAGS"
-
-         ac_fn_c_check_header_mongrel "$LINENO" "gio/gio.h" "ac_cv_header_gio_gio_h" "$ac_includes_default"
-if test "x$ac_cv_header_gio_gio_h" = x""yes; then :
-  ac_vmw_have_lib_header=1
-fi
-
-
-
-         CPPFLAGS="$ORIGINAL_CPPFLAGS"
-      else
-         ac_vmw_have_lib_header=1
-      fi
-
-      # Check a specific function in the library if requested.
-      # If it hasn't, just pick a random function from libc, just to make
-      # sure the linker can find the library being tested.
-      if test $ac_vmw_have_lib_header -eq 1; then
-         if test -n "g_desktop_app_info_get_filename"; then
-            ac_vmw_function=g_desktop_app_info_get_filename
-         else
-            ac_vmw_function=strlen
-         fi
-         as_ac_Lib=`$as_echo "ac_cv_lib_gio-2.0_$ac_vmw_function" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_vmw_function in -lgio-2.0" >&5
-$as_echo_n "checking for $ac_vmw_function in -lgio-2.0... " >&6; }
-if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lgio-2.0 $ac_vmw_custom_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 $ac_vmw_function ();
-int
-main ()
-{
-return $ac_vmw_function ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  eval "$as_ac_Lib=yes"
-else
-  eval "$as_ac_Lib=no"
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-eval ac_res=\$$as_ac_Lib
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
-  ac_vmw_have_lib_func=1
-fi
-
-      fi
-
-      if test $ac_vmw_have_lib_func -eq 1 && test $ac_vmw_have_lib_header -eq 1; then
-         GIO_CPPFLAGS="${CUSTOM_GIO_CPPFLAGS}"
-         GIO_LIBS="$ac_vmw_custom_libs"
-         ac_vmw_have_lib=1
-      fi
-   fi
-
-   # If that didn't work, try with pkg-config.
-   if test $ac_vmw_have_lib -eq 0 && test "$HAVE_PKG_CONFIG" = "yes" && test -n "gio-unix-2.0"; then
-      if test -n "2.24.0"; then
-         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gio-unix-2.0 >= 2.24.0 (via pkg-config)" >&5
-$as_echo_n "checking for gio-unix-2.0 >= 2.24.0 (via pkg-config)... " >&6; }
-         if pkg-config --exists 'gio-unix-2.0 >= 2.24.0'; then
-            ac_vmw_have_lib=1
-         fi
-      else
-         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gio-unix-2.0 (via pkg-config)" >&5
-$as_echo_n "checking for gio-unix-2.0 (via pkg-config)... " >&6; }
-         if pkg-config --exists 'gio-unix-2.0'; then
-            ac_vmw_have_lib=1
-         fi
-      fi
-
-      if test $ac_vmw_have_lib -eq 1; then
-         # Sometimes pkg-config might fail; for example, "pkg-config gtk+-2.0 --cflags"
-         # fails on OpenSolaris B71. So be pessimistic.
-         ac_vmw_cppflags="`pkg-config --cflags gio-unix-2.0`"
-         ac_vmw_ret1=$?
-         ac_vmw_libs="`pkg-config --libs gio-unix-2.0`"
-         ac_vmw_ret2=$?
-         if test $ac_vmw_ret1 -eq 0 && test $ac_vmw_ret2 -eq 0; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-            GIO_CPPFLAGS="$ac_vmw_cppflags"
-            GIO_LIBS="$ac_vmw_libs"
-         else
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-         fi
-      else
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-      fi
-   fi
-
-   # If we still haven't found the lib, try with the library's custom "config" script.
-   # Before checking, flush the AC_PATH_PROG cached variable.
-   unset ac_cv_path_ac_vmw_lib_cfg
-   unset ac_vmw_lib_cfg
-   if test $ac_vmw_have_lib -eq 0 && test -n ""; then
-      # Extract the first word of "", so it can be a program name with args.
-set dummy ; 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_vmw_lib_cfg+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $ac_vmw_lib_cfg in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_ac_vmw_lib_cfg="$ac_vmw_lib_cfg" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-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
-    ac_cv_path_ac_vmw_lib_cfg="$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
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_path_ac_vmw_lib_cfg" && ac_cv_path_ac_vmw_lib_cfg="no"
-  ;;
-esac
-fi
-ac_vmw_lib_cfg=$ac_cv_path_ac_vmw_lib_cfg
-if test -n "$ac_vmw_lib_cfg"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_vmw_lib_cfg" >&5
-$as_echo "$ac_vmw_lib_cfg" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-      if test "$ac_vmw_lib_cfg" != "no"; then
-         # XXX: icu-config does not follow the "--cflags" and "--libs" convention,
-         # so single it out here to avoid having to replicate all the rest of the
-         # logic elsewhere.
-         if test `basename "$ac_vmw_lib_cfg"` = "icu-config"; then
-            GIO_CPPFLAGS="`$ac_vmw_lib_cfg --cppflags`"
-            GIO_LIBS="`$ac_vmw_lib_cfg --ldflags`"
-         else
-            GIO_CPPFLAGS="`$ac_vmw_lib_cfg --cflags`"
-            GIO_LIBS="`$ac_vmw_lib_cfg --libs`"
-         fi
-         ac_vmw_have_lib=1
-      fi
-   fi
-
-   # Finish by executing the user provided action. The call to "true" is needed
-   # because the actions are optional, and we need something inside the block.
-   if test $ac_vmw_have_lib -eq 1; then
-      
-      
-      true
-      
-   else
-      true
-      as_fn_error $? "GLib/GIO 2.24+ not found.  Please configure without Unity (using --disable-unity) or upgrade the Glib devel package." "$LINENO" 5 
-   fi
-
-   fi # End of library checks for Unity.
-
    # Check whether we have gtk+ 2.0.
    if test "$with_gtk2" != "no"; then
       # gdk_display_get_default_group (added in gtk+ 2.4.0) is function currently
@@ -19847,53 +18882,6 @@
       as_fn_error $? "Gtk+ 2.0 library not found or too old. Please configure without Gtk+ support (using --without-gtk2) or install the Gtk+ 2.0 devel package." "$LINENO" 5 
    fi
 
-
-      # Unity requires libgdk_pixbuf_xlib, which most systems don't seem to
-      # provide via "pkg-config --libs gtk+-2.0".
-      if test "$enable_unity" != "no"; then
-         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdk_pixbuf_xlib_init in -lgdk_pixbuf_xlib-2.0" >&5
-$as_echo_n "checking for gdk_pixbuf_xlib_init in -lgdk_pixbuf_xlib-2.0... " >&6; }
-if test "${ac_cv_lib_gdk_pixbuf_xlib_2_0_gdk_pixbuf_xlib_init+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lgdk_pixbuf_xlib-2.0 $GTK_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 gdk_pixbuf_xlib_init ();
-int
-main ()
-{
-return gdk_pixbuf_xlib_init ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_gdk_pixbuf_xlib_2_0_gdk_pixbuf_xlib_init=yes
-else
-  ac_cv_lib_gdk_pixbuf_xlib_2_0_gdk_pixbuf_xlib_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_gdk_pixbuf_xlib_2_0_gdk_pixbuf_xlib_init" >&5
-$as_echo "$ac_cv_lib_gdk_pixbuf_xlib_2_0_gdk_pixbuf_xlib_init" >&6; }
-if test "x$ac_cv_lib_gdk_pixbuf_xlib_2_0_gdk_pixbuf_xlib_init" = x""yes; then :
-  GTK_LIBS="$GTK_LIBS -lgdk_pixbuf_xlib-2.0"
-else
-  as_fn_error $? "gdk_pixbuf_xlib-2.0 not found. Make sure your Gtk 2.0 installation is sane, or configure without Unity (using --disable-unity)." "$LINENO" 5 
-fi
-
-      fi
    fi
 
    #
@@ -21834,6 +20822,8 @@
 
    # Easier to give all modules the ICU defines/includes...
    CPPFLAGS="$CPPFLAGS $ICU_CPPFLAGS"
+else
+   CPPFLAGS="$CPPFLAGS -DNO_ICU"
 fi
 
 # Extract the first word of "rpcgen", so it can be a program name with args.
@@ -22090,6 +21080,50 @@
 
 fi
 
+bsdPrintfWrappers=no
+if test "$os" = "linux"; then
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ecvt in -lc" >&5
+$as_echo_n "checking for ecvt in -lc... " >&6; }
+if test "${ac_cv_lib_c_ecvt+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lc  $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 ecvt ();
+int
+main ()
+{
+return ecvt ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_c_ecvt=yes
+else
+  ac_cv_lib_c_ecvt=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_c_ecvt" >&5
+$as_echo "$ac_cv_lib_c_ecvt" >&6; }
+if test "x$ac_cv_lib_c_ecvt" = x""yes; then :
+  bsdPrintfWrappers=yes
+fi
+
+fi
+
 ###
 ### Typdefs, structs, and compiler quarks.
 ###
@@ -22555,7 +21589,7 @@
    CFLAGS="$ORIGINAL_CFLAGS$NEW_CFLAG"
 done
 CPPFLAGS="$CPPFLAGS -DVMX86_TOOLS"
-CPPFLAGS="$CPPFLAGS -DNO_CORE_ICU"
+CPPFLAGS="$CPPFLAGS"
 
 # -fvisibility is used by "core service" plugins, but not required.
 ORIGINAL_CFLAGS="$CFLAGS"
@@ -22584,6 +21618,34 @@
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 CFLAGS="$ORIGINAL_CFLAGS"
 
+# Detect "unused-but-set-variable" gcc warning and disable it.
+ORIGINAL_CFLAGS="$CFLAGS"
+CFLAGS="$CFLAGS -Wno-unused-but-set-variable"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GCC flag -Wno-unused-but-set-variable" >&5
+$as_echo_n "checking for GCC flag -Wno-unused-but-set-variable... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+return 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ORIGINAL_CFLAGS="$ORIGINAL_CFLAGS -Wno-unused-but-set-variable";
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+CFLAGS="$ORIGINAL_CFLAGS"
+
+
 BUILDDIR="`pwd`"
 
 INCLUDE_DIR="`cd $srcdir; pwd`/lib/include"
@@ -22767,6 +21829,7 @@
 fi
 
 if test "$os" = "freebsd"; then
+   LIBVMTOOLS_LIBADD="$LIBVMTOOLS_LIBADD -lkvm"
    MODULES_DIR="/boot/modules"
 
    if test "$osVersion" -ge 302000; then
@@ -22924,14 +21987,6 @@
   HAVE_XCOMPOSITE_FALSE=
 fi
 
- if test "$enable_unity" = "yes"; then
-  ENABLE_UNITY_TRUE=
-  ENABLE_UNITY_FALSE='#'
-else
-  ENABLE_UNITY_TRUE='#'
-  ENABLE_UNITY_FALSE=
-fi
-
  if test "$have_cunit" = "yes"; then
   ENABLE_TESTS_TRUE=
   ENABLE_TESTS_FALSE='#'
@@ -23004,6 +22059,14 @@
   USE_SLASH_PROC_FALSE=
 fi
 
+ if test "$bsdPrintfWrappers" = "yes"; then
+  USE_PRINTF_WRAPPERS_TRUE=
+  USE_PRINTF_WRAPPERS_FALSE='#'
+else
+  USE_PRINTF_WRAPPERS_TRUE='#'
+  USE_PRINTF_WRAPPERS_FALSE=
+fi
+
 
 if test "$have_xsm" != "yes"; then
 $as_echo "@%:@define NO_XSM 1" >>confdefs.h
@@ -23113,7 +22176,7 @@
 ###
 ### Create the Makefiles
 ###
-ac_config_files="$ac_config_files Makefile lib/Makefile lib/appUtil/Makefile lib/auth/Makefile lib/backdoor/Makefile lib/dict/Makefile lib/dynxdr/Makefile lib/err/Makefile lib/file/Makefile lib/foundryMsg/Makefile lib/guestApp/Makefile lib/guestRpc/Makefile lib/hgfs/Makefile lib/hgfsBd/Makefile lib/hgfsHelper/Makefile lib/hgfsServer/Makefile lib/hgfsServerManagerGuest/Makefile lib/hgfsServerPolicyGuest/Makefile lib/image/Makefile lib/impersonate/Makefile lib/lock/Makefile lib/message/Makefile lib/misc/Makefile lib/netUtil/Makefile lib/panic/Makefile lib/panicDefault/Makefile lib/printer/Makefile lib/procMgr/Makefile lib/raster/Makefile lib/region/Makefile lib/rpcChannel/Makefile lib/rpcIn/Makefile lib/rpcOut/Makefile lib/rpcVmx/Makefile lib/slashProc/Makefile lib/string/Makefile lib/stubs/Makefile lib/syncDriver/Makefile lib/system/Makefile lib/unicode/Makefile lib/user/Makefile lib/vmCheck/Makefile lib/vmSignal/Makefile lib/wiper/Makefile lib/xdg/Makefile services/Makefile services/vmtoolsd/Makefile services/plugins/Makefile services/plugins/desktopEvents/Makefile services/plugins/dndcp/Makefile services/plugins/guestInfo/Makefile services/plugins/guestInfo/getlib/Makefile services/plugins/hgfsServer/Makefile services/plugins/powerOps/Makefile services/plugins/resolutionSet/Makefile services/plugins/timeSync/Makefile services/plugins/unity/Makefile services/plugins/vix/Makefile services/plugins/vmbackup/Makefile vmware-user-suid-wrapper/Makefile toolbox/Makefile hgfsclient/Makefile hgfsmounter/Makefile checkvm/Makefile rpctool/Makefile libguestlib/Makefile libguestlib/vmguestlib.pc libhgfs/Makefile libvmtools/Makefile xferlogs/Makefile modules/Makefile vmblock-fuse/Makefile vmblockmounter/Makefile tests/Makefile tests/vmrpcdbg/Makefile tests/testDebug/Makefile tests/testPlugin/Makefile tests/testVmblock/Makefile docs/Makefile docs/api/Makefile scripts/Makefile scripts/build/rpcgen_wrapper.sh"
+ac_config_files="$ac_config_files Makefile lib/Makefile lib/appUtil/Makefile lib/auth/Makefile lib/backdoor/Makefile lib/dict/Makefile lib/dynxdr/Makefile lib/err/Makefile lib/file/Makefile lib/foundryMsg/Makefile lib/glibUtils/Makefile lib/guestApp/Makefile lib/guestRpc/Makefile lib/hgfs/Makefile lib/hgfsBd/Makefile lib/hgfsHelper/Makefile lib/hgfsServer/Makefile lib/hgfsServerManagerGuest/Makefile lib/hgfsServerPolicyGuest/Makefile lib/impersonate/Makefile lib/lock/Makefile lib/message/Makefile lib/misc/Makefile lib/netUtil/Makefile lib/panic/Makefile lib/panicDefault/Makefile lib/printer/Makefile lib/procMgr/Makefile lib/rpcChannel/Makefile lib/rpcIn/Makefile lib/rpcOut/Makefile lib/rpcVmx/Makefile lib/slashProc/Makefile lib/string/Makefile lib/stubs/Makefile lib/syncDriver/Makefile lib/system/Makefile lib/unicode/Makefile lib/user/Makefile lib/vmCheck/Makefile lib/vmSignal/Makefile lib/wiper/Makefile lib/xdg/Makefile services/Makefile services/vmtoolsd/Makefile services/plugins/Makefile services/plugins/desktopEvents/Makefile services/plugins/dndcp/Makefile services/plugins/guestInfo/Makefile services/plugins/guestInfo/getlib/Makefile services/plugins/hgfsServer/Makefile services/plugins/powerOps/Makefile services/plugins/resolutionSet/Makefile services/plugins/timeSync/Makefile services/plugins/vix/Makefile services/plugins/vmbackup/Makefile vmware-user-suid-wrapper/Makefile toolbox/Makefile hgfsclient/Makefile hgfsmounter/Makefile checkvm/Makefile rpctool/Makefile libguestlib/Makefile libguestlib/vmguestlib.pc libhgfs/Makefile libvmtools/Makefile xferlogs/Makefile modules/Makefile vmblock-fuse/Makefile vmblockmounter/Makefile tests/Makefile tests/vmrpcdbg/Makefile tests/testDebug/Makefile tests/testPlugin/Makefile tests/testVmblock/Makefile docs/Makefile docs/api/Makefile scripts/Makefile scripts/build/rpcgen_wrapper.sh"
 
 
 ###
@@ -23325,10 +22388,6 @@
   as_fn_error $? "conditional \"HAVE_XCOMPOSITE\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5 
 fi
-if test -z "${ENABLE_UNITY_TRUE}" && test -z "${ENABLE_UNITY_FALSE}"; then
-  as_fn_error $? "conditional \"ENABLE_UNITY\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5 
-fi
 if test -z "${ENABLE_TESTS_TRUE}" && test -z "${ENABLE_TESTS_FALSE}"; then
   as_fn_error $? "conditional \"ENABLE_TESTS\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5 
@@ -23365,6 +22424,10 @@
   as_fn_error $? "conditional \"USE_SLASH_PROC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5 
 fi
+if test -z "${USE_PRINTF_WRAPPERS_TRUE}" && test -z "${USE_PRINTF_WRAPPERS_FALSE}"; then
+  as_fn_error $? "conditional \"USE_PRINTF_WRAPPERS\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5 
+fi
 
 : ${CONFIG_STATUS=./config.status}
 ac_write_fail=0
@@ -23773,7 +22836,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by open-vm-tools $as_me 2011.07.19, which was
+This file was extended by open-vm-tools $as_me 2011.12.20, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -23830,7 +22893,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-open-vm-tools config.status 2011.07.19
+open-vm-tools config.status 2011.12.20
 configured by $0, generated by GNU Autoconf 2.67,
   with options \\"\$ac_cs_config\\"
 
@@ -24311,6 +23374,7 @@
     "lib/err/Makefile") CONFIG_FILES="$CONFIG_FILES lib/err/Makefile" ;;
     "lib/file/Makefile") CONFIG_FILES="$CONFIG_FILES lib/file/Makefile" ;;
     "lib/foundryMsg/Makefile") CONFIG_FILES="$CONFIG_FILES lib/foundryMsg/Makefile" ;;
+    "lib/glibUtils/Makefile") CONFIG_FILES="$CONFIG_FILES lib/glibUtils/Makefile" ;;
     "lib/guestApp/Makefile") CONFIG_FILES="$CONFIG_FILES lib/guestApp/Makefile" ;;
     "lib/guestRpc/Makefile") CONFIG_FILES="$CONFIG_FILES lib/guestRpc/Makefile" ;;
     "lib/hgfs/Makefile") CONFIG_FILES="$CONFIG_FILES lib/hgfs/Makefile" ;;
@@ -24319,7 +23383,6 @@
     "lib/hgfsServer/Makefile") CONFIG_FILES="$CONFIG_FILES lib/hgfsServer/Makefile" ;;
     "lib/hgfsServerManagerGuest/Makefile") CONFIG_FILES="$CONFIG_FILES lib/hgfsServerManagerGuest/Makefile" ;;
     "lib/hgfsServerPolicyGuest/Makefile") CONFIG_FILES="$CONFIG_FILES lib/hgfsServerPolicyGuest/Makefile" ;;
-    "lib/image/Makefile") CONFIG_FILES="$CONFIG_FILES lib/image/Makefile" ;;
     "lib/impersonate/Makefile") CONFIG_FILES="$CONFIG_FILES lib/impersonate/Makefile" ;;
     "lib/lock/Makefile") CONFIG_FILES="$CONFIG_FILES lib/lock/Makefile" ;;
     "lib/message/Makefile") CONFIG_FILES="$CONFIG_FILES lib/message/Makefile" ;;
@@ -24329,8 +23392,6 @@
     "lib/panicDefault/Makefile") CONFIG_FILES="$CONFIG_FILES lib/panicDefault/Makefile" ;;
     "lib/printer/Makefile") CONFIG_FILES="$CONFIG_FILES lib/printer/Makefile" ;;
     "lib/procMgr/Makefile") CONFIG_FILES="$CONFIG_FILES lib/procMgr/Makefile" ;;
-    "lib/raster/Makefile") CONFIG_FILES="$CONFIG_FILES lib/raster/Makefile" ;;
-    "lib/region/Makefile") CONFIG_FILES="$CONFIG_FILES lib/region/Makefile" ;;
     "lib/rpcChannel/Makefile") CONFIG_FILES="$CONFIG_FILES lib/rpcChannel/Makefile" ;;
     "lib/rpcIn/Makefile") CONFIG_FILES="$CONFIG_FILES lib/rpcIn/Makefile" ;;
     "lib/rpcOut/Makefile") CONFIG_FILES="$CONFIG_FILES lib/rpcOut/Makefile" ;;
@@ -24357,7 +23418,6 @@
     "services/plugins/powerOps/Makefile") CONFIG_FILES="$CONFIG_FILES services/plugins/powerOps/Makefile" ;;
     "services/plugins/resolutionSet/Makefile") CONFIG_FILES="$CONFIG_FILES services/plugins/resolutionSet/Makefile" ;;
     "services/plugins/timeSync/Makefile") CONFIG_FILES="$CONFIG_FILES services/plugins/timeSync/Makefile" ;;
-    "services/plugins/unity/Makefile") CONFIG_FILES="$CONFIG_FILES services/plugins/unity/Makefile" ;;
     "services/plugins/vix/Makefile") CONFIG_FILES="$CONFIG_FILES services/plugins/vix/Makefile" ;;
     "services/plugins/vmbackup/Makefile") CONFIG_FILES="$CONFIG_FILES services/plugins/vmbackup/Makefile" ;;
     "vmware-user-suid-wrapper/Makefile") CONFIG_FILES="$CONFIG_FILES vmware-user-suid-wrapper/Makefile" ;;
 
=== modified file 'autom4te.cache/output.2'
--- autom4te.cache/output.2	2011-07-22 16:41:03 +0000
+++ autom4te.cache/output.2	2012-01-24 04:56:25 +0000
@@ -1,6 +1,6 @@
 @%:@! /bin/sh
 @%:@ Guess values for system-dependent variables and create Makefiles.
-@%:@ Generated by GNU Autoconf 2.67 for open-vm-tools 2011.07.19.
+@%:@ Generated by GNU Autoconf 2.67 for open-vm-tools 2011.12.20.
 @%:@
 @%:@ Report bugs to <[e-mail]>.
 @%:@ 
@@ -701,8 +701,8 @@
 # Identity of this package.
 PACKAGE_NAME='open-vm-tools'
 PACKAGE_TARNAME='open-vm-tools'
-PACKAGE_VERSION='2011.07.19'
-PACKAGE_STRING='open-vm-tools 2011.07.19'
+PACKAGE_VERSION='2011.12.20'
+PACKAGE_STRING='open-vm-tools 2011.12.20'
 PACKAGE_BUGREPORT='[e-mail]'
 PACKAGE_URL=''
 
@@ -777,6 +777,8 @@
 TARGET_OS
 TOOLS_VERSION
 HGFS_LIBS
+USE_PRINTF_WRAPPERS_FALSE
+USE_PRINTF_WRAPPERS_TRUE
 USE_SLASH_PROC_FALSE
 USE_SLASH_PROC_TRUE
 HAVE_PAM_FALSE
@@ -795,8 +797,6 @@
 WITH_ROOT_PRIVILEGES_TRUE
 ENABLE_TESTS_FALSE
 ENABLE_TESTS_TRUE
-ENABLE_UNITY_FALSE
-ENABLE_UNITY_TRUE
 HAVE_XCOMPOSITE_FALSE
 HAVE_XCOMPOSITE_TRUE
 HAVE_XSM_FALSE
@@ -836,14 +836,6 @@
 GTKMM_CPPFLAGS
 GTK_LIBS
 GTK_CPPFLAGS
-GIO_LIBS
-GIO_CPPFLAGS
-ZLIB_LIBS
-ZLIB_CPPFLAGS
-LIBPNG_LIBS
-LIBPNG_CPPFLAGS
-URIPARSER_LIBS
-URIPARSER_CPPFLAGS
 CUNIT_LIBS
 CUNIT_CPPFLAGS
 PAM_LIBS
@@ -986,7 +978,6 @@
 with_kernel_release
 with_linuxdir
 enable_multimon
-enable_unity
 with_gtk2
 with_gtkmm
 enable_docs
@@ -1561,7 +1552,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures open-vm-tools 2011.07.19 to adapt to many kinds of systems.
+\`configure' configures open-vm-tools 2011.12.20 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1635,7 +1626,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of open-vm-tools 2011.07.19:";;
+     short | recursive ) echo "Configuration of open-vm-tools 2011.12.20:";;
    esac
   cat <<\_ACEOF
 
@@ -1644,7 +1635,6 @@
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --disable-multimon      disables multimon, enabled by default
-  --disable-unity         disables Unity, enabled by default
   --disable-docs          disables generation of API documentation; by
                           default, docs are built if doxygen is available.
   --disable-tests         disable compilation of test code.
@@ -1762,7 +1752,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-open-vm-tools configure 2011.07.19
+open-vm-tools configure 2011.12.20
 generated by GNU Autoconf 2.67
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2454,7 +2444,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by open-vm-tools $as_me 2011.07.19, which was
+It was created by open-vm-tools $as_me 2011.12.20, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   $ $0 $@
@@ -3044,14 +3034,6 @@
 fi
 
 
-@%:@ Check whether --enable-unity was given.
-if test "${enable_unity+set}" = set; then :
-  enableval=$enable_unity; enable_unity="$enableval"
-else
-  enable_unity="yes"
-fi
-
-
 
 @%:@ Check whether --with-gtk2 was given.
 if test "${with_gtk2+set}" = set; then :
@@ -3086,11 +3068,6 @@
 fi
 
 
-# If we're not going to use Gtk 2.0, disable Unity.
-if test "$with_gtk2" != "yes"; then
-   enable_unity="no"
-fi
-
 am__api_version='1.11'
 
 # Find a good install program.  We prefer a C program (faster),
@@ -3529,7 +3506,7 @@
 
 # Define the identity of the package.
  PACKAGE='open-vm-tools'
- VERSION='2011.07.19'
+ VERSION='2011.12.20'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -17819,8 +17796,7 @@
 #
 # Check for PAM.
 #
-if test "$os" = "linux"; then
-   
+
 @%:@ Check whether --with-pam was given.
 if test "${with_pam+set}" = set; then :
   withval=$with_pam; 
@@ -17829,8 +17805,8 @@
 fi
 
 
-   if test "$with_pam" = "yes"; then
-      
+if test "$with_pam" = "yes"; then
+   
    if test -z "$CUSTOM_PAM_CPPFLAGS"; then
       if test "$os" = freebsd; then
          CUSTOM_PAM_CPPFLAGS="-I/usr/local/include"
@@ -17842,7 +17818,7 @@
       fi
    fi
 
-      
+   
         
    if test -z "pam"; then
       as_fn_error $? "'library' parameter is required.'" "$LINENO" 5 
@@ -18054,7 +18030,6 @@
 
    fi
 
-   fi
 fi
 
 #
@@ -18298,7 +18273,6 @@
 # If the user explicitly disables X11, then don't try to detect the X-related libraries
 if test "$have_x" = "disabled"; then
    enable_multimon="no"
-   enable_unity="no"
 elif test "$have_x" != "yes"; then
    as_fn_error $? "The X11 libraries were not found. Please configure without X11 (using --without-x), or install the libX11 devel package(s)." "$LINENO" 5 
 else
@@ -18402,12 +18376,6 @@
   as_fn_error $? "libXinerama not found. Please configure without multimon (using --disable-multimon), configure without X11 (using --without-x), or install the libXinerama devel package(s)." "$LINENO" 5 
 fi
 
-   else
-      if test "$enable_unity" != "no"; then
-         { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Disabling Unity due to --disable-multimon." >&5
-$as_echo "$as_me: WARNING: Disabling Unity due to --disable-multimon." >&2;}
-         enable_unity="no"
-      fi
    fi
 
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XOpenDevice in -lXi" >&5
@@ -18704,939 +18672,6 @@
       have_xcomposite="yes"
    fi
 
-   # If we're building with support for Unity, we'll need a few additional
-   # libraries.
-   if test "$enable_unity" != "no"; then
-           # Unity needs the X11 Screen Saver extension library. It should be
-	   # in the same place as the X11 libraries, so no need for any fancy
-	   # path checking.
-	   
-   have_header=1
-   if test -n "X11/extensions/scrnsaver.h"; then
-      ac_fn_c_check_header_mongrel "$LINENO" "X11/extensions/scrnsaver.h" "ac_cv_header_X11_extensions_scrnsaver_h" "$ac_includes_default"
-if test "x$ac_cv_header_X11_extensions_scrnsaver_h" = x""yes; then :
-  
-else
-  
-          have_header=0;
-          as_fn_error $? "libXss or headers not found. Please configure without Unity (using --disable-unity) or install the libXss devel package." "$LINENO" 5 
-         
-fi
-
-
-   fi
-
-   if test $have_header = 1; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XScreenSaverQueryExtension in -lXss" >&5
-$as_echo_n "checking for XScreenSaverQueryExtension in -lXss... " >&6; }
-if test "${ac_cv_lib_Xss_XScreenSaverQueryExtension+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lXss $COMMON_XLIBS $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 XScreenSaverQueryExtension ();
-int
-main ()
-{
-return XScreenSaverQueryExtension ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_Xss_XScreenSaverQueryExtension=yes
-else
-  ac_cv_lib_Xss_XScreenSaverQueryExtension=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_Xss_XScreenSaverQueryExtension" >&5
-$as_echo "$ac_cv_lib_Xss_XScreenSaverQueryExtension" >&6; }
-if test "x$ac_cv_lib_Xss_XScreenSaverQueryExtension" = x""yes; then :
-  COMMON_XLIBS="-lXss $COMMON_XLIBS"
-else
-  as_fn_error $? "libXss or headers not found. Please configure without Unity (using --disable-unity) or install the libXss devel package." "$LINENO" 5 
-fi
-
-   fi
-
-
-           # Check for the uriparser library and headers. The upstream uriparser
-           # doesn't appear to ship with either a pkg-config file or a
-           # uriparser-config binary, so we'll look for it the old-fashioned
-           # way.
-           #
-           # Note that we look for uriFreeQueryListA because it's a relatively
-           # new symbol that our code needs (it isn't present in the uriparser
-           # that shipped with Ubuntu Hardy).
-           
-   if test -z "$CUSTOM_URIPARSER_CPPFLAGS"; then
-      if test "$os" = freebsd; then
-         CUSTOM_URIPARSER_CPPFLAGS="-I/usr/local/include"
-      else
-         CUSTOM_URIPARSER_CPPFLAGS="-I/usr/include"
-      fi
-      if test -n "uriparser"; then
-         CUSTOM_URIPARSER_CPPFLAGS="${CUSTOM_URIPARSER_CPPFLAGS}/uriparser"
-      fi
-   fi
-
-           
-        
-   if test -z "uriparser"; then
-      as_fn_error $? "'library' parameter is required.'" "$LINENO" 5 
-   fi
-   if test -z "URIPARSER"; then
-      as_fn_error $? "'lvar' parameter is required.'" "$LINENO" 5 
-   fi
-
-   ac_vmw_have_lib=0
-   ac_vmw_have_lib_func=0
-   ac_vmw_have_lib_header=0
-   ac_vmw_custom_libs=
-
-   #
-   # First, try any user-defined CUSTOM_* flags.
-   #
-   if test -n "${CUSTOM_URIPARSER_CPPFLAGS}" || test -n "${CUSTOM_URIPARSER_LIBS}"; then
-      ac_vmw_custom_libs="${CUSTOM_URIPARSER_LIBS} -luriparser"
-      if test -n "Uri.h"; then
-         ORIGINAL_CPPFLAGS="$CPPFLAGS"
-         CPPFLAGS="${CUSTOM_URIPARSER_CPPFLAGS} $CPPFLAGS"
-
-         ac_fn_c_check_header_mongrel "$LINENO" "Uri.h" "ac_cv_header_Uri_h" "$ac_includes_default"
-if test "x$ac_cv_header_Uri_h" = x""yes; then :
-  ac_vmw_have_lib_header=1
-fi
-
-
-
-         CPPFLAGS="$ORIGINAL_CPPFLAGS"
-      else
-         ac_vmw_have_lib_header=1
-      fi
-
-      # Check a specific function in the library if requested.
-      # If it hasn't, just pick a random function from libc, just to make
-      # sure the linker can find the library being tested.
-      if test $ac_vmw_have_lib_header -eq 1; then
-         if test -n "uriFreeQueryListA"; then
-            ac_vmw_function=uriFreeQueryListA
-         else
-            ac_vmw_function=strlen
-         fi
-         as_ac_Lib=`$as_echo "ac_cv_lib_uriparser_$ac_vmw_function" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_vmw_function in -luriparser" >&5
-$as_echo_n "checking for $ac_vmw_function in -luriparser... " >&6; }
-if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-luriparser $ac_vmw_custom_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 $ac_vmw_function ();
-int
-main ()
-{
-return $ac_vmw_function ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  eval "$as_ac_Lib=yes"
-else
-  eval "$as_ac_Lib=no"
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-eval ac_res=\$$as_ac_Lib
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
-  ac_vmw_have_lib_func=1
-fi
-
-      fi
-
-      if test $ac_vmw_have_lib_func -eq 1 && test $ac_vmw_have_lib_header -eq 1; then
-         URIPARSER_CPPFLAGS="${CUSTOM_URIPARSER_CPPFLAGS}"
-         URIPARSER_LIBS="$ac_vmw_custom_libs"
-         ac_vmw_have_lib=1
-      fi
-   fi
-
-   # If that didn't work, try with pkg-config.
-   if test $ac_vmw_have_lib -eq 0 && test "$HAVE_PKG_CONFIG" = "yes" && test -n ""; then
-      if test -n ""; then
-         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for  >=  (via pkg-config)" >&5
-$as_echo_n "checking for  >=  (via pkg-config)... " >&6; }
-         if pkg-config --exists ' >= '; then
-            ac_vmw_have_lib=1
-         fi
-      else
-         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for  (via pkg-config)" >&5
-$as_echo_n "checking for  (via pkg-config)... " >&6; }
-         if pkg-config --exists ''; then
-            ac_vmw_have_lib=1
-         fi
-      fi
-
-      if test $ac_vmw_have_lib -eq 1; then
-         # Sometimes pkg-config might fail; for example, "pkg-config gtk+-2.0 --cflags"
-         # fails on OpenSolaris B71. So be pessimistic.
-         ac_vmw_cppflags="`pkg-config --cflags `"
-         ac_vmw_ret1=$?
-         ac_vmw_libs="`pkg-config --libs `"
-         ac_vmw_ret2=$?
-         if test $ac_vmw_ret1 -eq 0 && test $ac_vmw_ret2 -eq 0; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-            URIPARSER_CPPFLAGS="$ac_vmw_cppflags"
-            URIPARSER_LIBS="$ac_vmw_libs"
-         else
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-         fi
-      else
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-      fi
-   fi
-
-   # If we still haven't found the lib, try with the library's custom "config" script.
-   # Before checking, flush the AC_PATH_PROG cached variable.
-   unset ac_cv_path_ac_vmw_lib_cfg
-   unset ac_vmw_lib_cfg
-   if test $ac_vmw_have_lib -eq 0 && test -n ""; then
-      # Extract the first word of "", so it can be a program name with args.
-set dummy ; 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_vmw_lib_cfg+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $ac_vmw_lib_cfg in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_ac_vmw_lib_cfg="$ac_vmw_lib_cfg" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-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
-    ac_cv_path_ac_vmw_lib_cfg="$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
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_path_ac_vmw_lib_cfg" && ac_cv_path_ac_vmw_lib_cfg="no"
-  ;;
-esac
-fi
-ac_vmw_lib_cfg=$ac_cv_path_ac_vmw_lib_cfg
-if test -n "$ac_vmw_lib_cfg"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_vmw_lib_cfg" >&5
-$as_echo "$ac_vmw_lib_cfg" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-      if test "$ac_vmw_lib_cfg" != "no"; then
-         # XXX: icu-config does not follow the "--cflags" and "--libs" convention,
-         # so single it out here to avoid having to replicate all the rest of the
-         # logic elsewhere.
-         if test `basename "$ac_vmw_lib_cfg"` = "icu-config"; then
-            URIPARSER_CPPFLAGS="`$ac_vmw_lib_cfg --cppflags`"
-            URIPARSER_LIBS="`$ac_vmw_lib_cfg --ldflags`"
-         else
-            URIPARSER_CPPFLAGS="`$ac_vmw_lib_cfg --cflags`"
-            URIPARSER_LIBS="`$ac_vmw_lib_cfg --libs`"
-         fi
-         ac_vmw_have_lib=1
-      fi
-   fi
-
-   # Finish by executing the user provided action. The call to "true" is needed
-   # because the actions are optional, and we need something inside the block.
-   if test $ac_vmw_have_lib -eq 1; then
-      
-      
-      true
-      
-   else
-      true
-      as_fn_error $? "uriparser library not found or is too old. Please configure without Unity (using --disable-unity) or install the liburiparser devel package." "$LINENO" 5 
-   fi
-
-
-           # Check for libpng.
-           
-        
-   if test -z "png12"; then
-      as_fn_error $? "'library' parameter is required.'" "$LINENO" 5 
-   fi
-   if test -z "LIBPNG"; then
-      as_fn_error $? "'lvar' parameter is required.'" "$LINENO" 5 
-   fi
-
-   ac_vmw_have_lib=0
-   ac_vmw_have_lib_func=0
-   ac_vmw_have_lib_header=0
-   ac_vmw_custom_libs=
-
-   #
-   # First, try any user-defined CUSTOM_* flags.
-   #
-   if test -n "${CUSTOM_LIBPNG_CPPFLAGS}" || test -n "${CUSTOM_LIBPNG_LIBS}"; then
-      ac_vmw_custom_libs="${CUSTOM_LIBPNG_LIBS} -lpng12"
-      if test -n "png.h"; then
-         ORIGINAL_CPPFLAGS="$CPPFLAGS"
-         CPPFLAGS="${CUSTOM_LIBPNG_CPPFLAGS} $CPPFLAGS"
-
-         ac_fn_c_check_header_mongrel "$LINENO" "png.h" "ac_cv_header_png_h" "$ac_includes_default"
-if test "x$ac_cv_header_png_h" = x""yes; then :
-  ac_vmw_have_lib_header=1
-fi
-
-
-
-         CPPFLAGS="$ORIGINAL_CPPFLAGS"
-      else
-         ac_vmw_have_lib_header=1
-      fi
-
-      # Check a specific function in the library if requested.
-      # If it hasn't, just pick a random function from libc, just to make
-      # sure the linker can find the library being tested.
-      if test $ac_vmw_have_lib_header -eq 1; then
-         if test -n "png_access_version_number"; then
-            ac_vmw_function=png_access_version_number
-         else
-            ac_vmw_function=strlen
-         fi
-         as_ac_Lib=`$as_echo "ac_cv_lib_png12_$ac_vmw_function" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_vmw_function in -lpng12" >&5
-$as_echo_n "checking for $ac_vmw_function in -lpng12... " >&6; }
-if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpng12 $ac_vmw_custom_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 $ac_vmw_function ();
-int
-main ()
-{
-return $ac_vmw_function ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  eval "$as_ac_Lib=yes"
-else
-  eval "$as_ac_Lib=no"
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-eval ac_res=\$$as_ac_Lib
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
-  ac_vmw_have_lib_func=1
-fi
-
-      fi
-
-      if test $ac_vmw_have_lib_func -eq 1 && test $ac_vmw_have_lib_header -eq 1; then
-         LIBPNG_CPPFLAGS="${CUSTOM_LIBPNG_CPPFLAGS}"
-         LIBPNG_LIBS="$ac_vmw_custom_libs"
-         ac_vmw_have_lib=1
-      fi
-   fi
-
-   # If that didn't work, try with pkg-config.
-   if test $ac_vmw_have_lib -eq 0 && test "$HAVE_PKG_CONFIG" = "yes" && test -n "libpng12"; then
-      if test -n ""; then
-         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libpng12 >=  (via pkg-config)" >&5
-$as_echo_n "checking for libpng12 >=  (via pkg-config)... " >&6; }
-         if pkg-config --exists 'libpng12 >= '; then
-            ac_vmw_have_lib=1
-         fi
-      else
-         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libpng12 (via pkg-config)" >&5
-$as_echo_n "checking for libpng12 (via pkg-config)... " >&6; }
-         if pkg-config --exists 'libpng12'; then
-            ac_vmw_have_lib=1
-         fi
-      fi
-
-      if test $ac_vmw_have_lib -eq 1; then
-         # Sometimes pkg-config might fail; for example, "pkg-config gtk+-2.0 --cflags"
-         # fails on OpenSolaris B71. So be pessimistic.
-         ac_vmw_cppflags="`pkg-config --cflags libpng12`"
-         ac_vmw_ret1=$?
-         ac_vmw_libs="`pkg-config --libs libpng12`"
-         ac_vmw_ret2=$?
-         if test $ac_vmw_ret1 -eq 0 && test $ac_vmw_ret2 -eq 0; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-            LIBPNG_CPPFLAGS="$ac_vmw_cppflags"
-            LIBPNG_LIBS="$ac_vmw_libs"
-         else
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-         fi
-      else
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-      fi
-   fi
-
-   # If we still haven't found the lib, try with the library's custom "config" script.
-   # Before checking, flush the AC_PATH_PROG cached variable.
-   unset ac_cv_path_ac_vmw_lib_cfg
-   unset ac_vmw_lib_cfg
-   if test $ac_vmw_have_lib -eq 0 && test -n "libpng-config"; then
-      # Extract the first word of "libpng-config", so it can be a program name with args.
-set dummy libpng-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_vmw_lib_cfg+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $ac_vmw_lib_cfg in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_ac_vmw_lib_cfg="$ac_vmw_lib_cfg" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-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
-    ac_cv_path_ac_vmw_lib_cfg="$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
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_path_ac_vmw_lib_cfg" && ac_cv_path_ac_vmw_lib_cfg="no"
-  ;;
-esac
-fi
-ac_vmw_lib_cfg=$ac_cv_path_ac_vmw_lib_cfg
-if test -n "$ac_vmw_lib_cfg"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_vmw_lib_cfg" >&5
-$as_echo "$ac_vmw_lib_cfg" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-      if test "$ac_vmw_lib_cfg" != "no"; then
-         # XXX: icu-config does not follow the "--cflags" and "--libs" convention,
-         # so single it out here to avoid having to replicate all the rest of the
-         # logic elsewhere.
-         if test `basename "$ac_vmw_lib_cfg"` = "icu-config"; then
-            LIBPNG_CPPFLAGS="`$ac_vmw_lib_cfg --cppflags`"
-            LIBPNG_LIBS="`$ac_vmw_lib_cfg --ldflags`"
-         else
-            LIBPNG_CPPFLAGS="`$ac_vmw_lib_cfg --cflags`"
-            LIBPNG_LIBS="`$ac_vmw_lib_cfg --libs`"
-         fi
-         ac_vmw_have_lib=1
-      fi
-   fi
-
-   # Finish by executing the user provided action. The call to "true" is needed
-   # because the actions are optional, and we need something inside the block.
-   if test $ac_vmw_have_lib -eq 1; then
-      
-      
-      true
-      
-   else
-      true
-      as_fn_error $? "libpng not found. Please configure without Unity (using --disable-unity) or install the libpng devel package" "$LINENO" 5 
-   fi
-
-
-           # Check for the zlib library and headers. Like uriparser, there
-           # isn't a pkg-config or zlib-config file.
-           
-   if test -z "$CUSTOM_ZLIB_CPPFLAGS"; then
-      if test "$os" = freebsd; then
-         CUSTOM_ZLIB_CPPFLAGS="-I/usr/local/include"
-      else
-         CUSTOM_ZLIB_CPPFLAGS="-I/usr/include"
-      fi
-      if test -n ""; then
-         CUSTOM_ZLIB_CPPFLAGS="${CUSTOM_ZLIB_CPPFLAGS}/"
-      fi
-   fi
-
-           
-        
-   if test -z "z"; then
-      as_fn_error $? "'library' parameter is required.'" "$LINENO" 5 
-   fi
-   if test -z "ZLIB"; then
-      as_fn_error $? "'lvar' parameter is required.'" "$LINENO" 5 
-   fi
-
-   ac_vmw_have_lib=0
-   ac_vmw_have_lib_func=0
-   ac_vmw_have_lib_header=0
-   ac_vmw_custom_libs=
-
-   #
-   # First, try any user-defined CUSTOM_* flags.
-   #
-   if test -n "${CUSTOM_ZLIB_CPPFLAGS}" || test -n "${CUSTOM_ZLIB_LIBS}"; then
-      ac_vmw_custom_libs="${CUSTOM_ZLIB_LIBS} -lz"
-      if test -n "zlib.h"; then
-         ORIGINAL_CPPFLAGS="$CPPFLAGS"
-         CPPFLAGS="${CUSTOM_ZLIB_CPPFLAGS} $CPPFLAGS"
-
-         ac_fn_c_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default"
-if test "x$ac_cv_header_zlib_h" = x""yes; then :
-  ac_vmw_have_lib_header=1
-fi
-
-
-
-         CPPFLAGS="$ORIGINAL_CPPFLAGS"
-      else
-         ac_vmw_have_lib_header=1
-      fi
-
-      # Check a specific function in the library if requested.
-      # If it hasn't, just pick a random function from libc, just to make
-      # sure the linker can find the library being tested.
-      if test $ac_vmw_have_lib_header -eq 1; then
-         if test -n "zlibVersion"; then
-            ac_vmw_function=zlibVersion
-         else
-            ac_vmw_function=strlen
-         fi
-         as_ac_Lib=`$as_echo "ac_cv_lib_z_$ac_vmw_function" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_vmw_function in -lz" >&5
-$as_echo_n "checking for $ac_vmw_function in -lz... " >&6; }
-if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lz $ac_vmw_custom_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 $ac_vmw_function ();
-int
-main ()
-{
-return $ac_vmw_function ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  eval "$as_ac_Lib=yes"
-else
-  eval "$as_ac_Lib=no"
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-eval ac_res=\$$as_ac_Lib
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
-  ac_vmw_have_lib_func=1
-fi
-
-      fi
-
-      if test $ac_vmw_have_lib_func -eq 1 && test $ac_vmw_have_lib_header -eq 1; then
-         ZLIB_CPPFLAGS="${CUSTOM_ZLIB_CPPFLAGS}"
-         ZLIB_LIBS="$ac_vmw_custom_libs"
-         ac_vmw_have_lib=1
-      fi
-   fi
-
-   # If that didn't work, try with pkg-config.
-   if test $ac_vmw_have_lib -eq 0 && test "$HAVE_PKG_CONFIG" = "yes" && test -n ""; then
-      if test -n ""; then
-         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for  >=  (via pkg-config)" >&5
-$as_echo_n "checking for  >=  (via pkg-config)... " >&6; }
-         if pkg-config --exists ' >= '; then
-            ac_vmw_have_lib=1
-         fi
-      else
-         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for  (via pkg-config)" >&5
-$as_echo_n "checking for  (via pkg-config)... " >&6; }
-         if pkg-config --exists ''; then
-            ac_vmw_have_lib=1
-         fi
-      fi
-
-      if test $ac_vmw_have_lib -eq 1; then
-         # Sometimes pkg-config might fail; for example, "pkg-config gtk+-2.0 --cflags"
-         # fails on OpenSolaris B71. So be pessimistic.
-         ac_vmw_cppflags="`pkg-config --cflags `"
-         ac_vmw_ret1=$?
-         ac_vmw_libs="`pkg-config --libs `"
-         ac_vmw_ret2=$?
-         if test $ac_vmw_ret1 -eq 0 && test $ac_vmw_ret2 -eq 0; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-            ZLIB_CPPFLAGS="$ac_vmw_cppflags"
-            ZLIB_LIBS="$ac_vmw_libs"
-         else
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-         fi
-      else
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-      fi
-   fi
-
-   # If we still haven't found the lib, try with the library's custom "config" script.
-   # Before checking, flush the AC_PATH_PROG cached variable.
-   unset ac_cv_path_ac_vmw_lib_cfg
-   unset ac_vmw_lib_cfg
-   if test $ac_vmw_have_lib -eq 0 && test -n ""; then
-      # Extract the first word of "", so it can be a program name with args.
-set dummy ; 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_vmw_lib_cfg+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $ac_vmw_lib_cfg in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_ac_vmw_lib_cfg="$ac_vmw_lib_cfg" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-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
-    ac_cv_path_ac_vmw_lib_cfg="$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
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_path_ac_vmw_lib_cfg" && ac_cv_path_ac_vmw_lib_cfg="no"
-  ;;
-esac
-fi
-ac_vmw_lib_cfg=$ac_cv_path_ac_vmw_lib_cfg
-if test -n "$ac_vmw_lib_cfg"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_vmw_lib_cfg" >&5
-$as_echo "$ac_vmw_lib_cfg" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-      if test "$ac_vmw_lib_cfg" != "no"; then
-         # XXX: icu-config does not follow the "--cflags" and "--libs" convention,
-         # so single it out here to avoid having to replicate all the rest of the
-         # logic elsewhere.
-         if test `basename "$ac_vmw_lib_cfg"` = "icu-config"; then
-            ZLIB_CPPFLAGS="`$ac_vmw_lib_cfg --cppflags`"
-            ZLIB_LIBS="`$ac_vmw_lib_cfg --ldflags`"
-         else
-            ZLIB_CPPFLAGS="`$ac_vmw_lib_cfg --cflags`"
-            ZLIB_LIBS="`$ac_vmw_lib_cfg --libs`"
-         fi
-         ac_vmw_have_lib=1
-      fi
-   fi
-
-   # Finish by executing the user provided action. The call to "true" is needed
-   # because the actions are optional, and we need something inside the block.
-   if test $ac_vmw_have_lib -eq 1; then
-      
-      
-      true
-      
-   else
-      true
-      as_fn_error $? "zlib library not found. Please configure without Unity (using --disable-unity) or install the zlib devel package." "$LINENO" 5 
-   fi
-
-
-           # Check for gio 2.24.
-           
-        
-   if test -z "gio-2.0"; then
-      as_fn_error $? "'library' parameter is required.'" "$LINENO" 5 
-   fi
-   if test -z "GIO"; then
-      as_fn_error $? "'lvar' parameter is required.'" "$LINENO" 5 
-   fi
-
-   ac_vmw_have_lib=0
-   ac_vmw_have_lib_func=0
-   ac_vmw_have_lib_header=0
-   ac_vmw_custom_libs=
-
-   #
-   # First, try any user-defined CUSTOM_* flags.
-   #
-   if test -n "${CUSTOM_GIO_CPPFLAGS}" || test -n "${CUSTOM_GIO_LIBS}"; then
-      ac_vmw_custom_libs="${CUSTOM_GIO_LIBS} -lgio-2.0"
-      if test -n "gio/gio.h"; then
-         ORIGINAL_CPPFLAGS="$CPPFLAGS"
-         CPPFLAGS="${CUSTOM_GIO_CPPFLAGS} $CPPFLAGS"
-
-         ac_fn_c_check_header_mongrel "$LINENO" "gio/gio.h" "ac_cv_header_gio_gio_h" "$ac_includes_default"
-if test "x$ac_cv_header_gio_gio_h" = x""yes; then :
-  ac_vmw_have_lib_header=1
-fi
-
-
-
-         CPPFLAGS="$ORIGINAL_CPPFLAGS"
-      else
-         ac_vmw_have_lib_header=1
-      fi
-
-      # Check a specific function in the library if requested.
-      # If it hasn't, just pick a random function from libc, just to make
-      # sure the linker can find the library being tested.
-      if test $ac_vmw_have_lib_header -eq 1; then
-         if test -n "g_desktop_app_info_get_filename"; then
-            ac_vmw_function=g_desktop_app_info_get_filename
-         else
-            ac_vmw_function=strlen
-         fi
-         as_ac_Lib=`$as_echo "ac_cv_lib_gio-2.0_$ac_vmw_function" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_vmw_function in -lgio-2.0" >&5
-$as_echo_n "checking for $ac_vmw_function in -lgio-2.0... " >&6; }
-if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lgio-2.0 $ac_vmw_custom_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 $ac_vmw_function ();
-int
-main ()
-{
-return $ac_vmw_function ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  eval "$as_ac_Lib=yes"
-else
-  eval "$as_ac_Lib=no"
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-eval ac_res=\$$as_ac_Lib
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
-  ac_vmw_have_lib_func=1
-fi
-
-      fi
-
-      if test $ac_vmw_have_lib_func -eq 1 && test $ac_vmw_have_lib_header -eq 1; then
-         GIO_CPPFLAGS="${CUSTOM_GIO_CPPFLAGS}"
-         GIO_LIBS="$ac_vmw_custom_libs"
-         ac_vmw_have_lib=1
-      fi
-   fi
-
-   # If that didn't work, try with pkg-config.
-   if test $ac_vmw_have_lib -eq 0 && test "$HAVE_PKG_CONFIG" = "yes" && test -n "gio-unix-2.0"; then
-      if test -n "2.24.0"; then
-         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gio-unix-2.0 >= 2.24.0 (via pkg-config)" >&5
-$as_echo_n "checking for gio-unix-2.0 >= 2.24.0 (via pkg-config)... " >&6; }
-         if pkg-config --exists 'gio-unix-2.0 >= 2.24.0'; then
-            ac_vmw_have_lib=1
-         fi
-      else
-         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gio-unix-2.0 (via pkg-config)" >&5
-$as_echo_n "checking for gio-unix-2.0 (via pkg-config)... " >&6; }
-         if pkg-config --exists 'gio-unix-2.0'; then
-            ac_vmw_have_lib=1
-         fi
-      fi
-
-      if test $ac_vmw_have_lib -eq 1; then
-         # Sometimes pkg-config might fail; for example, "pkg-config gtk+-2.0 --cflags"
-         # fails on OpenSolaris B71. So be pessimistic.
-         ac_vmw_cppflags="`pkg-config --cflags gio-unix-2.0`"
-         ac_vmw_ret1=$?
-         ac_vmw_libs="`pkg-config --libs gio-unix-2.0`"
-         ac_vmw_ret2=$?
-         if test $ac_vmw_ret1 -eq 0 && test $ac_vmw_ret2 -eq 0; then
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-            GIO_CPPFLAGS="$ac_vmw_cppflags"
-            GIO_LIBS="$ac_vmw_libs"
-         else
-            { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-         fi
-      else
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-      fi
-   fi
-
-   # If we still haven't found the lib, try with the library's custom "config" script.
-   # Before checking, flush the AC_PATH_PROG cached variable.
-   unset ac_cv_path_ac_vmw_lib_cfg
-   unset ac_vmw_lib_cfg
-   if test $ac_vmw_have_lib -eq 0 && test -n ""; then
-      # Extract the first word of "", so it can be a program name with args.
-set dummy ; 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_vmw_lib_cfg+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $ac_vmw_lib_cfg in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_ac_vmw_lib_cfg="$ac_vmw_lib_cfg" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-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
-    ac_cv_path_ac_vmw_lib_cfg="$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
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  test -z "$ac_cv_path_ac_vmw_lib_cfg" && ac_cv_path_ac_vmw_lib_cfg="no"
-  ;;
-esac
-fi
-ac_vmw_lib_cfg=$ac_cv_path_ac_vmw_lib_cfg
-if test -n "$ac_vmw_lib_cfg"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_vmw_lib_cfg" >&5
-$as_echo "$ac_vmw_lib_cfg" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-      if test "$ac_vmw_lib_cfg" != "no"; then
-         # XXX: icu-config does not follow the "--cflags" and "--libs" convention,
-         # so single it out here to avoid having to replicate all the rest of the
-         # logic elsewhere.
-         if test `basename "$ac_vmw_lib_cfg"` = "icu-config"; then
-            GIO_CPPFLAGS="`$ac_vmw_lib_cfg --cppflags`"
-            GIO_LIBS="`$ac_vmw_lib_cfg --ldflags`"
-         else
-            GIO_CPPFLAGS="`$ac_vmw_lib_cfg --cflags`"
-            GIO_LIBS="`$ac_vmw_lib_cfg --libs`"
-         fi
-         ac_vmw_have_lib=1
-      fi
-   fi
-
-   # Finish by executing the user provided action. The call to "true" is needed
-   # because the actions are optional, and we need something inside the block.
-   if test $ac_vmw_have_lib -eq 1; then
-      
-      
-      true
-      
-   else
-      true
-      as_fn_error $? "GLib/GIO 2.24+ not found.  Please configure without Unity (using --disable-unity) or upgrade the Glib devel package." "$LINENO" 5 
-   fi
-
-   fi # End of library checks for Unity.
-
    # Check whether we have gtk+ 2.0.
    if test "$with_gtk2" != "no"; then
       # gdk_display_get_default_group (added in gtk+ 2.4.0) is function currently
@@ -19847,53 +18882,6 @@
       as_fn_error $? "Gtk+ 2.0 library not found or too old. Please configure without Gtk+ support (using --without-gtk2) or install the Gtk+ 2.0 devel package." "$LINENO" 5 
    fi
 
-
-      # Unity requires libgdk_pixbuf_xlib, which most systems don't seem to
-      # provide via "pkg-config --libs gtk+-2.0".
-      if test "$enable_unity" != "no"; then
-         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdk_pixbuf_xlib_init in -lgdk_pixbuf_xlib-2.0" >&5
-$as_echo_n "checking for gdk_pixbuf_xlib_init in -lgdk_pixbuf_xlib-2.0... " >&6; }
-if test "${ac_cv_lib_gdk_pixbuf_xlib_2_0_gdk_pixbuf_xlib_init+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lgdk_pixbuf_xlib-2.0 $GTK_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 gdk_pixbuf_xlib_init ();
-int
-main ()
-{
-return gdk_pixbuf_xlib_init ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_gdk_pixbuf_xlib_2_0_gdk_pixbuf_xlib_init=yes
-else
-  ac_cv_lib_gdk_pixbuf_xlib_2_0_gdk_pixbuf_xlib_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_gdk_pixbuf_xlib_2_0_gdk_pixbuf_xlib_init" >&5
-$as_echo "$ac_cv_lib_gdk_pixbuf_xlib_2_0_gdk_pixbuf_xlib_init" >&6; }
-if test "x$ac_cv_lib_gdk_pixbuf_xlib_2_0_gdk_pixbuf_xlib_init" = x""yes; then :
-  GTK_LIBS="$GTK_LIBS -lgdk_pixbuf_xlib-2.0"
-else
-  as_fn_error $? "gdk_pixbuf_xlib-2.0 not found. Make sure your Gtk 2.0 installation is sane, or configure without Unity (using --disable-unity)." "$LINENO" 5 
-fi
-
-      fi
    fi
 
    #
@@ -21834,6 +20822,8 @@
 
    # Easier to give all modules the ICU defines/includes...
    CPPFLAGS="$CPPFLAGS $ICU_CPPFLAGS"
+else
+   CPPFLAGS="$CPPFLAGS -DNO_ICU"
 fi
 
 # Extract the first word of "rpcgen", so it can be a program name with args.
@@ -22090,6 +21080,50 @@
 
 fi
 
+bsdPrintfWrappers=no
+if test "$os" = "linux"; then
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ecvt in -lc" >&5
+$as_echo_n "checking for ecvt in -lc... " >&6; }
+if test "${ac_cv_lib_c_ecvt+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lc  $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 ecvt ();
+int
+main ()
+{
+return ecvt ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_c_ecvt=yes
+else
+  ac_cv_lib_c_ecvt=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_c_ecvt" >&5
+$as_echo "$ac_cv_lib_c_ecvt" >&6; }
+if test "x$ac_cv_lib_c_ecvt" = x""yes; then :
+  bsdPrintfWrappers=yes
+fi
+
+fi
+
 ###
 ### Typdefs, structs, and compiler quarks.
 ###
@@ -22555,7 +21589,7 @@
    CFLAGS="$ORIGINAL_CFLAGS$NEW_CFLAG"
 done
 CPPFLAGS="$CPPFLAGS -DVMX86_TOOLS"
-CPPFLAGS="$CPPFLAGS -DNO_CORE_ICU"
+CPPFLAGS="$CPPFLAGS"
 
 # -fvisibility is used by "core service" plugins, but not required.
 ORIGINAL_CFLAGS="$CFLAGS"
@@ -22584,6 +21618,34 @@
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 CFLAGS="$ORIGINAL_CFLAGS"
 
+# Detect "unused-but-set-variable" gcc warning and disable it.
+ORIGINAL_CFLAGS="$CFLAGS"
+CFLAGS="$CFLAGS -Wno-unused-but-set-variable"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GCC flag -Wno-unused-but-set-variable" >&5
+$as_echo_n "checking for GCC flag -Wno-unused-but-set-variable... " >&6; }
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+return 0;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ORIGINAL_CFLAGS="$ORIGINAL_CFLAGS -Wno-unused-but-set-variable";
+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+CFLAGS="$ORIGINAL_CFLAGS"
+
+
 BUILDDIR="`pwd`"
 
 INCLUDE_DIR="`cd $srcdir; pwd`/lib/include"
@@ -22767,6 +21829,7 @@
 fi
 
 if test "$os" = "freebsd"; then
+   LIBVMTOOLS_LIBADD="$LIBVMTOOLS_LIBADD -lkvm"
    MODULES_DIR="/boot/modules"
 
    if test "$osVersion" -ge 302000; then
@@ -22924,14 +21987,6 @@
   HAVE_XCOMPOSITE_FALSE=
 fi
 
- if test "$enable_unity" = "yes"; then
-  ENABLE_UNITY_TRUE=
-  ENABLE_UNITY_FALSE='#'
-else
-  ENABLE_UNITY_TRUE='#'
-  ENABLE_UNITY_FALSE=
-fi
-
  if test "$have_cunit" = "yes"; then
   ENABLE_TESTS_TRUE=
   ENABLE_TESTS_FALSE='#'
@@ -23004,6 +22059,14 @@
   USE_SLASH_PROC_FALSE=
 fi
 
+ if test "$bsdPrintfWrappers" = "yes"; then
+  USE_PRINTF_WRAPPERS_TRUE=
+  USE_PRINTF_WRAPPERS_FALSE='#'
+else
+  USE_PRINTF_WRAPPERS_TRUE='#'
+  USE_PRINTF_WRAPPERS_FALSE=
+fi
+
 
 if test "$have_xsm" != "yes"; then
 $as_echo "@%:@define NO_XSM 1" >>confdefs.h
@@ -23113,7 +22176,7 @@
 ###
 ### Create the Makefiles
 ###
-ac_config_files="$ac_config_files Makefile lib/Makefile lib/appUtil/Makefile lib/auth/Makefile lib/backdoor/Makefile lib/dict/Makefile lib/dynxdr/Makefile lib/err/Makefile lib/file/Makefile lib/foundryMsg/Makefile lib/guestApp/Makefile lib/guestRpc/Makefile lib/hgfs/Makefile lib/hgfsBd/Makefile lib/hgfsHelper/Makefile lib/hgfsServer/Makefile lib/hgfsServerManagerGuest/Makefile lib/hgfsServerPolicyGuest/Makefile lib/image/Makefile lib/impersonate/Makefile lib/lock/Makefile lib/message/Makefile lib/misc/Makefile lib/netUtil/Makefile lib/panic/Makefile lib/panicDefault/Makefile lib/printer/Makefile lib/procMgr/Makefile lib/raster/Makefile lib/region/Makefile lib/rpcChannel/Makefile lib/rpcIn/Makefile lib/rpcOut/Makefile lib/rpcVmx/Makefile lib/slashProc/Makefile lib/string/Makefile lib/stubs/Makefile lib/syncDriver/Makefile lib/system/Makefile lib/unicode/Makefile lib/user/Makefile lib/vmCheck/Makefile lib/vmSignal/Makefile lib/wiper/Makefile lib/xdg/Makefile services/Makefile services/vmtoolsd/Makefile services/plugins/Makefile services/plugins/desktopEvents/Makefile services/plugins/dndcp/Makefile services/plugins/guestInfo/Makefile services/plugins/guestInfo/getlib/Makefile services/plugins/hgfsServer/Makefile services/plugins/powerOps/Makefile services/plugins/resolutionSet/Makefile services/plugins/timeSync/Makefile services/plugins/unity/Makefile services/plugins/vix/Makefile services/plugins/vmbackup/Makefile vmware-user-suid-wrapper/Makefile toolbox/Makefile hgfsclient/Makefile hgfsmounter/Makefile checkvm/Makefile rpctool/Makefile libguestlib/Makefile libguestlib/vmguestlib.pc libhgfs/Makefile libvmtools/Makefile xferlogs/Makefile modules/Makefile vmblock-fuse/Makefile vmblockmounter/Makefile tests/Makefile tests/vmrpcdbg/Makefile tests/testDebug/Makefile tests/testPlugin/Makefile tests/testVmblock/Makefile docs/Makefile docs/api/Makefile scripts/Makefile scripts/build/rpcgen_wrapper.sh"
+ac_config_files="$ac_config_files Makefile lib/Makefile lib/appUtil/Makefile lib/auth/Makefile lib/backdoor/Makefile lib/dict/Makefile lib/dynxdr/Makefile lib/err/Makefile lib/file/Makefile lib/foundryMsg/Makefile lib/glibUtils/Makefile lib/guestApp/Makefile lib/guestRpc/Makefile lib/hgfs/Makefile lib/hgfsBd/Makefile lib/hgfsHelper/Makefile lib/hgfsServer/Makefile lib/hgfsServerManagerGuest/Makefile lib/hgfsServerPolicyGuest/Makefile lib/impersonate/Makefile lib/lock/Makefile lib/message/Makefile lib/misc/Makefile lib/netUtil/Makefile lib/panic/Makefile lib/panicDefault/Makefile lib/printer/Makefile lib/procMgr/Makefile lib/rpcChannel/Makefile lib/rpcIn/Makefile lib/rpcOut/Makefile lib/rpcVmx/Makefile lib/slashProc/Makefile lib/string/Makefile lib/stubs/Makefile lib/syncDriver/Makefile lib/system/Makefile lib/unicode/Makefile lib/user/Makefile lib/vmCheck/Makefile lib/vmSignal/Makefile lib/wiper/Makefile lib/xdg/Makefile services/Makefile services/vmtoolsd/Makefile services/plugins/Makefile services/plugins/desktopEvents/Makefile services/plugins/dndcp/Makefile services/plugins/guestInfo/Makefile services/plugins/guestInfo/getlib/Makefile services/plugins/hgfsServer/Makefile services/plugins/powerOps/Makefile services/plugins/resolutionSet/Makefile services/plugins/timeSync/Makefile services/plugins/vix/Makefile services/plugins/vmbackup/Makefile vmware-user-suid-wrapper/Makefile toolbox/Makefile hgfsclient/Makefile hgfsmounter/Makefile checkvm/Makefile rpctool/Makefile libguestlib/Makefile libguestlib/vmguestlib.pc libhgfs/Makefile libvmtools/Makefile xferlogs/Makefile modules/Makefile vmblock-fuse/Makefile vmblockmounter/Makefile tests/Makefile tests/vmrpcdbg/Makefile tests/testDebug/Makefile tests/testPlugin/Makefile tests/testVmblock/Makefile docs/Makefile docs/api/Makefile scripts/Makefile scripts/build/rpcgen_wrapper.sh"
 
 
 ###
@@ -23325,10 +22388,6 @@
   as_fn_error $? "conditional \"HAVE_XCOMPOSITE\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5 
 fi
-if test -z "${ENABLE_UNITY_TRUE}" && test -z "${ENABLE_UNITY_FALSE}"; then
-  as_fn_error $? "conditional \"ENABLE_UNITY\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5 
-fi
 if test -z "${ENABLE_TESTS_TRUE}" && test -z "${ENABLE_TESTS_FALSE}"; then
   as_fn_error $? "conditional \"ENABLE_TESTS\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5 
@@ -23365,6 +22424,10 @@
   as_fn_error $? "conditional \"USE_SLASH_PROC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5 
 fi
+if test -z "${USE_PRINTF_WRAPPERS_TRUE}" && test -z "${USE_PRINTF_WRAPPERS_FALSE}"; then
+  as_fn_error $? "conditional \"USE_PRINTF_WRAPPERS\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5 
+fi
 
 : ${CONFIG_STATUS=./config.status}
 ac_write_fail=0
@@ -23773,7 +22836,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by open-vm-tools $as_me 2011.07.19, which was
+This file was extended by open-vm-tools $as_me 2011.12.20, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -23830,7 +22893,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-open-vm-tools config.status 2011.07.19
+open-vm-tools config.status 2011.12.20
 configured by $0, generated by GNU Autoconf 2.67,
   with options \\"\$ac_cs_config\\"
 
@@ -24311,6 +23374,7 @@
     "lib/err/Makefile") CONFIG_FILES="$CONFIG_FILES lib/err/Makefile" ;;
     "lib/file/Makefile") CONFIG_FILES="$CONFIG_FILES lib/file/Makefile" ;;
     "lib/foundryMsg/Makefile") CONFIG_FILES="$CONFIG_FILES lib/foundryMsg/Makefile" ;;
+    "lib/glibUtils/Makefile") CONFIG_FILES="$CONFIG_FILES lib/glibUtils/Makefile" ;;
     "lib/guestApp/Makefile") CONFIG_FILES="$CONFIG_FILES lib/guestApp/Makefile" ;;
     "lib/guestRpc/Makefile") CONFIG_FILES="$CONFIG_FILES lib/guestRpc/Makefile" ;;
     "lib/hgfs/Makefile") CONFIG_FILES="$CONFIG_FILES lib/hgfs/Makefile" ;;
@@ -24319,7 +23383,6 @@
     "lib/hgfsServer/Makefile") CONFIG_FILES="$CONFIG_FILES lib/hgfsServer/Makefile" ;;
     "lib/hgfsServerManagerGuest/Makefile") CONFIG_FILES="$CONFIG_FILES lib/hgfsServerManagerGuest/Makefile" ;;
     "lib/hgfsServerPolicyGuest/Makefile") CONFIG_FILES="$CONFIG_FILES lib/hgfsServerPolicyGuest/Makefile" ;;
-    "lib/image/Makefile") CONFIG_FILES="$CONFIG_FILES lib/image/Makefile" ;;
     "lib/impersonate/Makefile") CONFIG_FILES="$CONFIG_FILES lib/impersonate/Makefile" ;;
     "lib/lock/Makefile") CONFIG_FILES="$CONFIG_FILES lib/lock/Makefile" ;;
     "lib/message/Makefile") CONFIG_FILES="$CONFIG_FILES lib/message/Makefile" ;;
@@ -24329,8 +23392,6 @@
     "lib/panicDefault/Makefile") CONFIG_FILES="$CONFIG_FILES lib/panicDefault/Makefile" ;;
     "lib/printer/Makefile") CONFIG_FILES="$CONFIG_FILES lib/printer/Makefile" ;;
     "lib/procMgr/Makefile") CONFIG_FILES="$CONFIG_FILES lib/procMgr/Makefile" ;;
-    "lib/raster/Makefile") CONFIG_FILES="$CONFIG_FILES lib/raster/Makefile" ;;
-    "lib/region/Makefile") CONFIG_FILES="$CONFIG_FILES lib/region/Makefile" ;;
     "lib/rpcChannel/Makefile") CONFIG_FILES="$CONFIG_FILES lib/rpcChannel/Makefile" ;;
     "lib/rpcIn/Makefile") CONFIG_FILES="$CONFIG_FILES lib/rpcIn/Makefile" ;;
     "lib/rpcOut/Makefile") CONFIG_FILES="$CONFIG_FILES lib/rpcOut/Makefile" ;;
@@ -24357,7 +23418,6 @@
     "services/plugins/powerOps/Makefile") CONFIG_FILES="$CONFIG_FILES services/plugins/powerOps/Makefile" ;;
     "services/plugins/resolutionSet/Makefile") CONFIG_FILES="$CONFIG_FILES services/plugins/resolutionSet/Makefile" ;;
     "services/plugins/timeSync/Makefile") CONFIG_FILES="$CONFIG_FILES services/plugins/timeSync/Makefile" ;;
-    "services/plugins/unity/Makefile") CONFIG_FILES="$CONFIG_FILES services/plugins/unity/Makefile" ;;
     "services/plugins/vix/Makefile") CONFIG_FILES="$CONFIG_FILES services/plugins/vix/Makefile" ;;
     "services/plugins/vmbackup/Makefile") CONFIG_FILES="$CONFIG_FILES services/plugins/vmbackup/Makefile" ;;
     "vmware-user-suid-wrapper/Makefile") CONFIG_FILES="$CONFIG_FILES vmware-user-suid-wrapper/Makefile" ;;
 
=== modified file 'autom4te.cache/traces.0'
--- autom4te.cache/traces.0	2011-07-22 16:41:03 +0000
+++ autom4te.cache/traces.0	2012-01-24 04:56:25 +0000
@@ -2330,61 +2330,61 @@
 m4trace:configure.ac:74: -1- m4_pattern_allow([^host_cpu$])
 m4trace:configure.ac:74: -1- m4_pattern_allow([^host_vendor$])
 m4trace:configure.ac:74: -1- m4_pattern_allow([^host_os$])
-m4trace:configure.ac:223: -1- AM_INIT_AUTOMAKE
-m4trace:configure.ac:223: -1- m4_pattern_allow([^AM_[A-Z]+FLAGS$])
-m4trace:configure.ac:223: -1- AM_SET_CURRENT_AUTOMAKE_VERSION
-m4trace:configure.ac:223: -1- AM_AUTOMAKE_VERSION([1.11.1])
-m4trace:configure.ac:223: -1- _AM_AUTOCONF_VERSION([2.67])
-m4trace:configure.ac:223: -1- m4_pattern_allow([^INSTALL_PROGRAM$])
-m4trace:configure.ac:223: -1- m4_pattern_allow([^INSTALL_SCRIPT$])
-m4trace:configure.ac:223: -1- m4_pattern_allow([^INSTALL_DATA$])
-m4trace:configure.ac:223: -1- m4_pattern_allow([^am__isrc$])
-m4trace:configure.ac:223: -1- _AM_SUBST_NOTMAKE([am__isrc])
-m4trace:configure.ac:223: -1- m4_pattern_allow([^CYGPATH_W$])
-m4trace:configure.ac:223: -1- _AM_SET_OPTIONS([])
-m4trace:configure.ac:223: -1- m4_pattern_allow([^PACKAGE$])
-m4trace:configure.ac:223: -1- m4_pattern_allow([^VERSION$])
-m4trace:configure.ac:223: -1- _AM_IF_OPTION([no-define], [], [AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
+m4trace:configure.ac:210: -1- AM_INIT_AUTOMAKE
+m4trace:configure.ac:210: -1- m4_pattern_allow([^AM_[A-Z]+FLAGS$])
+m4trace:configure.ac:210: -1- AM_SET_CURRENT_AUTOMAKE_VERSION
+m4trace:configure.ac:210: -1- AM_AUTOMAKE_VERSION([1.11.1])
+m4trace:configure.ac:210: -1- _AM_AUTOCONF_VERSION([2.67])
+m4trace:configure.ac:210: -1- m4_pattern_allow([^INSTALL_PROGRAM$])
+m4trace:configure.ac:210: -1- m4_pattern_allow([^INSTALL_SCRIPT$])
+m4trace:configure.ac:210: -1- m4_pattern_allow([^INSTALL_DATA$])
+m4trace:configure.ac:210: -1- m4_pattern_allow([^am__isrc$])
+m4trace:configure.ac:210: -1- _AM_SUBST_NOTMAKE([am__isrc])
+m4trace:configure.ac:210: -1- m4_pattern_allow([^CYGPATH_W$])
+m4trace:configure.ac:210: -1- _AM_SET_OPTIONS([])
+m4trace:configure.ac:210: -1- m4_pattern_allow([^PACKAGE$])
+m4trace:configure.ac:210: -1- m4_pattern_allow([^VERSION$])
+m4trace:configure.ac:210: -1- _AM_IF_OPTION([no-define], [], [AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
  AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])
-m4trace:configure.ac:223: -2- _AM_MANGLE_OPTION([no-define])
-m4trace:configure.ac:223: -1- m4_pattern_allow([^PACKAGE$])
-m4trace:configure.ac:223: -1- m4_pattern_allow([^VERSION$])
-m4trace:configure.ac:223: -1- AM_SANITY_CHECK
-m4trace:configure.ac:223: -1- AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}])
-m4trace:configure.ac:223: -1- AM_MISSING_HAS_RUN
-m4trace:configure.ac:223: -1- AM_AUX_DIR_EXPAND
-m4trace:configure.ac:223: -1- m4_pattern_allow([^ACLOCAL$])
-m4trace:configure.ac:223: -1- AM_MISSING_PROG([AUTOCONF], [autoconf])
-m4trace:configure.ac:223: -1- m4_pattern_allow([^AUTOCONF$])
-m4trace:configure.ac:223: -1- AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}])
-m4trace:configure.ac:223: -1- m4_pattern_allow([^AUTOMAKE$])
-m4trace:configure.ac:223: -1- AM_MISSING_PROG([AUTOHEADER], [autoheader])
-m4trace:configure.ac:223: -1- m4_pattern_allow([^AUTOHEADER$])
-m4trace:configure.ac:223: -1- AM_MISSING_PROG([MAKEINFO], [makeinfo])
-m4trace:configure.ac:223: -1- m4_pattern_allow([^MAKEINFO$])
-m4trace:configure.ac:223: -1- AM_PROG_INSTALL_SH
-m4trace:configure.ac:223: -1- m4_pattern_allow([^install_sh$])
-m4trace:configure.ac:223: -1- AM_PROG_INSTALL_STRIP
-m4trace:configure.ac:223: -1- m4_pattern_allow([^STRIP$])
-m4trace:configure.ac:223: -1- m4_pattern_allow([^INSTALL_STRIP_PROGRAM$])
-m4trace:configure.ac:223: -1- AM_PROG_MKDIR_P
-m4trace:configure.ac:223: -1- m4_pattern_allow([^MKDIR_P$])
-m4trace:configure.ac:223: -1- m4_pattern_allow([^mkdir_p$])
-m4trace:configure.ac:223: -1- m4_pattern_allow([^AWK$])
-m4trace:configure.ac:223: -1- m4_pattern_allow([^SET_MAKE$])
-m4trace:configure.ac:223: -1- AM_SET_LEADING_DOT
-m4trace:configure.ac:223: -1- m4_pattern_allow([^am__leading_dot$])
-m4trace:configure.ac:223: -1- _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
+m4trace:configure.ac:210: -2- _AM_MANGLE_OPTION([no-define])
+m4trace:configure.ac:210: -1- m4_pattern_allow([^PACKAGE$])
+m4trace:configure.ac:210: -1- m4_pattern_allow([^VERSION$])
+m4trace:configure.ac:210: -1- AM_SANITY_CHECK
+m4trace:configure.ac:210: -1- AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}])
+m4trace:configure.ac:210: -1- AM_MISSING_HAS_RUN
+m4trace:configure.ac:210: -1- AM_AUX_DIR_EXPAND
+m4trace:configure.ac:210: -1- m4_pattern_allow([^ACLOCAL$])
+m4trace:configure.ac:210: -1- AM_MISSING_PROG([AUTOCONF], [autoconf])
+m4trace:configure.ac:210: -1- m4_pattern_allow([^AUTOCONF$])
+m4trace:configure.ac:210: -1- AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}])
+m4trace:configure.ac:210: -1- m4_pattern_allow([^AUTOMAKE$])
+m4trace:configure.ac:210: -1- AM_MISSING_PROG([AUTOHEADER], [autoheader])
+m4trace:configure.ac:210: -1- m4_pattern_allow([^AUTOHEADER$])
+m4trace:configure.ac:210: -1- AM_MISSING_PROG([MAKEINFO], [makeinfo])
+m4trace:configure.ac:210: -1- m4_pattern_allow([^MAKEINFO$])
+m4trace:configure.ac:210: -1- AM_PROG_INSTALL_SH
+m4trace:configure.ac:210: -1- m4_pattern_allow([^install_sh$])
+m4trace:configure.ac:210: -1- AM_PROG_INSTALL_STRIP
+m4trace:configure.ac:210: -1- m4_pattern_allow([^STRIP$])
+m4trace:configure.ac:210: -1- m4_pattern_allow([^INSTALL_STRIP_PROGRAM$])
+m4trace:configure.ac:210: -1- AM_PROG_MKDIR_P
+m4trace:configure.ac:210: -1- m4_pattern_allow([^MKDIR_P$])
+m4trace:configure.ac:210: -1- m4_pattern_allow([^mkdir_p$])
+m4trace:configure.ac:210: -1- m4_pattern_allow([^AWK$])
+m4trace:configure.ac:210: -1- m4_pattern_allow([^SET_MAKE$])
+m4trace:configure.ac:210: -1- AM_SET_LEADING_DOT
+m4trace:configure.ac:210: -1- m4_pattern_allow([^am__leading_dot$])
+m4trace:configure.ac:210: -1- _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
 			     [_AM_PROG_TAR([v7])])])
-m4trace:configure.ac:223: -2- _AM_MANGLE_OPTION([tar-ustar])
-m4trace:configure.ac:223: -1- _AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], [_AM_PROG_TAR([v7])])
-m4trace:configure.ac:223: -2- _AM_MANGLE_OPTION([tar-pax])
-m4trace:configure.ac:223: -1- _AM_PROG_TAR([v7])
-m4trace:configure.ac:223: -1- AM_MISSING_PROG([AMTAR], [tar])
-m4trace:configure.ac:223: -1- m4_pattern_allow([^AMTAR$])
-m4trace:configure.ac:223: -1- m4_pattern_allow([^am__tar$])
-m4trace:configure.ac:223: -1- m4_pattern_allow([^am__untar$])
-m4trace:configure.ac:223: -1- _AM_IF_OPTION([no-dependencies], [], [AC_PROVIDE_IFELSE([AC_PROG_CC],
+m4trace:configure.ac:210: -2- _AM_MANGLE_OPTION([tar-ustar])
+m4trace:configure.ac:210: -1- _AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], [_AM_PROG_TAR([v7])])
+m4trace:configure.ac:210: -2- _AM_MANGLE_OPTION([tar-pax])
+m4trace:configure.ac:210: -1- _AM_PROG_TAR([v7])
+m4trace:configure.ac:210: -1- AM_MISSING_PROG([AMTAR], [tar])
+m4trace:configure.ac:210: -1- m4_pattern_allow([^AMTAR$])
+m4trace:configure.ac:210: -1- m4_pattern_allow([^am__tar$])
+m4trace:configure.ac:210: -1- m4_pattern_allow([^am__untar$])
+m4trace:configure.ac:210: -1- _AM_IF_OPTION([no-dependencies], [], [AC_PROVIDE_IFELSE([AC_PROG_CC],
 		  [_AM_DEPENDENCIES(CC)],
 		  [define([AC_PROG_CC],
 			  defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
@@ -2397,472 +2397,456 @@
 		  [define([AC_PROG_OBJC],
 			  defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
 ])
-m4trace:configure.ac:223: -2- _AM_MANGLE_OPTION([no-dependencies])
-m4trace:configure.ac:223: -1- _AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])
-m4trace:configure.ac:223: -2- _AM_MANGLE_OPTION([silent-rules])
-m4trace:configure.ac:246: -1- m4_pattern_allow([^CC$])
-m4trace:configure.ac:246: -1- m4_pattern_allow([^CFLAGS$])
-m4trace:configure.ac:246: -1- m4_pattern_allow([^LDFLAGS$])
-m4trace:configure.ac:246: -1- m4_pattern_allow([^LIBS$])
-m4trace:configure.ac:246: -1- m4_pattern_allow([^CPPFLAGS$])
-m4trace:configure.ac:246: -1- m4_pattern_allow([^CC$])
-m4trace:configure.ac:246: -1- m4_pattern_allow([^CC$])
-m4trace:configure.ac:246: -1- m4_pattern_allow([^CC$])
-m4trace:configure.ac:246: -1- m4_pattern_allow([^CC$])
-m4trace:configure.ac:246: -1- m4_pattern_allow([^ac_ct_CC$])
-m4trace:configure.ac:246: -1- m4_pattern_allow([^EXEEXT$])
-m4trace:configure.ac:246: -1- m4_pattern_allow([^OBJEXT$])
-m4trace:configure.ac:246: -1- _AM_DEPENDENCIES([CC])
-m4trace:configure.ac:246: -1- AM_SET_DEPDIR
-m4trace:configure.ac:246: -1- m4_pattern_allow([^DEPDIR$])
-m4trace:configure.ac:246: -1- AM_OUTPUT_DEPENDENCY_COMMANDS
-m4trace:configure.ac:246: -1- AM_MAKE_INCLUDE
-m4trace:configure.ac:246: -1- m4_pattern_allow([^am__include$])
-m4trace:configure.ac:246: -1- m4_pattern_allow([^am__quote$])
-m4trace:configure.ac:246: -1- AM_DEP_TRACK
-m4trace:configure.ac:246: -1- AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-m4trace:configure.ac:246: -1- m4_pattern_allow([^AMDEP_TRUE$])
-m4trace:configure.ac:246: -1- m4_pattern_allow([^AMDEP_FALSE$])
-m4trace:configure.ac:246: -1- _AM_SUBST_NOTMAKE([AMDEP_TRUE])
-m4trace:configure.ac:246: -1- _AM_SUBST_NOTMAKE([AMDEP_FALSE])
-m4trace:configure.ac:246: -1- m4_pattern_allow([^AMDEPBACKSLASH$])
-m4trace:configure.ac:246: -1- _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])
-m4trace:configure.ac:246: -1- m4_pattern_allow([^CCDEPMODE$])
-m4trace:configure.ac:246: -1- AM_CONDITIONAL([am__fastdepCC], [
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_CC_dependencies_compiler_type" = gcc3])
-m4trace:configure.ac:246: -1- m4_pattern_allow([^am__fastdepCC_TRUE$])
-m4trace:configure.ac:246: -1- m4_pattern_allow([^am__fastdepCC_FALSE$])
-m4trace:configure.ac:246: -1- _AM_SUBST_NOTMAKE([am__fastdepCC_TRUE])
-m4trace:configure.ac:246: -1- _AM_SUBST_NOTMAKE([am__fastdepCC_FALSE])
-m4trace:configure.ac:246: -1- m4_pattern_allow([^CPP$])
-m4trace:configure.ac:246: -1- m4_pattern_allow([^CPPFLAGS$])
-m4trace:configure.ac:246: -1- m4_pattern_allow([^CPP$])
-m4trace:configure.ac:247: -1- m4_pattern_allow([^CC$])
-m4trace:configure.ac:247: -1- m4_pattern_allow([^CFLAGS$])
-m4trace:configure.ac:247: -1- m4_pattern_allow([^LDFLAGS$])
-m4trace:configure.ac:247: -1- m4_pattern_allow([^LIBS$])
-m4trace:configure.ac:247: -1- m4_pattern_allow([^CPPFLAGS$])
-m4trace:configure.ac:247: -1- m4_pattern_allow([^CC$])
-m4trace:configure.ac:247: -1- m4_pattern_allow([^CC$])
-m4trace:configure.ac:247: -1- m4_pattern_allow([^CC$])
-m4trace:configure.ac:247: -1- m4_pattern_allow([^CC$])
-m4trace:configure.ac:247: -1- m4_pattern_allow([^ac_ct_CC$])
-m4trace:configure.ac:247: -1- _AM_DEPENDENCIES([CC])
-m4trace:configure.ac:247: -1- m4_pattern_allow([^CCDEPMODE$])
-m4trace:configure.ac:247: -1- AM_CONDITIONAL([am__fastdepCC], [
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_CC_dependencies_compiler_type" = gcc3])
-m4trace:configure.ac:247: -1- m4_pattern_allow([^am__fastdepCC_TRUE$])
-m4trace:configure.ac:247: -1- m4_pattern_allow([^am__fastdepCC_FALSE$])
-m4trace:configure.ac:247: -1- _AM_SUBST_NOTMAKE([am__fastdepCC_TRUE])
-m4trace:configure.ac:247: -1- _AM_SUBST_NOTMAKE([am__fastdepCC_FALSE])
-m4trace:configure.ac:251: -1- m4_pattern_allow([^CXX$])
-m4trace:configure.ac:251: -1- m4_pattern_allow([^CXXFLAGS$])
-m4trace:configure.ac:251: -1- m4_pattern_allow([^LDFLAGS$])
-m4trace:configure.ac:251: -1- m4_pattern_allow([^LIBS$])
-m4trace:configure.ac:251: -1- m4_pattern_allow([^CPPFLAGS$])
-m4trace:configure.ac:251: -1- m4_pattern_allow([^CXX$])
-m4trace:configure.ac:251: -1- m4_pattern_allow([^ac_ct_CXX$])
-m4trace:configure.ac:251: -1- _AM_DEPENDENCIES([CXX])
-m4trace:configure.ac:251: -1- m4_pattern_allow([^CXXDEPMODE$])
-m4trace:configure.ac:251: -1- AM_CONDITIONAL([am__fastdepCXX], [
+m4trace:configure.ac:210: -2- _AM_MANGLE_OPTION([no-dependencies])
+m4trace:configure.ac:210: -1- _AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])
+m4trace:configure.ac:210: -2- _AM_MANGLE_OPTION([silent-rules])
+m4trace:configure.ac:233: -1- m4_pattern_allow([^CC$])
+m4trace:configure.ac:233: -1- m4_pattern_allow([^CFLAGS$])
+m4trace:configure.ac:233: -1- m4_pattern_allow([^LDFLAGS$])
+m4trace:configure.ac:233: -1- m4_pattern_allow([^LIBS$])
+m4trace:configure.ac:233: -1- m4_pattern_allow([^CPPFLAGS$])
+m4trace:configure.ac:233: -1- m4_pattern_allow([^CC$])
+m4trace:configure.ac:233: -1- m4_pattern_allow([^CC$])
+m4trace:configure.ac:233: -1- m4_pattern_allow([^CC$])
+m4trace:configure.ac:233: -1- m4_pattern_allow([^CC$])
+m4trace:configure.ac:233: -1- m4_pattern_allow([^ac_ct_CC$])
+m4trace:configure.ac:233: -1- m4_pattern_allow([^EXEEXT$])
+m4trace:configure.ac:233: -1- m4_pattern_allow([^OBJEXT$])
+m4trace:configure.ac:233: -1- _AM_DEPENDENCIES([CC])
+m4trace:configure.ac:233: -1- AM_SET_DEPDIR
+m4trace:configure.ac:233: -1- m4_pattern_allow([^DEPDIR$])
+m4trace:configure.ac:233: -1- AM_OUTPUT_DEPENDENCY_COMMANDS
+m4trace:configure.ac:233: -1- AM_MAKE_INCLUDE
+m4trace:configure.ac:233: -1- m4_pattern_allow([^am__include$])
+m4trace:configure.ac:233: -1- m4_pattern_allow([^am__quote$])
+m4trace:configure.ac:233: -1- AM_DEP_TRACK
+m4trace:configure.ac:233: -1- AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
+m4trace:configure.ac:233: -1- m4_pattern_allow([^AMDEP_TRUE$])
+m4trace:configure.ac:233: -1- m4_pattern_allow([^AMDEP_FALSE$])
+m4trace:configure.ac:233: -1- _AM_SUBST_NOTMAKE([AMDEP_TRUE])
+m4trace:configure.ac:233: -1- _AM_SUBST_NOTMAKE([AMDEP_FALSE])
+m4trace:configure.ac:233: -1- m4_pattern_allow([^AMDEPBACKSLASH$])
+m4trace:configure.ac:233: -1- _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])
+m4trace:configure.ac:233: -1- m4_pattern_allow([^CCDEPMODE$])
+m4trace:configure.ac:233: -1- AM_CONDITIONAL([am__fastdepCC], [
+  test "x$enable_dependency_tracking" != xno \
+  && test "$am_cv_CC_dependencies_compiler_type" = gcc3])
+m4trace:configure.ac:233: -1- m4_pattern_allow([^am__fastdepCC_TRUE$])
+m4trace:configure.ac:233: -1- m4_pattern_allow([^am__fastdepCC_FALSE$])
+m4trace:configure.ac:233: -1- _AM_SUBST_NOTMAKE([am__fastdepCC_TRUE])
+m4trace:configure.ac:233: -1- _AM_SUBST_NOTMAKE([am__fastdepCC_FALSE])
+m4trace:configure.ac:233: -1- m4_pattern_allow([^CPP$])
+m4trace:configure.ac:233: -1- m4_pattern_allow([^CPPFLAGS$])
+m4trace:configure.ac:233: -1- m4_pattern_allow([^CPP$])
+m4trace:configure.ac:234: -1- m4_pattern_allow([^CC$])
+m4trace:configure.ac:234: -1- m4_pattern_allow([^CFLAGS$])
+m4trace:configure.ac:234: -1- m4_pattern_allow([^LDFLAGS$])
+m4trace:configure.ac:234: -1- m4_pattern_allow([^LIBS$])
+m4trace:configure.ac:234: -1- m4_pattern_allow([^CPPFLAGS$])
+m4trace:configure.ac:234: -1- m4_pattern_allow([^CC$])
+m4trace:configure.ac:234: -1- m4_pattern_allow([^CC$])
+m4trace:configure.ac:234: -1- m4_pattern_allow([^CC$])
+m4trace:configure.ac:234: -1- m4_pattern_allow([^CC$])
+m4trace:configure.ac:234: -1- m4_pattern_allow([^ac_ct_CC$])
+m4trace:configure.ac:234: -1- _AM_DEPENDENCIES([CC])
+m4trace:configure.ac:234: -1- m4_pattern_allow([^CCDEPMODE$])
+m4trace:configure.ac:234: -1- AM_CONDITIONAL([am__fastdepCC], [
+  test "x$enable_dependency_tracking" != xno \
+  && test "$am_cv_CC_dependencies_compiler_type" = gcc3])
+m4trace:configure.ac:234: -1- m4_pattern_allow([^am__fastdepCC_TRUE$])
+m4trace:configure.ac:234: -1- m4_pattern_allow([^am__fastdepCC_FALSE$])
+m4trace:configure.ac:234: -1- _AM_SUBST_NOTMAKE([am__fastdepCC_TRUE])
+m4trace:configure.ac:234: -1- _AM_SUBST_NOTMAKE([am__fastdepCC_FALSE])
+m4trace:configure.ac:238: -1- m4_pattern_allow([^CXX$])
+m4trace:configure.ac:238: -1- m4_pattern_allow([^CXXFLAGS$])
+m4trace:configure.ac:238: -1- m4_pattern_allow([^LDFLAGS$])
+m4trace:configure.ac:238: -1- m4_pattern_allow([^LIBS$])
+m4trace:configure.ac:238: -1- m4_pattern_allow([^CPPFLAGS$])
+m4trace:configure.ac:238: -1- m4_pattern_allow([^CXX$])
+m4trace:configure.ac:238: -1- m4_pattern_allow([^ac_ct_CXX$])
+m4trace:configure.ac:238: -1- _AM_DEPENDENCIES([CXX])
+m4trace:configure.ac:238: -1- m4_pattern_allow([^CXXDEPMODE$])
+m4trace:configure.ac:238: -1- AM_CONDITIONAL([am__fastdepCXX], [
   test "x$enable_dependency_tracking" != xno \
   && test "$am_cv_CXX_dependencies_compiler_type" = gcc3])
-m4trace:configure.ac:251: -1- m4_pattern_allow([^am__fastdepCXX_TRUE$])
-m4trace:configure.ac:251: -1- m4_pattern_allow([^am__fastdepCXX_FALSE$])
-m4trace:configure.ac:251: -1- _AM_SUBST_NOTMAKE([am__fastdepCXX_TRUE])
-m4trace:configure.ac:251: -1- _AM_SUBST_NOTMAKE([am__fastdepCXX_FALSE])
-m4trace:configure.ac:256: -1- AM_PROG_CC_C_O
-m4trace:configure.ac:256: -1- m4_pattern_allow([^NO_MINUS_C_MINUS_O$])
-m4trace:configure.ac:260: -1- m4_pattern_allow([^SED$])
-m4trace:configure.ac:261: -1- m4_pattern_allow([^LN_S$])
-m4trace:configure.ac:265: -1- AC_PROG_LIBTOOL
-m4trace:configure.ac:265: -1- _m4_warn([obsolete], [The macro `AC_PROG_LIBTOOL' is obsolete.
+m4trace:configure.ac:238: -1- m4_pattern_allow([^am__fastdepCXX_TRUE$])
+m4trace:configure.ac:238: -1- m4_pattern_allow([^am__fastdepCXX_FALSE$])
+m4trace:configure.ac:238: -1- _AM_SUBST_NOTMAKE([am__fastdepCXX_TRUE])
+m4trace:configure.ac:238: -1- _AM_SUBST_NOTMAKE([am__fastdepCXX_FALSE])
+m4trace:configure.ac:243: -1- AM_PROG_CC_C_O
+m4trace:configure.ac:243: -1- m4_pattern_allow([^NO_MINUS_C_MINUS_O$])
+m4trace:configure.ac:247: -1- m4_pattern_allow([^SED$])
+m4trace:configure.ac:248: -1- m4_pattern_allow([^LN_S$])
+m4trace:configure.ac:252: -1- AC_PROG_LIBTOOL
+m4trace:configure.ac:252: -1- _m4_warn([obsolete], [The macro `AC_PROG_LIBTOOL' is obsolete.
 You should run autoupdate.], [/usr/share/aclocal/libtool.m4:102: AC_PROG_LIBTOOL is expanded from...
-configure.ac:265: the top level])
-m4trace:configure.ac:265: -1- LT_INIT
-m4trace:configure.ac:265: -1- m4_pattern_forbid([^_?LT_[A-Z_]+$])
-m4trace:configure.ac:265: -1- m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])
-m4trace:configure.ac:265: -1- LTOPTIONS_VERSION
-m4trace:configure.ac:265: -1- LTSUGAR_VERSION
-m4trace:configure.ac:265: -1- LTVERSION_VERSION
-m4trace:configure.ac:265: -1- LTOBSOLETE_VERSION
-m4trace:configure.ac:265: -1- _LT_PROG_LTMAIN
-m4trace:configure.ac:265: -1- m4_pattern_allow([^LIBTOOL$])
-m4trace:configure.ac:265: -1- LT_PATH_LD
-m4trace:configure.ac:265: -1- m4_pattern_allow([^SED$])
-m4trace:configure.ac:265: -1- AC_PROG_EGREP
-m4trace:configure.ac:265: -1- m4_pattern_allow([^GREP$])
-m4trace:configure.ac:265: -1- m4_pattern_allow([^EGREP$])
-m4trace:configure.ac:265: -1- m4_pattern_allow([^FGREP$])
-m4trace:configure.ac:265: -1- m4_pattern_allow([^GREP$])
-m4trace:configure.ac:265: -1- m4_pattern_allow([^LD$])
-m4trace:configure.ac:265: -1- LT_PATH_NM
-m4trace:configure.ac:265: -1- m4_pattern_allow([^DUMPBIN$])
-m4trace:configure.ac:265: -1- m4_pattern_allow([^ac_ct_DUMPBIN$])
-m4trace:configure.ac:265: -1- m4_pattern_allow([^DUMPBIN$])
-m4trace:configure.ac:265: -1- m4_pattern_allow([^NM$])
-m4trace:configure.ac:265: -1- LT_CMD_MAX_LEN
-m4trace:configure.ac:265: -1- m4_pattern_allow([^OBJDUMP$])
-m4trace:configure.ac:265: -1- m4_pattern_allow([^OBJDUMP$])
-m4trace:configure.ac:265: -1- m4_pattern_allow([^AR$])
-m4trace:configure.ac:265: -1- m4_pattern_allow([^STRIP$])
-m4trace:configure.ac:265: -1- m4_pattern_allow([^RANLIB$])
-m4trace:configure.ac:265: -1- m4_pattern_allow([LT_OBJDIR])
-m4trace:configure.ac:265: -1- m4_pattern_allow([^LT_OBJDIR$])
-m4trace:configure.ac:265: -1- m4_pattern_allow([^lt_ECHO$])
-m4trace:configure.ac:265: -1- _LT_CC_BASENAME([$compiler])
-m4trace:configure.ac:265: -1- _LT_PATH_TOOL_PREFIX([${ac_tool_prefix}file], [/usr/bin$PATH_SEPARATOR$PATH])
-m4trace:configure.ac:265: -1- _LT_PATH_TOOL_PREFIX([file], [/usr/bin$PATH_SEPARATOR$PATH])
-m4trace:configure.ac:265: -1- LT_SUPPORTED_TAG([CC])
-m4trace:configure.ac:265: -1- _LT_COMPILER_BOILERPLATE
-m4trace:configure.ac:265: -1- _LT_LINKER_BOILERPLATE
-m4trace:configure.ac:265: -1- _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], [lt_cv_prog_compiler_rtti_exceptions], [-fno-rtti -fno-exceptions], [], [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, )="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, ) -fno-rtti -fno-exceptions"])
-m4trace:configure.ac:265: -1- _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, ) works], [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, )], [$_LT_TAGVAR(lt_prog_compiler_pic, )@&t@m4_if([],[],[ -DPIC],[m4_if([],[CXX],[ -DPIC],[])])], [], [case $_LT_TAGVAR(lt_prog_compiler_pic, ) in
+configure.ac:252: the top level])
+m4trace:configure.ac:252: -1- LT_INIT
+m4trace:configure.ac:252: -1- m4_pattern_forbid([^_?LT_[A-Z_]+$])
+m4trace:configure.ac:252: -1- m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])
+m4trace:configure.ac:252: -1- LTOPTIONS_VERSION
+m4trace:configure.ac:252: -1- LTSUGAR_VERSION
+m4trace:configure.ac:252: -1- LTVERSION_VERSION
+m4trace:configure.ac:252: -1- LTOBSOLETE_VERSION
+m4trace:configure.ac:252: -1- _LT_PROG_LTMAIN
+m4trace:configure.ac:252: -1- m4_pattern_allow([^LIBTOOL$])
+m4trace:configure.ac:252: -1- LT_PATH_LD
+m4trace:configure.ac:252: -1- m4_pattern_allow([^SED$])
+m4trace:configure.ac:252: -1- AC_PROG_EGREP
+m4trace:configure.ac:252: -1- m4_pattern_allow([^GREP$])
+m4trace:configure.ac:252: -1- m4_pattern_allow([^EGREP$])
+m4trace:configure.ac:252: -1- m4_pattern_allow([^FGREP$])
+m4trace:configure.ac:252: -1- m4_pattern_allow([^GREP$])
+m4trace:configure.ac:252: -1- m4_pattern_allow([^LD$])
+m4trace:configure.ac:252: -1- LT_PATH_NM
+m4trace:configure.ac:252: -1- m4_pattern_allow([^DUMPBIN$])
+m4trace:configure.ac:252: -1- m4_pattern_allow([^ac_ct_DUMPBIN$])
+m4trace:configure.ac:252: -1- m4_pattern_allow([^DUMPBIN$])
+m4trace:configure.ac:252: -1- m4_pattern_allow([^NM$])
+m4trace:configure.ac:252: -1- LT_CMD_MAX_LEN
+m4trace:configure.ac:252: -1- m4_pattern_allow([^OBJDUMP$])
+m4trace:configure.ac:252: -1- m4_pattern_allow([^OBJDUMP$])
+m4trace:configure.ac:252: -1- m4_pattern_allow([^AR$])
+m4trace:configure.ac:252: -1- m4_pattern_allow([^STRIP$])
+m4trace:configure.ac:252: -1- m4_pattern_allow([^RANLIB$])
+m4trace:configure.ac:252: -1- m4_pattern_allow([LT_OBJDIR])
+m4trace:configure.ac:252: -1- m4_pattern_allow([^LT_OBJDIR$])
+m4trace:configure.ac:252: -1- m4_pattern_allow([^lt_ECHO$])
+m4trace:configure.ac:252: -1- _LT_CC_BASENAME([$compiler])
+m4trace:configure.ac:252: -1- _LT_PATH_TOOL_PREFIX([${ac_tool_prefix}file], [/usr/bin$PATH_SEPARATOR$PATH])
+m4trace:configure.ac:252: -1- _LT_PATH_TOOL_PREFIX([file], [/usr/bin$PATH_SEPARATOR$PATH])
+m4trace:configure.ac:252: -1- LT_SUPPORTED_TAG([CC])
+m4trace:configure.ac:252: -1- _LT_COMPILER_BOILERPLATE
+m4trace:configure.ac:252: -1- _LT_LINKER_BOILERPLATE
+m4trace:configure.ac:252: -1- _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], [lt_cv_prog_compiler_rtti_exceptions], [-fno-rtti -fno-exceptions], [], [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, )="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, ) -fno-rtti -fno-exceptions"])
+m4trace:configure.ac:252: -1- _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, ) works], [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, )], [$_LT_TAGVAR(lt_prog_compiler_pic, )@&t@m4_if([],[],[ -DPIC],[m4_if([],[CXX],[ -DPIC],[])])], [], [case $_LT_TAGVAR(lt_prog_compiler_pic, ) in
      "" | " "*) ;;
      *) _LT_TAGVAR(lt_prog_compiler_pic, )=" $_LT_TAGVAR(lt_prog_compiler_pic, )" ;;
      esac], [_LT_TAGVAR(lt_prog_compiler_pic, )=
      _LT_TAGVAR(lt_prog_compiler_can_build_shared, )=no])
-m4trace:configure.ac:265: -1- _LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], [lt_cv_prog_compiler_static_works], [$lt_tmp_static_flag], [], [_LT_TAGVAR(lt_prog_compiler_static, )=])
-m4trace:configure.ac:265: -1- m4_pattern_allow([^DSYMUTIL$])
-m4trace:configure.ac:265: -1- m4_pattern_allow([^NMEDIT$])
-m4trace:configure.ac:265: -1- m4_pattern_allow([^LIPO$])
-m4trace:configure.ac:265: -1- m4_pattern_allow([^OTOOL$])
-m4trace:configure.ac:265: -1- m4_pattern_allow([^OTOOL64$])
-m4trace:configure.ac:265: -1- LT_SYS_DLOPEN_SELF
-m4trace:configure.ac:265: -1- m4_pattern_allow([^STDC_HEADERS$])
-m4trace:configure.ac:265: -1- m4_pattern_allow([^HAVE_DLFCN_H$])
-m4trace:configure.ac:265: -1- LT_LANG([CXX])
-m4trace:configure.ac:265: -1- LT_SUPPORTED_TAG([CXX])
-m4trace:configure.ac:265: -1- m4_pattern_allow([^CXX$])
-m4trace:configure.ac:265: -1- m4_pattern_allow([^CXXFLAGS$])
-m4trace:configure.ac:265: -1- m4_pattern_allow([^LDFLAGS$])
-m4trace:configure.ac:265: -1- m4_pattern_allow([^LIBS$])
-m4trace:configure.ac:265: -1- m4_pattern_allow([^CPPFLAGS$])
-m4trace:configure.ac:265: -1- m4_pattern_allow([^CXX$])
-m4trace:configure.ac:265: -1- m4_pattern_allow([^ac_ct_CXX$])
-m4trace:configure.ac:265: -1- _AM_DEPENDENCIES([CXX])
-m4trace:configure.ac:265: -1- m4_pattern_allow([^CXXDEPMODE$])
-m4trace:configure.ac:265: -1- AM_CONDITIONAL([am__fastdepCXX], [
+m4trace:configure.ac:252: -1- _LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], [lt_cv_prog_compiler_static_works], [$lt_tmp_static_flag], [], [_LT_TAGVAR(lt_prog_compiler_static, )=])
+m4trace:configure.ac:252: -1- m4_pattern_allow([^DSYMUTIL$])
+m4trace:configure.ac:252: -1- m4_pattern_allow([^NMEDIT$])
+m4trace:configure.ac:252: -1- m4_pattern_allow([^LIPO$])
+m4trace:configure.ac:252: -1- m4_pattern_allow([^OTOOL$])
+m4trace:configure.ac:252: -1- m4_pattern_allow([^OTOOL64$])
+m4trace:configure.ac:252: -1- LT_SYS_DLOPEN_SELF
+m4trace:configure.ac:252: -1- m4_pattern_allow([^STDC_HEADERS$])
+m4trace:configure.ac:252: -1- m4_pattern_allow([^HAVE_DLFCN_H$])
+m4trace:configure.ac:252: -1- LT_LANG([CXX])
+m4trace:configure.ac:252: -1- LT_SUPPORTED_TAG([CXX])
+m4trace:configure.ac:252: -1- m4_pattern_allow([^CXX$])
+m4trace:configure.ac:252: -1- m4_pattern_allow([^CXXFLAGS$])
+m4trace:configure.ac:252: -1- m4_pattern_allow([^LDFLAGS$])
+m4trace:configure.ac:252: -1- m4_pattern_allow([^LIBS$])
+m4trace:configure.ac:252: -1- m4_pattern_allow([^CPPFLAGS$])
+m4trace:configure.ac:252: -1- m4_pattern_allow([^CXX$])
+m4trace:configure.ac:252: -1- m4_pattern_allow([^ac_ct_CXX$])
+m4trace:configure.ac:252: -1- _AM_DEPENDENCIES([CXX])
+m4trace:configure.ac:252: -1- m4_pattern_allow([^CXXDEPMODE$])
+m4trace:configure.ac:252: -1- AM_CONDITIONAL([am__fastdepCXX], [
   test "x$enable_dependency_tracking" != xno \
   && test "$am_cv_CXX_dependencies_compiler_type" = gcc3])
-m4trace:configure.ac:265: -1- m4_pattern_allow([^am__fastdepCXX_TRUE$])
-m4trace:configure.ac:265: -1- m4_pattern_allow([^am__fastdepCXX_FALSE$])
-m4trace:configure.ac:265: -1- _AM_SUBST_NOTMAKE([am__fastdepCXX_TRUE])
-m4trace:configure.ac:265: -1- _AM_SUBST_NOTMAKE([am__fastdepCXX_FALSE])
-m4trace:configure.ac:265: -1- m4_pattern_allow([^CXXCPP$])
-m4trace:configure.ac:265: -1- m4_pattern_allow([^CPPFLAGS$])
-m4trace:configure.ac:265: -1- m4_pattern_allow([^CXXCPP$])
-m4trace:configure.ac:265: -1- _LT_COMPILER_BOILERPLATE
-m4trace:configure.ac:265: -1- _LT_LINKER_BOILERPLATE
-m4trace:configure.ac:265: -1- _LT_CC_BASENAME([$compiler])
-m4trace:configure.ac:265: -1- LT_PATH_LD
-m4trace:configure.ac:265: -1- m4_pattern_allow([^LD$])
-m4trace:configure.ac:265: -1- _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, CXX) works], [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, CXX)], [$_LT_TAGVAR(lt_prog_compiler_pic, CXX)@&t@m4_if([CXX],[],[ -DPIC],[m4_if([CXX],[CXX],[ -DPIC],[])])], [], [case $_LT_TAGVAR(lt_prog_compiler_pic, CXX) in
+m4trace:configure.ac:252: -1- m4_pattern_allow([^am__fastdepCXX_TRUE$])
+m4trace:configure.ac:252: -1- m4_pattern_allow([^am__fastdepCXX_FALSE$])
+m4trace:configure.ac:252: -1- _AM_SUBST_NOTMAKE([am__fastdepCXX_TRUE])
+m4trace:configure.ac:252: -1- _AM_SUBST_NOTMAKE([am__fastdepCXX_FALSE])
+m4trace:configure.ac:252: -1- m4_pattern_allow([^CXXCPP$])
+m4trace:configure.ac:252: -1- m4_pattern_allow([^CPPFLAGS$])
+m4trace:configure.ac:252: -1- m4_pattern_allow([^CXXCPP$])
+m4trace:configure.ac:252: -1- _LT_COMPILER_BOILERPLATE
+m4trace:configure.ac:252: -1- _LT_LINKER_BOILERPLATE
+m4trace:configure.ac:252: -1- _LT_CC_BASENAME([$compiler])
+m4trace:configure.ac:252: -1- LT_PATH_LD
+m4trace:configure.ac:252: -1- m4_pattern_allow([^LD$])
+m4trace:configure.ac:252: -1- _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, CXX) works], [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, CXX)], [$_LT_TAGVAR(lt_prog_compiler_pic, CXX)@&t@m4_if([CXX],[],[ -DPIC],[m4_if([CXX],[CXX],[ -DPIC],[])])], [], [case $_LT_TAGVAR(lt_prog_compiler_pic, CXX) in
      "" | " "*) ;;
      *) _LT_TAGVAR(lt_prog_compiler_pic, CXX)=" $_LT_TAGVAR(lt_prog_compiler_pic, CXX)" ;;
      esac], [_LT_TAGVAR(lt_prog_compiler_pic, CXX)=
      _LT_TAGVAR(lt_prog_compiler_can_build_shared, CXX)=no])
-m4trace:configure.ac:265: -1- _LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], [lt_cv_prog_compiler_static_works_CXX], [$lt_tmp_static_flag], [], [_LT_TAGVAR(lt_prog_compiler_static, CXX)=])
-m4trace:configure.ac:271: -1- m4_pattern_allow([^HAVE_PKG_CONFIG$])
-m4trace:configure.ac:285: -1- m4_pattern_allow([^XMKMF$])
-m4trace:configure.ac:285: -1- m4_pattern_allow([^X_DISPLAY_MISSING$])
-m4trace:configure.ac:285: -1- m4_pattern_allow([^X_CFLAGS$])
-m4trace:configure.ac:285: -1- m4_pattern_allow([^X_PRE_LIBS$])
-m4trace:configure.ac:285: -1- m4_pattern_allow([^X_LIBS$])
-m4trace:configure.ac:285: -1- m4_pattern_allow([^X_EXTRA_LIBS$])
-m4trace:configure.ac:308: -1- AC_VMW_CHECK_LIB([glib-2.0], [GLIB2], [glib-2.0], [], [2.6.0], [glib.h], [g_key_file_new], [], [AC_MSG_ERROR([glib >= 2.6.0 is required.])])
-m4trace:configure.ac:308: -1- m4_pattern_allow([^ac_vmw_lib_cfg$])
-m4trace:configure.ac:308: -1- m4_pattern_allow([^GLIB2_CPPFLAGS$])
-m4trace:configure.ac:308: -1- m4_pattern_allow([^GLIB2_LIBS$])
-m4trace:configure.ac:317: -1- AC_VMW_CHECK_LIB([gmodule-2.0], [GMODULE], [gmodule-2.0], [], [2.6.0], [], [], [], [AC_MSG_ERROR([gmodule >= 2.6.0 is required.])])
-m4trace:configure.ac:317: -1- m4_pattern_allow([^ac_vmw_lib_cfg$])
-m4trace:configure.ac:317: -1- m4_pattern_allow([^GMODULE_CPPFLAGS$])
-m4trace:configure.ac:317: -1- m4_pattern_allow([^GMODULE_LIBS$])
-m4trace:configure.ac:326: -1- AC_VMW_CHECK_LIB([gobject-2.0], [GOBJECT], [gobject-2.0], [], [2.6.0], [glib-object.h], [], [], [AC_MSG_ERROR([gobject >= 2.6.0 is required.])])
-m4trace:configure.ac:326: -1- m4_pattern_allow([^ac_vmw_lib_cfg$])
-m4trace:configure.ac:326: -1- m4_pattern_allow([^GOBJECT_CPPFLAGS$])
-m4trace:configure.ac:326: -1- m4_pattern_allow([^GOBJECT_LIBS$])
-m4trace:configure.ac:335: -1- AC_VMW_CHECK_LIB([gthread-2.0], [GTHREAD], [gthread-2.0], [], [2.6.0], [], [], [], [AC_MSG_ERROR([glib >= 2.6.0 is required.])])
-m4trace:configure.ac:335: -1- m4_pattern_allow([^ac_vmw_lib_cfg$])
-m4trace:configure.ac:335: -1- m4_pattern_allow([^GTHREAD_CPPFLAGS$])
-m4trace:configure.ac:335: -1- m4_pattern_allow([^GTHREAD_LIBS$])
-m4trace:configure.ac:344: -1- m4_pattern_allow([^have_genmarshal$])
-m4trace:configure.ac:357: -1- AC_VMW_CHECK_LIB([glib-2.0], [GLIB2], [glib-2.0], [], [2.14.0], [glib.h], [g_regex_new], [have_glib_2_14=yes], [AC_MSG_WARN([glib is not recent enough, some features will be disabled.])])
-m4trace:configure.ac:357: -1- m4_pattern_allow([^ac_vmw_lib_cfg$])
-m4trace:configure.ac:357: -1- m4_pattern_allow([^GLIB2_CPPFLAGS$])
-m4trace:configure.ac:357: -1- m4_pattern_allow([^GLIB2_LIBS$])
-m4trace:configure.ac:371: -1- AC_VMW_CHECK_LIB([fuse], [FUSE], [fuse], [], [], [fuse.h], [fuse_main], [have_fuse=yes], [have_fuse=no;
+m4trace:configure.ac:252: -1- _LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], [lt_cv_prog_compiler_static_works_CXX], [$lt_tmp_static_flag], [], [_LT_TAGVAR(lt_prog_compiler_static, CXX)=])
+m4trace:configure.ac:258: -1- m4_pattern_allow([^HAVE_PKG_CONFIG$])
+m4trace:configure.ac:272: -1- m4_pattern_allow([^XMKMF$])
+m4trace:configure.ac:272: -1- m4_pattern_allow([^X_DISPLAY_MISSING$])
+m4trace:configure.ac:272: -1- m4_pattern_allow([^X_CFLAGS$])
+m4trace:configure.ac:272: -1- m4_pattern_allow([^X_PRE_LIBS$])
+m4trace:configure.ac:272: -1- m4_pattern_allow([^X_LIBS$])
+m4trace:configure.ac:272: -1- m4_pattern_allow([^X_EXTRA_LIBS$])
+m4trace:configure.ac:295: -1- AC_VMW_CHECK_LIB([glib-2.0], [GLIB2], [glib-2.0], [], [2.6.0], [glib.h], [g_key_file_new], [], [AC_MSG_ERROR([glib >= 2.6.0 is required.])])
+m4trace:configure.ac:295: -1- m4_pattern_allow([^ac_vmw_lib_cfg$])
+m4trace:configure.ac:295: -1- m4_pattern_allow([^GLIB2_CPPFLAGS$])
+m4trace:configure.ac:295: -1- m4_pattern_allow([^GLIB2_LIBS$])
+m4trace:configure.ac:304: -1- AC_VMW_CHECK_LIB([gmodule-2.0], [GMODULE], [gmodule-2.0], [], [2.6.0], [], [], [], [AC_MSG_ERROR([gmodule >= 2.6.0 is required.])])
+m4trace:configure.ac:304: -1- m4_pattern_allow([^ac_vmw_lib_cfg$])
+m4trace:configure.ac:304: -1- m4_pattern_allow([^GMODULE_CPPFLAGS$])
+m4trace:configure.ac:304: -1- m4_pattern_allow([^GMODULE_LIBS$])
+m4trace:configure.ac:313: -1- AC_VMW_CHECK_LIB([gobject-2.0], [GOBJECT], [gobject-2.0], [], [2.6.0], [glib-object.h], [], [], [AC_MSG_ERROR([gobject >= 2.6.0 is required.])])
+m4trace:configure.ac:313: -1- m4_pattern_allow([^ac_vmw_lib_cfg$])
+m4trace:configure.ac:313: -1- m4_pattern_allow([^GOBJECT_CPPFLAGS$])
+m4trace:configure.ac:313: -1- m4_pattern_allow([^GOBJECT_LIBS$])
+m4trace:configure.ac:322: -1- AC_VMW_CHECK_LIB([gthread-2.0], [GTHREAD], [gthread-2.0], [], [2.6.0], [], [], [], [AC_MSG_ERROR([glib >= 2.6.0 is required.])])
+m4trace:configure.ac:322: -1- m4_pattern_allow([^ac_vmw_lib_cfg$])
+m4trace:configure.ac:322: -1- m4_pattern_allow([^GTHREAD_CPPFLAGS$])
+m4trace:configure.ac:322: -1- m4_pattern_allow([^GTHREAD_LIBS$])
+m4trace:configure.ac:331: -1- m4_pattern_allow([^have_genmarshal$])
+m4trace:configure.ac:344: -1- AC_VMW_CHECK_LIB([glib-2.0], [GLIB2], [glib-2.0], [], [2.14.0], [glib.h], [g_regex_new], [have_glib_2_14=yes], [AC_MSG_WARN([glib is not recent enough, some features will be disabled.])])
+m4trace:configure.ac:344: -1- m4_pattern_allow([^ac_vmw_lib_cfg$])
+m4trace:configure.ac:344: -1- m4_pattern_allow([^GLIB2_CPPFLAGS$])
+m4trace:configure.ac:344: -1- m4_pattern_allow([^GLIB2_LIBS$])
+m4trace:configure.ac:358: -1- AC_VMW_CHECK_LIB([fuse], [FUSE], [fuse], [], [], [fuse.h], [fuse_main], [have_fuse=yes], [have_fuse=no;
                   AC_MSG_WARN([Fuse is missing, vmblock-fuse will be disabled.])])
-m4trace:configure.ac:371: -1- m4_pattern_allow([^ac_vmw_lib_cfg$])
-m4trace:configure.ac:371: -1- m4_pattern_allow([^FUSE_CPPFLAGS$])
-m4trace:configure.ac:371: -1- m4_pattern_allow([^FUSE_LIBS$])
-m4trace:configure.ac:393: -1- AC_VMW_DEFAULT_FLAGS([PAM])
-m4trace:configure.ac:394: -1- AC_VMW_CHECK_LIB([pam], [PAM], [], [], [], [security/pam_appl.h], [pam_start], [PAM_CPPFLAGS="$PAM_CPPFLAGS -DUSE_PAM"], [AC_VMW_LIB_ERROR([PAM], [pam])])
-m4trace:configure.ac:394: -1- m4_pattern_allow([^ac_vmw_lib_cfg$])
-m4trace:configure.ac:394: -1- m4_pattern_allow([^PAM_CPPFLAGS$])
-m4trace:configure.ac:394: -1- m4_pattern_allow([^PAM_LIBS$])
-m4trace:configure.ac:394: -1- AC_VMW_LIB_ERROR([PAM], [pam])
-m4trace:configure.ac:410: -1- AC_VMW_DEFAULT_FLAGS([CUNIT])
-m4trace:configure.ac:411: -1- AC_VMW_CHECK_LIB([cunit], [CUNIT], [], [], [], [CUnit/CUnit.h], [CU_initialize_registry], [have_cunit=yes], [have_cunit=no])
-m4trace:configure.ac:411: -1- m4_pattern_allow([^ac_vmw_lib_cfg$])
-m4trace:configure.ac:411: -1- m4_pattern_allow([^CUNIT_CPPFLAGS$])
-m4trace:configure.ac:411: -1- m4_pattern_allow([^CUNIT_LIBS$])
-m4trace:configure.ac:422: -1- AC_VMW_LIB_ERROR([CUNIT], [cunit])
-m4trace:configure.ac:524: -1- m4_pattern_allow([^HAVE_X11_EXTENSIONS_XCOMPOSITE_H$])
-m4trace:configure.ac:538: -1- AC_VMW_CHECK_X11_LIB([Xss], [X11/extensions/scrnsaver.h], [XScreenSaverQueryExtension], [AC_MSG_ERROR([libXss or headers not found. Please configure without Unity (using --disable-unity) or install the libXss devel package.])])
-m4trace:configure.ac:552: -1- AC_VMW_DEFAULT_FLAGS([URIPARSER], [uriparser])
-m4trace:configure.ac:553: -1- AC_VMW_CHECK_LIB([uriparser], [URIPARSER], [], [], [], [Uri.h], [uriFreeQueryListA], [], [AC_MSG_ERROR([uriparser library not found or is too old. Please configure without Unity (using --disable-unity) or install the liburiparser devel package.])])
-m4trace:configure.ac:553: -1- m4_pattern_allow([^ac_vmw_lib_cfg$])
-m4trace:configure.ac:553: -1- m4_pattern_allow([^URIPARSER_CPPFLAGS$])
-m4trace:configure.ac:553: -1- m4_pattern_allow([^URIPARSER_LIBS$])
-m4trace:configure.ac:564: -1- AC_VMW_CHECK_LIB([png12], [LIBPNG], [libpng12], [libpng-config], [], [png.h], [png_access_version_number], [], [AC_MSG_ERROR([libpng not found. Please configure without Unity (using --disable-unity) or install the libpng devel package])])
-m4trace:configure.ac:564: -1- m4_pattern_allow([^ac_vmw_lib_cfg$])
-m4trace:configure.ac:564: -1- m4_pattern_allow([^LIBPNG_CPPFLAGS$])
-m4trace:configure.ac:564: -1- m4_pattern_allow([^LIBPNG_LIBS$])
-m4trace:configure.ac:576: -1- AC_VMW_DEFAULT_FLAGS([ZLIB])
-m4trace:configure.ac:577: -1- AC_VMW_CHECK_LIB([z], [ZLIB], [], [], [], [zlib.h], [zlibVersion], [], [AC_MSG_ERROR([zlib library not found. Please configure without Unity (using --disable-unity) or install the zlib devel package.])])
-m4trace:configure.ac:577: -1- m4_pattern_allow([^ac_vmw_lib_cfg$])
-m4trace:configure.ac:577: -1- m4_pattern_allow([^ZLIB_CPPFLAGS$])
-m4trace:configure.ac:577: -1- m4_pattern_allow([^ZLIB_LIBS$])
-m4trace:configure.ac:588: -1- AC_VMW_CHECK_LIB([gio-2.0], [GIO], [gio-unix-2.0], [], [2.24.0], [gio/gio.h], [g_desktop_app_info_get_filename], [], [AC_MSG_ERROR([GLib/GIO 2.24+ not found.  Please configure without Unity (using --disable-unity) or upgrade the Glib devel package.])])
-m4trace:configure.ac:588: -1- m4_pattern_allow([^ac_vmw_lib_cfg$])
-m4trace:configure.ac:588: -1- m4_pattern_allow([^GIO_CPPFLAGS$])
-m4trace:configure.ac:588: -1- m4_pattern_allow([^GIO_LIBS$])
-m4trace:configure.ac:603: -1- AC_VMW_CHECK_LIB([gtk-x11-2.0], [GTK], [gtk+-2.0], [], [2.4.0], [gtk/gtk.h], [gdk_display_get_default_group], [GTK_CPPFLAGS="$GTK_CPPFLAGS -DGTK2"], [AC_MSG_ERROR([Gtk+ 2.0 library not found or too old. Please configure without Gtk+ support (using --without-gtk2) or install the Gtk+ 2.0 devel package.])])
-m4trace:configure.ac:603: -1- m4_pattern_allow([^ac_vmw_lib_cfg$])
-m4trace:configure.ac:603: -1- m4_pattern_allow([^GTK_CPPFLAGS$])
-m4trace:configure.ac:603: -1- m4_pattern_allow([^GTK_LIBS$])
-m4trace:configure.ac:631: -1- AC_VMW_CHECK_LIBXX([gtkmm-2.4], [GTKMM], [gtkmm-2.4], [], [2.4.0], [gtkmm.h], [], [GTKMM_CPPFLAGS="$GTKMM_CPPFLAGS -DHAVE_GTKMM"], [AC_MSG_ERROR([gtkmm library not found. Please install the libgtkmm devel package(s), or re-configure using --without-gtkmm.])])
-m4trace:configure.ac:631: -1- AC_VMW_CHECK_LIB([gtkmm-2.4], [GTKMM], [gtkmm-2.4], [], [2.4.0], [gtkmm.h], [], [GTKMM_CPPFLAGS="$GTKMM_CPPFLAGS -DHAVE_GTKMM"], [AC_MSG_ERROR([gtkmm library not found. Please install the libgtkmm devel package(s), or re-configure using --without-gtkmm.])])
-m4trace:configure.ac:631: -1- m4_pattern_allow([^ac_vmw_lib_cfg$])
-m4trace:configure.ac:631: -1- m4_pattern_allow([^GTKMM_CPPFLAGS$])
-m4trace:configure.ac:631: -1- m4_pattern_allow([^GTKMM_LIBS$])
-m4trace:configure.ac:650: -1- m4_pattern_allow([^HAVE_DLOPEN$])
-m4trace:configure.ac:661: -1- m4_pattern_allow([^HAVE_ECVT$])
-m4trace:configure.ac:662: -1- m4_pattern_allow([^HAVE_FCVT$])
-m4trace:configure.ac:716: -1- AC_VMW_CHECK_LIB([$CUSTOM_PROCPS_NAME], [PROCPS], [], [], [], [], [getstat], [
+m4trace:configure.ac:358: -1- m4_pattern_allow([^ac_vmw_lib_cfg$])
+m4trace:configure.ac:358: -1- m4_pattern_allow([^FUSE_CPPFLAGS$])
+m4trace:configure.ac:358: -1- m4_pattern_allow([^FUSE_LIBS$])
+m4trace:configure.ac:379: -1- AC_VMW_DEFAULT_FLAGS([PAM])
+m4trace:configure.ac:380: -1- AC_VMW_CHECK_LIB([pam], [PAM], [], [], [], [security/pam_appl.h], [pam_start], [PAM_CPPFLAGS="$PAM_CPPFLAGS -DUSE_PAM"], [AC_VMW_LIB_ERROR([PAM], [pam])])
+m4trace:configure.ac:380: -1- m4_pattern_allow([^ac_vmw_lib_cfg$])
+m4trace:configure.ac:380: -1- m4_pattern_allow([^PAM_CPPFLAGS$])
+m4trace:configure.ac:380: -1- m4_pattern_allow([^PAM_LIBS$])
+m4trace:configure.ac:380: -1- AC_VMW_LIB_ERROR([PAM], [pam])
+m4trace:configure.ac:395: -1- AC_VMW_DEFAULT_FLAGS([CUNIT])
+m4trace:configure.ac:396: -1- AC_VMW_CHECK_LIB([cunit], [CUNIT], [], [], [], [CUnit/CUnit.h], [CU_initialize_registry], [have_cunit=yes], [have_cunit=no])
+m4trace:configure.ac:396: -1- m4_pattern_allow([^ac_vmw_lib_cfg$])
+m4trace:configure.ac:396: -1- m4_pattern_allow([^CUNIT_CPPFLAGS$])
+m4trace:configure.ac:396: -1- m4_pattern_allow([^CUNIT_LIBS$])
+m4trace:configure.ac:407: -1- AC_VMW_LIB_ERROR([CUNIT], [cunit])
+m4trace:configure.ac:503: -1- m4_pattern_allow([^HAVE_X11_EXTENSIONS_XCOMPOSITE_H$])
+m4trace:configure.ac:515: -1- AC_VMW_CHECK_LIB([gtk-x11-2.0], [GTK], [gtk+-2.0], [], [2.4.0], [gtk/gtk.h], [gdk_display_get_default_group], [GTK_CPPFLAGS="$GTK_CPPFLAGS -DGTK2"], [AC_MSG_ERROR([Gtk+ 2.0 library not found or too old. Please configure without Gtk+ support (using --without-gtk2) or install the Gtk+ 2.0 devel package.])])
+m4trace:configure.ac:515: -1- m4_pattern_allow([^ac_vmw_lib_cfg$])
+m4trace:configure.ac:515: -1- m4_pattern_allow([^GTK_CPPFLAGS$])
+m4trace:configure.ac:515: -1- m4_pattern_allow([^GTK_LIBS$])
+m4trace:configure.ac:532: -1- AC_VMW_CHECK_LIBXX([gtkmm-2.4], [GTKMM], [gtkmm-2.4], [], [2.4.0], [gtkmm.h], [], [GTKMM_CPPFLAGS="$GTKMM_CPPFLAGS -DHAVE_GTKMM"], [AC_MSG_ERROR([gtkmm library not found. Please install the libgtkmm devel package(s), or re-configure using --without-gtkmm.])])
+m4trace:configure.ac:532: -1- AC_VMW_CHECK_LIB([gtkmm-2.4], [GTKMM], [gtkmm-2.4], [], [2.4.0], [gtkmm.h], [], [GTKMM_CPPFLAGS="$GTKMM_CPPFLAGS -DHAVE_GTKMM"], [AC_MSG_ERROR([gtkmm library not found. Please install the libgtkmm devel package(s), or re-configure using --without-gtkmm.])])
+m4trace:configure.ac:532: -1- m4_pattern_allow([^ac_vmw_lib_cfg$])
+m4trace:configure.ac:532: -1- m4_pattern_allow([^GTKMM_CPPFLAGS$])
+m4trace:configure.ac:532: -1- m4_pattern_allow([^GTKMM_LIBS$])
+m4trace:configure.ac:551: -1- m4_pattern_allow([^HAVE_DLOPEN$])
+m4trace:configure.ac:562: -1- m4_pattern_allow([^HAVE_ECVT$])
+m4trace:configure.ac:563: -1- m4_pattern_allow([^HAVE_FCVT$])
+m4trace:configure.ac:617: -1- AC_VMW_CHECK_LIB([$CUSTOM_PROCPS_NAME], [PROCPS], [], [], [], [], [getstat], [
                      have_procps=yes;
                     ], [])
-m4trace:configure.ac:716: -1- m4_pattern_allow([^ac_vmw_lib_cfg$])
-m4trace:configure.ac:716: -1- m4_pattern_allow([^PROCPS_CPPFLAGS$])
-m4trace:configure.ac:716: -1- m4_pattern_allow([^PROCPS_LIBS$])
-m4trace:configure.ac:729: -1- AC_VMW_CHECK_LIB([proc-3.2.8], [PROCPS], [], [], [], [], [getstat], [
+m4trace:configure.ac:617: -1- m4_pattern_allow([^ac_vmw_lib_cfg$])
+m4trace:configure.ac:617: -1- m4_pattern_allow([^PROCPS_CPPFLAGS$])
+m4trace:configure.ac:617: -1- m4_pattern_allow([^PROCPS_LIBS$])
+m4trace:configure.ac:630: -1- AC_VMW_CHECK_LIB([proc-3.2.8], [PROCPS], [], [], [], [], [getstat], [
                         have_procps=yes;
                        ], [])
-m4trace:configure.ac:729: -1- m4_pattern_allow([^ac_vmw_lib_cfg$])
-m4trace:configure.ac:729: -1- m4_pattern_allow([^PROCPS_CPPFLAGS$])
-m4trace:configure.ac:729: -1- m4_pattern_allow([^PROCPS_LIBS$])
-m4trace:configure.ac:743: -1- AC_VMW_CHECK_LIB([proc-3.2.7], [PROCPS], [], [], [], [], [getstat], [], [AC_MSG_ERROR([libproc not found. Please configure without procps (using --without-procps) or install procps - http://procps.sourceforge.net])])
-m4trace:configure.ac:743: -1- m4_pattern_allow([^ac_vmw_lib_cfg$])
-m4trace:configure.ac:743: -1- m4_pattern_allow([^PROCPS_CPPFLAGS$])
-m4trace:configure.ac:743: -1- m4_pattern_allow([^PROCPS_LIBS$])
-m4trace:configure.ac:756: -1- m4_pattern_allow([^NO_PROCPS$])
-m4trace:configure.ac:770: -1- AC_VMW_CHECK_LIB([dumbnet], [DNET], [], [dumbnet-config], [], [dumbnet.h], [intf_open], [have_dnet="yes";
+m4trace:configure.ac:630: -1- m4_pattern_allow([^ac_vmw_lib_cfg$])
+m4trace:configure.ac:630: -1- m4_pattern_allow([^PROCPS_CPPFLAGS$])
+m4trace:configure.ac:630: -1- m4_pattern_allow([^PROCPS_LIBS$])
+m4trace:configure.ac:644: -1- AC_VMW_CHECK_LIB([proc-3.2.7], [PROCPS], [], [], [], [], [getstat], [], [AC_MSG_ERROR([libproc not found. Please configure without procps (using --without-procps) or install procps - http://procps.sourceforge.net])])
+m4trace:configure.ac:644: -1- m4_pattern_allow([^ac_vmw_lib_cfg$])
+m4trace:configure.ac:644: -1- m4_pattern_allow([^PROCPS_CPPFLAGS$])
+m4trace:configure.ac:644: -1- m4_pattern_allow([^PROCPS_LIBS$])
+m4trace:configure.ac:657: -1- m4_pattern_allow([^NO_PROCPS$])
+m4trace:configure.ac:671: -1- AC_VMW_CHECK_LIB([dumbnet], [DNET], [], [dumbnet-config], [], [dumbnet.h], [intf_open], [have_dnet="yes";
                      AC_DEFINE([DNET_IS_DUMBNET], 1, [Define to 1 if substituting Debian's libdumbnet for libdnet.])], [])
-m4trace:configure.ac:770: -1- m4_pattern_allow([^ac_vmw_lib_cfg$])