Ubuntu
open-vm-tools package

Merge lp:~n-muench/ubuntu/precise/open-vm-tools/open-vm-tools-august.merge2 into lp:ubuntu/precise/open-vm-tools

  1. Precise (12.04)
  2. open-vm-tools-august.merge2
  3. Merge into precise
Proposed by Nate Muench (Mink)
Status: Needs review
Proposed branch: lp:~n-muench/ubuntu/precise/open-vm-tools/open-vm-tools-august.merge2
Merge into: lp:ubuntu/precise/open-vm-tools
Diff against target: 15040 lines (+1988/-10490)
85 files modified
ChangeLog (+5/-0)
NEWS (+5/-0)
autom4te.cache/output.0 (+39/-10)
autom4te.cache/output.1 (+39/-10)
autom4te.cache/output.2 (+39/-10)
autom4te.cache/traces.0 (+156/-153)
autom4te.cache/traces.1 (+336/-333)
autom4te.cache/traces.2 (+156/-153)
configure (+39/-10)
configure.ac (+15/-2)
debian/README.source (+0/-37)
debian/changelog (+85/-57)
debian/compat (+1/-1)
debian/control (+7/-9)
debian/control.modules.in (+3/-7)
debian/copyright (+1/-6)
debian/open-vm-source.README.Debian (+1/-1)
debian/patches/01-kvers.patch (+73/-78)
debian/rules (+4/-28)
debian/source/format (+1/-1)
lib/auth/authPosix.c (+2/-0)
lib/file/fileIO.c (+52/-0)
lib/file/fileIOPosix.c (+61/-49)
lib/hgfsServer/hgfsServer.c (+12/-2)
lib/include/backdoor_def.h (+2/-1)
lib/include/buildNumber.h (+6/-6)
lib/include/fileIO.h (+7/-3)
lib/include/guestInfo.h (+0/-10)
lib/include/hostinfo.h (+2/-4)
lib/include/loglevel_user.h (+4/-0)
lib/include/msgfmt.h (+6/-2)
lib/include/mutexRankLib.h (+21/-15)
lib/include/posix.h (+1/-0)
lib/include/unityCommon.h (+2/-1)
lib/include/vixCommands.h (+0/-1)
lib/include/vm_basic_asm.h (+4/-4)
lib/include/vm_product.h (+18/-4)
lib/include/vm_version.h (+33/-10)
lib/include/vmci_defs.h (+8/-2)
lib/misc/hostinfo.c (+59/-30)
lib/misc/hostinfoHV.c (+3/-9)
lib/misc/hostinfoInt.h (+2/-2)
lib/misc/posixDlopen.c (+2/-2)
lib/misc/posixPosix.c (+41/-1)
lib/procMgr/procMgrPosix.c (+221/-15)
lib/wiper/wiperPosix.c (+20/-2)
modules/freebsd/vmhgfs/vnopscommon.c (+20/-13)
modules/linux/dkms.conf (+1/-1)
modules/linux/dkms.sh (+2/-2)
modules/linux/shared/compat_netdevice.h (+7/-1)
modules/linux/shared/vmci_defs.h (+8/-2)
modules/linux/shared/vmci_infrastructure.h (+1/-0)
modules/linux/vmblock/Makefile (+1/-1)
modules/linux/vmci/Makefile (+1/-1)
modules/linux/vmci/common/vmciContext.c (+44/-0)
modules/linux/vmci/common/vmciContext.h (+1/-0)
modules/linux/vmci/common/vmciEvent.c (+18/-2)
modules/linux/vmhgfs/Makefile (+1/-1)
modules/linux/vmsync/Makefile (+1/-1)
modules/linux/vmxnet/Makefile (+1/-1)
modules/linux/vsock/Makefile (+1/-1)
modules/linux/vsock/linux/vsockSocketWrapper.h (+3/-0)
services/plugins/guestInfo/guestInfoServer.c (+30/-25)
services/plugins/unity/Makefile.am (+8/-6)
services/plugins/unity/Makefile.in (+55/-49)
services/plugins/unity/unityTclo.cpp (+1/-0)
services/plugins/unity/unitylib/unity.c (+3/-15)
services/plugins/unity/unitylib/unity.h (+8/-18)
services/plugins/unity/unitylib/unityPlatform.h (+3/-5)
services/plugins/unity/unitylib/unityPlatformX11.cc (+0/-3341)
services/plugins/unity/unitylib/unityPlatformX11Settings.cc (+0/-1032)
services/plugins/unity/unitylib/unityPlatformX11Window.cc (+0/-3813)
services/plugins/unity/unitylib/unityX11.h (+0/-496)
services/plugins/unity/unitylib/x11Event.cc (+0/-352)
services/plugins/unity/unitylib/x11Util.cc (+0/-77)
services/plugins/vix/foundryToolsDaemon.c (+8/-83)
services/plugins/vix/vixPlugin.c (+0/-2)
services/plugins/vix/vixPluginInt.h (+0/-3)
services/plugins/vix/vixTools.c (+141/-51)
services/plugins/vix/vixToolsEnvVars.c (+4/-8)
services/plugins/vix/vixToolsInt.h (+5/-1)
services/vmtoolsd/mainLoop.c (+8/-0)
toolbox/l10n/de.vmsg (+5/-3)
toolbox/l10n/ja.vmsg (+2/-0)
toolbox/l10n/zh_CN.vmsg (+2/-2)
To merge this branch: bzr merge lp:~n-muench/ubuntu/precise/open-vm-tools/open-vm-tools-august.merge2
Reviewer Review Type Date Requested Status
Stefano Rivera Needs Fixing
Review via email: mp+80766@code.launchpad.net

Description of the change

This is the August release of the package.

The packaging includes some changes from the Debian unstable upload (namely the upgrade to quilt 3.0). The main things not merged from Debian include: open-vm-dkms remaining and open-vm-toolbox staying as a transitional package.

I've added numlockx to the suggested packages for open-vm-tools because the numlock doesn't engage after login (I don't know if I'm the only one encountering this). This is a temporary workaround until something better can be put into place.

I've removed the commented out lines from debian/rules, ones that were suppose to be removed before the last merge (but issues prevented it from being removed).

I used bzr import-dsc to add the newest revision. I think I did it right this time, although, I don't know if that .pc directory should be there or not (it's not in the source packaging). If you want me to resubmit it, I would be happy to.

You can consult my working branch for this merge:
https://code.launchpad.net/~n-muench/ubuntu/oneiric/open-vm-tools/open-vm-tools-august.prep

Built packages can be found here:
https://launchpad.net/~n-muench/+archive/virtual-test/+packages

Since this wasn't approved in time for the Oneiric, I'm resubmitting it for merging in the Precise branch, since we got 6 month before release.

To post a comment you must log in.
Revision history for this message
Stefano Rivera (stefanor) wrote :

$ bzr branch lp:ubuntu/open-vm-tools
$ cd open-vm-tools
$ bzr merge-package lp:~n-muench/ubuntu/precise/open-vm-tools/open-vm-tools-august.merge2
bzr: ERROR: None 2011.08.21-471295 was not found in <PristineTarSource ...

Please use bzr merge-upstream, when grabbing new upstream versions.

Have you considered working with the Debian maintainer on this package?

review: Needs Fixing
Reply

Unmerged revisions

26. By Nate Muench (Mink)

* Merge latest upstream git tag.
* Changes in debian/rules:
  - Removed "-Wno-unused-but-set-variable" from CFLAGS.
    + No longer needed, package now builds successfully without it.
  - Actually remove commented out lines regarding open-vm-toolbox.
* Changes in debian/control:
  - open-vm-tools recommends open-vm-dkms (LP: #598933)
  - Added NumLockX as a suggested package for open-vm-tools.
    + Temporary workaround until a proper fix is found.
* Partial merge from Debian unstable. Details below:
  - Updating maintainer and uploaders fields.
  - Removing vcs fields.
  - Removing references to Daniel Baumann's old email address.
  - Updating years in copyright file.
  - Updating to standards version 3.9.2.
  - Updating to debhelper version 8.
  - Switching to source format 3.0 (quilt).
  - Removing manual chrpath setting.
  - Removing exclusion from plugins from debhelper shlibs.
  - Rediffing kvers.patch.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'ChangeLog'
--- ChangeLog 2011-07-22 16:41:03 +0000
+++ ChangeLog 2011-10-31 00:22:23 +0000
@@ -1,3 +1,8 @@
12011.08.21 Marcelo Vanzin <mvanzin@vmware.com>
2 This release tag contains commits up to the following id:
3 2b3d76ba776f55d06fb5b62499b189ebd6bc1c75
4
5
12011.07.19 Marcelo Vanzin <mvanzin@vmware.com>62011.07.19 Marcelo Vanzin <mvanzin@vmware.com>
2 This release tag contains commits up to the following id:7 This release tag contains commits up to the following id:
3 5bed6f1369ca6e9c2c7fbaf4205d86e50f219c5f8 5bed6f1369ca6e9c2c7fbaf4205d86e50f219c5f
49
=== modified file 'NEWS'
--- NEWS 2011-07-22 16:41:03 +0000
+++ NEWS 2011-10-31 00:22:23 +0000
@@ -1,3 +1,8 @@
1open-vm-tools 2011.08.21 changes:
2 * Enabled several VIX APIs on FreeBSD.
3
4 * Minor bug fixes and code cleanup.
5
1open-vm-tools 2011.07.19 changes:6open-vm-tools 2011.07.19 changes:
2 * Fix an issue in the HGFS driver that could lead to a kernel7 * Fix an issue in the HGFS driver that could lead to a kernel
3 panic.8 panic.
49
=== modified file 'autom4te.cache/output.0'
--- autom4te.cache/output.0 2011-07-22 16:41:03 +0000
+++ autom4te.cache/output.0 2011-10-31 00:22:23 +0000
@@ -1,6 +1,6 @@
1@%:@! /bin/sh1@%:@! /bin/sh
2@%:@ Guess values for system-dependent variables and create Makefiles.2@%:@ Guess values for system-dependent variables and create Makefiles.
3@%:@ Generated by GNU Autoconf 2.67 for open-vm-tools 2011.07.19.3@%:@ Generated by GNU Autoconf 2.67 for open-vm-tools 2011.08.21.
4@%:@4@%:@
5@%:@ Report bugs to <open-vm-tools-devel@lists.sourceforge.net>.5@%:@ Report bugs to <open-vm-tools-devel@lists.sourceforge.net>.
6@%:@ 6@%:@
@@ -701,8 +701,8 @@
701# Identity of this package.701# Identity of this package.
702PACKAGE_NAME='open-vm-tools'702PACKAGE_NAME='open-vm-tools'
703PACKAGE_TARNAME='open-vm-tools'703PACKAGE_TARNAME='open-vm-tools'
704PACKAGE_VERSION='2011.07.19'704PACKAGE_VERSION='2011.08.21'
705PACKAGE_STRING='open-vm-tools 2011.07.19'705PACKAGE_STRING='open-vm-tools 2011.08.21'
706PACKAGE_BUGREPORT='open-vm-tools-devel@lists.sourceforge.net'706PACKAGE_BUGREPORT='open-vm-tools-devel@lists.sourceforge.net'
707PACKAGE_URL=''707PACKAGE_URL=''
708708
@@ -1561,7 +1561,7 @@
1561 # Omit some internal or obsolete options to make the list less imposing.1561 # Omit some internal or obsolete options to make the list less imposing.
1562 # This message is too long to be a string in the A/UX 3.1 sh.1562 # This message is too long to be a string in the A/UX 3.1 sh.
1563 cat <<_ACEOF1563 cat <<_ACEOF
1564\`configure' configures open-vm-tools 2011.07.19 to adapt to many kinds of systems.1564\`configure' configures open-vm-tools 2011.08.21 to adapt to many kinds of systems.
15651565
1566Usage: $0 [OPTION]... [VAR=VALUE]...1566Usage: $0 [OPTION]... [VAR=VALUE]...
15671567
@@ -1635,7 +1635,7 @@
16351635
1636if test -n "$ac_init_help"; then1636if test -n "$ac_init_help"; then
1637 case $ac_init_help in1637 case $ac_init_help in
1638 short | recursive ) echo "Configuration of open-vm-tools 2011.07.19:";;1638 short | recursive ) echo "Configuration of open-vm-tools 2011.08.21:";;
1639 esac1639 esac
1640 cat <<\_ACEOF1640 cat <<\_ACEOF
16411641
@@ -1762,7 +1762,7 @@
1762test -n "$ac_init_help" && exit $ac_status1762test -n "$ac_init_help" && exit $ac_status
1763if $ac_init_version; then1763if $ac_init_version; then
1764 cat <<\_ACEOF1764 cat <<\_ACEOF
1765open-vm-tools configure 2011.07.191765open-vm-tools configure 2011.08.21
1766generated by GNU Autoconf 2.671766generated by GNU Autoconf 2.67
17671767
1768Copyright (C) 2010 Free Software Foundation, Inc.1768Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2454,7 +2454,7 @@
2454This file contains any messages produced by compilers while2454This file contains any messages produced by compilers while
2455running configure, to aid debugging if configure makes a mistake.2455running configure, to aid debugging if configure makes a mistake.
24562456
2457It was created by open-vm-tools $as_me 2011.07.19, which was2457It was created by open-vm-tools $as_me 2011.08.21, which was
2458generated by GNU Autoconf 2.67. Invocation command line was2458generated by GNU Autoconf 2.67. Invocation command line was
24592459
2460 $ $0 $@2460 $ $0 $@
@@ -3529,7 +3529,7 @@
35293529
3530# Define the identity of the package.3530# Define the identity of the package.
3531 PACKAGE='open-vm-tools'3531 PACKAGE='open-vm-tools'
3532 VERSION='2011.07.19'3532 VERSION='2011.08.21'
35333533
35343534
3535cat >>confdefs.h <<_ACEOF3535cat >>confdefs.h <<_ACEOF
@@ -22584,6 +22584,34 @@
22584rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext22584rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
22585CFLAGS="$ORIGINAL_CFLAGS"22585CFLAGS="$ORIGINAL_CFLAGS"
2258622586
22587# Detect "unused-but-set-variable" gcc warning and disable it.
22588ORIGINAL_CFLAGS="$CFLAGS"
22589CFLAGS="$CFLAGS -Wno-unused-but-set-variable"
22590{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GCC flag -Wno-unused-but-set-variable" >&5
22591$as_echo_n "checking for GCC flag -Wno-unused-but-set-variable... " >&6; }
22592cat confdefs.h - <<_ACEOF >conftest.$ac_ext
22593/* end confdefs.h. */
22594
22595int
22596main ()
22597{
22598return 0;
22599 ;
22600 return 0;
22601}
22602_ACEOF
22603if ac_fn_c_try_compile "$LINENO"; then :
22604 ORIGINAL_CFLAGS="$ORIGINAL_CFLAGS -Wno-unused-but-set-variable";
22605 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
22606$as_echo "yes" >&6; }
22607else
22608 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
22609$as_echo "no" >&6; }
22610fi
22611rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
22612CFLAGS="$ORIGINAL_CFLAGS"
22613
22614
22587BUILDDIR="`pwd`"22615BUILDDIR="`pwd`"
2258822616
22589INCLUDE_DIR="`cd $srcdir; pwd`/lib/include"22617INCLUDE_DIR="`cd $srcdir; pwd`/lib/include"
@@ -22767,6 +22795,7 @@
22767fi22795fi
2276822796
22769if test "$os" = "freebsd"; then22797if test "$os" = "freebsd"; then
22798 LIBVMTOOLS_LIBADD="$LIBVMTOOLS_LIBADD -lkvm"
22770 MODULES_DIR="/boot/modules"22799 MODULES_DIR="/boot/modules"
2277122800
22772 if test "$osVersion" -ge 302000; then22801 if test "$osVersion" -ge 302000; then
@@ -23773,7 +23802,7 @@
23773# report actual input values of CONFIG_FILES etc. instead of their23802# report actual input values of CONFIG_FILES etc. instead of their
23774# values after options handling.23803# values after options handling.
23775ac_log="23804ac_log="
23776This file was extended by open-vm-tools $as_me 2011.07.19, which was23805This file was extended by open-vm-tools $as_me 2011.08.21, which was
23777generated by GNU Autoconf 2.67. Invocation command line was23806generated by GNU Autoconf 2.67. Invocation command line was
2377823807
23779 CONFIG_FILES = $CONFIG_FILES23808 CONFIG_FILES = $CONFIG_FILES
@@ -23830,7 +23859,7 @@
23830cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=123859cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
23831ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"23860ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
23832ac_cs_version="\\23861ac_cs_version="\\
23833open-vm-tools config.status 2011.07.1923862open-vm-tools config.status 2011.08.21
23834configured by $0, generated by GNU Autoconf 2.67,23863configured by $0, generated by GNU Autoconf 2.67,
23835 with options \\"\$ac_cs_config\\"23864 with options \\"\$ac_cs_config\\"
2383623865
2383723866
=== modified file 'autom4te.cache/output.1'
--- autom4te.cache/output.1 2011-07-22 16:41:03 +0000
+++ autom4te.cache/output.1 2011-10-31 00:22:23 +0000
@@ -1,6 +1,6 @@
1@%:@! /bin/sh1@%:@! /bin/sh
2@%:@ Guess values for system-dependent variables and create Makefiles.2@%:@ Guess values for system-dependent variables and create Makefiles.
3@%:@ Generated by GNU Autoconf 2.67 for open-vm-tools 2011.07.19.3@%:@ Generated by GNU Autoconf 2.67 for open-vm-tools 2011.08.21.
4@%:@4@%:@
5@%:@ Report bugs to <open-vm-tools-devel@lists.sourceforge.net>.5@%:@ Report bugs to <open-vm-tools-devel@lists.sourceforge.net>.
6@%:@ 6@%:@
@@ -701,8 +701,8 @@
701# Identity of this package.701# Identity of this package.
702PACKAGE_NAME='open-vm-tools'702PACKAGE_NAME='open-vm-tools'
703PACKAGE_TARNAME='open-vm-tools'703PACKAGE_TARNAME='open-vm-tools'
704PACKAGE_VERSION='2011.07.19'704PACKAGE_VERSION='2011.08.21'
705PACKAGE_STRING='open-vm-tools 2011.07.19'705PACKAGE_STRING='open-vm-tools 2011.08.21'
706PACKAGE_BUGREPORT='open-vm-tools-devel@lists.sourceforge.net'706PACKAGE_BUGREPORT='open-vm-tools-devel@lists.sourceforge.net'
707PACKAGE_URL=''707PACKAGE_URL=''
708708
@@ -1561,7 +1561,7 @@
1561 # Omit some internal or obsolete options to make the list less imposing.1561 # Omit some internal or obsolete options to make the list less imposing.
1562 # This message is too long to be a string in the A/UX 3.1 sh.1562 # This message is too long to be a string in the A/UX 3.1 sh.
1563 cat <<_ACEOF1563 cat <<_ACEOF
1564\`configure' configures open-vm-tools 2011.07.19 to adapt to many kinds of systems.1564\`configure' configures open-vm-tools 2011.08.21 to adapt to many kinds of systems.
15651565
1566Usage: $0 [OPTION]... [VAR=VALUE]...1566Usage: $0 [OPTION]... [VAR=VALUE]...
15671567
@@ -1635,7 +1635,7 @@
16351635
1636if test -n "$ac_init_help"; then1636if test -n "$ac_init_help"; then
1637 case $ac_init_help in1637 case $ac_init_help in
1638 short | recursive ) echo "Configuration of open-vm-tools 2011.07.19:";;1638 short | recursive ) echo "Configuration of open-vm-tools 2011.08.21:";;
1639 esac1639 esac
1640 cat <<\_ACEOF1640 cat <<\_ACEOF
16411641
@@ -1762,7 +1762,7 @@
1762test -n "$ac_init_help" && exit $ac_status1762test -n "$ac_init_help" && exit $ac_status
1763if $ac_init_version; then1763if $ac_init_version; then
1764 cat <<\_ACEOF1764 cat <<\_ACEOF
1765open-vm-tools configure 2011.07.191765open-vm-tools configure 2011.08.21
1766generated by GNU Autoconf 2.671766generated by GNU Autoconf 2.67
17671767
1768Copyright (C) 2010 Free Software Foundation, Inc.1768Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2454,7 +2454,7 @@
2454This file contains any messages produced by compilers while2454This file contains any messages produced by compilers while
2455running configure, to aid debugging if configure makes a mistake.2455running configure, to aid debugging if configure makes a mistake.
24562456
2457It was created by open-vm-tools $as_me 2011.07.19, which was2457It was created by open-vm-tools $as_me 2011.08.21, which was
2458generated by GNU Autoconf 2.67. Invocation command line was2458generated by GNU Autoconf 2.67. Invocation command line was
24592459
2460 $ $0 $@2460 $ $0 $@
@@ -3529,7 +3529,7 @@
35293529
3530# Define the identity of the package.3530# Define the identity of the package.
3531 PACKAGE='open-vm-tools'3531 PACKAGE='open-vm-tools'
3532 VERSION='2011.07.19'3532 VERSION='2011.08.21'
35333533
35343534
3535cat >>confdefs.h <<_ACEOF3535cat >>confdefs.h <<_ACEOF
@@ -22584,6 +22584,34 @@
22584rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext22584rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
22585CFLAGS="$ORIGINAL_CFLAGS"22585CFLAGS="$ORIGINAL_CFLAGS"
2258622586
22587# Detect "unused-but-set-variable" gcc warning and disable it.
22588ORIGINAL_CFLAGS="$CFLAGS"
22589CFLAGS="$CFLAGS -Wno-unused-but-set-variable"
22590{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GCC flag -Wno-unused-but-set-variable" >&5
22591$as_echo_n "checking for GCC flag -Wno-unused-but-set-variable... " >&6; }
22592cat confdefs.h - <<_ACEOF >conftest.$ac_ext
22593/* end confdefs.h. */
22594
22595int
22596main ()
22597{
22598return 0;
22599 ;
22600 return 0;
22601}
22602_ACEOF
22603if ac_fn_c_try_compile "$LINENO"; then :
22604 ORIGINAL_CFLAGS="$ORIGINAL_CFLAGS -Wno-unused-but-set-variable";
22605 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
22606$as_echo "yes" >&6; }
22607else
22608 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
22609$as_echo "no" >&6; }
22610fi
22611rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
22612CFLAGS="$ORIGINAL_CFLAGS"
22613
22614
22587BUILDDIR="`pwd`"22615BUILDDIR="`pwd`"
2258822616
22589INCLUDE_DIR="`cd $srcdir; pwd`/lib/include"22617INCLUDE_DIR="`cd $srcdir; pwd`/lib/include"
@@ -22767,6 +22795,7 @@
22767fi22795fi
2276822796
22769if test "$os" = "freebsd"; then22797if test "$os" = "freebsd"; then
22798 LIBVMTOOLS_LIBADD="$LIBVMTOOLS_LIBADD -lkvm"
22770 MODULES_DIR="/boot/modules"22799 MODULES_DIR="/boot/modules"
2277122800
22772 if test "$osVersion" -ge 302000; then22801 if test "$osVersion" -ge 302000; then
@@ -23773,7 +23802,7 @@
23773# report actual input values of CONFIG_FILES etc. instead of their23802# report actual input values of CONFIG_FILES etc. instead of their
23774# values after options handling.23803# values after options handling.
23775ac_log="23804ac_log="
23776This file was extended by open-vm-tools $as_me 2011.07.19, which was23805This file was extended by open-vm-tools $as_me 2011.08.21, which was
23777generated by GNU Autoconf 2.67. Invocation command line was23806generated by GNU Autoconf 2.67. Invocation command line was
2377823807
23779 CONFIG_FILES = $CONFIG_FILES23808 CONFIG_FILES = $CONFIG_FILES
@@ -23830,7 +23859,7 @@
23830cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=123859cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
23831ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"23860ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
23832ac_cs_version="\\23861ac_cs_version="\\
23833open-vm-tools config.status 2011.07.1923862open-vm-tools config.status 2011.08.21
23834configured by $0, generated by GNU Autoconf 2.67,23863configured by $0, generated by GNU Autoconf 2.67,
23835 with options \\"\$ac_cs_config\\"23864 with options \\"\$ac_cs_config\\"
2383623865
2383723866
=== modified file 'autom4te.cache/output.2'
--- autom4te.cache/output.2 2011-07-22 16:41:03 +0000
+++ autom4te.cache/output.2 2011-10-31 00:22:23 +0000
@@ -1,6 +1,6 @@
1@%:@! /bin/sh1@%:@! /bin/sh
2@%:@ Guess values for system-dependent variables and create Makefiles.2@%:@ Guess values for system-dependent variables and create Makefiles.
3@%:@ Generated by GNU Autoconf 2.67 for open-vm-tools 2011.07.19.3@%:@ Generated by GNU Autoconf 2.67 for open-vm-tools 2011.08.21.
4@%:@4@%:@
5@%:@ Report bugs to <open-vm-tools-devel@lists.sourceforge.net>.5@%:@ Report bugs to <open-vm-tools-devel@lists.sourceforge.net>.
6@%:@ 6@%:@
@@ -701,8 +701,8 @@
701# Identity of this package.701# Identity of this package.
702PACKAGE_NAME='open-vm-tools'702PACKAGE_NAME='open-vm-tools'
703PACKAGE_TARNAME='open-vm-tools'703PACKAGE_TARNAME='open-vm-tools'
704PACKAGE_VERSION='2011.07.19'704PACKAGE_VERSION='2011.08.21'
705PACKAGE_STRING='open-vm-tools 2011.07.19'705PACKAGE_STRING='open-vm-tools 2011.08.21'
706PACKAGE_BUGREPORT='open-vm-tools-devel@lists.sourceforge.net'706PACKAGE_BUGREPORT='open-vm-tools-devel@lists.sourceforge.net'
707PACKAGE_URL=''707PACKAGE_URL=''
708708
@@ -1561,7 +1561,7 @@
1561 # Omit some internal or obsolete options to make the list less imposing.1561 # Omit some internal or obsolete options to make the list less imposing.
1562 # This message is too long to be a string in the A/UX 3.1 sh.1562 # This message is too long to be a string in the A/UX 3.1 sh.
1563 cat <<_ACEOF1563 cat <<_ACEOF
1564\`configure' configures open-vm-tools 2011.07.19 to adapt to many kinds of systems.1564\`configure' configures open-vm-tools 2011.08.21 to adapt to many kinds of systems.
15651565
1566Usage: $0 [OPTION]... [VAR=VALUE]...1566Usage: $0 [OPTION]... [VAR=VALUE]...
15671567
@@ -1635,7 +1635,7 @@
16351635
1636if test -n "$ac_init_help"; then1636if test -n "$ac_init_help"; then
1637 case $ac_init_help in1637 case $ac_init_help in
1638 short | recursive ) echo "Configuration of open-vm-tools 2011.07.19:";;1638 short | recursive ) echo "Configuration of open-vm-tools 2011.08.21:";;
1639 esac1639 esac
1640 cat <<\_ACEOF1640 cat <<\_ACEOF
16411641
@@ -1762,7 +1762,7 @@
1762test -n "$ac_init_help" && exit $ac_status1762test -n "$ac_init_help" && exit $ac_status
1763if $ac_init_version; then1763if $ac_init_version; then
1764 cat <<\_ACEOF1764 cat <<\_ACEOF
1765open-vm-tools configure 2011.07.191765open-vm-tools configure 2011.08.21
1766generated by GNU Autoconf 2.671766generated by GNU Autoconf 2.67
17671767
1768Copyright (C) 2010 Free Software Foundation, Inc.1768Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2454,7 +2454,7 @@
2454This file contains any messages produced by compilers while2454This file contains any messages produced by compilers while
2455running configure, to aid debugging if configure makes a mistake.2455running configure, to aid debugging if configure makes a mistake.
24562456
2457It was created by open-vm-tools $as_me 2011.07.19, which was2457It was created by open-vm-tools $as_me 2011.08.21, which was
2458generated by GNU Autoconf 2.67. Invocation command line was2458generated by GNU Autoconf 2.67. Invocation command line was
24592459
2460 $ $0 $@2460 $ $0 $@
@@ -3529,7 +3529,7 @@
35293529
3530# Define the identity of the package.3530# Define the identity of the package.
3531 PACKAGE='open-vm-tools'3531 PACKAGE='open-vm-tools'
3532 VERSION='2011.07.19'3532 VERSION='2011.08.21'
35333533
35343534
3535cat >>confdefs.h <<_ACEOF3535cat >>confdefs.h <<_ACEOF
@@ -22584,6 +22584,34 @@
22584rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext22584rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
22585CFLAGS="$ORIGINAL_CFLAGS"22585CFLAGS="$ORIGINAL_CFLAGS"
2258622586
22587# Detect "unused-but-set-variable" gcc warning and disable it.
22588ORIGINAL_CFLAGS="$CFLAGS"
22589CFLAGS="$CFLAGS -Wno-unused-but-set-variable"
22590{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GCC flag -Wno-unused-but-set-variable" >&5
22591$as_echo_n "checking for GCC flag -Wno-unused-but-set-variable... " >&6; }
22592cat confdefs.h - <<_ACEOF >conftest.$ac_ext
22593/* end confdefs.h. */
22594
22595int
22596main ()
22597{
22598return 0;
22599 ;
22600 return 0;
22601}
22602_ACEOF
22603if ac_fn_c_try_compile "$LINENO"; then :
22604 ORIGINAL_CFLAGS="$ORIGINAL_CFLAGS -Wno-unused-but-set-variable";
22605 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
22606$as_echo "yes" >&6; }
22607else
22608 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
22609$as_echo "no" >&6; }
22610fi
22611rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
22612CFLAGS="$ORIGINAL_CFLAGS"
22613
22614
22587BUILDDIR="`pwd`"22615BUILDDIR="`pwd`"
2258822616
22589INCLUDE_DIR="`cd $srcdir; pwd`/lib/include"22617INCLUDE_DIR="`cd $srcdir; pwd`/lib/include"
@@ -22767,6 +22795,7 @@
22767fi22795fi
2276822796
22769if test "$os" = "freebsd"; then22797if test "$os" = "freebsd"; then
22798 LIBVMTOOLS_LIBADD="$LIBVMTOOLS_LIBADD -lkvm"
22770 MODULES_DIR="/boot/modules"22799 MODULES_DIR="/boot/modules"
2277122800
22772 if test "$osVersion" -ge 302000; then22801 if test "$osVersion" -ge 302000; then
@@ -23773,7 +23802,7 @@
23773# report actual input values of CONFIG_FILES etc. instead of their23802# report actual input values of CONFIG_FILES etc. instead of their
23774# values after options handling.23803# values after options handling.
23775ac_log="23804ac_log="
23776This file was extended by open-vm-tools $as_me 2011.07.19, which was23805This file was extended by open-vm-tools $as_me 2011.08.21, which was
23777generated by GNU Autoconf 2.67. Invocation command line was23806generated by GNU Autoconf 2.67. Invocation command line was
2377823807
23779 CONFIG_FILES = $CONFIG_FILES23808 CONFIG_FILES = $CONFIG_FILES
@@ -23830,7 +23859,7 @@
23830cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=123859cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
23831ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"23860ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
23832ac_cs_version="\\23861ac_cs_version="\\
23833open-vm-tools config.status 2011.07.1923862open-vm-tools config.status 2011.08.21
23834configured by $0, generated by GNU Autoconf 2.67,23863configured by $0, generated by GNU Autoconf 2.67,
23835 with options \\"\$ac_cs_config\\"23864 with options \\"\$ac_cs_config\\"
2383623865
2383723866
=== modified file 'autom4te.cache/traces.0'
--- autom4te.cache/traces.0 2011-07-22 16:41:03 +0000
+++ autom4te.cache/traces.0 2011-10-31 00:22:23 +0000
@@ -2713,156 +2713,159 @@
2713m4trace:configure.ac:950: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.2713m4trace:configure.ac:950: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
2714You should run autoupdate.], [../../lib/autoconf/general.m4:2602: AC_TRY_COMPILE is expanded from...2714You should run autoupdate.], [../../lib/autoconf/general.m4:2602: AC_TRY_COMPILE is expanded from...
2715configure.ac:950: the top level])2715configure.ac:950: the top level])
2716m4trace:configure.ac:968: -1- m4_pattern_allow([^have_doxygen$])2716m4trace:configure.ac:961: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
2717m4trace:configure.ac:975: -1- m4_pattern_allow([^DOT$])2717You should run autoupdate.], [../../lib/autoconf/general.m4:2602: AC_TRY_COMPILE is expanded from...
2718m4trace:configure.ac:982: -1- m4_pattern_allow([^DOT$])2718configure.ac:961: the top level])
2719m4trace:configure.ac:983: -1- m4_pattern_allow([^HAVE_DOT$])2719m4trace:configure.ac:980: -1- m4_pattern_allow([^have_doxygen$])
2720m4trace:configure.ac:985: -1- m4_pattern_allow([^MSCGEN$])2720m4trace:configure.ac:987: -1- m4_pattern_allow([^DOT$])
2721m4trace:configure.ac:993: -1- m4_pattern_allow([^MSCGEN_DIR$])2721m4trace:configure.ac:994: -1- m4_pattern_allow([^DOT$])
2722m4trace:configure.ac:1092: -1- AM_CONDITIONAL([BUILD_HGFSMOUNTER], [test "$buildHgfsmounter" = "yes"])2722m4trace:configure.ac:995: -1- m4_pattern_allow([^HAVE_DOT$])
2723m4trace:configure.ac:1092: -1- m4_pattern_allow([^BUILD_HGFSMOUNTER_TRUE$])2723m4trace:configure.ac:997: -1- m4_pattern_allow([^MSCGEN$])
2724m4trace:configure.ac:1092: -1- m4_pattern_allow([^BUILD_HGFSMOUNTER_FALSE$])2724m4trace:configure.ac:1005: -1- m4_pattern_allow([^MSCGEN_DIR$])
2725m4trace:configure.ac:1092: -1- _AM_SUBST_NOTMAKE([BUILD_HGFSMOUNTER_TRUE])2725m4trace:configure.ac:1105: -1- AM_CONDITIONAL([BUILD_HGFSMOUNTER], [test "$buildHgfsmounter" = "yes"])
2726m4trace:configure.ac:1092: -1- _AM_SUBST_NOTMAKE([BUILD_HGFSMOUNTER_FALSE])2726m4trace:configure.ac:1105: -1- m4_pattern_allow([^BUILD_HGFSMOUNTER_TRUE$])
2727m4trace:configure.ac:1093: -1- AM_CONDITIONAL([LINUX], [test "$os" = "linux"])2727m4trace:configure.ac:1105: -1- m4_pattern_allow([^BUILD_HGFSMOUNTER_FALSE$])
2728m4trace:configure.ac:1093: -1- m4_pattern_allow([^LINUX_TRUE$])2728m4trace:configure.ac:1105: -1- _AM_SUBST_NOTMAKE([BUILD_HGFSMOUNTER_TRUE])
2729m4trace:configure.ac:1093: -1- m4_pattern_allow([^LINUX_FALSE$])2729m4trace:configure.ac:1105: -1- _AM_SUBST_NOTMAKE([BUILD_HGFSMOUNTER_FALSE])
2730m4trace:configure.ac:1093: -1- _AM_SUBST_NOTMAKE([LINUX_TRUE])2730m4trace:configure.ac:1106: -1- AM_CONDITIONAL([LINUX], [test "$os" = "linux"])
2731m4trace:configure.ac:1093: -1- _AM_SUBST_NOTMAKE([LINUX_FALSE])2731m4trace:configure.ac:1106: -1- m4_pattern_allow([^LINUX_TRUE$])
2732m4trace:configure.ac:1094: -1- AM_CONDITIONAL([SOLARIS], [test "$os" = "solaris"])2732m4trace:configure.ac:1106: -1- m4_pattern_allow([^LINUX_FALSE$])
2733m4trace:configure.ac:1094: -1- m4_pattern_allow([^SOLARIS_TRUE$])2733m4trace:configure.ac:1106: -1- _AM_SUBST_NOTMAKE([LINUX_TRUE])
2734m4trace:configure.ac:1094: -1- m4_pattern_allow([^SOLARIS_FALSE$])2734m4trace:configure.ac:1106: -1- _AM_SUBST_NOTMAKE([LINUX_FALSE])
2735m4trace:configure.ac:1094: -1- _AM_SUBST_NOTMAKE([SOLARIS_TRUE])2735m4trace:configure.ac:1107: -1- AM_CONDITIONAL([SOLARIS], [test "$os" = "solaris"])
2736m4trace:configure.ac:1094: -1- _AM_SUBST_NOTMAKE([SOLARIS_FALSE])2736m4trace:configure.ac:1107: -1- m4_pattern_allow([^SOLARIS_TRUE$])
2737m4trace:configure.ac:1095: -1- AM_CONDITIONAL([FREEBSD], [test "$os" = "freebsd"])2737m4trace:configure.ac:1107: -1- m4_pattern_allow([^SOLARIS_FALSE$])
2738m4trace:configure.ac:1095: -1- m4_pattern_allow([^FREEBSD_TRUE$])2738m4trace:configure.ac:1107: -1- _AM_SUBST_NOTMAKE([SOLARIS_TRUE])
2739m4trace:configure.ac:1095: -1- m4_pattern_allow([^FREEBSD_FALSE$])2739m4trace:configure.ac:1107: -1- _AM_SUBST_NOTMAKE([SOLARIS_FALSE])
2740m4trace:configure.ac:1095: -1- _AM_SUBST_NOTMAKE([FREEBSD_TRUE])2740m4trace:configure.ac:1108: -1- AM_CONDITIONAL([FREEBSD], [test "$os" = "freebsd"])
2741m4trace:configure.ac:1095: -1- _AM_SUBST_NOTMAKE([FREEBSD_FALSE])2741m4trace:configure.ac:1108: -1- m4_pattern_allow([^FREEBSD_TRUE$])
2742m4trace:configure.ac:1096: -1- AM_CONDITIONAL([FREEBSD_CUSTOM_SYSDIR], [test "$os" = "freebsd" -a -n "$SYSDIR"])2742m4trace:configure.ac:1108: -1- m4_pattern_allow([^FREEBSD_FALSE$])
2743m4trace:configure.ac:1096: -1- m4_pattern_allow([^FREEBSD_CUSTOM_SYSDIR_TRUE$])2743m4trace:configure.ac:1108: -1- _AM_SUBST_NOTMAKE([FREEBSD_TRUE])
2744m4trace:configure.ac:1096: -1- m4_pattern_allow([^FREEBSD_CUSTOM_SYSDIR_FALSE$])2744m4trace:configure.ac:1108: -1- _AM_SUBST_NOTMAKE([FREEBSD_FALSE])
2745m4trace:configure.ac:1096: -1- _AM_SUBST_NOTMAKE([FREEBSD_CUSTOM_SYSDIR_TRUE])2745m4trace:configure.ac:1109: -1- AM_CONDITIONAL([FREEBSD_CUSTOM_SYSDIR], [test "$os" = "freebsd" -a -n "$SYSDIR"])
2746m4trace:configure.ac:1096: -1- _AM_SUBST_NOTMAKE([FREEBSD_CUSTOM_SYSDIR_FALSE])2746m4trace:configure.ac:1109: -1- m4_pattern_allow([^FREEBSD_CUSTOM_SYSDIR_TRUE$])
2747m4trace:configure.ac:1097: -1- AM_CONDITIONAL([THIRTY_TWO_BIT_USERSPACE], [test "$userSpaceBitness" = "32"])2747m4trace:configure.ac:1109: -1- m4_pattern_allow([^FREEBSD_CUSTOM_SYSDIR_FALSE$])
2748m4trace:configure.ac:1097: -1- m4_pattern_allow([^THIRTY_TWO_BIT_USERSPACE_TRUE$])2748m4trace:configure.ac:1109: -1- _AM_SUBST_NOTMAKE([FREEBSD_CUSTOM_SYSDIR_TRUE])
2749m4trace:configure.ac:1097: -1- m4_pattern_allow([^THIRTY_TWO_BIT_USERSPACE_FALSE$])2749m4trace:configure.ac:1109: -1- _AM_SUBST_NOTMAKE([FREEBSD_CUSTOM_SYSDIR_FALSE])
2750m4trace:configure.ac:1097: -1- _AM_SUBST_NOTMAKE([THIRTY_TWO_BIT_USERSPACE_TRUE])2750m4trace:configure.ac:1110: -1- AM_CONDITIONAL([THIRTY_TWO_BIT_USERSPACE], [test "$userSpaceBitness" = "32"])
2751m4trace:configure.ac:1097: -1- _AM_SUBST_NOTMAKE([THIRTY_TWO_BIT_USERSPACE_FALSE])2751m4trace:configure.ac:1110: -1- m4_pattern_allow([^THIRTY_TWO_BIT_USERSPACE_TRUE$])
2752m4trace:configure.ac:1098: -1- AM_CONDITIONAL([HAVE_X11], [test "$have_x" = "yes"])2752m4trace:configure.ac:1110: -1- m4_pattern_allow([^THIRTY_TWO_BIT_USERSPACE_FALSE$])
2753m4trace:configure.ac:1098: -1- m4_pattern_allow([^HAVE_X11_TRUE$])2753m4trace:configure.ac:1110: -1- _AM_SUBST_NOTMAKE([THIRTY_TWO_BIT_USERSPACE_TRUE])
2754m4trace:configure.ac:1098: -1- m4_pattern_allow([^HAVE_X11_FALSE$])2754m4trace:configure.ac:1110: -1- _AM_SUBST_NOTMAKE([THIRTY_TWO_BIT_USERSPACE_FALSE])
2755m4trace:configure.ac:1098: -1- _AM_SUBST_NOTMAKE([HAVE_X11_TRUE])2755m4trace:configure.ac:1111: -1- AM_CONDITIONAL([HAVE_X11], [test "$have_x" = "yes"])
2756m4trace:configure.ac:1098: -1- _AM_SUBST_NOTMAKE([HAVE_X11_FALSE])2756m4trace:configure.ac:1111: -1- m4_pattern_allow([^HAVE_X11_TRUE$])
2757m4trace:configure.ac:1099: -1- AM_CONDITIONAL([HAVE_ICU], [test "$with_icu" = "yes"])2757m4trace:configure.ac:1111: -1- m4_pattern_allow([^HAVE_X11_FALSE$])
2758m4trace:configure.ac:1099: -1- m4_pattern_allow([^HAVE_ICU_TRUE$])2758m4trace:configure.ac:1111: -1- _AM_SUBST_NOTMAKE([HAVE_X11_TRUE])
2759m4trace:configure.ac:1099: -1- m4_pattern_allow([^HAVE_ICU_FALSE$])2759m4trace:configure.ac:1111: -1- _AM_SUBST_NOTMAKE([HAVE_X11_FALSE])
2760m4trace:configure.ac:1099: -1- _AM_SUBST_NOTMAKE([HAVE_ICU_TRUE])2760m4trace:configure.ac:1112: -1- AM_CONDITIONAL([HAVE_ICU], [test "$with_icu" = "yes"])
2761m4trace:configure.ac:1099: -1- _AM_SUBST_NOTMAKE([HAVE_ICU_FALSE])2761m4trace:configure.ac:1112: -1- m4_pattern_allow([^HAVE_ICU_TRUE$])
2762m4trace:configure.ac:1100: -1- AM_CONDITIONAL([WITH_KERNEL_MODULES], [test "$with_kernel_modules" = "yes"])2762m4trace:configure.ac:1112: -1- m4_pattern_allow([^HAVE_ICU_FALSE$])
2763m4trace:configure.ac:1100: -1- m4_pattern_allow([^WITH_KERNEL_MODULES_TRUE$])2763m4trace:configure.ac:1112: -1- _AM_SUBST_NOTMAKE([HAVE_ICU_TRUE])
2764m4trace:configure.ac:1100: -1- m4_pattern_allow([^WITH_KERNEL_MODULES_FALSE$])2764m4trace:configure.ac:1112: -1- _AM_SUBST_NOTMAKE([HAVE_ICU_FALSE])
2765m4trace:configure.ac:1100: -1- _AM_SUBST_NOTMAKE([WITH_KERNEL_MODULES_TRUE])2765m4trace:configure.ac:1113: -1- AM_CONDITIONAL([WITH_KERNEL_MODULES], [test "$with_kernel_modules" = "yes"])
2766m4trace:configure.ac:1100: -1- _AM_SUBST_NOTMAKE([WITH_KERNEL_MODULES_FALSE])2766m4trace:configure.ac:1113: -1- m4_pattern_allow([^WITH_KERNEL_MODULES_TRUE$])
2767m4trace:configure.ac:1101: -1- AM_CONDITIONAL([HAVE_XSM], [test "$have_xsm" = "yes"])2767m4trace:configure.ac:1113: -1- m4_pattern_allow([^WITH_KERNEL_MODULES_FALSE$])
2768m4trace:configure.ac:1101: -1- m4_pattern_allow([^HAVE_XSM_TRUE$])2768m4trace:configure.ac:1113: -1- _AM_SUBST_NOTMAKE([WITH_KERNEL_MODULES_TRUE])
2769m4trace:configure.ac:1101: -1- m4_pattern_allow([^HAVE_XSM_FALSE$])2769m4trace:configure.ac:1113: -1- _AM_SUBST_NOTMAKE([WITH_KERNEL_MODULES_FALSE])
2770m4trace:configure.ac:1101: -1- _AM_SUBST_NOTMAKE([HAVE_XSM_TRUE])2770m4trace:configure.ac:1114: -1- AM_CONDITIONAL([HAVE_XSM], [test "$have_xsm" = "yes"])
2771m4trace:configure.ac:1101: -1- _AM_SUBST_NOTMAKE([HAVE_XSM_FALSE])2771m4trace:configure.ac:1114: -1- m4_pattern_allow([^HAVE_XSM_TRUE$])
2772m4trace:configure.ac:1102: -1- AM_CONDITIONAL([HAVE_XCOMPOSITE], [test "$have_xcomposite" = "yes"])2772m4trace:configure.ac:1114: -1- m4_pattern_allow([^HAVE_XSM_FALSE$])
2773m4trace:configure.ac:1102: -1- m4_pattern_allow([^HAVE_XCOMPOSITE_TRUE$])2773m4trace:configure.ac:1114: -1- _AM_SUBST_NOTMAKE([HAVE_XSM_TRUE])
2774m4trace:configure.ac:1102: -1- m4_pattern_allow([^HAVE_XCOMPOSITE_FALSE$])2774m4trace:configure.ac:1114: -1- _AM_SUBST_NOTMAKE([HAVE_XSM_FALSE])
2775m4trace:configure.ac:1102: -1- _AM_SUBST_NOTMAKE([HAVE_XCOMPOSITE_TRUE])2775m4trace:configure.ac:1115: -1- AM_CONDITIONAL([HAVE_XCOMPOSITE], [test "$have_xcomposite" = "yes"])
2776m4trace:configure.ac:1102: -1- _AM_SUBST_NOTMAKE([HAVE_XCOMPOSITE_FALSE])2776m4trace:configure.ac:1115: -1- m4_pattern_allow([^HAVE_XCOMPOSITE_TRUE$])
2777m4trace:configure.ac:1103: -1- AM_CONDITIONAL([ENABLE_UNITY], [test "$enable_unity" = "yes"])2777m4trace:configure.ac:1115: -1- m4_pattern_allow([^HAVE_XCOMPOSITE_FALSE$])
2778m4trace:configure.ac:1103: -1- m4_pattern_allow([^ENABLE_UNITY_TRUE$])2778m4trace:configure.ac:1115: -1- _AM_SUBST_NOTMAKE([HAVE_XCOMPOSITE_TRUE])
2779m4trace:configure.ac:1103: -1- m4_pattern_allow([^ENABLE_UNITY_FALSE$])2779m4trace:configure.ac:1115: -1- _AM_SUBST_NOTMAKE([HAVE_XCOMPOSITE_FALSE])
2780m4trace:configure.ac:1103: -1- _AM_SUBST_NOTMAKE([ENABLE_UNITY_TRUE])2780m4trace:configure.ac:1116: -1- AM_CONDITIONAL([ENABLE_UNITY], [test "$enable_unity" = "yes"])
2781m4trace:configure.ac:1103: -1- _AM_SUBST_NOTMAKE([ENABLE_UNITY_FALSE])2781m4trace:configure.ac:1116: -1- m4_pattern_allow([^ENABLE_UNITY_TRUE$])
2782m4trace:configure.ac:1104: -1- AM_CONDITIONAL([ENABLE_TESTS], [test "$have_cunit" = "yes"])2782m4trace:configure.ac:1116: -1- m4_pattern_allow([^ENABLE_UNITY_FALSE$])
2783m4trace:configure.ac:1104: -1- m4_pattern_allow([^ENABLE_TESTS_TRUE$])2783m4trace:configure.ac:1116: -1- _AM_SUBST_NOTMAKE([ENABLE_UNITY_TRUE])
2784m4trace:configure.ac:1104: -1- m4_pattern_allow([^ENABLE_TESTS_FALSE$])2784m4trace:configure.ac:1116: -1- _AM_SUBST_NOTMAKE([ENABLE_UNITY_FALSE])
2785m4trace:configure.ac:1104: -1- _AM_SUBST_NOTMAKE([ENABLE_TESTS_TRUE])2785m4trace:configure.ac:1117: -1- AM_CONDITIONAL([ENABLE_TESTS], [test "$have_cunit" = "yes"])
2786m4trace:configure.ac:1104: -1- _AM_SUBST_NOTMAKE([ENABLE_TESTS_FALSE])2786m4trace:configure.ac:1117: -1- m4_pattern_allow([^ENABLE_TESTS_TRUE$])
2787m4trace:configure.ac:1105: -1- AM_CONDITIONAL([WITH_ROOT_PRIVILEGES], [test "$with_root_privileges" = "yes"])2787m4trace:configure.ac:1117: -1- m4_pattern_allow([^ENABLE_TESTS_FALSE$])
2788m4trace:configure.ac:1105: -1- m4_pattern_allow([^WITH_ROOT_PRIVILEGES_TRUE$])2788m4trace:configure.ac:1117: -1- _AM_SUBST_NOTMAKE([ENABLE_TESTS_TRUE])
2789m4trace:configure.ac:1105: -1- m4_pattern_allow([^WITH_ROOT_PRIVILEGES_FALSE$])2789m4trace:configure.ac:1117: -1- _AM_SUBST_NOTMAKE([ENABLE_TESTS_FALSE])
2790m4trace:configure.ac:1105: -1- _AM_SUBST_NOTMAKE([WITH_ROOT_PRIVILEGES_TRUE])2790m4trace:configure.ac:1118: -1- AM_CONDITIONAL([WITH_ROOT_PRIVILEGES], [test "$with_root_privileges" = "yes"])
2791m4trace:configure.ac:1105: -1- _AM_SUBST_NOTMAKE([WITH_ROOT_PRIVILEGES_FALSE])2791m4trace:configure.ac:1118: -1- m4_pattern_allow([^WITH_ROOT_PRIVILEGES_TRUE$])
2792m4trace:configure.ac:1106: -1- AM_CONDITIONAL([HAVE_DNET], [test "$have_dnet" = "yes"])2792m4trace:configure.ac:1118: -1- m4_pattern_allow([^WITH_ROOT_PRIVILEGES_FALSE$])
2793m4trace:configure.ac:1106: -1- m4_pattern_allow([^HAVE_DNET_TRUE$])2793m4trace:configure.ac:1118: -1- _AM_SUBST_NOTMAKE([WITH_ROOT_PRIVILEGES_TRUE])
2794m4trace:configure.ac:1106: -1- m4_pattern_allow([^HAVE_DNET_FALSE$])2794m4trace:configure.ac:1118: -1- _AM_SUBST_NOTMAKE([WITH_ROOT_PRIVILEGES_FALSE])
2795m4trace:configure.ac:1106: -1- _AM_SUBST_NOTMAKE([HAVE_DNET_TRUE])2795m4trace:configure.ac:1119: -1- AM_CONDITIONAL([HAVE_DNET], [test "$have_dnet" = "yes"])
2796m4trace:configure.ac:1106: -1- _AM_SUBST_NOTMAKE([HAVE_DNET_FALSE])2796m4trace:configure.ac:1119: -1- m4_pattern_allow([^HAVE_DNET_TRUE$])
2797m4trace:configure.ac:1107: -1- AM_CONDITIONAL([HAVE_DOXYGEN], [test "$have_doxygen" = "yes"])2797m4trace:configure.ac:1119: -1- m4_pattern_allow([^HAVE_DNET_FALSE$])
2798m4trace:configure.ac:1107: -1- m4_pattern_allow([^HAVE_DOXYGEN_TRUE$])2798m4trace:configure.ac:1119: -1- _AM_SUBST_NOTMAKE([HAVE_DNET_TRUE])
2799m4trace:configure.ac:1107: -1- m4_pattern_allow([^HAVE_DOXYGEN_FALSE$])2799m4trace:configure.ac:1119: -1- _AM_SUBST_NOTMAKE([HAVE_DNET_FALSE])
2800m4trace:configure.ac:1107: -1- _AM_SUBST_NOTMAKE([HAVE_DOXYGEN_TRUE])2800m4trace:configure.ac:1120: -1- AM_CONDITIONAL([HAVE_DOXYGEN], [test "$have_doxygen" = "yes"])
2801m4trace:configure.ac:1107: -1- _AM_SUBST_NOTMAKE([HAVE_DOXYGEN_FALSE])2801m4trace:configure.ac:1120: -1- m4_pattern_allow([^HAVE_DOXYGEN_TRUE$])
2802m4trace:configure.ac:1108: -1- AM_CONDITIONAL([HAVE_FUSE], [test "$have_fuse" = "yes"])2802m4trace:configure.ac:1120: -1- m4_pattern_allow([^HAVE_DOXYGEN_FALSE$])
2803m4trace:configure.ac:1108: -1- m4_pattern_allow([^HAVE_FUSE_TRUE$])2803m4trace:configure.ac:1120: -1- _AM_SUBST_NOTMAKE([HAVE_DOXYGEN_TRUE])
2804m4trace:configure.ac:1108: -1- m4_pattern_allow([^HAVE_FUSE_FALSE$])2804m4trace:configure.ac:1120: -1- _AM_SUBST_NOTMAKE([HAVE_DOXYGEN_FALSE])
2805m4trace:configure.ac:1108: -1- _AM_SUBST_NOTMAKE([HAVE_FUSE_TRUE])2805m4trace:configure.ac:1121: -1- AM_CONDITIONAL([HAVE_FUSE], [test "$have_fuse" = "yes"])
2806m4trace:configure.ac:1108: -1- _AM_SUBST_NOTMAKE([HAVE_FUSE_FALSE])2806m4trace:configure.ac:1121: -1- m4_pattern_allow([^HAVE_FUSE_TRUE$])
2807m4trace:configure.ac:1109: -1- AM_CONDITIONAL([HAVE_GNU_LD], [test "$with_gnu_ld" = "yes"])2807m4trace:configure.ac:1121: -1- m4_pattern_allow([^HAVE_FUSE_FALSE$])
2808m4trace:configure.ac:1109: -1- m4_pattern_allow([^HAVE_GNU_LD_TRUE$])2808m4trace:configure.ac:1121: -1- _AM_SUBST_NOTMAKE([HAVE_FUSE_TRUE])
2809m4trace:configure.ac:1109: -1- m4_pattern_allow([^HAVE_GNU_LD_FALSE$])2809m4trace:configure.ac:1121: -1- _AM_SUBST_NOTMAKE([HAVE_FUSE_FALSE])
2810m4trace:configure.ac:1109: -1- _AM_SUBST_NOTMAKE([HAVE_GNU_LD_TRUE])2810m4trace:configure.ac:1122: -1- AM_CONDITIONAL([HAVE_GNU_LD], [test "$with_gnu_ld" = "yes"])
2811m4trace:configure.ac:1109: -1- _AM_SUBST_NOTMAKE([HAVE_GNU_LD_FALSE])2811m4trace:configure.ac:1122: -1- m4_pattern_allow([^HAVE_GNU_LD_TRUE$])
2812m4trace:configure.ac:1110: -1- AM_CONDITIONAL([HAVE_GTKMM], [test "$have_x" = "yes" -a "$with_gtkmm" = "yes"])2812m4trace:configure.ac:1122: -1- m4_pattern_allow([^HAVE_GNU_LD_FALSE$])
2813m4trace:configure.ac:1110: -1- m4_pattern_allow([^HAVE_GTKMM_TRUE$])2813m4trace:configure.ac:1122: -1- _AM_SUBST_NOTMAKE([HAVE_GNU_LD_TRUE])
2814m4trace:configure.ac:1110: -1- m4_pattern_allow([^HAVE_GTKMM_FALSE$])2814m4trace:configure.ac:1122: -1- _AM_SUBST_NOTMAKE([HAVE_GNU_LD_FALSE])
2815m4trace:configure.ac:1110: -1- _AM_SUBST_NOTMAKE([HAVE_GTKMM_TRUE])2815m4trace:configure.ac:1123: -1- AM_CONDITIONAL([HAVE_GTKMM], [test "$have_x" = "yes" -a "$with_gtkmm" = "yes"])
2816m4trace:configure.ac:1110: -1- _AM_SUBST_NOTMAKE([HAVE_GTKMM_FALSE])2816m4trace:configure.ac:1123: -1- m4_pattern_allow([^HAVE_GTKMM_TRUE$])
2817m4trace:configure.ac:1111: -1- AM_CONDITIONAL([HAVE_PAM], [test "$with_pam" = "yes"])2817m4trace:configure.ac:1123: -1- m4_pattern_allow([^HAVE_GTKMM_FALSE$])
2818m4trace:configure.ac:1111: -1- m4_pattern_allow([^HAVE_PAM_TRUE$])2818m4trace:configure.ac:1123: -1- _AM_SUBST_NOTMAKE([HAVE_GTKMM_TRUE])
2819m4trace:configure.ac:1111: -1- m4_pattern_allow([^HAVE_PAM_FALSE$])2819m4trace:configure.ac:1123: -1- _AM_SUBST_NOTMAKE([HAVE_GTKMM_FALSE])
2820m4trace:configure.ac:1111: -1- _AM_SUBST_NOTMAKE([HAVE_PAM_TRUE])2820m4trace:configure.ac:1124: -1- AM_CONDITIONAL([HAVE_PAM], [test "$with_pam" = "yes"])
2821m4trace:configure.ac:1111: -1- _AM_SUBST_NOTMAKE([HAVE_PAM_FALSE])2821m4trace:configure.ac:1124: -1- m4_pattern_allow([^HAVE_PAM_TRUE$])
2822m4trace:configure.ac:1112: -1- AM_CONDITIONAL([USE_SLASH_PROC], [test "os" = "linux" -a "$have_glib_2_14" = "yes"])2822m4trace:configure.ac:1124: -1- m4_pattern_allow([^HAVE_PAM_FALSE$])
2823m4trace:configure.ac:1112: -1- m4_pattern_allow([^USE_SLASH_PROC_TRUE$])2823m4trace:configure.ac:1124: -1- _AM_SUBST_NOTMAKE([HAVE_PAM_TRUE])
2824m4trace:configure.ac:1112: -1- m4_pattern_allow([^USE_SLASH_PROC_FALSE$])2824m4trace:configure.ac:1124: -1- _AM_SUBST_NOTMAKE([HAVE_PAM_FALSE])
2825m4trace:configure.ac:1112: -1- _AM_SUBST_NOTMAKE([USE_SLASH_PROC_TRUE])2825m4trace:configure.ac:1125: -1- AM_CONDITIONAL([USE_SLASH_PROC], [test "os" = "linux" -a "$have_glib_2_14" = "yes"])
2826m4trace:configure.ac:1112: -1- _AM_SUBST_NOTMAKE([USE_SLASH_PROC_FALSE])2826m4trace:configure.ac:1125: -1- m4_pattern_allow([^USE_SLASH_PROC_TRUE$])
2827m4trace:configure.ac:1115: -1- m4_pattern_allow([^NO_XSM$])2827m4trace:configure.ac:1125: -1- m4_pattern_allow([^USE_SLASH_PROC_FALSE$])
2828m4trace:configure.ac:1119: -1- m4_pattern_allow([^NO_XCOMPOSITE$])2828m4trace:configure.ac:1125: -1- _AM_SUBST_NOTMAKE([USE_SLASH_PROC_TRUE])
2829m4trace:configure.ac:1131: -1- m4_pattern_allow([^NO_MULTIMON$])2829m4trace:configure.ac:1125: -1- _AM_SUBST_NOTMAKE([USE_SLASH_PROC_FALSE])
2830m4trace:configure.ac:1173: -1- m4_pattern_allow([^HGFS_LIBS$])2830m4trace:configure.ac:1128: -1- m4_pattern_allow([^NO_XSM$])
2831m4trace:configure.ac:1174: -1- m4_pattern_allow([^TOOLS_VERSION$])2831m4trace:configure.ac:1132: -1- m4_pattern_allow([^NO_XCOMPOSITE$])
2832m4trace:configure.ac:1175: -1- m4_pattern_allow([^TARGET_OS$])2832m4trace:configure.ac:1144: -1- m4_pattern_allow([^NO_MULTIMON$])
2833m4trace:configure.ac:1176: -1- m4_pattern_allow([^KERNEL_RELEASE$])2833m4trace:configure.ac:1186: -1- m4_pattern_allow([^HGFS_LIBS$])
2834m4trace:configure.ac:1177: -1- m4_pattern_allow([^LINUXINCLUDE$])2834m4trace:configure.ac:1187: -1- m4_pattern_allow([^TOOLS_VERSION$])
2835m4trace:configure.ac:1178: -1- m4_pattern_allow([^MODULES_OS$])2835m4trace:configure.ac:1188: -1- m4_pattern_allow([^TARGET_OS$])
2836m4trace:configure.ac:1179: -1- m4_pattern_allow([^MODULES_DIR$])2836m4trace:configure.ac:1189: -1- m4_pattern_allow([^KERNEL_RELEASE$])
2837m4trace:configure.ac:1180: -1- m4_pattern_allow([^MODULES$])2837m4trace:configure.ac:1190: -1- m4_pattern_allow([^LINUXINCLUDE$])
2838m4trace:configure.ac:1181: -1- m4_pattern_allow([^COMMON_XLIBS$])2838m4trace:configure.ac:1191: -1- m4_pattern_allow([^MODULES_OS$])
2839m4trace:configure.ac:1182: -1- m4_pattern_allow([^XSM_LIBS$])2839m4trace:configure.ac:1192: -1- m4_pattern_allow([^MODULES_DIR$])
2840m4trace:configure.ac:1183: -1- m4_pattern_allow([^XCOMPOSITE_LIBS$])2840m4trace:configure.ac:1193: -1- m4_pattern_allow([^MODULES$])
2841m4trace:configure.ac:1184: -1- m4_pattern_allow([^PAM_PREFIX$])2841m4trace:configure.ac:1194: -1- m4_pattern_allow([^COMMON_XLIBS$])
2842m4trace:configure.ac:1185: -1- m4_pattern_allow([^PLUGIN_CPPFLAGS$])2842m4trace:configure.ac:1195: -1- m4_pattern_allow([^XSM_LIBS$])
2843m4trace:configure.ac:1186: -1- m4_pattern_allow([^PLUGIN_LDFLAGS$])2843m4trace:configure.ac:1196: -1- m4_pattern_allow([^XCOMPOSITE_LIBS$])
2844m4trace:configure.ac:1187: -1- m4_pattern_allow([^VMTOOLS_CPPFLAGS$])2844m4trace:configure.ac:1197: -1- m4_pattern_allow([^PAM_PREFIX$])
2845m4trace:configure.ac:1188: -1- m4_pattern_allow([^VMTOOLS_LIBS$])2845m4trace:configure.ac:1198: -1- m4_pattern_allow([^PLUGIN_CPPFLAGS$])
2846m4trace:configure.ac:1189: -1- m4_pattern_allow([^RPCGENFLAGS$])2846m4trace:configure.ac:1199: -1- m4_pattern_allow([^PLUGIN_LDFLAGS$])
2847m4trace:configure.ac:1190: -1- m4_pattern_allow([^XDR_LIBS$])2847m4trace:configure.ac:1200: -1- m4_pattern_allow([^VMTOOLS_CPPFLAGS$])
2848m4trace:configure.ac:1191: -1- m4_pattern_allow([^TEST_PLUGIN_INSTALLDIR$])2848m4trace:configure.ac:1201: -1- m4_pattern_allow([^VMTOOLS_LIBS$])
2849m4trace:configure.ac:1192: -1- m4_pattern_allow([^COMMON_PLUGIN_INSTALLDIR$])2849m4trace:configure.ac:1202: -1- m4_pattern_allow([^RPCGENFLAGS$])
2850m4trace:configure.ac:1193: -1- m4_pattern_allow([^VMSVC_PLUGIN_INSTALLDIR$])2850m4trace:configure.ac:1203: -1- m4_pattern_allow([^XDR_LIBS$])
2851m4trace:configure.ac:1194: -1- m4_pattern_allow([^VMUSR_PLUGIN_INSTALLDIR$])2851m4trace:configure.ac:1204: -1- m4_pattern_allow([^TEST_PLUGIN_INSTALLDIR$])
2852m4trace:configure.ac:1199: -1- m4_pattern_allow([^SYSDIR$])2852m4trace:configure.ac:1205: -1- m4_pattern_allow([^COMMON_PLUGIN_INSTALLDIR$])
2853m4trace:configure.ac:1201: -1- m4_pattern_allow([^INSTVMSG$])2853m4trace:configure.ac:1206: -1- m4_pattern_allow([^VMSVC_PLUGIN_INSTALLDIR$])
2854m4trace:configure.ac:1202: -1- m4_pattern_allow([^RPCGEN_WRAPPER$])2854m4trace:configure.ac:1207: -1- m4_pattern_allow([^VMUSR_PLUGIN_INSTALLDIR$])
2855m4trace:configure.ac:1206: -1- m4_pattern_allow([^LIB_AUTH_CPPFLAGS$])2855m4trace:configure.ac:1212: -1- m4_pattern_allow([^SYSDIR$])
2856m4trace:configure.ac:1207: -1- m4_pattern_allow([^LIB_IMPERSONATE_CPPFLAGS$])2856m4trace:configure.ac:1214: -1- m4_pattern_allow([^INSTVMSG$])
2857m4trace:configure.ac:1208: -1- m4_pattern_allow([^LIB_USER_CPPFLAGS$])2857m4trace:configure.ac:1215: -1- m4_pattern_allow([^RPCGEN_WRAPPER$])
2858m4trace:configure.ac:1209: -1- m4_pattern_allow([^LIBVMTOOLS_LIBADD$])2858m4trace:configure.ac:1219: -1- m4_pattern_allow([^LIB_AUTH_CPPFLAGS$])
2859m4trace:configure.ac:1213: -1- m4_pattern_allow([^VIX_LIBADD$])2859m4trace:configure.ac:1220: -1- m4_pattern_allow([^LIB_IMPERSONATE_CPPFLAGS$])
2860m4trace:configure.ac:1306: -1- m4_pattern_allow([^LIB@&t@OBJS$])2860m4trace:configure.ac:1221: -1- m4_pattern_allow([^LIB_USER_CPPFLAGS$])
2861m4trace:configure.ac:1306: -1- m4_pattern_allow([^LTLIBOBJS$])2861m4trace:configure.ac:1222: -1- m4_pattern_allow([^LIBVMTOOLS_LIBADD$])
2862m4trace:configure.ac:1306: -1- AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])2862m4trace:configure.ac:1226: -1- m4_pattern_allow([^VIX_LIBADD$])
2863m4trace:configure.ac:1306: -1- m4_pattern_allow([^am__EXEEXT_TRUE$])2863m4trace:configure.ac:1319: -1- m4_pattern_allow([^LIB@&t@OBJS$])
2864m4trace:configure.ac:1306: -1- m4_pattern_allow([^am__EXEEXT_FALSE$])2864m4trace:configure.ac:1319: -1- m4_pattern_allow([^LTLIBOBJS$])
2865m4trace:configure.ac:1306: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_TRUE])2865m4trace:configure.ac:1319: -1- AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])
2866m4trace:configure.ac:1306: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_FALSE])2866m4trace:configure.ac:1319: -1- m4_pattern_allow([^am__EXEEXT_TRUE$])
2867m4trace:configure.ac:1306: -1- _AM_OUTPUT_DEPENDENCY_COMMANDS2867m4trace:configure.ac:1319: -1- m4_pattern_allow([^am__EXEEXT_FALSE$])
2868m4trace:configure.ac:1306: -1- _LT_PROG_LTMAIN2868m4trace:configure.ac:1319: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_TRUE])
2869m4trace:configure.ac:1319: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_FALSE])
2870m4trace:configure.ac:1319: -1- _AM_OUTPUT_DEPENDENCY_COMMANDS
2871m4trace:configure.ac:1319: -1- _LT_PROG_LTMAIN
28692872
=== modified file 'autom4te.cache/traces.1'
--- autom4te.cache/traces.1 2011-07-22 16:41:03 +0000
+++ autom4te.cache/traces.1 2011-10-31 00:22:23 +0000
@@ -4,7 +4,7 @@
4m4trace:aclocal.m4:990: -1- m4_include([m4/ltversion.m4])4m4trace:aclocal.m4:990: -1- m4_include([m4/ltversion.m4])
5m4trace:aclocal.m4:991: -1- m4_include([m4/lt~obsolete.m4])5m4trace:aclocal.m4:991: -1- m4_include([m4/lt~obsolete.m4])
6m4trace:aclocal.m4:992: -1- m4_include([m4/vmtools.m4])6m4trace:aclocal.m4:992: -1- m4_include([m4/vmtools.m4])
7m4trace:configure.ac:43: -1- AC_INIT([open-vm-tools], [2011.07.19], [open-vm-tools-devel@lists.sourceforge.net])7m4trace:configure.ac:43: -1- AC_INIT([open-vm-tools], [2011.08.21], [open-vm-tools-devel@lists.sourceforge.net])
8m4trace:configure.ac:43: -1- m4_pattern_forbid([^_?A[CHUM]_])8m4trace:configure.ac:43: -1- m4_pattern_forbid([^_?A[CHUM]_])
9m4trace:configure.ac:43: -1- m4_pattern_forbid([_AC_])9m4trace:configure.ac:43: -1- m4_pattern_forbid([_AC_])
10m4trace:configure.ac:43: -1- m4_pattern_forbid([^LIBOBJS$], [do not use LIBOBJS directly, use AC_LIBOBJ (see section `AC_LIBOBJ vs LIBOBJS'])10m4trace:configure.ac:43: -1- m4_pattern_forbid([^LIBOBJS$], [do not use LIBOBJS directly, use AC_LIBOBJ (see section `AC_LIBOBJ vs LIBOBJS'])
@@ -959,312 +959,315 @@
959m4trace:configure.ac:950: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.959m4trace:configure.ac:950: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
960You should run autoupdate.], [../../lib/autoconf/general.m4:2602: AC_TRY_COMPILE is expanded from...960You should run autoupdate.], [../../lib/autoconf/general.m4:2602: AC_TRY_COMPILE is expanded from...
961configure.ac:950: the top level])961configure.ac:950: the top level])
962m4trace:configure.ac:968: -1- AC_SUBST([have_doxygen])962m4trace:configure.ac:961: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
963m4trace:configure.ac:968: -1- AC_SUBST_TRACE([have_doxygen])963You should run autoupdate.], [../../lib/autoconf/general.m4:2602: AC_TRY_COMPILE is expanded from...
964m4trace:configure.ac:968: -1- m4_pattern_allow([^have_doxygen$])964configure.ac:961: the top level])
965m4trace:configure.ac:975: -1- AC_SUBST([DOT])965m4trace:configure.ac:980: -1- AC_SUBST([have_doxygen])
966m4trace:configure.ac:975: -1- AC_SUBST_TRACE([DOT])966m4trace:configure.ac:980: -1- AC_SUBST_TRACE([have_doxygen])
967m4trace:configure.ac:975: -1- m4_pattern_allow([^DOT$])967m4trace:configure.ac:980: -1- m4_pattern_allow([^have_doxygen$])
968m4trace:configure.ac:982: -1- AC_SUBST([DOT])968m4trace:configure.ac:987: -1- AC_SUBST([DOT])
969m4trace:configure.ac:982: -1- AC_SUBST_TRACE([DOT])969m4trace:configure.ac:987: -1- AC_SUBST_TRACE([DOT])
970m4trace:configure.ac:982: -1- m4_pattern_allow([^DOT$])970m4trace:configure.ac:987: -1- m4_pattern_allow([^DOT$])
971m4trace:configure.ac:983: -1- AC_SUBST([HAVE_DOT])971m4trace:configure.ac:994: -1- AC_SUBST([DOT])
972m4trace:configure.ac:983: -1- AC_SUBST_TRACE([HAVE_DOT])972m4trace:configure.ac:994: -1- AC_SUBST_TRACE([DOT])
973m4trace:configure.ac:983: -1- m4_pattern_allow([^HAVE_DOT$])973m4trace:configure.ac:994: -1- m4_pattern_allow([^DOT$])
974m4trace:configure.ac:985: -1- AC_SUBST([MSCGEN])974m4trace:configure.ac:995: -1- AC_SUBST([HAVE_DOT])
975m4trace:configure.ac:985: -1- AC_SUBST_TRACE([MSCGEN])975m4trace:configure.ac:995: -1- AC_SUBST_TRACE([HAVE_DOT])
976m4trace:configure.ac:985: -1- m4_pattern_allow([^MSCGEN$])976m4trace:configure.ac:995: -1- m4_pattern_allow([^HAVE_DOT$])
977m4trace:configure.ac:993: -1- AC_SUBST([MSCGEN_DIR])977m4trace:configure.ac:997: -1- AC_SUBST([MSCGEN])
978m4trace:configure.ac:993: -1- AC_SUBST_TRACE([MSCGEN_DIR])978m4trace:configure.ac:997: -1- AC_SUBST_TRACE([MSCGEN])
979m4trace:configure.ac:993: -1- m4_pattern_allow([^MSCGEN_DIR$])979m4trace:configure.ac:997: -1- m4_pattern_allow([^MSCGEN$])
980m4trace:configure.ac:1092: -1- AM_CONDITIONAL([BUILD_HGFSMOUNTER], [test "$buildHgfsmounter" = "yes"])980m4trace:configure.ac:1005: -1- AC_SUBST([MSCGEN_DIR])
981m4trace:configure.ac:1092: -1- AC_SUBST([BUILD_HGFSMOUNTER_TRUE])981m4trace:configure.ac:1005: -1- AC_SUBST_TRACE([MSCGEN_DIR])
982m4trace:configure.ac:1092: -1- AC_SUBST_TRACE([BUILD_HGFSMOUNTER_TRUE])982m4trace:configure.ac:1005: -1- m4_pattern_allow([^MSCGEN_DIR$])
983m4trace:configure.ac:1092: -1- m4_pattern_allow([^BUILD_HGFSMOUNTER_TRUE$])983m4trace:configure.ac:1105: -1- AM_CONDITIONAL([BUILD_HGFSMOUNTER], [test "$buildHgfsmounter" = "yes"])
984m4trace:configure.ac:1092: -1- AC_SUBST([BUILD_HGFSMOUNTER_FALSE])984m4trace:configure.ac:1105: -1- AC_SUBST([BUILD_HGFSMOUNTER_TRUE])
985m4trace:configure.ac:1092: -1- AC_SUBST_TRACE([BUILD_HGFSMOUNTER_FALSE])985m4trace:configure.ac:1105: -1- AC_SUBST_TRACE([BUILD_HGFSMOUNTER_TRUE])
986m4trace:configure.ac:1092: -1- m4_pattern_allow([^BUILD_HGFSMOUNTER_FALSE$])986m4trace:configure.ac:1105: -1- m4_pattern_allow([^BUILD_HGFSMOUNTER_TRUE$])
987m4trace:configure.ac:1092: -1- _AM_SUBST_NOTMAKE([BUILD_HGFSMOUNTER_TRUE])987m4trace:configure.ac:1105: -1- AC_SUBST([BUILD_HGFSMOUNTER_FALSE])
988m4trace:configure.ac:1092: -1- _AM_SUBST_NOTMAKE([BUILD_HGFSMOUNTER_FALSE])988m4trace:configure.ac:1105: -1- AC_SUBST_TRACE([BUILD_HGFSMOUNTER_FALSE])
989m4trace:configure.ac:1093: -1- AM_CONDITIONAL([LINUX], [test "$os" = "linux"])989m4trace:configure.ac:1105: -1- m4_pattern_allow([^BUILD_HGFSMOUNTER_FALSE$])
990m4trace:configure.ac:1093: -1- AC_SUBST([LINUX_TRUE])990m4trace:configure.ac:1105: -1- _AM_SUBST_NOTMAKE([BUILD_HGFSMOUNTER_TRUE])
991m4trace:configure.ac:1093: -1- AC_SUBST_TRACE([LINUX_TRUE])991m4trace:configure.ac:1105: -1- _AM_SUBST_NOTMAKE([BUILD_HGFSMOUNTER_FALSE])
992m4trace:configure.ac:1093: -1- m4_pattern_allow([^LINUX_TRUE$])992m4trace:configure.ac:1106: -1- AM_CONDITIONAL([LINUX], [test "$os" = "linux"])
993m4trace:configure.ac:1093: -1- AC_SUBST([LINUX_FALSE])993m4trace:configure.ac:1106: -1- AC_SUBST([LINUX_TRUE])
994m4trace:configure.ac:1093: -1- AC_SUBST_TRACE([LINUX_FALSE])994m4trace:configure.ac:1106: -1- AC_SUBST_TRACE([LINUX_TRUE])
995m4trace:configure.ac:1093: -1- m4_pattern_allow([^LINUX_FALSE$])995m4trace:configure.ac:1106: -1- m4_pattern_allow([^LINUX_TRUE$])
996m4trace:configure.ac:1093: -1- _AM_SUBST_NOTMAKE([LINUX_TRUE])996m4trace:configure.ac:1106: -1- AC_SUBST([LINUX_FALSE])
997m4trace:configure.ac:1093: -1- _AM_SUBST_NOTMAKE([LINUX_FALSE])997m4trace:configure.ac:1106: -1- AC_SUBST_TRACE([LINUX_FALSE])
998m4trace:configure.ac:1094: -1- AM_CONDITIONAL([SOLARIS], [test "$os" = "solaris"])998m4trace:configure.ac:1106: -1- m4_pattern_allow([^LINUX_FALSE$])
999m4trace:configure.ac:1094: -1- AC_SUBST([SOLARIS_TRUE])999m4trace:configure.ac:1106: -1- _AM_SUBST_NOTMAKE([LINUX_TRUE])
1000m4trace:configure.ac:1094: -1- AC_SUBST_TRACE([SOLARIS_TRUE])1000m4trace:configure.ac:1106: -1- _AM_SUBST_NOTMAKE([LINUX_FALSE])
1001m4trace:configure.ac:1094: -1- m4_pattern_allow([^SOLARIS_TRUE$])1001m4trace:configure.ac:1107: -1- AM_CONDITIONAL([SOLARIS], [test "$os" = "solaris"])
1002m4trace:configure.ac:1094: -1- AC_SUBST([SOLARIS_FALSE])1002m4trace:configure.ac:1107: -1- AC_SUBST([SOLARIS_TRUE])
1003m4trace:configure.ac:1094: -1- AC_SUBST_TRACE([SOLARIS_FALSE])1003m4trace:configure.ac:1107: -1- AC_SUBST_TRACE([SOLARIS_TRUE])
1004m4trace:configure.ac:1094: -1- m4_pattern_allow([^SOLARIS_FALSE$])1004m4trace:configure.ac:1107: -1- m4_pattern_allow([^SOLARIS_TRUE$])
1005m4trace:configure.ac:1094: -1- _AM_SUBST_NOTMAKE([SOLARIS_TRUE])1005m4trace:configure.ac:1107: -1- AC_SUBST([SOLARIS_FALSE])
1006m4trace:configure.ac:1094: -1- _AM_SUBST_NOTMAKE([SOLARIS_FALSE])1006m4trace:configure.ac:1107: -1- AC_SUBST_TRACE([SOLARIS_FALSE])
1007m4trace:configure.ac:1095: -1- AM_CONDITIONAL([FREEBSD], [test "$os" = "freebsd"])1007m4trace:configure.ac:1107: -1- m4_pattern_allow([^SOLARIS_FALSE$])
1008m4trace:configure.ac:1095: -1- AC_SUBST([FREEBSD_TRUE])1008m4trace:configure.ac:1107: -1- _AM_SUBST_NOTMAKE([SOLARIS_TRUE])
1009m4trace:configure.ac:1095: -1- AC_SUBST_TRACE([FREEBSD_TRUE])1009m4trace:configure.ac:1107: -1- _AM_SUBST_NOTMAKE([SOLARIS_FALSE])
1010m4trace:configure.ac:1095: -1- m4_pattern_allow([^FREEBSD_TRUE$])1010m4trace:configure.ac:1108: -1- AM_CONDITIONAL([FREEBSD], [test "$os" = "freebsd"])
1011m4trace:configure.ac:1095: -1- AC_SUBST([FREEBSD_FALSE])1011m4trace:configure.ac:1108: -1- AC_SUBST([FREEBSD_TRUE])
1012m4trace:configure.ac:1095: -1- AC_SUBST_TRACE([FREEBSD_FALSE])1012m4trace:configure.ac:1108: -1- AC_SUBST_TRACE([FREEBSD_TRUE])
1013m4trace:configure.ac:1095: -1- m4_pattern_allow([^FREEBSD_FALSE$])1013m4trace:configure.ac:1108: -1- m4_pattern_allow([^FREEBSD_TRUE$])
1014m4trace:configure.ac:1095: -1- _AM_SUBST_NOTMAKE([FREEBSD_TRUE])1014m4trace:configure.ac:1108: -1- AC_SUBST([FREEBSD_FALSE])
1015m4trace:configure.ac:1095: -1- _AM_SUBST_NOTMAKE([FREEBSD_FALSE])1015m4trace:configure.ac:1108: -1- AC_SUBST_TRACE([FREEBSD_FALSE])
1016m4trace:configure.ac:1096: -1- AM_CONDITIONAL([FREEBSD_CUSTOM_SYSDIR], [test "$os" = "freebsd" -a -n "$SYSDIR"])1016m4trace:configure.ac:1108: -1- m4_pattern_allow([^FREEBSD_FALSE$])
1017m4trace:configure.ac:1096: -1- AC_SUBST([FREEBSD_CUSTOM_SYSDIR_TRUE])1017m4trace:configure.ac:1108: -1- _AM_SUBST_NOTMAKE([FREEBSD_TRUE])
1018m4trace:configure.ac:1096: -1- AC_SUBST_TRACE([FREEBSD_CUSTOM_SYSDIR_TRUE])1018m4trace:configure.ac:1108: -1- _AM_SUBST_NOTMAKE([FREEBSD_FALSE])
1019m4trace:configure.ac:1096: -1- m4_pattern_allow([^FREEBSD_CUSTOM_SYSDIR_TRUE$])1019m4trace:configure.ac:1109: -1- AM_CONDITIONAL([FREEBSD_CUSTOM_SYSDIR], [test "$os" = "freebsd" -a -n "$SYSDIR"])
1020m4trace:configure.ac:1096: -1- AC_SUBST([FREEBSD_CUSTOM_SYSDIR_FALSE])1020m4trace:configure.ac:1109: -1- AC_SUBST([FREEBSD_CUSTOM_SYSDIR_TRUE])
1021m4trace:configure.ac:1096: -1- AC_SUBST_TRACE([FREEBSD_CUSTOM_SYSDIR_FALSE])1021m4trace:configure.ac:1109: -1- AC_SUBST_TRACE([FREEBSD_CUSTOM_SYSDIR_TRUE])
1022m4trace:configure.ac:1096: -1- m4_pattern_allow([^FREEBSD_CUSTOM_SYSDIR_FALSE$])1022m4trace:configure.ac:1109: -1- m4_pattern_allow([^FREEBSD_CUSTOM_SYSDIR_TRUE$])
1023m4trace:configure.ac:1096: -1- _AM_SUBST_NOTMAKE([FREEBSD_CUSTOM_SYSDIR_TRUE])1023m4trace:configure.ac:1109: -1- AC_SUBST([FREEBSD_CUSTOM_SYSDIR_FALSE])
1024m4trace:configure.ac:1096: -1- _AM_SUBST_NOTMAKE([FREEBSD_CUSTOM_SYSDIR_FALSE])1024m4trace:configure.ac:1109: -1- AC_SUBST_TRACE([FREEBSD_CUSTOM_SYSDIR_FALSE])
1025m4trace:configure.ac:1097: -1- AM_CONDITIONAL([THIRTY_TWO_BIT_USERSPACE], [test "$userSpaceBitness" = "32"])1025m4trace:configure.ac:1109: -1- m4_pattern_allow([^FREEBSD_CUSTOM_SYSDIR_FALSE$])
1026m4trace:configure.ac:1097: -1- AC_SUBST([THIRTY_TWO_BIT_USERSPACE_TRUE])1026m4trace:configure.ac:1109: -1- _AM_SUBST_NOTMAKE([FREEBSD_CUSTOM_SYSDIR_TRUE])
1027m4trace:configure.ac:1097: -1- AC_SUBST_TRACE([THIRTY_TWO_BIT_USERSPACE_TRUE])1027m4trace:configure.ac:1109: -1- _AM_SUBST_NOTMAKE([FREEBSD_CUSTOM_SYSDIR_FALSE])
1028m4trace:configure.ac:1097: -1- m4_pattern_allow([^THIRTY_TWO_BIT_USERSPACE_TRUE$])1028m4trace:configure.ac:1110: -1- AM_CONDITIONAL([THIRTY_TWO_BIT_USERSPACE], [test "$userSpaceBitness" = "32"])
1029m4trace:configure.ac:1097: -1- AC_SUBST([THIRTY_TWO_BIT_USERSPACE_FALSE])1029m4trace:configure.ac:1110: -1- AC_SUBST([THIRTY_TWO_BIT_USERSPACE_TRUE])
1030m4trace:configure.ac:1097: -1- AC_SUBST_TRACE([THIRTY_TWO_BIT_USERSPACE_FALSE])1030m4trace:configure.ac:1110: -1- AC_SUBST_TRACE([THIRTY_TWO_BIT_USERSPACE_TRUE])
1031m4trace:configure.ac:1097: -1- m4_pattern_allow([^THIRTY_TWO_BIT_USERSPACE_FALSE$])1031m4trace:configure.ac:1110: -1- m4_pattern_allow([^THIRTY_TWO_BIT_USERSPACE_TRUE$])
1032m4trace:configure.ac:1097: -1- _AM_SUBST_NOTMAKE([THIRTY_TWO_BIT_USERSPACE_TRUE])1032m4trace:configure.ac:1110: -1- AC_SUBST([THIRTY_TWO_BIT_USERSPACE_FALSE])
1033m4trace:configure.ac:1097: -1- _AM_SUBST_NOTMAKE([THIRTY_TWO_BIT_USERSPACE_FALSE])1033m4trace:configure.ac:1110: -1- AC_SUBST_TRACE([THIRTY_TWO_BIT_USERSPACE_FALSE])
1034m4trace:configure.ac:1098: -1- AM_CONDITIONAL([HAVE_X11], [test "$have_x" = "yes"])1034m4trace:configure.ac:1110: -1- m4_pattern_allow([^THIRTY_TWO_BIT_USERSPACE_FALSE$])
1035m4trace:configure.ac:1098: -1- AC_SUBST([HAVE_X11_TRUE])1035m4trace:configure.ac:1110: -1- _AM_SUBST_NOTMAKE([THIRTY_TWO_BIT_USERSPACE_TRUE])
1036m4trace:configure.ac:1098: -1- AC_SUBST_TRACE([HAVE_X11_TRUE])1036m4trace:configure.ac:1110: -1- _AM_SUBST_NOTMAKE([THIRTY_TWO_BIT_USERSPACE_FALSE])
1037m4trace:configure.ac:1098: -1- m4_pattern_allow([^HAVE_X11_TRUE$])1037m4trace:configure.ac:1111: -1- AM_CONDITIONAL([HAVE_X11], [test "$have_x" = "yes"])
1038m4trace:configure.ac:1098: -1- AC_SUBST([HAVE_X11_FALSE])1038m4trace:configure.ac:1111: -1- AC_SUBST([HAVE_X11_TRUE])
1039m4trace:configure.ac:1098: -1- AC_SUBST_TRACE([HAVE_X11_FALSE])1039m4trace:configure.ac:1111: -1- AC_SUBST_TRACE([HAVE_X11_TRUE])
1040m4trace:configure.ac:1098: -1- m4_pattern_allow([^HAVE_X11_FALSE$])1040m4trace:configure.ac:1111: -1- m4_pattern_allow([^HAVE_X11_TRUE$])
1041m4trace:configure.ac:1098: -1- _AM_SUBST_NOTMAKE([HAVE_X11_TRUE])1041m4trace:configure.ac:1111: -1- AC_SUBST([HAVE_X11_FALSE])
1042m4trace:configure.ac:1098: -1- _AM_SUBST_NOTMAKE([HAVE_X11_FALSE])1042m4trace:configure.ac:1111: -1- AC_SUBST_TRACE([HAVE_X11_FALSE])
1043m4trace:configure.ac:1099: -1- AM_CONDITIONAL([HAVE_ICU], [test "$with_icu" = "yes"])1043m4trace:configure.ac:1111: -1- m4_pattern_allow([^HAVE_X11_FALSE$])
1044m4trace:configure.ac:1099: -1- AC_SUBST([HAVE_ICU_TRUE])1044m4trace:configure.ac:1111: -1- _AM_SUBST_NOTMAKE([HAVE_X11_TRUE])
1045m4trace:configure.ac:1099: -1- AC_SUBST_TRACE([HAVE_ICU_TRUE])1045m4trace:configure.ac:1111: -1- _AM_SUBST_NOTMAKE([HAVE_X11_FALSE])
1046m4trace:configure.ac:1099: -1- m4_pattern_allow([^HAVE_ICU_TRUE$])1046m4trace:configure.ac:1112: -1- AM_CONDITIONAL([HAVE_ICU], [test "$with_icu" = "yes"])
1047m4trace:configure.ac:1099: -1- AC_SUBST([HAVE_ICU_FALSE])1047m4trace:configure.ac:1112: -1- AC_SUBST([HAVE_ICU_TRUE])
1048m4trace:configure.ac:1099: -1- AC_SUBST_TRACE([HAVE_ICU_FALSE])1048m4trace:configure.ac:1112: -1- AC_SUBST_TRACE([HAVE_ICU_TRUE])
1049m4trace:configure.ac:1099: -1- m4_pattern_allow([^HAVE_ICU_FALSE$])1049m4trace:configure.ac:1112: -1- m4_pattern_allow([^HAVE_ICU_TRUE$])
1050m4trace:configure.ac:1099: -1- _AM_SUBST_NOTMAKE([HAVE_ICU_TRUE])1050m4trace:configure.ac:1112: -1- AC_SUBST([HAVE_ICU_FALSE])
1051m4trace:configure.ac:1099: -1- _AM_SUBST_NOTMAKE([HAVE_ICU_FALSE])1051m4trace:configure.ac:1112: -1- AC_SUBST_TRACE([HAVE_ICU_FALSE])
1052m4trace:configure.ac:1100: -1- AM_CONDITIONAL([WITH_KERNEL_MODULES], [test "$with_kernel_modules" = "yes"])1052m4trace:configure.ac:1112: -1- m4_pattern_allow([^HAVE_ICU_FALSE$])
1053m4trace:configure.ac:1100: -1- AC_SUBST([WITH_KERNEL_MODULES_TRUE])1053m4trace:configure.ac:1112: -1- _AM_SUBST_NOTMAKE([HAVE_ICU_TRUE])
1054m4trace:configure.ac:1100: -1- AC_SUBST_TRACE([WITH_KERNEL_MODULES_TRUE])1054m4trace:configure.ac:1112: -1- _AM_SUBST_NOTMAKE([HAVE_ICU_FALSE])
1055m4trace:configure.ac:1100: -1- m4_pattern_allow([^WITH_KERNEL_MODULES_TRUE$])1055m4trace:configure.ac:1113: -1- AM_CONDITIONAL([WITH_KERNEL_MODULES], [test "$with_kernel_modules" = "yes"])
1056m4trace:configure.ac:1100: -1- AC_SUBST([WITH_KERNEL_MODULES_FALSE])1056m4trace:configure.ac:1113: -1- AC_SUBST([WITH_KERNEL_MODULES_TRUE])
1057m4trace:configure.ac:1100: -1- AC_SUBST_TRACE([WITH_KERNEL_MODULES_FALSE])1057m4trace:configure.ac:1113: -1- AC_SUBST_TRACE([WITH_KERNEL_MODULES_TRUE])
1058m4trace:configure.ac:1100: -1- m4_pattern_allow([^WITH_KERNEL_MODULES_FALSE$])1058m4trace:configure.ac:1113: -1- m4_pattern_allow([^WITH_KERNEL_MODULES_TRUE$])
1059m4trace:configure.ac:1100: -1- _AM_SUBST_NOTMAKE([WITH_KERNEL_MODULES_TRUE])1059m4trace:configure.ac:1113: -1- AC_SUBST([WITH_KERNEL_MODULES_FALSE])
1060m4trace:configure.ac:1100: -1- _AM_SUBST_NOTMAKE([WITH_KERNEL_MODULES_FALSE])1060m4trace:configure.ac:1113: -1- AC_SUBST_TRACE([WITH_KERNEL_MODULES_FALSE])
1061m4trace:configure.ac:1101: -1- AM_CONDITIONAL([HAVE_XSM], [test "$have_xsm" = "yes"])1061m4trace:configure.ac:1113: -1- m4_pattern_allow([^WITH_KERNEL_MODULES_FALSE$])
1062m4trace:configure.ac:1101: -1- AC_SUBST([HAVE_XSM_TRUE])1062m4trace:configure.ac:1113: -1- _AM_SUBST_NOTMAKE([WITH_KERNEL_MODULES_TRUE])
1063m4trace:configure.ac:1101: -1- AC_SUBST_TRACE([HAVE_XSM_TRUE])1063m4trace:configure.ac:1113: -1- _AM_SUBST_NOTMAKE([WITH_KERNEL_MODULES_FALSE])
1064m4trace:configure.ac:1101: -1- m4_pattern_allow([^HAVE_XSM_TRUE$])1064m4trace:configure.ac:1114: -1- AM_CONDITIONAL([HAVE_XSM], [test "$have_xsm" = "yes"])
1065m4trace:configure.ac:1101: -1- AC_SUBST([HAVE_XSM_FALSE])1065m4trace:configure.ac:1114: -1- AC_SUBST([HAVE_XSM_TRUE])
1066m4trace:configure.ac:1101: -1- AC_SUBST_TRACE([HAVE_XSM_FALSE])1066m4trace:configure.ac:1114: -1- AC_SUBST_TRACE([HAVE_XSM_TRUE])
1067m4trace:configure.ac:1101: -1- m4_pattern_allow([^HAVE_XSM_FALSE$])1067m4trace:configure.ac:1114: -1- m4_pattern_allow([^HAVE_XSM_TRUE$])
1068m4trace:configure.ac:1101: -1- _AM_SUBST_NOTMAKE([HAVE_XSM_TRUE])1068m4trace:configure.ac:1114: -1- AC_SUBST([HAVE_XSM_FALSE])
1069m4trace:configure.ac:1101: -1- _AM_SUBST_NOTMAKE([HAVE_XSM_FALSE])1069m4trace:configure.ac:1114: -1- AC_SUBST_TRACE([HAVE_XSM_FALSE])
1070m4trace:configure.ac:1102: -1- AM_CONDITIONAL([HAVE_XCOMPOSITE], [test "$have_xcomposite" = "yes"])1070m4trace:configure.ac:1114: -1- m4_pattern_allow([^HAVE_XSM_FALSE$])
1071m4trace:configure.ac:1102: -1- AC_SUBST([HAVE_XCOMPOSITE_TRUE])1071m4trace:configure.ac:1114: -1- _AM_SUBST_NOTMAKE([HAVE_XSM_TRUE])
1072m4trace:configure.ac:1102: -1- AC_SUBST_TRACE([HAVE_XCOMPOSITE_TRUE])1072m4trace:configure.ac:1114: -1- _AM_SUBST_NOTMAKE([HAVE_XSM_FALSE])
1073m4trace:configure.ac:1102: -1- m4_pattern_allow([^HAVE_XCOMPOSITE_TRUE$])1073m4trace:configure.ac:1115: -1- AM_CONDITIONAL([HAVE_XCOMPOSITE], [test "$have_xcomposite" = "yes"])
1074m4trace:configure.ac:1102: -1- AC_SUBST([HAVE_XCOMPOSITE_FALSE])1074m4trace:configure.ac:1115: -1- AC_SUBST([HAVE_XCOMPOSITE_TRUE])
1075m4trace:configure.ac:1102: -1- AC_SUBST_TRACE([HAVE_XCOMPOSITE_FALSE])1075m4trace:configure.ac:1115: -1- AC_SUBST_TRACE([HAVE_XCOMPOSITE_TRUE])
1076m4trace:configure.ac:1102: -1- m4_pattern_allow([^HAVE_XCOMPOSITE_FALSE$])1076m4trace:configure.ac:1115: -1- m4_pattern_allow([^HAVE_XCOMPOSITE_TRUE$])
1077m4trace:configure.ac:1102: -1- _AM_SUBST_NOTMAKE([HAVE_XCOMPOSITE_TRUE])1077m4trace:configure.ac:1115: -1- AC_SUBST([HAVE_XCOMPOSITE_FALSE])
1078m4trace:configure.ac:1102: -1- _AM_SUBST_NOTMAKE([HAVE_XCOMPOSITE_FALSE])1078m4trace:configure.ac:1115: -1- AC_SUBST_TRACE([HAVE_XCOMPOSITE_FALSE])
1079m4trace:configure.ac:1103: -1- AM_CONDITIONAL([ENABLE_UNITY], [test "$enable_unity" = "yes"])1079m4trace:configure.ac:1115: -1- m4_pattern_allow([^HAVE_XCOMPOSITE_FALSE$])
1080m4trace:configure.ac:1103: -1- AC_SUBST([ENABLE_UNITY_TRUE])1080m4trace:configure.ac:1115: -1- _AM_SUBST_NOTMAKE([HAVE_XCOMPOSITE_TRUE])
1081m4trace:configure.ac:1103: -1- AC_SUBST_TRACE([ENABLE_UNITY_TRUE])1081m4trace:configure.ac:1115: -1- _AM_SUBST_NOTMAKE([HAVE_XCOMPOSITE_FALSE])
1082m4trace:configure.ac:1103: -1- m4_pattern_allow([^ENABLE_UNITY_TRUE$])1082m4trace:configure.ac:1116: -1- AM_CONDITIONAL([ENABLE_UNITY], [test "$enable_unity" = "yes"])
1083m4trace:configure.ac:1103: -1- AC_SUBST([ENABLE_UNITY_FALSE])1083m4trace:configure.ac:1116: -1- AC_SUBST([ENABLE_UNITY_TRUE])
1084m4trace:configure.ac:1103: -1- AC_SUBST_TRACE([ENABLE_UNITY_FALSE])1084m4trace:configure.ac:1116: -1- AC_SUBST_TRACE([ENABLE_UNITY_TRUE])
1085m4trace:configure.ac:1103: -1- m4_pattern_allow([^ENABLE_UNITY_FALSE$])1085m4trace:configure.ac:1116: -1- m4_pattern_allow([^ENABLE_UNITY_TRUE$])
1086m4trace:configure.ac:1103: -1- _AM_SUBST_NOTMAKE([ENABLE_UNITY_TRUE])1086m4trace:configure.ac:1116: -1- AC_SUBST([ENABLE_UNITY_FALSE])
1087m4trace:configure.ac:1103: -1- _AM_SUBST_NOTMAKE([ENABLE_UNITY_FALSE])1087m4trace:configure.ac:1116: -1- AC_SUBST_TRACE([ENABLE_UNITY_FALSE])
1088m4trace:configure.ac:1104: -1- AM_CONDITIONAL([ENABLE_TESTS], [test "$have_cunit" = "yes"])1088m4trace:configure.ac:1116: -1- m4_pattern_allow([^ENABLE_UNITY_FALSE$])
1089m4trace:configure.ac:1104: -1- AC_SUBST([ENABLE_TESTS_TRUE])1089m4trace:configure.ac:1116: -1- _AM_SUBST_NOTMAKE([ENABLE_UNITY_TRUE])
1090m4trace:configure.ac:1104: -1- AC_SUBST_TRACE([ENABLE_TESTS_TRUE])1090m4trace:configure.ac:1116: -1- _AM_SUBST_NOTMAKE([ENABLE_UNITY_FALSE])
1091m4trace:configure.ac:1104: -1- m4_pattern_allow([^ENABLE_TESTS_TRUE$])1091m4trace:configure.ac:1117: -1- AM_CONDITIONAL([ENABLE_TESTS], [test "$have_cunit" = "yes"])
1092m4trace:configure.ac:1104: -1- AC_SUBST([ENABLE_TESTS_FALSE])1092m4trace:configure.ac:1117: -1- AC_SUBST([ENABLE_TESTS_TRUE])
1093m4trace:configure.ac:1104: -1- AC_SUBST_TRACE([ENABLE_TESTS_FALSE])1093m4trace:configure.ac:1117: -1- AC_SUBST_TRACE([ENABLE_TESTS_TRUE])
1094m4trace:configure.ac:1104: -1- m4_pattern_allow([^ENABLE_TESTS_FALSE$])1094m4trace:configure.ac:1117: -1- m4_pattern_allow([^ENABLE_TESTS_TRUE$])
1095m4trace:configure.ac:1104: -1- _AM_SUBST_NOTMAKE([ENABLE_TESTS_TRUE])1095m4trace:configure.ac:1117: -1- AC_SUBST([ENABLE_TESTS_FALSE])
1096m4trace:configure.ac:1104: -1- _AM_SUBST_NOTMAKE([ENABLE_TESTS_FALSE])1096m4trace:configure.ac:1117: -1- AC_SUBST_TRACE([ENABLE_TESTS_FALSE])
1097m4trace:configure.ac:1105: -1- AM_CONDITIONAL([WITH_ROOT_PRIVILEGES], [test "$with_root_privileges" = "yes"])1097m4trace:configure.ac:1117: -1- m4_pattern_allow([^ENABLE_TESTS_FALSE$])
1098m4trace:configure.ac:1105: -1- AC_SUBST([WITH_ROOT_PRIVILEGES_TRUE])1098m4trace:configure.ac:1117: -1- _AM_SUBST_NOTMAKE([ENABLE_TESTS_TRUE])
1099m4trace:configure.ac:1105: -1- AC_SUBST_TRACE([WITH_ROOT_PRIVILEGES_TRUE])1099m4trace:configure.ac:1117: -1- _AM_SUBST_NOTMAKE([ENABLE_TESTS_FALSE])
1100m4trace:configure.ac:1105: -1- m4_pattern_allow([^WITH_ROOT_PRIVILEGES_TRUE$])1100m4trace:configure.ac:1118: -1- AM_CONDITIONAL([WITH_ROOT_PRIVILEGES], [test "$with_root_privileges" = "yes"])
1101m4trace:configure.ac:1105: -1- AC_SUBST([WITH_ROOT_PRIVILEGES_FALSE])1101m4trace:configure.ac:1118: -1- AC_SUBST([WITH_ROOT_PRIVILEGES_TRUE])
1102m4trace:configure.ac:1105: -1- AC_SUBST_TRACE([WITH_ROOT_PRIVILEGES_FALSE])1102m4trace:configure.ac:1118: -1- AC_SUBST_TRACE([WITH_ROOT_PRIVILEGES_TRUE])
1103m4trace:configure.ac:1105: -1- m4_pattern_allow([^WITH_ROOT_PRIVILEGES_FALSE$])1103m4trace:configure.ac:1118: -1- m4_pattern_allow([^WITH_ROOT_PRIVILEGES_TRUE$])
1104m4trace:configure.ac:1105: -1- _AM_SUBST_NOTMAKE([WITH_ROOT_PRIVILEGES_TRUE])1104m4trace:configure.ac:1118: -1- AC_SUBST([WITH_ROOT_PRIVILEGES_FALSE])
1105m4trace:configure.ac:1105: -1- _AM_SUBST_NOTMAKE([WITH_ROOT_PRIVILEGES_FALSE])1105m4trace:configure.ac:1118: -1- AC_SUBST_TRACE([WITH_ROOT_PRIVILEGES_FALSE])
1106m4trace:configure.ac:1106: -1- AM_CONDITIONAL([HAVE_DNET], [test "$have_dnet" = "yes"])1106m4trace:configure.ac:1118: -1- m4_pattern_allow([^WITH_ROOT_PRIVILEGES_FALSE$])
1107m4trace:configure.ac:1106: -1- AC_SUBST([HAVE_DNET_TRUE])1107m4trace:configure.ac:1118: -1- _AM_SUBST_NOTMAKE([WITH_ROOT_PRIVILEGES_TRUE])
1108m4trace:configure.ac:1106: -1- AC_SUBST_TRACE([HAVE_DNET_TRUE])1108m4trace:configure.ac:1118: -1- _AM_SUBST_NOTMAKE([WITH_ROOT_PRIVILEGES_FALSE])
1109m4trace:configure.ac:1106: -1- m4_pattern_allow([^HAVE_DNET_TRUE$])1109m4trace:configure.ac:1119: -1- AM_CONDITIONAL([HAVE_DNET], [test "$have_dnet" = "yes"])
1110m4trace:configure.ac:1106: -1- AC_SUBST([HAVE_DNET_FALSE])1110m4trace:configure.ac:1119: -1- AC_SUBST([HAVE_DNET_TRUE])
1111m4trace:configure.ac:1106: -1- AC_SUBST_TRACE([HAVE_DNET_FALSE])1111m4trace:configure.ac:1119: -1- AC_SUBST_TRACE([HAVE_DNET_TRUE])
1112m4trace:configure.ac:1106: -1- m4_pattern_allow([^HAVE_DNET_FALSE$])1112m4trace:configure.ac:1119: -1- m4_pattern_allow([^HAVE_DNET_TRUE$])
1113m4trace:configure.ac:1106: -1- _AM_SUBST_NOTMAKE([HAVE_DNET_TRUE])1113m4trace:configure.ac:1119: -1- AC_SUBST([HAVE_DNET_FALSE])
1114m4trace:configure.ac:1106: -1- _AM_SUBST_NOTMAKE([HAVE_DNET_FALSE])1114m4trace:configure.ac:1119: -1- AC_SUBST_TRACE([HAVE_DNET_FALSE])
1115m4trace:configure.ac:1107: -1- AM_CONDITIONAL([HAVE_DOXYGEN], [test "$have_doxygen" = "yes"])1115m4trace:configure.ac:1119: -1- m4_pattern_allow([^HAVE_DNET_FALSE$])
1116m4trace:configure.ac:1107: -1- AC_SUBST([HAVE_DOXYGEN_TRUE])1116m4trace:configure.ac:1119: -1- _AM_SUBST_NOTMAKE([HAVE_DNET_TRUE])
1117m4trace:configure.ac:1107: -1- AC_SUBST_TRACE([HAVE_DOXYGEN_TRUE])1117m4trace:configure.ac:1119: -1- _AM_SUBST_NOTMAKE([HAVE_DNET_FALSE])
1118m4trace:configure.ac:1107: -1- m4_pattern_allow([^HAVE_DOXYGEN_TRUE$])1118m4trace:configure.ac:1120: -1- AM_CONDITIONAL([HAVE_DOXYGEN], [test "$have_doxygen" = "yes"])
1119m4trace:configure.ac:1107: -1- AC_SUBST([HAVE_DOXYGEN_FALSE])1119m4trace:configure.ac:1120: -1- AC_SUBST([HAVE_DOXYGEN_TRUE])
1120m4trace:configure.ac:1107: -1- AC_SUBST_TRACE([HAVE_DOXYGEN_FALSE])1120m4trace:configure.ac:1120: -1- AC_SUBST_TRACE([HAVE_DOXYGEN_TRUE])
1121m4trace:configure.ac:1107: -1- m4_pattern_allow([^HAVE_DOXYGEN_FALSE$])1121m4trace:configure.ac:1120: -1- m4_pattern_allow([^HAVE_DOXYGEN_TRUE$])
1122m4trace:configure.ac:1107: -1- _AM_SUBST_NOTMAKE([HAVE_DOXYGEN_TRUE])1122m4trace:configure.ac:1120: -1- AC_SUBST([HAVE_DOXYGEN_FALSE])
1123m4trace:configure.ac:1107: -1- _AM_SUBST_NOTMAKE([HAVE_DOXYGEN_FALSE])1123m4trace:configure.ac:1120: -1- AC_SUBST_TRACE([HAVE_DOXYGEN_FALSE])
1124m4trace:configure.ac:1108: -1- AM_CONDITIONAL([HAVE_FUSE], [test "$have_fuse" = "yes"])1124m4trace:configure.ac:1120: -1- m4_pattern_allow([^HAVE_DOXYGEN_FALSE$])
1125m4trace:configure.ac:1108: -1- AC_SUBST([HAVE_FUSE_TRUE])1125m4trace:configure.ac:1120: -1- _AM_SUBST_NOTMAKE([HAVE_DOXYGEN_TRUE])
1126m4trace:configure.ac:1108: -1- AC_SUBST_TRACE([HAVE_FUSE_TRUE])1126m4trace:configure.ac:1120: -1- _AM_SUBST_NOTMAKE([HAVE_DOXYGEN_FALSE])
1127m4trace:configure.ac:1108: -1- m4_pattern_allow([^HAVE_FUSE_TRUE$])1127m4trace:configure.ac:1121: -1- AM_CONDITIONAL([HAVE_FUSE], [test "$have_fuse" = "yes"])
1128m4trace:configure.ac:1108: -1- AC_SUBST([HAVE_FUSE_FALSE])1128m4trace:configure.ac:1121: -1- AC_SUBST([HAVE_FUSE_TRUE])
1129m4trace:configure.ac:1108: -1- AC_SUBST_TRACE([HAVE_FUSE_FALSE])1129m4trace:configure.ac:1121: -1- AC_SUBST_TRACE([HAVE_FUSE_TRUE])
1130m4trace:configure.ac:1108: -1- m4_pattern_allow([^HAVE_FUSE_FALSE$])1130m4trace:configure.ac:1121: -1- m4_pattern_allow([^HAVE_FUSE_TRUE$])
1131m4trace:configure.ac:1108: -1- _AM_SUBST_NOTMAKE([HAVE_FUSE_TRUE])1131m4trace:configure.ac:1121: -1- AC_SUBST([HAVE_FUSE_FALSE])
1132m4trace:configure.ac:1108: -1- _AM_SUBST_NOTMAKE([HAVE_FUSE_FALSE])1132m4trace:configure.ac:1121: -1- AC_SUBST_TRACE([HAVE_FUSE_FALSE])
1133m4trace:configure.ac:1109: -1- AM_CONDITIONAL([HAVE_GNU_LD], [test "$with_gnu_ld" = "yes"])1133m4trace:configure.ac:1121: -1- m4_pattern_allow([^HAVE_FUSE_FALSE$])
1134m4trace:configure.ac:1109: -1- AC_SUBST([HAVE_GNU_LD_TRUE])1134m4trace:configure.ac:1121: -1- _AM_SUBST_NOTMAKE([HAVE_FUSE_TRUE])
1135m4trace:configure.ac:1109: -1- AC_SUBST_TRACE([HAVE_GNU_LD_TRUE])1135m4trace:configure.ac:1121: -1- _AM_SUBST_NOTMAKE([HAVE_FUSE_FALSE])
1136m4trace:configure.ac:1109: -1- m4_pattern_allow([^HAVE_GNU_LD_TRUE$])1136m4trace:configure.ac:1122: -1- AM_CONDITIONAL([HAVE_GNU_LD], [test "$with_gnu_ld" = "yes"])
1137m4trace:configure.ac:1109: -1- AC_SUBST([HAVE_GNU_LD_FALSE])1137m4trace:configure.ac:1122: -1- AC_SUBST([HAVE_GNU_LD_TRUE])
1138m4trace:configure.ac:1109: -1- AC_SUBST_TRACE([HAVE_GNU_LD_FALSE])1138m4trace:configure.ac:1122: -1- AC_SUBST_TRACE([HAVE_GNU_LD_TRUE])
1139m4trace:configure.ac:1109: -1- m4_pattern_allow([^HAVE_GNU_LD_FALSE$])1139m4trace:configure.ac:1122: -1- m4_pattern_allow([^HAVE_GNU_LD_TRUE$])
1140m4trace:configure.ac:1109: -1- _AM_SUBST_NOTMAKE([HAVE_GNU_LD_TRUE])1140m4trace:configure.ac:1122: -1- AC_SUBST([HAVE_GNU_LD_FALSE])
1141m4trace:configure.ac:1109: -1- _AM_SUBST_NOTMAKE([HAVE_GNU_LD_FALSE])1141m4trace:configure.ac:1122: -1- AC_SUBST_TRACE([HAVE_GNU_LD_FALSE])
1142m4trace:configure.ac:1110: -1- AM_CONDITIONAL([HAVE_GTKMM], [test "$have_x" = "yes" -a "$with_gtkmm" = "yes"])1142m4trace:configure.ac:1122: -1- m4_pattern_allow([^HAVE_GNU_LD_FALSE$])
1143m4trace:configure.ac:1110: -1- AC_SUBST([HAVE_GTKMM_TRUE])1143m4trace:configure.ac:1122: -1- _AM_SUBST_NOTMAKE([HAVE_GNU_LD_TRUE])
1144m4trace:configure.ac:1110: -1- AC_SUBST_TRACE([HAVE_GTKMM_TRUE])1144m4trace:configure.ac:1122: -1- _AM_SUBST_NOTMAKE([HAVE_GNU_LD_FALSE])
1145m4trace:configure.ac:1110: -1- m4_pattern_allow([^HAVE_GTKMM_TRUE$])1145m4trace:configure.ac:1123: -1- AM_CONDITIONAL([HAVE_GTKMM], [test "$have_x" = "yes" -a "$with_gtkmm" = "yes"])
1146m4trace:configure.ac:1110: -1- AC_SUBST([HAVE_GTKMM_FALSE])1146m4trace:configure.ac:1123: -1- AC_SUBST([HAVE_GTKMM_TRUE])
1147m4trace:configure.ac:1110: -1- AC_SUBST_TRACE([HAVE_GTKMM_FALSE])1147m4trace:configure.ac:1123: -1- AC_SUBST_TRACE([HAVE_GTKMM_TRUE])
1148m4trace:configure.ac:1110: -1- m4_pattern_allow([^HAVE_GTKMM_FALSE$])1148m4trace:configure.ac:1123: -1- m4_pattern_allow([^HAVE_GTKMM_TRUE$])
1149m4trace:configure.ac:1110: -1- _AM_SUBST_NOTMAKE([HAVE_GTKMM_TRUE])1149m4trace:configure.ac:1123: -1- AC_SUBST([HAVE_GTKMM_FALSE])
1150m4trace:configure.ac:1110: -1- _AM_SUBST_NOTMAKE([HAVE_GTKMM_FALSE])1150m4trace:configure.ac:1123: -1- AC_SUBST_TRACE([HAVE_GTKMM_FALSE])
1151m4trace:configure.ac:1111: -1- AM_CONDITIONAL([HAVE_PAM], [test "$with_pam" = "yes"])1151m4trace:configure.ac:1123: -1- m4_pattern_allow([^HAVE_GTKMM_FALSE$])
1152m4trace:configure.ac:1111: -1- AC_SUBST([HAVE_PAM_TRUE])1152m4trace:configure.ac:1123: -1- _AM_SUBST_NOTMAKE([HAVE_GTKMM_TRUE])
1153m4trace:configure.ac:1111: -1- AC_SUBST_TRACE([HAVE_PAM_TRUE])1153m4trace:configure.ac:1123: -1- _AM_SUBST_NOTMAKE([HAVE_GTKMM_FALSE])
1154m4trace:configure.ac:1111: -1- m4_pattern_allow([^HAVE_PAM_TRUE$])1154m4trace:configure.ac:1124: -1- AM_CONDITIONAL([HAVE_PAM], [test "$with_pam" = "yes"])
1155m4trace:configure.ac:1111: -1- AC_SUBST([HAVE_PAM_FALSE])1155m4trace:configure.ac:1124: -1- AC_SUBST([HAVE_PAM_TRUE])
1156m4trace:configure.ac:1111: -1- AC_SUBST_TRACE([HAVE_PAM_FALSE])1156m4trace:configure.ac:1124: -1- AC_SUBST_TRACE([HAVE_PAM_TRUE])
1157m4trace:configure.ac:1111: -1- m4_pattern_allow([^HAVE_PAM_FALSE$])1157m4trace:configure.ac:1124: -1- m4_pattern_allow([^HAVE_PAM_TRUE$])
1158m4trace:configure.ac:1111: -1- _AM_SUBST_NOTMAKE([HAVE_PAM_TRUE])1158m4trace:configure.ac:1124: -1- AC_SUBST([HAVE_PAM_FALSE])
1159m4trace:configure.ac:1111: -1- _AM_SUBST_NOTMAKE([HAVE_PAM_FALSE])1159m4trace:configure.ac:1124: -1- AC_SUBST_TRACE([HAVE_PAM_FALSE])
1160m4trace:configure.ac:1112: -1- AM_CONDITIONAL([USE_SLASH_PROC], [test "os" = "linux" -a "$have_glib_2_14" = "yes"])1160m4trace:configure.ac:1124: -1- m4_pattern_allow([^HAVE_PAM_FALSE$])
1161m4trace:configure.ac:1112: -1- AC_SUBST([USE_SLASH_PROC_TRUE])1161m4trace:configure.ac:1124: -1- _AM_SUBST_NOTMAKE([HAVE_PAM_TRUE])
1162m4trace:configure.ac:1112: -1- AC_SUBST_TRACE([USE_SLASH_PROC_TRUE])1162m4trace:configure.ac:1124: -1- _AM_SUBST_NOTMAKE([HAVE_PAM_FALSE])
1163m4trace:configure.ac:1112: -1- m4_pattern_allow([^USE_SLASH_PROC_TRUE$])1163m4trace:configure.ac:1125: -1- AM_CONDITIONAL([USE_SLASH_PROC], [test "os" = "linux" -a "$have_glib_2_14" = "yes"])
1164m4trace:configure.ac:1112: -1- AC_SUBST([USE_SLASH_PROC_FALSE])1164m4trace:configure.ac:1125: -1- AC_SUBST([USE_SLASH_PROC_TRUE])
1165m4trace:configure.ac:1112: -1- AC_SUBST_TRACE([USE_SLASH_PROC_FALSE])1165m4trace:configure.ac:1125: -1- AC_SUBST_TRACE([USE_SLASH_PROC_TRUE])
1166m4trace:configure.ac:1112: -1- m4_pattern_allow([^USE_SLASH_PROC_FALSE$])1166m4trace:configure.ac:1125: -1- m4_pattern_allow([^USE_SLASH_PROC_TRUE$])
1167m4trace:configure.ac:1112: -1- _AM_SUBST_NOTMAKE([USE_SLASH_PROC_TRUE])1167m4trace:configure.ac:1125: -1- AC_SUBST([USE_SLASH_PROC_FALSE])
1168m4trace:configure.ac:1112: -1- _AM_SUBST_NOTMAKE([USE_SLASH_PROC_FALSE])1168m4trace:configure.ac:1125: -1- AC_SUBST_TRACE([USE_SLASH_PROC_FALSE])
1169m4trace:configure.ac:1115: -1- AC_DEFINE_TRACE_LITERAL([NO_XSM])1169m4trace:configure.ac:1125: -1- m4_pattern_allow([^USE_SLASH_PROC_FALSE$])
1170m4trace:configure.ac:1115: -1- m4_pattern_allow([^NO_XSM$])1170m4trace:configure.ac:1125: -1- _AM_SUBST_NOTMAKE([USE_SLASH_PROC_TRUE])
1171m4trace:configure.ac:1119: -1- AC_DEFINE_TRACE_LITERAL([NO_XCOMPOSITE])1171m4trace:configure.ac:1125: -1- _AM_SUBST_NOTMAKE([USE_SLASH_PROC_FALSE])
1172m4trace:configure.ac:1119: -1- m4_pattern_allow([^NO_XCOMPOSITE$])1172m4trace:configure.ac:1128: -1- AC_DEFINE_TRACE_LITERAL([NO_XSM])
1173m4trace:configure.ac:1131: -1- AC_DEFINE_TRACE_LITERAL([NO_MULTIMON])1173m4trace:configure.ac:1128: -1- m4_pattern_allow([^NO_XSM$])
1174m4trace:configure.ac:1131: -1- m4_pattern_allow([^NO_MULTIMON$])1174m4trace:configure.ac:1132: -1- AC_DEFINE_TRACE_LITERAL([NO_XCOMPOSITE])
1175m4trace:configure.ac:1131: -1- AH_OUTPUT([NO_MULTIMON], [/* Define to 1 if building without multimon support. */1175m4trace:configure.ac:1132: -1- m4_pattern_allow([^NO_XCOMPOSITE$])
1176m4trace:configure.ac:1144: -1- AC_DEFINE_TRACE_LITERAL([NO_MULTIMON])
1177m4trace:configure.ac:1144: -1- m4_pattern_allow([^NO_MULTIMON$])
1178m4trace:configure.ac:1144: -1- AH_OUTPUT([NO_MULTIMON], [/* Define to 1 if building without multimon support. */
1176@%:@undef NO_MULTIMON])1179@%:@undef NO_MULTIMON])
1177m4trace:configure.ac:1173: -1- AC_SUBST([HGFS_LIBS])1180m4trace:configure.ac:1186: -1- AC_SUBST([HGFS_LIBS])
1178m4trace:configure.ac:1173: -1- AC_SUBST_TRACE([HGFS_LIBS])1181m4trace:configure.ac:1186: -1- AC_SUBST_TRACE([HGFS_LIBS])
1179m4trace:configure.ac:1173: -1- m4_pattern_allow([^HGFS_LIBS$])1182m4trace:configure.ac:1186: -1- m4_pattern_allow([^HGFS_LIBS$])
1180m4trace:configure.ac:1174: -1- AC_SUBST([TOOLS_VERSION])1183m4trace:configure.ac:1187: -1- AC_SUBST([TOOLS_VERSION])
1181m4trace:configure.ac:1174: -1- AC_SUBST_TRACE([TOOLS_VERSION])1184m4trace:configure.ac:1187: -1- AC_SUBST_TRACE([TOOLS_VERSION])
1182m4trace:configure.ac:1174: -1- m4_pattern_allow([^TOOLS_VERSION$])1185m4trace:configure.ac:1187: -1- m4_pattern_allow([^TOOLS_VERSION$])
1183m4trace:configure.ac:1175: -1- AC_SUBST([TARGET_OS])1186m4trace:configure.ac:1188: -1- AC_SUBST([TARGET_OS])
1184m4trace:configure.ac:1175: -1- AC_SUBST_TRACE([TARGET_OS])1187m4trace:configure.ac:1188: -1- AC_SUBST_TRACE([TARGET_OS])
1185m4trace:configure.ac:1175: -1- m4_pattern_allow([^TARGET_OS$])1188m4trace:configure.ac:1188: -1- m4_pattern_allow([^TARGET_OS$])
1186m4trace:configure.ac:1176: -1- AC_SUBST([KERNEL_RELEASE])1189m4trace:configure.ac:1189: -1- AC_SUBST([KERNEL_RELEASE])
1187m4trace:configure.ac:1176: -1- AC_SUBST_TRACE([KERNEL_RELEASE])1190m4trace:configure.ac:1189: -1- AC_SUBST_TRACE([KERNEL_RELEASE])
1188m4trace:configure.ac:1176: -1- m4_pattern_allow([^KERNEL_RELEASE$])1191m4trace:configure.ac:1189: -1- m4_pattern_allow([^KERNEL_RELEASE$])
1189m4trace:configure.ac:1177: -1- AC_SUBST([LINUXINCLUDE])1192m4trace:configure.ac:1190: -1- AC_SUBST([LINUXINCLUDE])
1190m4trace:configure.ac:1177: -1- AC_SUBST_TRACE([LINUXINCLUDE])1193m4trace:configure.ac:1190: -1- AC_SUBST_TRACE([LINUXINCLUDE])
1191m4trace:configure.ac:1177: -1- m4_pattern_allow([^LINUXINCLUDE$])1194m4trace:configure.ac:1190: -1- m4_pattern_allow([^LINUXINCLUDE$])
1192m4trace:configure.ac:1178: -1- AC_SUBST([MODULES_OS])1195m4trace:configure.ac:1191: -1- AC_SUBST([MODULES_OS])
1193m4trace:configure.ac:1178: -1- AC_SUBST_TRACE([MODULES_OS])1196m4trace:configure.ac:1191: -1- AC_SUBST_TRACE([MODULES_OS])
1194m4trace:configure.ac:1178: -1- m4_pattern_allow([^MODULES_OS$])1197m4trace:configure.ac:1191: -1- m4_pattern_allow([^MODULES_OS$])
1195m4trace:configure.ac:1179: -1- AC_SUBST([MODULES_DIR])1198m4trace:configure.ac:1192: -1- AC_SUBST([MODULES_DIR])
1196m4trace:configure.ac:1179: -1- AC_SUBST_TRACE([MODULES_DIR])1199m4trace:configure.ac:1192: -1- AC_SUBST_TRACE([MODULES_DIR])
1197m4trace:configure.ac:1179: -1- m4_pattern_allow([^MODULES_DIR$])1200m4trace:configure.ac:1192: -1- m4_pattern_allow([^MODULES_DIR$])
1198m4trace:configure.ac:1180: -1- AC_SUBST([MODULES])1201m4trace:configure.ac:1193: -1- AC_SUBST([MODULES])
1199m4trace:configure.ac:1180: -1- AC_SUBST_TRACE([MODULES])1202m4trace:configure.ac:1193: -1- AC_SUBST_TRACE([MODULES])
1200m4trace:configure.ac:1180: -1- m4_pattern_allow([^MODULES$])1203m4trace:configure.ac:1193: -1- m4_pattern_allow([^MODULES$])
1201m4trace:configure.ac:1181: -1- AC_SUBST([COMMON_XLIBS])1204m4trace:configure.ac:1194: -1- AC_SUBST([COMMON_XLIBS])
1202m4trace:configure.ac:1181: -1- AC_SUBST_TRACE([COMMON_XLIBS])1205m4trace:configure.ac:1194: -1- AC_SUBST_TRACE([COMMON_XLIBS])
1203m4trace:configure.ac:1181: -1- m4_pattern_allow([^COMMON_XLIBS$])1206m4trace:configure.ac:1194: -1- m4_pattern_allow([^COMMON_XLIBS$])
1204m4trace:configure.ac:1182: -1- AC_SUBST([XSM_LIBS])1207m4trace:configure.ac:1195: -1- AC_SUBST([XSM_LIBS])
1205m4trace:configure.ac:1182: -1- AC_SUBST_TRACE([XSM_LIBS])1208m4trace:configure.ac:1195: -1- AC_SUBST_TRACE([XSM_LIBS])
1206m4trace:configure.ac:1182: -1- m4_pattern_allow([^XSM_LIBS$])1209m4trace:configure.ac:1195: -1- m4_pattern_allow([^XSM_LIBS$])
1207m4trace:configure.ac:1183: -1- AC_SUBST([XCOMPOSITE_LIBS])1210m4trace:configure.ac:1196: -1- AC_SUBST([XCOMPOSITE_LIBS])
1208m4trace:configure.ac:1183: -1- AC_SUBST_TRACE([XCOMPOSITE_LIBS])1211m4trace:configure.ac:1196: -1- AC_SUBST_TRACE([XCOMPOSITE_LIBS])
1209m4trace:configure.ac:1183: -1- m4_pattern_allow([^XCOMPOSITE_LIBS$])1212m4trace:configure.ac:1196: -1- m4_pattern_allow([^XCOMPOSITE_LIBS$])
1210m4trace:configure.ac:1184: -1- AC_SUBST([PAM_PREFIX])1213m4trace:configure.ac:1197: -1- AC_SUBST([PAM_PREFIX])
1211m4trace:configure.ac:1184: -1- AC_SUBST_TRACE([PAM_PREFIX])1214m4trace:configure.ac:1197: -1- AC_SUBST_TRACE([PAM_PREFIX])
1212m4trace:configure.ac:1184: -1- m4_pattern_allow([^PAM_PREFIX$])1215m4trace:configure.ac:1197: -1- m4_pattern_allow([^PAM_PREFIX$])
1213m4trace:configure.ac:1185: -1- AC_SUBST([PLUGIN_CPPFLAGS])1216m4trace:configure.ac:1198: -1- AC_SUBST([PLUGIN_CPPFLAGS])
1214m4trace:configure.ac:1185: -1- AC_SUBST_TRACE([PLUGIN_CPPFLAGS])1217m4trace:configure.ac:1198: -1- AC_SUBST_TRACE([PLUGIN_CPPFLAGS])
1215m4trace:configure.ac:1185: -1- m4_pattern_allow([^PLUGIN_CPPFLAGS$])1218m4trace:configure.ac:1198: -1- m4_pattern_allow([^PLUGIN_CPPFLAGS$])
1216m4trace:configure.ac:1186: -1- AC_SUBST([PLUGIN_LDFLAGS])1219m4trace:configure.ac:1199: -1- AC_SUBST([PLUGIN_LDFLAGS])
1217m4trace:configure.ac:1186: -1- AC_SUBST_TRACE([PLUGIN_LDFLAGS])1220m4trace:configure.ac:1199: -1- AC_SUBST_TRACE([PLUGIN_LDFLAGS])
1218m4trace:configure.ac:1186: -1- m4_pattern_allow([^PLUGIN_LDFLAGS$])1221m4trace:configure.ac:1199: -1- m4_pattern_allow([^PLUGIN_LDFLAGS$])
1219m4trace:configure.ac:1187: -1- AC_SUBST([VMTOOLS_CPPFLAGS])1222m4trace:configure.ac:1200: -1- AC_SUBST([VMTOOLS_CPPFLAGS])
1220m4trace:configure.ac:1187: -1- AC_SUBST_TRACE([VMTOOLS_CPPFLAGS])1223m4trace:configure.ac:1200: -1- AC_SUBST_TRACE([VMTOOLS_CPPFLAGS])
1221m4trace:configure.ac:1187: -1- m4_pattern_allow([^VMTOOLS_CPPFLAGS$])1224m4trace:configure.ac:1200: -1- m4_pattern_allow([^VMTOOLS_CPPFLAGS$])
1222m4trace:configure.ac:1188: -1- AC_SUBST([VMTOOLS_LIBS])1225m4trace:configure.ac:1201: -1- AC_SUBST([VMTOOLS_LIBS])
1223m4trace:configure.ac:1188: -1- AC_SUBST_TRACE([VMTOOLS_LIBS])1226m4trace:configure.ac:1201: -1- AC_SUBST_TRACE([VMTOOLS_LIBS])
1224m4trace:configure.ac:1188: -1- m4_pattern_allow([^VMTOOLS_LIBS$])1227m4trace:configure.ac:1201: -1- m4_pattern_allow([^VMTOOLS_LIBS$])
1225m4trace:configure.ac:1189: -1- AC_SUBST([RPCGENFLAGS])1228m4trace:configure.ac:1202: -1- AC_SUBST([RPCGENFLAGS])
1226m4trace:configure.ac:1189: -1- AC_SUBST_TRACE([RPCGENFLAGS])1229m4trace:configure.ac:1202: -1- AC_SUBST_TRACE([RPCGENFLAGS])
1227m4trace:configure.ac:1189: -1- m4_pattern_allow([^RPCGENFLAGS$])1230m4trace:configure.ac:1202: -1- m4_pattern_allow([^RPCGENFLAGS$])
1228m4trace:configure.ac:1190: -1- AC_SUBST([XDR_LIBS])1231m4trace:configure.ac:1203: -1- AC_SUBST([XDR_LIBS])
1229m4trace:configure.ac:1190: -1- AC_SUBST_TRACE([XDR_LIBS])1232m4trace:configure.ac:1203: -1- AC_SUBST_TRACE([XDR_LIBS])
1230m4trace:configure.ac:1190: -1- m4_pattern_allow([^XDR_LIBS$])1233m4trace:configure.ac:1203: -1- m4_pattern_allow([^XDR_LIBS$])
1231m4trace:configure.ac:1191: -1- AC_SUBST([TEST_PLUGIN_INSTALLDIR])1234m4trace:configure.ac:1204: -1- AC_SUBST([TEST_PLUGIN_INSTALLDIR])
1232m4trace:configure.ac:1191: -1- AC_SUBST_TRACE([TEST_PLUGIN_INSTALLDIR])1235m4trace:configure.ac:1204: -1- AC_SUBST_TRACE([TEST_PLUGIN_INSTALLDIR])
1233m4trace:configure.ac:1191: -1- m4_pattern_allow([^TEST_PLUGIN_INSTALLDIR$])1236m4trace:configure.ac:1204: -1- m4_pattern_allow([^TEST_PLUGIN_INSTALLDIR$])
1234m4trace:configure.ac:1192: -1- AC_SUBST([COMMON_PLUGIN_INSTALLDIR])1237m4trace:configure.ac:1205: -1- AC_SUBST([COMMON_PLUGIN_INSTALLDIR])
1235m4trace:configure.ac:1192: -1- AC_SUBST_TRACE([COMMON_PLUGIN_INSTALLDIR])1238m4trace:configure.ac:1205: -1- AC_SUBST_TRACE([COMMON_PLUGIN_INSTALLDIR])
1236m4trace:configure.ac:1192: -1- m4_pattern_allow([^COMMON_PLUGIN_INSTALLDIR$])1239m4trace:configure.ac:1205: -1- m4_pattern_allow([^COMMON_PLUGIN_INSTALLDIR$])
1237m4trace:configure.ac:1193: -1- AC_SUBST([VMSVC_PLUGIN_INSTALLDIR])1240m4trace:configure.ac:1206: -1- AC_SUBST([VMSVC_PLUGIN_INSTALLDIR])
1238m4trace:configure.ac:1193: -1- AC_SUBST_TRACE([VMSVC_PLUGIN_INSTALLDIR])1241m4trace:configure.ac:1206: -1- AC_SUBST_TRACE([VMSVC_PLUGIN_INSTALLDIR])
1239m4trace:configure.ac:1193: -1- m4_pattern_allow([^VMSVC_PLUGIN_INSTALLDIR$])1242m4trace:configure.ac:1206: -1- m4_pattern_allow([^VMSVC_PLUGIN_INSTALLDIR$])
1240m4trace:configure.ac:1194: -1- AC_SUBST([VMUSR_PLUGIN_INSTALLDIR])1243m4trace:configure.ac:1207: -1- AC_SUBST([VMUSR_PLUGIN_INSTALLDIR])
1241m4trace:configure.ac:1194: -1- AC_SUBST_TRACE([VMUSR_PLUGIN_INSTALLDIR])1244m4trace:configure.ac:1207: -1- AC_SUBST_TRACE([VMUSR_PLUGIN_INSTALLDIR])
1242m4trace:configure.ac:1194: -1- m4_pattern_allow([^VMUSR_PLUGIN_INSTALLDIR$])1245m4trace:configure.ac:1207: -1- m4_pattern_allow([^VMUSR_PLUGIN_INSTALLDIR$])
1243m4trace:configure.ac:1199: -1- AC_SUBST([SYSDIR])1246m4trace:configure.ac:1212: -1- AC_SUBST([SYSDIR])
1244m4trace:configure.ac:1199: -1- AC_SUBST_TRACE([SYSDIR])1247m4trace:configure.ac:1212: -1- AC_SUBST_TRACE([SYSDIR])
1245m4trace:configure.ac:1199: -1- m4_pattern_allow([^SYSDIR$])1248m4trace:configure.ac:1212: -1- m4_pattern_allow([^SYSDIR$])
1246m4trace:configure.ac:1201: -1- AC_SUBST([INSTVMSG])1249m4trace:configure.ac:1214: -1- AC_SUBST([INSTVMSG])
1247m4trace:configure.ac:1201: -1- AC_SUBST_TRACE([INSTVMSG])1250m4trace:configure.ac:1214: -1- AC_SUBST_TRACE([INSTVMSG])
1248m4trace:configure.ac:1201: -1- m4_pattern_allow([^INSTVMSG$])1251m4trace:configure.ac:1214: -1- m4_pattern_allow([^INSTVMSG$])
1249m4trace:configure.ac:1202: -1- AC_SUBST([RPCGEN_WRAPPER])1252m4trace:configure.ac:1215: -1- AC_SUBST([RPCGEN_WRAPPER])
1250m4trace:configure.ac:1202: -1- AC_SUBST_TRACE([RPCGEN_WRAPPER])1253m4trace:configure.ac:1215: -1- AC_SUBST_TRACE([RPCGEN_WRAPPER])
1251m4trace:configure.ac:1202: -1- m4_pattern_allow([^RPCGEN_WRAPPER$])1254m4trace:configure.ac:1215: -1- m4_pattern_allow([^RPCGEN_WRAPPER$])
1252m4trace:configure.ac:1206: -1- AC_SUBST([LIB_AUTH_CPPFLAGS])1255m4trace:configure.ac:1219: -1- AC_SUBST([LIB_AUTH_CPPFLAGS])
1253m4trace:configure.ac:1206: -1- AC_SUBST_TRACE([LIB_AUTH_CPPFLAGS])1256m4trace:configure.ac:1219: -1- AC_SUBST_TRACE([LIB_AUTH_CPPFLAGS])
1254m4trace:configure.ac:1206: -1- m4_pattern_allow([^LIB_AUTH_CPPFLAGS$])1257m4trace:configure.ac:1219: -1- m4_pattern_allow([^LIB_AUTH_CPPFLAGS$])
1255m4trace:configure.ac:1207: -1- AC_SUBST([LIB_IMPERSONATE_CPPFLAGS])1258m4trace:configure.ac:1220: -1- AC_SUBST([LIB_IMPERSONATE_CPPFLAGS])
1256m4trace:configure.ac:1207: -1- AC_SUBST_TRACE([LIB_IMPERSONATE_CPPFLAGS])1259m4trace:configure.ac:1220: -1- AC_SUBST_TRACE([LIB_IMPERSONATE_CPPFLAGS])
1257m4trace:configure.ac:1207: -1- m4_pattern_allow([^LIB_IMPERSONATE_CPPFLAGS$])1260m4trace:configure.ac:1220: -1- m4_pattern_allow([^LIB_IMPERSONATE_CPPFLAGS$])
1258m4trace:configure.ac:1208: -1- AC_SUBST([LIB_USER_CPPFLAGS])1261m4trace:configure.ac:1221: -1- AC_SUBST([LIB_USER_CPPFLAGS])
1259m4trace:configure.ac:1208: -1- AC_SUBST_TRACE([LIB_USER_CPPFLAGS])1262m4trace:configure.ac:1221: -1- AC_SUBST_TRACE([LIB_USER_CPPFLAGS])
1260m4trace:configure.ac:1208: -1- m4_pattern_allow([^LIB_USER_CPPFLAGS$])1263m4trace:configure.ac:1221: -1- m4_pattern_allow([^LIB_USER_CPPFLAGS$])
1261m4trace:configure.ac:1209: -1- AC_SUBST([LIBVMTOOLS_LIBADD])1264m4trace:configure.ac:1222: -1- AC_SUBST([LIBVMTOOLS_LIBADD])
1262m4trace:configure.ac:1209: -1- AC_SUBST_TRACE([LIBVMTOOLS_LIBADD])1265m4trace:configure.ac:1222: -1- AC_SUBST_TRACE([LIBVMTOOLS_LIBADD])
1263m4trace:configure.ac:1209: -1- m4_pattern_allow([^LIBVMTOOLS_LIBADD$])1266m4trace:configure.ac:1222: -1- m4_pattern_allow([^LIBVMTOOLS_LIBADD$])
1264m4trace:configure.ac:1213: -1- AC_SUBST([VIX_LIBADD])1267m4trace:configure.ac:1226: -1- AC_SUBST([VIX_LIBADD])
1265m4trace:configure.ac:1213: -1- AC_SUBST_TRACE([VIX_LIBADD])1268m4trace:configure.ac:1226: -1- AC_SUBST_TRACE([VIX_LIBADD])
1266m4trace:configure.ac:1213: -1- m4_pattern_allow([^VIX_LIBADD$])1269m4trace:configure.ac:1226: -1- m4_pattern_allow([^VIX_LIBADD$])
1267m4trace:configure.ac:1218: -1- AC_CONFIG_FILES([ \1270m4trace:configure.ac:1231: -1- AC_CONFIG_FILES([ \
1268 Makefile \1271 Makefile \
1269 lib/Makefile \1272 lib/Makefile \
1270 lib/appUtil/Makefile \1273 lib/appUtil/Makefile \
@@ -1348,30 +1351,30 @@
1348 scripts/Makefile \1351 scripts/Makefile \
1349 scripts/build/rpcgen_wrapper.sh \1352 scripts/build/rpcgen_wrapper.sh \
1350])1353])
1351m4trace:configure.ac:1306: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs])1354m4trace:configure.ac:1319: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs])
1352m4trace:configure.ac:1306: -1- AC_SUBST_TRACE([LIB@&t@OBJS])1355m4trace:configure.ac:1319: -1- AC_SUBST_TRACE([LIB@&t@OBJS])
1353m4trace:configure.ac:1306: -1- m4_pattern_allow([^LIB@&t@OBJS$])1356m4trace:configure.ac:1319: -1- m4_pattern_allow([^LIB@&t@OBJS$])
1354m4trace:configure.ac:1306: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])1357m4trace:configure.ac:1319: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
1355m4trace:configure.ac:1306: -1- AC_SUBST_TRACE([LTLIBOBJS])1358m4trace:configure.ac:1319: -1- AC_SUBST_TRACE([LTLIBOBJS])
1356m4trace:configure.ac:1306: -1- m4_pattern_allow([^LTLIBOBJS$])1359m4trace:configure.ac:1319: -1- m4_pattern_allow([^LTLIBOBJS$])
1357m4trace:configure.ac:1306: -1- AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])1360m4trace:configure.ac:1319: -1- AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])
1358m4trace:configure.ac:1306: -1- AC_SUBST([am__EXEEXT_TRUE])1361m4trace:configure.ac:1319: -1- AC_SUBST([am__EXEEXT_TRUE])
1359m4trace:configure.ac:1306: -1- AC_SUBST_TRACE([am__EXEEXT_TRUE])1362m4trace:configure.ac:1319: -1- AC_SUBST_TRACE([am__EXEEXT_TRUE])
1360m4trace:configure.ac:1306: -1- m4_pattern_allow([^am__EXEEXT_TRUE$])1363m4trace:configure.ac:1319: -1- m4_pattern_allow([^am__EXEEXT_TRUE$])
1361m4trace:configure.ac:1306: -1- AC_SUBST([am__EXEEXT_FALSE])1364m4trace:configure.ac:1319: -1- AC_SUBST([am__EXEEXT_FALSE])
1362m4trace:configure.ac:1306: -1- AC_SUBST_TRACE([am__EXEEXT_FALSE])1365m4trace:configure.ac:1319: -1- AC_SUBST_TRACE([am__EXEEXT_FALSE])
1363m4trace:configure.ac:1306: -1- m4_pattern_allow([^am__EXEEXT_FALSE$])1366m4trace:configure.ac:1319: -1- m4_pattern_allow([^am__EXEEXT_FALSE$])
1364m4trace:configure.ac:1306: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_TRUE])1367m4trace:configure.ac:1319: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_TRUE])
1365m4trace:configure.ac:1306: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_FALSE])1368m4trace:configure.ac:1319: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_FALSE])
1366m4trace:configure.ac:1306: -1- AC_SUBST_TRACE([top_builddir])1369m4trace:configure.ac:1319: -1- AC_SUBST_TRACE([top_builddir])
1367m4trace:configure.ac:1306: -1- AC_SUBST_TRACE([top_build_prefix])1370m4trace:configure.ac:1319: -1- AC_SUBST_TRACE([top_build_prefix])
1368m4trace:configure.ac:1306: -1- AC_SUBST_TRACE([srcdir])1371m4trace:configure.ac:1319: -1- AC_SUBST_TRACE([srcdir])
1369m4trace:configure.ac:1306: -1- AC_SUBST_TRACE([abs_srcdir])1372m4trace:configure.ac:1319: -1- AC_SUBST_TRACE([abs_srcdir])
1370m4trace:configure.ac:1306: -1- AC_SUBST_TRACE([top_srcdir])1373m4trace:configure.ac:1319: -1- AC_SUBST_TRACE([top_srcdir])
1371m4trace:configure.ac:1306: -1- AC_SUBST_TRACE([abs_top_srcdir])1374m4trace:configure.ac:1319: -1- AC_SUBST_TRACE([abs_top_srcdir])
1372m4trace:configure.ac:1306: -1- AC_SUBST_TRACE([builddir])1375m4trace:configure.ac:1319: -1- AC_SUBST_TRACE([builddir])
1373m4trace:configure.ac:1306: -1- AC_SUBST_TRACE([abs_builddir])1376m4trace:configure.ac:1319: -1- AC_SUBST_TRACE([abs_builddir])
1374m4trace:configure.ac:1306: -1- AC_SUBST_TRACE([abs_top_builddir])1377m4trace:configure.ac:1319: -1- AC_SUBST_TRACE([abs_top_builddir])
1375m4trace:configure.ac:1306: -1- AC_SUBST_TRACE([INSTALL])1378m4trace:configure.ac:1319: -1- AC_SUBST_TRACE([INSTALL])
1376m4trace:configure.ac:1306: -1- AC_SUBST_TRACE([MKDIR_P])1379m4trace:configure.ac:1319: -1- AC_SUBST_TRACE([MKDIR_P])
1377m4trace:configure.ac:1306: -1- AC_REQUIRE_AUX_FILE([ltmain.sh])1380m4trace:configure.ac:1319: -1- AC_REQUIRE_AUX_FILE([ltmain.sh])
13781381
=== modified file 'autom4te.cache/traces.2'
--- autom4te.cache/traces.2 2011-07-22 16:41:03 +0000
+++ autom4te.cache/traces.2 2011-10-31 00:22:23 +0000
@@ -2713,156 +2713,159 @@
2713m4trace:configure.ac:950: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.2713m4trace:configure.ac:950: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
2714You should run autoupdate.], [../../lib/autoconf/general.m4:2602: AC_TRY_COMPILE is expanded from...2714You should run autoupdate.], [../../lib/autoconf/general.m4:2602: AC_TRY_COMPILE is expanded from...
2715configure.ac:950: the top level])2715configure.ac:950: the top level])
2716m4trace:configure.ac:968: -1- m4_pattern_allow([^have_doxygen$])2716m4trace:configure.ac:961: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
2717m4trace:configure.ac:975: -1- m4_pattern_allow([^DOT$])2717You should run autoupdate.], [../../lib/autoconf/general.m4:2602: AC_TRY_COMPILE is expanded from...
2718m4trace:configure.ac:982: -1- m4_pattern_allow([^DOT$])2718configure.ac:961: the top level])
2719m4trace:configure.ac:983: -1- m4_pattern_allow([^HAVE_DOT$])2719m4trace:configure.ac:980: -1- m4_pattern_allow([^have_doxygen$])
2720m4trace:configure.ac:985: -1- m4_pattern_allow([^MSCGEN$])2720m4trace:configure.ac:987: -1- m4_pattern_allow([^DOT$])
2721m4trace:configure.ac:993: -1- m4_pattern_allow([^MSCGEN_DIR$])2721m4trace:configure.ac:994: -1- m4_pattern_allow([^DOT$])
2722m4trace:configure.ac:1092: -1- AM_CONDITIONAL([BUILD_HGFSMOUNTER], [test "$buildHgfsmounter" = "yes"])2722m4trace:configure.ac:995: -1- m4_pattern_allow([^HAVE_DOT$])
2723m4trace:configure.ac:1092: -1- m4_pattern_allow([^BUILD_HGFSMOUNTER_TRUE$])2723m4trace:configure.ac:997: -1- m4_pattern_allow([^MSCGEN$])
2724m4trace:configure.ac:1092: -1- m4_pattern_allow([^BUILD_HGFSMOUNTER_FALSE$])2724m4trace:configure.ac:1005: -1- m4_pattern_allow([^MSCGEN_DIR$])
2725m4trace:configure.ac:1092: -1- _AM_SUBST_NOTMAKE([BUILD_HGFSMOUNTER_TRUE])2725m4trace:configure.ac:1105: -1- AM_CONDITIONAL([BUILD_HGFSMOUNTER], [test "$buildHgfsmounter" = "yes"])
2726m4trace:configure.ac:1092: -1- _AM_SUBST_NOTMAKE([BUILD_HGFSMOUNTER_FALSE])2726m4trace:configure.ac:1105: -1- m4_pattern_allow([^BUILD_HGFSMOUNTER_TRUE$])
2727m4trace:configure.ac:1093: -1- AM_CONDITIONAL([LINUX], [test "$os" = "linux"])2727m4trace:configure.ac:1105: -1- m4_pattern_allow([^BUILD_HGFSMOUNTER_FALSE$])
2728m4trace:configure.ac:1093: -1- m4_pattern_allow([^LINUX_TRUE$])2728m4trace:configure.ac:1105: -1- _AM_SUBST_NOTMAKE([BUILD_HGFSMOUNTER_TRUE])
2729m4trace:configure.ac:1093: -1- m4_pattern_allow([^LINUX_FALSE$])2729m4trace:configure.ac:1105: -1- _AM_SUBST_NOTMAKE([BUILD_HGFSMOUNTER_FALSE])
2730m4trace:configure.ac:1093: -1- _AM_SUBST_NOTMAKE([LINUX_TRUE])2730m4trace:configure.ac:1106: -1- AM_CONDITIONAL([LINUX], [test "$os" = "linux"])
2731m4trace:configure.ac:1093: -1- _AM_SUBST_NOTMAKE([LINUX_FALSE])2731m4trace:configure.ac:1106: -1- m4_pattern_allow([^LINUX_TRUE$])
2732m4trace:configure.ac:1094: -1- AM_CONDITIONAL([SOLARIS], [test "$os" = "solaris"])2732m4trace:configure.ac:1106: -1- m4_pattern_allow([^LINUX_FALSE$])
2733m4trace:configure.ac:1094: -1- m4_pattern_allow([^SOLARIS_TRUE$])2733m4trace:configure.ac:1106: -1- _AM_SUBST_NOTMAKE([LINUX_TRUE])
2734m4trace:configure.ac:1094: -1- m4_pattern_allow([^SOLARIS_FALSE$])2734m4trace:configure.ac:1106: -1- _AM_SUBST_NOTMAKE([LINUX_FALSE])
2735m4trace:configure.ac:1094: -1- _AM_SUBST_NOTMAKE([SOLARIS_TRUE])2735m4trace:configure.ac:1107: -1- AM_CONDITIONAL([SOLARIS], [test "$os" = "solaris"])
2736m4trace:configure.ac:1094: -1- _AM_SUBST_NOTMAKE([SOLARIS_FALSE])2736m4trace:configure.ac:1107: -1- m4_pattern_allow([^SOLARIS_TRUE$])
2737m4trace:configure.ac:1095: -1- AM_CONDITIONAL([FREEBSD], [test "$os" = "freebsd"])2737m4trace:configure.ac:1107: -1- m4_pattern_allow([^SOLARIS_FALSE$])
2738m4trace:configure.ac:1095: -1- m4_pattern_allow([^FREEBSD_TRUE$])2738m4trace:configure.ac:1107: -1- _AM_SUBST_NOTMAKE([SOLARIS_TRUE])
2739m4trace:configure.ac:1095: -1- m4_pattern_allow([^FREEBSD_FALSE$])2739m4trace:configure.ac:1107: -1- _AM_SUBST_NOTMAKE([SOLARIS_FALSE])
2740m4trace:configure.ac:1095: -1- _AM_SUBST_NOTMAKE([FREEBSD_TRUE])2740m4trace:configure.ac:1108: -1- AM_CONDITIONAL([FREEBSD], [test "$os" = "freebsd"])
2741m4trace:configure.ac:1095: -1- _AM_SUBST_NOTMAKE([FREEBSD_FALSE])2741m4trace:configure.ac:1108: -1- m4_pattern_allow([^FREEBSD_TRUE$])
2742m4trace:configure.ac:1096: -1- AM_CONDITIONAL([FREEBSD_CUSTOM_SYSDIR], [test "$os" = "freebsd" -a -n "$SYSDIR"])2742m4trace:configure.ac:1108: -1- m4_pattern_allow([^FREEBSD_FALSE$])
2743m4trace:configure.ac:1096: -1- m4_pattern_allow([^FREEBSD_CUSTOM_SYSDIR_TRUE$])2743m4trace:configure.ac:1108: -1- _AM_SUBST_NOTMAKE([FREEBSD_TRUE])
2744m4trace:configure.ac:1096: -1- m4_pattern_allow([^FREEBSD_CUSTOM_SYSDIR_FALSE$])2744m4trace:configure.ac:1108: -1- _AM_SUBST_NOTMAKE([FREEBSD_FALSE])
2745m4trace:configure.ac:1096: -1- _AM_SUBST_NOTMAKE([FREEBSD_CUSTOM_SYSDIR_TRUE])2745m4trace:configure.ac:1109: -1- AM_CONDITIONAL([FREEBSD_CUSTOM_SYSDIR], [test "$os" = "freebsd" -a -n "$SYSDIR"])
2746m4trace:configure.ac:1096: -1- _AM_SUBST_NOTMAKE([FREEBSD_CUSTOM_SYSDIR_FALSE])2746m4trace:configure.ac:1109: -1- m4_pattern_allow([^FREEBSD_CUSTOM_SYSDIR_TRUE$])
2747m4trace:configure.ac:1097: -1- AM_CONDITIONAL([THIRTY_TWO_BIT_USERSPACE], [test "$userSpaceBitness" = "32"])2747m4trace:configure.ac:1109: -1- m4_pattern_allow([^FREEBSD_CUSTOM_SYSDIR_FALSE$])
2748m4trace:configure.ac:1097: -1- m4_pattern_allow([^THIRTY_TWO_BIT_USERSPACE_TRUE$])2748m4trace:configure.ac:1109: -1- _AM_SUBST_NOTMAKE([FREEBSD_CUSTOM_SYSDIR_TRUE])
2749m4trace:configure.ac:1097: -1- m4_pattern_allow([^THIRTY_TWO_BIT_USERSPACE_FALSE$])2749m4trace:configure.ac:1109: -1- _AM_SUBST_NOTMAKE([FREEBSD_CUSTOM_SYSDIR_FALSE])
2750m4trace:configure.ac:1097: -1- _AM_SUBST_NOTMAKE([THIRTY_TWO_BIT_USERSPACE_TRUE])2750m4trace:configure.ac:1110: -1- AM_CONDITIONAL([THIRTY_TWO_BIT_USERSPACE], [test "$userSpaceBitness" = "32"])
2751m4trace:configure.ac:1097: -1- _AM_SUBST_NOTMAKE([THIRTY_TWO_BIT_USERSPACE_FALSE])2751m4trace:configure.ac:1110: -1- m4_pattern_allow([^THIRTY_TWO_BIT_USERSPACE_TRUE$])
2752m4trace:configure.ac:1098: -1- AM_CONDITIONAL([HAVE_X11], [test "$have_x" = "yes"])2752m4trace:configure.ac:1110: -1- m4_pattern_allow([^THIRTY_TWO_BIT_USERSPACE_FALSE$])
2753m4trace:configure.ac:1098: -1- m4_pattern_allow([^HAVE_X11_TRUE$])2753m4trace:configure.ac:1110: -1- _AM_SUBST_NOTMAKE([THIRTY_TWO_BIT_USERSPACE_TRUE])
2754m4trace:configure.ac:1098: -1- m4_pattern_allow([^HAVE_X11_FALSE$])2754m4trace:configure.ac:1110: -1- _AM_SUBST_NOTMAKE([THIRTY_TWO_BIT_USERSPACE_FALSE])
2755m4trace:configure.ac:1098: -1- _AM_SUBST_NOTMAKE([HAVE_X11_TRUE])2755m4trace:configure.ac:1111: -1- AM_CONDITIONAL([HAVE_X11], [test "$have_x" = "yes"])
2756m4trace:configure.ac:1098: -1- _AM_SUBST_NOTMAKE([HAVE_X11_FALSE])2756m4trace:configure.ac:1111: -1- m4_pattern_allow([^HAVE_X11_TRUE$])
2757m4trace:configure.ac:1099: -1- AM_CONDITIONAL([HAVE_ICU], [test "$with_icu" = "yes"])2757m4trace:configure.ac:1111: -1- m4_pattern_allow([^HAVE_X11_FALSE$])
2758m4trace:configure.ac:1099: -1- m4_pattern_allow([^HAVE_ICU_TRUE$])2758m4trace:configure.ac:1111: -1- _AM_SUBST_NOTMAKE([HAVE_X11_TRUE])
2759m4trace:configure.ac:1099: -1- m4_pattern_allow([^HAVE_ICU_FALSE$])2759m4trace:configure.ac:1111: -1- _AM_SUBST_NOTMAKE([HAVE_X11_FALSE])
2760m4trace:configure.ac:1099: -1- _AM_SUBST_NOTMAKE([HAVE_ICU_TRUE])2760m4trace:configure.ac:1112: -1- AM_CONDITIONAL([HAVE_ICU], [test "$with_icu" = "yes"])
2761m4trace:configure.ac:1099: -1- _AM_SUBST_NOTMAKE([HAVE_ICU_FALSE])2761m4trace:configure.ac:1112: -1- m4_pattern_allow([^HAVE_ICU_TRUE$])
2762m4trace:configure.ac:1100: -1- AM_CONDITIONAL([WITH_KERNEL_MODULES], [test "$with_kernel_modules" = "yes"])2762m4trace:configure.ac:1112: -1- m4_pattern_allow([^HAVE_ICU_FALSE$])
2763m4trace:configure.ac:1100: -1- m4_pattern_allow([^WITH_KERNEL_MODULES_TRUE$])2763m4trace:configure.ac:1112: -1- _AM_SUBST_NOTMAKE([HAVE_ICU_TRUE])
2764m4trace:configure.ac:1100: -1- m4_pattern_allow([^WITH_KERNEL_MODULES_FALSE$])2764m4trace:configure.ac:1112: -1- _AM_SUBST_NOTMAKE([HAVE_ICU_FALSE])
2765m4trace:configure.ac:1100: -1- _AM_SUBST_NOTMAKE([WITH_KERNEL_MODULES_TRUE])2765m4trace:configure.ac:1113: -1- AM_CONDITIONAL([WITH_KERNEL_MODULES], [test "$with_kernel_modules" = "yes"])
2766m4trace:configure.ac:1100: -1- _AM_SUBST_NOTMAKE([WITH_KERNEL_MODULES_FALSE])2766m4trace:configure.ac:1113: -1- m4_pattern_allow([^WITH_KERNEL_MODULES_TRUE$])
2767m4trace:configure.ac:1101: -1- AM_CONDITIONAL([HAVE_XSM], [test "$have_xsm" = "yes"])2767m4trace:configure.ac:1113: -1- m4_pattern_allow([^WITH_KERNEL_MODULES_FALSE$])
2768m4trace:configure.ac:1101: -1- m4_pattern_allow([^HAVE_XSM_TRUE$])2768m4trace:configure.ac:1113: -1- _AM_SUBST_NOTMAKE([WITH_KERNEL_MODULES_TRUE])
2769m4trace:configure.ac:1101: -1- m4_pattern_allow([^HAVE_XSM_FALSE$])2769m4trace:configure.ac:1113: -1- _AM_SUBST_NOTMAKE([WITH_KERNEL_MODULES_FALSE])
2770m4trace:configure.ac:1101: -1- _AM_SUBST_NOTMAKE([HAVE_XSM_TRUE])2770m4trace:configure.ac:1114: -1- AM_CONDITIONAL([HAVE_XSM], [test "$have_xsm" = "yes"])
2771m4trace:configure.ac:1101: -1- _AM_SUBST_NOTMAKE([HAVE_XSM_FALSE])2771m4trace:configure.ac:1114: -1- m4_pattern_allow([^HAVE_XSM_TRUE$])
2772m4trace:configure.ac:1102: -1- AM_CONDITIONAL([HAVE_XCOMPOSITE], [test "$have_xcomposite" = "yes"])2772m4trace:configure.ac:1114: -1- m4_pattern_allow([^HAVE_XSM_FALSE$])
2773m4trace:configure.ac:1102: -1- m4_pattern_allow([^HAVE_XCOMPOSITE_TRUE$])2773m4trace:configure.ac:1114: -1- _AM_SUBST_NOTMAKE([HAVE_XSM_TRUE])
2774m4trace:configure.ac:1102: -1- m4_pattern_allow([^HAVE_XCOMPOSITE_FALSE$])2774m4trace:configure.ac:1114: -1- _AM_SUBST_NOTMAKE([HAVE_XSM_FALSE])
2775m4trace:configure.ac:1102: -1- _AM_SUBST_NOTMAKE([HAVE_XCOMPOSITE_TRUE])2775m4trace:configure.ac:1115: -1- AM_CONDITIONAL([HAVE_XCOMPOSITE], [test "$have_xcomposite" = "yes"])
2776m4trace:configure.ac:1102: -1- _AM_SUBST_NOTMAKE([HAVE_XCOMPOSITE_FALSE])2776m4trace:configure.ac:1115: -1- m4_pattern_allow([^HAVE_XCOMPOSITE_TRUE$])
2777m4trace:configure.ac:1103: -1- AM_CONDITIONAL([ENABLE_UNITY], [test "$enable_unity" = "yes"])2777m4trace:configure.ac:1115: -1- m4_pattern_allow([^HAVE_XCOMPOSITE_FALSE$])
2778m4trace:configure.ac:1103: -1- m4_pattern_allow([^ENABLE_UNITY_TRUE$])2778m4trace:configure.ac:1115: -1- _AM_SUBST_NOTMAKE([HAVE_XCOMPOSITE_TRUE])
2779m4trace:configure.ac:1103: -1- m4_pattern_allow([^ENABLE_UNITY_FALSE$])2779m4trace:configure.ac:1115: -1- _AM_SUBST_NOTMAKE([HAVE_XCOMPOSITE_FALSE])
2780m4trace:configure.ac:1103: -1- _AM_SUBST_NOTMAKE([ENABLE_UNITY_TRUE])2780m4trace:configure.ac:1116: -1- AM_CONDITIONAL([ENABLE_UNITY], [test "$enable_unity" = "yes"])
2781m4trace:configure.ac:1103: -1- _AM_SUBST_NOTMAKE([ENABLE_UNITY_FALSE])2781m4trace:configure.ac:1116: -1- m4_pattern_allow([^ENABLE_UNITY_TRUE$])
2782m4trace:configure.ac:1104: -1- AM_CONDITIONAL([ENABLE_TESTS], [test "$have_cunit" = "yes"])2782m4trace:configure.ac:1116: -1- m4_pattern_allow([^ENABLE_UNITY_FALSE$])
2783m4trace:configure.ac:1104: -1- m4_pattern_allow([^ENABLE_TESTS_TRUE$])2783m4trace:configure.ac:1116: -1- _AM_SUBST_NOTMAKE([ENABLE_UNITY_TRUE])
2784m4trace:configure.ac:1104: -1- m4_pattern_allow([^ENABLE_TESTS_FALSE$])2784m4trace:configure.ac:1116: -1- _AM_SUBST_NOTMAKE([ENABLE_UNITY_FALSE])
2785m4trace:configure.ac:1104: -1- _AM_SUBST_NOTMAKE([ENABLE_TESTS_TRUE])2785m4trace:configure.ac:1117: -1- AM_CONDITIONAL([ENABLE_TESTS], [test "$have_cunit" = "yes"])
2786m4trace:configure.ac:1104: -1- _AM_SUBST_NOTMAKE([ENABLE_TESTS_FALSE])2786m4trace:configure.ac:1117: -1- m4_pattern_allow([^ENABLE_TESTS_TRUE$])
2787m4trace:configure.ac:1105: -1- AM_CONDITIONAL([WITH_ROOT_PRIVILEGES], [test "$with_root_privileges" = "yes"])2787m4trace:configure.ac:1117: -1- m4_pattern_allow([^ENABLE_TESTS_FALSE$])
2788m4trace:configure.ac:1105: -1- m4_pattern_allow([^WITH_ROOT_PRIVILEGES_TRUE$])2788m4trace:configure.ac:1117: -1- _AM_SUBST_NOTMAKE([ENABLE_TESTS_TRUE])
2789m4trace:configure.ac:1105: -1- m4_pattern_allow([^WITH_ROOT_PRIVILEGES_FALSE$])2789m4trace:configure.ac:1117: -1- _AM_SUBST_NOTMAKE([ENABLE_TESTS_FALSE])
2790m4trace:configure.ac:1105: -1- _AM_SUBST_NOTMAKE([WITH_ROOT_PRIVILEGES_TRUE])2790m4trace:configure.ac:1118: -1- AM_CONDITIONAL([WITH_ROOT_PRIVILEGES], [test "$with_root_privileges" = "yes"])
2791m4trace:configure.ac:1105: -1- _AM_SUBST_NOTMAKE([WITH_ROOT_PRIVILEGES_FALSE])2791m4trace:configure.ac:1118: -1- m4_pattern_allow([^WITH_ROOT_PRIVILEGES_TRUE$])
2792m4trace:configure.ac:1106: -1- AM_CONDITIONAL([HAVE_DNET], [test "$have_dnet" = "yes"])2792m4trace:configure.ac:1118: -1- m4_pattern_allow([^WITH_ROOT_PRIVILEGES_FALSE$])
2793m4trace:configure.ac:1106: -1- m4_pattern_allow([^HAVE_DNET_TRUE$])2793m4trace:configure.ac:1118: -1- _AM_SUBST_NOTMAKE([WITH_ROOT_PRIVILEGES_TRUE])
2794m4trace:configure.ac:1106: -1- m4_pattern_allow([^HAVE_DNET_FALSE$])2794m4trace:configure.ac:1118: -1- _AM_SUBST_NOTMAKE([WITH_ROOT_PRIVILEGES_FALSE])
2795m4trace:configure.ac:1106: -1- _AM_SUBST_NOTMAKE([HAVE_DNET_TRUE])2795m4trace:configure.ac:1119: -1- AM_CONDITIONAL([HAVE_DNET], [test "$have_dnet" = "yes"])
2796m4trace:configure.ac:1106: -1- _AM_SUBST_NOTMAKE([HAVE_DNET_FALSE])2796m4trace:configure.ac:1119: -1- m4_pattern_allow([^HAVE_DNET_TRUE$])
2797m4trace:configure.ac:1107: -1- AM_CONDITIONAL([HAVE_DOXYGEN], [test "$have_doxygen" = "yes"])2797m4trace:configure.ac:1119: -1- m4_pattern_allow([^HAVE_DNET_FALSE$])
2798m4trace:configure.ac:1107: -1- m4_pattern_allow([^HAVE_DOXYGEN_TRUE$])2798m4trace:configure.ac:1119: -1- _AM_SUBST_NOTMAKE([HAVE_DNET_TRUE])
2799m4trace:configure.ac:1107: -1- m4_pattern_allow([^HAVE_DOXYGEN_FALSE$])2799m4trace:configure.ac:1119: -1- _AM_SUBST_NOTMAKE([HAVE_DNET_FALSE])
2800m4trace:configure.ac:1107: -1- _AM_SUBST_NOTMAKE([HAVE_DOXYGEN_TRUE])2800m4trace:configure.ac:1120: -1- AM_CONDITIONAL([HAVE_DOXYGEN], [test "$have_doxygen" = "yes"])
2801m4trace:configure.ac:1107: -1- _AM_SUBST_NOTMAKE([HAVE_DOXYGEN_FALSE])2801m4trace:configure.ac:1120: -1- m4_pattern_allow([^HAVE_DOXYGEN_TRUE$])
2802m4trace:configure.ac:1108: -1- AM_CONDITIONAL([HAVE_FUSE], [test "$have_fuse" = "yes"])2802m4trace:configure.ac:1120: -1- m4_pattern_allow([^HAVE_DOXYGEN_FALSE$])
2803m4trace:configure.ac:1108: -1- m4_pattern_allow([^HAVE_FUSE_TRUE$])2803m4trace:configure.ac:1120: -1- _AM_SUBST_NOTMAKE([HAVE_DOXYGEN_TRUE])
2804m4trace:configure.ac:1108: -1- m4_pattern_allow([^HAVE_FUSE_FALSE$])2804m4trace:configure.ac:1120: -1- _AM_SUBST_NOTMAKE([HAVE_DOXYGEN_FALSE])
2805m4trace:configure.ac:1108: -1- _AM_SUBST_NOTMAKE([HAVE_FUSE_TRUE])2805m4trace:configure.ac:1121: -1- AM_CONDITIONAL([HAVE_FUSE], [test "$have_fuse" = "yes"])
2806m4trace:configure.ac:1108: -1- _AM_SUBST_NOTMAKE([HAVE_FUSE_FALSE])2806m4trace:configure.ac:1121: -1- m4_pattern_allow([^HAVE_FUSE_TRUE$])
2807m4trace:configure.ac:1109: -1- AM_CONDITIONAL([HAVE_GNU_LD], [test "$with_gnu_ld" = "yes"])2807m4trace:configure.ac:1121: -1- m4_pattern_allow([^HAVE_FUSE_FALSE$])
2808m4trace:configure.ac:1109: -1- m4_pattern_allow([^HAVE_GNU_LD_TRUE$])2808m4trace:configure.ac:1121: -1- _AM_SUBST_NOTMAKE([HAVE_FUSE_TRUE])
2809m4trace:configure.ac:1109: -1- m4_pattern_allow([^HAVE_GNU_LD_FALSE$])2809m4trace:configure.ac:1121: -1- _AM_SUBST_NOTMAKE([HAVE_FUSE_FALSE])
2810m4trace:configure.ac:1109: -1- _AM_SUBST_NOTMAKE([HAVE_GNU_LD_TRUE])2810m4trace:configure.ac:1122: -1- AM_CONDITIONAL([HAVE_GNU_LD], [test "$with_gnu_ld" = "yes"])
2811m4trace:configure.ac:1109: -1- _AM_SUBST_NOTMAKE([HAVE_GNU_LD_FALSE])2811m4trace:configure.ac:1122: -1- m4_pattern_allow([^HAVE_GNU_LD_TRUE$])
2812m4trace:configure.ac:1110: -1- AM_CONDITIONAL([HAVE_GTKMM], [test "$have_x" = "yes" -a "$with_gtkmm" = "yes"])2812m4trace:configure.ac:1122: -1- m4_pattern_allow([^HAVE_GNU_LD_FALSE$])
2813m4trace:configure.ac:1110: -1- m4_pattern_allow([^HAVE_GTKMM_TRUE$])2813m4trace:configure.ac:1122: -1- _AM_SUBST_NOTMAKE([HAVE_GNU_LD_TRUE])
2814m4trace:configure.ac:1110: -1- m4_pattern_allow([^HAVE_GTKMM_FALSE$])2814m4trace:configure.ac:1122: -1- _AM_SUBST_NOTMAKE([HAVE_GNU_LD_FALSE])
2815m4trace:configure.ac:1110: -1- _AM_SUBST_NOTMAKE([HAVE_GTKMM_TRUE])2815m4trace:configure.ac:1123: -1- AM_CONDITIONAL([HAVE_GTKMM], [test "$have_x" = "yes" -a "$with_gtkmm" = "yes"])
2816m4trace:configure.ac:1110: -1- _AM_SUBST_NOTMAKE([HAVE_GTKMM_FALSE])2816m4trace:configure.ac:1123: -1- m4_pattern_allow([^HAVE_GTKMM_TRUE$])
2817m4trace:configure.ac:1111: -1- AM_CONDITIONAL([HAVE_PAM], [test "$with_pam" = "yes"])2817m4trace:configure.ac:1123: -1- m4_pattern_allow([^HAVE_GTKMM_FALSE$])
2818m4trace:configure.ac:1111: -1- m4_pattern_allow([^HAVE_PAM_TRUE$])2818m4trace:configure.ac:1123: -1- _AM_SUBST_NOTMAKE([HAVE_GTKMM_TRUE])
2819m4trace:configure.ac:1111: -1- m4_pattern_allow([^HAVE_PAM_FALSE$])2819m4trace:configure.ac:1123: -1- _AM_SUBST_NOTMAKE([HAVE_GTKMM_FALSE])
2820m4trace:configure.ac:1111: -1- _AM_SUBST_NOTMAKE([HAVE_PAM_TRUE])2820m4trace:configure.ac:1124: -1- AM_CONDITIONAL([HAVE_PAM], [test "$with_pam" = "yes"])
2821m4trace:configure.ac:1111: -1- _AM_SUBST_NOTMAKE([HAVE_PAM_FALSE])2821m4trace:configure.ac:1124: -1- m4_pattern_allow([^HAVE_PAM_TRUE$])
2822m4trace:configure.ac:1112: -1- AM_CONDITIONAL([USE_SLASH_PROC], [test "os" = "linux" -a "$have_glib_2_14" = "yes"])2822m4trace:configure.ac:1124: -1- m4_pattern_allow([^HAVE_PAM_FALSE$])
2823m4trace:configure.ac:1112: -1- m4_pattern_allow([^USE_SLASH_PROC_TRUE$])2823m4trace:configure.ac:1124: -1- _AM_SUBST_NOTMAKE([HAVE_PAM_TRUE])
2824m4trace:configure.ac:1112: -1- m4_pattern_allow([^USE_SLASH_PROC_FALSE$])2824m4trace:configure.ac:1124: -1- _AM_SUBST_NOTMAKE([HAVE_PAM_FALSE])
2825m4trace:configure.ac:1112: -1- _AM_SUBST_NOTMAKE([USE_SLASH_PROC_TRUE])2825m4trace:configure.ac:1125: -1- AM_CONDITIONAL([USE_SLASH_PROC], [test "os" = "linux" -a "$have_glib_2_14" = "yes"])
2826m4trace:configure.ac:1112: -1- _AM_SUBST_NOTMAKE([USE_SLASH_PROC_FALSE])2826m4trace:configure.ac:1125: -1- m4_pattern_allow([^USE_SLASH_PROC_TRUE$])
2827m4trace:configure.ac:1115: -1- m4_pattern_allow([^NO_XSM$])2827m4trace:configure.ac:1125: -1- m4_pattern_allow([^USE_SLASH_PROC_FALSE$])
2828m4trace:configure.ac:1119: -1- m4_pattern_allow([^NO_XCOMPOSITE$])2828m4trace:configure.ac:1125: -1- _AM_SUBST_NOTMAKE([USE_SLASH_PROC_TRUE])
2829m4trace:configure.ac:1131: -1- m4_pattern_allow([^NO_MULTIMON$])2829m4trace:configure.ac:1125: -1- _AM_SUBST_NOTMAKE([USE_SLASH_PROC_FALSE])
2830m4trace:configure.ac:1173: -1- m4_pattern_allow([^HGFS_LIBS$])2830m4trace:configure.ac:1128: -1- m4_pattern_allow([^NO_XSM$])
2831m4trace:configure.ac:1174: -1- m4_pattern_allow([^TOOLS_VERSION$])2831m4trace:configure.ac:1132: -1- m4_pattern_allow([^NO_XCOMPOSITE$])
2832m4trace:configure.ac:1175: -1- m4_pattern_allow([^TARGET_OS$])2832m4trace:configure.ac:1144: -1- m4_pattern_allow([^NO_MULTIMON$])
2833m4trace:configure.ac:1176: -1- m4_pattern_allow([^KERNEL_RELEASE$])2833m4trace:configure.ac:1186: -1- m4_pattern_allow([^HGFS_LIBS$])
2834m4trace:configure.ac:1177: -1- m4_pattern_allow([^LINUXINCLUDE$])2834m4trace:configure.ac:1187: -1- m4_pattern_allow([^TOOLS_VERSION$])
2835m4trace:configure.ac:1178: -1- m4_pattern_allow([^MODULES_OS$])2835m4trace:configure.ac:1188: -1- m4_pattern_allow([^TARGET_OS$])
2836m4trace:configure.ac:1179: -1- m4_pattern_allow([^MODULES_DIR$])2836m4trace:configure.ac:1189: -1- m4_pattern_allow([^KERNEL_RELEASE$])
2837m4trace:configure.ac:1180: -1- m4_pattern_allow([^MODULES$])2837m4trace:configure.ac:1190: -1- m4_pattern_allow([^LINUXINCLUDE$])
2838m4trace:configure.ac:1181: -1- m4_pattern_allow([^COMMON_XLIBS$])2838m4trace:configure.ac:1191: -1- m4_pattern_allow([^MODULES_OS$])
2839m4trace:configure.ac:1182: -1- m4_pattern_allow([^XSM_LIBS$])2839m4trace:configure.ac:1192: -1- m4_pattern_allow([^MODULES_DIR$])
2840m4trace:configure.ac:1183: -1- m4_pattern_allow([^XCOMPOSITE_LIBS$])2840m4trace:configure.ac:1193: -1- m4_pattern_allow([^MODULES$])
2841m4trace:configure.ac:1184: -1- m4_pattern_allow([^PAM_PREFIX$])2841m4trace:configure.ac:1194: -1- m4_pattern_allow([^COMMON_XLIBS$])
2842m4trace:configure.ac:1185: -1- m4_pattern_allow([^PLUGIN_CPPFLAGS$])2842m4trace:configure.ac:1195: -1- m4_pattern_allow([^XSM_LIBS$])
2843m4trace:configure.ac:1186: -1- m4_pattern_allow([^PLUGIN_LDFLAGS$])2843m4trace:configure.ac:1196: -1- m4_pattern_allow([^XCOMPOSITE_LIBS$])
2844m4trace:configure.ac:1187: -1- m4_pattern_allow([^VMTOOLS_CPPFLAGS$])2844m4trace:configure.ac:1197: -1- m4_pattern_allow([^PAM_PREFIX$])
2845m4trace:configure.ac:1188: -1- m4_pattern_allow([^VMTOOLS_LIBS$])2845m4trace:configure.ac:1198: -1- m4_pattern_allow([^PLUGIN_CPPFLAGS$])
2846m4trace:configure.ac:1189: -1- m4_pattern_allow([^RPCGENFLAGS$])2846m4trace:configure.ac:1199: -1- m4_pattern_allow([^PLUGIN_LDFLAGS$])
2847m4trace:configure.ac:1190: -1- m4_pattern_allow([^XDR_LIBS$])2847m4trace:configure.ac:1200: -1- m4_pattern_allow([^VMTOOLS_CPPFLAGS$])
2848m4trace:configure.ac:1191: -1- m4_pattern_allow([^TEST_PLUGIN_INSTALLDIR$])2848m4trace:configure.ac:1201: -1- m4_pattern_allow([^VMTOOLS_LIBS$])
2849m4trace:configure.ac:1192: -1- m4_pattern_allow([^COMMON_PLUGIN_INSTALLDIR$])2849m4trace:configure.ac:1202: -1- m4_pattern_allow([^RPCGENFLAGS$])
2850m4trace:configure.ac:1193: -1- m4_pattern_allow([^VMSVC_PLUGIN_INSTALLDIR$])2850m4trace:configure.ac:1203: -1- m4_pattern_allow([^XDR_LIBS$])
2851m4trace:configure.ac:1194: -1- m4_pattern_allow([^VMUSR_PLUGIN_INSTALLDIR$])2851m4trace:configure.ac:1204: -1- m4_pattern_allow([^TEST_PLUGIN_INSTALLDIR$])
2852m4trace:configure.ac:1199: -1- m4_pattern_allow([^SYSDIR$])2852m4trace:configure.ac:1205: -1- m4_pattern_allow([^COMMON_PLUGIN_INSTALLDIR$])
2853m4trace:configure.ac:1201: -1- m4_pattern_allow([^INSTVMSG$])2853m4trace:configure.ac:1206: -1- m4_pattern_allow([^VMSVC_PLUGIN_INSTALLDIR$])
2854m4trace:configure.ac:1202: -1- m4_pattern_allow([^RPCGEN_WRAPPER$])2854m4trace:configure.ac:1207: -1- m4_pattern_allow([^VMUSR_PLUGIN_INSTALLDIR$])
2855m4trace:configure.ac:1206: -1- m4_pattern_allow([^LIB_AUTH_CPPFLAGS$])2855m4trace:configure.ac:1212: -1- m4_pattern_allow([^SYSDIR$])
2856m4trace:configure.ac:1207: -1- m4_pattern_allow([^LIB_IMPERSONATE_CPPFLAGS$])2856m4trace:configure.ac:1214: -1- m4_pattern_allow([^INSTVMSG$])
2857m4trace:configure.ac:1208: -1- m4_pattern_allow([^LIB_USER_CPPFLAGS$])2857m4trace:configure.ac:1215: -1- m4_pattern_allow([^RPCGEN_WRAPPER$])
2858m4trace:configure.ac:1209: -1- m4_pattern_allow([^LIBVMTOOLS_LIBADD$])2858m4trace:configure.ac:1219: -1- m4_pattern_allow([^LIB_AUTH_CPPFLAGS$])
2859m4trace:configure.ac:1213: -1- m4_pattern_allow([^VIX_LIBADD$])2859m4trace:configure.ac:1220: -1- m4_pattern_allow([^LIB_IMPERSONATE_CPPFLAGS$])
2860m4trace:configure.ac:1306: -1- m4_pattern_allow([^LIB@&t@OBJS$])2860m4trace:configure.ac:1221: -1- m4_pattern_allow([^LIB_USER_CPPFLAGS$])
2861m4trace:configure.ac:1306: -1- m4_pattern_allow([^LTLIBOBJS$])2861m4trace:configure.ac:1222: -1- m4_pattern_allow([^LIBVMTOOLS_LIBADD$])
2862m4trace:configure.ac:1306: -1- AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])2862m4trace:configure.ac:1226: -1- m4_pattern_allow([^VIX_LIBADD$])
2863m4trace:configure.ac:1306: -1- m4_pattern_allow([^am__EXEEXT_TRUE$])2863m4trace:configure.ac:1319: -1- m4_pattern_allow([^LIB@&t@OBJS$])
2864m4trace:configure.ac:1306: -1- m4_pattern_allow([^am__EXEEXT_FALSE$])2864m4trace:configure.ac:1319: -1- m4_pattern_allow([^LTLIBOBJS$])
2865m4trace:configure.ac:1306: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_TRUE])2865m4trace:configure.ac:1319: -1- AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])
2866m4trace:configure.ac:1306: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_FALSE])2866m4trace:configure.ac:1319: -1- m4_pattern_allow([^am__EXEEXT_TRUE$])
2867m4trace:configure.ac:1306: -1- _AM_OUTPUT_DEPENDENCY_COMMANDS2867m4trace:configure.ac:1319: -1- m4_pattern_allow([^am__EXEEXT_FALSE$])
2868m4trace:configure.ac:1306: -1- _LT_PROG_LTMAIN2868m4trace:configure.ac:1319: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_TRUE])
2869m4trace:configure.ac:1319: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_FALSE])
2870m4trace:configure.ac:1319: -1- _AM_OUTPUT_DEPENDENCY_COMMANDS
2871m4trace:configure.ac:1319: -1- _LT_PROG_LTMAIN
28692872
=== modified file 'configure'
--- configure 2011-07-22 16:41:03 +0000
+++ configure 2011-10-31 00:22:23 +0000
@@ -1,6 +1,6 @@
1#! /bin/sh1#! /bin/sh
2# Guess values for system-dependent variables and create Makefiles.2# Guess values for system-dependent variables and create Makefiles.
3# Generated by GNU Autoconf 2.67 for open-vm-tools 2011.07.19.3# Generated by GNU Autoconf 2.67 for open-vm-tools 2011.08.21.
4#4#
5# Report bugs to <open-vm-tools-devel@lists.sourceforge.net>.5# Report bugs to <open-vm-tools-devel@lists.sourceforge.net>.
6#6#
@@ -701,8 +701,8 @@
701# Identity of this package.701# Identity of this package.
702PACKAGE_NAME='open-vm-tools'702PACKAGE_NAME='open-vm-tools'
703PACKAGE_TARNAME='open-vm-tools'703PACKAGE_TARNAME='open-vm-tools'
704PACKAGE_VERSION='2011.07.19'704PACKAGE_VERSION='2011.08.21'
705PACKAGE_STRING='open-vm-tools 2011.07.19'705PACKAGE_STRING='open-vm-tools 2011.08.21'
706PACKAGE_BUGREPORT='open-vm-tools-devel@lists.sourceforge.net'706PACKAGE_BUGREPORT='open-vm-tools-devel@lists.sourceforge.net'
707PACKAGE_URL=''707PACKAGE_URL=''
708708
@@ -1561,7 +1561,7 @@
1561 # Omit some internal or obsolete options to make the list less imposing.1561 # Omit some internal or obsolete options to make the list less imposing.
1562 # This message is too long to be a string in the A/UX 3.1 sh.1562 # This message is too long to be a string in the A/UX 3.1 sh.
1563 cat <<_ACEOF1563 cat <<_ACEOF
1564\`configure' configures open-vm-tools 2011.07.19 to adapt to many kinds of systems.1564\`configure' configures open-vm-tools 2011.08.21 to adapt to many kinds of systems.
15651565
1566Usage: $0 [OPTION]... [VAR=VALUE]...1566Usage: $0 [OPTION]... [VAR=VALUE]...
15671567
@@ -1635,7 +1635,7 @@
16351635
1636if test -n "$ac_init_help"; then1636if test -n "$ac_init_help"; then
1637 case $ac_init_help in1637 case $ac_init_help in
1638 short | recursive ) echo "Configuration of open-vm-tools 2011.07.19:";;1638 short | recursive ) echo "Configuration of open-vm-tools 2011.08.21:";;
1639 esac1639 esac
1640 cat <<\_ACEOF1640 cat <<\_ACEOF
16411641
@@ -1762,7 +1762,7 @@
1762test -n "$ac_init_help" && exit $ac_status1762test -n "$ac_init_help" && exit $ac_status
1763if $ac_init_version; then1763if $ac_init_version; then
1764 cat <<\_ACEOF1764 cat <<\_ACEOF
1765open-vm-tools configure 2011.07.191765open-vm-tools configure 2011.08.21
1766generated by GNU Autoconf 2.671766generated by GNU Autoconf 2.67
17671767
1768Copyright (C) 2010 Free Software Foundation, Inc.1768Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2454,7 +2454,7 @@
2454This file contains any messages produced by compilers while2454This file contains any messages produced by compilers while
2455running configure, to aid debugging if configure makes a mistake.2455running configure, to aid debugging if configure makes a mistake.
24562456
2457It was created by open-vm-tools $as_me 2011.07.19, which was2457It was created by open-vm-tools $as_me 2011.08.21, which was
2458generated by GNU Autoconf 2.67. Invocation command line was2458generated by GNU Autoconf 2.67. Invocation command line was
24592459
2460 $ $0 $@2460 $ $0 $@
@@ -3529,7 +3529,7 @@
35293529
3530# Define the identity of the package.3530# Define the identity of the package.
3531 PACKAGE='open-vm-tools'3531 PACKAGE='open-vm-tools'
3532 VERSION='2011.07.19'3532 VERSION='2011.08.21'
35333533
35343534
3535cat >>confdefs.h <<_ACEOF3535cat >>confdefs.h <<_ACEOF
@@ -22584,6 +22584,34 @@
22584rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext22584rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
22585CFLAGS="$ORIGINAL_CFLAGS"22585CFLAGS="$ORIGINAL_CFLAGS"
2258622586
22587# Detect "unused-but-set-variable" gcc warning and disable it.
22588ORIGINAL_CFLAGS="$CFLAGS"
22589CFLAGS="$CFLAGS -Wno-unused-but-set-variable"
22590{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GCC flag -Wno-unused-but-set-variable" >&5
22591$as_echo_n "checking for GCC flag -Wno-unused-but-set-variable... " >&6; }
22592cat confdefs.h - <<_ACEOF >conftest.$ac_ext
22593/* end confdefs.h. */
22594
22595int
22596main ()
22597{
22598return 0;
22599 ;
22600 return 0;
22601}
22602_ACEOF
22603if ac_fn_c_try_compile "$LINENO"; then :
22604 ORIGINAL_CFLAGS="$ORIGINAL_CFLAGS -Wno-unused-but-set-variable";
22605 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
22606$as_echo "yes" >&6; }
22607else
22608 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
22609$as_echo "no" >&6; }
22610fi
22611rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
22612CFLAGS="$ORIGINAL_CFLAGS"
22613
22614
22587BUILDDIR="`pwd`"22615BUILDDIR="`pwd`"
2258822616
22589INCLUDE_DIR="`cd $srcdir; pwd`/lib/include"22617INCLUDE_DIR="`cd $srcdir; pwd`/lib/include"
@@ -22767,6 +22795,7 @@
22767fi22795fi
2276822796
22769if test "$os" = "freebsd"; then22797if test "$os" = "freebsd"; then
22798 LIBVMTOOLS_LIBADD="$LIBVMTOOLS_LIBADD -lkvm"
22770 MODULES_DIR="/boot/modules"22799 MODULES_DIR="/boot/modules"
2277122800
22772 if test "$osVersion" -ge 302000; then22801 if test "$osVersion" -ge 302000; then
@@ -23773,7 +23802,7 @@
23773# report actual input values of CONFIG_FILES etc. instead of their23802# report actual input values of CONFIG_FILES etc. instead of their
23774# values after options handling.23803# values after options handling.
23775ac_log="23804ac_log="
23776This file was extended by open-vm-tools $as_me 2011.07.19, which was23805This file was extended by open-vm-tools $as_me 2011.08.21, which was
23777generated by GNU Autoconf 2.67. Invocation command line was23806generated by GNU Autoconf 2.67. Invocation command line was
2377823807
23779 CONFIG_FILES = $CONFIG_FILES23808 CONFIG_FILES = $CONFIG_FILES
@@ -23830,7 +23859,7 @@
23830cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=123859cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
23831ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"23860ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
23832ac_cs_version="\\23861ac_cs_version="\\
23833open-vm-tools config.status 2011.07.1923862open-vm-tools config.status 2011.08.21
23834configured by $0, generated by GNU Autoconf 2.67,23863configured by $0, generated by GNU Autoconf 2.67,
23835 with options \\"\$ac_cs_config\\"23864 with options \\"\$ac_cs_config\\"
2383623865
2383723866
=== modified file 'configure.ac'
--- configure.ac 2011-07-22 16:41:03 +0000
+++ configure.ac 2011-10-31 00:22:23 +0000
@@ -39,10 +39,10 @@
39### Initialization39### Initialization
40###40###
4141
42TOOLS_VERSION="2011.07.19"42TOOLS_VERSION="2011.08.21"
43AC_INIT(43AC_INIT(
44 [open-vm-tools],44 [open-vm-tools],
45 [2011.07.19],45 [2011.08.21],
46 [open-vm-tools-devel@lists.sourceforge.net])46 [open-vm-tools-devel@lists.sourceforge.net])
4747
48# In order to make this configure script auto-detect situations where48# In order to make this configure script auto-detect situations where
@@ -954,6 +954,18 @@
954 [AC_MSG_RESULT(no)])954 [AC_MSG_RESULT(no)])
955CFLAGS="$ORIGINAL_CFLAGS"955CFLAGS="$ORIGINAL_CFLAGS"
956956
957# Detect "unused-but-set-variable" gcc warning and disable it.
958ORIGINAL_CFLAGS="$CFLAGS"
959CFLAGS="$CFLAGS -Wno-unused-but-set-variable"
960AC_MSG_CHECKING([for GCC flag -Wno-unused-but-set-variable])
961AC_TRY_COMPILE([],
962 [return 0;],
963 [ORIGINAL_CFLAGS="$ORIGINAL_CFLAGS -Wno-unused-but-set-variable";
964 AC_MSG_RESULT(yes)],
965 [AC_MSG_RESULT(no)])
966CFLAGS="$ORIGINAL_CFLAGS"
967
968
957BUILDDIR="`pwd`"969BUILDDIR="`pwd`"
958970
959INCLUDE_DIR="`cd $srcdir; pwd`/lib/include"971INCLUDE_DIR="`cd $srcdir; pwd`/lib/include"
@@ -1025,6 +1037,7 @@
1025fi1037fi
10261038
1027if test "$os" = "freebsd"; then1039if test "$os" = "freebsd"; then
1040 LIBVMTOOLS_LIBADD="$LIBVMTOOLS_LIBADD -lkvm"
1028 MODULES_DIR="/boot/modules"1041 MODULES_DIR="/boot/modules"
10291042
1030 if test "$osVersion" -ge 302000; then1043 if test "$osVersion" -ge 302000; then
10311044
=== removed file 'debian/README.source'
--- debian/README.source 2010-07-03 21:34:25 +0000
+++ debian/README.source 1970-01-01 00:00:00 +0000
@@ -1,37 +0,0 @@
1Package Repositories
2--------------------
3
4Backports for the current stable debian distribution as well as snapshots of
5unreleased versions may be available in repositories listed on the maintainers
6homepage. The current URL of the maintainer homepage can be seen in
7debian/copyright.
8
9
10Source Access
11-------------
12
13You can obtain the sources of this package with:
14
15 $ apt-get source ${PACKAGE}
16
17whereas '${PACKAGE}' has to be replaced with the actual name of the package.
18
19This package is maintained with the Git version control system. The current git
20source tree can be obtained with:
21
22 $ git clone ${GIT_URI}
23
24whereas '${GIT_URI}' has to be replaced with the actual URI for the Git
25repository. The current Git URI can be seen in debian/control in the extracted
26package sources.
27
28More information about Git can be found in the git-core package.
29
30This package may use the Quilt patch system to manage all modifications to the
31upstream source. Changes, if any, are stored in the source package as diffs in
32debian/diff and are applied during the build. Current modifications can be
33applied to the source tree with:
34
35 $ QUILT_PATCHES=debian/patches quilt push -a
36
37More information about Quilt can be found in the quilt package.
380
=== modified file 'debian/changelog'
--- debian/changelog 2011-07-22 16:41:03 +0000
+++ debian/changelog 2011-10-31 00:22:23 +0000
@@ -1,3 +1,31 @@
1open-vm-tools (2011.08.21-471295-0ubuntu1) precise; urgency=low
2
3 * Merge latest upstream git tag.
4
5 * Changes in debian/rules:
6 - Removed "-Wno-unused-but-set-variable" from CFLAGS.
7 + No longer needed, package now builds successfully without it.
8 - Actually remove commented out lines regarding open-vm-toolbox.
9
10 * Changes in debian/control:
11 - open-vm-tools recommends open-vm-dkms (LP: #598933)
12 - Added NumLockX as a suggested package for open-vm-tools.
13 + Temporary workaround until a proper fix is found.
14
15 * Partial merge from Debian unstable. Details below:
16 - Updating maintainer and uploaders fields.
17 - Removing vcs fields.
18 - Removing references to Daniel Baumann's old email address.
19 - Updating years in copyright file.
20 - Updating to standards version 3.9.2.
21 - Updating to debhelper version 8.
22 - Switching to source format 3.0 (quilt).
23 - Removing manual chrpath setting.
24 - Removing exclusion from plugins from debhelper shlibs.
25 - Rediffing kvers.patch.
26
27 -- Nate Muench <NowIWillDestroyAbydos@gmail.com> Sun, 30 Oct 2011 19:17:28 -0500
28
1open-vm-tools (2011.07.19-450511-0ubuntu1) oneiric; urgency=low29open-vm-tools (2011.07.19-450511-0ubuntu1) oneiric; urgency=low
230
3 * Merge latest upstream git tag. Fixes Building on Oneiric31 * Merge latest upstream git tag. Fixes Building on Oneiric
@@ -78,13 +106,13 @@
78 #579721).106 #579721).
79 * Updating standards version to 3.9.1.107 * Updating standards version to 3.9.1.
80108
81 -- Daniel Baumann <daniel@debian.org> Sat, 14 Aug 2010 12:59:39 +0200109 -- Daniel Baumann <daniel.baumann@progress-technologies.net> Sat, 14 Aug 2010 12:59:39 +0200
82110
83open-vm-tools (2010.06.16-268169-2) unstable; urgency=low111open-vm-tools (2010.06.16-268169-2) unstable; urgency=low
84112
85 * Removing vmmemctl fom initscript (Closes: #588356).113 * Removing vmmemctl fom initscript (Closes: #588356).
86114
87 -- Daniel Baumann <daniel@debian.org> Fri, 09 Jul 2010 13:19:42 +0200115 -- Daniel Baumann <daniel.baumann@progress-technologies.net> Fri, 09 Jul 2010 13:19:42 +0200
88116
89open-vm-tools (2010.06.16-268169-1) unstable; urgency=low117open-vm-tools (2010.06.16-268169-1) unstable; urgency=low
90118
@@ -95,7 +123,7 @@
95 * Dropping procps.patch, not required anymore.123 * Dropping procps.patch, not required anymore.
96 * Updating packaging for upstreams vmmemctl module removal.124 * Updating packaging for upstreams vmmemctl module removal.
97125
98 -- Daniel Baumann <daniel@debian.org> Sat, 03 Jul 2010 21:34:25 +0200126 -- Daniel Baumann <daniel.baumann@progress-technologies.net> Sat, 03 Jul 2010 21:34:25 +0200
99127
100open-vm-tools (2010.04.25-253928-2+ubuntu2) maverick; urgency=low128open-vm-tools (2010.04.25-253928-2+ubuntu2) maverick; urgency=low
101129
@@ -116,7 +144,7 @@
116 * Dropping la files.144 * Dropping la files.
117 * Updating rules for pvscsi removal (Closes: #581160).145 * Updating rules for pvscsi removal (Closes: #581160).
118146
119 -- Daniel Baumann <daniel@debian.org> Tue, 11 May 2010 20:10:45 +0200147 -- Daniel Baumann <daniel.baumann@progress-technologies.net> Tue, 11 May 2010 20:10:45 +0200
120148
121open-vm-tools (2010.04.25-253928-1) unstable; urgency=low149open-vm-tools (2010.04.25-253928-1) unstable; urgency=low
122150
@@ -125,7 +153,7 @@
125 * Removing remote_fs from initscript again (Closes: #577163).153 * Removing remote_fs from initscript again (Closes: #577163).
126 * Updating lintian overrides for open-vm-tools.154 * Updating lintian overrides for open-vm-tools.
127155
128 -- Daniel Baumann <daniel@debian.org> Thu, 29 Apr 2010 22:01:51 +0200156 -- Daniel Baumann <daniel.baumann@progress-technologies.net> Thu, 29 Apr 2010 22:01:51 +0200
129157
130open-vm-tools (2010.03.20-243334-4) unstable; urgency=low158open-vm-tools (2010.03.20-243334-4) unstable; urgency=low
131159
@@ -143,7 +171,7 @@
143 * Updating initscript start/stop declarations (Closes: #576843,171 * Updating initscript start/stop declarations (Closes: #576843,
144 #577163).172 #577163).
145173
146 -- Daniel Baumann <daniel@debian.org> Wed, 14 Apr 2010 18:59:32 +0200174 -- Daniel Baumann <daniel.baumann@progress-technologies.net> Wed, 14 Apr 2010 18:59:32 +0200
147175
148open-vm-tools (2010.03.20-243334-3) unstable; urgency=low176open-vm-tools (2010.03.20-243334-3) unstable; urgency=low
149177
@@ -155,14 +183,14 @@
155 * Adding make to open-vm-dkms depends.183 * Adding make to open-vm-dkms depends.
156 * Also stopping in runlevel 1.184 * Also stopping in runlevel 1.
157185
158 -- Daniel Baumann <daniel@debian.org> Tue, 06 Apr 2010 22:42:58 +0200186 -- Daniel Baumann <daniel.baumann@progress-technologies.net> Tue, 06 Apr 2010 22:42:58 +0200
159187
160open-vm-tools (2010.03.20-243334-2) unstable; urgency=low188open-vm-tools (2010.03.20-243334-2) unstable; urgency=low
161189
162 * Addding dkms support based on the work of Evan Broder190 * Addding dkms support based on the work of Evan Broder
163 <broder@mit.edu> on the ubuntu package (Closes: #516251).191 <broder@mit.edu> on the ubuntu package (Closes: #516251).
164192
165 -- Daniel Baumann <daniel@debian.org> Sat, 27 Mar 2010 17:09:36 +0100193 -- Daniel Baumann <daniel.baumann@progress-technologies.net> Sat, 27 Mar 2010 17:09:36 +0100
166194
167open-vm-tools (2010.03.20-243334-1) unstable; urgency=low195open-vm-tools (2010.03.20-243334-1) unstable; urgency=low
168196
@@ -171,7 +199,7 @@
171 * Moving local Makefile to subdirectory.199 * Moving local Makefile to subdirectory.
172 * Adding build-depends to libfuse-dev.200 * Adding build-depends to libfuse-dev.
173201
174 -- Daniel Baumann <daniel@debian.org> Sat, 27 Mar 2010 11:01:55 +0100202 -- Daniel Baumann <daniel.baumann@progress-technologies.net> Sat, 27 Mar 2010 11:01:55 +0100
175203
176open-vm-tools (2010.02.23-236320-1+ubuntu1) lucid; urgency=low204open-vm-tools (2010.02.23-236320-1+ubuntu1) lucid; urgency=low
177205
@@ -187,7 +215,7 @@
187 * Updating to standards 3.8.4.215 * Updating to standards 3.8.4.
188 * Merging upstream version 2010.02.23-236320.216 * Merging upstream version 2010.02.23-236320.
189217
190 -- Daniel Baumann <daniel@debian.org> Sat, 27 Feb 2010 16:34:11 +0100218 -- Daniel Baumann <daniel.baumann@progress-technologies.net> Sat, 27 Feb 2010 16:34:11 +0100
191219
192open-vm-tools (2010.01.19-226760-1) unstable; urgency=low220open-vm-tools (2010.01.19-226760-1) unstable; urgency=low
193221
@@ -197,7 +225,7 @@
197 * Updating packaging for upstreams vmxnet3 module removal.225 * Updating packaging for upstreams vmxnet3 module removal.
198 * Updating packaging for upstreams test plugin removal.226 * Updating packaging for upstreams test plugin removal.
199227
200 -- Daniel Baumann <daniel@debian.org> Sun, 24 Jan 2010 09:55:47 +0100228 -- Daniel Baumann <daniel.baumann@progress-technologies.net> Sun, 24 Jan 2010 09:55:47 +0100
201229
202open-vm-tools (2009.12.16-217847-1) unstable; urgency=low230open-vm-tools (2009.12.16-217847-1) unstable; urgency=low
203231
@@ -206,7 +234,7 @@
206 * Rediffing kvers.patch.234 * Rediffing kvers.patch.
207 * Rediffing procps.patch.235 * Rediffing procps.patch.
208236
209 -- Daniel Baumann <daniel@debian.org> Sun, 20 Dec 2009 13:36:35 +0100237 -- Daniel Baumann <daniel.baumann@progress-technologies.net> Sun, 20 Dec 2009 13:36:35 +0100
210238
211open-vm-tools (2009.11.16-210370-1+ubuntu2) lucid; urgency=low239open-vm-tools (2009.11.16-210370-1+ubuntu2) lucid; urgency=low
212240
@@ -233,13 +261,13 @@
233 * Removing test plugin.261 * Removing test plugin.
234 * Removing unused plugin symlinks.262 * Removing unused plugin symlinks.
235263
236 -- Daniel Baumann <daniel@debian.org> Sun, 06 Dec 2009 07:45:05 +0100264 -- Daniel Baumann <daniel.baumann@progress-technologies.net> Sun, 06 Dec 2009 07:45:05 +0100
237265
238open-vm-tools (2009.10.15-201664-1) unstable; urgency=low266open-vm-tools (2009.10.15-201664-1) unstable; urgency=low
239267
240 * Merging upstream version 2009.10.15-201664.268 * Merging upstream version 2009.10.15-201664.
241269
242 -- Daniel Baumann <daniel@debian.org> Sun, 18 Oct 2009 12:28:19 +0200270 -- Daniel Baumann <daniel.baumann@progress-technologies.net> Sun, 18 Oct 2009 12:28:19 +0200
243271
244open-vm-tools (2009.09.18-193784-1) unstable; urgency=low272open-vm-tools (2009.09.18-193784-1) unstable; urgency=low
245273
@@ -250,7 +278,7 @@
250 * Moving maintainer homepage from control to copyright.278 * Moving maintainer homepage from control to copyright.
251 * Updating README.source.279 * Updating README.source.
252280
253 -- Daniel Baumann <daniel@debian.org> Sun, 04 Oct 2009 08:18:40 +0200281 -- Daniel Baumann <daniel.baumann@progress-technologies.net> Sun, 04 Oct 2009 08:18:40 +0200
254282
255open-vm-tools (2009.08.24-187411-1) unstable; urgency=low283open-vm-tools (2009.08.24-187411-1) unstable; urgency=low
256284
@@ -259,7 +287,7 @@
259 * Updating vcs fields.287 * Updating vcs fields.
260 * Updating package to standards version 3.8.3.288 * Updating package to standards version 3.8.3.
261289
262 -- Daniel Baumann <daniel@debian.org> Tue, 25 Aug 2009 10:35:29 +0200290 -- Daniel Baumann <daniel.baumann@progress-technologies.net> Tue, 25 Aug 2009 10:35:29 +0200
263291
264open-vm-tools (2009.07.22-179896-2) unstable; urgency=low292open-vm-tools (2009.07.22-179896-2) unstable; urgency=low
265293
@@ -267,13 +295,13 @@
267 new dumbnet upstream version broke down (Closes: #539006).295 new dumbnet upstream version broke down (Closes: #539006).
268 * Using more common name to store local debian additions.296 * Using more common name to store local debian additions.
269297
270 -- Daniel Baumann <daniel@debian.org> Thu, 30 Jul 2009 12:56:49 +0200298 -- Daniel Baumann <daniel.baumann@progress-technologies.net> Thu, 30 Jul 2009 12:56:49 +0200
271299
272open-vm-tools (2009.07.22-179896-1) unstable; urgency=low300open-vm-tools (2009.07.22-179896-1) unstable; urgency=low
273301
274 * Merging upstream version 2009.07.22-179896.302 * Merging upstream version 2009.07.22-179896.
275303
276 -- Daniel Baumann <daniel@debian.org> Mon, 27 Jul 2009 11:46:49 +0200304 -- Daniel Baumann <daniel.baumann@progress-technologies.net> Mon, 27 Jul 2009 11:46:49 +0200
277305
278open-vm-tools (2009.06.18-172495-3) unstable; urgency=medium306open-vm-tools (2009.06.18-172495-3) unstable; urgency=medium
279307
@@ -286,14 +314,14 @@
286 package is not supported by upstream (Closes: #518014).314 package is not supported by upstream (Closes: #518014).
287 * Cleaning up module source by removing unecessary files.315 * Cleaning up module source by removing unecessary files.
288316
289 -- Daniel Baumann <daniel@debian.org> Sun, 19 Jul 2009 11:40:57 +0200317 -- Daniel Baumann <daniel.baumann@progress-technologies.net> Sun, 19 Jul 2009 11:40:57 +0200
290318
291open-vm-tools (2009.06.18-172495-2) unstable; urgency=low319open-vm-tools (2009.06.18-172495-2) unstable; urgency=low
292320
293 * Correcting typo in rules for setting configure flags on amd64321 * Correcting typo in rules for setting configure flags on amd64
294 (Closes: #531414).322 (Closes: #531414).
295323
296 -- Daniel Baumann <daniel@debian.org> Thu, 16 Jul 2009 23:10:27 +0200324 -- Daniel Baumann <daniel.baumann@progress-technologies.net> Thu, 16 Jul 2009 23:10:27 +0200
297325
298open-vm-tools (2009.06.18-172495-1) unstable; urgency=low326open-vm-tools (2009.06.18-172495-1) unstable; urgency=low
299327
@@ -302,27 +330,27 @@
302 * Updating year in copyright file.330 * Updating year in copyright file.
303 * Correcting vcs fields in modules control file.331 * Correcting vcs fields in modules control file.
304332
305 -- Daniel Baumann <daniel@debian.org> Wed, 01 Jul 2009 11:52:35 -0300333 -- Daniel Baumann <daniel.baumann@progress-technologies.net> Wed, 01 Jul 2009 11:52:35 -0300
306334
307open-vm-tools (2009.05.22-167859-3) unstable; urgency=low335open-vm-tools (2009.05.22-167859-3) unstable; urgency=low
308336
309 * Building without procps on amd64 as a temporary workaround (Closes:337 * Building without procps on amd64 as a temporary workaround (Closes:
310 #531429).338 #531429).
311339
312 -- Daniel Baumann <daniel@debian.org> Mon, 01 Jun 2009 17:13:07 +0200340 -- Daniel Baumann <daniel.baumann@progress-technologies.net> Mon, 01 Jun 2009 17:13:07 +0200
313341
314open-vm-tools (2009.05.22-167859-2) unstable; urgency=low342open-vm-tools (2009.05.22-167859-2) unstable; urgency=low
315343
316 * Adding procps to build-depends (Closes: #531414).344 * Adding procps to build-depends (Closes: #531414).
317 * Adding patch for configure to not hardcode procps version.345 * Adding patch for configure to not hardcode procps version.
318346
319 -- Daniel Baumann <daniel@debian.org> Mon, 01 Jun 2009 12:53:51 +0200347 -- Daniel Baumann <daniel.baumann@progress-technologies.net> Mon, 01 Jun 2009 12:53:51 +0200
320348
321open-vm-tools (2009.05.22-167859-1) unstable; urgency=low349open-vm-tools (2009.05.22-167859-1) unstable; urgency=low
322350
323 * Merging upstream version 2009.05.22-167859.351 * Merging upstream version 2009.05.22-167859.
324352
325 -- Daniel Baumann <daniel@debian.org> Sat, 30 May 2009 09:48:43 +0200353 -- Daniel Baumann <daniel.baumann@progress-technologies.net> Sat, 30 May 2009 09:48:43 +0200
326354
327open-vm-tools (2009.04.23-162451-1) unstable; urgency=low355open-vm-tools (2009.04.23-162451-1) unstable; urgency=low
328356
@@ -331,13 +359,13 @@
331 anymore.359 anymore.
332 * Using correct rfc-2822 date formats in changelog.360 * Using correct rfc-2822 date formats in changelog.
333361
334 -- Daniel Baumann <daniel@debian.org> Tue, 19 May 2009 19:21:31 +0200362 -- Daniel Baumann <daniel.baumann@progress-technologies.net> Tue, 19 May 2009 19:21:31 +0200
335363
336open-vm-tools (2009.03.18-154848-2) unstable; urgency=low364open-vm-tools (2009.03.18-154848-2) unstable; urgency=low
337365
338 * Correcting patch system depends (Closes: #520493).366 * Correcting patch system depends (Closes: #520493).
339367
340 -- Daniel Baumann <daniel@debian.org> Fri, 20 Mar 2009 10:19:00 +0100368 -- Daniel Baumann <daniel.baumann@progress-technologies.net> Fri, 20 Mar 2009 10:19:00 +0100
341369
342open-vm-tools (2009.03.18-154848-1) unstable; urgency=low370open-vm-tools (2009.03.18-154848-1) unstable; urgency=low
343371
@@ -350,19 +378,19 @@
350 * Manually handling modprobe file rename from lenny to squeeze378 * Manually handling modprobe file rename from lenny to squeeze
351 (Closes: #519935).379 (Closes: #519935).
352380
353 -- Daniel Baumann <daniel@debian.org> Thu, 19 Mar 2009 09:35:00 +0100381 -- Daniel Baumann <daniel.baumann@progress-technologies.net> Thu, 19 Mar 2009 09:35:00 +0100
354382
355open-vm-tools (2009.02.18-148847-3) unstable; urgency=medium383open-vm-tools (2009.02.18-148847-3) unstable; urgency=medium
356384
357 * Updating kvers.dpatch.385 * Updating kvers.dpatch.
358386
359 -- Daniel Baumann <daniel@debian.org> Wed, 18 Mar 2009 23:16:06 +0100387 -- Daniel Baumann <daniel.baumann@progress-technologies.net> Wed, 18 Mar 2009 23:16:06 +0100
360388
361open-vm-tools (2009.02.18-148847-2) unstable; urgency=low389open-vm-tools (2009.02.18-148847-2) unstable; urgency=low
362390
363 * Using debhelper to install vmxnet modprobe file.391 * Using debhelper to install vmxnet modprobe file.
364392
365 -- Daniel Baumann <daniel@debian.org> Sun, 08 Mar 2009 16:03:00 +0100393 -- Daniel Baumann <daniel.baumann@progress-technologies.net> Sun, 08 Mar 2009 16:03:00 +0100
366394
367open-vm-tools (2009.02.18-148847-1) unstable; urgency=low395open-vm-tools (2009.02.18-148847-1) unstable; urgency=low
368396
@@ -370,20 +398,20 @@
370 * Enabling unity support, uriparser 0.7 is finally available.398 * Enabling unity support, uriparser 0.7 is finally available.
371 * Adding libgtkmm-2.4-dev to build-depends.399 * Adding libgtkmm-2.4-dev to build-depends.
372400
373 -- Daniel Baumann <daniel@debian.org> Fri, 20 Feb 2009 09:03:00 +0100401 -- Daniel Baumann <daniel.baumann@progress-technologies.net> Fri, 20 Feb 2009 09:03:00 +0100
374402
375open-vm-tools (2009.01.21-142982-2) unstable; urgency=medium403open-vm-tools (2009.01.21-142982-2) unstable; urgency=medium
376404
377 * Always prefering vmxnet over pcnet32 through modprobe and initramfs405 * Always prefering vmxnet over pcnet32 through modprobe and initramfs
378 configuration (Closes: #502365).406 configuration (Closes: #502365).
379407
380 -- Daniel Baumann <daniel@debian.org> Wed, 04 Feb 2009 11:28:00 +0100408 -- Daniel Baumann <daniel.baumann@progress-technologies.net> Wed, 04 Feb 2009 11:28:00 +0100
381409
382open-vm-tools (2009.01.21-142982-1) unstable; urgency=low410open-vm-tools (2009.01.21-142982-1) unstable; urgency=low
383411
384 * Merging upstream version 2009.01.21-142982.412 * Merging upstream version 2009.01.21-142982.
385413
386 -- Daniel Baumann <daniel@debian.org> Sat, 24 Jan 2009 04:45:00 +0100414 -- Daniel Baumann <daniel.baumann@progress-technologies.net> Sat, 24 Jan 2009 04:45:00 +0100
387415
388open-vm-tools (2008.12.23-137496-1) unstable; urgency=low416open-vm-tools (2008.12.23-137496-1) unstable; urgency=low
389417
@@ -392,7 +420,7 @@
392 having vmxnet already loaded at initramfs stage. Thanks to Russ Allbery420 having vmxnet already loaded at initramfs stage. Thanks to Russ Allbery
393 <rra@debian.org> (Closes: #510935).421 <rra@debian.org> (Closes: #510935).
394422
395 -- Daniel Baumann <daniel@debian.org> Fri, 09 Jan 2009 12:13:00 -0500423 -- Daniel Baumann <daniel.baumann@progress-technologies.net> Fri, 09 Jan 2009 12:13:00 -0500
396424
397open-vm-tools (2008.11.18-130226-1) unstable; urgency=low425open-vm-tools (2008.11.18-130226-1) unstable; urgency=low
398426
@@ -400,14 +428,14 @@
400 * Merging upstream version 2008.11.18-130226.428 * Merging upstream version 2008.11.18-130226.
401 * Updating debian directory for addition of pvscsi and vmxnet3 modules.429 * Updating debian directory for addition of pvscsi and vmxnet3 modules.
402430
403 -- Daniel Baumann <daniel@debian.org> Thu, 20 Nov 2008 21:56:00 +0100431 -- Daniel Baumann <daniel.baumann@progress-technologies.net> Thu, 20 Nov 2008 21:56:00 +0100
404432
405open-vm-tools (2008.10.10-123053-2) unstable; urgency=medium433open-vm-tools (2008.10.10-123053-2) unstable; urgency=medium
406434
407 * Correcting typo in dh_installinit call.435 * Correcting typo in dh_installinit call.
408 * Downgrading depends on module-assistant to recommends.436 * Downgrading depends on module-assistant to recommends.
409437
410 -- Daniel Baumann <daniel@debian.org> Thu, 23 Oct 2008 15:32:00 +0200438 -- Daniel Baumann <daniel.baumann@progress-technologies.net> Thu, 23 Oct 2008 15:32:00 +0200
411439
412open-vm-tools (2008.10.10-123053-1) unstable; urgency=low440open-vm-tools (2008.10.10-123053-1) unstable; urgency=low
413441
@@ -415,14 +443,14 @@
415 * Merging upstream version 2008.10.10-123053.443 * Merging upstream version 2008.10.10-123053.
416 * Updating kvers.dpatch.444 * Updating kvers.dpatch.
417445
418 -- Daniel Baumann <daniel@debian.org> Thu, 16 Oct 2008 19:05:00 +0200446 -- Daniel Baumann <daniel.baumann@progress-technologies.net> Thu, 16 Oct 2008 19:05:00 +0200
419447
420open-vm-tools (2008.09.03-114782-2) unstable; urgency=low448open-vm-tools (2008.09.03-114782-2) unstable; urgency=low
421449
422 * Updating kvers.dpatch (Closes: #498620).450 * Updating kvers.dpatch (Closes: #498620).
423 * Updating initscript to correctly handle vmxnet (Closes: #479090, #488810).451 * Updating initscript to correctly handle vmxnet (Closes: #479090, #488810).
424452
425 -- Daniel Baumann <daniel@debian.org> Sun, 14 Sep 2008 14:30:00 +0200453 -- Daniel Baumann <daniel.baumann@progress-technologies.net> Sun, 14 Sep 2008 14:30:00 +0200
426454
427open-vm-tools (2008.09.03-114782-1) unstable; urgency=low455open-vm-tools (2008.09.03-114782-1) unstable; urgency=low
428456
@@ -430,7 +458,7 @@
430 * Updating rules to new location of the config.guess and config.sub files.458 * Updating rules to new location of the config.guess and config.sub files.
431 * Updating vcs fields in control file.459 * Updating vcs fields in control file.
432460
433 -- Daniel Baumann <daniel@debian.org> Tue, 09 Sep 2008 22:06:00 +0200461 -- Daniel Baumann <daniel.baumann@progress-technologies.net> Tue, 09 Sep 2008 22:06:00 +0200
434462
435open-vm-tools (2008.08.08-109361-1) unstable; urgency=low463open-vm-tools (2008.08.08-109361-1) unstable; urgency=low
436464
@@ -442,7 +470,7 @@
442 * Updating to add new vmci and vsock modules.470 * Updating to add new vmci and vsock modules.
443 * Merging upstream version 2008.08.08-109361.471 * Merging upstream version 2008.08.08-109361.
444472
445 -- Daniel Baumann <daniel@debian.org> Mon, 11 Aug 2008 15:56:00 +0200473 -- Daniel Baumann <daniel.baumann@progress-technologies.net> Mon, 11 Aug 2008 15:56:00 +0200
446474
447open-vm-tools (2008.07.01-102166-3) unstable; urgency=medium475open-vm-tools (2008.07.01-102166-3) unstable; urgency=medium
448476
@@ -450,7 +478,7 @@
450 * Fixing FTBFS on amd64 by renaming /etc/pam.d/vmware-guestd-x64 to478 * Fixing FTBFS on amd64 by renaming /etc/pam.d/vmware-guestd-x64 to
451 /etc/pam.d/vmware-guestd.479 /etc/pam.d/vmware-guestd.
452480
453 -- Daniel Baumann <daniel@debian.org> Thu, 10 Jul 2008 23:24:00 +0200481 -- Daniel Baumann <daniel.baumann@progress-technologies.net> Thu, 10 Jul 2008 23:24:00 +0200
454482
455open-vm-tools (2008.07.01-102166-2) unstable; urgency=medium483open-vm-tools (2008.07.01-102166-2) unstable; urgency=medium
456484
@@ -467,13 +495,13 @@
467 * Adding symlink from mount.vmhgfs to old vmware-hgfsmounter name.495 * Adding symlink from mount.vmhgfs to old vmware-hgfsmounter name.
468 * Removing executable bit for /etc/pam.d/vmware-guestd file.496 * Removing executable bit for /etc/pam.d/vmware-guestd file.
469497
470 -- Daniel Baumann <daniel@debian.org> Fri, 04 Jul 2008 09:59:00 +0200498 -- Daniel Baumann <daniel.baumann@progress-technologies.net> Fri, 04 Jul 2008 09:59:00 +0200
471499
472open-vm-tools (2008.07.01-102166-1) unstable; urgency=low500open-vm-tools (2008.07.01-102166-1) unstable; urgency=low
473501
474 * Merging upstream version 2008.07.01-102166.502 * Merging upstream version 2008.07.01-102166.
475503
476 -- Daniel Baumann <daniel@debian.org> Thu, 03 Jul 2008 13:01:00 +0200504 -- Daniel Baumann <daniel.baumann@progress-technologies.net> Thu, 03 Jul 2008 13:01:00 +0200
477505
478open-vm-tools (2008.06.20-100027-1) unstable; urgency=low506open-vm-tools (2008.06.20-100027-1) unstable; urgency=low
479507
@@ -481,7 +509,7 @@
481 kernel-modules configure switch.509 kernel-modules configure switch.
482 * Merging upstream version 2008.06.20-100027.510 * Merging upstream version 2008.06.20-100027.
483511
484 -- Daniel Baumann <daniel@debian.org> Tue, 01 Jul 2008 22:22:00 +0200512 -- Daniel Baumann <daniel.baumann@progress-technologies.net> Tue, 01 Jul 2008 22:22:00 +0200
485513
486open-vm-tools (2008.06.03-96374-2) unstable; urgency=medium514open-vm-tools (2008.06.03-96374-2) unstable; urgency=medium
487515
@@ -489,7 +517,7 @@
489 * Splitting open-vm-tools into open-vm-tools (CLI tools) and open-vm-517 * Splitting open-vm-tools into open-vm-tools (CLI tools) and open-vm-
490 toolbox (GUI tools) (Closes: #467042).518 toolbox (GUI tools) (Closes: #467042).
491519
492 -- Daniel Baumann <daniel@debian.org> Fri, 20 Jun 2008 14:51:00 +0200520 -- Daniel Baumann <daniel.baumann@progress-technologies.net> Fri, 20 Jun 2008 14:51:00 +0200
493521
494open-vm-tools (2008.06.03-96374-1) unstable; urgency=medium522open-vm-tools (2008.06.03-96374-1) unstable; urgency=medium
495523
@@ -500,14 +528,14 @@
500 * Merging upstream version 2008.06.03-96374 (Closes: #484242).528 * Merging upstream version 2008.06.03-96374 (Closes: #484242).
501 * Updating to standards 3.8.0.529 * Updating to standards 3.8.0.
502530
503 -- Daniel Baumann <daniel@debian.org> Fri, 20 Jun 2008 14:12:00 +0200531 -- Daniel Baumann <daniel.baumann@progress-technologies.net> Fri, 20 Jun 2008 14:12:00 +0200
504532
505open-vm-tools (2008.05.15-93241-2) unstable; urgency=medium533open-vm-tools (2008.05.15-93241-2) unstable; urgency=medium
506534
507 * Updating location of vmware-checkvm in init script (Closes: #483056).535 * Updating location of vmware-checkvm in init script (Closes: #483056).
508 * Correcting typo in mount.vmhgfs symlink (Closes: #474694).536 * Correcting typo in mount.vmhgfs symlink (Closes: #474694).
509537
510 -- Daniel Baumann <daniel@debian.org> Tue, 27 May 2008 07:29:00 +0200538 -- Daniel Baumann <daniel.baumann@progress-technologies.net> Tue, 27 May 2008 07:29:00 +0200
511539
512open-vm-tools (2008.05.15-93241-1) unstable; urgency=medium540open-vm-tools (2008.05.15-93241-1) unstable; urgency=medium
513541
@@ -522,14 +550,14 @@
522 * Removing debian todo file.550 * Removing debian todo file.
523 * Merging upstream version 2008.05.15-93241.551 * Merging upstream version 2008.05.15-93241.
524552
525 -- Daniel Baumann <daniel@debian.org> Wed, 21 May 2008 09:15:00 +0200553 -- Daniel Baumann <daniel.baumann@progress-technologies.net> Wed, 21 May 2008 09:15:00 +0200
526554
527open-vm-tools (2008.05.02-90473-1) unstable; urgency=low555open-vm-tools (2008.05.02-90473-1) unstable; urgency=low
528556
529 * Adding libicu-dev to build-depends.557 * Adding libicu-dev to build-depends.
530 * Merging upstream version 2008.05.02-90473.558 * Merging upstream version 2008.05.02-90473.
531559
532 -- Daniel Baumann <daniel@debian.org> Sat, 03 May 2008 09:44:00 +0200560 -- Daniel Baumann <daniel.baumann@progress-technologies.net> Sat, 03 May 2008 09:44:00 +0200
533561
534open-vm-tools (2008.04.14-87182-1) unstable; urgency=medium562open-vm-tools (2008.04.14-87182-1) unstable; urgency=medium
535563
@@ -546,7 +574,7 @@
546 * Updating vcs fields in control.574 * Updating vcs fields in control.
547 * Updating package to debhelper 7.575 * Updating package to debhelper 7.
548576
549 -- Daniel Baumann <daniel@debian.org> Sat, 26 Apr 2008 13:40:00 +0200577 -- Daniel Baumann <daniel.baumann@progress-technologies.net> Sat, 26 Apr 2008 13:40:00 +0200
550578
551open-vm-tools (2008.02.13-77928-2) unstable; urgency=medium579open-vm-tools (2008.02.13-77928-2) unstable; urgency=medium
552580
@@ -554,13 +582,13 @@
554 * Cleaned up copyright.582 * Cleaned up copyright.
555 * Fixing pathes and binary names in init script (Closes: #469146).583 * Fixing pathes and binary names in init script (Closes: #469146).
556584
557 -- Daniel Baumann <daniel@debian.org> Sat, 08 Mar 2008 08:48:00 +0100585 -- Daniel Baumann <daniel.baumann@progress-technologies.net> Sat, 08 Mar 2008 08:48:00 +0100
558586
559open-vm-tools (2008.02.13-77928-1) unstable; urgency=low587open-vm-tools (2008.02.13-77928-1) unstable; urgency=low
560588
561 * Adding upstream version 2008.02.13-77928.589 * Adding upstream version 2008.02.13-77928.
562590
563 -- Daniel Baumann <daniel@debian.org> Sun, 24 Feb 2008 20:41:00 +0100591 -- Daniel Baumann <daniel.baumann@progress-technologies.net> Sun, 24 Feb 2008 20:41:00 +0100
564592
565open-vm-tools (2008.01.23-74039-2) unstable; urgency=low593open-vm-tools (2008.01.23-74039-2) unstable; urgency=low
566594
@@ -574,7 +602,7 @@
574 * Reverting config.guess and config.sub to upstream.602 * Reverting config.guess and config.sub to upstream.
575 * Adding vmware-guestd init script (Closes: #465276).603 * Adding vmware-guestd init script (Closes: #465276).
576604
577 -- Daniel Baumann <daniel@debian.org> Sun, 24 Feb 2008 20:20:00 +0100605 -- Daniel Baumann <daniel.baumann@progress-technologies.net> Sun, 24 Feb 2008 20:20:00 +0100
578606
579open-vm-tools (2008.01.23-74039-1) unstable; urgency=low607open-vm-tools (2008.01.23-74039-1) unstable; urgency=low
580608
@@ -584,30 +612,30 @@
584 * Bumping package to policy 3.7.3.612 * Bumping package to policy 3.7.3.
585 * Also removing user/ in clean target of rules.613 * Also removing user/ in clean target of rules.
586614
587 -- Daniel Baumann <daniel@debian.org> Wed, 30 Jan 2008 15:24:00 +0100615 -- Daniel Baumann <daniel.baumann@progress-technologies.net> Wed, 30 Jan 2008 15:24:00 +0100
588616
589open-vm-tools (2007.11.21-64693-2) unstable; urgency=low617open-vm-tools (2007.11.21-64693-2) unstable; urgency=low
590618
591 * Adding open-vm-source package for module source.619 * Adding open-vm-source package for module source.
592 * Upload to unstable.620 * Upload to unstable.
593621
594 -- Daniel Baumann <daniel@debian.org> Mon, 26 Nov 2007 11:08:00 +0100622 -- Daniel Baumann <daniel.baumann@progress-technologies.net> Mon, 26 Nov 2007 11:08:00 +0100
595623
596open-vm-tools (2007.11.21-64693-1) experimental; urgency=low624open-vm-tools (2007.11.21-64693-1) experimental; urgency=low
597625
598 * New upstream release.626 * New upstream release.
599627
600 -- Daniel Baumann <daniel@debian.org> Mon, 26 Nov 2007 11:07:00 +0100628 -- Daniel Baumann <daniel.baumann@progress-technologies.net> Mon, 26 Nov 2007 11:07:00 +0100
601629
602open-vm-tools (2007.09.04-56574-2) experimental; urgency=low630open-vm-tools (2007.09.04-56574-2) experimental; urgency=low
603631
604 * Moving package to contrib (Closes: #445439).632 * Moving package to contrib (Closes: #445439).
605 * Limiting architectures to amd64 and i386 (Closes: #445374).633 * Limiting architectures to amd64 and i386 (Closes: #445374).
606634
607 -- Daniel Baumann <daniel@debian.org> Tue, 09 Oct 2007 10:05:00 +0200635 -- Daniel Baumann <daniel.baumann@progress-technologies.net> Tue, 09 Oct 2007 10:05:00 +0200
608636
609open-vm-tools (2007.09.04-56574-1) experimental; urgency=low637open-vm-tools (2007.09.04-56574-1) experimental; urgency=low
610638
611 * Initial release (Closes: #441905).639 * Initial release (Closes: #441905).
612640
613 -- Daniel Baumann <daniel@debian.org> Sun, 09 Sep 2007 16:53:00 +0200641 -- Daniel Baumann <daniel.baumann@progress-technologies.net> Sun, 09 Sep 2007 16:53:00 +0200
614642
=== modified file 'debian/compat'
--- debian/compat 2008-06-20 14:12:00 +0000
+++ debian/compat 2011-10-31 00:22:23 +0000
@@ -1,1 +1,1 @@
1718
22
=== modified file 'debian/control'
--- debian/control 2011-07-22 16:41:03 +0000
+++ debian/control 2011-10-31 00:22:23 +0000
@@ -2,23 +2,21 @@
2Section: contrib/admin2Section: contrib/admin
3Priority: extra3Priority: extra
4Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>4Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
5XSBC-Original-Maintainer: Debian VMware Maintainers <vmware@lists.debian-maintainers.org>5XSBC-Original-Maintainer: Daniel Baumann <daniel.baumann@progress-technologies.net>
6Uploaders: Daniel Baumann <daniel@debian.org>
7Build-Depends:6Build-Depends:
8 debhelper (>= 7), autotools-dev, quilt, libdumbnet-dev, libfuse-dev,7 debhelper (>= 8), autotools-dev, libdumbnet-dev, libfuse-dev,
9 libgtk2.0-dev, libgtkmm-2.4-dev, libicu-dev, libnotify-dev, libpam0g-dev,8 libgtk2.0-dev, libgtkmm-2.4-dev, libicu-dev, libnotify-dev, libpam0g-dev,
10 libproc-dev [i386], liburiparser-dev (>= 0.7), libx11-dev, libxinerama-dev,9 libproc-dev [i386], liburiparser-dev (>= 0.7), libx11-dev, libxinerama-dev,
11 libxss-dev, libxtst-dev, quilt10 libxss-dev, libxtst-dev
12Standards-Version: 3.9.111Standards-Version: 3.9.2
13Homepage: http://open-vm-tools.sourceforge.net/12Homepage: http://open-vm-tools.sourceforge.net/
14Vcs-Browser: http://git.debian-maintainers.org/?p=vmware/open-vm-tools.git
15Vcs-Git: git://git.debian-maintainers.org/git/vmware/open-vm-tools.git
1613
17Package: open-vm-tools14Package: open-vm-tools
18Architecture: amd64 i38615Architecture: amd64 i386
19Depends: ${misc:Depends}, ${shlibs:Depends}16Depends: ${misc:Depends}, ${shlibs:Depends}
20Recommends: open-vm-source, ethtool, zerofree, xauth, xserver-xorg-input-vmmouse, xserver-xorg-video-vmware17Recommends: open-vm-source, open-vm-dkms, ethtool, zerofree, xauth,
21Suggests: xdg-utils18 xserver-xorg-input-vmmouse, xserver-xorg-video-vmware
19Suggests: xdg-utils, numlockx
22Replaces: open-vm-toolbox20Replaces: open-vm-toolbox
23Breaks: open-vm-toolbox21Breaks: open-vm-toolbox
24Description: tools and components for VMware guest systems (CLI tools)22Description: tools and components for VMware guest systems (CLI tools)
2523
=== modified file 'debian/control.modules.in'
--- debian/control.modules.in 2009-10-18 12:28:19 +0000
+++ debian/control.modules.in 2011-10-31 00:22:23 +0000
@@ -1,14 +1,10 @@
1Source: open-vm-tools1Source: open-vm-tools
2Section: contrib/admin2Section: contrib/admin
3Priority: extra3Priority: extra
4Maintainer: Debian VMware Maintainers <vmware@lists.debian-maintainers.org>4Maintainer: Daniel Baumann <daniel.baumann@progress-technologies.net>
5Uploaders: Daniel Baumann <daniel@debian.org>5Build-Depends: debhelper (>= 8)
6Build-Depends: debhelper (>= 7)6Standards-Version: 3.9.2
7Standards-Version: 3.8.3
8Homepage: http://open-vm-tools.sourceforge.net/7Homepage: http://open-vm-tools.sourceforge.net/
9Vcs-Browser: http://git.debian-maintainers.org/?p=vmware/open-vm-tools.git
10Vcs-Git: git://git.debian-maintainers.org/git/vmware/open-vm-tools.git
11XSBC-Maintainer-Homepage: http://vmware.debian-maintainers.org/
128
13Package: open-vm-modules-_KVERS_9Package: open-vm-modules-_KVERS_
14Architecture: any10Architecture: any
1511
=== modified file 'debian/copyright'
--- debian/copyright 2010-03-22 15:41:59 +0000
+++ debian/copyright 2011-10-31 00:22:23 +0000
@@ -1,8 +1,3 @@
1Upstream-Contact: Open VM Tools project <open-vm-tools-devel@lists.sourceforge.net>
2Upstream-Homepage: http://open-vm-tools.sourceforge.net/
3Maintainer-Contact: Debian VMware Maintainers <vmware@lists.debian-maintainers.org>
4Maintainer-Homepage: http://vmware.debian-maintainers.org/
5
6Files: *1Files: *
7Copyright: (C) VMware, Inc. <http://www.vmware.com/>2Copyright: (C) VMware, Inc. <http://www.vmware.com/>
8License: GPL-2.13License: GPL-2.1
@@ -137,7 +132,7 @@
137 the copyright holder(s) and author(s).132 the copyright holder(s) and author(s).
138133
139Files: debian/*134Files: debian/*
140Copyright: (C) 2007-2010 Daniel Baumann <daniel@debian.org>135Copyright: (C) 2007-2011 Daniel Baumann <daniel.baumann@progress-technologies.net>
141License: GPL-2+136License: GPL-2+
142 This program is free software; you can redistribute it and/or modify it under137 This program is free software; you can redistribute it and/or modify it under
143 the terms of the GNU General Public License as published by the Free Software138 the terms of the GNU General Public License as published by the Free Software
144139
=== modified file 'debian/open-vm-source.README.Debian'
--- debian/open-vm-source.README.Debian 2009-10-18 12:28:19 +0000
+++ debian/open-vm-source.README.Debian 2011-10-31 00:22:23 +0000
@@ -15,4 +15,4 @@
15 * Using the make-kpkg(1) command provided by the kernel-package Debian15 * Using the make-kpkg(1) command provided by the kernel-package Debian
16 package. See the "modules_image" section of the make-kpkg(1) man page.16 package. See the "modules_image" section of the make-kpkg(1) man page.
1717
18 -- Daniel Baumann <daniel@debian.org> Sun, 9 Sep 2007 16:53:00 +020018 -- Daniel Baumann <daniel.baumann@progress-technologies.net> Sun, 9 Sep 2007 16:53:00 +0200
1919
=== modified file 'debian/patches/01-kvers.patch'
--- debian/patches/01-kvers.patch 2011-03-31 14:20:05 +0000
+++ debian/patches/01-kvers.patch 2011-10-31 00:22:23 +0000
@@ -1,81 +1,76 @@
1Author: Cyril Brulebois <cyril.brulebois@enst-bretagne.fr>1Author: Cyril Brulebois <cyril.brulebois@enst-bretagne.fr>
2Description: Replacing uname call with KVERS, overwriting seemed not to work.2Description: Replacing uname call with KVERS, overwriting seemed not to work.
33
4Index: open-vm-tools-2010.06.16-268169/modules/linux/vmblock/Makefile4diff -Naurp open-vm-tools.orig/modules/linux/vmblock/Makefile open-vm-tools/modules/linux/vmblock/Makefile
5===================================================================5--- open-vm-tools.orig/modules/linux/vmblock/Makefile 2011-08-28 14:17:10.216965523 +0200
6--- open-vm-tools-2010.06.16-268169.orig/modules/linux/vmblock/Makefile 2011-03-08 17:11:48.701605582 -06006+++ open-vm-tools/modules/linux/vmblock/Makefile 2011-08-28 14:48:23.558254911 +0200
7+++ open-vm-tools-2010.06.16-268169/modules/linux/vmblock/Makefile 2011-03-08 17:11:50.821605582 -06007@@ -43,7 +43,7 @@ INCLUDE += -I$(SRCROOT)/shared
8@@ -43,7 +43,7 @@8 endif
9 endif9
10 10
11 11-VM_UNAME = $(shell uname -r)
12-VM_UNAME = $(shell uname -r)12+VM_UNAME = $(KVERS)
13+VM_UNAME = $(KVERS)13
14 14 # Header directory for the running kernel
15 # Header directory for the running kernel15 ifdef LINUXINCLUDE
16 ifdef LINUXINCLUDE16diff -Naurp open-vm-tools.orig/modules/linux/vmci/Makefile open-vm-tools/modules/linux/vmci/Makefile
17Index: open-vm-tools-2010.06.16-268169/modules/linux/vmci/Makefile17--- open-vm-tools.orig/modules/linux/vmci/Makefile 2011-08-28 14:17:10.216965523 +0200
18===================================================================18+++ open-vm-tools/modules/linux/vmci/Makefile 2011-08-28 14:48:24.586260009 +0200
19--- open-vm-tools-2010.06.16-268169.orig/modules/linux/vmci/Makefile 2011-03-08 17:11:48.721605582 -060019@@ -43,7 +43,7 @@ INCLUDE += -I$(SRCROOT)/shared
20+++ open-vm-tools-2010.06.16-268169/modules/linux/vmci/Makefile 2011-03-08 17:11:50.841605582 -060020 endif
21@@ -43,7 +43,7 @@21
22 endif22
23 23-VM_UNAME = $(shell uname -r)
24 24+VM_UNAME = $(KVERS)
25-VM_UNAME = $(shell uname -r)25
26+VM_UNAME = $(KVERS)26 # Header directory for the running kernel
27 27 ifdef LINUXINCLUDE
28 # Header directory for the running kernel28diff -Naurp open-vm-tools.orig/modules/linux/vmhgfs/Makefile open-vm-tools/modules/linux/vmhgfs/Makefile
29 ifdef LINUXINCLUDE29--- open-vm-tools.orig/modules/linux/vmhgfs/Makefile 2011-08-28 14:17:10.228965579 +0200
30Index: open-vm-tools-2010.06.16-268169/modules/linux/vmhgfs/Makefile30+++ open-vm-tools/modules/linux/vmhgfs/Makefile 2011-08-28 14:48:25.554264810 +0200
31===================================================================31@@ -43,7 +43,7 @@ INCLUDE += -I$(SRCROOT)/shared
32--- open-vm-tools-2010.06.16-268169.orig/modules/linux/vmhgfs/Makefile 2011-03-08 17:11:48.741605582 -060032 endif
33+++ open-vm-tools-2010.06.16-268169/modules/linux/vmhgfs/Makefile 2011-03-08 17:11:50.861605582 -060033
34@@ -43,7 +43,7 @@34
35 endif35-VM_UNAME = $(shell uname -r)
36 36+VM_UNAME = $(KVERS)
37 37
38-VM_UNAME = $(shell uname -r)38 # Header directory for the running kernel
39+VM_UNAME = $(KVERS)39 ifdef LINUXINCLUDE
40 40diff -Naurp open-vm-tools.orig/modules/linux/vmsync/Makefile open-vm-tools/modules/linux/vmsync/Makefile
41 # Header directory for the running kernel41--- open-vm-tools.orig/modules/linux/vmsync/Makefile 2011-08-28 14:17:10.240965642 +0200
42 ifdef LINUXINCLUDE42+++ open-vm-tools/modules/linux/vmsync/Makefile 2011-08-28 14:48:27.638275144 +0200
43Index: open-vm-tools-2010.06.16-268169/modules/linux/vmsync/Makefile43@@ -43,7 +43,7 @@ INCLUDE += -I$(SRCROOT)/shared
44===================================================================44 endif
45--- open-vm-tools-2010.06.16-268169.orig/modules/linux/vmsync/Makefile 2011-03-08 17:11:48.761605582 -060045
46+++ open-vm-tools-2010.06.16-268169/modules/linux/vmsync/Makefile 2011-03-08 17:11:50.891605582 -060046
47@@ -43,7 +43,7 @@47-VM_UNAME = $(shell uname -r)
48 endif48+VM_UNAME = $(KVERS)
49 49
50 50 # Header directory for the running kernel
51-VM_UNAME = $(shell uname -r)51 ifdef LINUXINCLUDE
52+VM_UNAME = $(KVERS)52diff -Naurp open-vm-tools.orig/modules/linux/vmxnet/Makefile open-vm-tools/modules/linux/vmxnet/Makefile
53 53--- open-vm-tools.orig/modules/linux/vmxnet/Makefile 2011-08-28 14:17:10.240965642 +0200
54 # Header directory for the running kernel54+++ open-vm-tools/modules/linux/vmxnet/Makefile 2011-08-28 14:48:28.602279930 +0200
55 ifdef LINUXINCLUDE55@@ -43,7 +43,7 @@ INCLUDE += -I$(SRCROOT)/shared
56Index: open-vm-tools-2010.06.16-268169/modules/linux/vmxnet/Makefile56 endif
57===================================================================57
58--- open-vm-tools-2010.06.16-268169.orig/modules/linux/vmxnet/Makefile 2011-03-08 17:11:48.781605582 -060058
59+++ open-vm-tools-2010.06.16-268169/modules/linux/vmxnet/Makefile 2011-03-08 17:11:50.931605582 -060059-VM_UNAME = $(shell uname -r)
60@@ -43,7 +43,7 @@60+VM_UNAME = $(KVERS)
61 endif61
62 62 # Header directory for the running kernel
63 63 ifdef LINUXINCLUDE
64-VM_UNAME = $(shell uname -r)64diff -Naurp open-vm-tools.orig/modules/linux/vsock/Makefile open-vm-tools/modules/linux/vsock/Makefile
65+VM_UNAME = $(KVERS)65--- open-vm-tools.orig/modules/linux/vsock/Makefile 2011-08-28 14:17:10.244965654 +0200
66 66+++ open-vm-tools/modules/linux/vsock/Makefile 2011-08-28 14:48:31.254293082 +0200
67 # Header directory for the running kernel67@@ -43,7 +43,7 @@ INCLUDE += -I$(SRCROOT)/shared
68 ifdef LINUXINCLUDE68 endif
69Index: open-vm-tools-2010.06.16-268169/modules/linux/vsock/Makefile69
70===================================================================70
71--- open-vm-tools-2010.06.16-268169.orig/modules/linux/vsock/Makefile 2011-03-08 17:11:48.811605582 -060071-VM_UNAME = $(shell uname -r)
72+++ open-vm-tools-2010.06.16-268169/modules/linux/vsock/Makefile 2011-03-08 17:11:50.961605582 -060072+VM_UNAME = $(KVERS)
73@@ -43,7 +43,7 @@73
74 endif74 # Header directory for the running kernel
75 75 ifdef LINUXINCLUDE
76 76
77-VM_UNAME = $(shell uname -r)
78+VM_UNAME = $(KVERS)
79
80 # Header directory for the running kernel
81 ifdef LINUXINCLUDE
8277
=== modified file 'debian/rules'
--- debian/rules 2011-07-22 16:41:03 +0000
+++ debian/rules 2011-10-31 00:22:23 +0000
@@ -3,8 +3,6 @@
3# Uncomment this to turn on verbose mode.3# Uncomment this to turn on verbose mode.
4#export DH_VERBOSE=14#export DH_VERBOSE=1
55
6include /usr/share/quilt/quilt.make
7
8# These are used for cross-compiling and for saving the configure script6# These are used for cross-compiling and for saving the configure script
9# from having to guess our platform (since we know it already)7# from having to guess our platform (since we know it already)
10DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)8DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
@@ -19,9 +17,9 @@
19#CFLAGS = -Wall -g17#CFLAGS = -Wall -g
2018
21ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))19ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
22 CFLAGS += -Wno-unused-but-set-variable -O020 CFLAGS += -O0
23else21else
24 CFLAGS += -Wno-unused-but-set-variable -O222 CFLAGS += -O2
25endif23endif
2624
27# some default definitions, important!25# some default definitions, important!
@@ -93,7 +91,7 @@
93 dh_builddeb --destdir=$(DEB_DESTDIR)91 dh_builddeb --destdir=$(DEB_DESTDIR)
94 dh_prep92 dh_prep
9593
96config.status: configure patch94config.status: configure
97 dh_testdir95 dh_testdir
9896
99ifneq "$(wildcard /usr/share/misc/config.sub)" ""97ifneq "$(wildcard /usr/share/misc/config.sub)" ""
@@ -115,7 +113,7 @@
115113
116 touch build-stamp114 touch build-stamp
117115
118clean: unpatch116clean:
119 dh_testdir117 dh_testdir
120 dh_testroot118 dh_testroot
121 rm -f build-stamp119 rm -f build-stamp
@@ -147,8 +145,6 @@
147145
148 install -D -m 4755 vmware-user-suid-wrapper/vmware-user-suid-wrapper debian/open-vm-tools/usr/sbin/vmware-user-suid-wrapper146 install -D -m 4755 vmware-user-suid-wrapper/vmware-user-suid-wrapper debian/open-vm-tools/usr/sbin/vmware-user-suid-wrapper
149147
150# install -D -m 0644 toolbox/smallIcon.xpm debian/open-vm-toolbox/usr/share/pixmaps/vmware-toolbox.xpm
151
152 set -e; if [ -e debian/open-vm-tools/etc/pam.d/vmtoolsd-x64 ]; \148 set -e; if [ -e debian/open-vm-tools/etc/pam.d/vmtoolsd-x64 ]; \
153 then \149 then \
154 sed -i -e "s|lib64|lib|g" debian/open-vm-tools/etc/pam.d/vmtoolsd-x64; \150 sed -i -e "s|lib64|lib|g" debian/open-vm-tools/etc/pam.d/vmtoolsd-x64; \
@@ -162,26 +158,6 @@
162 # Moving open-vm-tools files158 # Moving open-vm-tools files
163 mkdir -p debian/open-vm-tools/sbin159 mkdir -p debian/open-vm-tools/sbin
164 mv debian/open-vm-tools/usr/sbin/mount.vmhgfs debian/open-vm-tools/sbin/mount.vmhgfs160 mv debian/open-vm-tools/usr/sbin/mount.vmhgfs debian/open-vm-tools/sbin/mount.vmhgfs
165
166 # Moving open-vm-toolbox files
167# mkdir -p debian/open-vm-toolbox/usr/bin
168 # vmware-user no longer seems to exist
169 #mv debian/open-vm-tools/usr/bin/vmware-user debian/open-vm-toolbox/usr/bin
170# mv debian/open-vm-tools/usr/bin/vmware-toolbox debian/open-vm-toolbox/usr/bin
171 # this should be done with open-vm-toolbox.install ?
172# mkdir -p debian/open-vm-tools/etc
173# mv debian/open-vm-tools/etc/xdg debian/open-vm-toolbox/etc/
174
175# mkdir -p debian/open-vm-tools/usr/lib/open-vm-tools/plugins
176# mv debian/open-vm-tools/usr/lib/open-vm-tools/plugins/vmusr debian/open-vm-tools/usr/lib/open-vm-toolbox/plugins
177
178 # XXX This is wrong: install-exec-hook in toolbox/Makefile is not being called.
179 # when the instal-exec-hook is working, remove the rest of this stanza
180# mkdir -p debian/open-vm-tools/usr/share/applications
181# install -m 644 scripts/common/vmware-toolbox.desktop debian/open-vm-toolbox/usr/share/applications
182# sed -i s/Exec=.*/Exec=vmware-toolbox/ debian/open-vm-toolbox/usr/share/applications/vmware-toolbox.desktop
183# install -d debian/open-vm-toolbox/usr/share/pixmaps/vmware
184# install -m 644 toolbox/bigIcon.xpm debian/open-vm-toolbox/usr/share/pixmaps/vmware/vmware-toolbox.xpm
185 install -m 755 scripts/common/vmware-xdg-detect-de debian/open-vm-tools/usr/bin161 install -m 755 scripts/common/vmware-xdg-detect-de debian/open-vm-tools/usr/bin
186162
187 # Installing configuration files163 # Installing configuration files
188164
=== modified file 'debian/source/format'
--- debian/source/format 2009-12-20 13:36:35 +0000
+++ debian/source/format 2011-10-31 00:22:23 +0000
@@ -1,1 +1,1 @@
11.013.0 (quilt)
22
=== modified file 'lib/auth/authPosix.c'
--- lib/auth/authPosix.c 2011-03-31 14:20:05 +0000
+++ lib/auth/authPosix.c 2011-10-31 00:22:23 +0000
@@ -46,6 +46,8 @@
46#ifdef USE_PAM46#ifdef USE_PAM
47#if defined(sun)47#if defined(sun)
48#define CURRENT_PAM_LIBRARY "libpam.so.1"48#define CURRENT_PAM_LIBRARY "libpam.so.1"
49#elif defined(__FreeBSD__)
50#define CURRENT_PAM_LIBRARY "libpam.so"
49#else51#else
50#define CURRENT_PAM_LIBRARY "libpam.so.0"52#define CURRENT_PAM_LIBRARY "libpam.so.0"
51#endif53#endif
5254
=== modified file 'lib/file/fileIO.c'
--- lib/file/fileIO.c 2011-03-31 14:20:05 +0000
+++ lib/file/fileIO.c 2011-10-31 00:22:23 +0000
@@ -349,6 +349,58 @@
349/*349/*
350 *----------------------------------------------------------------------350 *----------------------------------------------------------------------
351 *351 *
352 * FileIO_GetSize --
353 *
354 * Get size of file.
355 *
356 * Results:
357 * Size of file or -1.
358 *
359 * Side effects:
360 * errno is set on error.
361 *
362 *----------------------------------------------------------------------
363 */
364
365int64
366FileIO_GetSize(const FileIODescriptor *fd) // IN:
367{
368 int64 logicalBytes;
369
370 return (FileIO_GetAllocSize(fd, &logicalBytes, NULL) != FILEIO_SUCCESS) ?
371 -1 : logicalBytes;
372}
373
374
375/*
376 *----------------------------------------------------------------------
377 *
378 * FileIO_GetSizeByPath --
379 *
380 * Get size of a file specified by path.
381 *
382 * Results:
383 * Size of file or -1.
384 *
385 * Side effects:
386 * errno is set on error
387 *
388 *----------------------------------------------------------------------
389 */
390
391int64
392FileIO_GetSizeByPath(ConstUnicode pathName) // IN:
393{
394 int64 logicalBytes;
395
396 return (FileIO_GetAllocSizeByPath(pathName, &logicalBytes, NULL) !=
397 FILEIO_SUCCESS) ? -1 : logicalBytes;
398}
399
400
401/*
402 *----------------------------------------------------------------------
403 *
352 * FileIO_Filename --404 * FileIO_Filename --
353 *405 *
354 * Returns the filename that was used to open a FileIODescriptor406 * Returns the filename that was used to open a FileIODescriptor
355407
=== modified file 'lib/file/fileIOPosix.c'
--- lib/file/fileIOPosix.c 2011-07-22 16:41:03 +0000
+++ lib/file/fileIOPosix.c 2011-10-31 00:22:23 +0000
@@ -1877,42 +1877,16 @@
1877#endif /* defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) ||1877#endif /* defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) ||
1878 defined(sun) */1878 defined(sun) */
18791879
1880/*
1881 *----------------------------------------------------------------------
1882 *
1883 * FileIO_GetSize --
1884 *
1885 * Get size of file.
1886 *
1887 * Results:
1888 * Size of file or -1.
1889 *
1890 * Side effects:
1891 * None
1892 *
1893 *----------------------------------------------------------------------
1894 */
1895
1896int64
1897FileIO_GetSize(const FileIODescriptor *fd) // IN:
1898{
1899 struct stat statBuf;
1900
1901 ASSERT(fd);
1902
1903 return (fstat(fd->posix, &statBuf) == -1) ? -1 : statBuf.st_size;
1904}
1905
19061880
1907/*1881/*
1908 *----------------------------------------------------------------------1882 *----------------------------------------------------------------------
1909 *1883 *
1910 * FileIO_GetAllocSize --1884 * FileIO_GetAllocSize --
1911 *1885 *
1912 * Get allocated size of file.1886 * Get logcial and alloced size of a file.
1913 *1887 *
1914 * Results:1888 * Results:
1915 * Size of file or -1.1889 * FileIOResult.
1916 *1890 *
1917 * Side effects:1891 * Side effects:
1918 * None1892 * None
@@ -1920,19 +1894,32 @@
1920 *----------------------------------------------------------------------1894 *----------------------------------------------------------------------
1921 */1895 */
19221896
1923int641897FileIOResult
1924FileIO_GetAllocSize(const FileIODescriptor *fd) // IN1898FileIO_GetAllocSize(const FileIODescriptor *fd, // IN:
1899 uint64 *logicalBytes, // OUT:
1900 uint64 *allocedBytes) // OUT:
1925{1901{
1926 struct stat s;1902 struct stat statBuf;
19271903
1928 ASSERT(fd);1904 ASSERT(fd);
19291905
1930 /*1906 if (fstat(fd->posix, &statBuf) == -1) {
1931 * If you don't like the magic number 512, yell at the people1907 return FileIOErrno2Result(errno);
1932 * who wrote sys/stat.h and tell them to add a #define for it.1908 }
1933 */1909
19341910 if (logicalBytes) {
1935 return (fstat(fd->posix, &s) == -1) ? -1 : s.st_blocks * 512;1911 *logicalBytes = statBuf.st_size;
1912 }
1913
1914 if (allocedBytes) {
1915 /*
1916 * If you don't like the magic number 512, yell at the people
1917 * who wrote sys/stat.h and tell them to add a #define for it.
1918 */
1919 *allocedBytes = statBuf.st_blocks * 512;
1920 }
1921
1922 return FILEIO_SUCCESS;
1936}1923}
19371924
19381925
@@ -1959,13 +1946,18 @@
1959{1946{
19601947
1961#if defined(__APPLE__) || defined(__linux__)1948#if defined(__APPLE__) || defined(__linux__)
1949 FileIOResult fret;
1962 uint64 curSize;1950 uint64 curSize;
1963 uint64 preallocLen;1951 uint64 preallocLen;
1964#if defined(__APPLE__)1952#if defined(__APPLE__)
1965 fstore_t prealloc;1953 fstore_t prealloc;
1966#endif1954#endif
19671955
1968 curSize = FileIO_GetAllocSize(fd);1956 fret = FileIO_GetAllocSize(fd, NULL, &curSize);
1957 if (!FileIO_IsSuccess(fret)) {
1958 return FALSE;
1959 }
1960
1969 if (curSize > size) {1961 if (curSize > size) {
1970 errno = EINVAL;1962 errno = EINVAL;
19711963
@@ -1997,12 +1989,12 @@
1997/*1989/*
1998 *----------------------------------------------------------------------1990 *----------------------------------------------------------------------
1999 *1991 *
2000 * FileIO_GetSizeByPath --1992 * FileIO_GetAllocSizeByPath --
2001 *1993 *
2002 * Get size of a file specified by path. 1994 * Get the logcial and alloced size of a file specified by path.
2003 *1995 *
2004 * Results:1996 * Results:
2005 * Size of file or -1.1997 * FileIOResult.
2006 *1998 *
2007 * Side effects:1999 * Side effects:
2008 * errno is set on error2000 * errno is set on error
@@ -2010,15 +2002,35 @@
2010 *----------------------------------------------------------------------2002 *----------------------------------------------------------------------
2011 */2003 */
20122004
2013int642005FileIOResult
2014FileIO_GetSizeByPath(ConstUnicode pathName) // IN:2006FileIO_GetAllocSizeByPath(ConstUnicode pathName, // IN:
2007 uint64 *logicalBytes, // OUT:
2008 uint64 *allocedBytes) // OUT:
2015{2009{
2016 int err;2010 struct stat statBuf;
2017 struct stat statbuf;2011
20182012 if (Posix_Stat(pathName, &statBuf) == -1) {
2019 err = Posix_Stat(pathName, &statbuf);2013 return FileIOErrno2Result(errno);
20202014 }
2021 return (err == 0) ? statbuf.st_size : -1;2015
2016 if (logicalBytes) {
2017 *logicalBytes = statBuf.st_size;
2018 }
2019
2020 if (allocedBytes) {
2021#if __linux__ && defined(N_PLAT_NLM)
2022 /* Netware doesn't have st_blocks. Just fall back to GetSize. */
2023 *allocedBytes = statBuf.st_size;
2024#else
2025 /*
2026 * If you don't like the magic number 512, yell at the people
2027 * who wrote sys/stat.h and tell them to add a #define for it.
2028 */
2029 *allocedBytes = statBuf.st_blocks * 512;
2030#endif
2031 }
2032
2033 return FILEIO_SUCCESS;
2022}2034}
20232035
20242036
20252037
=== modified file 'lib/hgfsServer/hgfsServer.c'
--- lib/hgfsServer/hgfsServer.c 2011-07-22 16:41:03 +0000
+++ lib/hgfsServer/hgfsServer.c 2011-10-31 00:22:23 +0000
@@ -5252,6 +5252,7 @@
52525252
5253 if (!HgfsUnpackReadRequest(input->payload, input->payloadSize, input->op, &file,5253 if (!HgfsUnpackReadRequest(input->payload, input->payloadSize, input->op, &file,
5254 &offset, &requiredSize)) {5254 &offset, &requiredSize)) {
5255 LOG(4, ("%s: Failed to unpack a valid packet -> PROTOCOL_ERROR.\n", __FUNCTION__));
5255 status = HGFS_ERROR_PROTOCOL;5256 status = HGFS_ERROR_PROTOCOL;
5256 } else {5257 } else {
5257 switch(input->op) {5258 switch(input->op) {
@@ -5266,9 +5267,10 @@
5266 sizeof *reply + inlineDataSize, (void **)&reply,5267 sizeof *reply + inlineDataSize, (void **)&reply,
5267 input->session)) {5268 input->session)) {
5268 status = HGFS_ERROR_PROTOCOL;5269 status = HGFS_ERROR_PROTOCOL;
5270 LOG(4, ("%s: V3/V4 Failed to alloc reply -> PROTOCOL_ERROR.\n", __FUNCTION__));
5269 } else {5271 } else {
5270 if (inlineDataSize > 0) {5272 if (HGFS_OP_READ_V3 == input->op) {
5271 payload = reply->payload;5273 payload = &reply->payload[0];
5272 } else {5274 } else {
5273 payload = HSPU_GetDataPacketBuf(input->packet, BUF_WRITEABLE,5275 payload = HSPU_GetDataPacketBuf(input->packet, BUF_WRITEABLE,
5274 input->session);5276 input->session);
@@ -5284,6 +5286,7 @@
5284 }5286 }
5285 } else {5287 } else {
5286 status = HGFS_ERROR_PROTOCOL;5288 status = HGFS_ERROR_PROTOCOL;
5289 LOG(4, ("%s: V3/V4 Failed to get payload -> PROTOCOL_ERROR.\n", __FUNCTION__));
5287 }5290 }
5288 }5291 }
5289 break;5292 break;
@@ -5298,15 +5301,20 @@
5298 reply->payload, &reply->actualSize);5301 reply->payload, &reply->actualSize);
5299 if (HGFS_ERROR_SUCCESS == status) {5302 if (HGFS_ERROR_SUCCESS == status) {
5300 replyPayloadSize = sizeof *reply + reply->actualSize;5303 replyPayloadSize = sizeof *reply + reply->actualSize;
5304 } else {
5305 LOG(4, ("%s: V1 Failed to read-> %d.\n", __FUNCTION__, status));
5301 }5306 }
5302 } else {5307 } else {
5303 status = HGFS_ERROR_PROTOCOL;5308 status = HGFS_ERROR_PROTOCOL;
5309 LOG(4, ("%s: V1 Failed to alloc reply -> PROTOCOL_ERROR.\n", __FUNCTION__));
5304 }5310 }
5305 break;5311 break;
5306 }5312 }
5307 default:5313 default:
5308 NOT_IMPLEMENTED();5314 NOT_IMPLEMENTED();
5309 status = HGFS_ERROR_PROTOCOL;5315 status = HGFS_ERROR_PROTOCOL;
5316 LOG(4, ("%s: Unsupported protocol version passed %d -> PROTOCOL_ERROR.\n",
5317 __FUNCTION__, input->op));
5310 }5318 }
5311 }5319 }
53125320
@@ -5575,6 +5583,8 @@
55755583
5576 *freeBytes = outFreeBytes;5584 *freeBytes = outFreeBytes;
5577 *totalBytes = outTotalBytes;5585 *totalBytes = outTotalBytes;
5586 LOG(4, ("%s: return %"FMT64"u bytes Free %"FMT64"u bytes\n", __FUNCTION__,
5587 outTotalBytes, outFreeBytes));
55785588
5579 return status;5589 return status;
5580}5590}
55815591
=== modified file 'lib/include/backdoor_def.h'
--- lib/include/backdoor_def.h 2011-07-22 16:41:03 +0000
+++ lib/include/backdoor_def.h 2011-10-31 00:22:23 +0000
@@ -177,8 +177,9 @@
177/* Task applied to backdoor pshare hints */177/* Task applied to backdoor pshare hints */
178#define BDOOR_PSHARE_HINTS_CMD_SHARE 0178#define BDOOR_PSHARE_HINTS_CMD_SHARE 0
179#define BDOOR_PSHARE_HINTS_CMD_DROP 1179#define BDOOR_PSHARE_HINTS_CMD_DROP 1
180#define BDOOR_PSHARE_HINTS_CMD_MAX 2
180181
181#define BDOOR_PSHARE_HINTS_CMD(ecx) (((ecx) >> 24) & 0x1)182#define BDOOR_PSHARE_HINTS_CMD(ecx) (((ecx) >> 24) & 0xff)
182183
183/* Nesting control operations */184/* Nesting control operations */
184185
185186
=== modified file 'lib/include/buildNumber.h'
--- lib/include/buildNumber.h 2011-07-22 16:41:03 +0000
+++ lib/include/buildNumber.h 2011-10-31 00:22:23 +0000
@@ -1,12 +1,12 @@
1#define BUILD_NUMBER \1#define BUILD_NUMBER \
2 "build-450511"2 "build-471295"
3#define BUILD_NUMBER_NUMERIC \3#define BUILD_NUMBER_NUMERIC \
4 4505114 471295
5#define BUILD_NUMBER_NUMERIC_STRING \5#define BUILD_NUMBER_NUMERIC_STRING \
6 "450511"6 "471295"
7#define PRODUCT_BUILD_NUMBER \7#define PRODUCT_BUILD_NUMBER \
8 "product-build-6971"8 "product-build-7542"
9#define PRODUCT_BUILD_NUMBER_NUMERIC \9#define PRODUCT_BUILD_NUMBER_NUMERIC \
10 697110 7542
11#define PRODUCT_BUILD_NUMBER_NUMERIC_STRING \11#define PRODUCT_BUILD_NUMBER_NUMERIC_STRING \
12 "6971"12 "7542"
1313
=== modified file 'lib/include/fileIO.h'
--- lib/include/fileIO.h 2011-07-22 16:41:03 +0000
+++ lib/include/fileIO.h 2011-10-31 00:22:23 +0000
@@ -335,12 +335,16 @@
335335
336int FileIO_Sync(const FileIODescriptor *file);336int FileIO_Sync(const FileIODescriptor *file);
337337
338FileIOResult FileIO_GetAllocSize(const FileIODescriptor *fd,
339 uint64 *logicalBytes,
340 uint64 *allocedBytes);
338int64 FileIO_GetSize(const FileIODescriptor *fd);341int64 FileIO_GetSize(const FileIODescriptor *fd);
339342
340int64 FileIO_GetAllocSize(const FileIODescriptor *fd);343Bool FileIO_SetAllocSize(const FileIODescriptor *fd, uint64 size);
341344
342Bool FileIO_SetAllocSize(const FileIODescriptor *fd,345FileIOResult FileIO_GetAllocSizeByPath(ConstUnicode pathName,
343 uint64 size);346 uint64 *logicalBytes,
347 uint64 *allocedBytes);
344348
345int64 FileIO_GetSizeByPath(ConstUnicode pathName);349int64 FileIO_GetSizeByPath(ConstUnicode pathName);
346350
347351
=== modified file 'lib/include/guestInfo.h'
--- lib/include/guestInfo.h 2011-07-22 16:41:03 +0000
+++ lib/include/guestInfo.h 2011-10-31 00:22:23 +0000
@@ -52,16 +52,6 @@
52#define GUEST_INFO_COMMAND "SetGuestInfo"52#define GUEST_INFO_COMMAND "SetGuestInfo"
53#define MAX_VALUE_LEN 10053#define MAX_VALUE_LEN 100
5454
55/**
56 * Upper bound for value sizes, based on gethostname(2):
57 *
58 * SUS2 guarantees that "Host names are limited to 255 bytes".
59 *
60 * We can't modify MAX_VALUE_LEN since it's used in wire-level definitions
61 * (such as PartitionEntry).
62 */
63#define GUESTINFO_MAX_VALUE_SIZE 256
64
65#define MAX_NICS 1655#define MAX_NICS 16
66#define MAX_IPS 8 // Max number of IP addresses for a single NIC56#define MAX_IPS 8 // Max number of IP addresses for a single NIC
67#define MAC_ADDR_SIZE 1957#define MAC_ADDR_SIZE 19
6858
=== modified file 'lib/include/hostinfo.h'
--- lib/include/hostinfo.h 2011-07-22 16:41:03 +0000
+++ lib/include/hostinfo.h 2011-10-31 00:22:23 +0000
@@ -70,10 +70,8 @@
70extern int Hostinfo_GetSystemBitness(void);70extern int Hostinfo_GetSystemBitness(void);
71extern const char *Hostinfo_OSVersionString(void);71extern const char *Hostinfo_OSVersionString(void);
7272
73extern Bool Hostinfo_GetOSName(uint32 outBufFullLen,73extern char *Hostinfo_GetOSName(void);
74 uint32 outBufLen,74extern char *Hostinfo_GetOSGuestString(void);
75 char *osNameFull,
76 char *osName);
7775
78extern Bool Hostinfo_OSIsSMP(void);76extern Bool Hostinfo_OSIsSMP(void);
79#if defined(_WIN32)77#if defined(_WIN32)
8078
=== modified file 'lib/include/loglevel_user.h'
--- lib/include/loglevel_user.h 2011-07-22 16:41:03 +0000
+++ lib/include/loglevel_user.h 2011-10-31 00:22:23 +0000
@@ -119,6 +119,7 @@
119 LOGLEVEL_VAR(gui), \119 LOGLEVEL_VAR(gui), \
120 LOGLEVEL_VAR(guiWin32), \120 LOGLEVEL_VAR(guiWin32), \
121 LOGLEVEL_VAR(mks), \121 LOGLEVEL_VAR(mks), \
122 LOGLEVEL_VAR(mksSWB), \
122 LOGLEVEL_VAR(mksClient), \123 LOGLEVEL_VAR(mksClient), \
123 LOGLEVEL_VAR(mksServer), \124 LOGLEVEL_VAR(mksServer), \
124 LOGLEVEL_VAR(mksKeyboard), \125 LOGLEVEL_VAR(mksKeyboard), \
@@ -128,6 +129,7 @@
128 LOGLEVEL_VAR(mksHostOps), \129 LOGLEVEL_VAR(mksHostOps), \
129 LOGLEVEL_VAR(mksGLManager), \130 LOGLEVEL_VAR(mksGLManager), \
130 LOGLEVEL_VAR(mksGLShader), \131 LOGLEVEL_VAR(mksGLShader), \
132 LOGLEVEL_VAR(mksGLState), \
131 LOGLEVEL_VAR(vdpPlugin), \133 LOGLEVEL_VAR(vdpPlugin), \
132 \134 \
133 /* user/sound */ \135 /* user/sound */ \
@@ -176,6 +178,7 @@
176 LOGLEVEL_VAR(smbios), \178 LOGLEVEL_VAR(smbios), \
177 LOGLEVEL_VAR(acpi), \179 LOGLEVEL_VAR(acpi), \
178 LOGLEVEL_VAR(acpiGPE), \180 LOGLEVEL_VAR(acpiGPE), \
181 LOGLEVEL_VAR(vmgenc), \
179 LOGLEVEL_VAR(xpmode), \182 LOGLEVEL_VAR(xpmode), \
180 LOGLEVEL_VAR(snapshot), \183 LOGLEVEL_VAR(snapshot), \
181 LOGLEVEL_VAR(asyncsocket), \184 LOGLEVEL_VAR(asyncsocket), \
@@ -239,6 +242,7 @@
239 LOGLEVEL_VAR(wrapLib), \242 LOGLEVEL_VAR(wrapLib), \
240 LOGLEVEL_VAR(digestlib), \243 LOGLEVEL_VAR(digestlib), \
241 LOGLEVEL_VAR(inputdevtap), \244 LOGLEVEL_VAR(inputdevtap), \
245 LOGLEVEL_VAR(objlib), \
242 LOGLEVEL_VAR(svgadevtap), \246 LOGLEVEL_VAR(svgadevtap), \
243 LOGLEVEL_VAR(masReceipt), /* lib/masReceipt */ \247 LOGLEVEL_VAR(masReceipt), /* lib/masReceipt */ \
244 LOGLEVEL_VAR(serviceImpl), /* lib/serviceImpl */ \248 LOGLEVEL_VAR(serviceImpl), /* lib/serviceImpl */ \
245249
=== modified file 'lib/include/msgfmt.h'
--- lib/include/msgfmt.h 2009-12-20 13:36:35 +0000
+++ lib/include/msgfmt.h 2011-10-31 00:22:23 +0000
@@ -165,10 +165,14 @@
165 MsgFmt_Arg **args, int *numArgs, char **error,165 MsgFmt_Arg **args, int *numArgs, char **error,
166 void *buf, size_t *bufSize);166 void *buf, size_t *bufSize);
167void MsgFmt_FreeArgs(MsgFmt_Arg *args, int numArgs);167void MsgFmt_FreeArgs(MsgFmt_Arg *args, int numArgs);
168
168void MsgFmt_SwizzleArgs(MsgFmt_Arg *args,169void MsgFmt_SwizzleArgs(MsgFmt_Arg *args,
169 int numArgs);170 int numArgs);
170void MsgFmt_UnswizzleArgs(MsgFmt_Arg *args,171int MsgFmt_GetSwizzledString(const MsgFmt_Arg *args, int numArgs, int idx,
171 int numArgs);172 const void *bufEnd, const int8 **str);
173int MsgFmt_UnswizzleArgs(MsgFmt_Arg *args,
174 int numArgs,
175 void *bufEnd);
172176
173MsgFmt_Arg* MsgFmt_CopyArgs(MsgFmt_Arg* copyArgs,177MsgFmt_Arg* MsgFmt_CopyArgs(MsgFmt_Arg* copyArgs,
174 int numArgs);178 int numArgs);
175179
=== modified file 'lib/include/mutexRankLib.h'
--- lib/include/mutexRankLib.h 2011-07-22 16:41:03 +0000
+++ lib/include/mutexRankLib.h 2011-10-31 00:22:23 +0000
@@ -24,6 +24,11 @@
24/*24/*
25 * MXUser mutex ranks for bora/lib code.25 * MXUser mutex ranks for bora/lib code.
26 *26 *
27 * The ranks define the ordering in which locks are allowed to be acquired.
28 *
29 * Only locks with higher rank numbers (generally more localized)
30 * can be acquired while a lock with a lower rank number is active.
31 *
27 * bora/lib lock rank space is from RANK_libLockBase on up to32 * bora/lib lock rank space is from RANK_libLockBase on up to
28 * RANK_LEAF (see vm_basic_defs).asdf33 * RANK_LEAF (see vm_basic_defs).asdf
29 *34 *
@@ -33,13 +38,13 @@
33/*38/*
34 * hostDeviceInfo HAL lock39 * hostDeviceInfo HAL lock
35 *40 *
36 * Must be > vmhs locks since this is held around the RANK_vmhsHDILock41 * Must be < vmhs locks since this is held around the RANK_vmhsHDILock
37 * callback lock which vmhs passes into that library.42 * callback lock which vmhs passes into that library.
38 */43 */
39#define RANK_hdiHALLock (RANK_libLockBase + 0x1005)44#define RANK_hdiHALLock (RANK_libLockBase + 0x1005)
4045
41/*46/*
42 * vmhs locks47 * vmhs locks (must be < vigor)
43 */48 */
44#define RANK_vmhsHDILock (RANK_libLockBase + 0x3002)49#define RANK_vmhsHDILock (RANK_libLockBase + 0x3002)
45#define RANK_vmhsThrMxLock (RANK_libLockBase + 0x3005)50#define RANK_vmhsThrMxLock (RANK_libLockBase + 0x3005)
@@ -72,6 +77,12 @@
72#define RANK_popPendingListLock (RANK_libLockBase + 0x4605)77#define RANK_popPendingListLock (RANK_libLockBase + 0x4605)
7378
74/*79/*
80 * vigor (must be < VMDB range and < disklib, see bug 741290)
81 */
82#define RANK_vigorClientLock (RANK_libLockBase + 0x4700)
83#define RANK_vigorOfflineClientLock (RANK_libLockBase + 0x4710)
84
85/*
75 * disklib and I/O related locks86 * disklib and I/O related locks
76 */87 */
77#define RANK_diskLibLock (RANK_libLockBase + 0x5001)88#define RANK_diskLibLock (RANK_libLockBase + 0x5001)
@@ -85,12 +96,6 @@
85#define RANK_parInitLock (RANK_libLockBase + 0x5070)96#define RANK_parInitLock (RANK_libLockBase + 0x5070)
8697
87/*98/*
88 * RANK_vigorClientLock < VMDB range
89 */
90#define RANK_vigorClientLock (RANK_libLockBase + 0x5400)
91#define RANK_vigorOfflineClientLock (RANK_libLockBase + 0x5410)
92
93/*
94 * VMDB range:99 * VMDB range:
95 * (RANK_libLockBase + 0x5500, RANK_libLockBase + 0x5600)100 * (RANK_libLockBase + 0x5500, RANK_libLockBase + 0x5600)
96 */101 */
@@ -111,15 +116,15 @@
111 * non-leaf locks are usually defined with RANK_LEAF - 1.116 * non-leaf locks are usually defined with RANK_LEAF - 1.
112 *117 *
113 * At least:118 * At least:
114 * impersonate > pollDefault119 * impersonate < pollDefault
115 * keyLocator > preference (for checking AESNI)120 * keyLocator < preference (for checking AESNI)
116 * configDb > keyLocator (for unlocking dictionaries)121 * keyLocator < ssl (bug 743010)
117 * battery/button > preference122 * configDb < keyLocator (for unlocking dictionaries)
118 * workerLib > something for sure under VThread_Create123 * battery/button < preference
119 * licenseCheck > preference124 * workerLib < something for sure under VThread_Create
125 * licenseCheck < preference
120 */126 */
121127
122#define RANK_sslStateLock (RANK_libLockBase + 0x7010)
123#define RANK_getSafeTmpDirLock (RANK_libLockBase + 0x7020)128#define RANK_getSafeTmpDirLock (RANK_libLockBase + 0x7020)
124#define RANK_batteryLock (RANK_libLockBase + 0x7030)129#define RANK_batteryLock (RANK_libLockBase + 0x7030)
125#define RANK_buttonLock (RANK_libLockBase + 0x7040)130#define RANK_buttonLock (RANK_libLockBase + 0x7040)
@@ -128,6 +133,7 @@
128#define RANK_workerLibLock (RANK_libLockBase + 0x7060)133#define RANK_workerLibLock (RANK_libLockBase + 0x7060)
129#define RANK_configDbLock (RANK_libLockBase + 0x7070)134#define RANK_configDbLock (RANK_libLockBase + 0x7070)
130#define RANK_keyLocatorLock (RANK_libLockBase + 0x7080)135#define RANK_keyLocatorLock (RANK_libLockBase + 0x7080)
136#define RANK_sslStateLock (RANK_libLockBase + 0x7085)
131#define RANK_licenseCheckLock (RANK_libLockBase + 0x7090)137#define RANK_licenseCheckLock (RANK_libLockBase + 0x7090)
132#define RANK_preferenceLock (RANK_libLockBase + 0x7100)138#define RANK_preferenceLock (RANK_libLockBase + 0x7100)
133139
134140
=== modified file 'lib/include/posix.h'
--- lib/include/posix.h 2011-07-22 16:41:03 +0000
+++ lib/include/posix.h 2011-10-31 00:22:23 +0000
@@ -86,6 +86,7 @@
86Unicode Posix_Getenv(ConstUnicode name);86Unicode Posix_Getenv(ConstUnicode name);
87long Posix_Pathconf(ConstUnicode pathName, int name);87long Posix_Pathconf(ConstUnicode pathName, int name);
88int Posix_Lstat(ConstUnicode pathName, struct stat *statbuf);88int Posix_Lstat(ConstUnicode pathName, struct stat *statbuf);
89Unicode Posix_MkTemp(ConstUnicode pathName);
8990
90#if !defined(_WIN32)91#if !defined(_WIN32)
91/*92/*
9293
=== modified file 'lib/include/unityCommon.h'
--- lib/include/unityCommon.h 2011-03-31 14:20:05 +0000
+++ lib/include/unityCommon.h 2011-10-31 00:22:23 +0000
@@ -188,9 +188,10 @@
188#ifndef _UNITY_COMMON_H_188#ifndef _UNITY_COMMON_H_
189#define _UNITY_COMMON_H_189#define _UNITY_COMMON_H_
190190
191#include "vmware.h"
192
191#define UNITY_MAX_SETTOP_WINDOW_COUNT 100193#define UNITY_MAX_SETTOP_WINDOW_COUNT 100
192194
193
194/*195/*
195 * Unity, GHI GuestRPC interface.196 * Unity, GHI GuestRPC interface.
196 */197 */
197198
=== modified file 'lib/include/vixCommands.h'
--- lib/include/vixCommands.h 2011-07-22 16:41:03 +0000
+++ lib/include/vixCommands.h 2011-10-31 00:22:23 +0000
@@ -2289,7 +2289,6 @@
2289#define VIX_BACKDOORCOMMAND_SYNCDRIVER_FREEZE VIX_BACKDOOR_COMMAND_VERSION"SyncDriver_Freeze"2289#define VIX_BACKDOORCOMMAND_SYNCDRIVER_FREEZE VIX_BACKDOOR_COMMAND_VERSION"SyncDriver_Freeze"
2290#define VIX_BACKDOORCOMMAND_SYNCDRIVER_THAW VIX_BACKDOOR_COMMAND_VERSION"SyncDriver_Thaw"2290#define VIX_BACKDOORCOMMAND_SYNCDRIVER_THAW VIX_BACKDOOR_COMMAND_VERSION"SyncDriver_Thaw"
2291#define VIX_BACKDOORCOMMAND_GET_PROPERTIES VIX_BACKDOOR_COMMAND_VERSION"Get_ToolsProperties"2291#define VIX_BACKDOORCOMMAND_GET_PROPERTIES VIX_BACKDOOR_COMMAND_VERSION"Get_ToolsProperties"
2292#define VIX_BACKDOORCOMMAND_CHECK_USER_ACCOUNT VIX_BACKDOOR_COMMAND_VERSION"Check_User_Account"
2293#define VIX_BACKDOORCOMMAND_SEND_HGFS_PACKET VIX_BACKDOOR_COMMAND_VERSION"Send_Hgfs_Packet"2292#define VIX_BACKDOORCOMMAND_SEND_HGFS_PACKET VIX_BACKDOOR_COMMAND_VERSION"Send_Hgfs_Packet"
2294#define VIX_BACKDOORCOMMAND_UNRECOGNIZED_COMMAND VIX_BACKDOOR_COMMAND_VERSION"Unrecognized_Command"2293#define VIX_BACKDOORCOMMAND_UNRECOGNIZED_COMMAND VIX_BACKDOOR_COMMAND_VERSION"Unrecognized_Command"
2295#define VIX_BACKDOORCOMMAND_COMMAND VIX_BACKDOOR_COMMAND_VERSION"Relayed_Command"2294#define VIX_BACKDOORCOMMAND_COMMAND VIX_BACKDOOR_COMMAND_VERSION"Relayed_Command"
22962295
=== modified file 'lib/include/vm_basic_asm.h'
--- lib/include/vm_basic_asm.h 2011-07-22 16:41:03 +0000
+++ lib/include/vm_basic_asm.h 2011-10-31 00:22:23 +0000
@@ -603,8 +603,8 @@
603 );603 );
604 return dst;604 return dst;
605#else605#else
606 int dummy0;606 size_t dummy0;
607 int dummy1;607 void *dummy1;
608608
609 __asm__ __volatile__("\t"609 __asm__ __volatile__("\t"
610 "cld" "\n\t"610 "cld" "\n\t"
@@ -633,8 +633,8 @@
633 );633 );
634 return dst;634 return dst;
635#else635#else
636 int dummy0;636 size_t dummy0;
637 int dummy1;637 void *dummy1;
638638
639 __asm__ __volatile__("\t"639 __asm__ __volatile__("\t"
640 "cld" "\n\t"640 "cld" "\n\t"
641641
=== modified file 'lib/include/vm_product.h'
--- lib/include/vm_product.h 2011-07-22 16:41:03 +0000
+++ lib/include/vm_product.h 2011-10-31 00:22:23 +0000
@@ -133,8 +133,9 @@
133133
134#define PRODUCT_DDK_NAME MAKE_NAME("ESX DDK")134#define PRODUCT_DDK_NAME MAKE_NAME("ESX DDK")
135135
136#define PRODUCT_VDM_SHORT_NAME "VDM"136// XXX I think these are dead and can be removed -clayton
137#define PRODUCT_VDM_NAME MAKE_NAME("Virtual Desktop Manager")137// #define PRODUCT_VDM_SHORT_NAME "VDM"
138// #define PRODUCT_VDM_NAME MAKE_NAME("Virtual Desktop Manager")
138139
139#define PRODUCT_VDDK_SHORT_NAME "VDDK"140#define PRODUCT_VDDK_SHORT_NAME "VDDK"
140#define PRODUCT_VDDK_NAME MAKE_NAME("VMware Virtual Disk Development Kit")141#define PRODUCT_VDDK_NAME MAKE_NAME("VMware Virtual Disk Development Kit")
@@ -148,6 +149,13 @@
148149
149#define PRODUCT_BOOMERANG_NAME MAKE_NAME("Boomerang")150#define PRODUCT_BOOMERANG_NAME MAKE_NAME("Boomerang")
150151
152#define PRODUCT_HBR_SERVER_NAME MAKE_NAME("vSphere Replication Server")
153
154#define PRODUCT_VIEW_SHORT_NAME "View"
155#define PRODUCT_VIEW_NAME MAKE_NAME("View")
156#define PRODUCT_VIEW_NAME_FOR_LICENSE PRODUCT_VIEW_NAME
157
158
151// XXX VMvisor is the underlying technology for possibly several products,159// XXX VMvisor is the underlying technology for possibly several products,
152// XXX not the product. Fix when names are decided.160// XXX not the product. Fix when names are decided.
153// #define PRODUCT_VMVISOR_NAME MAKE_NAME("VMvisor")161// #define PRODUCT_VMVISOR_NAME MAKE_NAME("VMvisor")
@@ -180,7 +188,7 @@
180 */188 */
181#define PRODUCT_VMRC_PLUGIN_GUID_EMBEDDED 291BA977-564B-4626-B868-A968FB8D4591189#define PRODUCT_VMRC_PLUGIN_GUID_EMBEDDED 291BA977-564B-4626-B868-A968FB8D4591
182#define PRODUCT_VMRC_PLUGIN_GUID_TYPELIB 70ABCAB7-6B45-4555-ABFC-8BC686E5ACFE190#define PRODUCT_VMRC_PLUGIN_GUID_TYPELIB 70ABCAB7-6B45-4555-ABFC-8BC686E5ACFE
183#define PRODUCT_VMRC_PLUGIN_PROGID_EMBEDDED_BASE "VMware.VMwareRemoteConsole"191#define PRODUCT_VMRC_PLUGIN_PROGID_EMBEDDED_BASE "VMware.RemoteConsole"
184#define PRODUCT_VMRC_PLUGIN_PROGID_EMBEDDED PRODUCT_VMRC_PLUGIN_PROGID_EMBEDDED_BASE "." \192#define PRODUCT_VMRC_PLUGIN_PROGID_EMBEDDED PRODUCT_VMRC_PLUGIN_PROGID_EMBEDDED_BASE "." \
185 XSTR(VMRC_PLUGIN_VERSION_BASE)193 XSTR(VMRC_PLUGIN_VERSION_BASE)
186194
@@ -242,6 +250,7 @@
242 || defined(VMX86_WGS) \250 || defined(VMX86_WGS) \
243 || defined(VMX86_DESKTOP) \251 || defined(VMX86_DESKTOP) \
244 || defined(VMX86_ENTERPRISE_DESKTOP) \252 || defined(VMX86_ENTERPRISE_DESKTOP) \
253 || defined(VMX86_VIEW) \
245 || defined(VMX86_MUI) \254 || defined(VMX86_MUI) \
246 || defined(VMX86_API) \255 || defined(VMX86_API) \
247 || defined(VMX86_VPX) \256 || defined(VMX86_VPX) \
@@ -257,7 +266,8 @@
257 || defined(VMX86_DDK) \266 || defined(VMX86_DDK) \
258 || defined(VMX86_VDDK) \267 || defined(VMX86_VDDK) \
259 || defined(VMX86_NETDUMP) \268 || defined(VMX86_NETDUMP) \
260 || defined(VMX86_BOOMERANG))269 || defined(VMX86_BOOMERANG) \
270 || defined(VMX86_HBR_SERVER))
261# if defined(_WIN32) || defined(__APPLE__)271# if defined(_WIN32) || defined(__APPLE__)
262 /*272 /*
263 * XXX Make the product be Workstation by default if none of the defines273 * XXX Make the product be Workstation by default if none of the defines
@@ -334,6 +344,10 @@
334# define PRODUCT_SHORT_NAME PRODUCT_NETDUMP_NAME344# define PRODUCT_SHORT_NAME PRODUCT_NETDUMP_NAME
335#elif defined(VMX86_BOOMERANG)345#elif defined(VMX86_BOOMERANG)
336# define PRODUCT_SHORT_NAME PRODUCT_BOOMERANG_NAME346# define PRODUCT_SHORT_NAME PRODUCT_BOOMERANG_NAME
347#elif defined(VMX86_HBR_SERVER)
348# define PRODUCT_SHORT_NAME PRODUCT_HBR_SERVER_NAME
349#elif defined(VMX86_VIEW)
350# define PRODUCT_SHORT_NAME PRODUCT_VIEW_NAME
337#endif351#endif
338352
339353
340354
=== modified file 'lib/include/vm_version.h'
--- lib/include/vm_version.h 2011-07-22 16:41:03 +0000
+++ lib/include/vm_version.h 2011-10-31 00:22:23 +0000
@@ -92,9 +92,11 @@
92 #define PRODUCT_VERSION 1,1,5,PRODUCT_BUILD_NUMBER_NUMERIC92 #define PRODUCT_VERSION 1,1,5,PRODUCT_BUILD_NUMBER_NUMERIC
93#elif defined(VMX86_VPX)93#elif defined(VMX86_VPX)
94 /* this should be kept in sync with the corresponding vpx branch. */94 /* this should be kept in sync with the corresponding vpx branch. */
95 #define PRODUCT_VERSION 5,0,0,PRODUCT_BUILD_NUMBER_NUMERIC95 #define PRODUCT_VERSION 5,1,0,PRODUCT_BUILD_NUMBER_NUMERIC
96#elif defined(VMX86_BOOMERANG)96#elif defined(VMX86_BOOMERANG)
97 #define PRODUCT_VERSION 1,0,0,PRODUCT_BUILD_NUMBER_NUMERIC97 #define PRODUCT_VERSION 1,0,0,PRODUCT_BUILD_NUMBER_NUMERIC
98#elif defined(VMX86_VIEW)
99 #define PRODUCT_VERSION 0,0,0,PRODUCT_BUILD_NUMBER_NUMERIC
98#else100#else
99 #define PRODUCT_VERSION 4,0,0,PRODUCT_BUILD_NUMBER_NUMERIC /* PLAYER_VERSION_NUMBER below has to match this */101 #define PRODUCT_VERSION 4,0,0,PRODUCT_BUILD_NUMBER_NUMERIC /* PLAYER_VERSION_NUMBER below has to match this */
100#endif102#endif
@@ -123,7 +125,7 @@
123 * VMI 2.0 : 3.1.0125 * VMI 2.0 : 3.1.0
124 * P2VA 3.0 : 3.?.?126 * P2VA 3.0 : 3.?.?
125 */127 */
126#define VIE_FILEVERSION 5,0,0,PRODUCT_BUILD_NUMBER_NUMERIC128#define VIE_FILEVERSION 5,1,0,PRODUCT_BUILD_NUMBER_NUMERIC
127129
128/*130/*
129 * This string can be a little more "free form". The license131 * This string can be a little more "free form". The license
@@ -188,7 +190,7 @@
188 * 4.0.0-1.8: patch 3190 * 4.0.0-1.8: patch 3
189 */191 */
190#define ESX_VERSION_MAJOR "5"192#define ESX_VERSION_MAJOR "5"
191#define ESX_VERSION_MINOR "0"193#define ESX_VERSION_MINOR "1"
192#define ESX_VERSION_MAINT "0"194#define ESX_VERSION_MAINT "0"
193#define ESX_VERSION ESX_VERSION_MAJOR "." ESX_VERSION_MINOR "." \195#define ESX_VERSION ESX_VERSION_MAJOR "." ESX_VERSION_MINOR "." \
194 ESX_VERSION_MAINT196 ESX_VERSION_MAINT
@@ -211,21 +213,37 @@
211#define PLAYER_VERSION "e.x.p"213#define PLAYER_VERSION "e.x.p"
212#define V2V_VERSION "e.x.p"214#define V2V_VERSION "e.x.p"
213#define V2V_FILE_VERSION 1,0,0,0215#define V2V_FILE_VERSION 1,0,0,0
216/*
217 * When updating FUSION_VERSION from e.x.p to GA, you will also need to update
218 * lastVersion{Major,Minor,Patch} in bora/scons/package/fusion/fusion.sc
219 * which controls what versions are allowed to automatically update for free.
220 */
214#define FUSION_VERSION "e.x.p"221#define FUSION_VERSION "e.x.p"
215#define BOOMERANG_VERSION "e.x.p"222#define BOOMERANG_VERSION "e.x.p"
223#define HBR_SERVER_VERSION "e.x.p"
216224
217// These must match VIE_FILEVERSION above225// These must match VIE_FILEVERSION above
218#define SYSIMAGE_VERSION "5.0.0"226#define SYSIMAGE_VERSION "5.1.0"
219#define SYSIMAGE_FILE_VERSION VIE_FILEVERSION227#define SYSIMAGE_FILE_VERSION VIE_FILEVERSION
220228
221#define VCB_VERSION "4.0.0"229#define VCB_VERSION "4.0.0"
222#define VCB_FILE_VERSION 4,0,0,0230#define VCB_FILE_VERSION 4,0,0,0
223#define VIM_VERSION "5.0.0"231#define VIM_VERSION "5.1.0"
224#define VPX_VERSION "5.0.0"232
233// Put VPX_VERSION first, because vpx/make/defs.mk doesn't check for suffix.
234#define VPX_VERSION "5.1.0"
235#define VPX_VERSION_MAJOR "5"
236#define VPX_VERSION_MINOR "1"
237#define VPX_VERSION_MAINT "0"
238#define VPX_VERSION_THIRD_PARTY VPX_VERSION_MAJOR VPX_VERSION_MINOR \
239 VPX_VERSION_MAINT
225#define VPX_RELEASE_UPDATE "0" /* 0 = Pre-release/GA, 1 = Update 1 */240#define VPX_RELEASE_UPDATE "0" /* 0 = Pre-release/GA, 1 = Update 1 */
241#define VPX_RELEASE_PATCH "0" /* 0 = experimental */
242#define VPX_RELEASE VPX_RELEASE_UPDATE "." VPX_RELEASE_PATCH
243
226#define SVA_VERSION "1.0.0"244#define SVA_VERSION "1.0.0"
227#define SSO_VERSION "1.0.0"245#define SSO_VERSION "1.0.0"
228#define WBC_VERSION "5.0.0"246#define WBC_VERSION "5.1.0"
229#define SDK_VERSION "4.1.0"247#define SDK_VERSION "4.1.0"
230#define FOUNDRY_VERSION "1.11.0"248#define FOUNDRY_VERSION "1.11.0"
231#define FOUNDRY_FILE_VERSION 1,11,0,PRODUCT_BUILD_NUMBER_NUMERIC249#define FOUNDRY_FILE_VERSION 1,11,0,PRODUCT_BUILD_NUMBER_NUMERIC
@@ -233,7 +251,7 @@
233#define VLICENSE_VERSION "1.1.5"251#define VLICENSE_VERSION "1.1.5"
234#define DDK_VERSION "e.x.p"252#define DDK_VERSION "e.x.p"
235#define VIPERL_VERSION "1.1.0"253#define VIPERL_VERSION "1.1.0"
236#define RCLI_VERSION "5.0.0"254#define RCLI_VERSION "5.1.0"
237#define VDM_VERSION "e.x.p"255#define VDM_VERSION "e.x.p"
238#define VMSAFE_VERSION "1.2.0"256#define VMSAFE_VERSION "1.2.0"
239#define VMSAFE_FILE_VERSION 1,2,0,PRODUCT_BUILD_NUMBER_NUMERIC257#define VMSAFE_FILE_VERSION 1,2,0,PRODUCT_BUILD_NUMBER_NUMERIC
@@ -247,6 +265,7 @@
247#define VIEWY_VERSION "e.x.p"265#define VIEWY_VERSION "e.x.p"
248#define VMCFSDK_VERSION "e.x.p"266#define VMCFSDK_VERSION "e.x.p"
249#define PCOIP_VERSION "e.x.p"267#define PCOIP_VERSION "e.x.p"
268#define VIEW_VERSION "0.0.0"
250269
251270
252// VMRC_PLUGIN_VERSION should match PLAYER_VERSION but can't be e.x.p271// VMRC_PLUGIN_VERSION should match PLAYER_VERSION but can't be e.x.p
@@ -286,7 +305,7 @@
286305
287#define USB_ARBITRATOR_VERSION_MAJOR 9306#define USB_ARBITRATOR_VERSION_MAJOR 9
288#define USB_ARBITRATOR_VERSION_MINOR 0307#define USB_ARBITRATOR_VERSION_MINOR 0
289#define USB_ARBITRATOR_VERSION_Z 25308#define USB_ARBITRATOR_VERSION_Z 33
290309
291#define USB_ARBITRATOR_VERSION_BASE USB_ARBITRATOR_VERSION_MAJOR.\310#define USB_ARBITRATOR_VERSION_BASE USB_ARBITRATOR_VERSION_MAJOR.\
292 USB_ARBITRATOR_VERSION_MINOR311 USB_ARBITRATOR_VERSION_MINOR
@@ -302,7 +321,7 @@
302 * USB Arbitrator Component version. This version is used by the linux321 * USB Arbitrator Component version. This version is used by the linux
303 * installer. See USB_ARBITRATOR_COMPONENT_VERSION_NUMBER in mk/defs-onetime.mk322 * installer. See USB_ARBITRATOR_COMPONENT_VERSION_NUMBER in mk/defs-onetime.mk
304 */323 */
305#define USB_ARBITRATOR_COMPONENT_VERSION_NUMBER "9.0.25"324#define USB_ARBITRATOR_COMPONENT_VERSION_NUMBER "9.0.33"
306325
307#ifdef VMX86_VPX326#ifdef VMX86_VPX
308#define VIM_API_TYPE "VirtualCenter"327#define VIM_API_TYPE "VirtualCenter"
@@ -369,6 +388,10 @@
369# define PRODUCT_VERSION_NUMBER VDDK_VERSION388# define PRODUCT_VERSION_NUMBER VDDK_VERSION
370#elif defined(VMX86_BOOMERANG)389#elif defined(VMX86_BOOMERANG)
371# define PRODUCT_VERSION_NUMBER BOOMERANG_VERSION390# define PRODUCT_VERSION_NUMBER BOOMERANG_VERSION
391#elif defined(VMX86_HBR_SERVER)
392# define PRODUCT_VERSION_NUMBER HBR_SERVER_VERSION
393#elif defined(VMX86_VIEW)
394# define PRODUCT_VERSION_NUMBER VIEW_VERSION
372#endif395#endif
373396
374/*397/*
375398
=== modified file 'lib/include/vmci_defs.h'
--- lib/include/vmci_defs.h 2011-03-31 14:20:05 +0000
+++ lib/include/vmci_defs.h 2011-10-31 00:22:23 +0000
@@ -314,8 +314,10 @@
314#define VMCI_EVENT_QP_RESUMED 2 // Only applicable to guest endpoints314#define VMCI_EVENT_QP_RESUMED 2 // Only applicable to guest endpoints
315#define VMCI_EVENT_QP_PEER_ATTACH 3 // Applicable to guest and host315#define VMCI_EVENT_QP_PEER_ATTACH 3 // Applicable to guest and host
316#define VMCI_EVENT_QP_PEER_DETACH 4 // Applicable to guest and host316#define VMCI_EVENT_QP_PEER_DETACH 4 // Applicable to guest and host
317#define VMCI_EVENT_MEM_ACCESS_ON 5 // Only applicable to VMX endpoints317#define VMCI_EVENT_MEM_ACCESS_ON 5 // Applicable to VMX and vmk. On vmk,
318#define VMCI_EVENT_MEM_ACCESS_OFF 6 // Only applicable to VMX endpoints318 // this event has the Context payload type.
319#define VMCI_EVENT_MEM_ACCESS_OFF 6 // Applicable to VMX and vmk. Same as
320 // above for the payload type.
319#define VMCI_EVENT_MAX 7321#define VMCI_EVENT_MAX 7
320322
321/*323/*
@@ -329,8 +331,12 @@
329#define VMCI_EVENT_VALID_VMX(_event) (_event == VMCI_EVENT_MEM_ACCESS_ON || \331#define VMCI_EVENT_VALID_VMX(_event) (_event == VMCI_EVENT_MEM_ACCESS_ON || \
330 _event == VMCI_EVENT_MEM_ACCESS_OFF)332 _event == VMCI_EVENT_MEM_ACCESS_OFF)
331333
334#if defined(VMX86_SERVER)
335#define VMCI_EVENT_VALID(_event) (_event < VMCI_EVENT_MAX)
336#else // VMX86_SERVER
332#define VMCI_EVENT_VALID(_event) (_event < VMCI_EVENT_MAX && \337#define VMCI_EVENT_VALID(_event) (_event < VMCI_EVENT_MAX && \
333 !VMCI_EVENT_VALID_VMX(_event))338 !VMCI_EVENT_VALID_VMX(_event))
339#endif // VMX86_SERVER
334340
335/* Reserved guest datagram resource ids. */341/* Reserved guest datagram resource ids. */
336#define VMCI_EVENT_HANDLER 0342#define VMCI_EVENT_HANDLER 0
337343
=== modified file 'lib/misc/hostinfo.c'
--- lib/misc/hostinfo.c 2011-07-22 16:41:03 +0000
+++ lib/misc/hostinfo.c 2011-10-31 00:22:23 +0000
@@ -256,11 +256,9 @@
256 *256 *
257 * Hostinfo_GetOSName --257 * Hostinfo_GetOSName --
258 *258 *
259 * Query the operating system and build a pair of strings to identify it.259 * Query the operating system and build a string to identify it.
260 * The two strings are osName and osNameFull. Short osName strings are
261 * the same as you'd see in a VM's .vmx file.
262 *260 *
263 * The long names are a bit more descriptive:261 * Examples:
264 * Windows: <OS NAME> <SERVICE PACK> (BUILD <BUILD_NUMBER>)262 * Windows: <OS NAME> <SERVICE PACK> (BUILD <BUILD_NUMBER>)
265 * example: Windows XP Professional Service Pack 2 (Build 2600)263 * example: Windows XP Professional Service Pack 2 (Build 2600)
266 *264 *
@@ -268,31 +266,62 @@
268 * example: Linux 2.4.18-3 Red Hat Linux release 7.3 (Valhalla)266 * example: Linux 2.4.18-3 Red Hat Linux release 7.3 (Valhalla)
269 *267 *
270 * Return value:268 * Return value:
271 * Returns TRUE on success and FALSE on failure.269 * NULL Unable to obtain the OS name.
272 * Returns the guest's full OS name (osFullName)270 * !NULL The OS name. The caller is responsible for freeing it.
273 * Returns the guest's OS name in the same format as .vmx file (osName)271 *
274 *272 * Side effects:
275 * Side effects:273 * Memory is allocated.
276 * None274 *
277 *275 *-----------------------------------------------------------------------------
278 *-----------------------------------------------------------------------------276 */
279 */277
280278char *
281Bool279Hostinfo_GetOSName(void)
282Hostinfo_GetOSName(uint32 outBufFullLen, // IN: length of osFullName buffer280{
283 uint32 outBufLen, // IN: length of osName buffer281 char *name;
284 char *osFullName, // OUT: Full OS name282 Bool data = HostinfoOSNameCacheValid ? TRUE : HostinfoOSData();
285 char *osName) // OUT: OS name283
286{284 if (data) {
287 Bool retval;285 name = Util_SafeStrdup(HostinfoCachedOSFullName);
288286 } else {
289 retval = HostinfoOSNameCacheValid ? TRUE : HostinfoOSData();287 name = NULL;
290288 }
291 if (retval) {289
292 Str_Strcpy(osFullName, HostinfoCachedOSFullName, outBufFullLen);290 return name;
293 Str_Strcpy(osName, HostinfoCachedOSName, outBufLen);291}
294 }292
295293
296 return retval;294
295/*
296 *-----------------------------------------------------------------------------
297 *
298 * Hostinfo_GetOSGuestString --
299 *
300 * Query the operating system and build a string to identify it. The
301 * returned string is the same as you'd see in a VM's .vmx file.
302 *
303 * Return value:
304 * NULL Unable to obtain the OS name.
305 * !NULL The OS name. The caller is responsible for freeing it.
306 *
307 * Side effects:
308 * Memory is allocated.
309 *
310 *-----------------------------------------------------------------------------
311 */
312
313char *
314Hostinfo_GetOSGuestString(void)
315{
316 char *name;
317 Bool data = HostinfoOSNameCacheValid ? TRUE : HostinfoOSData();
318
319 if (data) {
320 name = Util_SafeStrdup(HostinfoCachedOSName);
321 } else {
322 name = NULL;
323 }
324
325 return name;
297}326}
298327
299328
=== modified file 'lib/misc/hostinfoHV.c'
--- lib/misc/hostinfoHV.c 2011-07-22 16:41:03 +0000
+++ lib/misc/hostinfoHV.c 2011-10-31 00:22:23 +0000
@@ -489,7 +489,7 @@
489/*489/*
490 *----------------------------------------------------------------------490 *----------------------------------------------------------------------
491 *491 *
492 * Hostinfo_TouchBackDoor --492 * Hostinfo_TouchBackDoor --
493 *493 *
494 * Access the backdoor. This is used to determine if we are494 * Access the backdoor. This is used to determine if we are
495 * running in a VM or on a physical host. On a physical host495 * running in a VM or on a physical host. On a physical host
@@ -505,7 +505,7 @@
505 * if not.505 * if not.
506 *506 *
507 * Side effects:507 * Side effects:
508 * Exception if not in a VM.508 * Exception if not in a VM.
509 *509 *
510 *----------------------------------------------------------------------510 *----------------------------------------------------------------------
511 */511 */
@@ -513,13 +513,7 @@
513Bool513Bool
514Hostinfo_TouchBackDoor(void)514Hostinfo_TouchBackDoor(void)
515{515{
516 /*516#if defined(__i386__) || defined(__x86_64__)
517 * XXX: This can cause Apple's Crash Reporter to erroneously display
518 * a crash, even though the process has caught the SIGILL and handled
519 * it.
520 */
521
522#if !defined(__APPLE__) && (defined(__i386__) || defined(__x86_64__))
523 uint32 eax;517 uint32 eax;
524 uint32 ebx;518 uint32 ebx;
525 uint32 ecx;519 uint32 ecx;
526520
=== modified file 'lib/misc/hostinfoInt.h'
--- lib/misc/hostinfoInt.h 2010-01-24 09:55:47 +0000
+++ lib/misc/hostinfoInt.h 2011-10-31 00:22:23 +0000
@@ -26,8 +26,8 @@
26#define _HOSTINFOINT_H_26#define _HOSTINFOINT_H_
2727
2828
29#define MAX_OS_NAME_LEN 6429#define MAX_OS_NAME_LEN 128
30#define MAX_OS_FULLNAME_LEN 19230#define MAX_OS_FULLNAME_LEN 512
3131
3232
33/*33/*
3434
=== modified file 'lib/misc/posixDlopen.c'
--- lib/misc/posixDlopen.c 2011-03-31 14:20:05 +0000
+++ lib/misc/posixDlopen.c 2011-10-31 00:22:23 +0000
@@ -21,7 +21,7 @@
21#include <stdlib.h>21#include <stdlib.h>
22#include <errno.h>22#include <errno.h>
2323
24#if defined(__APPLE__) || defined(linux) || defined(sun)24#if !defined(_WIN32)
25#include <dlfcn.h>25#include <dlfcn.h>
26#endif26#endif
2727
@@ -29,7 +29,7 @@
29#include "posixInt.h"29#include "posixInt.h"
3030
3131
32#if defined(__APPLE__) || defined(linux) || defined(sun)32#if !defined(_WIN32)
33/*33/*
34 *----------------------------------------------------------------------34 *----------------------------------------------------------------------
35 *35 *
3636
=== modified file 'lib/misc/posixPosix.c'
--- lib/misc/posixPosix.c 2011-07-22 16:41:03 +0000
+++ lib/misc/posixPosix.c 2011-10-31 00:22:23 +0000
@@ -3259,5 +3259,45 @@
32593259
3260 return ret;3260 return ret;
3261}3261}
3262
3263#endif // } !defined(sun)3262#endif // } !defined(sun)
3263
3264
3265/*
3266 *----------------------------------------------------------------------
3267 *
3268 * Posix_MkTemp --
3269 *
3270 * POSIX mktemp(). It is implemented via mkstemp() to avoid
3271 * warning about using dangerous mktemp() API - but note that
3272 * it suffers from all mktemp() problems - caller has to use
3273 * O_EXCL when creating file, and retry if file already exists.
3274 *
3275 * Results:
3276 * NULL Error
3277 * !NULL Success (result must be freed by the caller)
3278 *
3279 * Side effects:
3280 * errno is set on error
3281 *
3282 *----------------------------------------------------------------------
3283 */
3284
3285Unicode
3286Posix_MkTemp(ConstUnicode pathName) // IN:
3287{
3288 Unicode result = NULL;
3289 char *path;
3290 int fd;
3291
3292 if (!PosixConvertToCurrent(pathName, &path)) {
3293 return NULL;
3294 }
3295 fd = mkstemp(path);
3296 if (fd >= 0) {
3297 close(fd);
3298 unlink(path);
3299 result = Unicode_Alloc(path, STRING_ENCODING_DEFAULT);
3300 }
3301 free(path);
3302 return result;
3303}
32643304
=== modified file 'lib/procMgr/procMgrPosix.c'
--- lib/procMgr/procMgrPosix.c 2011-03-31 14:20:05 +0000
+++ lib/procMgr/procMgrPosix.c 2011-10-31 00:22:23 +0000
@@ -33,6 +33,8 @@
33#include <unistd.h>33#include <unistd.h>
34#if !defined(__FreeBSD__) && !defined(sun) && !defined(__APPLE__)34#if !defined(__FreeBSD__) && !defined(sun) && !defined(__APPLE__)
35#include <asm/param.h>35#include <asm/param.h>
36#endif
37#if !defined(sun) && !defined(__APPLE__)
36#include <locale.h>38#include <locale.h>
37#include <sys/stat.h>39#include <sys/stat.h>
38#endif40#endif
@@ -48,13 +50,18 @@
48#include <time.h>50#include <time.h>
49#include <grp.h>51#include <grp.h>
50#include <sys/syscall.h>52#include <sys/syscall.h>
51#if defined(linux) || defined(HAVE_SYS_USER_H)53#if defined(linux) || defined(__FreeBSD__) || defined(HAVE_SYS_USER_H)
52// sys/param.h is required on FreeBSD before sys/user.h54// sys/param.h is required on FreeBSD before sys/user.h
53# include <sys/param.h>55# include <sys/param.h>
54// Pull in PAGE_SIZE/PAGE_SHIFT defines ahead of vm_basic_defs.h56// Pull in PAGE_SIZE/PAGE_SHIFT defines ahead of vm_basic_defs.h
55# include <sys/user.h>57# include <sys/user.h>
56#endif58#endif
5759#if defined (__FreeBSD__)
60#include <kvm.h>
61#include <limits.h>
62#include <paths.h>
63#include <sys/sysctl.h>
64#endif
58#include "vmware.h"65#include "vmware.h"
59#include "procMgr.h"66#include "procMgr.h"
60#include "vm_assert.h"67#include "vm_assert.h"
@@ -171,13 +178,13 @@
171 *----------------------------------------------------------------------178 *----------------------------------------------------------------------
172 */179 */
173180
174#if !defined(sun)181#if !defined(sun) && !defined(__FreeBSD__)
175int182int
176ProcMgr_ReadProcFile(int fd, // IN183ProcMgr_ReadProcFile(int fd, // IN
177 char **contents) // OUT184 char **contents) // OUT
178{185{
179 int size = 0;186 int size = 0;
180#if !defined(__FreeBSD__) && !defined(__APPLE__)187#if !defined(__APPLE__)
181 char tmp[512];188 char tmp[512];
182 int numRead;189 int numRead;
183190
@@ -227,7 +234,7 @@
227 return size;234 return size;
228}235}
229236
230#endif // !sun237#endif // !sun && !FreeBSD
231238
232/*239/*
233 *----------------------------------------------------------------------240 *----------------------------------------------------------------------
@@ -247,12 +254,12 @@
247 *----------------------------------------------------------------------254 *----------------------------------------------------------------------
248 */255 */
249256
250#if !defined(sun)257#if !defined(sun) && !defined(__FreeBSD__)
251ProcMgr_ProcList *258ProcMgr_ProcList *
252ProcMgr_ListProcesses(void)259ProcMgr_ListProcesses(void)
253{260{
254 ProcMgr_ProcList *procList = NULL;261 ProcMgr_ProcList *procList = NULL;
255#if !defined(__FreeBSD__) && !defined(__APPLE__)262#if !defined(__APPLE__)
256 Bool failed = FALSE;263 Bool failed = FALSE;
257 DynBuf dbProcId;264 DynBuf dbProcId;
258 DynBuf dbProcCmd;265 DynBuf dbProcCmd;
@@ -595,12 +602,211 @@
595 ProcMgr_FreeProcList(procList);602 ProcMgr_FreeProcList(procList);
596 procList = NULL;603 procList = NULL;
597 }604 }
598#endif // !defined(__FreeBSD__) && !defined(__APPLE__)605#endif // !defined(__APPLE__)
599606
600 return procList;607 return procList;
601}608}
602#endif // !defined(sun)609#endif // !defined(sun) & !defined(__FreeBSD__)
603610
611
612/*
613 *----------------------------------------------------------------------
614 *
615 * ProcMgr_ListProcesses --
616 *
617 * List all the processes that the calling client has privilege to
618 * enumerate. The strings in the returned structure should be all
619 * UTF-8 encoded, although we do not enforce it right now.
620 *
621 * Results:
622 *
623 * A ProcMgr_ProcList.
624 *
625 * Side effects:
626 *
627 *----------------------------------------------------------------------
628 */
629
630#if defined(__FreeBSD__)
631ProcMgr_ProcList *
632ProcMgr_ListProcesses(void)
633{
634 ProcMgr_ProcList *procList = NULL;
635 Bool failed = TRUE;
636 static kvm_t *kd;
637 struct kinfo_proc *kp;
638 char errbuf[_POSIX2_LINE_MAX];
639 int i, nentries=-1, flag=0;
640 DynBuf dbProcId;
641 DynBuf dbProcCmd;
642 DynBuf dbProcStartTime;
643 DynBuf dbProcOwner;
644
645 DynBuf_Init(&dbProcId);
646 DynBuf_Init(&dbProcCmd);
647 DynBuf_Init(&dbProcStartTime);
648 DynBuf_Init(&dbProcOwner);
649
650 /*
651 * Get the handle to the Kernel Virtual Memory
652 */
653 kd = kvm_openfiles(NULL, _PATH_DEVNULL, NULL, O_RDONLY, errbuf);
654 if (kd == NULL) {
655 Warning("%s: failed to open kvm with error: %s\n", __FUNCTION__, errbuf);
656 goto abort;
657 }
658
659 /*
660 * Get the list of process info structs
661 */
662 kp = kvm_getprocs(kd, KERN_PROC_PROC, flag, &nentries);
663 if ((kp == NULL && nentries > 0) || (kp != NULL && nentries < 0)) {
664 Warning("%s: failed to get proc infos with error: %s\n",
665 __FUNCTION__, kvm_geterr(kd));
666 goto abort;
667 }
668
669 /*
670 * Iterate through the list of process entries
671 */
672 for (i = 0; i < nentries; ++i, ++kp) {
673 struct passwd *pwd;
674 char *userName = NULL;
675 char *cmdLine = NULL;
676 char **cmdLineTemp = NULL;
677 time_t processStartTime;
678
679 /*
680 * Store the pid of the process
681 */
682 if (!DynBuf_Append(&dbProcId, &(kp->ki_pid), sizeof(kp->ki_pid))) {
683 Warning("%s: failed to append pid in DynBuf - out of memory\n",
684 __FUNCTION__);
685 goto abort;
686 }
687
688 /*
689 * Store the owner of the process.
690 */
691 pwd = getpwuid(kp->ki_uid);
692 userName = (NULL == pwd)
693 ? Str_SafeAsprintf(NULL, "%d", (int) kp->ki_uid)
694 : Unicode_Alloc(pwd->pw_name, STRING_ENCODING_DEFAULT);
695 if (!DynBuf_Append(&dbProcOwner, &userName, sizeof userName)) {
696 Warning("%s: failed to append username in DynBuf - out of memory\n",
697 __FUNCTION__);
698 goto abort;
699 }
700
701 /*
702 * Store the command line string of the process
703 */
704 cmdLineTemp = kvm_getargv(kd, kp, 0);
705 if (cmdLineTemp != NULL) {
706 // flatten the argument list to get cmd & all params
707 DynBuf dbuf;
708
709 DynBuf_Init(&dbuf);
710 while (*cmdLineTemp != NULL) {
711 if (!DynBuf_Append(&dbuf, *cmdLineTemp, strlen(*cmdLineTemp))) {
712 Warning("%s: failed to append cmd/args in DynBuf - no memory\n",
713 __FUNCTION__);
714 goto abort;
715 }
716 cmdLineTemp++;
717 if (*cmdLineTemp != NULL) {
718 // add the whitespace between arguments
719 if (!DynBuf_Append(&dbuf, " ", 1)) {
720 Warning("%s: failed to append ' ' in DynBuf - no memory\n",
721 __FUNCTION__);
722 goto abort;
723 }
724 }
725 }
726 // add the NUL term
727 if (!DynBuf_Append(&dbuf, "", 1)) {
728 Warning("%s: failed to append NUL in DynBuf - out of memory\n",
729 __FUNCTION__);
730 goto abort;
731 }
732 DynBuf_Trim(&dbuf);
733 cmdLine = DynBuf_Detach(&dbuf);
734 DynBuf_Destroy(&dbuf);
735 } else {
736 cmdLine = Unicode_Alloc(kp->ki_comm, STRING_ENCODING_DEFAULT);
737 }
738 if (!DynBuf_Append(&dbProcCmd, &cmdLine, sizeof cmdLine)) {
739 Warning("%s: failed to append cmdline in DynBuf - out of memory\n",
740 __FUNCTION__);
741 goto abort;
742 }
743
744 /*
745 * Store the start time of the process
746 */
747 processStartTime = kp->ki_start.tv_sec;
748 if (!DynBuf_Append(&dbProcStartTime,
749 &processStartTime,
750 sizeof processStartTime)) {
751 Warning("%s: failed to append start time in DynBuf - out of memory\n",
752 __FUNCTION__);
753 goto abort;
754 }
755
756 } // for nentries
757
758 if (0 == DynBuf_GetSize(&dbProcId)) {
759 goto abort;
760 }
761
762 /*
763 * We're done adding to DynBuf. Trim off any unused allocated space.
764 * DynBuf_Trim() followed by DynBuf_Detach() avoids a memcpy().
765 */
766 DynBuf_Trim(&dbProcId);
767 DynBuf_Trim(&dbProcCmd);
768 DynBuf_Trim(&dbProcStartTime);
769 DynBuf_Trim(&dbProcOwner);
770
771 /*
772 * Create a ProcMgr_ProcList and populate its fields.
773 */
774 procList = (ProcMgr_ProcList *) Util_SafeCalloc(1, sizeof(ProcMgr_ProcList));
775 ASSERT_NOT_IMPLEMENTED(procList);
776
777 procList->procCount = DynBuf_GetSize(&dbProcId) / sizeof(pid_t);
778
779 procList->procIdList = (pid_t *) DynBuf_Detach(&dbProcId);
780 ASSERT_NOT_IMPLEMENTED(procList->procIdList);
781 procList->procCmdList = (char **) DynBuf_Detach(&dbProcCmd);
782 ASSERT_NOT_IMPLEMENTED(procList->procCmdList);
783 procList->startTime = (time_t *) DynBuf_Detach(&dbProcStartTime);
784 ASSERT_NOT_IMPLEMENTED(procList->startTime);
785 procList->procOwnerList = (char **) DynBuf_Detach(&dbProcOwner);
786 ASSERT_NOT_IMPLEMENTED(procList->procOwnerList);
787
788 failed = FALSE;
789abort:
790 DynBuf_Destroy(&dbProcId);
791 DynBuf_Destroy(&dbProcCmd);
792 DynBuf_Destroy(&dbProcStartTime);
793 DynBuf_Destroy(&dbProcOwner);
794
795 if (kd != NULL) {
796 /*
797 * Wrap up: also deallocates memory (if) allocated by kvm_getargv()
798 */
799 kvm_close(kd);
800 }
801
802 if (failed) {
803 ProcMgr_FreeProcList(procList);
804 procList = NULL;
805 }
806
807 return procList;
808}
809#endif // defined(__FreeBSD__)
604810
605/*811/*
606 *----------------------------------------------------------------------812 *----------------------------------------------------------------------
@@ -1435,7 +1641,7 @@
1435 free(asyncProc);1641 free(asyncProc);
1436}1642}
14371643
1438#ifdef linux1644#if defined(linux) || defined(__FreeBSD__)
14391645
1440/*1646/*
1441 *----------------------------------------------------------------------1647 *----------------------------------------------------------------------
@@ -1634,4 +1840,4 @@
1634 return TRUE;1840 return TRUE;
1635}1841}
16361842
1637#endif // linux1843#endif // linux || __FreeBSD__
16381844
=== modified file 'lib/wiper/wiperPosix.c'
--- lib/wiper/wiperPosix.c 2011-07-22 16:41:03 +0000
+++ lib/wiper/wiperPosix.c 2011-10-31 00:22:23 +0000
@@ -46,6 +46,7 @@
46#include "wiper.h"46#include "wiper.h"
47#include "util.h"47#include "util.h"
48#include "str.h"48#include "str.h"
49#include "strutil.h"
49#include "fileIO.h"50#include "fileIO.h"
50#include "vmstdio.h"51#include "vmstdio.h"
51#include "mntinfo.h"52#include "mntinfo.h"
@@ -325,7 +326,7 @@
325 return FALSE;326 return FALSE;
326}327}
327328
328#elif defined(__FreeBSD__) || defined(__APPLE__) /* } FreeBSD { */329#elif defined(__FreeBSD__) /* } FreeBSD { */
329330
330static Bool331static Bool
331WiperIsDiskDevice(MNTINFO *mnt, // IN: file system being considered332WiperIsDiskDevice(MNTINFO *mnt, // IN: file system being considered
@@ -359,7 +360,7 @@
359 (S_ISCHR(s->st_mode) && ((maj == 3) || (maj == 13)))) {360 (S_ISCHR(s->st_mode) && ((maj == 3) || (maj == 13)))) {
360 retval = TRUE;361 retval = TRUE;
361 }362 }
362#else /* Also the Apple case */363#else
363 /*364 /*
364 * Begin by testing whether file system source is really a character365 * Begin by testing whether file system source is really a character
365 * device node. (FreeBSD killed off block devices long ago.) Next,366 * device node. (FreeBSD killed off block devices long ago.) Next,
@@ -375,10 +376,27 @@
375 retval = TRUE;376 retval = TRUE;
376 }377 }
377 }378 }
379#undef MASK_ATA_DISK
380#undef MASK_SCSI_DISK
378#endif /* __FreeBSD_version */381#endif /* __FreeBSD_version */
379382
380 return retval;383 return retval;
381}384}
385
386#elif defined(__APPLE__) /* } { */
387
388static Bool
389WiperIsDiskDevice(MNTINFO *mnt, // IN
390 struct stat *s) // IN
391{
392 /*
393 * Differently from FreeBSD, Mac OS still lists disks as block devices,
394 * it seems. Disks devices also seem to start with "/dev/disk".
395 */
396 return S_ISBLK(s->st_mode) &&
397 StrUtil_StartsWith(MNTINFO_NAME(mnt), "/dev/disk");
398}
399
382#endif /* } */400#endif /* } */
383401
384/*402/*
385403
=== modified file 'modules/freebsd/vmhgfs/vnopscommon.c'
--- modules/freebsd/vmhgfs/vnopscommon.c 2011-03-31 14:20:05 +0000
+++ modules/freebsd/vmhgfs/vnopscommon.c 2011-10-31 00:22:23 +0000
@@ -487,7 +487,7 @@
487 HgfsAttrToBSD(vp, &hgfsAttrV2, vap);487 HgfsAttrToBSD(vp, &hgfsAttrV2, vap);
488 }488 }
489489
490 DEBUG(VM_DEBUG_LOG, "Exit %s.\n", HGFS_VP_TO_FILENAME(vp));490 DEBUG(VM_DEBUG_LOG, "Exit %s -> %d.\n", HGFS_VP_TO_FILENAME(vp), ret);
491 return ret;491 return ret;
492}492}
493493
@@ -701,7 +701,7 @@
701 ret = HgfsDelete(sip, HGFS_VP_TO_FILENAME(vp), HGFS_OP_DELETE_FILE_V3);701 ret = HgfsDelete(sip, HGFS_VP_TO_FILENAME(vp), HGFS_OP_DELETE_FILE_V3);
702702
703out:703out:
704 DEBUG(VM_DEBUG_LOG, "Exit %s.\n", HGFS_VP_TO_FILENAME(vp));704 DEBUG(VM_DEBUG_LOG, "Exit %s -> %d.\n", HGFS_VP_TO_FILENAME(vp), ret);
705 return ret;705 return ret;
706}706}
707707
@@ -1115,8 +1115,9 @@
11151115
1116 /* We can't read from directories, that's what readdir() is for. */1116 /* We can't read from directories, that's what readdir() is for. */
1117 if (HGFS_VP_TO_VTYPE(vp) != VREG) {1117 if (HGFS_VP_TO_VTYPE(vp) != VREG) {
1118 DEBUG(VM_DEBUG_FAIL, "Can only read regular files.\n");1118 ret = (HGFS_VP_TO_VTYPE(vp) == VDIR) ? EISDIR : EPERM;
1119 return (HGFS_VP_TO_VTYPE(vp) == VDIR) ? EISDIR : EPERM;1119 DEBUG(VM_DEBUG_FAIL, "Read not a reg file type %d ret %d.\n", HGFS_VP_TO_VTYPE(vp), ret);
1120 return ret;
1120 }1121 }
11211122
1122 /* off_t is a signed quantity */1123 /* off_t is a signed quantity */
@@ -1163,15 +1164,21 @@
1163 do {1164 do {
1164 uint32_t size;1165 uint32_t size;
11651166
1166 DEBUG(VM_DEBUG_INFO, "offset=%"FMT64"d, uio_offset=%"FMT64"d\n",
1167 offset, HGFS_UIOP_TO_OFFSET(uiop));
1168 DEBUG(VM_DEBUG_HANDLE, "** handle=%d, file=%s\n",
1169 handle, HGFS_VP_TO_FILENAME(vp));
1170
1171 /* Request at most HGFS_IO_MAX bytes */1167 /* Request at most HGFS_IO_MAX bytes */
1172 size = (HGFS_UIOP_TO_RESID(uiop) > HGFS_IO_MAX) ? HGFS_IO_MAX :1168 size = (HGFS_UIOP_TO_RESID(uiop) > HGFS_IO_MAX) ? HGFS_IO_MAX :
1173 HGFS_UIOP_TO_RESID(uiop);1169 HGFS_UIOP_TO_RESID(uiop);
11741170
1171 DEBUG(VM_DEBUG_INFO, "offset=%"FMT64"d, uio_offset=%"FMT64"d\n",
1172 offset, HGFS_UIOP_TO_OFFSET(uiop));
1173 DEBUG(VM_DEBUG_HANDLE, "** handle=%d, file=%s to read %u\n",
1174 handle, HGFS_VP_TO_FILENAME(vp), size);
1175
1176 if (size == 0) {
1177 /* For a zero byte length read we return success. */
1178 DEBUG(VM_DEBUG_DONE, "size of 0 ret -> 0.\n");
1179 return 0;
1180 }
1181
1175 /* Send one read request. */1182 /* Send one read request. */
1176 ret = HgfsDoRead(sip, handle, offset, size, uiop);1183 ret = HgfsDoRead(sip, handle, offset, size, uiop);
1177 if (ret == 0) {1184 if (ret == 0) {
@@ -1524,7 +1531,7 @@
1524 fp = HGFS_VP_TO_FP(vp);1531 fp = HGFS_VP_TO_FP(vp);
1525 ASSERT(fp);1532 ASSERT(fp);
15261533
1527 DEBUG(VM_DEBUG_ENTRY, "opening \"%s\"\n", HGFS_VP_TO_FILENAME(vp));1534 DEBUG(VM_DEBUG_ENTRY, "opening dir \"%s\"\n", HGFS_VP_TO_FILENAME(vp));
15281535
1529 /*1536 /*
1530 * If the directory is already opened then we are done.1537 * If the directory is already opened then we are done.
@@ -1668,11 +1675,11 @@
1668 * again. Thus, returning ENOENT to the Mac OS puts the guest kernel into infinite1675 * again. Thus, returning ENOENT to the Mac OS puts the guest kernel into infinite
1669 * loop. In order to resolve this issue, before passing on the request to the1676 * loop. In order to resolve this issue, before passing on the request to the
1670 * server, we validate if user is attempting to create a new share. If yes,1677 * server, we validate if user is attempting to create a new share. If yes,
1671 * we return EPERM as the error code.1678 * we return EACCES as the error code.
1672 */1679 */
1673 if (HgfsAttemptToCreateShare(HGFS_VP_TO_FILENAME(vp), flag)) {1680 if (HgfsAttemptToCreateShare(HGFS_VP_TO_FILENAME(vp), flag)) {
1674 DEBUG (VM_DEBUG_LOG, "An attempt to create a new share was made.\n");1681 DEBUG (VM_DEBUG_LOG, "An attempt to create a new share was made.\n");
1675 return EPERM;1682 return EACCES;
1676 }1683 }
16771684
1678 /* Convert FreeBSD modes to Hgfs modes */1685 /* Convert FreeBSD modes to Hgfs modes */
@@ -2977,7 +2984,7 @@
2977 hgfsAttrV2.ownerPerms | hgfsAttrV2.groupPerms | hgfsAttrV2.otherPerms;2984 hgfsAttrV2.ownerPerms | hgfsAttrV2.groupPerms | hgfsAttrV2.otherPerms;
2978 }2985 }
2979 if (!IsModeCompatible(mode, effectivePermissions)) {2986 if (!IsModeCompatible(mode, effectivePermissions)) {
2980 ret = EPERM;2987 ret = EACCES;
2981 DEBUG(VM_DEBUG_FAIL, "HgfsAccessInt denied access: %s (%d, %d)\n",2988 DEBUG(VM_DEBUG_FAIL, "HgfsAccessInt denied access: %s (%d, %d)\n",
2982 HGFS_VP_TO_FILENAME(vp), mode, effectivePermissions);2989 HGFS_VP_TO_FILENAME(vp), mode, effectivePermissions);
2983 }2990 }
29842991
=== modified file 'modules/linux/dkms.conf'
--- modules/linux/dkms.conf 2011-07-22 16:41:03 +0000
+++ modules/linux/dkms.conf 2011-10-31 00:22:23 +0000
@@ -1,5 +1,5 @@
1PACKAGE_NAME=open-vm-tools1PACKAGE_NAME=open-vm-tools
2PACKAGE_VERSION=2011.07.192PACKAGE_VERSION=2011.08.21
3MAKE_CMD_TMPL="make VM_UNAME=\$kernelver \3MAKE_CMD_TMPL="make VM_UNAME=\$kernelver \
4 MODULEBUILDDIR=$dkms_tree/$PACKAGE_NAME/$PACKAGE_VERSION/build"4 MODULEBUILDDIR=$dkms_tree/$PACKAGE_NAME/$PACKAGE_VERSION/build"
55
66
=== modified file 'modules/linux/dkms.sh'
--- modules/linux/dkms.sh 2011-07-22 16:41:03 +0000
+++ modules/linux/dkms.sh 2011-10-31 00:22:23 +0000
@@ -28,12 +28,12 @@
28 echo " src: root of unpacked open-vm-tools package"28 echo " src: root of unpacked open-vm-tools package"
29 echo " dst: where to create the dkms tree"29 echo " dst: where to create the dkms tree"
30 echo30 echo
31 echo "The script will create an 'open-vm-tools' module with version 2011.07.19."31 echo "The script will create an 'open-vm-tools' module with version 2011.08.21."
32 exit 132 exit 1
33fi33fi
3434
35src=$135src=$1
36dst=$2/open-vm-tools-2011.07.1936dst=$2/open-vm-tools-2011.08.21
3737
38SHARED_HEADERS="backdoor_def.h"38SHARED_HEADERS="backdoor_def.h"
39SHARED_HEADERS="$SHARED_HEADERS backdoor_types.h"39SHARED_HEADERS="$SHARED_HEADERS backdoor_types.h"
4040
=== modified file 'modules/linux/shared/compat_netdevice.h'
--- modules/linux/shared/compat_netdevice.h 2011-07-22 16:41:03 +0000
+++ modules/linux/shared/compat_netdevice.h 2011-10-31 00:22:23 +0000
@@ -196,7 +196,7 @@
196#define netdev_priv(dev) ((dev)->priv)196#define netdev_priv(dev) ((dev)->priv)
197#endif197#endif
198198
199#if defined(NETDEV_TX_OK)199#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 9)
200# define COMPAT_NETDEV_TX_OK NETDEV_TX_OK200# define COMPAT_NETDEV_TX_OK NETDEV_TX_OK
201# define COMPAT_NETDEV_TX_BUSY NETDEV_TX_BUSY201# define COMPAT_NETDEV_TX_BUSY NETDEV_TX_BUSY
202#else202#else
@@ -392,4 +392,10 @@
392# endif392# endif
393#endif393#endif
394394
395#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)
396# define compat_vlan_get_protocol(skb) vlan_get_protocol(skb)
397#else
398# define compat_vlan_get_protocol(skb) (skb->protocol)
399#endif
400
395#endif /* __COMPAT_NETDEVICE_H__ */401#endif /* __COMPAT_NETDEVICE_H__ */
396402
=== modified file 'modules/linux/shared/vmci_defs.h'
--- modules/linux/shared/vmci_defs.h 2011-03-31 14:20:05 +0000
+++ modules/linux/shared/vmci_defs.h 2011-10-31 00:22:23 +0000
@@ -314,8 +314,10 @@
314#define VMCI_EVENT_QP_RESUMED 2 // Only applicable to guest endpoints314#define VMCI_EVENT_QP_RESUMED 2 // Only applicable to guest endpoints
315#define VMCI_EVENT_QP_PEER_ATTACH 3 // Applicable to guest and host315#define VMCI_EVENT_QP_PEER_ATTACH 3 // Applicable to guest and host
316#define VMCI_EVENT_QP_PEER_DETACH 4 // Applicable to guest and host316#define VMCI_EVENT_QP_PEER_DETACH 4 // Applicable to guest and host
317#define VMCI_EVENT_MEM_ACCESS_ON 5 // Only applicable to VMX endpoints317#define VMCI_EVENT_MEM_ACCESS_ON 5 // Applicable to VMX and vmk. On vmk,
318#define VMCI_EVENT_MEM_ACCESS_OFF 6 // Only applicable to VMX endpoints318 // this event has the Context payload type.
319#define VMCI_EVENT_MEM_ACCESS_OFF 6 // Applicable to VMX and vmk. Same as
320 // above for the payload type.
319#define VMCI_EVENT_MAX 7321#define VMCI_EVENT_MAX 7
320322
321/*323/*
@@ -329,8 +331,12 @@
329#define VMCI_EVENT_VALID_VMX(_event) (_event == VMCI_EVENT_MEM_ACCESS_ON || \331#define VMCI_EVENT_VALID_VMX(_event) (_event == VMCI_EVENT_MEM_ACCESS_ON || \
330 _event == VMCI_EVENT_MEM_ACCESS_OFF)332 _event == VMCI_EVENT_MEM_ACCESS_OFF)
331333
334#if defined(VMX86_SERVER)
335#define VMCI_EVENT_VALID(_event) (_event < VMCI_EVENT_MAX)
336#else // VMX86_SERVER
332#define VMCI_EVENT_VALID(_event) (_event < VMCI_EVENT_MAX && \337#define VMCI_EVENT_VALID(_event) (_event < VMCI_EVENT_MAX && \
333 !VMCI_EVENT_VALID_VMX(_event))338 !VMCI_EVENT_VALID_VMX(_event))
339#endif // VMX86_SERVER
334340
335/* Reserved guest datagram resource ids. */341/* Reserved guest datagram resource ids. */
336#define VMCI_EVENT_HANDLER 0342#define VMCI_EVENT_HANDLER 0
337343
=== modified file 'modules/linux/shared/vmci_infrastructure.h'
--- modules/linux/shared/vmci_infrastructure.h 2011-03-31 14:20:05 +0000
+++ modules/linux/shared/vmci_infrastructure.h 2011-10-31 00:22:23 +0000
@@ -80,6 +80,7 @@
80#define VMCI_DEV_QP_BREAK_SHARING 0x05 // DEPRECATED80#define VMCI_DEV_QP_BREAK_SHARING 0x05 // DEPRECATED
81#define VMCI_DEV_RESTORE_SYNC 0x0681#define VMCI_DEV_RESTORE_SYNC 0x06
82#define VMCI_DEV_BMASTER_OFF 0x0782#define VMCI_DEV_BMASTER_OFF 0x07
83#define VMCI_DEV_BMASTER_ON 0x08
8384
8485
85/*86/*
8687
=== modified file 'modules/linux/vmblock/Makefile'
--- modules/linux/vmblock/Makefile 2011-03-31 14:20:05 +0000
+++ modules/linux/vmblock/Makefile 2011-10-31 00:22:23 +0000
@@ -43,7 +43,7 @@
43endif43endif
4444
4545
46VM_UNAME = $(shell uname -r)46VM_UNAME = $(KVERS)
4747
48# Header directory for the running kernel48# Header directory for the running kernel
49ifdef LINUXINCLUDE49ifdef LINUXINCLUDE
5050
=== modified file 'modules/linux/vmci/Makefile'
--- modules/linux/vmci/Makefile 2011-03-31 14:20:05 +0000
+++ modules/linux/vmci/Makefile 2011-10-31 00:22:23 +0000
@@ -43,7 +43,7 @@
43endif43endif
4444
4545
46VM_UNAME = $(shell uname -r)46VM_UNAME = $(KVERS)
4747
48# Header directory for the running kernel48# Header directory for the running kernel
49ifdef LINUXINCLUDE49ifdef LINUXINCLUDE
5050
=== modified file 'modules/linux/vmci/common/vmciContext.c'
--- modules/linux/vmci/common/vmciContext.c 2011-07-22 16:41:03 +0000
+++ modules/linux/vmci/common/vmciContext.c 2011-10-31 00:22:23 +0000
@@ -2151,6 +2151,50 @@
2151/*2151/*
2152 *----------------------------------------------------------------------2152 *----------------------------------------------------------------------
2153 *2153 *
2154 * VMCIContext_SignalPendingDatagrams --
2155 *
2156 * Signals the guest if any datagrams are pending. This is used
2157 * after the VMCI device is unquiesced to ensure that no pending
2158 * datagrams go unnoticed, since signals may not be fully
2159 * processed while the device is quiesced.
2160 *
2161 * Results:
2162 * None.
2163 *
2164 * Side effects:
2165 * None.
2166 *
2167 *----------------------------------------------------------------------
2168 */
2169
2170void
2171VMCIContext_SignalPendingDatagrams(VMCIId contextID)
2172{
2173 Bool pending;
2174 VMCIContext *context;
2175 VMCILockFlags flags;
2176
2177 context = VMCIContext_Get(contextID);
2178 if (!context) {
2179 ASSERT(FALSE);
2180 return;
2181 }
2182
2183 VMCI_GrabLock(&context->lock, &flags);
2184 pending = context->pendingDatagrams;
2185 VMCI_ReleaseLock(&context->lock, flags);
2186
2187 if (pending) {
2188 VMCIHost_SignalCall(&context->hostContext);
2189 }
2190
2191 VMCIContext_Release(context);
2192}
2193
2194
2195/*
2196 *----------------------------------------------------------------------
2197 *
2154 * VMCIContext_SetDomainName --2198 * VMCIContext_SetDomainName --
2155 *2199 *
2156 * Sets the domain name of the given context.2200 * Sets the domain name of the given context.
21572201
=== modified file 'modules/linux/vmci/common/vmciContext.h'
--- modules/linux/vmci/common/vmciContext.h 2011-03-31 14:20:05 +0000
+++ modules/linux/vmci/common/vmciContext.h 2011-10-31 00:22:23 +0000
@@ -114,6 +114,7 @@
114 Bool success);114 Bool success);
115#if defined(VMKERNEL)115#if defined(VMKERNEL)
116void VMCIContext_SignalPendingDoorbells(VMCIId contextID);116void VMCIContext_SignalPendingDoorbells(VMCIId contextID);
117void VMCIContext_SignalPendingDatagrams(VMCIId contextID);
117118
118int VMCIContextID2HostVmID(VMCIId contextID, void *hostVmID, size_t hostVmIDLen);119int VMCIContextID2HostVmID(VMCIId contextID, void *hostVmID, size_t hostVmIDLen);
119#endif120#endif
120121
=== modified file 'modules/linux/vmci/common/vmciEvent.c'
--- modules/linux/vmci/common/vmciEvent.c 2011-07-22 16:41:03 +0000
+++ modules/linux/vmci/common/vmciEvent.c 2011-10-31 00:22:23 +0000
@@ -535,9 +535,25 @@
535 /*535 /*
536 * In the vmkernel we defer delivery of events to a helper world. This536 * In the vmkernel we defer delivery of events to a helper world. This
537 * makes the event delivery more consistent across hosts and guests with537 * makes the event delivery more consistent across hosts and guests with
538 * regard to which locks are held.538 * regard to which locks are held. Memory access events are an exception
539 * to this, since clients need to know immediately that the device
540 * memory is disabled (if we delay such events, then clients may be
541 * notified too late).
539 */542 */
540 sub->runDelayed = TRUE;543 if (VMCI_EVENT_MEM_ACCESS_ON == event ||
544 VMCI_EVENT_MEM_ACCESS_OFF == event) {
545 /*
546 * Client must expect to get such events synchronously, and should
547 * perform its locking accordingly. If it can't handle this, then
548 * fail.
549 */
550 if (flags & VMCI_FLAG_EVENT_DELAYED_CB) {
551 return VMCI_ERROR_INVALID_ARGS;
552 }
553 sub->runDelayed = FALSE;
554 } else {
555 sub->runDelayed = TRUE;
556 }
541 } else if (!VMCI_CanScheduleDelayedWork()) {557 } else if (!VMCI_CanScheduleDelayedWork()) {
542 /*558 /*
543 * If the platform doesn't support delayed work callbacks then don't559 * If the platform doesn't support delayed work callbacks then don't
544560
=== modified file 'modules/linux/vmhgfs/Makefile'
--- modules/linux/vmhgfs/Makefile 2011-03-31 14:20:05 +0000
+++ modules/linux/vmhgfs/Makefile 2011-10-31 00:22:23 +0000
@@ -43,7 +43,7 @@
43endif43endif
4444
4545
46VM_UNAME = $(shell uname -r)46VM_UNAME = $(KVERS)
4747
48# Header directory for the running kernel48# Header directory for the running kernel
49ifdef LINUXINCLUDE49ifdef LINUXINCLUDE
5050
=== modified file 'modules/linux/vmsync/Makefile'
--- modules/linux/vmsync/Makefile 2011-03-31 14:20:05 +0000
+++ modules/linux/vmsync/Makefile 2011-10-31 00:22:23 +0000
@@ -43,7 +43,7 @@
43endif43endif
4444
4545
46VM_UNAME = $(shell uname -r)46VM_UNAME = $(KVERS)
4747
48# Header directory for the running kernel48# Header directory for the running kernel
49ifdef LINUXINCLUDE49ifdef LINUXINCLUDE
5050
=== modified file 'modules/linux/vmxnet/Makefile'
--- modules/linux/vmxnet/Makefile 2011-03-31 14:20:05 +0000
+++ modules/linux/vmxnet/Makefile 2011-10-31 00:22:23 +0000
@@ -43,7 +43,7 @@
43endif43endif
4444
4545
46VM_UNAME = $(shell uname -r)46VM_UNAME = $(KVERS)
4747
48# Header directory for the running kernel48# Header directory for the running kernel
49ifdef LINUXINCLUDE49ifdef LINUXINCLUDE
5050
=== modified file 'modules/linux/vsock/Makefile'
--- modules/linux/vsock/Makefile 2011-03-31 14:20:05 +0000
+++ modules/linux/vsock/Makefile 2011-10-31 00:22:23 +0000
@@ -43,7 +43,7 @@
43endif43endif
4444
4545
46VM_UNAME = $(shell uname -r)46VM_UNAME = $(KVERS)
4747
48# Header directory for the running kernel48# Header directory for the running kernel
49ifdef LINUXINCLUDE49ifdef LINUXINCLUDE
5050
=== modified file 'modules/linux/vsock/linux/vsockSocketWrapper.h'
--- modules/linux/vsock/linux/vsockSocketWrapper.h 2011-07-22 16:41:03 +0000
+++ modules/linux/vsock/linux/vsockSocketWrapper.h 2011-10-31 00:22:23 +0000
@@ -156,6 +156,7 @@
156# define __ELOCALSHUTDOWN ESHUTDOWN156# define __ELOCALSHUTDOWN ESHUTDOWN
157# define __EPEERSHUTDOWN ECONNABORTED157# define __EPEERSHUTDOWN ECONNABORTED
158# define __ECONNINPROGRESS EWOULDBLOCK158# define __ECONNINPROGRESS EWOULDBLOCK
159# define __ESNDRCVTIMEDOUT ETIMEDOUT
159# define ESYSNOTREADY WSASYSNOTREADY160# define ESYSNOTREADY WSASYSNOTREADY
160#elif defined(VMKERNEL)161#elif defined(VMKERNEL)
161# define EINTR VMK_WAIT_INTERRUPTED162# define EINTR VMK_WAIT_INTERRUPTED
@@ -200,11 +201,13 @@
200# define __ELOCALSHUTDOWN EPIPE201# define __ELOCALSHUTDOWN EPIPE
201# define __EPEERSHUTDOWN EPIPE202# define __EPEERSHUTDOWN EPIPE
202# define __ECONNINPROGRESS EINPROGRESS203# define __ECONNINPROGRESS EINPROGRESS
204# define __ESNDRCVTIMEDOUT VMK_WOULD_BLOCK
203# define ESYSNOTREADY VMK_NOT_SUPPORTED205# define ESYSNOTREADY VMK_NOT_SUPPORTED
204#elif defined(__APPLE__)206#elif defined(__APPLE__)
205# define __ELOCALSHUTDOWN ESHUTDOWN207# define __ELOCALSHUTDOWN ESHUTDOWN
206# define __EPEERSHUTDOWN ECONNABORTED208# define __EPEERSHUTDOWN ECONNABORTED
207# define __ECONNINPROGRESS EINPROGRESS209# define __ECONNINPROGRESS EINPROGRESS
210# define __ESNDRCVTIMEDOUT EAGAIN
208# define ESYSNOTREADY EOPNOTSUPP211# define ESYSNOTREADY EOPNOTSUPP
209#elif defined(linux)212#elif defined(linux)
210# define ESYSNOTREADY EOPNOTSUPP213# define ESYSNOTREADY EOPNOTSUPP
211214
=== modified file 'services/plugins/guestInfo/guestInfoServer.c'
--- services/plugins/guestInfo/guestInfoServer.c 2011-07-22 16:41:03 +0000
+++ services/plugins/guestInfo/guestInfoServer.c 2011-10-31 00:22:23 +0000
@@ -66,10 +66,6 @@
66VM_EMBED_VERSION(VMTOOLSD_VERSION_STRING);66VM_EMBED_VERSION(VMTOOLSD_VERSION_STRING);
67#endif67#endif
6868
69MY_ASSERTS(GI_SIZE_ASSERTS,
70 ASSERT_ON_COMPILE(GUESTINFO_MAX_VALUE_SIZE >= MAX_VALUE_LEN);
71)
72
73/**69/**
74 * Default poll interval is 30s (in milliseconds).70 * Default poll interval is 30s (in milliseconds).
75 */71 */
@@ -81,9 +77,9 @@
81 * Stores information about all guest information sent to the vmx.77 * Stores information about all guest information sent to the vmx.
82 */78 */
8379
84typedef struct _GuestInfoCache{80typedef struct _GuestInfoCache {
85 /* Stores values of all key-value pairs. */81 /* Stores values of all key-value pairs. */
86 char value[INFO_MAX][GUESTINFO_MAX_VALUE_SIZE];82 char *value[INFO_MAX];
87 NicInfoV3 *nicInfo;83 NicInfoV3 *nicInfo;
88 GuestDiskInfo *diskInfo;84 GuestDiskInfo *diskInfo;
89} GuestInfoCache;85} GuestInfoCache;
@@ -232,9 +228,9 @@
232static gboolean228static gboolean
233GuestInfoGather(gpointer data)229GuestInfoGather(gpointer data)
234{230{
235 char name[GUESTINFO_MAX_VALUE_SIZE];231 char name[256]; // Size is derived from the SUS2 specification
236 char osNameFull[GUESTINFO_MAX_VALUE_SIZE];232 // "Host names are limited to 255 bytes"
237 char osName[GUESTINFO_MAX_VALUE_SIZE];233 char *osString = NULL;
238 gboolean disableQueryDiskInfo;234 gboolean disableQueryDiskInfo;
239 NicInfoV3 *nicInfo = NULL;235 NicInfoV3 *nicInfo = NULL;
240 GuestDiskInfo *diskInfo = NULL;236 GuestDiskInfo *diskInfo = NULL;
@@ -257,17 +253,25 @@
257 }253 }
258254
259 /* Gather all the relevant guest information. */255 /* Gather all the relevant guest information. */
260 if (!Hostinfo_GetOSName(sizeof osNameFull, sizeof osName, osNameFull,256 osString = Hostinfo_GetOSName();
261 osName)) {257 if (osString == NULL) {
262 g_warning("Failed to get OS info.\n");258 g_warning("Failed to get OS info.\n");
263 } else {259 } else {
264 if (!GuestInfoUpdateVmdb(ctx, INFO_OS_NAME_FULL, osNameFull)) {260 if (!GuestInfoUpdateVmdb(ctx, INFO_OS_NAME_FULL, osString)) {
265 g_warning("Failed to update VMDB\n");261 g_warning("Failed to update VMDB\n");
266 }262 }
267 if (!GuestInfoUpdateVmdb(ctx, INFO_OS_NAME, osName)) {263 }
268 g_warning("Failed to update VMDB\n");264 free(osString);
269 }265
270 }266 osString = Hostinfo_GetOSGuestString();
267 if (osString == NULL) {
268 g_warning("Failed to get OS info.\n");
269 } else {
270 if (!GuestInfoUpdateVmdb(ctx, INFO_OS_NAME, osString)) {
271 g_warning("Failed to update VMDB\n");
272 }
273 }
274 free(osString);
271275
272 disableQueryDiskInfo =276 disableQueryDiskInfo =
273 g_key_file_get_boolean(ctx->config, CONFGROUPNAME_GUESTINFO,277 g_key_file_get_boolean(ctx->config, CONFGROUPNAME_GUESTINFO,
@@ -451,7 +455,8 @@
451 * Above fall-through is intentional.455 * Above fall-through is intentional.
452 */456 */
453457
454 if (strcmp(gInfoCache.value[infoType], (char *)info) == 0) {458 if (gInfoCache.value[infoType] != NULL &&
459 strcmp(gInfoCache.value[infoType], (char *)info) == 0) {
455 /* The value has not changed */460 /* The value has not changed */
456 g_debug("Value unchanged for infotype %d.\n", infoType);461 g_debug("Value unchanged for infotype %d.\n", infoType);
457 break;462 break;
@@ -463,9 +468,8 @@
463 }468 }
464469
465 /* Update the value in the cache as well. */470 /* Update the value in the cache as well. */
466 Str_Strcpy(gInfoCache.value[infoType],471 free(gInfoCache.value[infoType]);
467 (char *)info,472 gInfoCache.value[infoType] = Util_SafeStrdup((char *) info);
468 sizeof gInfoCache.value[infoType]);
469 break;473 break;
470474
471 case INFO_IPADDRESS:475 case INFO_IPADDRESS:
@@ -914,7 +918,8 @@
914 int i;918 int i;
915919
916 for (i = 0; i < INFO_MAX; i++) {920 for (i = 0; i < INFO_MAX; i++) {
917 gInfoCache.value[i][0] = 0;921 free(gInfoCache.value[i]);
922 gInfoCache.value[i] = NULL;
918 }923 }
919924
920 GuestInfo_FreeDiskInfo(gInfoCache.diskInfo);925 GuestInfo_FreeDiskInfo(gInfoCache.diskInfo);
921926
=== modified file 'services/plugins/unity/Makefile.am'
--- services/plugins/unity/Makefile.am 2011-07-22 16:41:03 +0000
+++ services/plugins/unity/Makefile.am 2011-10-31 00:22:23 +0000
@@ -70,14 +70,16 @@
70libunity_la_SOURCES += ghIntegration/pseudoAppMgr.cc70libunity_la_SOURCES += ghIntegration/pseudoAppMgr.cc
7171
72libunity_la_SOURCES += unitylib/unity.c72libunity_la_SOURCES += unitylib/unity.c
73libunity_la_SOURCES += unitylib/unityInt.h
73libunity_la_SOURCES += unitylib/unityPlatform.h74libunity_la_SOURCES += unitylib/unityPlatform.h
74libunity_la_SOURCES += unitylib/unityPlatformX11.cc75libunity_la_SOURCES += unitylib/debug.c
75libunity_la_SOURCES += unitylib/unityPlatformX11Settings.cc76libunity_la_SOURCES += unitylib/event.cc
76libunity_la_SOURCES += unitylib/unityPlatformX11Window.cc77libunity_la_SOURCES += unitylib/settings.cc
77libunity_la_SOURCES += unitylib/unityX11.h78libunity_la_SOURCES += unitylib/util.cc
79libunity_la_SOURCES += unitylib/window.cc
78libunity_la_SOURCES += unitylib/windowPathFactory.cc80libunity_la_SOURCES += unitylib/windowPathFactory.cc
79libunity_la_SOURCES += unitylib/x11Event.cc81libunity_la_SOURCES += unitylib/x11Platform.cc
80libunity_la_SOURCES += unitylib/x11Util.cc82libunity_la_SOURCES += unitylib/x11Platform.h
8183
82libunity_la_SOURCES += unityWindowTracker/unityWindowTracker.c84libunity_la_SOURCES += unityWindowTracker/unityWindowTracker.c
8385
8486
=== modified file 'services/plugins/unity/Makefile.in'
--- services/plugins/unity/Makefile.in 2011-07-22 16:41:03 +0000
+++ services/plugins/unity/Makefile.in 2011-10-31 00:22:23 +0000
@@ -107,11 +107,10 @@
107 libunity_la-unityTclo.lo libunity_la-ghIntegration.lo \107 libunity_la-unityTclo.lo libunity_la-ghIntegration.lo \
108 libunity_la-icon.lo libunity_la-platform.lo \108 libunity_la-icon.lo libunity_la-platform.lo \
109 libunity_la-pseudoAppMgr.lo libunity_la-unity.lo \109 libunity_la-pseudoAppMgr.lo libunity_la-unity.lo \
110 libunity_la-unityPlatformX11.lo \110 libunity_la-debug.lo libunity_la-event.lo \
111 libunity_la-unityPlatformX11Settings.lo \111 libunity_la-settings.lo libunity_la-util.lo \
112 libunity_la-unityPlatformX11Window.lo \112 libunity_la-window.lo libunity_la-windowPathFactory.lo \
113 libunity_la-windowPathFactory.lo libunity_la-x11Event.lo \113 libunity_la-x11Platform.lo libunity_la-unityWindowTracker.lo \
114 libunity_la-x11Util.lo libunity_la-unityWindowTracker.lo \
115 $(am__objects_1)114 $(am__objects_1)
116libunity_la_OBJECTS = $(am_libunity_la_OBJECTS)115libunity_la_OBJECTS = $(am_libunity_la_OBJECTS)
117libunity_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \116libunity_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
@@ -359,12 +358,11 @@
359 unityTclo.cpp ghIntegration/ghIntegration.cpp \358 unityTclo.cpp ghIntegration/ghIntegration.cpp \
360 ghIntegration/ghIntegrationInt.h ghIntegration/icon.cc \359 ghIntegration/ghIntegrationInt.h ghIntegration/icon.cc \
361 ghIntegration/platform.cc ghIntegration/pseudoAppMgr.cc \360 ghIntegration/platform.cc ghIntegration/pseudoAppMgr.cc \
362 unitylib/unity.c unitylib/unityPlatform.h \361 unitylib/unity.c unitylib/unityInt.h unitylib/unityPlatform.h \
363 unitylib/unityPlatformX11.cc \362 unitylib/debug.c unitylib/event.cc unitylib/settings.cc \
364 unitylib/unityPlatformX11Settings.cc \363 unitylib/util.cc unitylib/window.cc \
365 unitylib/unityPlatformX11Window.cc unitylib/unityX11.h \364 unitylib/windowPathFactory.cc unitylib/x11Platform.cc \
366 unitylib/windowPathFactory.cc unitylib/x11Event.cc \365 unitylib/x11Platform.h unityWindowTracker/unityWindowTracker.c \
367 unitylib/x11Util.cc unityWindowTracker/unityWindowTracker.c \
368 $(RPCGEN_SRCS)366 $(RPCGEN_SRCS)
369RPCGEN_SRCS = ghiGetBinaryHandlers_xdr.c ghiGetExecInfoHash_xdr.c \367RPCGEN_SRCS = ghiGetBinaryHandlers_xdr.c ghiGetExecInfoHash_xdr.c \
370 ghiProtocolHandler_xdr.c ghiStartMenu_xdr.c \368 ghiProtocolHandler_xdr.c ghiStartMenu_xdr.c \
@@ -452,6 +450,8 @@
452distclean-compile:450distclean-compile:
453 -rm -f *.tab.c451 -rm -f *.tab.c
454452
453@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunity_la-debug.Plo@am__quote@
454@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunity_la-event.Plo@am__quote@
455@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunity_la-ghIntegration.Plo@am__quote@455@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunity_la-ghIntegration.Plo@am__quote@
456@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunity_la-ghiGetBinaryHandlers_xdr.Plo@am__quote@456@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunity_la-ghiGetBinaryHandlers_xdr.Plo@am__quote@
457@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunity_la-ghiGetExecInfoHash_xdr.Plo@am__quote@457@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunity_la-ghiGetExecInfoHash_xdr.Plo@am__quote@
@@ -466,21 +466,20 @@
466@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunity_la-icon.Plo@am__quote@466@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunity_la-icon.Plo@am__quote@
467@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunity_la-platform.Plo@am__quote@467@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunity_la-platform.Plo@am__quote@
468@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunity_la-pseudoAppMgr.Plo@am__quote@468@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunity_la-pseudoAppMgr.Plo@am__quote@
469@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunity_la-settings.Plo@am__quote@
469@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunity_la-toolsPlugin.Plo@am__quote@470@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunity_la-toolsPlugin.Plo@am__quote@
470@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunity_la-unity.Plo@am__quote@471@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunity_la-unity.Plo@am__quote@
471@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunity_la-unityActive_xdr.Plo@am__quote@472@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunity_la-unityActive_xdr.Plo@am__quote@
472@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunity_la-unityPlatformX11.Plo@am__quote@
473@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunity_la-unityPlatformX11Settings.Plo@am__quote@
474@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunity_la-unityPlatformX11Window.Plo@am__quote@
475@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunity_la-unityPlugin.Plo@am__quote@473@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunity_la-unityPlugin.Plo@am__quote@
476@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunity_la-unityPluginEntry.Plo@am__quote@474@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunity_la-unityPluginEntry.Plo@am__quote@
477@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunity_la-unityPluginPosix.Plo@am__quote@475@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunity_la-unityPluginPosix.Plo@am__quote@
478@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunity_la-unityTclo.Plo@am__quote@476@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunity_la-unityTclo.Plo@am__quote@
479@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunity_la-unityWindowTracker.Plo@am__quote@477@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunity_la-unityWindowTracker.Plo@am__quote@
480@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunity_la-unity_xdr.Plo@am__quote@478@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunity_la-unity_xdr.Plo@am__quote@
479@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunity_la-util.Plo@am__quote@
480@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunity_la-window.Plo@am__quote@
481@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunity_la-windowPathFactory.Plo@am__quote@481@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunity_la-windowPathFactory.Plo@am__quote@
482@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunity_la-x11Event.Plo@am__quote@482@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunity_la-x11Platform.Plo@am__quote@
483@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunity_la-x11Util.Plo@am__quote@
484483
485.c.o:484.c.o:
486@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<485@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -510,6 +509,13 @@
510@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@509@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
511@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libunity_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libunity_la-unity.lo `test -f 'unitylib/unity.c' || echo '$(srcdir)/'`unitylib/unity.c510@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libunity_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libunity_la-unity.lo `test -f 'unitylib/unity.c' || echo '$(srcdir)/'`unitylib/unity.c
512511
512libunity_la-debug.lo: unitylib/debug.c
513@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libunity_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libunity_la-debug.lo -MD -MP -MF $(DEPDIR)/libunity_la-debug.Tpo -c -o libunity_la-debug.lo `test -f 'unitylib/debug.c' || echo '$(srcdir)/'`unitylib/debug.c
514@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libunity_la-debug.Tpo $(DEPDIR)/libunity_la-debug.Plo
515@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='unitylib/debug.c' object='libunity_la-debug.lo' libtool=yes @AMDEPBACKSLASH@
516@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
517@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libunity_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libunity_la-debug.lo `test -f 'unitylib/debug.c' || echo '$(srcdir)/'`unitylib/debug.c
518
513libunity_la-unityWindowTracker.lo: unityWindowTracker/unityWindowTracker.c519libunity_la-unityWindowTracker.lo: unityWindowTracker/unityWindowTracker.c
514@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libunity_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libunity_la-unityWindowTracker.lo -MD -MP -MF $(DEPDIR)/libunity_la-unityWindowTracker.Tpo -c -o libunity_la-unityWindowTracker.lo `test -f 'unityWindowTracker/unityWindowTracker.c' || echo '$(srcdir)/'`unityWindowTracker/unityWindowTracker.c520@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libunity_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libunity_la-unityWindowTracker.lo -MD -MP -MF $(DEPDIR)/libunity_la-unityWindowTracker.Tpo -c -o libunity_la-unityWindowTracker.lo `test -f 'unityWindowTracker/unityWindowTracker.c' || echo '$(srcdir)/'`unityWindowTracker/unityWindowTracker.c
515@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libunity_la-unityWindowTracker.Tpo $(DEPDIR)/libunity_la-unityWindowTracker.Plo521@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libunity_la-unityWindowTracker.Tpo $(DEPDIR)/libunity_la-unityWindowTracker.Plo
@@ -685,26 +691,33 @@
685@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@691@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
686@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libunity_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libunity_la-pseudoAppMgr.lo `test -f 'ghIntegration/pseudoAppMgr.cc' || echo '$(srcdir)/'`ghIntegration/pseudoAppMgr.cc692@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libunity_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libunity_la-pseudoAppMgr.lo `test -f 'ghIntegration/pseudoAppMgr.cc' || echo '$(srcdir)/'`ghIntegration/pseudoAppMgr.cc
687693
688libunity_la-unityPlatformX11.lo: unitylib/unityPlatformX11.cc694libunity_la-event.lo: unitylib/event.cc
689@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libunity_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libunity_la-unityPlatformX11.lo -MD -MP -MF $(DEPDIR)/libunity_la-unityPlatformX11.Tpo -c -o libunity_la-unityPlatformX11.lo `test -f 'unitylib/unityPlatformX11.cc' || echo '$(srcdir)/'`unitylib/unityPlatformX11.cc695@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libunity_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libunity_la-event.lo -MD -MP -MF $(DEPDIR)/libunity_la-event.Tpo -c -o libunity_la-event.lo `test -f 'unitylib/event.cc' || echo '$(srcdir)/'`unitylib/event.cc
690@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libunity_la-unityPlatformX11.Tpo $(DEPDIR)/libunity_la-unityPlatformX11.Plo696@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libunity_la-event.Tpo $(DEPDIR)/libunity_la-event.Plo
691@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='unitylib/unityPlatformX11.cc' object='libunity_la-unityPlatformX11.lo' libtool=yes @AMDEPBACKSLASH@697@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='unitylib/event.cc' object='libunity_la-event.lo' libtool=yes @AMDEPBACKSLASH@
692@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@698@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
693@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libunity_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libunity_la-unityPlatformX11.lo `test -f 'unitylib/unityPlatformX11.cc' || echo '$(srcdir)/'`unitylib/unityPlatformX11.cc699@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libunity_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libunity_la-event.lo `test -f 'unitylib/event.cc' || echo '$(srcdir)/'`unitylib/event.cc
694700
695libunity_la-unityPlatformX11Settings.lo: unitylib/unityPlatformX11Settings.cc701libunity_la-settings.lo: unitylib/settings.cc
696@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libunity_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libunity_la-unityPlatformX11Settings.lo -MD -MP -MF $(DEPDIR)/libunity_la-unityPlatformX11Settings.Tpo -c -o libunity_la-unityPlatformX11Settings.lo `test -f 'unitylib/unityPlatformX11Settings.cc' || echo '$(srcdir)/'`unitylib/unityPlatformX11Settings.cc702@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libunity_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libunity_la-settings.lo -MD -MP -MF $(DEPDIR)/libunity_la-settings.Tpo -c -o libunity_la-settings.lo `test -f 'unitylib/settings.cc' || echo '$(srcdir)/'`unitylib/settings.cc
697@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libunity_la-unityPlatformX11Settings.Tpo $(DEPDIR)/libunity_la-unityPlatformX11Settings.Plo703@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libunity_la-settings.Tpo $(DEPDIR)/libunity_la-settings.Plo
698@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='unitylib/unityPlatformX11Settings.cc' object='libunity_la-unityPlatformX11Settings.lo' libtool=yes @AMDEPBACKSLASH@704@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='unitylib/settings.cc' object='libunity_la-settings.lo' libtool=yes @AMDEPBACKSLASH@
699@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@705@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
700@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libunity_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libunity_la-unityPlatformX11Settings.lo `test -f 'unitylib/unityPlatformX11Settings.cc' || echo '$(srcdir)/'`unitylib/unityPlatformX11Settings.cc706@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libunity_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libunity_la-settings.lo `test -f 'unitylib/settings.cc' || echo '$(srcdir)/'`unitylib/settings.cc
701707
702libunity_la-unityPlatformX11Window.lo: unitylib/unityPlatformX11Window.cc708libunity_la-util.lo: unitylib/util.cc
703@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libunity_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libunity_la-unityPlatformX11Window.lo -MD -MP -MF $(DEPDIR)/libunity_la-unityPlatformX11Window.Tpo -c -o libunity_la-unityPlatformX11Window.lo `test -f 'unitylib/unityPlatformX11Window.cc' || echo '$(srcdir)/'`unitylib/unityPlatformX11Window.cc709@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libunity_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libunity_la-util.lo -MD -MP -MF $(DEPDIR)/libunity_la-util.Tpo -c -o libunity_la-util.lo `test -f 'unitylib/util.cc' || echo '$(srcdir)/'`unitylib/util.cc
704@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libunity_la-unityPlatformX11Window.Tpo $(DEPDIR)/libunity_la-unityPlatformX11Window.Plo710@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libunity_la-util.Tpo $(DEPDIR)/libunity_la-util.Plo
705@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='unitylib/unityPlatformX11Window.cc' object='libunity_la-unityPlatformX11Window.lo' libtool=yes @AMDEPBACKSLASH@711@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='unitylib/util.cc' object='libunity_la-util.lo' libtool=yes @AMDEPBACKSLASH@
706@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@712@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
707@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libunity_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libunity_la-unityPlatformX11Window.lo `test -f 'unitylib/unityPlatformX11Window.cc' || echo '$(srcdir)/'`unitylib/unityPlatformX11Window.cc713@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libunity_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libunity_la-util.lo `test -f 'unitylib/util.cc' || echo '$(srcdir)/'`unitylib/util.cc
714
715libunity_la-window.lo: unitylib/window.cc
716@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libunity_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libunity_la-window.lo -MD -MP -MF $(DEPDIR)/libunity_la-window.Tpo -c -o libunity_la-window.lo `test -f 'unitylib/window.cc' || echo '$(srcdir)/'`unitylib/window.cc
717@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libunity_la-window.Tpo $(DEPDIR)/libunity_la-window.Plo
718@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='unitylib/window.cc' object='libunity_la-window.lo' libtool=yes @AMDEPBACKSLASH@
719@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
720@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libunity_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libunity_la-window.lo `test -f 'unitylib/window.cc' || echo '$(srcdir)/'`unitylib/window.cc
708721
709libunity_la-windowPathFactory.lo: unitylib/windowPathFactory.cc722libunity_la-windowPathFactory.lo: unitylib/windowPathFactory.cc
710@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libunity_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libunity_la-windowPathFactory.lo -MD -MP -MF $(DEPDIR)/libunity_la-windowPathFactory.Tpo -c -o libunity_la-windowPathFactory.lo `test -f 'unitylib/windowPathFactory.cc' || echo '$(srcdir)/'`unitylib/windowPathFactory.cc723@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libunity_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libunity_la-windowPathFactory.lo -MD -MP -MF $(DEPDIR)/libunity_la-windowPathFactory.Tpo -c -o libunity_la-windowPathFactory.lo `test -f 'unitylib/windowPathFactory.cc' || echo '$(srcdir)/'`unitylib/windowPathFactory.cc
@@ -713,19 +726,12 @@
713@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@726@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
714@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libunity_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libunity_la-windowPathFactory.lo `test -f 'unitylib/windowPathFactory.cc' || echo '$(srcdir)/'`unitylib/windowPathFactory.cc727@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libunity_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libunity_la-windowPathFactory.lo `test -f 'unitylib/windowPathFactory.cc' || echo '$(srcdir)/'`unitylib/windowPathFactory.cc
715728
716libunity_la-x11Event.lo: unitylib/x11Event.cc729libunity_la-x11Platform.lo: unitylib/x11Platform.cc
717@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libunity_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libunity_la-x11Event.lo -MD -MP -MF $(DEPDIR)/libunity_la-x11Event.Tpo -c -o libunity_la-x11Event.lo `test -f 'unitylib/x11Event.cc' || echo '$(srcdir)/'`unitylib/x11Event.cc730@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libunity_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libunity_la-x11Platform.lo -MD -MP -MF $(DEPDIR)/libunity_la-x11Platform.Tpo -c -o libunity_la-x11Platform.lo `test -f 'unitylib/x11Platform.cc' || echo '$(srcdir)/'`unitylib/x11Platform.cc
718@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libunity_la-x11Event.Tpo $(DEPDIR)/libunity_la-x11Event.Plo731@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libunity_la-x11Platform.Tpo $(DEPDIR)/libunity_la-x11Platform.Plo
719@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='unitylib/x11Event.cc' object='libunity_la-x11Event.lo' libtool=yes @AMDEPBACKSLASH@732@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='unitylib/x11Platform.cc' object='libunity_la-x11Platform.lo' libtool=yes @AMDEPBACKSLASH@
720@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@733@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
721@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libunity_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libunity_la-x11Event.lo `test -f 'unitylib/x11Event.cc' || echo '$(srcdir)/'`unitylib/x11Event.cc734@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libunity_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libunity_la-x11Platform.lo `test -f 'unitylib/x11Platform.cc' || echo '$(srcdir)/'`unitylib/x11Platform.cc
722
723libunity_la-x11Util.lo: unitylib/x11Util.cc
724@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libunity_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT libunity_la-x11Util.lo -MD -MP -MF $(DEPDIR)/libunity_la-x11Util.Tpo -c -o libunity_la-x11Util.lo `test -f 'unitylib/x11Util.cc' || echo '$(srcdir)/'`unitylib/x11Util.cc
725@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libunity_la-x11Util.Tpo $(DEPDIR)/libunity_la-x11Util.Plo
726@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='unitylib/x11Util.cc' object='libunity_la-x11Util.lo' libtool=yes @AMDEPBACKSLASH@
727@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
728@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libunity_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o libunity_la-x11Util.lo `test -f 'unitylib/x11Util.cc' || echo '$(srcdir)/'`unitylib/x11Util.cc
729735
730.cpp.o:736.cpp.o:
731@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<737@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
732738
=== modified file 'services/plugins/unity/unityTclo.cpp'
--- services/plugins/unity/unityTclo.cpp 2011-03-31 14:20:05 +0000
+++ services/plugins/unity/unityTclo.cpp 2011-10-31 00:22:23 +0000
@@ -47,6 +47,7 @@
47 #include "guestrpc/unityActive.h"47 #include "guestrpc/unityActive.h"
48 #include "rpcin.h"48 #include "rpcin.h"
49 #include "rpcout.h"49 #include "rpcout.h"
50 #include "str.h"
50 #include "strutil.h"51 #include "strutil.h"
51#if defined(OPEN_VM_TOOLS)52#if defined(OPEN_VM_TOOLS)
52 #include "unitylib/unity.h"53 #include "unitylib/unity.h"
5354
=== modified file 'services/plugins/unity/unitylib/unity.c'
--- services/plugins/unity/unitylib/unity.c 2011-07-22 16:41:03 +0000
+++ services/plugins/unity/unitylib/unity.c 2011-10-31 00:22:23 +0000
@@ -39,22 +39,14 @@
39 * @li UnityRpcGH39 * @li UnityRpcGH
40 */40 */
4141
42#include <glib.h>
43#include <glib-object.h>
42#include "vmware.h"44#include "vmware.h"
43#include "debug.h"45#include "debug.h"
44#include "util.h"46#include "unityDebug.h"
45#include "strutil.h"
46#include "region.h"
47#include "unityWindowTracker.h"
48#include "unityCommon.h"
49#include "unity.h"
50#include "unityInt.h"47#include "unityInt.h"
51#include "unityPlatform.h"48#include "unityPlatform.h"
52#include "unityDebug.h"
53#include "vmware/tools/unityevents.h"49#include "vmware/tools/unityevents.h"
54#include "vmware/tools/plugin.h"
55#include "appUtil.h"
56#include <stdio.h>
57#include <glib-object.h>
5850
59/*51/*
60 * Singleton object for tracking the state of the service.52 * Singleton object for tracking the state of the service.
@@ -64,9 +56,7 @@
64/*56/*
65 * Helper Functions57 * Helper Functions
66 */58 */
67
68static void UnityUpdateCallbackFn(void *param, UnityUpdate *update);59static void UnityUpdateCallbackFn(void *param, UnityUpdate *update);
69
70static void UnitySetAddHiddenWindows(Bool enabled);60static void UnitySetAddHiddenWindows(Bool enabled);
71static void UnitySetInterlockMinimizeOperation(Bool enabled);61static void UnitySetInterlockMinimizeOperation(Bool enabled);
72static void UnitySetSendWindowContents(Bool enabled);62static void UnitySetSendWindowContents(Bool enabled);
@@ -77,7 +67,6 @@
77 * Dispatch table for Unity window commands. All commands performing actions on67 * Dispatch table for Unity window commands. All commands performing actions on
78 * guest unity windows go here.68 * guest unity windows go here.
79 */69 */
80
81typedef struct {70typedef struct {
82 const char *name;71 const char *name;
83 Bool (*exec)(UnityPlatform *up, UnityWindowId window);72 Bool (*exec)(UnityPlatform *up, UnityWindowId window);
The diff has been truncated for viewing.

Subscribers

People subscribed via source and target branches