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
1=== modified file 'ChangeLog'
2--- ChangeLog 2011-07-22 16:41:03 +0000
3+++ ChangeLog 2011-10-31 00:22:23 +0000
4@@ -1,3 +1,8 @@
5+2011.08.21 Marcelo Vanzin <mvanzin@vmware.com>
6+ This release tag contains commits up to the following id:
7+ 2b3d76ba776f55d06fb5b62499b189ebd6bc1c75
8+
9+
10 2011.07.19 Marcelo Vanzin <mvanzin@vmware.com>
11 This release tag contains commits up to the following id:
12 5bed6f1369ca6e9c2c7fbaf4205d86e50f219c5f
13
14=== modified file 'NEWS'
15--- NEWS 2011-07-22 16:41:03 +0000
16+++ NEWS 2011-10-31 00:22:23 +0000
17@@ -1,3 +1,8 @@
18+open-vm-tools 2011.08.21 changes:
19+ * Enabled several VIX APIs on FreeBSD.
20+
21+ * Minor bug fixes and code cleanup.
22+
23 open-vm-tools 2011.07.19 changes:
24 * Fix an issue in the HGFS driver that could lead to a kernel
25 panic.
26
27=== modified file 'autom4te.cache/output.0'
28--- autom4te.cache/output.0 2011-07-22 16:41:03 +0000
29+++ autom4te.cache/output.0 2011-10-31 00:22:23 +0000
30@@ -1,6 +1,6 @@
31 @%:@! /bin/sh
32 @%:@ Guess values for system-dependent variables and create Makefiles.
33-@%:@ Generated by GNU Autoconf 2.67 for open-vm-tools 2011.07.19.
34+@%:@ Generated by GNU Autoconf 2.67 for open-vm-tools 2011.08.21.
35 @%:@
36 @%:@ Report bugs to <open-vm-tools-devel@lists.sourceforge.net>.
37 @%:@
38@@ -701,8 +701,8 @@
39 # Identity of this package.
40 PACKAGE_NAME='open-vm-tools'
41 PACKAGE_TARNAME='open-vm-tools'
42-PACKAGE_VERSION='2011.07.19'
43-PACKAGE_STRING='open-vm-tools 2011.07.19'
44+PACKAGE_VERSION='2011.08.21'
45+PACKAGE_STRING='open-vm-tools 2011.08.21'
46 PACKAGE_BUGREPORT='open-vm-tools-devel@lists.sourceforge.net'
47 PACKAGE_URL=''
48
49@@ -1561,7 +1561,7 @@
50 # Omit some internal or obsolete options to make the list less imposing.
51 # This message is too long to be a string in the A/UX 3.1 sh.
52 cat <<_ACEOF
53-\`configure' configures open-vm-tools 2011.07.19 to adapt to many kinds of systems.
54+\`configure' configures open-vm-tools 2011.08.21 to adapt to many kinds of systems.
55
56 Usage: $0 [OPTION]... [VAR=VALUE]...
57
58@@ -1635,7 +1635,7 @@
59
60 if test -n "$ac_init_help"; then
61 case $ac_init_help in
62- short | recursive ) echo "Configuration of open-vm-tools 2011.07.19:";;
63+ short | recursive ) echo "Configuration of open-vm-tools 2011.08.21:";;
64 esac
65 cat <<\_ACEOF
66
67@@ -1762,7 +1762,7 @@
68 test -n "$ac_init_help" && exit $ac_status
69 if $ac_init_version; then
70 cat <<\_ACEOF
71-open-vm-tools configure 2011.07.19
72+open-vm-tools configure 2011.08.21
73 generated by GNU Autoconf 2.67
74
75 Copyright (C) 2010 Free Software Foundation, Inc.
76@@ -2454,7 +2454,7 @@
77 This file contains any messages produced by compilers while
78 running configure, to aid debugging if configure makes a mistake.
79
80-It was created by open-vm-tools $as_me 2011.07.19, which was
81+It was created by open-vm-tools $as_me 2011.08.21, which was
82 generated by GNU Autoconf 2.67. Invocation command line was
83
84 $ $0 $@
85@@ -3529,7 +3529,7 @@
86
87 # Define the identity of the package.
88 PACKAGE='open-vm-tools'
89- VERSION='2011.07.19'
90+ VERSION='2011.08.21'
91
92
93 cat >>confdefs.h <<_ACEOF
94@@ -22584,6 +22584,34 @@
95 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
96 CFLAGS="$ORIGINAL_CFLAGS"
97
98+# Detect "unused-but-set-variable" gcc warning and disable it.
99+ORIGINAL_CFLAGS="$CFLAGS"
100+CFLAGS="$CFLAGS -Wno-unused-but-set-variable"
101+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GCC flag -Wno-unused-but-set-variable" >&5
102+$as_echo_n "checking for GCC flag -Wno-unused-but-set-variable... " >&6; }
103+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
104+/* end confdefs.h. */
105+
106+int
107+main ()
108+{
109+return 0;
110+ ;
111+ return 0;
112+}
113+_ACEOF
114+if ac_fn_c_try_compile "$LINENO"; then :
115+ ORIGINAL_CFLAGS="$ORIGINAL_CFLAGS -Wno-unused-but-set-variable";
116+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
117+$as_echo "yes" >&6; }
118+else
119+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
120+$as_echo "no" >&6; }
121+fi
122+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
123+CFLAGS="$ORIGINAL_CFLAGS"
124+
125+
126 BUILDDIR="`pwd`"
127
128 INCLUDE_DIR="`cd $srcdir; pwd`/lib/include"
129@@ -22767,6 +22795,7 @@
130 fi
131
132 if test "$os" = "freebsd"; then
133+ LIBVMTOOLS_LIBADD="$LIBVMTOOLS_LIBADD -lkvm"
134 MODULES_DIR="/boot/modules"
135
136 if test "$osVersion" -ge 302000; then
137@@ -23773,7 +23802,7 @@
138 # report actual input values of CONFIG_FILES etc. instead of their
139 # values after options handling.
140 ac_log="
141-This file was extended by open-vm-tools $as_me 2011.07.19, which was
142+This file was extended by open-vm-tools $as_me 2011.08.21, which was
143 generated by GNU Autoconf 2.67. Invocation command line was
144
145 CONFIG_FILES = $CONFIG_FILES
146@@ -23830,7 +23859,7 @@
147 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
148 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
149 ac_cs_version="\\
150-open-vm-tools config.status 2011.07.19
151+open-vm-tools config.status 2011.08.21
152 configured by $0, generated by GNU Autoconf 2.67,
153 with options \\"\$ac_cs_config\\"
154
155
156=== modified file 'autom4te.cache/output.1'
157--- autom4te.cache/output.1 2011-07-22 16:41:03 +0000
158+++ autom4te.cache/output.1 2011-10-31 00:22:23 +0000
159@@ -1,6 +1,6 @@
160 @%:@! /bin/sh
161 @%:@ Guess values for system-dependent variables and create Makefiles.
162-@%:@ Generated by GNU Autoconf 2.67 for open-vm-tools 2011.07.19.
163+@%:@ Generated by GNU Autoconf 2.67 for open-vm-tools 2011.08.21.
164 @%:@
165 @%:@ Report bugs to <open-vm-tools-devel@lists.sourceforge.net>.
166 @%:@
167@@ -701,8 +701,8 @@
168 # Identity of this package.
169 PACKAGE_NAME='open-vm-tools'
170 PACKAGE_TARNAME='open-vm-tools'
171-PACKAGE_VERSION='2011.07.19'
172-PACKAGE_STRING='open-vm-tools 2011.07.19'
173+PACKAGE_VERSION='2011.08.21'
174+PACKAGE_STRING='open-vm-tools 2011.08.21'
175 PACKAGE_BUGREPORT='open-vm-tools-devel@lists.sourceforge.net'
176 PACKAGE_URL=''
177
178@@ -1561,7 +1561,7 @@
179 # Omit some internal or obsolete options to make the list less imposing.
180 # This message is too long to be a string in the A/UX 3.1 sh.
181 cat <<_ACEOF
182-\`configure' configures open-vm-tools 2011.07.19 to adapt to many kinds of systems.
183+\`configure' configures open-vm-tools 2011.08.21 to adapt to many kinds of systems.
184
185 Usage: $0 [OPTION]... [VAR=VALUE]...
186
187@@ -1635,7 +1635,7 @@
188
189 if test -n "$ac_init_help"; then
190 case $ac_init_help in
191- short | recursive ) echo "Configuration of open-vm-tools 2011.07.19:";;
192+ short | recursive ) echo "Configuration of open-vm-tools 2011.08.21:";;
193 esac
194 cat <<\_ACEOF
195
196@@ -1762,7 +1762,7 @@
197 test -n "$ac_init_help" && exit $ac_status
198 if $ac_init_version; then
199 cat <<\_ACEOF
200-open-vm-tools configure 2011.07.19
201+open-vm-tools configure 2011.08.21
202 generated by GNU Autoconf 2.67
203
204 Copyright (C) 2010 Free Software Foundation, Inc.
205@@ -2454,7 +2454,7 @@
206 This file contains any messages produced by compilers while
207 running configure, to aid debugging if configure makes a mistake.
208
209-It was created by open-vm-tools $as_me 2011.07.19, which was
210+It was created by open-vm-tools $as_me 2011.08.21, which was
211 generated by GNU Autoconf 2.67. Invocation command line was
212
213 $ $0 $@
214@@ -3529,7 +3529,7 @@
215
216 # Define the identity of the package.
217 PACKAGE='open-vm-tools'
218- VERSION='2011.07.19'
219+ VERSION='2011.08.21'
220
221
222 cat >>confdefs.h <<_ACEOF
223@@ -22584,6 +22584,34 @@
224 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
225 CFLAGS="$ORIGINAL_CFLAGS"
226
227+# Detect "unused-but-set-variable" gcc warning and disable it.
228+ORIGINAL_CFLAGS="$CFLAGS"
229+CFLAGS="$CFLAGS -Wno-unused-but-set-variable"
230+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GCC flag -Wno-unused-but-set-variable" >&5
231+$as_echo_n "checking for GCC flag -Wno-unused-but-set-variable... " >&6; }
232+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
233+/* end confdefs.h. */
234+
235+int
236+main ()
237+{
238+return 0;
239+ ;
240+ return 0;
241+}
242+_ACEOF
243+if ac_fn_c_try_compile "$LINENO"; then :
244+ ORIGINAL_CFLAGS="$ORIGINAL_CFLAGS -Wno-unused-but-set-variable";
245+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
246+$as_echo "yes" >&6; }
247+else
248+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
249+$as_echo "no" >&6; }
250+fi
251+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
252+CFLAGS="$ORIGINAL_CFLAGS"
253+
254+
255 BUILDDIR="`pwd`"
256
257 INCLUDE_DIR="`cd $srcdir; pwd`/lib/include"
258@@ -22767,6 +22795,7 @@
259 fi
260
261 if test "$os" = "freebsd"; then
262+ LIBVMTOOLS_LIBADD="$LIBVMTOOLS_LIBADD -lkvm"
263 MODULES_DIR="/boot/modules"
264
265 if test "$osVersion" -ge 302000; then
266@@ -23773,7 +23802,7 @@
267 # report actual input values of CONFIG_FILES etc. instead of their
268 # values after options handling.
269 ac_log="
270-This file was extended by open-vm-tools $as_me 2011.07.19, which was
271+This file was extended by open-vm-tools $as_me 2011.08.21, which was
272 generated by GNU Autoconf 2.67. Invocation command line was
273
274 CONFIG_FILES = $CONFIG_FILES
275@@ -23830,7 +23859,7 @@
276 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
277 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
278 ac_cs_version="\\
279-open-vm-tools config.status 2011.07.19
280+open-vm-tools config.status 2011.08.21
281 configured by $0, generated by GNU Autoconf 2.67,
282 with options \\"\$ac_cs_config\\"
283
284
285=== modified file 'autom4te.cache/output.2'
286--- autom4te.cache/output.2 2011-07-22 16:41:03 +0000
287+++ autom4te.cache/output.2 2011-10-31 00:22:23 +0000
288@@ -1,6 +1,6 @@
289 @%:@! /bin/sh
290 @%:@ Guess values for system-dependent variables and create Makefiles.
291-@%:@ Generated by GNU Autoconf 2.67 for open-vm-tools 2011.07.19.
292+@%:@ Generated by GNU Autoconf 2.67 for open-vm-tools 2011.08.21.
293 @%:@
294 @%:@ Report bugs to <open-vm-tools-devel@lists.sourceforge.net>.
295 @%:@
296@@ -701,8 +701,8 @@
297 # Identity of this package.
298 PACKAGE_NAME='open-vm-tools'
299 PACKAGE_TARNAME='open-vm-tools'
300-PACKAGE_VERSION='2011.07.19'
301-PACKAGE_STRING='open-vm-tools 2011.07.19'
302+PACKAGE_VERSION='2011.08.21'
303+PACKAGE_STRING='open-vm-tools 2011.08.21'
304 PACKAGE_BUGREPORT='open-vm-tools-devel@lists.sourceforge.net'
305 PACKAGE_URL=''
306
307@@ -1561,7 +1561,7 @@
308 # Omit some internal or obsolete options to make the list less imposing.
309 # This message is too long to be a string in the A/UX 3.1 sh.
310 cat <<_ACEOF
311-\`configure' configures open-vm-tools 2011.07.19 to adapt to many kinds of systems.
312+\`configure' configures open-vm-tools 2011.08.21 to adapt to many kinds of systems.
313
314 Usage: $0 [OPTION]... [VAR=VALUE]...
315
316@@ -1635,7 +1635,7 @@
317
318 if test -n "$ac_init_help"; then
319 case $ac_init_help in
320- short | recursive ) echo "Configuration of open-vm-tools 2011.07.19:";;
321+ short | recursive ) echo "Configuration of open-vm-tools 2011.08.21:";;
322 esac
323 cat <<\_ACEOF
324
325@@ -1762,7 +1762,7 @@
326 test -n "$ac_init_help" && exit $ac_status
327 if $ac_init_version; then
328 cat <<\_ACEOF
329-open-vm-tools configure 2011.07.19
330+open-vm-tools configure 2011.08.21
331 generated by GNU Autoconf 2.67
332
333 Copyright (C) 2010 Free Software Foundation, Inc.
334@@ -2454,7 +2454,7 @@
335 This file contains any messages produced by compilers while
336 running configure, to aid debugging if configure makes a mistake.
337
338-It was created by open-vm-tools $as_me 2011.07.19, which was
339+It was created by open-vm-tools $as_me 2011.08.21, which was
340 generated by GNU Autoconf 2.67. Invocation command line was
341
342 $ $0 $@
343@@ -3529,7 +3529,7 @@
344
345 # Define the identity of the package.
346 PACKAGE='open-vm-tools'
347- VERSION='2011.07.19'
348+ VERSION='2011.08.21'
349
350
351 cat >>confdefs.h <<_ACEOF
352@@ -22584,6 +22584,34 @@
353 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
354 CFLAGS="$ORIGINAL_CFLAGS"
355
356+# Detect "unused-but-set-variable" gcc warning and disable it.
357+ORIGINAL_CFLAGS="$CFLAGS"
358+CFLAGS="$CFLAGS -Wno-unused-but-set-variable"
359+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GCC flag -Wno-unused-but-set-variable" >&5
360+$as_echo_n "checking for GCC flag -Wno-unused-but-set-variable... " >&6; }
361+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
362+/* end confdefs.h. */
363+
364+int
365+main ()
366+{
367+return 0;
368+ ;
369+ return 0;
370+}
371+_ACEOF
372+if ac_fn_c_try_compile "$LINENO"; then :
373+ ORIGINAL_CFLAGS="$ORIGINAL_CFLAGS -Wno-unused-but-set-variable";
374+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
375+$as_echo "yes" >&6; }
376+else
377+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
378+$as_echo "no" >&6; }
379+fi
380+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
381+CFLAGS="$ORIGINAL_CFLAGS"
382+
383+
384 BUILDDIR="`pwd`"
385
386 INCLUDE_DIR="`cd $srcdir; pwd`/lib/include"
387@@ -22767,6 +22795,7 @@
388 fi
389
390 if test "$os" = "freebsd"; then
391+ LIBVMTOOLS_LIBADD="$LIBVMTOOLS_LIBADD -lkvm"
392 MODULES_DIR="/boot/modules"
393
394 if test "$osVersion" -ge 302000; then
395@@ -23773,7 +23802,7 @@
396 # report actual input values of CONFIG_FILES etc. instead of their
397 # values after options handling.
398 ac_log="
399-This file was extended by open-vm-tools $as_me 2011.07.19, which was
400+This file was extended by open-vm-tools $as_me 2011.08.21, which was
401 generated by GNU Autoconf 2.67. Invocation command line was
402
403 CONFIG_FILES = $CONFIG_FILES
404@@ -23830,7 +23859,7 @@
405 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
406 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
407 ac_cs_version="\\
408-open-vm-tools config.status 2011.07.19
409+open-vm-tools config.status 2011.08.21
410 configured by $0, generated by GNU Autoconf 2.67,
411 with options \\"\$ac_cs_config\\"
412
413
414=== modified file 'autom4te.cache/traces.0'
415--- autom4te.cache/traces.0 2011-07-22 16:41:03 +0000
416+++ autom4te.cache/traces.0 2011-10-31 00:22:23 +0000
417@@ -2713,156 +2713,159 @@
418 m4trace:configure.ac:950: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
419 You should run autoupdate.], [../../lib/autoconf/general.m4:2602: AC_TRY_COMPILE is expanded from...
420 configure.ac:950: the top level])
421-m4trace:configure.ac:968: -1- m4_pattern_allow([^have_doxygen$])
422-m4trace:configure.ac:975: -1- m4_pattern_allow([^DOT$])
423-m4trace:configure.ac:982: -1- m4_pattern_allow([^DOT$])
424-m4trace:configure.ac:983: -1- m4_pattern_allow([^HAVE_DOT$])
425-m4trace:configure.ac:985: -1- m4_pattern_allow([^MSCGEN$])
426-m4trace:configure.ac:993: -1- m4_pattern_allow([^MSCGEN_DIR$])
427-m4trace:configure.ac:1092: -1- AM_CONDITIONAL([BUILD_HGFSMOUNTER], [test "$buildHgfsmounter" = "yes"])
428-m4trace:configure.ac:1092: -1- m4_pattern_allow([^BUILD_HGFSMOUNTER_TRUE$])
429-m4trace:configure.ac:1092: -1- m4_pattern_allow([^BUILD_HGFSMOUNTER_FALSE$])
430-m4trace:configure.ac:1092: -1- _AM_SUBST_NOTMAKE([BUILD_HGFSMOUNTER_TRUE])
431-m4trace:configure.ac:1092: -1- _AM_SUBST_NOTMAKE([BUILD_HGFSMOUNTER_FALSE])
432-m4trace:configure.ac:1093: -1- AM_CONDITIONAL([LINUX], [test "$os" = "linux"])
433-m4trace:configure.ac:1093: -1- m4_pattern_allow([^LINUX_TRUE$])
434-m4trace:configure.ac:1093: -1- m4_pattern_allow([^LINUX_FALSE$])
435-m4trace:configure.ac:1093: -1- _AM_SUBST_NOTMAKE([LINUX_TRUE])
436-m4trace:configure.ac:1093: -1- _AM_SUBST_NOTMAKE([LINUX_FALSE])
437-m4trace:configure.ac:1094: -1- AM_CONDITIONAL([SOLARIS], [test "$os" = "solaris"])
438-m4trace:configure.ac:1094: -1- m4_pattern_allow([^SOLARIS_TRUE$])
439-m4trace:configure.ac:1094: -1- m4_pattern_allow([^SOLARIS_FALSE$])
440-m4trace:configure.ac:1094: -1- _AM_SUBST_NOTMAKE([SOLARIS_TRUE])
441-m4trace:configure.ac:1094: -1- _AM_SUBST_NOTMAKE([SOLARIS_FALSE])
442-m4trace:configure.ac:1095: -1- AM_CONDITIONAL([FREEBSD], [test "$os" = "freebsd"])
443-m4trace:configure.ac:1095: -1- m4_pattern_allow([^FREEBSD_TRUE$])
444-m4trace:configure.ac:1095: -1- m4_pattern_allow([^FREEBSD_FALSE$])
445-m4trace:configure.ac:1095: -1- _AM_SUBST_NOTMAKE([FREEBSD_TRUE])
446-m4trace:configure.ac:1095: -1- _AM_SUBST_NOTMAKE([FREEBSD_FALSE])
447-m4trace:configure.ac:1096: -1- AM_CONDITIONAL([FREEBSD_CUSTOM_SYSDIR], [test "$os" = "freebsd" -a -n "$SYSDIR"])
448-m4trace:configure.ac:1096: -1- m4_pattern_allow([^FREEBSD_CUSTOM_SYSDIR_TRUE$])
449-m4trace:configure.ac:1096: -1- m4_pattern_allow([^FREEBSD_CUSTOM_SYSDIR_FALSE$])
450-m4trace:configure.ac:1096: -1- _AM_SUBST_NOTMAKE([FREEBSD_CUSTOM_SYSDIR_TRUE])
451-m4trace:configure.ac:1096: -1- _AM_SUBST_NOTMAKE([FREEBSD_CUSTOM_SYSDIR_FALSE])
452-m4trace:configure.ac:1097: -1- AM_CONDITIONAL([THIRTY_TWO_BIT_USERSPACE], [test "$userSpaceBitness" = "32"])
453-m4trace:configure.ac:1097: -1- m4_pattern_allow([^THIRTY_TWO_BIT_USERSPACE_TRUE$])
454-m4trace:configure.ac:1097: -1- m4_pattern_allow([^THIRTY_TWO_BIT_USERSPACE_FALSE$])
455-m4trace:configure.ac:1097: -1- _AM_SUBST_NOTMAKE([THIRTY_TWO_BIT_USERSPACE_TRUE])
456-m4trace:configure.ac:1097: -1- _AM_SUBST_NOTMAKE([THIRTY_TWO_BIT_USERSPACE_FALSE])
457-m4trace:configure.ac:1098: -1- AM_CONDITIONAL([HAVE_X11], [test "$have_x" = "yes"])
458-m4trace:configure.ac:1098: -1- m4_pattern_allow([^HAVE_X11_TRUE$])
459-m4trace:configure.ac:1098: -1- m4_pattern_allow([^HAVE_X11_FALSE$])
460-m4trace:configure.ac:1098: -1- _AM_SUBST_NOTMAKE([HAVE_X11_TRUE])
461-m4trace:configure.ac:1098: -1- _AM_SUBST_NOTMAKE([HAVE_X11_FALSE])
462-m4trace:configure.ac:1099: -1- AM_CONDITIONAL([HAVE_ICU], [test "$with_icu" = "yes"])
463-m4trace:configure.ac:1099: -1- m4_pattern_allow([^HAVE_ICU_TRUE$])
464-m4trace:configure.ac:1099: -1- m4_pattern_allow([^HAVE_ICU_FALSE$])
465-m4trace:configure.ac:1099: -1- _AM_SUBST_NOTMAKE([HAVE_ICU_TRUE])
466-m4trace:configure.ac:1099: -1- _AM_SUBST_NOTMAKE([HAVE_ICU_FALSE])
467-m4trace:configure.ac:1100: -1- AM_CONDITIONAL([WITH_KERNEL_MODULES], [test "$with_kernel_modules" = "yes"])
468-m4trace:configure.ac:1100: -1- m4_pattern_allow([^WITH_KERNEL_MODULES_TRUE$])
469-m4trace:configure.ac:1100: -1- m4_pattern_allow([^WITH_KERNEL_MODULES_FALSE$])
470-m4trace:configure.ac:1100: -1- _AM_SUBST_NOTMAKE([WITH_KERNEL_MODULES_TRUE])
471-m4trace:configure.ac:1100: -1- _AM_SUBST_NOTMAKE([WITH_KERNEL_MODULES_FALSE])
472-m4trace:configure.ac:1101: -1- AM_CONDITIONAL([HAVE_XSM], [test "$have_xsm" = "yes"])
473-m4trace:configure.ac:1101: -1- m4_pattern_allow([^HAVE_XSM_TRUE$])
474-m4trace:configure.ac:1101: -1- m4_pattern_allow([^HAVE_XSM_FALSE$])
475-m4trace:configure.ac:1101: -1- _AM_SUBST_NOTMAKE([HAVE_XSM_TRUE])
476-m4trace:configure.ac:1101: -1- _AM_SUBST_NOTMAKE([HAVE_XSM_FALSE])
477-m4trace:configure.ac:1102: -1- AM_CONDITIONAL([HAVE_XCOMPOSITE], [test "$have_xcomposite" = "yes"])
478-m4trace:configure.ac:1102: -1- m4_pattern_allow([^HAVE_XCOMPOSITE_TRUE$])
479-m4trace:configure.ac:1102: -1- m4_pattern_allow([^HAVE_XCOMPOSITE_FALSE$])
480-m4trace:configure.ac:1102: -1- _AM_SUBST_NOTMAKE([HAVE_XCOMPOSITE_TRUE])
481-m4trace:configure.ac:1102: -1- _AM_SUBST_NOTMAKE([HAVE_XCOMPOSITE_FALSE])
482-m4trace:configure.ac:1103: -1- AM_CONDITIONAL([ENABLE_UNITY], [test "$enable_unity" = "yes"])
483-m4trace:configure.ac:1103: -1- m4_pattern_allow([^ENABLE_UNITY_TRUE$])
484-m4trace:configure.ac:1103: -1- m4_pattern_allow([^ENABLE_UNITY_FALSE$])
485-m4trace:configure.ac:1103: -1- _AM_SUBST_NOTMAKE([ENABLE_UNITY_TRUE])
486-m4trace:configure.ac:1103: -1- _AM_SUBST_NOTMAKE([ENABLE_UNITY_FALSE])
487-m4trace:configure.ac:1104: -1- AM_CONDITIONAL([ENABLE_TESTS], [test "$have_cunit" = "yes"])
488-m4trace:configure.ac:1104: -1- m4_pattern_allow([^ENABLE_TESTS_TRUE$])
489-m4trace:configure.ac:1104: -1- m4_pattern_allow([^ENABLE_TESTS_FALSE$])
490-m4trace:configure.ac:1104: -1- _AM_SUBST_NOTMAKE([ENABLE_TESTS_TRUE])
491-m4trace:configure.ac:1104: -1- _AM_SUBST_NOTMAKE([ENABLE_TESTS_FALSE])
492-m4trace:configure.ac:1105: -1- AM_CONDITIONAL([WITH_ROOT_PRIVILEGES], [test "$with_root_privileges" = "yes"])
493-m4trace:configure.ac:1105: -1- m4_pattern_allow([^WITH_ROOT_PRIVILEGES_TRUE$])
494-m4trace:configure.ac:1105: -1- m4_pattern_allow([^WITH_ROOT_PRIVILEGES_FALSE$])
495-m4trace:configure.ac:1105: -1- _AM_SUBST_NOTMAKE([WITH_ROOT_PRIVILEGES_TRUE])
496-m4trace:configure.ac:1105: -1- _AM_SUBST_NOTMAKE([WITH_ROOT_PRIVILEGES_FALSE])
497-m4trace:configure.ac:1106: -1- AM_CONDITIONAL([HAVE_DNET], [test "$have_dnet" = "yes"])
498-m4trace:configure.ac:1106: -1- m4_pattern_allow([^HAVE_DNET_TRUE$])
499-m4trace:configure.ac:1106: -1- m4_pattern_allow([^HAVE_DNET_FALSE$])
500-m4trace:configure.ac:1106: -1- _AM_SUBST_NOTMAKE([HAVE_DNET_TRUE])
501-m4trace:configure.ac:1106: -1- _AM_SUBST_NOTMAKE([HAVE_DNET_FALSE])
502-m4trace:configure.ac:1107: -1- AM_CONDITIONAL([HAVE_DOXYGEN], [test "$have_doxygen" = "yes"])
503-m4trace:configure.ac:1107: -1- m4_pattern_allow([^HAVE_DOXYGEN_TRUE$])
504-m4trace:configure.ac:1107: -1- m4_pattern_allow([^HAVE_DOXYGEN_FALSE$])
505-m4trace:configure.ac:1107: -1- _AM_SUBST_NOTMAKE([HAVE_DOXYGEN_TRUE])
506-m4trace:configure.ac:1107: -1- _AM_SUBST_NOTMAKE([HAVE_DOXYGEN_FALSE])
507-m4trace:configure.ac:1108: -1- AM_CONDITIONAL([HAVE_FUSE], [test "$have_fuse" = "yes"])
508-m4trace:configure.ac:1108: -1- m4_pattern_allow([^HAVE_FUSE_TRUE$])
509-m4trace:configure.ac:1108: -1- m4_pattern_allow([^HAVE_FUSE_FALSE$])
510-m4trace:configure.ac:1108: -1- _AM_SUBST_NOTMAKE([HAVE_FUSE_TRUE])
511-m4trace:configure.ac:1108: -1- _AM_SUBST_NOTMAKE([HAVE_FUSE_FALSE])
512-m4trace:configure.ac:1109: -1- AM_CONDITIONAL([HAVE_GNU_LD], [test "$with_gnu_ld" = "yes"])
513-m4trace:configure.ac:1109: -1- m4_pattern_allow([^HAVE_GNU_LD_TRUE$])
514-m4trace:configure.ac:1109: -1- m4_pattern_allow([^HAVE_GNU_LD_FALSE$])
515-m4trace:configure.ac:1109: -1- _AM_SUBST_NOTMAKE([HAVE_GNU_LD_TRUE])
516-m4trace:configure.ac:1109: -1- _AM_SUBST_NOTMAKE([HAVE_GNU_LD_FALSE])
517-m4trace:configure.ac:1110: -1- AM_CONDITIONAL([HAVE_GTKMM], [test "$have_x" = "yes" -a "$with_gtkmm" = "yes"])
518-m4trace:configure.ac:1110: -1- m4_pattern_allow([^HAVE_GTKMM_TRUE$])
519-m4trace:configure.ac:1110: -1- m4_pattern_allow([^HAVE_GTKMM_FALSE$])
520-m4trace:configure.ac:1110: -1- _AM_SUBST_NOTMAKE([HAVE_GTKMM_TRUE])
521-m4trace:configure.ac:1110: -1- _AM_SUBST_NOTMAKE([HAVE_GTKMM_FALSE])
522-m4trace:configure.ac:1111: -1- AM_CONDITIONAL([HAVE_PAM], [test "$with_pam" = "yes"])
523-m4trace:configure.ac:1111: -1- m4_pattern_allow([^HAVE_PAM_TRUE$])
524-m4trace:configure.ac:1111: -1- m4_pattern_allow([^HAVE_PAM_FALSE$])
525-m4trace:configure.ac:1111: -1- _AM_SUBST_NOTMAKE([HAVE_PAM_TRUE])
526-m4trace:configure.ac:1111: -1- _AM_SUBST_NOTMAKE([HAVE_PAM_FALSE])
527-m4trace:configure.ac:1112: -1- AM_CONDITIONAL([USE_SLASH_PROC], [test "os" = "linux" -a "$have_glib_2_14" = "yes"])
528-m4trace:configure.ac:1112: -1- m4_pattern_allow([^USE_SLASH_PROC_TRUE$])
529-m4trace:configure.ac:1112: -1- m4_pattern_allow([^USE_SLASH_PROC_FALSE$])
530-m4trace:configure.ac:1112: -1- _AM_SUBST_NOTMAKE([USE_SLASH_PROC_TRUE])
531-m4trace:configure.ac:1112: -1- _AM_SUBST_NOTMAKE([USE_SLASH_PROC_FALSE])
532-m4trace:configure.ac:1115: -1- m4_pattern_allow([^NO_XSM$])
533-m4trace:configure.ac:1119: -1- m4_pattern_allow([^NO_XCOMPOSITE$])
534-m4trace:configure.ac:1131: -1- m4_pattern_allow([^NO_MULTIMON$])
535-m4trace:configure.ac:1173: -1- m4_pattern_allow([^HGFS_LIBS$])
536-m4trace:configure.ac:1174: -1- m4_pattern_allow([^TOOLS_VERSION$])
537-m4trace:configure.ac:1175: -1- m4_pattern_allow([^TARGET_OS$])
538-m4trace:configure.ac:1176: -1- m4_pattern_allow([^KERNEL_RELEASE$])
539-m4trace:configure.ac:1177: -1- m4_pattern_allow([^LINUXINCLUDE$])
540-m4trace:configure.ac:1178: -1- m4_pattern_allow([^MODULES_OS$])
541-m4trace:configure.ac:1179: -1- m4_pattern_allow([^MODULES_DIR$])
542-m4trace:configure.ac:1180: -1- m4_pattern_allow([^MODULES$])
543-m4trace:configure.ac:1181: -1- m4_pattern_allow([^COMMON_XLIBS$])
544-m4trace:configure.ac:1182: -1- m4_pattern_allow([^XSM_LIBS$])
545-m4trace:configure.ac:1183: -1- m4_pattern_allow([^XCOMPOSITE_LIBS$])
546-m4trace:configure.ac:1184: -1- m4_pattern_allow([^PAM_PREFIX$])
547-m4trace:configure.ac:1185: -1- m4_pattern_allow([^PLUGIN_CPPFLAGS$])
548-m4trace:configure.ac:1186: -1- m4_pattern_allow([^PLUGIN_LDFLAGS$])
549-m4trace:configure.ac:1187: -1- m4_pattern_allow([^VMTOOLS_CPPFLAGS$])
550-m4trace:configure.ac:1188: -1- m4_pattern_allow([^VMTOOLS_LIBS$])
551-m4trace:configure.ac:1189: -1- m4_pattern_allow([^RPCGENFLAGS$])
552-m4trace:configure.ac:1190: -1- m4_pattern_allow([^XDR_LIBS$])
553-m4trace:configure.ac:1191: -1- m4_pattern_allow([^TEST_PLUGIN_INSTALLDIR$])
554-m4trace:configure.ac:1192: -1- m4_pattern_allow([^COMMON_PLUGIN_INSTALLDIR$])
555-m4trace:configure.ac:1193: -1- m4_pattern_allow([^VMSVC_PLUGIN_INSTALLDIR$])
556-m4trace:configure.ac:1194: -1- m4_pattern_allow([^VMUSR_PLUGIN_INSTALLDIR$])
557-m4trace:configure.ac:1199: -1- m4_pattern_allow([^SYSDIR$])
558-m4trace:configure.ac:1201: -1- m4_pattern_allow([^INSTVMSG$])
559-m4trace:configure.ac:1202: -1- m4_pattern_allow([^RPCGEN_WRAPPER$])
560-m4trace:configure.ac:1206: -1- m4_pattern_allow([^LIB_AUTH_CPPFLAGS$])
561-m4trace:configure.ac:1207: -1- m4_pattern_allow([^LIB_IMPERSONATE_CPPFLAGS$])
562-m4trace:configure.ac:1208: -1- m4_pattern_allow([^LIB_USER_CPPFLAGS$])
563-m4trace:configure.ac:1209: -1- m4_pattern_allow([^LIBVMTOOLS_LIBADD$])
564-m4trace:configure.ac:1213: -1- m4_pattern_allow([^VIX_LIBADD$])
565-m4trace:configure.ac:1306: -1- m4_pattern_allow([^LIB@&t@OBJS$])
566-m4trace:configure.ac:1306: -1- m4_pattern_allow([^LTLIBOBJS$])
567-m4trace:configure.ac:1306: -1- AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])
568-m4trace:configure.ac:1306: -1- m4_pattern_allow([^am__EXEEXT_TRUE$])
569-m4trace:configure.ac:1306: -1- m4_pattern_allow([^am__EXEEXT_FALSE$])
570-m4trace:configure.ac:1306: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_TRUE])
571-m4trace:configure.ac:1306: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_FALSE])
572-m4trace:configure.ac:1306: -1- _AM_OUTPUT_DEPENDENCY_COMMANDS
573-m4trace:configure.ac:1306: -1- _LT_PROG_LTMAIN
574+m4trace:configure.ac:961: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
575+You should run autoupdate.], [../../lib/autoconf/general.m4:2602: AC_TRY_COMPILE is expanded from...
576+configure.ac:961: the top level])
577+m4trace:configure.ac:980: -1- m4_pattern_allow([^have_doxygen$])
578+m4trace:configure.ac:987: -1- m4_pattern_allow([^DOT$])
579+m4trace:configure.ac:994: -1- m4_pattern_allow([^DOT$])
580+m4trace:configure.ac:995: -1- m4_pattern_allow([^HAVE_DOT$])
581+m4trace:configure.ac:997: -1- m4_pattern_allow([^MSCGEN$])
582+m4trace:configure.ac:1005: -1- m4_pattern_allow([^MSCGEN_DIR$])
583+m4trace:configure.ac:1105: -1- AM_CONDITIONAL([BUILD_HGFSMOUNTER], [test "$buildHgfsmounter" = "yes"])
584+m4trace:configure.ac:1105: -1- m4_pattern_allow([^BUILD_HGFSMOUNTER_TRUE$])
585+m4trace:configure.ac:1105: -1- m4_pattern_allow([^BUILD_HGFSMOUNTER_FALSE$])
586+m4trace:configure.ac:1105: -1- _AM_SUBST_NOTMAKE([BUILD_HGFSMOUNTER_TRUE])
587+m4trace:configure.ac:1105: -1- _AM_SUBST_NOTMAKE([BUILD_HGFSMOUNTER_FALSE])
588+m4trace:configure.ac:1106: -1- AM_CONDITIONAL([LINUX], [test "$os" = "linux"])
589+m4trace:configure.ac:1106: -1- m4_pattern_allow([^LINUX_TRUE$])
590+m4trace:configure.ac:1106: -1- m4_pattern_allow([^LINUX_FALSE$])
591+m4trace:configure.ac:1106: -1- _AM_SUBST_NOTMAKE([LINUX_TRUE])
592+m4trace:configure.ac:1106: -1- _AM_SUBST_NOTMAKE([LINUX_FALSE])
593+m4trace:configure.ac:1107: -1- AM_CONDITIONAL([SOLARIS], [test "$os" = "solaris"])
594+m4trace:configure.ac:1107: -1- m4_pattern_allow([^SOLARIS_TRUE$])
595+m4trace:configure.ac:1107: -1- m4_pattern_allow([^SOLARIS_FALSE$])
596+m4trace:configure.ac:1107: -1- _AM_SUBST_NOTMAKE([SOLARIS_TRUE])
597+m4trace:configure.ac:1107: -1- _AM_SUBST_NOTMAKE([SOLARIS_FALSE])
598+m4trace:configure.ac:1108: -1- AM_CONDITIONAL([FREEBSD], [test "$os" = "freebsd"])
599+m4trace:configure.ac:1108: -1- m4_pattern_allow([^FREEBSD_TRUE$])
600+m4trace:configure.ac:1108: -1- m4_pattern_allow([^FREEBSD_FALSE$])
601+m4trace:configure.ac:1108: -1- _AM_SUBST_NOTMAKE([FREEBSD_TRUE])
602+m4trace:configure.ac:1108: -1- _AM_SUBST_NOTMAKE([FREEBSD_FALSE])
603+m4trace:configure.ac:1109: -1- AM_CONDITIONAL([FREEBSD_CUSTOM_SYSDIR], [test "$os" = "freebsd" -a -n "$SYSDIR"])
604+m4trace:configure.ac:1109: -1- m4_pattern_allow([^FREEBSD_CUSTOM_SYSDIR_TRUE$])
605+m4trace:configure.ac:1109: -1- m4_pattern_allow([^FREEBSD_CUSTOM_SYSDIR_FALSE$])
606+m4trace:configure.ac:1109: -1- _AM_SUBST_NOTMAKE([FREEBSD_CUSTOM_SYSDIR_TRUE])
607+m4trace:configure.ac:1109: -1- _AM_SUBST_NOTMAKE([FREEBSD_CUSTOM_SYSDIR_FALSE])
608+m4trace:configure.ac:1110: -1- AM_CONDITIONAL([THIRTY_TWO_BIT_USERSPACE], [test "$userSpaceBitness" = "32"])
609+m4trace:configure.ac:1110: -1- m4_pattern_allow([^THIRTY_TWO_BIT_USERSPACE_TRUE$])
610+m4trace:configure.ac:1110: -1- m4_pattern_allow([^THIRTY_TWO_BIT_USERSPACE_FALSE$])
611+m4trace:configure.ac:1110: -1- _AM_SUBST_NOTMAKE([THIRTY_TWO_BIT_USERSPACE_TRUE])
612+m4trace:configure.ac:1110: -1- _AM_SUBST_NOTMAKE([THIRTY_TWO_BIT_USERSPACE_FALSE])
613+m4trace:configure.ac:1111: -1- AM_CONDITIONAL([HAVE_X11], [test "$have_x" = "yes"])
614+m4trace:configure.ac:1111: -1- m4_pattern_allow([^HAVE_X11_TRUE$])
615+m4trace:configure.ac:1111: -1- m4_pattern_allow([^HAVE_X11_FALSE$])
616+m4trace:configure.ac:1111: -1- _AM_SUBST_NOTMAKE([HAVE_X11_TRUE])
617+m4trace:configure.ac:1111: -1- _AM_SUBST_NOTMAKE([HAVE_X11_FALSE])
618+m4trace:configure.ac:1112: -1- AM_CONDITIONAL([HAVE_ICU], [test "$with_icu" = "yes"])
619+m4trace:configure.ac:1112: -1- m4_pattern_allow([^HAVE_ICU_TRUE$])
620+m4trace:configure.ac:1112: -1- m4_pattern_allow([^HAVE_ICU_FALSE$])
621+m4trace:configure.ac:1112: -1- _AM_SUBST_NOTMAKE([HAVE_ICU_TRUE])
622+m4trace:configure.ac:1112: -1- _AM_SUBST_NOTMAKE([HAVE_ICU_FALSE])
623+m4trace:configure.ac:1113: -1- AM_CONDITIONAL([WITH_KERNEL_MODULES], [test "$with_kernel_modules" = "yes"])
624+m4trace:configure.ac:1113: -1- m4_pattern_allow([^WITH_KERNEL_MODULES_TRUE$])
625+m4trace:configure.ac:1113: -1- m4_pattern_allow([^WITH_KERNEL_MODULES_FALSE$])
626+m4trace:configure.ac:1113: -1- _AM_SUBST_NOTMAKE([WITH_KERNEL_MODULES_TRUE])
627+m4trace:configure.ac:1113: -1- _AM_SUBST_NOTMAKE([WITH_KERNEL_MODULES_FALSE])
628+m4trace:configure.ac:1114: -1- AM_CONDITIONAL([HAVE_XSM], [test "$have_xsm" = "yes"])
629+m4trace:configure.ac:1114: -1- m4_pattern_allow([^HAVE_XSM_TRUE$])
630+m4trace:configure.ac:1114: -1- m4_pattern_allow([^HAVE_XSM_FALSE$])
631+m4trace:configure.ac:1114: -1- _AM_SUBST_NOTMAKE([HAVE_XSM_TRUE])
632+m4trace:configure.ac:1114: -1- _AM_SUBST_NOTMAKE([HAVE_XSM_FALSE])
633+m4trace:configure.ac:1115: -1- AM_CONDITIONAL([HAVE_XCOMPOSITE], [test "$have_xcomposite" = "yes"])
634+m4trace:configure.ac:1115: -1- m4_pattern_allow([^HAVE_XCOMPOSITE_TRUE$])
635+m4trace:configure.ac:1115: -1- m4_pattern_allow([^HAVE_XCOMPOSITE_FALSE$])
636+m4trace:configure.ac:1115: -1- _AM_SUBST_NOTMAKE([HAVE_XCOMPOSITE_TRUE])
637+m4trace:configure.ac:1115: -1- _AM_SUBST_NOTMAKE([HAVE_XCOMPOSITE_FALSE])
638+m4trace:configure.ac:1116: -1- AM_CONDITIONAL([ENABLE_UNITY], [test "$enable_unity" = "yes"])
639+m4trace:configure.ac:1116: -1- m4_pattern_allow([^ENABLE_UNITY_TRUE$])
640+m4trace:configure.ac:1116: -1- m4_pattern_allow([^ENABLE_UNITY_FALSE$])
641+m4trace:configure.ac:1116: -1- _AM_SUBST_NOTMAKE([ENABLE_UNITY_TRUE])
642+m4trace:configure.ac:1116: -1- _AM_SUBST_NOTMAKE([ENABLE_UNITY_FALSE])
643+m4trace:configure.ac:1117: -1- AM_CONDITIONAL([ENABLE_TESTS], [test "$have_cunit" = "yes"])
644+m4trace:configure.ac:1117: -1- m4_pattern_allow([^ENABLE_TESTS_TRUE$])
645+m4trace:configure.ac:1117: -1- m4_pattern_allow([^ENABLE_TESTS_FALSE$])
646+m4trace:configure.ac:1117: -1- _AM_SUBST_NOTMAKE([ENABLE_TESTS_TRUE])
647+m4trace:configure.ac:1117: -1- _AM_SUBST_NOTMAKE([ENABLE_TESTS_FALSE])
648+m4trace:configure.ac:1118: -1- AM_CONDITIONAL([WITH_ROOT_PRIVILEGES], [test "$with_root_privileges" = "yes"])
649+m4trace:configure.ac:1118: -1- m4_pattern_allow([^WITH_ROOT_PRIVILEGES_TRUE$])
650+m4trace:configure.ac:1118: -1- m4_pattern_allow([^WITH_ROOT_PRIVILEGES_FALSE$])
651+m4trace:configure.ac:1118: -1- _AM_SUBST_NOTMAKE([WITH_ROOT_PRIVILEGES_TRUE])
652+m4trace:configure.ac:1118: -1- _AM_SUBST_NOTMAKE([WITH_ROOT_PRIVILEGES_FALSE])
653+m4trace:configure.ac:1119: -1- AM_CONDITIONAL([HAVE_DNET], [test "$have_dnet" = "yes"])
654+m4trace:configure.ac:1119: -1- m4_pattern_allow([^HAVE_DNET_TRUE$])
655+m4trace:configure.ac:1119: -1- m4_pattern_allow([^HAVE_DNET_FALSE$])
656+m4trace:configure.ac:1119: -1- _AM_SUBST_NOTMAKE([HAVE_DNET_TRUE])
657+m4trace:configure.ac:1119: -1- _AM_SUBST_NOTMAKE([HAVE_DNET_FALSE])
658+m4trace:configure.ac:1120: -1- AM_CONDITIONAL([HAVE_DOXYGEN], [test "$have_doxygen" = "yes"])
659+m4trace:configure.ac:1120: -1- m4_pattern_allow([^HAVE_DOXYGEN_TRUE$])
660+m4trace:configure.ac:1120: -1- m4_pattern_allow([^HAVE_DOXYGEN_FALSE$])
661+m4trace:configure.ac:1120: -1- _AM_SUBST_NOTMAKE([HAVE_DOXYGEN_TRUE])
662+m4trace:configure.ac:1120: -1- _AM_SUBST_NOTMAKE([HAVE_DOXYGEN_FALSE])
663+m4trace:configure.ac:1121: -1- AM_CONDITIONAL([HAVE_FUSE], [test "$have_fuse" = "yes"])
664+m4trace:configure.ac:1121: -1- m4_pattern_allow([^HAVE_FUSE_TRUE$])
665+m4trace:configure.ac:1121: -1- m4_pattern_allow([^HAVE_FUSE_FALSE$])
666+m4trace:configure.ac:1121: -1- _AM_SUBST_NOTMAKE([HAVE_FUSE_TRUE])
667+m4trace:configure.ac:1121: -1- _AM_SUBST_NOTMAKE([HAVE_FUSE_FALSE])
668+m4trace:configure.ac:1122: -1- AM_CONDITIONAL([HAVE_GNU_LD], [test "$with_gnu_ld" = "yes"])
669+m4trace:configure.ac:1122: -1- m4_pattern_allow([^HAVE_GNU_LD_TRUE$])
670+m4trace:configure.ac:1122: -1- m4_pattern_allow([^HAVE_GNU_LD_FALSE$])
671+m4trace:configure.ac:1122: -1- _AM_SUBST_NOTMAKE([HAVE_GNU_LD_TRUE])
672+m4trace:configure.ac:1122: -1- _AM_SUBST_NOTMAKE([HAVE_GNU_LD_FALSE])
673+m4trace:configure.ac:1123: -1- AM_CONDITIONAL([HAVE_GTKMM], [test "$have_x" = "yes" -a "$with_gtkmm" = "yes"])
674+m4trace:configure.ac:1123: -1- m4_pattern_allow([^HAVE_GTKMM_TRUE$])
675+m4trace:configure.ac:1123: -1- m4_pattern_allow([^HAVE_GTKMM_FALSE$])
676+m4trace:configure.ac:1123: -1- _AM_SUBST_NOTMAKE([HAVE_GTKMM_TRUE])
677+m4trace:configure.ac:1123: -1- _AM_SUBST_NOTMAKE([HAVE_GTKMM_FALSE])
678+m4trace:configure.ac:1124: -1- AM_CONDITIONAL([HAVE_PAM], [test "$with_pam" = "yes"])
679+m4trace:configure.ac:1124: -1- m4_pattern_allow([^HAVE_PAM_TRUE$])
680+m4trace:configure.ac:1124: -1- m4_pattern_allow([^HAVE_PAM_FALSE$])
681+m4trace:configure.ac:1124: -1- _AM_SUBST_NOTMAKE([HAVE_PAM_TRUE])
682+m4trace:configure.ac:1124: -1- _AM_SUBST_NOTMAKE([HAVE_PAM_FALSE])
683+m4trace:configure.ac:1125: -1- AM_CONDITIONAL([USE_SLASH_PROC], [test "os" = "linux" -a "$have_glib_2_14" = "yes"])
684+m4trace:configure.ac:1125: -1- m4_pattern_allow([^USE_SLASH_PROC_TRUE$])
685+m4trace:configure.ac:1125: -1- m4_pattern_allow([^USE_SLASH_PROC_FALSE$])
686+m4trace:configure.ac:1125: -1- _AM_SUBST_NOTMAKE([USE_SLASH_PROC_TRUE])
687+m4trace:configure.ac:1125: -1- _AM_SUBST_NOTMAKE([USE_SLASH_PROC_FALSE])
688+m4trace:configure.ac:1128: -1- m4_pattern_allow([^NO_XSM$])
689+m4trace:configure.ac:1132: -1- m4_pattern_allow([^NO_XCOMPOSITE$])
690+m4trace:configure.ac:1144: -1- m4_pattern_allow([^NO_MULTIMON$])
691+m4trace:configure.ac:1186: -1- m4_pattern_allow([^HGFS_LIBS$])
692+m4trace:configure.ac:1187: -1- m4_pattern_allow([^TOOLS_VERSION$])
693+m4trace:configure.ac:1188: -1- m4_pattern_allow([^TARGET_OS$])
694+m4trace:configure.ac:1189: -1- m4_pattern_allow([^KERNEL_RELEASE$])
695+m4trace:configure.ac:1190: -1- m4_pattern_allow([^LINUXINCLUDE$])
696+m4trace:configure.ac:1191: -1- m4_pattern_allow([^MODULES_OS$])
697+m4trace:configure.ac:1192: -1- m4_pattern_allow([^MODULES_DIR$])
698+m4trace:configure.ac:1193: -1- m4_pattern_allow([^MODULES$])
699+m4trace:configure.ac:1194: -1- m4_pattern_allow([^COMMON_XLIBS$])
700+m4trace:configure.ac:1195: -1- m4_pattern_allow([^XSM_LIBS$])
701+m4trace:configure.ac:1196: -1- m4_pattern_allow([^XCOMPOSITE_LIBS$])
702+m4trace:configure.ac:1197: -1- m4_pattern_allow([^PAM_PREFIX$])
703+m4trace:configure.ac:1198: -1- m4_pattern_allow([^PLUGIN_CPPFLAGS$])
704+m4trace:configure.ac:1199: -1- m4_pattern_allow([^PLUGIN_LDFLAGS$])
705+m4trace:configure.ac:1200: -1- m4_pattern_allow([^VMTOOLS_CPPFLAGS$])
706+m4trace:configure.ac:1201: -1- m4_pattern_allow([^VMTOOLS_LIBS$])
707+m4trace:configure.ac:1202: -1- m4_pattern_allow([^RPCGENFLAGS$])
708+m4trace:configure.ac:1203: -1- m4_pattern_allow([^XDR_LIBS$])
709+m4trace:configure.ac:1204: -1- m4_pattern_allow([^TEST_PLUGIN_INSTALLDIR$])
710+m4trace:configure.ac:1205: -1- m4_pattern_allow([^COMMON_PLUGIN_INSTALLDIR$])
711+m4trace:configure.ac:1206: -1- m4_pattern_allow([^VMSVC_PLUGIN_INSTALLDIR$])
712+m4trace:configure.ac:1207: -1- m4_pattern_allow([^VMUSR_PLUGIN_INSTALLDIR$])
713+m4trace:configure.ac:1212: -1- m4_pattern_allow([^SYSDIR$])
714+m4trace:configure.ac:1214: -1- m4_pattern_allow([^INSTVMSG$])
715+m4trace:configure.ac:1215: -1- m4_pattern_allow([^RPCGEN_WRAPPER$])
716+m4trace:configure.ac:1219: -1- m4_pattern_allow([^LIB_AUTH_CPPFLAGS$])
717+m4trace:configure.ac:1220: -1- m4_pattern_allow([^LIB_IMPERSONATE_CPPFLAGS$])
718+m4trace:configure.ac:1221: -1- m4_pattern_allow([^LIB_USER_CPPFLAGS$])
719+m4trace:configure.ac:1222: -1- m4_pattern_allow([^LIBVMTOOLS_LIBADD$])
720+m4trace:configure.ac:1226: -1- m4_pattern_allow([^VIX_LIBADD$])
721+m4trace:configure.ac:1319: -1- m4_pattern_allow([^LIB@&t@OBJS$])
722+m4trace:configure.ac:1319: -1- m4_pattern_allow([^LTLIBOBJS$])
723+m4trace:configure.ac:1319: -1- AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])
724+m4trace:configure.ac:1319: -1- m4_pattern_allow([^am__EXEEXT_TRUE$])
725+m4trace:configure.ac:1319: -1- m4_pattern_allow([^am__EXEEXT_FALSE$])
726+m4trace:configure.ac:1319: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_TRUE])
727+m4trace:configure.ac:1319: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_FALSE])
728+m4trace:configure.ac:1319: -1- _AM_OUTPUT_DEPENDENCY_COMMANDS
729+m4trace:configure.ac:1319: -1- _LT_PROG_LTMAIN
730
731=== modified file 'autom4te.cache/traces.1'
732--- autom4te.cache/traces.1 2011-07-22 16:41:03 +0000
733+++ autom4te.cache/traces.1 2011-10-31 00:22:23 +0000
734@@ -4,7 +4,7 @@
735 m4trace:aclocal.m4:990: -1- m4_include([m4/ltversion.m4])
736 m4trace:aclocal.m4:991: -1- m4_include([m4/lt~obsolete.m4])
737 m4trace:aclocal.m4:992: -1- m4_include([m4/vmtools.m4])
738-m4trace:configure.ac:43: -1- AC_INIT([open-vm-tools], [2011.07.19], [open-vm-tools-devel@lists.sourceforge.net])
739+m4trace:configure.ac:43: -1- AC_INIT([open-vm-tools], [2011.08.21], [open-vm-tools-devel@lists.sourceforge.net])
740 m4trace:configure.ac:43: -1- m4_pattern_forbid([^_?A[CHUM]_])
741 m4trace:configure.ac:43: -1- m4_pattern_forbid([_AC_])
742 m4trace:configure.ac:43: -1- m4_pattern_forbid([^LIBOBJS$], [do not use LIBOBJS directly, use AC_LIBOBJ (see section `AC_LIBOBJ vs LIBOBJS'])
743@@ -959,312 +959,315 @@
744 m4trace:configure.ac:950: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
745 You should run autoupdate.], [../../lib/autoconf/general.m4:2602: AC_TRY_COMPILE is expanded from...
746 configure.ac:950: the top level])
747-m4trace:configure.ac:968: -1- AC_SUBST([have_doxygen])
748-m4trace:configure.ac:968: -1- AC_SUBST_TRACE([have_doxygen])
749-m4trace:configure.ac:968: -1- m4_pattern_allow([^have_doxygen$])
750-m4trace:configure.ac:975: -1- AC_SUBST([DOT])
751-m4trace:configure.ac:975: -1- AC_SUBST_TRACE([DOT])
752-m4trace:configure.ac:975: -1- m4_pattern_allow([^DOT$])
753-m4trace:configure.ac:982: -1- AC_SUBST([DOT])
754-m4trace:configure.ac:982: -1- AC_SUBST_TRACE([DOT])
755-m4trace:configure.ac:982: -1- m4_pattern_allow([^DOT$])
756-m4trace:configure.ac:983: -1- AC_SUBST([HAVE_DOT])
757-m4trace:configure.ac:983: -1- AC_SUBST_TRACE([HAVE_DOT])
758-m4trace:configure.ac:983: -1- m4_pattern_allow([^HAVE_DOT$])
759-m4trace:configure.ac:985: -1- AC_SUBST([MSCGEN])
760-m4trace:configure.ac:985: -1- AC_SUBST_TRACE([MSCGEN])
761-m4trace:configure.ac:985: -1- m4_pattern_allow([^MSCGEN$])
762-m4trace:configure.ac:993: -1- AC_SUBST([MSCGEN_DIR])
763-m4trace:configure.ac:993: -1- AC_SUBST_TRACE([MSCGEN_DIR])
764-m4trace:configure.ac:993: -1- m4_pattern_allow([^MSCGEN_DIR$])
765-m4trace:configure.ac:1092: -1- AM_CONDITIONAL([BUILD_HGFSMOUNTER], [test "$buildHgfsmounter" = "yes"])
766-m4trace:configure.ac:1092: -1- AC_SUBST([BUILD_HGFSMOUNTER_TRUE])
767-m4trace:configure.ac:1092: -1- AC_SUBST_TRACE([BUILD_HGFSMOUNTER_TRUE])
768-m4trace:configure.ac:1092: -1- m4_pattern_allow([^BUILD_HGFSMOUNTER_TRUE$])
769-m4trace:configure.ac:1092: -1- AC_SUBST([BUILD_HGFSMOUNTER_FALSE])
770-m4trace:configure.ac:1092: -1- AC_SUBST_TRACE([BUILD_HGFSMOUNTER_FALSE])
771-m4trace:configure.ac:1092: -1- m4_pattern_allow([^BUILD_HGFSMOUNTER_FALSE$])
772-m4trace:configure.ac:1092: -1- _AM_SUBST_NOTMAKE([BUILD_HGFSMOUNTER_TRUE])
773-m4trace:configure.ac:1092: -1- _AM_SUBST_NOTMAKE([BUILD_HGFSMOUNTER_FALSE])
774-m4trace:configure.ac:1093: -1- AM_CONDITIONAL([LINUX], [test "$os" = "linux"])
775-m4trace:configure.ac:1093: -1- AC_SUBST([LINUX_TRUE])
776-m4trace:configure.ac:1093: -1- AC_SUBST_TRACE([LINUX_TRUE])
777-m4trace:configure.ac:1093: -1- m4_pattern_allow([^LINUX_TRUE$])
778-m4trace:configure.ac:1093: -1- AC_SUBST([LINUX_FALSE])
779-m4trace:configure.ac:1093: -1- AC_SUBST_TRACE([LINUX_FALSE])
780-m4trace:configure.ac:1093: -1- m4_pattern_allow([^LINUX_FALSE$])
781-m4trace:configure.ac:1093: -1- _AM_SUBST_NOTMAKE([LINUX_TRUE])
782-m4trace:configure.ac:1093: -1- _AM_SUBST_NOTMAKE([LINUX_FALSE])
783-m4trace:configure.ac:1094: -1- AM_CONDITIONAL([SOLARIS], [test "$os" = "solaris"])
784-m4trace:configure.ac:1094: -1- AC_SUBST([SOLARIS_TRUE])
785-m4trace:configure.ac:1094: -1- AC_SUBST_TRACE([SOLARIS_TRUE])
786-m4trace:configure.ac:1094: -1- m4_pattern_allow([^SOLARIS_TRUE$])
787-m4trace:configure.ac:1094: -1- AC_SUBST([SOLARIS_FALSE])
788-m4trace:configure.ac:1094: -1- AC_SUBST_TRACE([SOLARIS_FALSE])
789-m4trace:configure.ac:1094: -1- m4_pattern_allow([^SOLARIS_FALSE$])
790-m4trace:configure.ac:1094: -1- _AM_SUBST_NOTMAKE([SOLARIS_TRUE])
791-m4trace:configure.ac:1094: -1- _AM_SUBST_NOTMAKE([SOLARIS_FALSE])
792-m4trace:configure.ac:1095: -1- AM_CONDITIONAL([FREEBSD], [test "$os" = "freebsd"])
793-m4trace:configure.ac:1095: -1- AC_SUBST([FREEBSD_TRUE])
794-m4trace:configure.ac:1095: -1- AC_SUBST_TRACE([FREEBSD_TRUE])
795-m4trace:configure.ac:1095: -1- m4_pattern_allow([^FREEBSD_TRUE$])
796-m4trace:configure.ac:1095: -1- AC_SUBST([FREEBSD_FALSE])
797-m4trace:configure.ac:1095: -1- AC_SUBST_TRACE([FREEBSD_FALSE])
798-m4trace:configure.ac:1095: -1- m4_pattern_allow([^FREEBSD_FALSE$])
799-m4trace:configure.ac:1095: -1- _AM_SUBST_NOTMAKE([FREEBSD_TRUE])
800-m4trace:configure.ac:1095: -1- _AM_SUBST_NOTMAKE([FREEBSD_FALSE])
801-m4trace:configure.ac:1096: -1- AM_CONDITIONAL([FREEBSD_CUSTOM_SYSDIR], [test "$os" = "freebsd" -a -n "$SYSDIR"])
802-m4trace:configure.ac:1096: -1- AC_SUBST([FREEBSD_CUSTOM_SYSDIR_TRUE])
803-m4trace:configure.ac:1096: -1- AC_SUBST_TRACE([FREEBSD_CUSTOM_SYSDIR_TRUE])
804-m4trace:configure.ac:1096: -1- m4_pattern_allow([^FREEBSD_CUSTOM_SYSDIR_TRUE$])
805-m4trace:configure.ac:1096: -1- AC_SUBST([FREEBSD_CUSTOM_SYSDIR_FALSE])
806-m4trace:configure.ac:1096: -1- AC_SUBST_TRACE([FREEBSD_CUSTOM_SYSDIR_FALSE])
807-m4trace:configure.ac:1096: -1- m4_pattern_allow([^FREEBSD_CUSTOM_SYSDIR_FALSE$])
808-m4trace:configure.ac:1096: -1- _AM_SUBST_NOTMAKE([FREEBSD_CUSTOM_SYSDIR_TRUE])
809-m4trace:configure.ac:1096: -1- _AM_SUBST_NOTMAKE([FREEBSD_CUSTOM_SYSDIR_FALSE])
810-m4trace:configure.ac:1097: -1- AM_CONDITIONAL([THIRTY_TWO_BIT_USERSPACE], [test "$userSpaceBitness" = "32"])
811-m4trace:configure.ac:1097: -1- AC_SUBST([THIRTY_TWO_BIT_USERSPACE_TRUE])
812-m4trace:configure.ac:1097: -1- AC_SUBST_TRACE([THIRTY_TWO_BIT_USERSPACE_TRUE])
813-m4trace:configure.ac:1097: -1- m4_pattern_allow([^THIRTY_TWO_BIT_USERSPACE_TRUE$])
814-m4trace:configure.ac:1097: -1- AC_SUBST([THIRTY_TWO_BIT_USERSPACE_FALSE])
815-m4trace:configure.ac:1097: -1- AC_SUBST_TRACE([THIRTY_TWO_BIT_USERSPACE_FALSE])
816-m4trace:configure.ac:1097: -1- m4_pattern_allow([^THIRTY_TWO_BIT_USERSPACE_FALSE$])
817-m4trace:configure.ac:1097: -1- _AM_SUBST_NOTMAKE([THIRTY_TWO_BIT_USERSPACE_TRUE])
818-m4trace:configure.ac:1097: -1- _AM_SUBST_NOTMAKE([THIRTY_TWO_BIT_USERSPACE_FALSE])
819-m4trace:configure.ac:1098: -1- AM_CONDITIONAL([HAVE_X11], [test "$have_x" = "yes"])
820-m4trace:configure.ac:1098: -1- AC_SUBST([HAVE_X11_TRUE])
821-m4trace:configure.ac:1098: -1- AC_SUBST_TRACE([HAVE_X11_TRUE])
822-m4trace:configure.ac:1098: -1- m4_pattern_allow([^HAVE_X11_TRUE$])
823-m4trace:configure.ac:1098: -1- AC_SUBST([HAVE_X11_FALSE])
824-m4trace:configure.ac:1098: -1- AC_SUBST_TRACE([HAVE_X11_FALSE])
825-m4trace:configure.ac:1098: -1- m4_pattern_allow([^HAVE_X11_FALSE$])
826-m4trace:configure.ac:1098: -1- _AM_SUBST_NOTMAKE([HAVE_X11_TRUE])
827-m4trace:configure.ac:1098: -1- _AM_SUBST_NOTMAKE([HAVE_X11_FALSE])
828-m4trace:configure.ac:1099: -1- AM_CONDITIONAL([HAVE_ICU], [test "$with_icu" = "yes"])
829-m4trace:configure.ac:1099: -1- AC_SUBST([HAVE_ICU_TRUE])
830-m4trace:configure.ac:1099: -1- AC_SUBST_TRACE([HAVE_ICU_TRUE])
831-m4trace:configure.ac:1099: -1- m4_pattern_allow([^HAVE_ICU_TRUE$])
832-m4trace:configure.ac:1099: -1- AC_SUBST([HAVE_ICU_FALSE])
833-m4trace:configure.ac:1099: -1- AC_SUBST_TRACE([HAVE_ICU_FALSE])
834-m4trace:configure.ac:1099: -1- m4_pattern_allow([^HAVE_ICU_FALSE$])
835-m4trace:configure.ac:1099: -1- _AM_SUBST_NOTMAKE([HAVE_ICU_TRUE])
836-m4trace:configure.ac:1099: -1- _AM_SUBST_NOTMAKE([HAVE_ICU_FALSE])
837-m4trace:configure.ac:1100: -1- AM_CONDITIONAL([WITH_KERNEL_MODULES], [test "$with_kernel_modules" = "yes"])
838-m4trace:configure.ac:1100: -1- AC_SUBST([WITH_KERNEL_MODULES_TRUE])
839-m4trace:configure.ac:1100: -1- AC_SUBST_TRACE([WITH_KERNEL_MODULES_TRUE])
840-m4trace:configure.ac:1100: -1- m4_pattern_allow([^WITH_KERNEL_MODULES_TRUE$])
841-m4trace:configure.ac:1100: -1- AC_SUBST([WITH_KERNEL_MODULES_FALSE])
842-m4trace:configure.ac:1100: -1- AC_SUBST_TRACE([WITH_KERNEL_MODULES_FALSE])
843-m4trace:configure.ac:1100: -1- m4_pattern_allow([^WITH_KERNEL_MODULES_FALSE$])
844-m4trace:configure.ac:1100: -1- _AM_SUBST_NOTMAKE([WITH_KERNEL_MODULES_TRUE])
845-m4trace:configure.ac:1100: -1- _AM_SUBST_NOTMAKE([WITH_KERNEL_MODULES_FALSE])
846-m4trace:configure.ac:1101: -1- AM_CONDITIONAL([HAVE_XSM], [test "$have_xsm" = "yes"])
847-m4trace:configure.ac:1101: -1- AC_SUBST([HAVE_XSM_TRUE])
848-m4trace:configure.ac:1101: -1- AC_SUBST_TRACE([HAVE_XSM_TRUE])
849-m4trace:configure.ac:1101: -1- m4_pattern_allow([^HAVE_XSM_TRUE$])
850-m4trace:configure.ac:1101: -1- AC_SUBST([HAVE_XSM_FALSE])
851-m4trace:configure.ac:1101: -1- AC_SUBST_TRACE([HAVE_XSM_FALSE])
852-m4trace:configure.ac:1101: -1- m4_pattern_allow([^HAVE_XSM_FALSE$])
853-m4trace:configure.ac:1101: -1- _AM_SUBST_NOTMAKE([HAVE_XSM_TRUE])
854-m4trace:configure.ac:1101: -1- _AM_SUBST_NOTMAKE([HAVE_XSM_FALSE])
855-m4trace:configure.ac:1102: -1- AM_CONDITIONAL([HAVE_XCOMPOSITE], [test "$have_xcomposite" = "yes"])
856-m4trace:configure.ac:1102: -1- AC_SUBST([HAVE_XCOMPOSITE_TRUE])
857-m4trace:configure.ac:1102: -1- AC_SUBST_TRACE([HAVE_XCOMPOSITE_TRUE])
858-m4trace:configure.ac:1102: -1- m4_pattern_allow([^HAVE_XCOMPOSITE_TRUE$])
859-m4trace:configure.ac:1102: -1- AC_SUBST([HAVE_XCOMPOSITE_FALSE])
860-m4trace:configure.ac:1102: -1- AC_SUBST_TRACE([HAVE_XCOMPOSITE_FALSE])
861-m4trace:configure.ac:1102: -1- m4_pattern_allow([^HAVE_XCOMPOSITE_FALSE$])
862-m4trace:configure.ac:1102: -1- _AM_SUBST_NOTMAKE([HAVE_XCOMPOSITE_TRUE])
863-m4trace:configure.ac:1102: -1- _AM_SUBST_NOTMAKE([HAVE_XCOMPOSITE_FALSE])
864-m4trace:configure.ac:1103: -1- AM_CONDITIONAL([ENABLE_UNITY], [test "$enable_unity" = "yes"])
865-m4trace:configure.ac:1103: -1- AC_SUBST([ENABLE_UNITY_TRUE])
866-m4trace:configure.ac:1103: -1- AC_SUBST_TRACE([ENABLE_UNITY_TRUE])
867-m4trace:configure.ac:1103: -1- m4_pattern_allow([^ENABLE_UNITY_TRUE$])
868-m4trace:configure.ac:1103: -1- AC_SUBST([ENABLE_UNITY_FALSE])
869-m4trace:configure.ac:1103: -1- AC_SUBST_TRACE([ENABLE_UNITY_FALSE])
870-m4trace:configure.ac:1103: -1- m4_pattern_allow([^ENABLE_UNITY_FALSE$])
871-m4trace:configure.ac:1103: -1- _AM_SUBST_NOTMAKE([ENABLE_UNITY_TRUE])
872-m4trace:configure.ac:1103: -1- _AM_SUBST_NOTMAKE([ENABLE_UNITY_FALSE])
873-m4trace:configure.ac:1104: -1- AM_CONDITIONAL([ENABLE_TESTS], [test "$have_cunit" = "yes"])
874-m4trace:configure.ac:1104: -1- AC_SUBST([ENABLE_TESTS_TRUE])
875-m4trace:configure.ac:1104: -1- AC_SUBST_TRACE([ENABLE_TESTS_TRUE])
876-m4trace:configure.ac:1104: -1- m4_pattern_allow([^ENABLE_TESTS_TRUE$])
877-m4trace:configure.ac:1104: -1- AC_SUBST([ENABLE_TESTS_FALSE])
878-m4trace:configure.ac:1104: -1- AC_SUBST_TRACE([ENABLE_TESTS_FALSE])
879-m4trace:configure.ac:1104: -1- m4_pattern_allow([^ENABLE_TESTS_FALSE$])
880-m4trace:configure.ac:1104: -1- _AM_SUBST_NOTMAKE([ENABLE_TESTS_TRUE])
881-m4trace:configure.ac:1104: -1- _AM_SUBST_NOTMAKE([ENABLE_TESTS_FALSE])
882-m4trace:configure.ac:1105: -1- AM_CONDITIONAL([WITH_ROOT_PRIVILEGES], [test "$with_root_privileges" = "yes"])
883-m4trace:configure.ac:1105: -1- AC_SUBST([WITH_ROOT_PRIVILEGES_TRUE])
884-m4trace:configure.ac:1105: -1- AC_SUBST_TRACE([WITH_ROOT_PRIVILEGES_TRUE])
885-m4trace:configure.ac:1105: -1- m4_pattern_allow([^WITH_ROOT_PRIVILEGES_TRUE$])
886-m4trace:configure.ac:1105: -1- AC_SUBST([WITH_ROOT_PRIVILEGES_FALSE])
887-m4trace:configure.ac:1105: -1- AC_SUBST_TRACE([WITH_ROOT_PRIVILEGES_FALSE])
888-m4trace:configure.ac:1105: -1- m4_pattern_allow([^WITH_ROOT_PRIVILEGES_FALSE$])
889-m4trace:configure.ac:1105: -1- _AM_SUBST_NOTMAKE([WITH_ROOT_PRIVILEGES_TRUE])
890-m4trace:configure.ac:1105: -1- _AM_SUBST_NOTMAKE([WITH_ROOT_PRIVILEGES_FALSE])
891-m4trace:configure.ac:1106: -1- AM_CONDITIONAL([HAVE_DNET], [test "$have_dnet" = "yes"])
892-m4trace:configure.ac:1106: -1- AC_SUBST([HAVE_DNET_TRUE])
893-m4trace:configure.ac:1106: -1- AC_SUBST_TRACE([HAVE_DNET_TRUE])
894-m4trace:configure.ac:1106: -1- m4_pattern_allow([^HAVE_DNET_TRUE$])
895-m4trace:configure.ac:1106: -1- AC_SUBST([HAVE_DNET_FALSE])
896-m4trace:configure.ac:1106: -1- AC_SUBST_TRACE([HAVE_DNET_FALSE])
897-m4trace:configure.ac:1106: -1- m4_pattern_allow([^HAVE_DNET_FALSE$])
898-m4trace:configure.ac:1106: -1- _AM_SUBST_NOTMAKE([HAVE_DNET_TRUE])
899-m4trace:configure.ac:1106: -1- _AM_SUBST_NOTMAKE([HAVE_DNET_FALSE])
900-m4trace:configure.ac:1107: -1- AM_CONDITIONAL([HAVE_DOXYGEN], [test "$have_doxygen" = "yes"])
901-m4trace:configure.ac:1107: -1- AC_SUBST([HAVE_DOXYGEN_TRUE])
902-m4trace:configure.ac:1107: -1- AC_SUBST_TRACE([HAVE_DOXYGEN_TRUE])
903-m4trace:configure.ac:1107: -1- m4_pattern_allow([^HAVE_DOXYGEN_TRUE$])
904-m4trace:configure.ac:1107: -1- AC_SUBST([HAVE_DOXYGEN_FALSE])
905-m4trace:configure.ac:1107: -1- AC_SUBST_TRACE([HAVE_DOXYGEN_FALSE])
906-m4trace:configure.ac:1107: -1- m4_pattern_allow([^HAVE_DOXYGEN_FALSE$])
907-m4trace:configure.ac:1107: -1- _AM_SUBST_NOTMAKE([HAVE_DOXYGEN_TRUE])
908-m4trace:configure.ac:1107: -1- _AM_SUBST_NOTMAKE([HAVE_DOXYGEN_FALSE])
909-m4trace:configure.ac:1108: -1- AM_CONDITIONAL([HAVE_FUSE], [test "$have_fuse" = "yes"])
910-m4trace:configure.ac:1108: -1- AC_SUBST([HAVE_FUSE_TRUE])
911-m4trace:configure.ac:1108: -1- AC_SUBST_TRACE([HAVE_FUSE_TRUE])
912-m4trace:configure.ac:1108: -1- m4_pattern_allow([^HAVE_FUSE_TRUE$])
913-m4trace:configure.ac:1108: -1- AC_SUBST([HAVE_FUSE_FALSE])
914-m4trace:configure.ac:1108: -1- AC_SUBST_TRACE([HAVE_FUSE_FALSE])
915-m4trace:configure.ac:1108: -1- m4_pattern_allow([^HAVE_FUSE_FALSE$])
916-m4trace:configure.ac:1108: -1- _AM_SUBST_NOTMAKE([HAVE_FUSE_TRUE])
917-m4trace:configure.ac:1108: -1- _AM_SUBST_NOTMAKE([HAVE_FUSE_FALSE])
918-m4trace:configure.ac:1109: -1- AM_CONDITIONAL([HAVE_GNU_LD], [test "$with_gnu_ld" = "yes"])
919-m4trace:configure.ac:1109: -1- AC_SUBST([HAVE_GNU_LD_TRUE])
920-m4trace:configure.ac:1109: -1- AC_SUBST_TRACE([HAVE_GNU_LD_TRUE])
921-m4trace:configure.ac:1109: -1- m4_pattern_allow([^HAVE_GNU_LD_TRUE$])
922-m4trace:configure.ac:1109: -1- AC_SUBST([HAVE_GNU_LD_FALSE])
923-m4trace:configure.ac:1109: -1- AC_SUBST_TRACE([HAVE_GNU_LD_FALSE])
924-m4trace:configure.ac:1109: -1- m4_pattern_allow([^HAVE_GNU_LD_FALSE$])
925-m4trace:configure.ac:1109: -1- _AM_SUBST_NOTMAKE([HAVE_GNU_LD_TRUE])
926-m4trace:configure.ac:1109: -1- _AM_SUBST_NOTMAKE([HAVE_GNU_LD_FALSE])
927-m4trace:configure.ac:1110: -1- AM_CONDITIONAL([HAVE_GTKMM], [test "$have_x" = "yes" -a "$with_gtkmm" = "yes"])
928-m4trace:configure.ac:1110: -1- AC_SUBST([HAVE_GTKMM_TRUE])
929-m4trace:configure.ac:1110: -1- AC_SUBST_TRACE([HAVE_GTKMM_TRUE])
930-m4trace:configure.ac:1110: -1- m4_pattern_allow([^HAVE_GTKMM_TRUE$])
931-m4trace:configure.ac:1110: -1- AC_SUBST([HAVE_GTKMM_FALSE])
932-m4trace:configure.ac:1110: -1- AC_SUBST_TRACE([HAVE_GTKMM_FALSE])
933-m4trace:configure.ac:1110: -1- m4_pattern_allow([^HAVE_GTKMM_FALSE$])
934-m4trace:configure.ac:1110: -1- _AM_SUBST_NOTMAKE([HAVE_GTKMM_TRUE])
935-m4trace:configure.ac:1110: -1- _AM_SUBST_NOTMAKE([HAVE_GTKMM_FALSE])
936-m4trace:configure.ac:1111: -1- AM_CONDITIONAL([HAVE_PAM], [test "$with_pam" = "yes"])
937-m4trace:configure.ac:1111: -1- AC_SUBST([HAVE_PAM_TRUE])
938-m4trace:configure.ac:1111: -1- AC_SUBST_TRACE([HAVE_PAM_TRUE])
939-m4trace:configure.ac:1111: -1- m4_pattern_allow([^HAVE_PAM_TRUE$])
940-m4trace:configure.ac:1111: -1- AC_SUBST([HAVE_PAM_FALSE])
941-m4trace:configure.ac:1111: -1- AC_SUBST_TRACE([HAVE_PAM_FALSE])
942-m4trace:configure.ac:1111: -1- m4_pattern_allow([^HAVE_PAM_FALSE$])
943-m4trace:configure.ac:1111: -1- _AM_SUBST_NOTMAKE([HAVE_PAM_TRUE])
944-m4trace:configure.ac:1111: -1- _AM_SUBST_NOTMAKE([HAVE_PAM_FALSE])
945-m4trace:configure.ac:1112: -1- AM_CONDITIONAL([USE_SLASH_PROC], [test "os" = "linux" -a "$have_glib_2_14" = "yes"])
946-m4trace:configure.ac:1112: -1- AC_SUBST([USE_SLASH_PROC_TRUE])
947-m4trace:configure.ac:1112: -1- AC_SUBST_TRACE([USE_SLASH_PROC_TRUE])
948-m4trace:configure.ac:1112: -1- m4_pattern_allow([^USE_SLASH_PROC_TRUE$])
949-m4trace:configure.ac:1112: -1- AC_SUBST([USE_SLASH_PROC_FALSE])
950-m4trace:configure.ac:1112: -1- AC_SUBST_TRACE([USE_SLASH_PROC_FALSE])
951-m4trace:configure.ac:1112: -1- m4_pattern_allow([^USE_SLASH_PROC_FALSE$])
952-m4trace:configure.ac:1112: -1- _AM_SUBST_NOTMAKE([USE_SLASH_PROC_TRUE])
953-m4trace:configure.ac:1112: -1- _AM_SUBST_NOTMAKE([USE_SLASH_PROC_FALSE])
954-m4trace:configure.ac:1115: -1- AC_DEFINE_TRACE_LITERAL([NO_XSM])
955-m4trace:configure.ac:1115: -1- m4_pattern_allow([^NO_XSM$])
956-m4trace:configure.ac:1119: -1- AC_DEFINE_TRACE_LITERAL([NO_XCOMPOSITE])
957-m4trace:configure.ac:1119: -1- m4_pattern_allow([^NO_XCOMPOSITE$])
958-m4trace:configure.ac:1131: -1- AC_DEFINE_TRACE_LITERAL([NO_MULTIMON])
959-m4trace:configure.ac:1131: -1- m4_pattern_allow([^NO_MULTIMON$])
960-m4trace:configure.ac:1131: -1- AH_OUTPUT([NO_MULTIMON], [/* Define to 1 if building without multimon support. */
961+m4trace:configure.ac:961: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
962+You should run autoupdate.], [../../lib/autoconf/general.m4:2602: AC_TRY_COMPILE is expanded from...
963+configure.ac:961: the top level])
964+m4trace:configure.ac:980: -1- AC_SUBST([have_doxygen])
965+m4trace:configure.ac:980: -1- AC_SUBST_TRACE([have_doxygen])
966+m4trace:configure.ac:980: -1- m4_pattern_allow([^have_doxygen$])
967+m4trace:configure.ac:987: -1- AC_SUBST([DOT])
968+m4trace:configure.ac:987: -1- AC_SUBST_TRACE([DOT])
969+m4trace:configure.ac:987: -1- m4_pattern_allow([^DOT$])
970+m4trace:configure.ac:994: -1- AC_SUBST([DOT])
971+m4trace:configure.ac:994: -1- AC_SUBST_TRACE([DOT])
972+m4trace:configure.ac:994: -1- m4_pattern_allow([^DOT$])
973+m4trace:configure.ac:995: -1- AC_SUBST([HAVE_DOT])
974+m4trace:configure.ac:995: -1- AC_SUBST_TRACE([HAVE_DOT])
975+m4trace:configure.ac:995: -1- m4_pattern_allow([^HAVE_DOT$])
976+m4trace:configure.ac:997: -1- AC_SUBST([MSCGEN])
977+m4trace:configure.ac:997: -1- AC_SUBST_TRACE([MSCGEN])
978+m4trace:configure.ac:997: -1- m4_pattern_allow([^MSCGEN$])
979+m4trace:configure.ac:1005: -1- AC_SUBST([MSCGEN_DIR])
980+m4trace:configure.ac:1005: -1- AC_SUBST_TRACE([MSCGEN_DIR])
981+m4trace:configure.ac:1005: -1- m4_pattern_allow([^MSCGEN_DIR$])
982+m4trace:configure.ac:1105: -1- AM_CONDITIONAL([BUILD_HGFSMOUNTER], [test "$buildHgfsmounter" = "yes"])
983+m4trace:configure.ac:1105: -1- AC_SUBST([BUILD_HGFSMOUNTER_TRUE])
984+m4trace:configure.ac:1105: -1- AC_SUBST_TRACE([BUILD_HGFSMOUNTER_TRUE])
985+m4trace:configure.ac:1105: -1- m4_pattern_allow([^BUILD_HGFSMOUNTER_TRUE$])
986+m4trace:configure.ac:1105: -1- AC_SUBST([BUILD_HGFSMOUNTER_FALSE])
987+m4trace:configure.ac:1105: -1- AC_SUBST_TRACE([BUILD_HGFSMOUNTER_FALSE])
988+m4trace:configure.ac:1105: -1- m4_pattern_allow([^BUILD_HGFSMOUNTER_FALSE$])
989+m4trace:configure.ac:1105: -1- _AM_SUBST_NOTMAKE([BUILD_HGFSMOUNTER_TRUE])
990+m4trace:configure.ac:1105: -1- _AM_SUBST_NOTMAKE([BUILD_HGFSMOUNTER_FALSE])
991+m4trace:configure.ac:1106: -1- AM_CONDITIONAL([LINUX], [test "$os" = "linux"])
992+m4trace:configure.ac:1106: -1- AC_SUBST([LINUX_TRUE])
993+m4trace:configure.ac:1106: -1- AC_SUBST_TRACE([LINUX_TRUE])
994+m4trace:configure.ac:1106: -1- m4_pattern_allow([^LINUX_TRUE$])
995+m4trace:configure.ac:1106: -1- AC_SUBST([LINUX_FALSE])
996+m4trace:configure.ac:1106: -1- AC_SUBST_TRACE([LINUX_FALSE])
997+m4trace:configure.ac:1106: -1- m4_pattern_allow([^LINUX_FALSE$])
998+m4trace:configure.ac:1106: -1- _AM_SUBST_NOTMAKE([LINUX_TRUE])
999+m4trace:configure.ac:1106: -1- _AM_SUBST_NOTMAKE([LINUX_FALSE])
1000+m4trace:configure.ac:1107: -1- AM_CONDITIONAL([SOLARIS], [test "$os" = "solaris"])
1001+m4trace:configure.ac:1107: -1- AC_SUBST([SOLARIS_TRUE])
1002+m4trace:configure.ac:1107: -1- AC_SUBST_TRACE([SOLARIS_TRUE])
1003+m4trace:configure.ac:1107: -1- m4_pattern_allow([^SOLARIS_TRUE$])
1004+m4trace:configure.ac:1107: -1- AC_SUBST([SOLARIS_FALSE])
1005+m4trace:configure.ac:1107: -1- AC_SUBST_TRACE([SOLARIS_FALSE])
1006+m4trace:configure.ac:1107: -1- m4_pattern_allow([^SOLARIS_FALSE$])
1007+m4trace:configure.ac:1107: -1- _AM_SUBST_NOTMAKE([SOLARIS_TRUE])
1008+m4trace:configure.ac:1107: -1- _AM_SUBST_NOTMAKE([SOLARIS_FALSE])
1009+m4trace:configure.ac:1108: -1- AM_CONDITIONAL([FREEBSD], [test "$os" = "freebsd"])
1010+m4trace:configure.ac:1108: -1- AC_SUBST([FREEBSD_TRUE])
1011+m4trace:configure.ac:1108: -1- AC_SUBST_TRACE([FREEBSD_TRUE])
1012+m4trace:configure.ac:1108: -1- m4_pattern_allow([^FREEBSD_TRUE$])
1013+m4trace:configure.ac:1108: -1- AC_SUBST([FREEBSD_FALSE])
1014+m4trace:configure.ac:1108: -1- AC_SUBST_TRACE([FREEBSD_FALSE])
1015+m4trace:configure.ac:1108: -1- m4_pattern_allow([^FREEBSD_FALSE$])
1016+m4trace:configure.ac:1108: -1- _AM_SUBST_NOTMAKE([FREEBSD_TRUE])
1017+m4trace:configure.ac:1108: -1- _AM_SUBST_NOTMAKE([FREEBSD_FALSE])
1018+m4trace:configure.ac:1109: -1- AM_CONDITIONAL([FREEBSD_CUSTOM_SYSDIR], [test "$os" = "freebsd" -a -n "$SYSDIR"])
1019+m4trace:configure.ac:1109: -1- AC_SUBST([FREEBSD_CUSTOM_SYSDIR_TRUE])
1020+m4trace:configure.ac:1109: -1- AC_SUBST_TRACE([FREEBSD_CUSTOM_SYSDIR_TRUE])
1021+m4trace:configure.ac:1109: -1- m4_pattern_allow([^FREEBSD_CUSTOM_SYSDIR_TRUE$])
1022+m4trace:configure.ac:1109: -1- AC_SUBST([FREEBSD_CUSTOM_SYSDIR_FALSE])
1023+m4trace:configure.ac:1109: -1- AC_SUBST_TRACE([FREEBSD_CUSTOM_SYSDIR_FALSE])
1024+m4trace:configure.ac:1109: -1- m4_pattern_allow([^FREEBSD_CUSTOM_SYSDIR_FALSE$])
1025+m4trace:configure.ac:1109: -1- _AM_SUBST_NOTMAKE([FREEBSD_CUSTOM_SYSDIR_TRUE])
1026+m4trace:configure.ac:1109: -1- _AM_SUBST_NOTMAKE([FREEBSD_CUSTOM_SYSDIR_FALSE])
1027+m4trace:configure.ac:1110: -1- AM_CONDITIONAL([THIRTY_TWO_BIT_USERSPACE], [test "$userSpaceBitness" = "32"])
1028+m4trace:configure.ac:1110: -1- AC_SUBST([THIRTY_TWO_BIT_USERSPACE_TRUE])
1029+m4trace:configure.ac:1110: -1- AC_SUBST_TRACE([THIRTY_TWO_BIT_USERSPACE_TRUE])
1030+m4trace:configure.ac:1110: -1- m4_pattern_allow([^THIRTY_TWO_BIT_USERSPACE_TRUE$])
1031+m4trace:configure.ac:1110: -1- AC_SUBST([THIRTY_TWO_BIT_USERSPACE_FALSE])
1032+m4trace:configure.ac:1110: -1- AC_SUBST_TRACE([THIRTY_TWO_BIT_USERSPACE_FALSE])
1033+m4trace:configure.ac:1110: -1- m4_pattern_allow([^THIRTY_TWO_BIT_USERSPACE_FALSE$])
1034+m4trace:configure.ac:1110: -1- _AM_SUBST_NOTMAKE([THIRTY_TWO_BIT_USERSPACE_TRUE])
1035+m4trace:configure.ac:1110: -1- _AM_SUBST_NOTMAKE([THIRTY_TWO_BIT_USERSPACE_FALSE])
1036+m4trace:configure.ac:1111: -1- AM_CONDITIONAL([HAVE_X11], [test "$have_x" = "yes"])
1037+m4trace:configure.ac:1111: -1- AC_SUBST([HAVE_X11_TRUE])
1038+m4trace:configure.ac:1111: -1- AC_SUBST_TRACE([HAVE_X11_TRUE])
1039+m4trace:configure.ac:1111: -1- m4_pattern_allow([^HAVE_X11_TRUE$])
1040+m4trace:configure.ac:1111: -1- AC_SUBST([HAVE_X11_FALSE])
1041+m4trace:configure.ac:1111: -1- AC_SUBST_TRACE([HAVE_X11_FALSE])
1042+m4trace:configure.ac:1111: -1- m4_pattern_allow([^HAVE_X11_FALSE$])
1043+m4trace:configure.ac:1111: -1- _AM_SUBST_NOTMAKE([HAVE_X11_TRUE])
1044+m4trace:configure.ac:1111: -1- _AM_SUBST_NOTMAKE([HAVE_X11_FALSE])
1045+m4trace:configure.ac:1112: -1- AM_CONDITIONAL([HAVE_ICU], [test "$with_icu" = "yes"])
1046+m4trace:configure.ac:1112: -1- AC_SUBST([HAVE_ICU_TRUE])
1047+m4trace:configure.ac:1112: -1- AC_SUBST_TRACE([HAVE_ICU_TRUE])
1048+m4trace:configure.ac:1112: -1- m4_pattern_allow([^HAVE_ICU_TRUE$])
1049+m4trace:configure.ac:1112: -1- AC_SUBST([HAVE_ICU_FALSE])
1050+m4trace:configure.ac:1112: -1- AC_SUBST_TRACE([HAVE_ICU_FALSE])
1051+m4trace:configure.ac:1112: -1- m4_pattern_allow([^HAVE_ICU_FALSE$])
1052+m4trace:configure.ac:1112: -1- _AM_SUBST_NOTMAKE([HAVE_ICU_TRUE])
1053+m4trace:configure.ac:1112: -1- _AM_SUBST_NOTMAKE([HAVE_ICU_FALSE])
1054+m4trace:configure.ac:1113: -1- AM_CONDITIONAL([WITH_KERNEL_MODULES], [test "$with_kernel_modules" = "yes"])
1055+m4trace:configure.ac:1113: -1- AC_SUBST([WITH_KERNEL_MODULES_TRUE])
1056+m4trace:configure.ac:1113: -1- AC_SUBST_TRACE([WITH_KERNEL_MODULES_TRUE])
1057+m4trace:configure.ac:1113: -1- m4_pattern_allow([^WITH_KERNEL_MODULES_TRUE$])
1058+m4trace:configure.ac:1113: -1- AC_SUBST([WITH_KERNEL_MODULES_FALSE])
1059+m4trace:configure.ac:1113: -1- AC_SUBST_TRACE([WITH_KERNEL_MODULES_FALSE])
1060+m4trace:configure.ac:1113: -1- m4_pattern_allow([^WITH_KERNEL_MODULES_FALSE$])
1061+m4trace:configure.ac:1113: -1- _AM_SUBST_NOTMAKE([WITH_KERNEL_MODULES_TRUE])
1062+m4trace:configure.ac:1113: -1- _AM_SUBST_NOTMAKE([WITH_KERNEL_MODULES_FALSE])
1063+m4trace:configure.ac:1114: -1- AM_CONDITIONAL([HAVE_XSM], [test "$have_xsm" = "yes"])
1064+m4trace:configure.ac:1114: -1- AC_SUBST([HAVE_XSM_TRUE])
1065+m4trace:configure.ac:1114: -1- AC_SUBST_TRACE([HAVE_XSM_TRUE])
1066+m4trace:configure.ac:1114: -1- m4_pattern_allow([^HAVE_XSM_TRUE$])
1067+m4trace:configure.ac:1114: -1- AC_SUBST([HAVE_XSM_FALSE])
1068+m4trace:configure.ac:1114: -1- AC_SUBST_TRACE([HAVE_XSM_FALSE])
1069+m4trace:configure.ac:1114: -1- m4_pattern_allow([^HAVE_XSM_FALSE$])
1070+m4trace:configure.ac:1114: -1- _AM_SUBST_NOTMAKE([HAVE_XSM_TRUE])
1071+m4trace:configure.ac:1114: -1- _AM_SUBST_NOTMAKE([HAVE_XSM_FALSE])
1072+m4trace:configure.ac:1115: -1- AM_CONDITIONAL([HAVE_XCOMPOSITE], [test "$have_xcomposite" = "yes"])
1073+m4trace:configure.ac:1115: -1- AC_SUBST([HAVE_XCOMPOSITE_TRUE])
1074+m4trace:configure.ac:1115: -1- AC_SUBST_TRACE([HAVE_XCOMPOSITE_TRUE])
1075+m4trace:configure.ac:1115: -1- m4_pattern_allow([^HAVE_XCOMPOSITE_TRUE$])
1076+m4trace:configure.ac:1115: -1- AC_SUBST([HAVE_XCOMPOSITE_FALSE])
1077+m4trace:configure.ac:1115: -1- AC_SUBST_TRACE([HAVE_XCOMPOSITE_FALSE])
1078+m4trace:configure.ac:1115: -1- m4_pattern_allow([^HAVE_XCOMPOSITE_FALSE$])
1079+m4trace:configure.ac:1115: -1- _AM_SUBST_NOTMAKE([HAVE_XCOMPOSITE_TRUE])
1080+m4trace:configure.ac:1115: -1- _AM_SUBST_NOTMAKE([HAVE_XCOMPOSITE_FALSE])
1081+m4trace:configure.ac:1116: -1- AM_CONDITIONAL([ENABLE_UNITY], [test "$enable_unity" = "yes"])
1082+m4trace:configure.ac:1116: -1- AC_SUBST([ENABLE_UNITY_TRUE])
1083+m4trace:configure.ac:1116: -1- AC_SUBST_TRACE([ENABLE_UNITY_TRUE])
1084+m4trace:configure.ac:1116: -1- m4_pattern_allow([^ENABLE_UNITY_TRUE$])
1085+m4trace:configure.ac:1116: -1- AC_SUBST([ENABLE_UNITY_FALSE])
1086+m4trace:configure.ac:1116: -1- AC_SUBST_TRACE([ENABLE_UNITY_FALSE])
1087+m4trace:configure.ac:1116: -1- m4_pattern_allow([^ENABLE_UNITY_FALSE$])
1088+m4trace:configure.ac:1116: -1- _AM_SUBST_NOTMAKE([ENABLE_UNITY_TRUE])
1089+m4trace:configure.ac:1116: -1- _AM_SUBST_NOTMAKE([ENABLE_UNITY_FALSE])
1090+m4trace:configure.ac:1117: -1- AM_CONDITIONAL([ENABLE_TESTS], [test "$have_cunit" = "yes"])
1091+m4trace:configure.ac:1117: -1- AC_SUBST([ENABLE_TESTS_TRUE])
1092+m4trace:configure.ac:1117: -1- AC_SUBST_TRACE([ENABLE_TESTS_TRUE])
1093+m4trace:configure.ac:1117: -1- m4_pattern_allow([^ENABLE_TESTS_TRUE$])
1094+m4trace:configure.ac:1117: -1- AC_SUBST([ENABLE_TESTS_FALSE])
1095+m4trace:configure.ac:1117: -1- AC_SUBST_TRACE([ENABLE_TESTS_FALSE])
1096+m4trace:configure.ac:1117: -1- m4_pattern_allow([^ENABLE_TESTS_FALSE$])
1097+m4trace:configure.ac:1117: -1- _AM_SUBST_NOTMAKE([ENABLE_TESTS_TRUE])
1098+m4trace:configure.ac:1117: -1- _AM_SUBST_NOTMAKE([ENABLE_TESTS_FALSE])
1099+m4trace:configure.ac:1118: -1- AM_CONDITIONAL([WITH_ROOT_PRIVILEGES], [test "$with_root_privileges" = "yes"])
1100+m4trace:configure.ac:1118: -1- AC_SUBST([WITH_ROOT_PRIVILEGES_TRUE])
1101+m4trace:configure.ac:1118: -1- AC_SUBST_TRACE([WITH_ROOT_PRIVILEGES_TRUE])
1102+m4trace:configure.ac:1118: -1- m4_pattern_allow([^WITH_ROOT_PRIVILEGES_TRUE$])
1103+m4trace:configure.ac:1118: -1- AC_SUBST([WITH_ROOT_PRIVILEGES_FALSE])
1104+m4trace:configure.ac:1118: -1- AC_SUBST_TRACE([WITH_ROOT_PRIVILEGES_FALSE])
1105+m4trace:configure.ac:1118: -1- m4_pattern_allow([^WITH_ROOT_PRIVILEGES_FALSE$])
1106+m4trace:configure.ac:1118: -1- _AM_SUBST_NOTMAKE([WITH_ROOT_PRIVILEGES_TRUE])
1107+m4trace:configure.ac:1118: -1- _AM_SUBST_NOTMAKE([WITH_ROOT_PRIVILEGES_FALSE])
1108+m4trace:configure.ac:1119: -1- AM_CONDITIONAL([HAVE_DNET], [test "$have_dnet" = "yes"])
1109+m4trace:configure.ac:1119: -1- AC_SUBST([HAVE_DNET_TRUE])
1110+m4trace:configure.ac:1119: -1- AC_SUBST_TRACE([HAVE_DNET_TRUE])
1111+m4trace:configure.ac:1119: -1- m4_pattern_allow([^HAVE_DNET_TRUE$])
1112+m4trace:configure.ac:1119: -1- AC_SUBST([HAVE_DNET_FALSE])
1113+m4trace:configure.ac:1119: -1- AC_SUBST_TRACE([HAVE_DNET_FALSE])
1114+m4trace:configure.ac:1119: -1- m4_pattern_allow([^HAVE_DNET_FALSE$])
1115+m4trace:configure.ac:1119: -1- _AM_SUBST_NOTMAKE([HAVE_DNET_TRUE])
1116+m4trace:configure.ac:1119: -1- _AM_SUBST_NOTMAKE([HAVE_DNET_FALSE])
1117+m4trace:configure.ac:1120: -1- AM_CONDITIONAL([HAVE_DOXYGEN], [test "$have_doxygen" = "yes"])
1118+m4trace:configure.ac:1120: -1- AC_SUBST([HAVE_DOXYGEN_TRUE])
1119+m4trace:configure.ac:1120: -1- AC_SUBST_TRACE([HAVE_DOXYGEN_TRUE])
1120+m4trace:configure.ac:1120: -1- m4_pattern_allow([^HAVE_DOXYGEN_TRUE$])
1121+m4trace:configure.ac:1120: -1- AC_SUBST([HAVE_DOXYGEN_FALSE])
1122+m4trace:configure.ac:1120: -1- AC_SUBST_TRACE([HAVE_DOXYGEN_FALSE])
1123+m4trace:configure.ac:1120: -1- m4_pattern_allow([^HAVE_DOXYGEN_FALSE$])
1124+m4trace:configure.ac:1120: -1- _AM_SUBST_NOTMAKE([HAVE_DOXYGEN_TRUE])
1125+m4trace:configure.ac:1120: -1- _AM_SUBST_NOTMAKE([HAVE_DOXYGEN_FALSE])
1126+m4trace:configure.ac:1121: -1- AM_CONDITIONAL([HAVE_FUSE], [test "$have_fuse" = "yes"])
1127+m4trace:configure.ac:1121: -1- AC_SUBST([HAVE_FUSE_TRUE])
1128+m4trace:configure.ac:1121: -1- AC_SUBST_TRACE([HAVE_FUSE_TRUE])
1129+m4trace:configure.ac:1121: -1- m4_pattern_allow([^HAVE_FUSE_TRUE$])
1130+m4trace:configure.ac:1121: -1- AC_SUBST([HAVE_FUSE_FALSE])
1131+m4trace:configure.ac:1121: -1- AC_SUBST_TRACE([HAVE_FUSE_FALSE])
1132+m4trace:configure.ac:1121: -1- m4_pattern_allow([^HAVE_FUSE_FALSE$])
1133+m4trace:configure.ac:1121: -1- _AM_SUBST_NOTMAKE([HAVE_FUSE_TRUE])
1134+m4trace:configure.ac:1121: -1- _AM_SUBST_NOTMAKE([HAVE_FUSE_FALSE])
1135+m4trace:configure.ac:1122: -1- AM_CONDITIONAL([HAVE_GNU_LD], [test "$with_gnu_ld" = "yes"])
1136+m4trace:configure.ac:1122: -1- AC_SUBST([HAVE_GNU_LD_TRUE])
1137+m4trace:configure.ac:1122: -1- AC_SUBST_TRACE([HAVE_GNU_LD_TRUE])
1138+m4trace:configure.ac:1122: -1- m4_pattern_allow([^HAVE_GNU_LD_TRUE$])
1139+m4trace:configure.ac:1122: -1- AC_SUBST([HAVE_GNU_LD_FALSE])
1140+m4trace:configure.ac:1122: -1- AC_SUBST_TRACE([HAVE_GNU_LD_FALSE])
1141+m4trace:configure.ac:1122: -1- m4_pattern_allow([^HAVE_GNU_LD_FALSE$])
1142+m4trace:configure.ac:1122: -1- _AM_SUBST_NOTMAKE([HAVE_GNU_LD_TRUE])
1143+m4trace:configure.ac:1122: -1- _AM_SUBST_NOTMAKE([HAVE_GNU_LD_FALSE])
1144+m4trace:configure.ac:1123: -1- AM_CONDITIONAL([HAVE_GTKMM], [test "$have_x" = "yes" -a "$with_gtkmm" = "yes"])
1145+m4trace:configure.ac:1123: -1- AC_SUBST([HAVE_GTKMM_TRUE])
1146+m4trace:configure.ac:1123: -1- AC_SUBST_TRACE([HAVE_GTKMM_TRUE])
1147+m4trace:configure.ac:1123: -1- m4_pattern_allow([^HAVE_GTKMM_TRUE$])
1148+m4trace:configure.ac:1123: -1- AC_SUBST([HAVE_GTKMM_FALSE])
1149+m4trace:configure.ac:1123: -1- AC_SUBST_TRACE([HAVE_GTKMM_FALSE])
1150+m4trace:configure.ac:1123: -1- m4_pattern_allow([^HAVE_GTKMM_FALSE$])
1151+m4trace:configure.ac:1123: -1- _AM_SUBST_NOTMAKE([HAVE_GTKMM_TRUE])
1152+m4trace:configure.ac:1123: -1- _AM_SUBST_NOTMAKE([HAVE_GTKMM_FALSE])
1153+m4trace:configure.ac:1124: -1- AM_CONDITIONAL([HAVE_PAM], [test "$with_pam" = "yes"])
1154+m4trace:configure.ac:1124: -1- AC_SUBST([HAVE_PAM_TRUE])
1155+m4trace:configure.ac:1124: -1- AC_SUBST_TRACE([HAVE_PAM_TRUE])
1156+m4trace:configure.ac:1124: -1- m4_pattern_allow([^HAVE_PAM_TRUE$])
1157+m4trace:configure.ac:1124: -1- AC_SUBST([HAVE_PAM_FALSE])
1158+m4trace:configure.ac:1124: -1- AC_SUBST_TRACE([HAVE_PAM_FALSE])
1159+m4trace:configure.ac:1124: -1- m4_pattern_allow([^HAVE_PAM_FALSE$])
1160+m4trace:configure.ac:1124: -1- _AM_SUBST_NOTMAKE([HAVE_PAM_TRUE])
1161+m4trace:configure.ac:1124: -1- _AM_SUBST_NOTMAKE([HAVE_PAM_FALSE])
1162+m4trace:configure.ac:1125: -1- AM_CONDITIONAL([USE_SLASH_PROC], [test "os" = "linux" -a "$have_glib_2_14" = "yes"])
1163+m4trace:configure.ac:1125: -1- AC_SUBST([USE_SLASH_PROC_TRUE])
1164+m4trace:configure.ac:1125: -1- AC_SUBST_TRACE([USE_SLASH_PROC_TRUE])
1165+m4trace:configure.ac:1125: -1- m4_pattern_allow([^USE_SLASH_PROC_TRUE$])
1166+m4trace:configure.ac:1125: -1- AC_SUBST([USE_SLASH_PROC_FALSE])
1167+m4trace:configure.ac:1125: -1- AC_SUBST_TRACE([USE_SLASH_PROC_FALSE])
1168+m4trace:configure.ac:1125: -1- m4_pattern_allow([^USE_SLASH_PROC_FALSE$])
1169+m4trace:configure.ac:1125: -1- _AM_SUBST_NOTMAKE([USE_SLASH_PROC_TRUE])
1170+m4trace:configure.ac:1125: -1- _AM_SUBST_NOTMAKE([USE_SLASH_PROC_FALSE])
1171+m4trace:configure.ac:1128: -1- AC_DEFINE_TRACE_LITERAL([NO_XSM])
1172+m4trace:configure.ac:1128: -1- m4_pattern_allow([^NO_XSM$])
1173+m4trace:configure.ac:1132: -1- AC_DEFINE_TRACE_LITERAL([NO_XCOMPOSITE])
1174+m4trace:configure.ac:1132: -1- m4_pattern_allow([^NO_XCOMPOSITE$])
1175+m4trace:configure.ac:1144: -1- AC_DEFINE_TRACE_LITERAL([NO_MULTIMON])
1176+m4trace:configure.ac:1144: -1- m4_pattern_allow([^NO_MULTIMON$])
1177+m4trace:configure.ac:1144: -1- AH_OUTPUT([NO_MULTIMON], [/* Define to 1 if building without multimon support. */
1178 @%:@undef NO_MULTIMON])
1179-m4trace:configure.ac:1173: -1- AC_SUBST([HGFS_LIBS])
1180-m4trace:configure.ac:1173: -1- AC_SUBST_TRACE([HGFS_LIBS])
1181-m4trace:configure.ac:1173: -1- m4_pattern_allow([^HGFS_LIBS$])
1182-m4trace:configure.ac:1174: -1- AC_SUBST([TOOLS_VERSION])
1183-m4trace:configure.ac:1174: -1- AC_SUBST_TRACE([TOOLS_VERSION])
1184-m4trace:configure.ac:1174: -1- m4_pattern_allow([^TOOLS_VERSION$])
1185-m4trace:configure.ac:1175: -1- AC_SUBST([TARGET_OS])
1186-m4trace:configure.ac:1175: -1- AC_SUBST_TRACE([TARGET_OS])
1187-m4trace:configure.ac:1175: -1- m4_pattern_allow([^TARGET_OS$])
1188-m4trace:configure.ac:1176: -1- AC_SUBST([KERNEL_RELEASE])
1189-m4trace:configure.ac:1176: -1- AC_SUBST_TRACE([KERNEL_RELEASE])
1190-m4trace:configure.ac:1176: -1- m4_pattern_allow([^KERNEL_RELEASE$])
1191-m4trace:configure.ac:1177: -1- AC_SUBST([LINUXINCLUDE])
1192-m4trace:configure.ac:1177: -1- AC_SUBST_TRACE([LINUXINCLUDE])
1193-m4trace:configure.ac:1177: -1- m4_pattern_allow([^LINUXINCLUDE$])
1194-m4trace:configure.ac:1178: -1- AC_SUBST([MODULES_OS])
1195-m4trace:configure.ac:1178: -1- AC_SUBST_TRACE([MODULES_OS])
1196-m4trace:configure.ac:1178: -1- m4_pattern_allow([^MODULES_OS$])
1197-m4trace:configure.ac:1179: -1- AC_SUBST([MODULES_DIR])
1198-m4trace:configure.ac:1179: -1- AC_SUBST_TRACE([MODULES_DIR])
1199-m4trace:configure.ac:1179: -1- m4_pattern_allow([^MODULES_DIR$])
1200-m4trace:configure.ac:1180: -1- AC_SUBST([MODULES])
1201-m4trace:configure.ac:1180: -1- AC_SUBST_TRACE([MODULES])
1202-m4trace:configure.ac:1180: -1- m4_pattern_allow([^MODULES$])
1203-m4trace:configure.ac:1181: -1- AC_SUBST([COMMON_XLIBS])
1204-m4trace:configure.ac:1181: -1- AC_SUBST_TRACE([COMMON_XLIBS])
1205-m4trace:configure.ac:1181: -1- m4_pattern_allow([^COMMON_XLIBS$])
1206-m4trace:configure.ac:1182: -1- AC_SUBST([XSM_LIBS])
1207-m4trace:configure.ac:1182: -1- AC_SUBST_TRACE([XSM_LIBS])
1208-m4trace:configure.ac:1182: -1- m4_pattern_allow([^XSM_LIBS$])
1209-m4trace:configure.ac:1183: -1- AC_SUBST([XCOMPOSITE_LIBS])
1210-m4trace:configure.ac:1183: -1- AC_SUBST_TRACE([XCOMPOSITE_LIBS])
1211-m4trace:configure.ac:1183: -1- m4_pattern_allow([^XCOMPOSITE_LIBS$])
1212-m4trace:configure.ac:1184: -1- AC_SUBST([PAM_PREFIX])
1213-m4trace:configure.ac:1184: -1- AC_SUBST_TRACE([PAM_PREFIX])
1214-m4trace:configure.ac:1184: -1- m4_pattern_allow([^PAM_PREFIX$])
1215-m4trace:configure.ac:1185: -1- AC_SUBST([PLUGIN_CPPFLAGS])
1216-m4trace:configure.ac:1185: -1- AC_SUBST_TRACE([PLUGIN_CPPFLAGS])
1217-m4trace:configure.ac:1185: -1- m4_pattern_allow([^PLUGIN_CPPFLAGS$])
1218-m4trace:configure.ac:1186: -1- AC_SUBST([PLUGIN_LDFLAGS])
1219-m4trace:configure.ac:1186: -1- AC_SUBST_TRACE([PLUGIN_LDFLAGS])
1220-m4trace:configure.ac:1186: -1- m4_pattern_allow([^PLUGIN_LDFLAGS$])
1221-m4trace:configure.ac:1187: -1- AC_SUBST([VMTOOLS_CPPFLAGS])
1222-m4trace:configure.ac:1187: -1- AC_SUBST_TRACE([VMTOOLS_CPPFLAGS])
1223-m4trace:configure.ac:1187: -1- m4_pattern_allow([^VMTOOLS_CPPFLAGS$])
1224-m4trace:configure.ac:1188: -1- AC_SUBST([VMTOOLS_LIBS])
1225-m4trace:configure.ac:1188: -1- AC_SUBST_TRACE([VMTOOLS_LIBS])
1226-m4trace:configure.ac:1188: -1- m4_pattern_allow([^VMTOOLS_LIBS$])
1227-m4trace:configure.ac:1189: -1- AC_SUBST([RPCGENFLAGS])
1228-m4trace:configure.ac:1189: -1- AC_SUBST_TRACE([RPCGENFLAGS])
1229-m4trace:configure.ac:1189: -1- m4_pattern_allow([^RPCGENFLAGS$])
1230-m4trace:configure.ac:1190: -1- AC_SUBST([XDR_LIBS])
1231-m4trace:configure.ac:1190: -1- AC_SUBST_TRACE([XDR_LIBS])
1232-m4trace:configure.ac:1190: -1- m4_pattern_allow([^XDR_LIBS$])
1233-m4trace:configure.ac:1191: -1- AC_SUBST([TEST_PLUGIN_INSTALLDIR])
1234-m4trace:configure.ac:1191: -1- AC_SUBST_TRACE([TEST_PLUGIN_INSTALLDIR])
1235-m4trace:configure.ac:1191: -1- m4_pattern_allow([^TEST_PLUGIN_INSTALLDIR$])
1236-m4trace:configure.ac:1192: -1- AC_SUBST([COMMON_PLUGIN_INSTALLDIR])
1237-m4trace:configure.ac:1192: -1- AC_SUBST_TRACE([COMMON_PLUGIN_INSTALLDIR])
1238-m4trace:configure.ac:1192: -1- m4_pattern_allow([^COMMON_PLUGIN_INSTALLDIR$])
1239-m4trace:configure.ac:1193: -1- AC_SUBST([VMSVC_PLUGIN_INSTALLDIR])
1240-m4trace:configure.ac:1193: -1- AC_SUBST_TRACE([VMSVC_PLUGIN_INSTALLDIR])
1241-m4trace:configure.ac:1193: -1- m4_pattern_allow([^VMSVC_PLUGIN_INSTALLDIR$])
1242-m4trace:configure.ac:1194: -1- AC_SUBST([VMUSR_PLUGIN_INSTALLDIR])
1243-m4trace:configure.ac:1194: -1- AC_SUBST_TRACE([VMUSR_PLUGIN_INSTALLDIR])
1244-m4trace:configure.ac:1194: -1- m4_pattern_allow([^VMUSR_PLUGIN_INSTALLDIR$])
1245-m4trace:configure.ac:1199: -1- AC_SUBST([SYSDIR])
1246-m4trace:configure.ac:1199: -1- AC_SUBST_TRACE([SYSDIR])
1247-m4trace:configure.ac:1199: -1- m4_pattern_allow([^SYSDIR$])
1248-m4trace:configure.ac:1201: -1- AC_SUBST([INSTVMSG])
1249-m4trace:configure.ac:1201: -1- AC_SUBST_TRACE([INSTVMSG])
1250-m4trace:configure.ac:1201: -1- m4_pattern_allow([^INSTVMSG$])
1251-m4trace:configure.ac:1202: -1- AC_SUBST([RPCGEN_WRAPPER])
1252-m4trace:configure.ac:1202: -1- AC_SUBST_TRACE([RPCGEN_WRAPPER])
1253-m4trace:configure.ac:1202: -1- m4_pattern_allow([^RPCGEN_WRAPPER$])
1254-m4trace:configure.ac:1206: -1- AC_SUBST([LIB_AUTH_CPPFLAGS])
1255-m4trace:configure.ac:1206: -1- AC_SUBST_TRACE([LIB_AUTH_CPPFLAGS])
1256-m4trace:configure.ac:1206: -1- m4_pattern_allow([^LIB_AUTH_CPPFLAGS$])
1257-m4trace:configure.ac:1207: -1- AC_SUBST([LIB_IMPERSONATE_CPPFLAGS])
1258-m4trace:configure.ac:1207: -1- AC_SUBST_TRACE([LIB_IMPERSONATE_CPPFLAGS])
1259-m4trace:configure.ac:1207: -1- m4_pattern_allow([^LIB_IMPERSONATE_CPPFLAGS$])
1260-m4trace:configure.ac:1208: -1- AC_SUBST([LIB_USER_CPPFLAGS])
1261-m4trace:configure.ac:1208: -1- AC_SUBST_TRACE([LIB_USER_CPPFLAGS])
1262-m4trace:configure.ac:1208: -1- m4_pattern_allow([^LIB_USER_CPPFLAGS$])
1263-m4trace:configure.ac:1209: -1- AC_SUBST([LIBVMTOOLS_LIBADD])
1264-m4trace:configure.ac:1209: -1- AC_SUBST_TRACE([LIBVMTOOLS_LIBADD])
1265-m4trace:configure.ac:1209: -1- m4_pattern_allow([^LIBVMTOOLS_LIBADD$])
1266-m4trace:configure.ac:1213: -1- AC_SUBST([VIX_LIBADD])
1267-m4trace:configure.ac:1213: -1- AC_SUBST_TRACE([VIX_LIBADD])
1268-m4trace:configure.ac:1213: -1- m4_pattern_allow([^VIX_LIBADD$])
1269-m4trace:configure.ac:1218: -1- AC_CONFIG_FILES([ \
1270+m4trace:configure.ac:1186: -1- AC_SUBST([HGFS_LIBS])
1271+m4trace:configure.ac:1186: -1- AC_SUBST_TRACE([HGFS_LIBS])
1272+m4trace:configure.ac:1186: -1- m4_pattern_allow([^HGFS_LIBS$])
1273+m4trace:configure.ac:1187: -1- AC_SUBST([TOOLS_VERSION])
1274+m4trace:configure.ac:1187: -1- AC_SUBST_TRACE([TOOLS_VERSION])
1275+m4trace:configure.ac:1187: -1- m4_pattern_allow([^TOOLS_VERSION$])
1276+m4trace:configure.ac:1188: -1- AC_SUBST([TARGET_OS])
1277+m4trace:configure.ac:1188: -1- AC_SUBST_TRACE([TARGET_OS])
1278+m4trace:configure.ac:1188: -1- m4_pattern_allow([^TARGET_OS$])
1279+m4trace:configure.ac:1189: -1- AC_SUBST([KERNEL_RELEASE])
1280+m4trace:configure.ac:1189: -1- AC_SUBST_TRACE([KERNEL_RELEASE])
1281+m4trace:configure.ac:1189: -1- m4_pattern_allow([^KERNEL_RELEASE$])
1282+m4trace:configure.ac:1190: -1- AC_SUBST([LINUXINCLUDE])
1283+m4trace:configure.ac:1190: -1- AC_SUBST_TRACE([LINUXINCLUDE])
1284+m4trace:configure.ac:1190: -1- m4_pattern_allow([^LINUXINCLUDE$])
1285+m4trace:configure.ac:1191: -1- AC_SUBST([MODULES_OS])
1286+m4trace:configure.ac:1191: -1- AC_SUBST_TRACE([MODULES_OS])
1287+m4trace:configure.ac:1191: -1- m4_pattern_allow([^MODULES_OS$])
1288+m4trace:configure.ac:1192: -1- AC_SUBST([MODULES_DIR])
1289+m4trace:configure.ac:1192: -1- AC_SUBST_TRACE([MODULES_DIR])
1290+m4trace:configure.ac:1192: -1- m4_pattern_allow([^MODULES_DIR$])
1291+m4trace:configure.ac:1193: -1- AC_SUBST([MODULES])
1292+m4trace:configure.ac:1193: -1- AC_SUBST_TRACE([MODULES])
1293+m4trace:configure.ac:1193: -1- m4_pattern_allow([^MODULES$])
1294+m4trace:configure.ac:1194: -1- AC_SUBST([COMMON_XLIBS])
1295+m4trace:configure.ac:1194: -1- AC_SUBST_TRACE([COMMON_XLIBS])
1296+m4trace:configure.ac:1194: -1- m4_pattern_allow([^COMMON_XLIBS$])
1297+m4trace:configure.ac:1195: -1- AC_SUBST([XSM_LIBS])
1298+m4trace:configure.ac:1195: -1- AC_SUBST_TRACE([XSM_LIBS])
1299+m4trace:configure.ac:1195: -1- m4_pattern_allow([^XSM_LIBS$])
1300+m4trace:configure.ac:1196: -1- AC_SUBST([XCOMPOSITE_LIBS])
1301+m4trace:configure.ac:1196: -1- AC_SUBST_TRACE([XCOMPOSITE_LIBS])
1302+m4trace:configure.ac:1196: -1- m4_pattern_allow([^XCOMPOSITE_LIBS$])
1303+m4trace:configure.ac:1197: -1- AC_SUBST([PAM_PREFIX])
1304+m4trace:configure.ac:1197: -1- AC_SUBST_TRACE([PAM_PREFIX])
1305+m4trace:configure.ac:1197: -1- m4_pattern_allow([^PAM_PREFIX$])
1306+m4trace:configure.ac:1198: -1- AC_SUBST([PLUGIN_CPPFLAGS])
1307+m4trace:configure.ac:1198: -1- AC_SUBST_TRACE([PLUGIN_CPPFLAGS])
1308+m4trace:configure.ac:1198: -1- m4_pattern_allow([^PLUGIN_CPPFLAGS$])
1309+m4trace:configure.ac:1199: -1- AC_SUBST([PLUGIN_LDFLAGS])
1310+m4trace:configure.ac:1199: -1- AC_SUBST_TRACE([PLUGIN_LDFLAGS])
1311+m4trace:configure.ac:1199: -1- m4_pattern_allow([^PLUGIN_LDFLAGS$])
1312+m4trace:configure.ac:1200: -1- AC_SUBST([VMTOOLS_CPPFLAGS])
1313+m4trace:configure.ac:1200: -1- AC_SUBST_TRACE([VMTOOLS_CPPFLAGS])
1314+m4trace:configure.ac:1200: -1- m4_pattern_allow([^VMTOOLS_CPPFLAGS$])
1315+m4trace:configure.ac:1201: -1- AC_SUBST([VMTOOLS_LIBS])
1316+m4trace:configure.ac:1201: -1- AC_SUBST_TRACE([VMTOOLS_LIBS])
1317+m4trace:configure.ac:1201: -1- m4_pattern_allow([^VMTOOLS_LIBS$])
1318+m4trace:configure.ac:1202: -1- AC_SUBST([RPCGENFLAGS])
1319+m4trace:configure.ac:1202: -1- AC_SUBST_TRACE([RPCGENFLAGS])
1320+m4trace:configure.ac:1202: -1- m4_pattern_allow([^RPCGENFLAGS$])
1321+m4trace:configure.ac:1203: -1- AC_SUBST([XDR_LIBS])
1322+m4trace:configure.ac:1203: -1- AC_SUBST_TRACE([XDR_LIBS])
1323+m4trace:configure.ac:1203: -1- m4_pattern_allow([^XDR_LIBS$])
1324+m4trace:configure.ac:1204: -1- AC_SUBST([TEST_PLUGIN_INSTALLDIR])
1325+m4trace:configure.ac:1204: -1- AC_SUBST_TRACE([TEST_PLUGIN_INSTALLDIR])
1326+m4trace:configure.ac:1204: -1- m4_pattern_allow([^TEST_PLUGIN_INSTALLDIR$])
1327+m4trace:configure.ac:1205: -1- AC_SUBST([COMMON_PLUGIN_INSTALLDIR])
1328+m4trace:configure.ac:1205: -1- AC_SUBST_TRACE([COMMON_PLUGIN_INSTALLDIR])
1329+m4trace:configure.ac:1205: -1- m4_pattern_allow([^COMMON_PLUGIN_INSTALLDIR$])
1330+m4trace:configure.ac:1206: -1- AC_SUBST([VMSVC_PLUGIN_INSTALLDIR])
1331+m4trace:configure.ac:1206: -1- AC_SUBST_TRACE([VMSVC_PLUGIN_INSTALLDIR])
1332+m4trace:configure.ac:1206: -1- m4_pattern_allow([^VMSVC_PLUGIN_INSTALLDIR$])
1333+m4trace:configure.ac:1207: -1- AC_SUBST([VMUSR_PLUGIN_INSTALLDIR])
1334+m4trace:configure.ac:1207: -1- AC_SUBST_TRACE([VMUSR_PLUGIN_INSTALLDIR])
1335+m4trace:configure.ac:1207: -1- m4_pattern_allow([^VMUSR_PLUGIN_INSTALLDIR$])
1336+m4trace:configure.ac:1212: -1- AC_SUBST([SYSDIR])
1337+m4trace:configure.ac:1212: -1- AC_SUBST_TRACE([SYSDIR])
1338+m4trace:configure.ac:1212: -1- m4_pattern_allow([^SYSDIR$])
1339+m4trace:configure.ac:1214: -1- AC_SUBST([INSTVMSG])
1340+m4trace:configure.ac:1214: -1- AC_SUBST_TRACE([INSTVMSG])
1341+m4trace:configure.ac:1214: -1- m4_pattern_allow([^INSTVMSG$])
1342+m4trace:configure.ac:1215: -1- AC_SUBST([RPCGEN_WRAPPER])
1343+m4trace:configure.ac:1215: -1- AC_SUBST_TRACE([RPCGEN_WRAPPER])
1344+m4trace:configure.ac:1215: -1- m4_pattern_allow([^RPCGEN_WRAPPER$])
1345+m4trace:configure.ac:1219: -1- AC_SUBST([LIB_AUTH_CPPFLAGS])
1346+m4trace:configure.ac:1219: -1- AC_SUBST_TRACE([LIB_AUTH_CPPFLAGS])
1347+m4trace:configure.ac:1219: -1- m4_pattern_allow([^LIB_AUTH_CPPFLAGS$])
1348+m4trace:configure.ac:1220: -1- AC_SUBST([LIB_IMPERSONATE_CPPFLAGS])
1349+m4trace:configure.ac:1220: -1- AC_SUBST_TRACE([LIB_IMPERSONATE_CPPFLAGS])
1350+m4trace:configure.ac:1220: -1- m4_pattern_allow([^LIB_IMPERSONATE_CPPFLAGS$])
1351+m4trace:configure.ac:1221: -1- AC_SUBST([LIB_USER_CPPFLAGS])
1352+m4trace:configure.ac:1221: -1- AC_SUBST_TRACE([LIB_USER_CPPFLAGS])
1353+m4trace:configure.ac:1221: -1- m4_pattern_allow([^LIB_USER_CPPFLAGS$])
1354+m4trace:configure.ac:1222: -1- AC_SUBST([LIBVMTOOLS_LIBADD])
1355+m4trace:configure.ac:1222: -1- AC_SUBST_TRACE([LIBVMTOOLS_LIBADD])
1356+m4trace:configure.ac:1222: -1- m4_pattern_allow([^LIBVMTOOLS_LIBADD$])
1357+m4trace:configure.ac:1226: -1- AC_SUBST([VIX_LIBADD])
1358+m4trace:configure.ac:1226: -1- AC_SUBST_TRACE([VIX_LIBADD])
1359+m4trace:configure.ac:1226: -1- m4_pattern_allow([^VIX_LIBADD$])
1360+m4trace:configure.ac:1231: -1- AC_CONFIG_FILES([ \
1361 Makefile \
1362 lib/Makefile \
1363 lib/appUtil/Makefile \
1364@@ -1348,30 +1351,30 @@
1365 scripts/Makefile \
1366 scripts/build/rpcgen_wrapper.sh \
1367 ])
1368-m4trace:configure.ac:1306: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs])
1369-m4trace:configure.ac:1306: -1- AC_SUBST_TRACE([LIB@&t@OBJS])
1370-m4trace:configure.ac:1306: -1- m4_pattern_allow([^LIB@&t@OBJS$])
1371-m4trace:configure.ac:1306: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
1372-m4trace:configure.ac:1306: -1- AC_SUBST_TRACE([LTLIBOBJS])
1373-m4trace:configure.ac:1306: -1- m4_pattern_allow([^LTLIBOBJS$])
1374-m4trace:configure.ac:1306: -1- AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])
1375-m4trace:configure.ac:1306: -1- AC_SUBST([am__EXEEXT_TRUE])
1376-m4trace:configure.ac:1306: -1- AC_SUBST_TRACE([am__EXEEXT_TRUE])
1377-m4trace:configure.ac:1306: -1- m4_pattern_allow([^am__EXEEXT_TRUE$])
1378-m4trace:configure.ac:1306: -1- AC_SUBST([am__EXEEXT_FALSE])
1379-m4trace:configure.ac:1306: -1- AC_SUBST_TRACE([am__EXEEXT_FALSE])
1380-m4trace:configure.ac:1306: -1- m4_pattern_allow([^am__EXEEXT_FALSE$])
1381-m4trace:configure.ac:1306: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_TRUE])
1382-m4trace:configure.ac:1306: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_FALSE])
1383-m4trace:configure.ac:1306: -1- AC_SUBST_TRACE([top_builddir])
1384-m4trace:configure.ac:1306: -1- AC_SUBST_TRACE([top_build_prefix])
1385-m4trace:configure.ac:1306: -1- AC_SUBST_TRACE([srcdir])
1386-m4trace:configure.ac:1306: -1- AC_SUBST_TRACE([abs_srcdir])
1387-m4trace:configure.ac:1306: -1- AC_SUBST_TRACE([top_srcdir])
1388-m4trace:configure.ac:1306: -1- AC_SUBST_TRACE([abs_top_srcdir])
1389-m4trace:configure.ac:1306: -1- AC_SUBST_TRACE([builddir])
1390-m4trace:configure.ac:1306: -1- AC_SUBST_TRACE([abs_builddir])
1391-m4trace:configure.ac:1306: -1- AC_SUBST_TRACE([abs_top_builddir])
1392-m4trace:configure.ac:1306: -1- AC_SUBST_TRACE([INSTALL])
1393-m4trace:configure.ac:1306: -1- AC_SUBST_TRACE([MKDIR_P])
1394-m4trace:configure.ac:1306: -1- AC_REQUIRE_AUX_FILE([ltmain.sh])
1395+m4trace:configure.ac:1319: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs])
1396+m4trace:configure.ac:1319: -1- AC_SUBST_TRACE([LIB@&t@OBJS])
1397+m4trace:configure.ac:1319: -1- m4_pattern_allow([^LIB@&t@OBJS$])
1398+m4trace:configure.ac:1319: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
1399+m4trace:configure.ac:1319: -1- AC_SUBST_TRACE([LTLIBOBJS])
1400+m4trace:configure.ac:1319: -1- m4_pattern_allow([^LTLIBOBJS$])
1401+m4trace:configure.ac:1319: -1- AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])
1402+m4trace:configure.ac:1319: -1- AC_SUBST([am__EXEEXT_TRUE])
1403+m4trace:configure.ac:1319: -1- AC_SUBST_TRACE([am__EXEEXT_TRUE])
1404+m4trace:configure.ac:1319: -1- m4_pattern_allow([^am__EXEEXT_TRUE$])
1405+m4trace:configure.ac:1319: -1- AC_SUBST([am__EXEEXT_FALSE])
1406+m4trace:configure.ac:1319: -1- AC_SUBST_TRACE([am__EXEEXT_FALSE])
1407+m4trace:configure.ac:1319: -1- m4_pattern_allow([^am__EXEEXT_FALSE$])
1408+m4trace:configure.ac:1319: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_TRUE])
1409+m4trace:configure.ac:1319: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_FALSE])
1410+m4trace:configure.ac:1319: -1- AC_SUBST_TRACE([top_builddir])
1411+m4trace:configure.ac:1319: -1- AC_SUBST_TRACE([top_build_prefix])
1412+m4trace:configure.ac:1319: -1- AC_SUBST_TRACE([srcdir])
1413+m4trace:configure.ac:1319: -1- AC_SUBST_TRACE([abs_srcdir])
1414+m4trace:configure.ac:1319: -1- AC_SUBST_TRACE([top_srcdir])
1415+m4trace:configure.ac:1319: -1- AC_SUBST_TRACE([abs_top_srcdir])
1416+m4trace:configure.ac:1319: -1- AC_SUBST_TRACE([builddir])
1417+m4trace:configure.ac:1319: -1- AC_SUBST_TRACE([abs_builddir])
1418+m4trace:configure.ac:1319: -1- AC_SUBST_TRACE([abs_top_builddir])
1419+m4trace:configure.ac:1319: -1- AC_SUBST_TRACE([INSTALL])
1420+m4trace:configure.ac:1319: -1- AC_SUBST_TRACE([MKDIR_P])
1421+m4trace:configure.ac:1319: -1- AC_REQUIRE_AUX_FILE([ltmain.sh])
1422
1423=== modified file 'autom4te.cache/traces.2'
1424--- autom4te.cache/traces.2 2011-07-22 16:41:03 +0000
1425+++ autom4te.cache/traces.2 2011-10-31 00:22:23 +0000
1426@@ -2713,156 +2713,159 @@
1427 m4trace:configure.ac:950: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
1428 You should run autoupdate.], [../../lib/autoconf/general.m4:2602: AC_TRY_COMPILE is expanded from...
1429 configure.ac:950: the top level])
1430-m4trace:configure.ac:968: -1- m4_pattern_allow([^have_doxygen$])
1431-m4trace:configure.ac:975: -1- m4_pattern_allow([^DOT$])
1432-m4trace:configure.ac:982: -1- m4_pattern_allow([^DOT$])
1433-m4trace:configure.ac:983: -1- m4_pattern_allow([^HAVE_DOT$])
1434-m4trace:configure.ac:985: -1- m4_pattern_allow([^MSCGEN$])
1435-m4trace:configure.ac:993: -1- m4_pattern_allow([^MSCGEN_DIR$])
1436-m4trace:configure.ac:1092: -1- AM_CONDITIONAL([BUILD_HGFSMOUNTER], [test "$buildHgfsmounter" = "yes"])
1437-m4trace:configure.ac:1092: -1- m4_pattern_allow([^BUILD_HGFSMOUNTER_TRUE$])
1438-m4trace:configure.ac:1092: -1- m4_pattern_allow([^BUILD_HGFSMOUNTER_FALSE$])
1439-m4trace:configure.ac:1092: -1- _AM_SUBST_NOTMAKE([BUILD_HGFSMOUNTER_TRUE])
1440-m4trace:configure.ac:1092: -1- _AM_SUBST_NOTMAKE([BUILD_HGFSMOUNTER_FALSE])
1441-m4trace:configure.ac:1093: -1- AM_CONDITIONAL([LINUX], [test "$os" = "linux"])
1442-m4trace:configure.ac:1093: -1- m4_pattern_allow([^LINUX_TRUE$])
1443-m4trace:configure.ac:1093: -1- m4_pattern_allow([^LINUX_FALSE$])
1444-m4trace:configure.ac:1093: -1- _AM_SUBST_NOTMAKE([LINUX_TRUE])
1445-m4trace:configure.ac:1093: -1- _AM_SUBST_NOTMAKE([LINUX_FALSE])
1446-m4trace:configure.ac:1094: -1- AM_CONDITIONAL([SOLARIS], [test "$os" = "solaris"])
1447-m4trace:configure.ac:1094: -1- m4_pattern_allow([^SOLARIS_TRUE$])
1448-m4trace:configure.ac:1094: -1- m4_pattern_allow([^SOLARIS_FALSE$])
1449-m4trace:configure.ac:1094: -1- _AM_SUBST_NOTMAKE([SOLARIS_TRUE])
1450-m4trace:configure.ac:1094: -1- _AM_SUBST_NOTMAKE([SOLARIS_FALSE])
1451-m4trace:configure.ac:1095: -1- AM_CONDITIONAL([FREEBSD], [test "$os" = "freebsd"])
1452-m4trace:configure.ac:1095: -1- m4_pattern_allow([^FREEBSD_TRUE$])
1453-m4trace:configure.ac:1095: -1- m4_pattern_allow([^FREEBSD_FALSE$])
1454-m4trace:configure.ac:1095: -1- _AM_SUBST_NOTMAKE([FREEBSD_TRUE])
1455-m4trace:configure.ac:1095: -1- _AM_SUBST_NOTMAKE([FREEBSD_FALSE])
1456-m4trace:configure.ac:1096: -1- AM_CONDITIONAL([FREEBSD_CUSTOM_SYSDIR], [test "$os" = "freebsd" -a -n "$SYSDIR"])
1457-m4trace:configure.ac:1096: -1- m4_pattern_allow([^FREEBSD_CUSTOM_SYSDIR_TRUE$])
1458-m4trace:configure.ac:1096: -1- m4_pattern_allow([^FREEBSD_CUSTOM_SYSDIR_FALSE$])
1459-m4trace:configure.ac:1096: -1- _AM_SUBST_NOTMAKE([FREEBSD_CUSTOM_SYSDIR_TRUE])
1460-m4trace:configure.ac:1096: -1- _AM_SUBST_NOTMAKE([FREEBSD_CUSTOM_SYSDIR_FALSE])
1461-m4trace:configure.ac:1097: -1- AM_CONDITIONAL([THIRTY_TWO_BIT_USERSPACE], [test "$userSpaceBitness" = "32"])
1462-m4trace:configure.ac:1097: -1- m4_pattern_allow([^THIRTY_TWO_BIT_USERSPACE_TRUE$])
1463-m4trace:configure.ac:1097: -1- m4_pattern_allow([^THIRTY_TWO_BIT_USERSPACE_FALSE$])
1464-m4trace:configure.ac:1097: -1- _AM_SUBST_NOTMAKE([THIRTY_TWO_BIT_USERSPACE_TRUE])
1465-m4trace:configure.ac:1097: -1- _AM_SUBST_NOTMAKE([THIRTY_TWO_BIT_USERSPACE_FALSE])
1466-m4trace:configure.ac:1098: -1- AM_CONDITIONAL([HAVE_X11], [test "$have_x" = "yes"])
1467-m4trace:configure.ac:1098: -1- m4_pattern_allow([^HAVE_X11_TRUE$])
1468-m4trace:configure.ac:1098: -1- m4_pattern_allow([^HAVE_X11_FALSE$])
1469-m4trace:configure.ac:1098: -1- _AM_SUBST_NOTMAKE([HAVE_X11_TRUE])
1470-m4trace:configure.ac:1098: -1- _AM_SUBST_NOTMAKE([HAVE_X11_FALSE])
1471-m4trace:configure.ac:1099: -1- AM_CONDITIONAL([HAVE_ICU], [test "$with_icu" = "yes"])
1472-m4trace:configure.ac:1099: -1- m4_pattern_allow([^HAVE_ICU_TRUE$])
1473-m4trace:configure.ac:1099: -1- m4_pattern_allow([^HAVE_ICU_FALSE$])
1474-m4trace:configure.ac:1099: -1- _AM_SUBST_NOTMAKE([HAVE_ICU_TRUE])
1475-m4trace:configure.ac:1099: -1- _AM_SUBST_NOTMAKE([HAVE_ICU_FALSE])
1476-m4trace:configure.ac:1100: -1- AM_CONDITIONAL([WITH_KERNEL_MODULES], [test "$with_kernel_modules" = "yes"])
1477-m4trace:configure.ac:1100: -1- m4_pattern_allow([^WITH_KERNEL_MODULES_TRUE$])
1478-m4trace:configure.ac:1100: -1- m4_pattern_allow([^WITH_KERNEL_MODULES_FALSE$])
1479-m4trace:configure.ac:1100: -1- _AM_SUBST_NOTMAKE([WITH_KERNEL_MODULES_TRUE])
1480-m4trace:configure.ac:1100: -1- _AM_SUBST_NOTMAKE([WITH_KERNEL_MODULES_FALSE])
1481-m4trace:configure.ac:1101: -1- AM_CONDITIONAL([HAVE_XSM], [test "$have_xsm" = "yes"])
1482-m4trace:configure.ac:1101: -1- m4_pattern_allow([^HAVE_XSM_TRUE$])
1483-m4trace:configure.ac:1101: -1- m4_pattern_allow([^HAVE_XSM_FALSE$])
1484-m4trace:configure.ac:1101: -1- _AM_SUBST_NOTMAKE([HAVE_XSM_TRUE])
1485-m4trace:configure.ac:1101: -1- _AM_SUBST_NOTMAKE([HAVE_XSM_FALSE])
1486-m4trace:configure.ac:1102: -1- AM_CONDITIONAL([HAVE_XCOMPOSITE], [test "$have_xcomposite" = "yes"])
1487-m4trace:configure.ac:1102: -1- m4_pattern_allow([^HAVE_XCOMPOSITE_TRUE$])
1488-m4trace:configure.ac:1102: -1- m4_pattern_allow([^HAVE_XCOMPOSITE_FALSE$])
1489-m4trace:configure.ac:1102: -1- _AM_SUBST_NOTMAKE([HAVE_XCOMPOSITE_TRUE])
1490-m4trace:configure.ac:1102: -1- _AM_SUBST_NOTMAKE([HAVE_XCOMPOSITE_FALSE])
1491-m4trace:configure.ac:1103: -1- AM_CONDITIONAL([ENABLE_UNITY], [test "$enable_unity" = "yes"])
1492-m4trace:configure.ac:1103: -1- m4_pattern_allow([^ENABLE_UNITY_TRUE$])
1493-m4trace:configure.ac:1103: -1- m4_pattern_allow([^ENABLE_UNITY_FALSE$])
1494-m4trace:configure.ac:1103: -1- _AM_SUBST_NOTMAKE([ENABLE_UNITY_TRUE])
1495-m4trace:configure.ac:1103: -1- _AM_SUBST_NOTMAKE([ENABLE_UNITY_FALSE])
1496-m4trace:configure.ac:1104: -1- AM_CONDITIONAL([ENABLE_TESTS], [test "$have_cunit" = "yes"])
1497-m4trace:configure.ac:1104: -1- m4_pattern_allow([^ENABLE_TESTS_TRUE$])
1498-m4trace:configure.ac:1104: -1- m4_pattern_allow([^ENABLE_TESTS_FALSE$])
1499-m4trace:configure.ac:1104: -1- _AM_SUBST_NOTMAKE([ENABLE_TESTS_TRUE])
1500-m4trace:configure.ac:1104: -1- _AM_SUBST_NOTMAKE([ENABLE_TESTS_FALSE])
1501-m4trace:configure.ac:1105: -1- AM_CONDITIONAL([WITH_ROOT_PRIVILEGES], [test "$with_root_privileges" = "yes"])
1502-m4trace:configure.ac:1105: -1- m4_pattern_allow([^WITH_ROOT_PRIVILEGES_TRUE$])
1503-m4trace:configure.ac:1105: -1- m4_pattern_allow([^WITH_ROOT_PRIVILEGES_FALSE$])
1504-m4trace:configure.ac:1105: -1- _AM_SUBST_NOTMAKE([WITH_ROOT_PRIVILEGES_TRUE])
1505-m4trace:configure.ac:1105: -1- _AM_SUBST_NOTMAKE([WITH_ROOT_PRIVILEGES_FALSE])
1506-m4trace:configure.ac:1106: -1- AM_CONDITIONAL([HAVE_DNET], [test "$have_dnet" = "yes"])
1507-m4trace:configure.ac:1106: -1- m4_pattern_allow([^HAVE_DNET_TRUE$])
1508-m4trace:configure.ac:1106: -1- m4_pattern_allow([^HAVE_DNET_FALSE$])
1509-m4trace:configure.ac:1106: -1- _AM_SUBST_NOTMAKE([HAVE_DNET_TRUE])
1510-m4trace:configure.ac:1106: -1- _AM_SUBST_NOTMAKE([HAVE_DNET_FALSE])
1511-m4trace:configure.ac:1107: -1- AM_CONDITIONAL([HAVE_DOXYGEN], [test "$have_doxygen" = "yes"])
1512-m4trace:configure.ac:1107: -1- m4_pattern_allow([^HAVE_DOXYGEN_TRUE$])
1513-m4trace:configure.ac:1107: -1- m4_pattern_allow([^HAVE_DOXYGEN_FALSE$])
1514-m4trace:configure.ac:1107: -1- _AM_SUBST_NOTMAKE([HAVE_DOXYGEN_TRUE])
1515-m4trace:configure.ac:1107: -1- _AM_SUBST_NOTMAKE([HAVE_DOXYGEN_FALSE])
1516-m4trace:configure.ac:1108: -1- AM_CONDITIONAL([HAVE_FUSE], [test "$have_fuse" = "yes"])
1517-m4trace:configure.ac:1108: -1- m4_pattern_allow([^HAVE_FUSE_TRUE$])
1518-m4trace:configure.ac:1108: -1- m4_pattern_allow([^HAVE_FUSE_FALSE$])
1519-m4trace:configure.ac:1108: -1- _AM_SUBST_NOTMAKE([HAVE_FUSE_TRUE])
1520-m4trace:configure.ac:1108: -1- _AM_SUBST_NOTMAKE([HAVE_FUSE_FALSE])
1521-m4trace:configure.ac:1109: -1- AM_CONDITIONAL([HAVE_GNU_LD], [test "$with_gnu_ld" = "yes"])
1522-m4trace:configure.ac:1109: -1- m4_pattern_allow([^HAVE_GNU_LD_TRUE$])
1523-m4trace:configure.ac:1109: -1- m4_pattern_allow([^HAVE_GNU_LD_FALSE$])
1524-m4trace:configure.ac:1109: -1- _AM_SUBST_NOTMAKE([HAVE_GNU_LD_TRUE])
1525-m4trace:configure.ac:1109: -1- _AM_SUBST_NOTMAKE([HAVE_GNU_LD_FALSE])
1526-m4trace:configure.ac:1110: -1- AM_CONDITIONAL([HAVE_GTKMM], [test "$have_x" = "yes" -a "$with_gtkmm" = "yes"])
1527-m4trace:configure.ac:1110: -1- m4_pattern_allow([^HAVE_GTKMM_TRUE$])
1528-m4trace:configure.ac:1110: -1- m4_pattern_allow([^HAVE_GTKMM_FALSE$])
1529-m4trace:configure.ac:1110: -1- _AM_SUBST_NOTMAKE([HAVE_GTKMM_TRUE])
1530-m4trace:configure.ac:1110: -1- _AM_SUBST_NOTMAKE([HAVE_GTKMM_FALSE])
1531-m4trace:configure.ac:1111: -1- AM_CONDITIONAL([HAVE_PAM], [test "$with_pam" = "yes"])
1532-m4trace:configure.ac:1111: -1- m4_pattern_allow([^HAVE_PAM_TRUE$])
1533-m4trace:configure.ac:1111: -1- m4_pattern_allow([^HAVE_PAM_FALSE$])
1534-m4trace:configure.ac:1111: -1- _AM_SUBST_NOTMAKE([HAVE_PAM_TRUE])
1535-m4trace:configure.ac:1111: -1- _AM_SUBST_NOTMAKE([HAVE_PAM_FALSE])
1536-m4trace:configure.ac:1112: -1- AM_CONDITIONAL([USE_SLASH_PROC], [test "os" = "linux" -a "$have_glib_2_14" = "yes"])
1537-m4trace:configure.ac:1112: -1- m4_pattern_allow([^USE_SLASH_PROC_TRUE$])
1538-m4trace:configure.ac:1112: -1- m4_pattern_allow([^USE_SLASH_PROC_FALSE$])
1539-m4trace:configure.ac:1112: -1- _AM_SUBST_NOTMAKE([USE_SLASH_PROC_TRUE])
1540-m4trace:configure.ac:1112: -1- _AM_SUBST_NOTMAKE([USE_SLASH_PROC_FALSE])
1541-m4trace:configure.ac:1115: -1- m4_pattern_allow([^NO_XSM$])
1542-m4trace:configure.ac:1119: -1- m4_pattern_allow([^NO_XCOMPOSITE$])
1543-m4trace:configure.ac:1131: -1- m4_pattern_allow([^NO_MULTIMON$])
1544-m4trace:configure.ac:1173: -1- m4_pattern_allow([^HGFS_LIBS$])
1545-m4trace:configure.ac:1174: -1- m4_pattern_allow([^TOOLS_VERSION$])
1546-m4trace:configure.ac:1175: -1- m4_pattern_allow([^TARGET_OS$])
1547-m4trace:configure.ac:1176: -1- m4_pattern_allow([^KERNEL_RELEASE$])
1548-m4trace:configure.ac:1177: -1- m4_pattern_allow([^LINUXINCLUDE$])
1549-m4trace:configure.ac:1178: -1- m4_pattern_allow([^MODULES_OS$])
1550-m4trace:configure.ac:1179: -1- m4_pattern_allow([^MODULES_DIR$])
1551-m4trace:configure.ac:1180: -1- m4_pattern_allow([^MODULES$])
1552-m4trace:configure.ac:1181: -1- m4_pattern_allow([^COMMON_XLIBS$])
1553-m4trace:configure.ac:1182: -1- m4_pattern_allow([^XSM_LIBS$])
1554-m4trace:configure.ac:1183: -1- m4_pattern_allow([^XCOMPOSITE_LIBS$])
1555-m4trace:configure.ac:1184: -1- m4_pattern_allow([^PAM_PREFIX$])
1556-m4trace:configure.ac:1185: -1- m4_pattern_allow([^PLUGIN_CPPFLAGS$])
1557-m4trace:configure.ac:1186: -1- m4_pattern_allow([^PLUGIN_LDFLAGS$])
1558-m4trace:configure.ac:1187: -1- m4_pattern_allow([^VMTOOLS_CPPFLAGS$])
1559-m4trace:configure.ac:1188: -1- m4_pattern_allow([^VMTOOLS_LIBS$])
1560-m4trace:configure.ac:1189: -1- m4_pattern_allow([^RPCGENFLAGS$])
1561-m4trace:configure.ac:1190: -1- m4_pattern_allow([^XDR_LIBS$])
1562-m4trace:configure.ac:1191: -1- m4_pattern_allow([^TEST_PLUGIN_INSTALLDIR$])
1563-m4trace:configure.ac:1192: -1- m4_pattern_allow([^COMMON_PLUGIN_INSTALLDIR$])
1564-m4trace:configure.ac:1193: -1- m4_pattern_allow([^VMSVC_PLUGIN_INSTALLDIR$])
1565-m4trace:configure.ac:1194: -1- m4_pattern_allow([^VMUSR_PLUGIN_INSTALLDIR$])
1566-m4trace:configure.ac:1199: -1- m4_pattern_allow([^SYSDIR$])
1567-m4trace:configure.ac:1201: -1- m4_pattern_allow([^INSTVMSG$])
1568-m4trace:configure.ac:1202: -1- m4_pattern_allow([^RPCGEN_WRAPPER$])
1569-m4trace:configure.ac:1206: -1- m4_pattern_allow([^LIB_AUTH_CPPFLAGS$])
1570-m4trace:configure.ac:1207: -1- m4_pattern_allow([^LIB_IMPERSONATE_CPPFLAGS$])
1571-m4trace:configure.ac:1208: -1- m4_pattern_allow([^LIB_USER_CPPFLAGS$])
1572-m4trace:configure.ac:1209: -1- m4_pattern_allow([^LIBVMTOOLS_LIBADD$])
1573-m4trace:configure.ac:1213: -1- m4_pattern_allow([^VIX_LIBADD$])
1574-m4trace:configure.ac:1306: -1- m4_pattern_allow([^LIB@&t@OBJS$])
1575-m4trace:configure.ac:1306: -1- m4_pattern_allow([^LTLIBOBJS$])
1576-m4trace:configure.ac:1306: -1- AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])
1577-m4trace:configure.ac:1306: -1- m4_pattern_allow([^am__EXEEXT_TRUE$])
1578-m4trace:configure.ac:1306: -1- m4_pattern_allow([^am__EXEEXT_FALSE$])
1579-m4trace:configure.ac:1306: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_TRUE])
1580-m4trace:configure.ac:1306: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_FALSE])
1581-m4trace:configure.ac:1306: -1- _AM_OUTPUT_DEPENDENCY_COMMANDS
1582-m4trace:configure.ac:1306: -1- _LT_PROG_LTMAIN
1583+m4trace:configure.ac:961: -1- _m4_warn([obsolete], [The macro `AC_TRY_COMPILE' is obsolete.
1584+You should run autoupdate.], [../../lib/autoconf/general.m4:2602: AC_TRY_COMPILE is expanded from...
1585+configure.ac:961: the top level])
1586+m4trace:configure.ac:980: -1- m4_pattern_allow([^have_doxygen$])
1587+m4trace:configure.ac:987: -1- m4_pattern_allow([^DOT$])
1588+m4trace:configure.ac:994: -1- m4_pattern_allow([^DOT$])
1589+m4trace:configure.ac:995: -1- m4_pattern_allow([^HAVE_DOT$])
1590+m4trace:configure.ac:997: -1- m4_pattern_allow([^MSCGEN$])
1591+m4trace:configure.ac:1005: -1- m4_pattern_allow([^MSCGEN_DIR$])
1592+m4trace:configure.ac:1105: -1- AM_CONDITIONAL([BUILD_HGFSMOUNTER], [test "$buildHgfsmounter" = "yes"])
1593+m4trace:configure.ac:1105: -1- m4_pattern_allow([^BUILD_HGFSMOUNTER_TRUE$])
1594+m4trace:configure.ac:1105: -1- m4_pattern_allow([^BUILD_HGFSMOUNTER_FALSE$])
1595+m4trace:configure.ac:1105: -1- _AM_SUBST_NOTMAKE([BUILD_HGFSMOUNTER_TRUE])
1596+m4trace:configure.ac:1105: -1- _AM_SUBST_NOTMAKE([BUILD_HGFSMOUNTER_FALSE])
1597+m4trace:configure.ac:1106: -1- AM_CONDITIONAL([LINUX], [test "$os" = "linux"])
1598+m4trace:configure.ac:1106: -1- m4_pattern_allow([^LINUX_TRUE$])
1599+m4trace:configure.ac:1106: -1- m4_pattern_allow([^LINUX_FALSE$])
1600+m4trace:configure.ac:1106: -1- _AM_SUBST_NOTMAKE([LINUX_TRUE])
1601+m4trace:configure.ac:1106: -1- _AM_SUBST_NOTMAKE([LINUX_FALSE])
1602+m4trace:configure.ac:1107: -1- AM_CONDITIONAL([SOLARIS], [test "$os" = "solaris"])
1603+m4trace:configure.ac:1107: -1- m4_pattern_allow([^SOLARIS_TRUE$])
1604+m4trace:configure.ac:1107: -1- m4_pattern_allow([^SOLARIS_FALSE$])
1605+m4trace:configure.ac:1107: -1- _AM_SUBST_NOTMAKE([SOLARIS_TRUE])
1606+m4trace:configure.ac:1107: -1- _AM_SUBST_NOTMAKE([SOLARIS_FALSE])
1607+m4trace:configure.ac:1108: -1- AM_CONDITIONAL([FREEBSD], [test "$os" = "freebsd"])
1608+m4trace:configure.ac:1108: -1- m4_pattern_allow([^FREEBSD_TRUE$])
1609+m4trace:configure.ac:1108: -1- m4_pattern_allow([^FREEBSD_FALSE$])
1610+m4trace:configure.ac:1108: -1- _AM_SUBST_NOTMAKE([FREEBSD_TRUE])
1611+m4trace:configure.ac:1108: -1- _AM_SUBST_NOTMAKE([FREEBSD_FALSE])
1612+m4trace:configure.ac:1109: -1- AM_CONDITIONAL([FREEBSD_CUSTOM_SYSDIR], [test "$os" = "freebsd" -a -n "$SYSDIR"])
1613+m4trace:configure.ac:1109: -1- m4_pattern_allow([^FREEBSD_CUSTOM_SYSDIR_TRUE$])
1614+m4trace:configure.ac:1109: -1- m4_pattern_allow([^FREEBSD_CUSTOM_SYSDIR_FALSE$])
1615+m4trace:configure.ac:1109: -1- _AM_SUBST_NOTMAKE([FREEBSD_CUSTOM_SYSDIR_TRUE])
1616+m4trace:configure.ac:1109: -1- _AM_SUBST_NOTMAKE([FREEBSD_CUSTOM_SYSDIR_FALSE])
1617+m4trace:configure.ac:1110: -1- AM_CONDITIONAL([THIRTY_TWO_BIT_USERSPACE], [test "$userSpaceBitness" = "32"])
1618+m4trace:configure.ac:1110: -1- m4_pattern_allow([^THIRTY_TWO_BIT_USERSPACE_TRUE$])
1619+m4trace:configure.ac:1110: -1- m4_pattern_allow([^THIRTY_TWO_BIT_USERSPACE_FALSE$])
1620+m4trace:configure.ac:1110: -1- _AM_SUBST_NOTMAKE([THIRTY_TWO_BIT_USERSPACE_TRUE])
1621+m4trace:configure.ac:1110: -1- _AM_SUBST_NOTMAKE([THIRTY_TWO_BIT_USERSPACE_FALSE])
1622+m4trace:configure.ac:1111: -1- AM_CONDITIONAL([HAVE_X11], [test "$have_x" = "yes"])
1623+m4trace:configure.ac:1111: -1- m4_pattern_allow([^HAVE_X11_TRUE$])
1624+m4trace:configure.ac:1111: -1- m4_pattern_allow([^HAVE_X11_FALSE$])
1625+m4trace:configure.ac:1111: -1- _AM_SUBST_NOTMAKE([HAVE_X11_TRUE])
1626+m4trace:configure.ac:1111: -1- _AM_SUBST_NOTMAKE([HAVE_X11_FALSE])
1627+m4trace:configure.ac:1112: -1- AM_CONDITIONAL([HAVE_ICU], [test "$with_icu" = "yes"])
1628+m4trace:configure.ac:1112: -1- m4_pattern_allow([^HAVE_ICU_TRUE$])
1629+m4trace:configure.ac:1112: -1- m4_pattern_allow([^HAVE_ICU_FALSE$])
1630+m4trace:configure.ac:1112: -1- _AM_SUBST_NOTMAKE([HAVE_ICU_TRUE])
1631+m4trace:configure.ac:1112: -1- _AM_SUBST_NOTMAKE([HAVE_ICU_FALSE])
1632+m4trace:configure.ac:1113: -1- AM_CONDITIONAL([WITH_KERNEL_MODULES], [test "$with_kernel_modules" = "yes"])
1633+m4trace:configure.ac:1113: -1- m4_pattern_allow([^WITH_KERNEL_MODULES_TRUE$])
1634+m4trace:configure.ac:1113: -1- m4_pattern_allow([^WITH_KERNEL_MODULES_FALSE$])
1635+m4trace:configure.ac:1113: -1- _AM_SUBST_NOTMAKE([WITH_KERNEL_MODULES_TRUE])
1636+m4trace:configure.ac:1113: -1- _AM_SUBST_NOTMAKE([WITH_KERNEL_MODULES_FALSE])
1637+m4trace:configure.ac:1114: -1- AM_CONDITIONAL([HAVE_XSM], [test "$have_xsm" = "yes"])
1638+m4trace:configure.ac:1114: -1- m4_pattern_allow([^HAVE_XSM_TRUE$])
1639+m4trace:configure.ac:1114: -1- m4_pattern_allow([^HAVE_XSM_FALSE$])
1640+m4trace:configure.ac:1114: -1- _AM_SUBST_NOTMAKE([HAVE_XSM_TRUE])
1641+m4trace:configure.ac:1114: -1- _AM_SUBST_NOTMAKE([HAVE_XSM_FALSE])
1642+m4trace:configure.ac:1115: -1- AM_CONDITIONAL([HAVE_XCOMPOSITE], [test "$have_xcomposite" = "yes"])
1643+m4trace:configure.ac:1115: -1- m4_pattern_allow([^HAVE_XCOMPOSITE_TRUE$])
1644+m4trace:configure.ac:1115: -1- m4_pattern_allow([^HAVE_XCOMPOSITE_FALSE$])
1645+m4trace:configure.ac:1115: -1- _AM_SUBST_NOTMAKE([HAVE_XCOMPOSITE_TRUE])
1646+m4trace:configure.ac:1115: -1- _AM_SUBST_NOTMAKE([HAVE_XCOMPOSITE_FALSE])
1647+m4trace:configure.ac:1116: -1- AM_CONDITIONAL([ENABLE_UNITY], [test "$enable_unity" = "yes"])
1648+m4trace:configure.ac:1116: -1- m4_pattern_allow([^ENABLE_UNITY_TRUE$])
1649+m4trace:configure.ac:1116: -1- m4_pattern_allow([^ENABLE_UNITY_FALSE$])
1650+m4trace:configure.ac:1116: -1- _AM_SUBST_NOTMAKE([ENABLE_UNITY_TRUE])
1651+m4trace:configure.ac:1116: -1- _AM_SUBST_NOTMAKE([ENABLE_UNITY_FALSE])
1652+m4trace:configure.ac:1117: -1- AM_CONDITIONAL([ENABLE_TESTS], [test "$have_cunit" = "yes"])
1653+m4trace:configure.ac:1117: -1- m4_pattern_allow([^ENABLE_TESTS_TRUE$])
1654+m4trace:configure.ac:1117: -1- m4_pattern_allow([^ENABLE_TESTS_FALSE$])
1655+m4trace:configure.ac:1117: -1- _AM_SUBST_NOTMAKE([ENABLE_TESTS_TRUE])
1656+m4trace:configure.ac:1117: -1- _AM_SUBST_NOTMAKE([ENABLE_TESTS_FALSE])
1657+m4trace:configure.ac:1118: -1- AM_CONDITIONAL([WITH_ROOT_PRIVILEGES], [test "$with_root_privileges" = "yes"])
1658+m4trace:configure.ac:1118: -1- m4_pattern_allow([^WITH_ROOT_PRIVILEGES_TRUE$])
1659+m4trace:configure.ac:1118: -1- m4_pattern_allow([^WITH_ROOT_PRIVILEGES_FALSE$])
1660+m4trace:configure.ac:1118: -1- _AM_SUBST_NOTMAKE([WITH_ROOT_PRIVILEGES_TRUE])
1661+m4trace:configure.ac:1118: -1- _AM_SUBST_NOTMAKE([WITH_ROOT_PRIVILEGES_FALSE])
1662+m4trace:configure.ac:1119: -1- AM_CONDITIONAL([HAVE_DNET], [test "$have_dnet" = "yes"])
1663+m4trace:configure.ac:1119: -1- m4_pattern_allow([^HAVE_DNET_TRUE$])
1664+m4trace:configure.ac:1119: -1- m4_pattern_allow([^HAVE_DNET_FALSE$])
1665+m4trace:configure.ac:1119: -1- _AM_SUBST_NOTMAKE([HAVE_DNET_TRUE])
1666+m4trace:configure.ac:1119: -1- _AM_SUBST_NOTMAKE([HAVE_DNET_FALSE])
1667+m4trace:configure.ac:1120: -1- AM_CONDITIONAL([HAVE_DOXYGEN], [test "$have_doxygen" = "yes"])
1668+m4trace:configure.ac:1120: -1- m4_pattern_allow([^HAVE_DOXYGEN_TRUE$])
1669+m4trace:configure.ac:1120: -1- m4_pattern_allow([^HAVE_DOXYGEN_FALSE$])
1670+m4trace:configure.ac:1120: -1- _AM_SUBST_NOTMAKE([HAVE_DOXYGEN_TRUE])
1671+m4trace:configure.ac:1120: -1- _AM_SUBST_NOTMAKE([HAVE_DOXYGEN_FALSE])
1672+m4trace:configure.ac:1121: -1- AM_CONDITIONAL([HAVE_FUSE], [test "$have_fuse" = "yes"])
1673+m4trace:configure.ac:1121: -1- m4_pattern_allow([^HAVE_FUSE_TRUE$])
1674+m4trace:configure.ac:1121: -1- m4_pattern_allow([^HAVE_FUSE_FALSE$])
1675+m4trace:configure.ac:1121: -1- _AM_SUBST_NOTMAKE([HAVE_FUSE_TRUE])
1676+m4trace:configure.ac:1121: -1- _AM_SUBST_NOTMAKE([HAVE_FUSE_FALSE])
1677+m4trace:configure.ac:1122: -1- AM_CONDITIONAL([HAVE_GNU_LD], [test "$with_gnu_ld" = "yes"])
1678+m4trace:configure.ac:1122: -1- m4_pattern_allow([^HAVE_GNU_LD_TRUE$])
1679+m4trace:configure.ac:1122: -1- m4_pattern_allow([^HAVE_GNU_LD_FALSE$])
1680+m4trace:configure.ac:1122: -1- _AM_SUBST_NOTMAKE([HAVE_GNU_LD_TRUE])
1681+m4trace:configure.ac:1122: -1- _AM_SUBST_NOTMAKE([HAVE_GNU_LD_FALSE])
1682+m4trace:configure.ac:1123: -1- AM_CONDITIONAL([HAVE_GTKMM], [test "$have_x" = "yes" -a "$with_gtkmm" = "yes"])
1683+m4trace:configure.ac:1123: -1- m4_pattern_allow([^HAVE_GTKMM_TRUE$])
1684+m4trace:configure.ac:1123: -1- m4_pattern_allow([^HAVE_GTKMM_FALSE$])
1685+m4trace:configure.ac:1123: -1- _AM_SUBST_NOTMAKE([HAVE_GTKMM_TRUE])
1686+m4trace:configure.ac:1123: -1- _AM_SUBST_NOTMAKE([HAVE_GTKMM_FALSE])
1687+m4trace:configure.ac:1124: -1- AM_CONDITIONAL([HAVE_PAM], [test "$with_pam" = "yes"])
1688+m4trace:configure.ac:1124: -1- m4_pattern_allow([^HAVE_PAM_TRUE$])
1689+m4trace:configure.ac:1124: -1- m4_pattern_allow([^HAVE_PAM_FALSE$])
1690+m4trace:configure.ac:1124: -1- _AM_SUBST_NOTMAKE([HAVE_PAM_TRUE])
1691+m4trace:configure.ac:1124: -1- _AM_SUBST_NOTMAKE([HAVE_PAM_FALSE])
1692+m4trace:configure.ac:1125: -1- AM_CONDITIONAL([USE_SLASH_PROC], [test "os" = "linux" -a "$have_glib_2_14" = "yes"])
1693+m4trace:configure.ac:1125: -1- m4_pattern_allow([^USE_SLASH_PROC_TRUE$])
1694+m4trace:configure.ac:1125: -1- m4_pattern_allow([^USE_SLASH_PROC_FALSE$])
1695+m4trace:configure.ac:1125: -1- _AM_SUBST_NOTMAKE([USE_SLASH_PROC_TRUE])
1696+m4trace:configure.ac:1125: -1- _AM_SUBST_NOTMAKE([USE_SLASH_PROC_FALSE])
1697+m4trace:configure.ac:1128: -1- m4_pattern_allow([^NO_XSM$])
1698+m4trace:configure.ac:1132: -1- m4_pattern_allow([^NO_XCOMPOSITE$])
1699+m4trace:configure.ac:1144: -1- m4_pattern_allow([^NO_MULTIMON$])
1700+m4trace:configure.ac:1186: -1- m4_pattern_allow([^HGFS_LIBS$])
1701+m4trace:configure.ac:1187: -1- m4_pattern_allow([^TOOLS_VERSION$])
1702+m4trace:configure.ac:1188: -1- m4_pattern_allow([^TARGET_OS$])
1703+m4trace:configure.ac:1189: -1- m4_pattern_allow([^KERNEL_RELEASE$])
1704+m4trace:configure.ac:1190: -1- m4_pattern_allow([^LINUXINCLUDE$])
1705+m4trace:configure.ac:1191: -1- m4_pattern_allow([^MODULES_OS$])
1706+m4trace:configure.ac:1192: -1- m4_pattern_allow([^MODULES_DIR$])
1707+m4trace:configure.ac:1193: -1- m4_pattern_allow([^MODULES$])
1708+m4trace:configure.ac:1194: -1- m4_pattern_allow([^COMMON_XLIBS$])
1709+m4trace:configure.ac:1195: -1- m4_pattern_allow([^XSM_LIBS$])
1710+m4trace:configure.ac:1196: -1- m4_pattern_allow([^XCOMPOSITE_LIBS$])
1711+m4trace:configure.ac:1197: -1- m4_pattern_allow([^PAM_PREFIX$])
1712+m4trace:configure.ac:1198: -1- m4_pattern_allow([^PLUGIN_CPPFLAGS$])
1713+m4trace:configure.ac:1199: -1- m4_pattern_allow([^PLUGIN_LDFLAGS$])
1714+m4trace:configure.ac:1200: -1- m4_pattern_allow([^VMTOOLS_CPPFLAGS$])
1715+m4trace:configure.ac:1201: -1- m4_pattern_allow([^VMTOOLS_LIBS$])
1716+m4trace:configure.ac:1202: -1- m4_pattern_allow([^RPCGENFLAGS$])
1717+m4trace:configure.ac:1203: -1- m4_pattern_allow([^XDR_LIBS$])
1718+m4trace:configure.ac:1204: -1- m4_pattern_allow([^TEST_PLUGIN_INSTALLDIR$])
1719+m4trace:configure.ac:1205: -1- m4_pattern_allow([^COMMON_PLUGIN_INSTALLDIR$])
1720+m4trace:configure.ac:1206: -1- m4_pattern_allow([^VMSVC_PLUGIN_INSTALLDIR$])
1721+m4trace:configure.ac:1207: -1- m4_pattern_allow([^VMUSR_PLUGIN_INSTALLDIR$])
1722+m4trace:configure.ac:1212: -1- m4_pattern_allow([^SYSDIR$])
1723+m4trace:configure.ac:1214: -1- m4_pattern_allow([^INSTVMSG$])
1724+m4trace:configure.ac:1215: -1- m4_pattern_allow([^RPCGEN_WRAPPER$])
1725+m4trace:configure.ac:1219: -1- m4_pattern_allow([^LIB_AUTH_CPPFLAGS$])
1726+m4trace:configure.ac:1220: -1- m4_pattern_allow([^LIB_IMPERSONATE_CPPFLAGS$])
1727+m4trace:configure.ac:1221: -1- m4_pattern_allow([^LIB_USER_CPPFLAGS$])
1728+m4trace:configure.ac:1222: -1- m4_pattern_allow([^LIBVMTOOLS_LIBADD$])
1729+m4trace:configure.ac:1226: -1- m4_pattern_allow([^VIX_LIBADD$])
1730+m4trace:configure.ac:1319: -1- m4_pattern_allow([^LIB@&t@OBJS$])
1731+m4trace:configure.ac:1319: -1- m4_pattern_allow([^LTLIBOBJS$])
1732+m4trace:configure.ac:1319: -1- AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])
1733+m4trace:configure.ac:1319: -1- m4_pattern_allow([^am__EXEEXT_TRUE$])
1734+m4trace:configure.ac:1319: -1- m4_pattern_allow([^am__EXEEXT_FALSE$])
1735+m4trace:configure.ac:1319: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_TRUE])
1736+m4trace:configure.ac:1319: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_FALSE])
1737+m4trace:configure.ac:1319: -1- _AM_OUTPUT_DEPENDENCY_COMMANDS
1738+m4trace:configure.ac:1319: -1- _LT_PROG_LTMAIN
1739
1740=== modified file 'configure'
1741--- configure 2011-07-22 16:41:03 +0000
1742+++ configure 2011-10-31 00:22:23 +0000
1743@@ -1,6 +1,6 @@
1744 #! /bin/sh
1745 # Guess values for system-dependent variables and create Makefiles.
1746-# Generated by GNU Autoconf 2.67 for open-vm-tools 2011.07.19.
1747+# Generated by GNU Autoconf 2.67 for open-vm-tools 2011.08.21.
1748 #
1749 # Report bugs to <open-vm-tools-devel@lists.sourceforge.net>.
1750 #
1751@@ -701,8 +701,8 @@
1752 # Identity of this package.
1753 PACKAGE_NAME='open-vm-tools'
1754 PACKAGE_TARNAME='open-vm-tools'
1755-PACKAGE_VERSION='2011.07.19'
1756-PACKAGE_STRING='open-vm-tools 2011.07.19'
1757+PACKAGE_VERSION='2011.08.21'
1758+PACKAGE_STRING='open-vm-tools 2011.08.21'
1759 PACKAGE_BUGREPORT='open-vm-tools-devel@lists.sourceforge.net'
1760 PACKAGE_URL=''
1761
1762@@ -1561,7 +1561,7 @@
1763 # Omit some internal or obsolete options to make the list less imposing.
1764 # This message is too long to be a string in the A/UX 3.1 sh.
1765 cat <<_ACEOF
1766-\`configure' configures open-vm-tools 2011.07.19 to adapt to many kinds of systems.
1767+\`configure' configures open-vm-tools 2011.08.21 to adapt to many kinds of systems.
1768
1769 Usage: $0 [OPTION]... [VAR=VALUE]...
1770
1771@@ -1635,7 +1635,7 @@
1772
1773 if test -n "$ac_init_help"; then
1774 case $ac_init_help in
1775- short | recursive ) echo "Configuration of open-vm-tools 2011.07.19:";;
1776+ short | recursive ) echo "Configuration of open-vm-tools 2011.08.21:";;
1777 esac
1778 cat <<\_ACEOF
1779
1780@@ -1762,7 +1762,7 @@
1781 test -n "$ac_init_help" && exit $ac_status
1782 if $ac_init_version; then
1783 cat <<\_ACEOF
1784-open-vm-tools configure 2011.07.19
1785+open-vm-tools configure 2011.08.21
1786 generated by GNU Autoconf 2.67
1787
1788 Copyright (C) 2010 Free Software Foundation, Inc.
1789@@ -2454,7 +2454,7 @@
1790 This file contains any messages produced by compilers while
1791 running configure, to aid debugging if configure makes a mistake.
1792
1793-It was created by open-vm-tools $as_me 2011.07.19, which was
1794+It was created by open-vm-tools $as_me 2011.08.21, which was
1795 generated by GNU Autoconf 2.67. Invocation command line was
1796
1797 $ $0 $@
1798@@ -3529,7 +3529,7 @@
1799
1800 # Define the identity of the package.
1801 PACKAGE='open-vm-tools'
1802- VERSION='2011.07.19'
1803+ VERSION='2011.08.21'
1804
1805
1806 cat >>confdefs.h <<_ACEOF
1807@@ -22584,6 +22584,34 @@
1808 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
1809 CFLAGS="$ORIGINAL_CFLAGS"
1810
1811+# Detect "unused-but-set-variable" gcc warning and disable it.
1812+ORIGINAL_CFLAGS="$CFLAGS"
1813+CFLAGS="$CFLAGS -Wno-unused-but-set-variable"
1814+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GCC flag -Wno-unused-but-set-variable" >&5
1815+$as_echo_n "checking for GCC flag -Wno-unused-but-set-variable... " >&6; }
1816+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1817+/* end confdefs.h. */
1818+
1819+int
1820+main ()
1821+{
1822+return 0;
1823+ ;
1824+ return 0;
1825+}
1826+_ACEOF
1827+if ac_fn_c_try_compile "$LINENO"; then :
1828+ ORIGINAL_CFLAGS="$ORIGINAL_CFLAGS -Wno-unused-but-set-variable";
1829+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
1830+$as_echo "yes" >&6; }
1831+else
1832+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1833+$as_echo "no" >&6; }
1834+fi
1835+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
1836+CFLAGS="$ORIGINAL_CFLAGS"
1837+
1838+
1839 BUILDDIR="`pwd`"
1840
1841 INCLUDE_DIR="`cd $srcdir; pwd`/lib/include"
1842@@ -22767,6 +22795,7 @@
1843 fi
1844
1845 if test "$os" = "freebsd"; then
1846+ LIBVMTOOLS_LIBADD="$LIBVMTOOLS_LIBADD -lkvm"
1847 MODULES_DIR="/boot/modules"
1848
1849 if test "$osVersion" -ge 302000; then
1850@@ -23773,7 +23802,7 @@
1851 # report actual input values of CONFIG_FILES etc. instead of their
1852 # values after options handling.
1853 ac_log="
1854-This file was extended by open-vm-tools $as_me 2011.07.19, which was
1855+This file was extended by open-vm-tools $as_me 2011.08.21, which was
1856 generated by GNU Autoconf 2.67. Invocation command line was
1857
1858 CONFIG_FILES = $CONFIG_FILES
1859@@ -23830,7 +23859,7 @@
1860 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
1861 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
1862 ac_cs_version="\\
1863-open-vm-tools config.status 2011.07.19
1864+open-vm-tools config.status 2011.08.21
1865 configured by $0, generated by GNU Autoconf 2.67,
1866 with options \\"\$ac_cs_config\\"
1867
1868
1869=== modified file 'configure.ac'
1870--- configure.ac 2011-07-22 16:41:03 +0000
1871+++ configure.ac 2011-10-31 00:22:23 +0000
1872@@ -39,10 +39,10 @@
1873 ### Initialization
1874 ###
1875
1876-TOOLS_VERSION="2011.07.19"
1877+TOOLS_VERSION="2011.08.21"
1878 AC_INIT(
1879 [open-vm-tools],
1880- [2011.07.19],
1881+ [2011.08.21],
1882 [open-vm-tools-devel@lists.sourceforge.net])
1883
1884 # In order to make this configure script auto-detect situations where
1885@@ -954,6 +954,18 @@
1886 [AC_MSG_RESULT(no)])
1887 CFLAGS="$ORIGINAL_CFLAGS"
1888
1889+# Detect "unused-but-set-variable" gcc warning and disable it.
1890+ORIGINAL_CFLAGS="$CFLAGS"
1891+CFLAGS="$CFLAGS -Wno-unused-but-set-variable"
1892+AC_MSG_CHECKING([for GCC flag -Wno-unused-but-set-variable])
1893+AC_TRY_COMPILE([],
1894+ [return 0;],
1895+ [ORIGINAL_CFLAGS="$ORIGINAL_CFLAGS -Wno-unused-but-set-variable";
1896+ AC_MSG_RESULT(yes)],
1897+ [AC_MSG_RESULT(no)])
1898+CFLAGS="$ORIGINAL_CFLAGS"
1899+
1900+
1901 BUILDDIR="`pwd`"
1902
1903 INCLUDE_DIR="`cd $srcdir; pwd`/lib/include"
1904@@ -1025,6 +1037,7 @@
1905 fi
1906
1907 if test "$os" = "freebsd"; then
1908+ LIBVMTOOLS_LIBADD="$LIBVMTOOLS_LIBADD -lkvm"
1909 MODULES_DIR="/boot/modules"
1910
1911 if test "$osVersion" -ge 302000; then
1912
1913=== removed file 'debian/README.source'
1914--- debian/README.source 2010-07-03 21:34:25 +0000
1915+++ debian/README.source 1970-01-01 00:00:00 +0000
1916@@ -1,37 +0,0 @@
1917-Package Repositories
1918---------------------
1919-
1920-Backports for the current stable debian distribution as well as snapshots of
1921-unreleased versions may be available in repositories listed on the maintainers
1922-homepage. The current URL of the maintainer homepage can be seen in
1923-debian/copyright.
1924-
1925-
1926-Source Access
1927--------------
1928-
1929-You can obtain the sources of this package with:
1930-
1931- $ apt-get source ${PACKAGE}
1932-
1933-whereas '${PACKAGE}' has to be replaced with the actual name of the package.
1934-
1935-This package is maintained with the Git version control system. The current git
1936-source tree can be obtained with:
1937-
1938- $ git clone ${GIT_URI}
1939-
1940-whereas '${GIT_URI}' has to be replaced with the actual URI for the Git
1941-repository. The current Git URI can be seen in debian/control in the extracted
1942-package sources.
1943-
1944-More information about Git can be found in the git-core package.
1945-
1946-This package may use the Quilt patch system to manage all modifications to the
1947-upstream source. Changes, if any, are stored in the source package as diffs in
1948-debian/diff and are applied during the build. Current modifications can be
1949-applied to the source tree with:
1950-
1951- $ QUILT_PATCHES=debian/patches quilt push -a
1952-
1953-More information about Quilt can be found in the quilt package.
1954
1955=== modified file 'debian/changelog'
1956--- debian/changelog 2011-07-22 16:41:03 +0000
1957+++ debian/changelog 2011-10-31 00:22:23 +0000
1958@@ -1,3 +1,31 @@
1959+open-vm-tools (2011.08.21-471295-0ubuntu1) precise; urgency=low
1960+
1961+ * Merge latest upstream git tag.
1962+
1963+ * Changes in debian/rules:
1964+ - Removed "-Wno-unused-but-set-variable" from CFLAGS.
1965+ + No longer needed, package now builds successfully without it.
1966+ - Actually remove commented out lines regarding open-vm-toolbox.
1967+
1968+ * Changes in debian/control:
1969+ - open-vm-tools recommends open-vm-dkms (LP: #598933)
1970+ - Added NumLockX as a suggested package for open-vm-tools.
1971+ + Temporary workaround until a proper fix is found.
1972+
1973+ * Partial merge from Debian unstable. Details below:
1974+ - Updating maintainer and uploaders fields.
1975+ - Removing vcs fields.
1976+ - Removing references to Daniel Baumann's old email address.
1977+ - Updating years in copyright file.
1978+ - Updating to standards version 3.9.2.
1979+ - Updating to debhelper version 8.
1980+ - Switching to source format 3.0 (quilt).
1981+ - Removing manual chrpath setting.
1982+ - Removing exclusion from plugins from debhelper shlibs.
1983+ - Rediffing kvers.patch.
1984+
1985+ -- Nate Muench <NowIWillDestroyAbydos@gmail.com> Sun, 30 Oct 2011 19:17:28 -0500
1986+
1987 open-vm-tools (2011.07.19-450511-0ubuntu1) oneiric; urgency=low
1988
1989 * Merge latest upstream git tag. Fixes Building on Oneiric
1990@@ -78,13 +106,13 @@
1991 #579721).
1992 * Updating standards version to 3.9.1.
1993
1994- -- Daniel Baumann <daniel@debian.org> Sat, 14 Aug 2010 12:59:39 +0200
1995+ -- Daniel Baumann <daniel.baumann@progress-technologies.net> Sat, 14 Aug 2010 12:59:39 +0200
1996
1997 open-vm-tools (2010.06.16-268169-2) unstable; urgency=low
1998
1999 * Removing vmmemctl fom initscript (Closes: #588356).
2000
2001- -- Daniel Baumann <daniel@debian.org> Fri, 09 Jul 2010 13:19:42 +0200
2002+ -- Daniel Baumann <daniel.baumann@progress-technologies.net> Fri, 09 Jul 2010 13:19:42 +0200
2003
2004 open-vm-tools (2010.06.16-268169-1) unstable; urgency=low
2005
2006@@ -95,7 +123,7 @@
2007 * Dropping procps.patch, not required anymore.
2008 * Updating packaging for upstreams vmmemctl module removal.
2009
2010- -- Daniel Baumann <daniel@debian.org> Sat, 03 Jul 2010 21:34:25 +0200
2011+ -- Daniel Baumann <daniel.baumann@progress-technologies.net> Sat, 03 Jul 2010 21:34:25 +0200
2012
2013 open-vm-tools (2010.04.25-253928-2+ubuntu2) maverick; urgency=low
2014
2015@@ -116,7 +144,7 @@
2016 * Dropping la files.
2017 * Updating rules for pvscsi removal (Closes: #581160).
2018
2019- -- Daniel Baumann <daniel@debian.org> Tue, 11 May 2010 20:10:45 +0200
2020+ -- Daniel Baumann <daniel.baumann@progress-technologies.net> Tue, 11 May 2010 20:10:45 +0200
2021
2022 open-vm-tools (2010.04.25-253928-1) unstable; urgency=low
2023
2024@@ -125,7 +153,7 @@
2025 * Removing remote_fs from initscript again (Closes: #577163).
2026 * Updating lintian overrides for open-vm-tools.
2027
2028- -- Daniel Baumann <daniel@debian.org> Thu, 29 Apr 2010 22:01:51 +0200
2029+ -- Daniel Baumann <daniel.baumann@progress-technologies.net> Thu, 29 Apr 2010 22:01:51 +0200
2030
2031 open-vm-tools (2010.03.20-243334-4) unstable; urgency=low
2032
2033@@ -143,7 +171,7 @@
2034 * Updating initscript start/stop declarations (Closes: #576843,
2035 #577163).
2036
2037- -- Daniel Baumann <daniel@debian.org> Wed, 14 Apr 2010 18:59:32 +0200
2038+ -- Daniel Baumann <daniel.baumann@progress-technologies.net> Wed, 14 Apr 2010 18:59:32 +0200
2039
2040 open-vm-tools (2010.03.20-243334-3) unstable; urgency=low
2041
2042@@ -155,14 +183,14 @@
2043 * Adding make to open-vm-dkms depends.
2044 * Also stopping in runlevel 1.
2045
2046- -- Daniel Baumann <daniel@debian.org> Tue, 06 Apr 2010 22:42:58 +0200
2047+ -- Daniel Baumann <daniel.baumann@progress-technologies.net> Tue, 06 Apr 2010 22:42:58 +0200
2048
2049 open-vm-tools (2010.03.20-243334-2) unstable; urgency=low
2050
2051 * Addding dkms support based on the work of Evan Broder
2052 <broder@mit.edu> on the ubuntu package (Closes: #516251).
2053
2054- -- Daniel Baumann <daniel@debian.org> Sat, 27 Mar 2010 17:09:36 +0100
2055+ -- Daniel Baumann <daniel.baumann@progress-technologies.net> Sat, 27 Mar 2010 17:09:36 +0100
2056
2057 open-vm-tools (2010.03.20-243334-1) unstable; urgency=low
2058
2059@@ -171,7 +199,7 @@
2060 * Moving local Makefile to subdirectory.
2061 * Adding build-depends to libfuse-dev.
2062
2063- -- Daniel Baumann <daniel@debian.org> Sat, 27 Mar 2010 11:01:55 +0100
2064+ -- Daniel Baumann <daniel.baumann@progress-technologies.net> Sat, 27 Mar 2010 11:01:55 +0100
2065
2066 open-vm-tools (2010.02.23-236320-1+ubuntu1) lucid; urgency=low
2067
2068@@ -187,7 +215,7 @@
2069 * Updating to standards 3.8.4.
2070 * Merging upstream version 2010.02.23-236320.
2071
2072- -- Daniel Baumann <daniel@debian.org> Sat, 27 Feb 2010 16:34:11 +0100
2073+ -- Daniel Baumann <daniel.baumann@progress-technologies.net> Sat, 27 Feb 2010 16:34:11 +0100
2074
2075 open-vm-tools (2010.01.19-226760-1) unstable; urgency=low
2076
2077@@ -197,7 +225,7 @@
2078 * Updating packaging for upstreams vmxnet3 module removal.
2079 * Updating packaging for upstreams test plugin removal.
2080
2081- -- Daniel Baumann <daniel@debian.org> Sun, 24 Jan 2010 09:55:47 +0100
2082+ -- Daniel Baumann <daniel.baumann@progress-technologies.net> Sun, 24 Jan 2010 09:55:47 +0100
2083
2084 open-vm-tools (2009.12.16-217847-1) unstable; urgency=low
2085
2086@@ -206,7 +234,7 @@
2087 * Rediffing kvers.patch.
2088 * Rediffing procps.patch.
2089
2090- -- Daniel Baumann <daniel@debian.org> Sun, 20 Dec 2009 13:36:35 +0100
2091+ -- Daniel Baumann <daniel.baumann@progress-technologies.net> Sun, 20 Dec 2009 13:36:35 +0100
2092
2093 open-vm-tools (2009.11.16-210370-1+ubuntu2) lucid; urgency=low
2094
2095@@ -233,13 +261,13 @@
2096 * Removing test plugin.
2097 * Removing unused plugin symlinks.
2098
2099- -- Daniel Baumann <daniel@debian.org> Sun, 06 Dec 2009 07:45:05 +0100
2100+ -- Daniel Baumann <daniel.baumann@progress-technologies.net> Sun, 06 Dec 2009 07:45:05 +0100
2101
2102 open-vm-tools (2009.10.15-201664-1) unstable; urgency=low
2103
2104 * Merging upstream version 2009.10.15-201664.
2105
2106- -- Daniel Baumann <daniel@debian.org> Sun, 18 Oct 2009 12:28:19 +0200
2107+ -- Daniel Baumann <daniel.baumann@progress-technologies.net> Sun, 18 Oct 2009 12:28:19 +0200
2108
2109 open-vm-tools (2009.09.18-193784-1) unstable; urgency=low
2110
2111@@ -250,7 +278,7 @@
2112 * Moving maintainer homepage from control to copyright.
2113 * Updating README.source.
2114
2115- -- Daniel Baumann <daniel@debian.org> Sun, 04 Oct 2009 08:18:40 +0200
2116+ -- Daniel Baumann <daniel.baumann@progress-technologies.net> Sun, 04 Oct 2009 08:18:40 +0200
2117
2118 open-vm-tools (2009.08.24-187411-1) unstable; urgency=low
2119
2120@@ -259,7 +287,7 @@
2121 * Updating vcs fields.
2122 * Updating package to standards version 3.8.3.
2123
2124- -- Daniel Baumann <daniel@debian.org> Tue, 25 Aug 2009 10:35:29 +0200
2125+ -- Daniel Baumann <daniel.baumann@progress-technologies.net> Tue, 25 Aug 2009 10:35:29 +0200
2126
2127 open-vm-tools (2009.07.22-179896-2) unstable; urgency=low
2128
2129@@ -267,13 +295,13 @@
2130 new dumbnet upstream version broke down (Closes: #539006).
2131 * Using more common name to store local debian additions.
2132
2133- -- Daniel Baumann <daniel@debian.org> Thu, 30 Jul 2009 12:56:49 +0200
2134+ -- Daniel Baumann <daniel.baumann@progress-technologies.net> Thu, 30 Jul 2009 12:56:49 +0200
2135
2136 open-vm-tools (2009.07.22-179896-1) unstable; urgency=low
2137
2138 * Merging upstream version 2009.07.22-179896.
2139
2140- -- Daniel Baumann <daniel@debian.org> Mon, 27 Jul 2009 11:46:49 +0200
2141+ -- Daniel Baumann <daniel.baumann@progress-technologies.net> Mon, 27 Jul 2009 11:46:49 +0200
2142
2143 open-vm-tools (2009.06.18-172495-3) unstable; urgency=medium
2144
2145@@ -286,14 +314,14 @@
2146 package is not supported by upstream (Closes: #518014).
2147 * Cleaning up module source by removing unecessary files.
2148
2149- -- Daniel Baumann <daniel@debian.org> Sun, 19 Jul 2009 11:40:57 +0200
2150+ -- Daniel Baumann <daniel.baumann@progress-technologies.net> Sun, 19 Jul 2009 11:40:57 +0200
2151
2152 open-vm-tools (2009.06.18-172495-2) unstable; urgency=low
2153
2154 * Correcting typo in rules for setting configure flags on amd64
2155 (Closes: #531414).
2156
2157- -- Daniel Baumann <daniel@debian.org> Thu, 16 Jul 2009 23:10:27 +0200
2158+ -- Daniel Baumann <daniel.baumann@progress-technologies.net> Thu, 16 Jul 2009 23:10:27 +0200
2159
2160 open-vm-tools (2009.06.18-172495-1) unstable; urgency=low
2161
2162@@ -302,27 +330,27 @@
2163 * Updating year in copyright file.
2164 * Correcting vcs fields in modules control file.
2165
2166- -- Daniel Baumann <daniel@debian.org> Wed, 01 Jul 2009 11:52:35 -0300
2167+ -- Daniel Baumann <daniel.baumann@progress-technologies.net> Wed, 01 Jul 2009 11:52:35 -0300
2168
2169 open-vm-tools (2009.05.22-167859-3) unstable; urgency=low
2170
2171 * Building without procps on amd64 as a temporary workaround (Closes:
2172 #531429).
2173
2174- -- Daniel Baumann <daniel@debian.org> Mon, 01 Jun 2009 17:13:07 +0200
2175+ -- Daniel Baumann <daniel.baumann@progress-technologies.net> Mon, 01 Jun 2009 17:13:07 +0200
2176
2177 open-vm-tools (2009.05.22-167859-2) unstable; urgency=low
2178
2179 * Adding procps to build-depends (Closes: #531414).
2180 * Adding patch for configure to not hardcode procps version.
2181
2182- -- Daniel Baumann <daniel@debian.org> Mon, 01 Jun 2009 12:53:51 +0200
2183+ -- Daniel Baumann <daniel.baumann@progress-technologies.net> Mon, 01 Jun 2009 12:53:51 +0200
2184
2185 open-vm-tools (2009.05.22-167859-1) unstable; urgency=low
2186
2187 * Merging upstream version 2009.05.22-167859.
2188
2189- -- Daniel Baumann <daniel@debian.org> Sat, 30 May 2009 09:48:43 +0200
2190+ -- Daniel Baumann <daniel.baumann@progress-technologies.net> Sat, 30 May 2009 09:48:43 +0200
2191
2192 open-vm-tools (2009.04.23-162451-1) unstable; urgency=low
2193
2194@@ -331,13 +359,13 @@
2195 anymore.
2196 * Using correct rfc-2822 date formats in changelog.
2197
2198- -- Daniel Baumann <daniel@debian.org> Tue, 19 May 2009 19:21:31 +0200
2199+ -- Daniel Baumann <daniel.baumann@progress-technologies.net> Tue, 19 May 2009 19:21:31 +0200
2200
2201 open-vm-tools (2009.03.18-154848-2) unstable; urgency=low
2202
2203 * Correcting patch system depends (Closes: #520493).
2204
2205- -- Daniel Baumann <daniel@debian.org> Fri, 20 Mar 2009 10:19:00 +0100
2206+ -- Daniel Baumann <daniel.baumann@progress-technologies.net> Fri, 20 Mar 2009 10:19:00 +0100
2207
2208 open-vm-tools (2009.03.18-154848-1) unstable; urgency=low
2209
2210@@ -350,19 +378,19 @@
2211 * Manually handling modprobe file rename from lenny to squeeze
2212 (Closes: #519935).
2213
2214- -- Daniel Baumann <daniel@debian.org> Thu, 19 Mar 2009 09:35:00 +0100
2215+ -- Daniel Baumann <daniel.baumann@progress-technologies.net> Thu, 19 Mar 2009 09:35:00 +0100
2216
2217 open-vm-tools (2009.02.18-148847-3) unstable; urgency=medium
2218
2219 * Updating kvers.dpatch.
2220
2221- -- Daniel Baumann <daniel@debian.org> Wed, 18 Mar 2009 23:16:06 +0100
2222+ -- Daniel Baumann <daniel.baumann@progress-technologies.net> Wed, 18 Mar 2009 23:16:06 +0100
2223
2224 open-vm-tools (2009.02.18-148847-2) unstable; urgency=low
2225
2226 * Using debhelper to install vmxnet modprobe file.
2227
2228- -- Daniel Baumann <daniel@debian.org> Sun, 08 Mar 2009 16:03:00 +0100
2229+ -- Daniel Baumann <daniel.baumann@progress-technologies.net> Sun, 08 Mar 2009 16:03:00 +0100
2230
2231 open-vm-tools (2009.02.18-148847-1) unstable; urgency=low
2232
2233@@ -370,20 +398,20 @@
2234 * Enabling unity support, uriparser 0.7 is finally available.
2235 * Adding libgtkmm-2.4-dev to build-depends.
2236
2237- -- Daniel Baumann <daniel@debian.org> Fri, 20 Feb 2009 09:03:00 +0100
2238+ -- Daniel Baumann <daniel.baumann@progress-technologies.net> Fri, 20 Feb 2009 09:03:00 +0100
2239
2240 open-vm-tools (2009.01.21-142982-2) unstable; urgency=medium
2241
2242 * Always prefering vmxnet over pcnet32 through modprobe and initramfs
2243 configuration (Closes: #502365).
2244
2245- -- Daniel Baumann <daniel@debian.org> Wed, 04 Feb 2009 11:28:00 +0100
2246+ -- Daniel Baumann <daniel.baumann@progress-technologies.net> Wed, 04 Feb 2009 11:28:00 +0100
2247
2248 open-vm-tools (2009.01.21-142982-1) unstable; urgency=low
2249
2250 * Merging upstream version 2009.01.21-142982.
2251
2252- -- Daniel Baumann <daniel@debian.org> Sat, 24 Jan 2009 04:45:00 +0100
2253+ -- Daniel Baumann <daniel.baumann@progress-technologies.net> Sat, 24 Jan 2009 04:45:00 +0100
2254
2255 open-vm-tools (2008.12.23-137496-1) unstable; urgency=low
2256
2257@@ -392,7 +420,7 @@
2258 having vmxnet already loaded at initramfs stage. Thanks to Russ Allbery
2259 <rra@debian.org> (Closes: #510935).
2260
2261- -- Daniel Baumann <daniel@debian.org> Fri, 09 Jan 2009 12:13:00 -0500
2262+ -- Daniel Baumann <daniel.baumann@progress-technologies.net> Fri, 09 Jan 2009 12:13:00 -0500
2263
2264 open-vm-tools (2008.11.18-130226-1) unstable; urgency=low
2265
2266@@ -400,14 +428,14 @@
2267 * Merging upstream version 2008.11.18-130226.
2268 * Updating debian directory for addition of pvscsi and vmxnet3 modules.
2269
2270- -- Daniel Baumann <daniel@debian.org> Thu, 20 Nov 2008 21:56:00 +0100
2271+ -- Daniel Baumann <daniel.baumann@progress-technologies.net> Thu, 20 Nov 2008 21:56:00 +0100
2272
2273 open-vm-tools (2008.10.10-123053-2) unstable; urgency=medium
2274
2275 * Correcting typo in dh_installinit call.
2276 * Downgrading depends on module-assistant to recommends.
2277
2278- -- Daniel Baumann <daniel@debian.org> Thu, 23 Oct 2008 15:32:00 +0200
2279+ -- Daniel Baumann <daniel.baumann@progress-technologies.net> Thu, 23 Oct 2008 15:32:00 +0200
2280
2281 open-vm-tools (2008.10.10-123053-1) unstable; urgency=low
2282
2283@@ -415,14 +443,14 @@
2284 * Merging upstream version 2008.10.10-123053.
2285 * Updating kvers.dpatch.
2286
2287- -- Daniel Baumann <daniel@debian.org> Thu, 16 Oct 2008 19:05:00 +0200
2288+ -- Daniel Baumann <daniel.baumann@progress-technologies.net> Thu, 16 Oct 2008 19:05:00 +0200
2289
2290 open-vm-tools (2008.09.03-114782-2) unstable; urgency=low
2291
2292 * Updating kvers.dpatch (Closes: #498620).
2293 * Updating initscript to correctly handle vmxnet (Closes: #479090, #488810).
2294
2295- -- Daniel Baumann <daniel@debian.org> Sun, 14 Sep 2008 14:30:00 +0200
2296+ -- Daniel Baumann <daniel.baumann@progress-technologies.net> Sun, 14 Sep 2008 14:30:00 +0200
2297
2298 open-vm-tools (2008.09.03-114782-1) unstable; urgency=low
2299
2300@@ -430,7 +458,7 @@
2301 * Updating rules to new location of the config.guess and config.sub files.
2302 * Updating vcs fields in control file.
2303
2304- -- Daniel Baumann <daniel@debian.org> Tue, 09 Sep 2008 22:06:00 +0200
2305+ -- Daniel Baumann <daniel.baumann@progress-technologies.net> Tue, 09 Sep 2008 22:06:00 +0200
2306
2307 open-vm-tools (2008.08.08-109361-1) unstable; urgency=low
2308
2309@@ -442,7 +470,7 @@
2310 * Updating to add new vmci and vsock modules.
2311 * Merging upstream version 2008.08.08-109361.
2312
2313- -- Daniel Baumann <daniel@debian.org> Mon, 11 Aug 2008 15:56:00 +0200
2314+ -- Daniel Baumann <daniel.baumann@progress-technologies.net> Mon, 11 Aug 2008 15:56:00 +0200
2315
2316 open-vm-tools (2008.07.01-102166-3) unstable; urgency=medium
2317
2318@@ -450,7 +478,7 @@
2319 * Fixing FTBFS on amd64 by renaming /etc/pam.d/vmware-guestd-x64 to
2320 /etc/pam.d/vmware-guestd.
2321
2322- -- Daniel Baumann <daniel@debian.org> Thu, 10 Jul 2008 23:24:00 +0200
2323+ -- Daniel Baumann <daniel.baumann@progress-technologies.net> Thu, 10 Jul 2008 23:24:00 +0200
2324
2325 open-vm-tools (2008.07.01-102166-2) unstable; urgency=medium
2326
2327@@ -467,13 +495,13 @@
2328 * Adding symlink from mount.vmhgfs to old vmware-hgfsmounter name.
2329 * Removing executable bit for /etc/pam.d/vmware-guestd file.
2330
2331- -- Daniel Baumann <daniel@debian.org> Fri, 04 Jul 2008 09:59:00 +0200
2332+ -- Daniel Baumann <daniel.baumann@progress-technologies.net> Fri, 04 Jul 2008 09:59:00 +0200
2333
2334 open-vm-tools (2008.07.01-102166-1) unstable; urgency=low
2335
2336 * Merging upstream version 2008.07.01-102166.
2337
2338- -- Daniel Baumann <daniel@debian.org> Thu, 03 Jul 2008 13:01:00 +0200
2339+ -- Daniel Baumann <daniel.baumann@progress-technologies.net> Thu, 03 Jul 2008 13:01:00 +0200
2340
2341 open-vm-tools (2008.06.20-100027-1) unstable; urgency=low
2342
2343@@ -481,7 +509,7 @@
2344 kernel-modules configure switch.
2345 * Merging upstream version 2008.06.20-100027.
2346
2347- -- Daniel Baumann <daniel@debian.org> Tue, 01 Jul 2008 22:22:00 +0200
2348+ -- Daniel Baumann <daniel.baumann@progress-technologies.net> Tue, 01 Jul 2008 22:22:00 +0200
2349
2350 open-vm-tools (2008.06.03-96374-2) unstable; urgency=medium
2351
2352@@ -489,7 +517,7 @@
2353 * Splitting open-vm-tools into open-vm-tools (CLI tools) and open-vm-
2354 toolbox (GUI tools) (Closes: #467042).
2355
2356- -- Daniel Baumann <daniel@debian.org> Fri, 20 Jun 2008 14:51:00 +0200
2357+ -- Daniel Baumann <daniel.baumann@progress-technologies.net> Fri, 20 Jun 2008 14:51:00 +0200
2358
2359 open-vm-tools (2008.06.03-96374-1) unstable; urgency=medium
2360
2361@@ -500,14 +528,14 @@
2362 * Merging upstream version 2008.06.03-96374 (Closes: #484242).
2363 * Updating to standards 3.8.0.
2364
2365- -- Daniel Baumann <daniel@debian.org> Fri, 20 Jun 2008 14:12:00 +0200
2366+ -- Daniel Baumann <daniel.baumann@progress-technologies.net> Fri, 20 Jun 2008 14:12:00 +0200
2367
2368 open-vm-tools (2008.05.15-93241-2) unstable; urgency=medium
2369
2370 * Updating location of vmware-checkvm in init script (Closes: #483056).
2371 * Correcting typo in mount.vmhgfs symlink (Closes: #474694).
2372
2373- -- Daniel Baumann <daniel@debian.org> Tue, 27 May 2008 07:29:00 +0200
2374+ -- Daniel Baumann <daniel.baumann@progress-technologies.net> Tue, 27 May 2008 07:29:00 +0200
2375
2376 open-vm-tools (2008.05.15-93241-1) unstable; urgency=medium
2377
2378@@ -522,14 +550,14 @@
2379 * Removing debian todo file.
2380 * Merging upstream version 2008.05.15-93241.
2381
2382- -- Daniel Baumann <daniel@debian.org> Wed, 21 May 2008 09:15:00 +0200
2383+ -- Daniel Baumann <daniel.baumann@progress-technologies.net> Wed, 21 May 2008 09:15:00 +0200
2384
2385 open-vm-tools (2008.05.02-90473-1) unstable; urgency=low
2386
2387 * Adding libicu-dev to build-depends.
2388 * Merging upstream version 2008.05.02-90473.
2389
2390- -- Daniel Baumann <daniel@debian.org> Sat, 03 May 2008 09:44:00 +0200
2391+ -- Daniel Baumann <daniel.baumann@progress-technologies.net> Sat, 03 May 2008 09:44:00 +0200
2392
2393 open-vm-tools (2008.04.14-87182-1) unstable; urgency=medium
2394
2395@@ -546,7 +574,7 @@
2396 * Updating vcs fields in control.
2397 * Updating package to debhelper 7.
2398
2399- -- Daniel Baumann <daniel@debian.org> Sat, 26 Apr 2008 13:40:00 +0200
2400+ -- Daniel Baumann <daniel.baumann@progress-technologies.net> Sat, 26 Apr 2008 13:40:00 +0200
2401
2402 open-vm-tools (2008.02.13-77928-2) unstable; urgency=medium
2403
2404@@ -554,13 +582,13 @@
2405 * Cleaned up copyright.
2406 * Fixing pathes and binary names in init script (Closes: #469146).
2407
2408- -- Daniel Baumann <daniel@debian.org> Sat, 08 Mar 2008 08:48:00 +0100
2409+ -- Daniel Baumann <daniel.baumann@progress-technologies.net> Sat, 08 Mar 2008 08:48:00 +0100
2410
2411 open-vm-tools (2008.02.13-77928-1) unstable; urgency=low
2412
2413 * Adding upstream version 2008.02.13-77928.
2414
2415- -- Daniel Baumann <daniel@debian.org> Sun, 24 Feb 2008 20:41:00 +0100
2416+ -- Daniel Baumann <daniel.baumann@progress-technologies.net> Sun, 24 Feb 2008 20:41:00 +0100
2417
2418 open-vm-tools (2008.01.23-74039-2) unstable; urgency=low
2419
2420@@ -574,7 +602,7 @@
2421 * Reverting config.guess and config.sub to upstream.
2422 * Adding vmware-guestd init script (Closes: #465276).
2423
2424- -- Daniel Baumann <daniel@debian.org> Sun, 24 Feb 2008 20:20:00 +0100
2425+ -- Daniel Baumann <daniel.baumann@progress-technologies.net> Sun, 24 Feb 2008 20:20:00 +0100
2426
2427 open-vm-tools (2008.01.23-74039-1) unstable; urgency=low
2428
2429@@ -584,30 +612,30 @@
2430 * Bumping package to policy 3.7.3.
2431 * Also removing user/ in clean target of rules.
2432
2433- -- Daniel Baumann <daniel@debian.org> Wed, 30 Jan 2008 15:24:00 +0100
2434+ -- Daniel Baumann <daniel.baumann@progress-technologies.net> Wed, 30 Jan 2008 15:24:00 +0100
2435
2436 open-vm-tools (2007.11.21-64693-2) unstable; urgency=low
2437
2438 * Adding open-vm-source package for module source.
2439 * Upload to unstable.
2440
2441- -- Daniel Baumann <daniel@debian.org> Mon, 26 Nov 2007 11:08:00 +0100
2442+ -- Daniel Baumann <daniel.baumann@progress-technologies.net> Mon, 26 Nov 2007 11:08:00 +0100
2443
2444 open-vm-tools (2007.11.21-64693-1) experimental; urgency=low
2445
2446 * New upstream release.
2447
2448- -- Daniel Baumann <daniel@debian.org> Mon, 26 Nov 2007 11:07:00 +0100
2449+ -- Daniel Baumann <daniel.baumann@progress-technologies.net> Mon, 26 Nov 2007 11:07:00 +0100
2450
2451 open-vm-tools (2007.09.04-56574-2) experimental; urgency=low
2452
2453 * Moving package to contrib (Closes: #445439).
2454 * Limiting architectures to amd64 and i386 (Closes: #445374).
2455
2456- -- Daniel Baumann <daniel@debian.org> Tue, 09 Oct 2007 10:05:00 +0200
2457+ -- Daniel Baumann <daniel.baumann@progress-technologies.net> Tue, 09 Oct 2007 10:05:00 +0200
2458
2459 open-vm-tools (2007.09.04-56574-1) experimental; urgency=low
2460
2461 * Initial release (Closes: #441905).
2462
2463- -- Daniel Baumann <daniel@debian.org> Sun, 09 Sep 2007 16:53:00 +0200
2464+ -- Daniel Baumann <daniel.baumann@progress-technologies.net> Sun, 09 Sep 2007 16:53:00 +0200
2465
2466=== modified file 'debian/compat'
2467--- debian/compat 2008-06-20 14:12:00 +0000
2468+++ debian/compat 2011-10-31 00:22:23 +0000
2469@@ -1,1 +1,1 @@
2470-7
2471+8
2472
2473=== modified file 'debian/control'
2474--- debian/control 2011-07-22 16:41:03 +0000
2475+++ debian/control 2011-10-31 00:22:23 +0000
2476@@ -2,23 +2,21 @@
2477 Section: contrib/admin
2478 Priority: extra
2479 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
2480-XSBC-Original-Maintainer: Debian VMware Maintainers <vmware@lists.debian-maintainers.org>
2481-Uploaders: Daniel Baumann <daniel@debian.org>
2482+XSBC-Original-Maintainer: Daniel Baumann <daniel.baumann@progress-technologies.net>
2483 Build-Depends:
2484- debhelper (>= 7), autotools-dev, quilt, libdumbnet-dev, libfuse-dev,
2485+ debhelper (>= 8), autotools-dev, libdumbnet-dev, libfuse-dev,
2486 libgtk2.0-dev, libgtkmm-2.4-dev, libicu-dev, libnotify-dev, libpam0g-dev,
2487 libproc-dev [i386], liburiparser-dev (>= 0.7), libx11-dev, libxinerama-dev,
2488- libxss-dev, libxtst-dev, quilt
2489-Standards-Version: 3.9.1
2490+ libxss-dev, libxtst-dev
2491+Standards-Version: 3.9.2
2492 Homepage: http://open-vm-tools.sourceforge.net/
2493-Vcs-Browser: http://git.debian-maintainers.org/?p=vmware/open-vm-tools.git
2494-Vcs-Git: git://git.debian-maintainers.org/git/vmware/open-vm-tools.git
2495
2496 Package: open-vm-tools
2497 Architecture: amd64 i386
2498 Depends: ${misc:Depends}, ${shlibs:Depends}
2499-Recommends: open-vm-source, ethtool, zerofree, xauth, xserver-xorg-input-vmmouse, xserver-xorg-video-vmware
2500-Suggests: xdg-utils
2501+Recommends: open-vm-source, open-vm-dkms, ethtool, zerofree, xauth,
2502+ xserver-xorg-input-vmmouse, xserver-xorg-video-vmware
2503+Suggests: xdg-utils, numlockx
2504 Replaces: open-vm-toolbox
2505 Breaks: open-vm-toolbox
2506 Description: tools and components for VMware guest systems (CLI tools)
2507
2508=== modified file 'debian/control.modules.in'
2509--- debian/control.modules.in 2009-10-18 12:28:19 +0000
2510+++ debian/control.modules.in 2011-10-31 00:22:23 +0000
2511@@ -1,14 +1,10 @@
2512 Source: open-vm-tools
2513 Section: contrib/admin
2514 Priority: extra
2515-Maintainer: Debian VMware Maintainers <vmware@lists.debian-maintainers.org>
2516-Uploaders: Daniel Baumann <daniel@debian.org>
2517-Build-Depends: debhelper (>= 7)
2518-Standards-Version: 3.8.3
2519+Maintainer: Daniel Baumann <daniel.baumann@progress-technologies.net>
2520+Build-Depends: debhelper (>= 8)
2521+Standards-Version: 3.9.2
2522 Homepage: http://open-vm-tools.sourceforge.net/
2523-Vcs-Browser: http://git.debian-maintainers.org/?p=vmware/open-vm-tools.git
2524-Vcs-Git: git://git.debian-maintainers.org/git/vmware/open-vm-tools.git
2525-XSBC-Maintainer-Homepage: http://vmware.debian-maintainers.org/
2526
2527 Package: open-vm-modules-_KVERS_
2528 Architecture: any
2529
2530=== modified file 'debian/copyright'
2531--- debian/copyright 2010-03-22 15:41:59 +0000
2532+++ debian/copyright 2011-10-31 00:22:23 +0000
2533@@ -1,8 +1,3 @@
2534-Upstream-Contact: Open VM Tools project <open-vm-tools-devel@lists.sourceforge.net>
2535-Upstream-Homepage: http://open-vm-tools.sourceforge.net/
2536-Maintainer-Contact: Debian VMware Maintainers <vmware@lists.debian-maintainers.org>
2537-Maintainer-Homepage: http://vmware.debian-maintainers.org/
2538-
2539 Files: *
2540 Copyright: (C) VMware, Inc. <http://www.vmware.com/>
2541 License: GPL-2.1
2542@@ -137,7 +132,7 @@
2543 the copyright holder(s) and author(s).
2544
2545 Files: debian/*
2546-Copyright: (C) 2007-2010 Daniel Baumann <daniel@debian.org>
2547+Copyright: (C) 2007-2011 Daniel Baumann <daniel.baumann@progress-technologies.net>
2548 License: GPL-2+
2549 This program is free software; you can redistribute it and/or modify it under
2550 the terms of the GNU General Public License as published by the Free Software
2551
2552=== modified file 'debian/open-vm-source.README.Debian'
2553--- debian/open-vm-source.README.Debian 2009-10-18 12:28:19 +0000
2554+++ debian/open-vm-source.README.Debian 2011-10-31 00:22:23 +0000
2555@@ -15,4 +15,4 @@
2556 * Using the make-kpkg(1) command provided by the kernel-package Debian
2557 package. See the "modules_image" section of the make-kpkg(1) man page.
2558
2559- -- Daniel Baumann <daniel@debian.org> Sun, 9 Sep 2007 16:53:00 +0200
2560+ -- Daniel Baumann <daniel.baumann@progress-technologies.net> Sun, 9 Sep 2007 16:53:00 +0200
2561
2562=== modified file 'debian/patches/01-kvers.patch'
2563--- debian/patches/01-kvers.patch 2011-03-31 14:20:05 +0000
2564+++ debian/patches/01-kvers.patch 2011-10-31 00:22:23 +0000
2565@@ -1,81 +1,76 @@
2566 Author: Cyril Brulebois <cyril.brulebois@enst-bretagne.fr>
2567 Description: Replacing uname call with KVERS, overwriting seemed not to work.
2568
2569-Index: open-vm-tools-2010.06.16-268169/modules/linux/vmblock/Makefile
2570-===================================================================
2571---- open-vm-tools-2010.06.16-268169.orig/modules/linux/vmblock/Makefile 2011-03-08 17:11:48.701605582 -0600
2572-+++ open-vm-tools-2010.06.16-268169/modules/linux/vmblock/Makefile 2011-03-08 17:11:50.821605582 -0600
2573-@@ -43,7 +43,7 @@
2574- endif
2575-
2576-
2577--VM_UNAME = $(shell uname -r)
2578-+VM_UNAME = $(KVERS)
2579-
2580- # Header directory for the running kernel
2581- ifdef LINUXINCLUDE
2582-Index: open-vm-tools-2010.06.16-268169/modules/linux/vmci/Makefile
2583-===================================================================
2584---- open-vm-tools-2010.06.16-268169.orig/modules/linux/vmci/Makefile 2011-03-08 17:11:48.721605582 -0600
2585-+++ open-vm-tools-2010.06.16-268169/modules/linux/vmci/Makefile 2011-03-08 17:11:50.841605582 -0600
2586-@@ -43,7 +43,7 @@
2587- endif
2588-
2589-
2590--VM_UNAME = $(shell uname -r)
2591-+VM_UNAME = $(KVERS)
2592-
2593- # Header directory for the running kernel
2594- ifdef LINUXINCLUDE
2595-Index: open-vm-tools-2010.06.16-268169/modules/linux/vmhgfs/Makefile
2596-===================================================================
2597---- open-vm-tools-2010.06.16-268169.orig/modules/linux/vmhgfs/Makefile 2011-03-08 17:11:48.741605582 -0600
2598-+++ open-vm-tools-2010.06.16-268169/modules/linux/vmhgfs/Makefile 2011-03-08 17:11:50.861605582 -0600
2599-@@ -43,7 +43,7 @@
2600- endif
2601-
2602-
2603--VM_UNAME = $(shell uname -r)
2604-+VM_UNAME = $(KVERS)
2605-
2606- # Header directory for the running kernel
2607- ifdef LINUXINCLUDE
2608-Index: open-vm-tools-2010.06.16-268169/modules/linux/vmsync/Makefile
2609-===================================================================
2610---- open-vm-tools-2010.06.16-268169.orig/modules/linux/vmsync/Makefile 2011-03-08 17:11:48.761605582 -0600
2611-+++ open-vm-tools-2010.06.16-268169/modules/linux/vmsync/Makefile 2011-03-08 17:11:50.891605582 -0600
2612-@@ -43,7 +43,7 @@
2613- endif
2614-
2615-
2616--VM_UNAME = $(shell uname -r)
2617-+VM_UNAME = $(KVERS)
2618-
2619- # Header directory for the running kernel
2620- ifdef LINUXINCLUDE
2621-Index: open-vm-tools-2010.06.16-268169/modules/linux/vmxnet/Makefile
2622-===================================================================
2623---- open-vm-tools-2010.06.16-268169.orig/modules/linux/vmxnet/Makefile 2011-03-08 17:11:48.781605582 -0600
2624-+++ open-vm-tools-2010.06.16-268169/modules/linux/vmxnet/Makefile 2011-03-08 17:11:50.931605582 -0600
2625-@@ -43,7 +43,7 @@
2626- endif
2627-
2628-
2629--VM_UNAME = $(shell uname -r)
2630-+VM_UNAME = $(KVERS)
2631-
2632- # Header directory for the running kernel
2633- ifdef LINUXINCLUDE
2634-Index: open-vm-tools-2010.06.16-268169/modules/linux/vsock/Makefile
2635-===================================================================
2636---- open-vm-tools-2010.06.16-268169.orig/modules/linux/vsock/Makefile 2011-03-08 17:11:48.811605582 -0600
2637-+++ open-vm-tools-2010.06.16-268169/modules/linux/vsock/Makefile 2011-03-08 17:11:50.961605582 -0600
2638-@@ -43,7 +43,7 @@
2639- endif
2640-
2641-
2642--VM_UNAME = $(shell uname -r)
2643-+VM_UNAME = $(KVERS)
2644-
2645- # Header directory for the running kernel
2646- ifdef LINUXINCLUDE
2647+diff -Naurp open-vm-tools.orig/modules/linux/vmblock/Makefile open-vm-tools/modules/linux/vmblock/Makefile
2648+--- open-vm-tools.orig/modules/linux/vmblock/Makefile 2011-08-28 14:17:10.216965523 +0200
2649++++ open-vm-tools/modules/linux/vmblock/Makefile 2011-08-28 14:48:23.558254911 +0200
2650+@@ -43,7 +43,7 @@ INCLUDE += -I$(SRCROOT)/shared
2651+ endif
2652+
2653+
2654+-VM_UNAME = $(shell uname -r)
2655++VM_UNAME = $(KVERS)
2656+
2657+ # Header directory for the running kernel
2658+ ifdef LINUXINCLUDE
2659+diff -Naurp open-vm-tools.orig/modules/linux/vmci/Makefile open-vm-tools/modules/linux/vmci/Makefile
2660+--- open-vm-tools.orig/modules/linux/vmci/Makefile 2011-08-28 14:17:10.216965523 +0200
2661++++ open-vm-tools/modules/linux/vmci/Makefile 2011-08-28 14:48:24.586260009 +0200
2662+@@ -43,7 +43,7 @@ INCLUDE += -I$(SRCROOT)/shared
2663+ endif
2664+
2665+
2666+-VM_UNAME = $(shell uname -r)
2667++VM_UNAME = $(KVERS)
2668+
2669+ # Header directory for the running kernel
2670+ ifdef LINUXINCLUDE
2671+diff -Naurp open-vm-tools.orig/modules/linux/vmhgfs/Makefile open-vm-tools/modules/linux/vmhgfs/Makefile
2672+--- open-vm-tools.orig/modules/linux/vmhgfs/Makefile 2011-08-28 14:17:10.228965579 +0200
2673++++ open-vm-tools/modules/linux/vmhgfs/Makefile 2011-08-28 14:48:25.554264810 +0200
2674+@@ -43,7 +43,7 @@ INCLUDE += -I$(SRCROOT)/shared
2675+ endif
2676+
2677+
2678+-VM_UNAME = $(shell uname -r)
2679++VM_UNAME = $(KVERS)
2680+
2681+ # Header directory for the running kernel
2682+ ifdef LINUXINCLUDE
2683+diff -Naurp open-vm-tools.orig/modules/linux/vmsync/Makefile open-vm-tools/modules/linux/vmsync/Makefile
2684+--- open-vm-tools.orig/modules/linux/vmsync/Makefile 2011-08-28 14:17:10.240965642 +0200
2685++++ open-vm-tools/modules/linux/vmsync/Makefile 2011-08-28 14:48:27.638275144 +0200
2686+@@ -43,7 +43,7 @@ INCLUDE += -I$(SRCROOT)/shared
2687+ endif
2688+
2689+
2690+-VM_UNAME = $(shell uname -r)
2691++VM_UNAME = $(KVERS)
2692+
2693+ # Header directory for the running kernel
2694+ ifdef LINUXINCLUDE
2695+diff -Naurp open-vm-tools.orig/modules/linux/vmxnet/Makefile open-vm-tools/modules/linux/vmxnet/Makefile
2696+--- open-vm-tools.orig/modules/linux/vmxnet/Makefile 2011-08-28 14:17:10.240965642 +0200
2697++++ open-vm-tools/modules/linux/vmxnet/Makefile 2011-08-28 14:48:28.602279930 +0200
2698+@@ -43,7 +43,7 @@ INCLUDE += -I$(SRCROOT)/shared
2699+ endif
2700+
2701+
2702+-VM_UNAME = $(shell uname -r)
2703++VM_UNAME = $(KVERS)
2704+
2705+ # Header directory for the running kernel
2706+ ifdef LINUXINCLUDE
2707+diff -Naurp open-vm-tools.orig/modules/linux/vsock/Makefile open-vm-tools/modules/linux/vsock/Makefile
2708+--- open-vm-tools.orig/modules/linux/vsock/Makefile 2011-08-28 14:17:10.244965654 +0200
2709++++ open-vm-tools/modules/linux/vsock/Makefile 2011-08-28 14:48:31.254293082 +0200
2710+@@ -43,7 +43,7 @@ INCLUDE += -I$(SRCROOT)/shared
2711+ endif
2712+
2713+
2714+-VM_UNAME = $(shell uname -r)
2715++VM_UNAME = $(KVERS)
2716+
2717+ # Header directory for the running kernel
2718+ ifdef LINUXINCLUDE
2719+
2720
2721=== modified file 'debian/rules'
2722--- debian/rules 2011-07-22 16:41:03 +0000
2723+++ debian/rules 2011-10-31 00:22:23 +0000
2724@@ -3,8 +3,6 @@
2725 # Uncomment this to turn on verbose mode.
2726 #export DH_VERBOSE=1
2727
2728-include /usr/share/quilt/quilt.make
2729-
2730 # These are used for cross-compiling and for saving the configure script
2731 # from having to guess our platform (since we know it already)
2732 DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
2733@@ -19,9 +17,9 @@
2734 #CFLAGS = -Wall -g
2735
2736 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
2737- CFLAGS += -Wno-unused-but-set-variable -O0
2738+ CFLAGS += -O0
2739 else
2740- CFLAGS += -Wno-unused-but-set-variable -O2
2741+ CFLAGS += -O2
2742 endif
2743
2744 # some default definitions, important!
2745@@ -93,7 +91,7 @@
2746 dh_builddeb --destdir=$(DEB_DESTDIR)
2747 dh_prep
2748
2749-config.status: configure patch
2750+config.status: configure
2751 dh_testdir
2752
2753 ifneq "$(wildcard /usr/share/misc/config.sub)" ""
2754@@ -115,7 +113,7 @@
2755
2756 touch build-stamp
2757
2758-clean: unpatch
2759+clean:
2760 dh_testdir
2761 dh_testroot
2762 rm -f build-stamp
2763@@ -147,8 +145,6 @@
2764
2765 install -D -m 4755 vmware-user-suid-wrapper/vmware-user-suid-wrapper debian/open-vm-tools/usr/sbin/vmware-user-suid-wrapper
2766
2767-# install -D -m 0644 toolbox/smallIcon.xpm debian/open-vm-toolbox/usr/share/pixmaps/vmware-toolbox.xpm
2768-
2769 set -e; if [ -e debian/open-vm-tools/etc/pam.d/vmtoolsd-x64 ]; \
2770 then \
2771 sed -i -e "s|lib64|lib|g" debian/open-vm-tools/etc/pam.d/vmtoolsd-x64; \
2772@@ -162,26 +158,6 @@
2773 # Moving open-vm-tools files
2774 mkdir -p debian/open-vm-tools/sbin
2775 mv debian/open-vm-tools/usr/sbin/mount.vmhgfs debian/open-vm-tools/sbin/mount.vmhgfs
2776-
2777- # Moving open-vm-toolbox files
2778-# mkdir -p debian/open-vm-toolbox/usr/bin
2779- # vmware-user no longer seems to exist
2780- #mv debian/open-vm-tools/usr/bin/vmware-user debian/open-vm-toolbox/usr/bin
2781-# mv debian/open-vm-tools/usr/bin/vmware-toolbox debian/open-vm-toolbox/usr/bin
2782- # this should be done with open-vm-toolbox.install ?
2783-# mkdir -p debian/open-vm-tools/etc
2784-# mv debian/open-vm-tools/etc/xdg debian/open-vm-toolbox/etc/
2785-
2786-# mkdir -p debian/open-vm-tools/usr/lib/open-vm-tools/plugins
2787-# mv debian/open-vm-tools/usr/lib/open-vm-tools/plugins/vmusr debian/open-vm-tools/usr/lib/open-vm-toolbox/plugins
2788-
2789- # XXX This is wrong: install-exec-hook in toolbox/Makefile is not being called.
2790- # when the instal-exec-hook is working, remove the rest of this stanza
2791-# mkdir -p debian/open-vm-tools/usr/share/applications
2792-# install -m 644 scripts/common/vmware-toolbox.desktop debian/open-vm-toolbox/usr/share/applications
2793-# sed -i s/Exec=.*/Exec=vmware-toolbox/ debian/open-vm-toolbox/usr/share/applications/vmware-toolbox.desktop
2794-# install -d debian/open-vm-toolbox/usr/share/pixmaps/vmware
2795-# install -m 644 toolbox/bigIcon.xpm debian/open-vm-toolbox/usr/share/pixmaps/vmware/vmware-toolbox.xpm
2796 install -m 755 scripts/common/vmware-xdg-detect-de debian/open-vm-tools/usr/bin
2797
2798 # Installing configuration files
2799
2800=== modified file 'debian/source/format'
2801--- debian/source/format 2009-12-20 13:36:35 +0000
2802+++ debian/source/format 2011-10-31 00:22:23 +0000
2803@@ -1,1 +1,1 @@
2804-1.0
2805+3.0 (quilt)
2806
2807=== modified file 'lib/auth/authPosix.c'
2808--- lib/auth/authPosix.c 2011-03-31 14:20:05 +0000
2809+++ lib/auth/authPosix.c 2011-10-31 00:22:23 +0000
2810@@ -46,6 +46,8 @@
2811 #ifdef USE_PAM
2812 #if defined(sun)
2813 #define CURRENT_PAM_LIBRARY "libpam.so.1"
2814+#elif defined(__FreeBSD__)
2815+#define CURRENT_PAM_LIBRARY "libpam.so"
2816 #else
2817 #define CURRENT_PAM_LIBRARY "libpam.so.0"
2818 #endif
2819
2820=== modified file 'lib/file/fileIO.c'
2821--- lib/file/fileIO.c 2011-03-31 14:20:05 +0000
2822+++ lib/file/fileIO.c 2011-10-31 00:22:23 +0000
2823@@ -349,6 +349,58 @@
2824 /*
2825 *----------------------------------------------------------------------
2826 *
2827+ * FileIO_GetSize --
2828+ *
2829+ * Get size of file.
2830+ *
2831+ * Results:
2832+ * Size of file or -1.
2833+ *
2834+ * Side effects:
2835+ * errno is set on error.
2836+ *
2837+ *----------------------------------------------------------------------
2838+ */
2839+
2840+int64
2841+FileIO_GetSize(const FileIODescriptor *fd) // IN:
2842+{
2843+ int64 logicalBytes;
2844+
2845+ return (FileIO_GetAllocSize(fd, &logicalBytes, NULL) != FILEIO_SUCCESS) ?
2846+ -1 : logicalBytes;
2847+}
2848+
2849+
2850+/*
2851+ *----------------------------------------------------------------------
2852+ *
2853+ * FileIO_GetSizeByPath --
2854+ *
2855+ * Get size of a file specified by path.
2856+ *
2857+ * Results:
2858+ * Size of file or -1.
2859+ *
2860+ * Side effects:
2861+ * errno is set on error
2862+ *
2863+ *----------------------------------------------------------------------
2864+ */
2865+
2866+int64
2867+FileIO_GetSizeByPath(ConstUnicode pathName) // IN:
2868+{
2869+ int64 logicalBytes;
2870+
2871+ return (FileIO_GetAllocSizeByPath(pathName, &logicalBytes, NULL) !=
2872+ FILEIO_SUCCESS) ? -1 : logicalBytes;
2873+}
2874+
2875+
2876+/*
2877+ *----------------------------------------------------------------------
2878+ *
2879 * FileIO_Filename --
2880 *
2881 * Returns the filename that was used to open a FileIODescriptor
2882
2883=== modified file 'lib/file/fileIOPosix.c'
2884--- lib/file/fileIOPosix.c 2011-07-22 16:41:03 +0000
2885+++ lib/file/fileIOPosix.c 2011-10-31 00:22:23 +0000
2886@@ -1877,42 +1877,16 @@
2887 #endif /* defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) ||
2888 defined(sun) */
2889
2890-/*
2891- *----------------------------------------------------------------------
2892- *
2893- * FileIO_GetSize --
2894- *
2895- * Get size of file.
2896- *
2897- * Results:
2898- * Size of file or -1.
2899- *
2900- * Side effects:
2901- * None
2902- *
2903- *----------------------------------------------------------------------
2904- */
2905-
2906-int64
2907-FileIO_GetSize(const FileIODescriptor *fd) // IN:
2908-{
2909- struct stat statBuf;
2910-
2911- ASSERT(fd);
2912-
2913- return (fstat(fd->posix, &statBuf) == -1) ? -1 : statBuf.st_size;
2914-}
2915-
2916
2917 /*
2918 *----------------------------------------------------------------------
2919 *
2920 * FileIO_GetAllocSize --
2921 *
2922- * Get allocated size of file.
2923+ * Get logcial and alloced size of a file.
2924 *
2925 * Results:
2926- * Size of file or -1.
2927+ * FileIOResult.
2928 *
2929 * Side effects:
2930 * None
2931@@ -1920,19 +1894,32 @@
2932 *----------------------------------------------------------------------
2933 */
2934
2935-int64
2936-FileIO_GetAllocSize(const FileIODescriptor *fd) // IN
2937+FileIOResult
2938+FileIO_GetAllocSize(const FileIODescriptor *fd, // IN:
2939+ uint64 *logicalBytes, // OUT:
2940+ uint64 *allocedBytes) // OUT:
2941 {
2942- struct stat s;
2943+ struct stat statBuf;
2944
2945 ASSERT(fd);
2946
2947- /*
2948- * If you don't like the magic number 512, yell at the people
2949- * who wrote sys/stat.h and tell them to add a #define for it.
2950- */
2951-
2952- return (fstat(fd->posix, &s) == -1) ? -1 : s.st_blocks * 512;
2953+ if (fstat(fd->posix, &statBuf) == -1) {
2954+ return FileIOErrno2Result(errno);
2955+ }
2956+
2957+ if (logicalBytes) {
2958+ *logicalBytes = statBuf.st_size;
2959+ }
2960+
2961+ if (allocedBytes) {
2962+ /*
2963+ * If you don't like the magic number 512, yell at the people
2964+ * who wrote sys/stat.h and tell them to add a #define for it.
2965+ */
2966+ *allocedBytes = statBuf.st_blocks * 512;
2967+ }
2968+
2969+ return FILEIO_SUCCESS;
2970 }
2971
2972
2973@@ -1959,13 +1946,18 @@
2974 {
2975
2976 #if defined(__APPLE__) || defined(__linux__)
2977+ FileIOResult fret;
2978 uint64 curSize;
2979 uint64 preallocLen;
2980 #if defined(__APPLE__)
2981 fstore_t prealloc;
2982 #endif
2983
2984- curSize = FileIO_GetAllocSize(fd);
2985+ fret = FileIO_GetAllocSize(fd, NULL, &curSize);
2986+ if (!FileIO_IsSuccess(fret)) {
2987+ return FALSE;
2988+ }
2989+
2990 if (curSize > size) {
2991 errno = EINVAL;
2992
2993@@ -1997,12 +1989,12 @@
2994 /*
2995 *----------------------------------------------------------------------
2996 *
2997- * FileIO_GetSizeByPath --
2998+ * FileIO_GetAllocSizeByPath --
2999 *
3000- * Get size of a file specified by path.
3001+ * Get the logcial and alloced size of a file specified by path.
3002 *
3003 * Results:
3004- * Size of file or -1.
3005+ * FileIOResult.
3006 *
3007 * Side effects:
3008 * errno is set on error
3009@@ -2010,15 +2002,35 @@
3010 *----------------------------------------------------------------------
3011 */
3012
3013-int64
3014-FileIO_GetSizeByPath(ConstUnicode pathName) // IN:
3015+FileIOResult
3016+FileIO_GetAllocSizeByPath(ConstUnicode pathName, // IN:
3017+ uint64 *logicalBytes, // OUT:
3018+ uint64 *allocedBytes) // OUT:
3019 {
3020- int err;
3021- struct stat statbuf;
3022-
3023- err = Posix_Stat(pathName, &statbuf);
3024-
3025- return (err == 0) ? statbuf.st_size : -1;
3026+ struct stat statBuf;
3027+
3028+ if (Posix_Stat(pathName, &statBuf) == -1) {
3029+ return FileIOErrno2Result(errno);
3030+ }
3031+
3032+ if (logicalBytes) {
3033+ *logicalBytes = statBuf.st_size;
3034+ }
3035+
3036+ if (allocedBytes) {
3037+#if __linux__ && defined(N_PLAT_NLM)
3038+ /* Netware doesn't have st_blocks. Just fall back to GetSize. */
3039+ *allocedBytes = statBuf.st_size;
3040+#else
3041+ /*
3042+ * If you don't like the magic number 512, yell at the people
3043+ * who wrote sys/stat.h and tell them to add a #define for it.
3044+ */
3045+ *allocedBytes = statBuf.st_blocks * 512;
3046+#endif
3047+ }
3048+
3049+ return FILEIO_SUCCESS;
3050 }
3051
3052
3053
3054=== modified file 'lib/hgfsServer/hgfsServer.c'
3055--- lib/hgfsServer/hgfsServer.c 2011-07-22 16:41:03 +0000
3056+++ lib/hgfsServer/hgfsServer.c 2011-10-31 00:22:23 +0000
3057@@ -5252,6 +5252,7 @@
3058
3059 if (!HgfsUnpackReadRequest(input->payload, input->payloadSize, input->op, &file,
3060 &offset, &requiredSize)) {
3061+ LOG(4, ("%s: Failed to unpack a valid packet -> PROTOCOL_ERROR.\n", __FUNCTION__));
3062 status = HGFS_ERROR_PROTOCOL;
3063 } else {
3064 switch(input->op) {
3065@@ -5266,9 +5267,10 @@
3066 sizeof *reply + inlineDataSize, (void **)&reply,
3067 input->session)) {
3068 status = HGFS_ERROR_PROTOCOL;
3069+ LOG(4, ("%s: V3/V4 Failed to alloc reply -> PROTOCOL_ERROR.\n", __FUNCTION__));
3070 } else {
3071- if (inlineDataSize > 0) {
3072- payload = reply->payload;
3073+ if (HGFS_OP_READ_V3 == input->op) {
3074+ payload = &reply->payload[0];
3075 } else {
3076 payload = HSPU_GetDataPacketBuf(input->packet, BUF_WRITEABLE,
3077 input->session);
3078@@ -5284,6 +5286,7 @@
3079 }
3080 } else {
3081 status = HGFS_ERROR_PROTOCOL;
3082+ LOG(4, ("%s: V3/V4 Failed to get payload -> PROTOCOL_ERROR.\n", __FUNCTION__));
3083 }
3084 }
3085 break;
3086@@ -5298,15 +5301,20 @@
3087 reply->payload, &reply->actualSize);
3088 if (HGFS_ERROR_SUCCESS == status) {
3089 replyPayloadSize = sizeof *reply + reply->actualSize;
3090+ } else {
3091+ LOG(4, ("%s: V1 Failed to read-> %d.\n", __FUNCTION__, status));
3092 }
3093 } else {
3094 status = HGFS_ERROR_PROTOCOL;
3095+ LOG(4, ("%s: V1 Failed to alloc reply -> PROTOCOL_ERROR.\n", __FUNCTION__));
3096 }
3097 break;
3098 }
3099 default:
3100 NOT_IMPLEMENTED();
3101 status = HGFS_ERROR_PROTOCOL;
3102+ LOG(4, ("%s: Unsupported protocol version passed %d -> PROTOCOL_ERROR.\n",
3103+ __FUNCTION__, input->op));
3104 }
3105 }
3106
3107@@ -5575,6 +5583,8 @@
3108
3109 *freeBytes = outFreeBytes;
3110 *totalBytes = outTotalBytes;
3111+ LOG(4, ("%s: return %"FMT64"u bytes Free %"FMT64"u bytes\n", __FUNCTION__,
3112+ outTotalBytes, outFreeBytes));
3113
3114 return status;
3115 }
3116
3117=== modified file 'lib/include/backdoor_def.h'
3118--- lib/include/backdoor_def.h 2011-07-22 16:41:03 +0000
3119+++ lib/include/backdoor_def.h 2011-10-31 00:22:23 +0000
3120@@ -177,8 +177,9 @@
3121 /* Task applied to backdoor pshare hints */
3122 #define BDOOR_PSHARE_HINTS_CMD_SHARE 0
3123 #define BDOOR_PSHARE_HINTS_CMD_DROP 1
3124+#define BDOOR_PSHARE_HINTS_CMD_MAX 2
3125
3126-#define BDOOR_PSHARE_HINTS_CMD(ecx) (((ecx) >> 24) & 0x1)
3127+#define BDOOR_PSHARE_HINTS_CMD(ecx) (((ecx) >> 24) & 0xff)
3128
3129 /* Nesting control operations */
3130
3131
3132=== modified file 'lib/include/buildNumber.h'
3133--- lib/include/buildNumber.h 2011-07-22 16:41:03 +0000
3134+++ lib/include/buildNumber.h 2011-10-31 00:22:23 +0000
3135@@ -1,12 +1,12 @@
3136 #define BUILD_NUMBER \
3137- "build-450511"
3138+ "build-471295"
3139 #define BUILD_NUMBER_NUMERIC \
3140- 450511
3141+ 471295
3142 #define BUILD_NUMBER_NUMERIC_STRING \
3143- "450511"
3144+ "471295"
3145 #define PRODUCT_BUILD_NUMBER \
3146- "product-build-6971"
3147+ "product-build-7542"
3148 #define PRODUCT_BUILD_NUMBER_NUMERIC \
3149- 6971
3150+ 7542
3151 #define PRODUCT_BUILD_NUMBER_NUMERIC_STRING \
3152- "6971"
3153+ "7542"
3154
3155=== modified file 'lib/include/fileIO.h'
3156--- lib/include/fileIO.h 2011-07-22 16:41:03 +0000
3157+++ lib/include/fileIO.h 2011-10-31 00:22:23 +0000
3158@@ -335,12 +335,16 @@
3159
3160 int FileIO_Sync(const FileIODescriptor *file);
3161
3162+FileIOResult FileIO_GetAllocSize(const FileIODescriptor *fd,
3163+ uint64 *logicalBytes,
3164+ uint64 *allocedBytes);
3165 int64 FileIO_GetSize(const FileIODescriptor *fd);
3166
3167-int64 FileIO_GetAllocSize(const FileIODescriptor *fd);
3168+Bool FileIO_SetAllocSize(const FileIODescriptor *fd, uint64 size);
3169
3170-Bool FileIO_SetAllocSize(const FileIODescriptor *fd,
3171- uint64 size);
3172+FileIOResult FileIO_GetAllocSizeByPath(ConstUnicode pathName,
3173+ uint64 *logicalBytes,
3174+ uint64 *allocedBytes);
3175
3176 int64 FileIO_GetSizeByPath(ConstUnicode pathName);
3177
3178
3179=== modified file 'lib/include/guestInfo.h'
3180--- lib/include/guestInfo.h 2011-07-22 16:41:03 +0000
3181+++ lib/include/guestInfo.h 2011-10-31 00:22:23 +0000
3182@@ -52,16 +52,6 @@
3183 #define GUEST_INFO_COMMAND "SetGuestInfo"
3184 #define MAX_VALUE_LEN 100
3185
3186-/**
3187- * Upper bound for value sizes, based on gethostname(2):
3188- *
3189- * SUS2 guarantees that "Host names are limited to 255 bytes".
3190- *
3191- * We can't modify MAX_VALUE_LEN since it's used in wire-level definitions
3192- * (such as PartitionEntry).
3193- */
3194-#define GUESTINFO_MAX_VALUE_SIZE 256
3195-
3196 #define MAX_NICS 16
3197 #define MAX_IPS 8 // Max number of IP addresses for a single NIC
3198 #define MAC_ADDR_SIZE 19
3199
3200=== modified file 'lib/include/hostinfo.h'
3201--- lib/include/hostinfo.h 2011-07-22 16:41:03 +0000
3202+++ lib/include/hostinfo.h 2011-10-31 00:22:23 +0000
3203@@ -70,10 +70,8 @@
3204 extern int Hostinfo_GetSystemBitness(void);
3205 extern const char *Hostinfo_OSVersionString(void);
3206
3207-extern Bool Hostinfo_GetOSName(uint32 outBufFullLen,
3208- uint32 outBufLen,
3209- char *osNameFull,
3210- char *osName);
3211+extern char *Hostinfo_GetOSName(void);
3212+extern char *Hostinfo_GetOSGuestString(void);
3213
3214 extern Bool Hostinfo_OSIsSMP(void);
3215 #if defined(_WIN32)
3216
3217=== modified file 'lib/include/loglevel_user.h'
3218--- lib/include/loglevel_user.h 2011-07-22 16:41:03 +0000
3219+++ lib/include/loglevel_user.h 2011-10-31 00:22:23 +0000
3220@@ -119,6 +119,7 @@
3221 LOGLEVEL_VAR(gui), \
3222 LOGLEVEL_VAR(guiWin32), \
3223 LOGLEVEL_VAR(mks), \
3224+ LOGLEVEL_VAR(mksSWB), \
3225 LOGLEVEL_VAR(mksClient), \
3226 LOGLEVEL_VAR(mksServer), \
3227 LOGLEVEL_VAR(mksKeyboard), \
3228@@ -128,6 +129,7 @@
3229 LOGLEVEL_VAR(mksHostOps), \
3230 LOGLEVEL_VAR(mksGLManager), \
3231 LOGLEVEL_VAR(mksGLShader), \
3232+ LOGLEVEL_VAR(mksGLState), \
3233 LOGLEVEL_VAR(vdpPlugin), \
3234 \
3235 /* user/sound */ \
3236@@ -176,6 +178,7 @@
3237 LOGLEVEL_VAR(smbios), \
3238 LOGLEVEL_VAR(acpi), \
3239 LOGLEVEL_VAR(acpiGPE), \
3240+ LOGLEVEL_VAR(vmgenc), \
3241 LOGLEVEL_VAR(xpmode), \
3242 LOGLEVEL_VAR(snapshot), \
3243 LOGLEVEL_VAR(asyncsocket), \
3244@@ -239,6 +242,7 @@
3245 LOGLEVEL_VAR(wrapLib), \
3246 LOGLEVEL_VAR(digestlib), \
3247 LOGLEVEL_VAR(inputdevtap), \
3248+ LOGLEVEL_VAR(objlib), \
3249 LOGLEVEL_VAR(svgadevtap), \
3250 LOGLEVEL_VAR(masReceipt), /* lib/masReceipt */ \
3251 LOGLEVEL_VAR(serviceImpl), /* lib/serviceImpl */ \
3252
3253=== modified file 'lib/include/msgfmt.h'
3254--- lib/include/msgfmt.h 2009-12-20 13:36:35 +0000
3255+++ lib/include/msgfmt.h 2011-10-31 00:22:23 +0000
3256@@ -165,10 +165,14 @@
3257 MsgFmt_Arg **args, int *numArgs, char **error,
3258 void *buf, size_t *bufSize);
3259 void MsgFmt_FreeArgs(MsgFmt_Arg *args, int numArgs);
3260+
3261 void MsgFmt_SwizzleArgs(MsgFmt_Arg *args,
3262 int numArgs);
3263-void MsgFmt_UnswizzleArgs(MsgFmt_Arg *args,
3264- int numArgs);
3265+int MsgFmt_GetSwizzledString(const MsgFmt_Arg *args, int numArgs, int idx,
3266+ const void *bufEnd, const int8 **str);
3267+int MsgFmt_UnswizzleArgs(MsgFmt_Arg *args,
3268+ int numArgs,
3269+ void *bufEnd);
3270
3271 MsgFmt_Arg* MsgFmt_CopyArgs(MsgFmt_Arg* copyArgs,
3272 int numArgs);
3273
3274=== modified file 'lib/include/mutexRankLib.h'
3275--- lib/include/mutexRankLib.h 2011-07-22 16:41:03 +0000
3276+++ lib/include/mutexRankLib.h 2011-10-31 00:22:23 +0000
3277@@ -24,6 +24,11 @@
3278 /*
3279 * MXUser mutex ranks for bora/lib code.
3280 *
3281+ * The ranks define the ordering in which locks are allowed to be acquired.
3282+ *
3283+ * Only locks with higher rank numbers (generally more localized)
3284+ * can be acquired while a lock with a lower rank number is active.
3285+ *
3286 * bora/lib lock rank space is from RANK_libLockBase on up to
3287 * RANK_LEAF (see vm_basic_defs).asdf
3288 *
3289@@ -33,13 +38,13 @@
3290 /*
3291 * hostDeviceInfo HAL lock
3292 *
3293- * Must be > vmhs locks since this is held around the RANK_vmhsHDILock
3294+ * Must be < vmhs locks since this is held around the RANK_vmhsHDILock
3295 * callback lock which vmhs passes into that library.
3296 */
3297 #define RANK_hdiHALLock (RANK_libLockBase + 0x1005)
3298
3299 /*
3300- * vmhs locks
3301+ * vmhs locks (must be < vigor)
3302 */
3303 #define RANK_vmhsHDILock (RANK_libLockBase + 0x3002)
3304 #define RANK_vmhsThrMxLock (RANK_libLockBase + 0x3005)
3305@@ -72,6 +77,12 @@
3306 #define RANK_popPendingListLock (RANK_libLockBase + 0x4605)
3307
3308 /*
3309+ * vigor (must be < VMDB range and < disklib, see bug 741290)
3310+ */
3311+#define RANK_vigorClientLock (RANK_libLockBase + 0x4700)
3312+#define RANK_vigorOfflineClientLock (RANK_libLockBase + 0x4710)
3313+
3314+/*
3315 * disklib and I/O related locks
3316 */
3317 #define RANK_diskLibLock (RANK_libLockBase + 0x5001)
3318@@ -85,12 +96,6 @@
3319 #define RANK_parInitLock (RANK_libLockBase + 0x5070)
3320
3321 /*
3322- * RANK_vigorClientLock < VMDB range
3323- */
3324-#define RANK_vigorClientLock (RANK_libLockBase + 0x5400)
3325-#define RANK_vigorOfflineClientLock (RANK_libLockBase + 0x5410)
3326-
3327-/*
3328 * VMDB range:
3329 * (RANK_libLockBase + 0x5500, RANK_libLockBase + 0x5600)
3330 */
3331@@ -111,15 +116,15 @@
3332 * non-leaf locks are usually defined with RANK_LEAF - 1.
3333 *
3334 * At least:
3335- * impersonate > pollDefault
3336- * keyLocator > preference (for checking AESNI)
3337- * configDb > keyLocator (for unlocking dictionaries)
3338- * battery/button > preference
3339- * workerLib > something for sure under VThread_Create
3340- * licenseCheck > preference
3341+ * impersonate < pollDefault
3342+ * keyLocator < preference (for checking AESNI)
3343+ * keyLocator < ssl (bug 743010)
3344+ * configDb < keyLocator (for unlocking dictionaries)
3345+ * battery/button < preference
3346+ * workerLib < something for sure under VThread_Create
3347+ * licenseCheck < preference
3348 */
3349
3350-#define RANK_sslStateLock (RANK_libLockBase + 0x7010)
3351 #define RANK_getSafeTmpDirLock (RANK_libLockBase + 0x7020)
3352 #define RANK_batteryLock (RANK_libLockBase + 0x7030)
3353 #define RANK_buttonLock (RANK_libLockBase + 0x7040)
3354@@ -128,6 +133,7 @@
3355 #define RANK_workerLibLock (RANK_libLockBase + 0x7060)
3356 #define RANK_configDbLock (RANK_libLockBase + 0x7070)
3357 #define RANK_keyLocatorLock (RANK_libLockBase + 0x7080)
3358+#define RANK_sslStateLock (RANK_libLockBase + 0x7085)
3359 #define RANK_licenseCheckLock (RANK_libLockBase + 0x7090)
3360 #define RANK_preferenceLock (RANK_libLockBase + 0x7100)
3361
3362
3363=== modified file 'lib/include/posix.h'
3364--- lib/include/posix.h 2011-07-22 16:41:03 +0000
3365+++ lib/include/posix.h 2011-10-31 00:22:23 +0000
3366@@ -86,6 +86,7 @@
3367 Unicode Posix_Getenv(ConstUnicode name);
3368 long Posix_Pathconf(ConstUnicode pathName, int name);
3369 int Posix_Lstat(ConstUnicode pathName, struct stat *statbuf);
3370+Unicode Posix_MkTemp(ConstUnicode pathName);
3371
3372 #if !defined(_WIN32)
3373 /*
3374
3375=== modified file 'lib/include/unityCommon.h'
3376--- lib/include/unityCommon.h 2011-03-31 14:20:05 +0000
3377+++ lib/include/unityCommon.h 2011-10-31 00:22:23 +0000
3378@@ -188,9 +188,10 @@
3379 #ifndef _UNITY_COMMON_H_
3380 #define _UNITY_COMMON_H_
3381
3382+#include "vmware.h"
3383+
3384 #define UNITY_MAX_SETTOP_WINDOW_COUNT 100
3385
3386-
3387 /*
3388 * Unity, GHI GuestRPC interface.
3389 */
3390
3391=== modified file 'lib/include/vixCommands.h'
3392--- lib/include/vixCommands.h 2011-07-22 16:41:03 +0000
3393+++ lib/include/vixCommands.h 2011-10-31 00:22:23 +0000
3394@@ -2289,7 +2289,6 @@
3395 #define VIX_BACKDOORCOMMAND_SYNCDRIVER_FREEZE VIX_BACKDOOR_COMMAND_VERSION"SyncDriver_Freeze"
3396 #define VIX_BACKDOORCOMMAND_SYNCDRIVER_THAW VIX_BACKDOOR_COMMAND_VERSION"SyncDriver_Thaw"
3397 #define VIX_BACKDOORCOMMAND_GET_PROPERTIES VIX_BACKDOOR_COMMAND_VERSION"Get_ToolsProperties"
3398-#define VIX_BACKDOORCOMMAND_CHECK_USER_ACCOUNT VIX_BACKDOOR_COMMAND_VERSION"Check_User_Account"
3399 #define VIX_BACKDOORCOMMAND_SEND_HGFS_PACKET VIX_BACKDOOR_COMMAND_VERSION"Send_Hgfs_Packet"
3400 #define VIX_BACKDOORCOMMAND_UNRECOGNIZED_COMMAND VIX_BACKDOOR_COMMAND_VERSION"Unrecognized_Command"
3401 #define VIX_BACKDOORCOMMAND_COMMAND VIX_BACKDOOR_COMMAND_VERSION"Relayed_Command"
3402
3403=== modified file 'lib/include/vm_basic_asm.h'
3404--- lib/include/vm_basic_asm.h 2011-07-22 16:41:03 +0000
3405+++ lib/include/vm_basic_asm.h 2011-10-31 00:22:23 +0000
3406@@ -603,8 +603,8 @@
3407 );
3408 return dst;
3409 #else
3410- int dummy0;
3411- int dummy1;
3412+ size_t dummy0;
3413+ void *dummy1;
3414
3415 __asm__ __volatile__("\t"
3416 "cld" "\n\t"
3417@@ -633,8 +633,8 @@
3418 );
3419 return dst;
3420 #else
3421- int dummy0;
3422- int dummy1;
3423+ size_t dummy0;
3424+ void *dummy1;
3425
3426 __asm__ __volatile__("\t"
3427 "cld" "\n\t"
3428
3429=== modified file 'lib/include/vm_product.h'
3430--- lib/include/vm_product.h 2011-07-22 16:41:03 +0000
3431+++ lib/include/vm_product.h 2011-10-31 00:22:23 +0000
3432@@ -133,8 +133,9 @@
3433
3434 #define PRODUCT_DDK_NAME MAKE_NAME("ESX DDK")
3435
3436-#define PRODUCT_VDM_SHORT_NAME "VDM"
3437-#define PRODUCT_VDM_NAME MAKE_NAME("Virtual Desktop Manager")
3438+// XXX I think these are dead and can be removed -clayton
3439+// #define PRODUCT_VDM_SHORT_NAME "VDM"
3440+// #define PRODUCT_VDM_NAME MAKE_NAME("Virtual Desktop Manager")
3441
3442 #define PRODUCT_VDDK_SHORT_NAME "VDDK"
3443 #define PRODUCT_VDDK_NAME MAKE_NAME("VMware Virtual Disk Development Kit")
3444@@ -148,6 +149,13 @@
3445
3446 #define PRODUCT_BOOMERANG_NAME MAKE_NAME("Boomerang")
3447
3448+#define PRODUCT_HBR_SERVER_NAME MAKE_NAME("vSphere Replication Server")
3449+
3450+#define PRODUCT_VIEW_SHORT_NAME "View"
3451+#define PRODUCT_VIEW_NAME MAKE_NAME("View")
3452+#define PRODUCT_VIEW_NAME_FOR_LICENSE PRODUCT_VIEW_NAME
3453+
3454+
3455 // XXX VMvisor is the underlying technology for possibly several products,
3456 // XXX not the product. Fix when names are decided.
3457 // #define PRODUCT_VMVISOR_NAME MAKE_NAME("VMvisor")
3458@@ -180,7 +188,7 @@
3459 */
3460 #define PRODUCT_VMRC_PLUGIN_GUID_EMBEDDED 291BA977-564B-4626-B868-A968FB8D4591
3461 #define PRODUCT_VMRC_PLUGIN_GUID_TYPELIB 70ABCAB7-6B45-4555-ABFC-8BC686E5ACFE
3462-#define PRODUCT_VMRC_PLUGIN_PROGID_EMBEDDED_BASE "VMware.VMwareRemoteConsole"
3463+#define PRODUCT_VMRC_PLUGIN_PROGID_EMBEDDED_BASE "VMware.RemoteConsole"
3464 #define PRODUCT_VMRC_PLUGIN_PROGID_EMBEDDED PRODUCT_VMRC_PLUGIN_PROGID_EMBEDDED_BASE "." \
3465 XSTR(VMRC_PLUGIN_VERSION_BASE)
3466
3467@@ -242,6 +250,7 @@
3468 || defined(VMX86_WGS) \
3469 || defined(VMX86_DESKTOP) \
3470 || defined(VMX86_ENTERPRISE_DESKTOP) \
3471+ || defined(VMX86_VIEW) \
3472 || defined(VMX86_MUI) \
3473 || defined(VMX86_API) \
3474 || defined(VMX86_VPX) \
3475@@ -257,7 +266,8 @@
3476 || defined(VMX86_DDK) \
3477 || defined(VMX86_VDDK) \
3478 || defined(VMX86_NETDUMP) \
3479- || defined(VMX86_BOOMERANG))
3480+ || defined(VMX86_BOOMERANG) \
3481+ || defined(VMX86_HBR_SERVER))
3482 # if defined(_WIN32) || defined(__APPLE__)
3483 /*
3484 * XXX Make the product be Workstation by default if none of the defines
3485@@ -334,6 +344,10 @@
3486 # define PRODUCT_SHORT_NAME PRODUCT_NETDUMP_NAME
3487 #elif defined(VMX86_BOOMERANG)
3488 # define PRODUCT_SHORT_NAME PRODUCT_BOOMERANG_NAME
3489+#elif defined(VMX86_HBR_SERVER)
3490+# define PRODUCT_SHORT_NAME PRODUCT_HBR_SERVER_NAME
3491+#elif defined(VMX86_VIEW)
3492+# define PRODUCT_SHORT_NAME PRODUCT_VIEW_NAME
3493 #endif
3494
3495
3496
3497=== modified file 'lib/include/vm_version.h'
3498--- lib/include/vm_version.h 2011-07-22 16:41:03 +0000
3499+++ lib/include/vm_version.h 2011-10-31 00:22:23 +0000
3500@@ -92,9 +92,11 @@
3501 #define PRODUCT_VERSION 1,1,5,PRODUCT_BUILD_NUMBER_NUMERIC
3502 #elif defined(VMX86_VPX)
3503 /* this should be kept in sync with the corresponding vpx branch. */
3504- #define PRODUCT_VERSION 5,0,0,PRODUCT_BUILD_NUMBER_NUMERIC
3505+ #define PRODUCT_VERSION 5,1,0,PRODUCT_BUILD_NUMBER_NUMERIC
3506 #elif defined(VMX86_BOOMERANG)
3507 #define PRODUCT_VERSION 1,0,0,PRODUCT_BUILD_NUMBER_NUMERIC
3508+#elif defined(VMX86_VIEW)
3509+ #define PRODUCT_VERSION 0,0,0,PRODUCT_BUILD_NUMBER_NUMERIC
3510 #else
3511 #define PRODUCT_VERSION 4,0,0,PRODUCT_BUILD_NUMBER_NUMERIC /* PLAYER_VERSION_NUMBER below has to match this */
3512 #endif
3513@@ -123,7 +125,7 @@
3514 * VMI 2.0 : 3.1.0
3515 * P2VA 3.0 : 3.?.?
3516 */
3517-#define VIE_FILEVERSION 5,0,0,PRODUCT_BUILD_NUMBER_NUMERIC
3518+#define VIE_FILEVERSION 5,1,0,PRODUCT_BUILD_NUMBER_NUMERIC
3519
3520 /*
3521 * This string can be a little more "free form". The license
3522@@ -188,7 +190,7 @@
3523 * 4.0.0-1.8: patch 3
3524 */
3525 #define ESX_VERSION_MAJOR "5"
3526-#define ESX_VERSION_MINOR "0"
3527+#define ESX_VERSION_MINOR "1"
3528 #define ESX_VERSION_MAINT "0"
3529 #define ESX_VERSION ESX_VERSION_MAJOR "." ESX_VERSION_MINOR "." \
3530 ESX_VERSION_MAINT
3531@@ -211,21 +213,37 @@
3532 #define PLAYER_VERSION "e.x.p"
3533 #define V2V_VERSION "e.x.p"
3534 #define V2V_FILE_VERSION 1,0,0,0
3535+/*
3536+ * When updating FUSION_VERSION from e.x.p to GA, you will also need to update
3537+ * lastVersion{Major,Minor,Patch} in bora/scons/package/fusion/fusion.sc
3538+ * which controls what versions are allowed to automatically update for free.
3539+ */
3540 #define FUSION_VERSION "e.x.p"
3541 #define BOOMERANG_VERSION "e.x.p"
3542+#define HBR_SERVER_VERSION "e.x.p"
3543
3544 // These must match VIE_FILEVERSION above
3545-#define SYSIMAGE_VERSION "5.0.0"
3546+#define SYSIMAGE_VERSION "5.1.0"
3547 #define SYSIMAGE_FILE_VERSION VIE_FILEVERSION
3548
3549 #define VCB_VERSION "4.0.0"
3550 #define VCB_FILE_VERSION 4,0,0,0
3551-#define VIM_VERSION "5.0.0"
3552-#define VPX_VERSION "5.0.0"
3553+#define VIM_VERSION "5.1.0"
3554+
3555+// Put VPX_VERSION first, because vpx/make/defs.mk doesn't check for suffix.
3556+#define VPX_VERSION "5.1.0"
3557+#define VPX_VERSION_MAJOR "5"
3558+#define VPX_VERSION_MINOR "1"
3559+#define VPX_VERSION_MAINT "0"
3560+#define VPX_VERSION_THIRD_PARTY VPX_VERSION_MAJOR VPX_VERSION_MINOR \
3561+ VPX_VERSION_MAINT
3562 #define VPX_RELEASE_UPDATE "0" /* 0 = Pre-release/GA, 1 = Update 1 */
3563+#define VPX_RELEASE_PATCH "0" /* 0 = experimental */
3564+#define VPX_RELEASE VPX_RELEASE_UPDATE "." VPX_RELEASE_PATCH
3565+
3566 #define SVA_VERSION "1.0.0"
3567 #define SSO_VERSION "1.0.0"
3568-#define WBC_VERSION "5.0.0"
3569+#define WBC_VERSION "5.1.0"
3570 #define SDK_VERSION "4.1.0"
3571 #define FOUNDRY_VERSION "1.11.0"
3572 #define FOUNDRY_FILE_VERSION 1,11,0,PRODUCT_BUILD_NUMBER_NUMERIC
3573@@ -233,7 +251,7 @@
3574 #define VLICENSE_VERSION "1.1.5"
3575 #define DDK_VERSION "e.x.p"
3576 #define VIPERL_VERSION "1.1.0"
3577-#define RCLI_VERSION "5.0.0"
3578+#define RCLI_VERSION "5.1.0"
3579 #define VDM_VERSION "e.x.p"
3580 #define VMSAFE_VERSION "1.2.0"
3581 #define VMSAFE_FILE_VERSION 1,2,0,PRODUCT_BUILD_NUMBER_NUMERIC
3582@@ -247,6 +265,7 @@
3583 #define VIEWY_VERSION "e.x.p"
3584 #define VMCFSDK_VERSION "e.x.p"
3585 #define PCOIP_VERSION "e.x.p"
3586+#define VIEW_VERSION "0.0.0"
3587
3588
3589 // VMRC_PLUGIN_VERSION should match PLAYER_VERSION but can't be e.x.p
3590@@ -286,7 +305,7 @@
3591
3592 #define USB_ARBITRATOR_VERSION_MAJOR 9
3593 #define USB_ARBITRATOR_VERSION_MINOR 0
3594-#define USB_ARBITRATOR_VERSION_Z 25
3595+#define USB_ARBITRATOR_VERSION_Z 33
3596
3597 #define USB_ARBITRATOR_VERSION_BASE USB_ARBITRATOR_VERSION_MAJOR.\
3598 USB_ARBITRATOR_VERSION_MINOR
3599@@ -302,7 +321,7 @@
3600 * USB Arbitrator Component version. This version is used by the linux
3601 * installer. See USB_ARBITRATOR_COMPONENT_VERSION_NUMBER in mk/defs-onetime.mk
3602 */
3603-#define USB_ARBITRATOR_COMPONENT_VERSION_NUMBER "9.0.25"
3604+#define USB_ARBITRATOR_COMPONENT_VERSION_NUMBER "9.0.33"
3605
3606 #ifdef VMX86_VPX
3607 #define VIM_API_TYPE "VirtualCenter"
3608@@ -369,6 +388,10 @@
3609 # define PRODUCT_VERSION_NUMBER VDDK_VERSION
3610 #elif defined(VMX86_BOOMERANG)
3611 # define PRODUCT_VERSION_NUMBER BOOMERANG_VERSION
3612+#elif defined(VMX86_HBR_SERVER)
3613+# define PRODUCT_VERSION_NUMBER HBR_SERVER_VERSION
3614+#elif defined(VMX86_VIEW)
3615+# define PRODUCT_VERSION_NUMBER VIEW_VERSION
3616 #endif
3617
3618 /*
3619
3620=== modified file 'lib/include/vmci_defs.h'
3621--- lib/include/vmci_defs.h 2011-03-31 14:20:05 +0000
3622+++ lib/include/vmci_defs.h 2011-10-31 00:22:23 +0000
3623@@ -314,8 +314,10 @@
3624 #define VMCI_EVENT_QP_RESUMED 2 // Only applicable to guest endpoints
3625 #define VMCI_EVENT_QP_PEER_ATTACH 3 // Applicable to guest and host
3626 #define VMCI_EVENT_QP_PEER_DETACH 4 // Applicable to guest and host
3627-#define VMCI_EVENT_MEM_ACCESS_ON 5 // Only applicable to VMX endpoints
3628-#define VMCI_EVENT_MEM_ACCESS_OFF 6 // Only applicable to VMX endpoints
3629+#define VMCI_EVENT_MEM_ACCESS_ON 5 // Applicable to VMX and vmk. On vmk,
3630+ // this event has the Context payload type.
3631+#define VMCI_EVENT_MEM_ACCESS_OFF 6 // Applicable to VMX and vmk. Same as
3632+ // above for the payload type.
3633 #define VMCI_EVENT_MAX 7
3634
3635 /*
3636@@ -329,8 +331,12 @@
3637 #define VMCI_EVENT_VALID_VMX(_event) (_event == VMCI_EVENT_MEM_ACCESS_ON || \
3638 _event == VMCI_EVENT_MEM_ACCESS_OFF)
3639
3640+#if defined(VMX86_SERVER)
3641+#define VMCI_EVENT_VALID(_event) (_event < VMCI_EVENT_MAX)
3642+#else // VMX86_SERVER
3643 #define VMCI_EVENT_VALID(_event) (_event < VMCI_EVENT_MAX && \
3644 !VMCI_EVENT_VALID_VMX(_event))
3645+#endif // VMX86_SERVER
3646
3647 /* Reserved guest datagram resource ids. */
3648 #define VMCI_EVENT_HANDLER 0
3649
3650=== modified file 'lib/misc/hostinfo.c'
3651--- lib/misc/hostinfo.c 2011-07-22 16:41:03 +0000
3652+++ lib/misc/hostinfo.c 2011-10-31 00:22:23 +0000
3653@@ -256,11 +256,9 @@
3654 *
3655 * Hostinfo_GetOSName --
3656 *
3657- * Query the operating system and build a pair of strings to identify it.
3658- * The two strings are osName and osNameFull. Short osName strings are
3659- * the same as you'd see in a VM's .vmx file.
3660+ * Query the operating system and build a string to identify it.
3661 *
3662- * The long names are a bit more descriptive:
3663+ * Examples:
3664 * Windows: <OS NAME> <SERVICE PACK> (BUILD <BUILD_NUMBER>)
3665 * example: Windows XP Professional Service Pack 2 (Build 2600)
3666 *
3667@@ -268,31 +266,62 @@
3668 * example: Linux 2.4.18-3 Red Hat Linux release 7.3 (Valhalla)
3669 *
3670 * Return value:
3671- * Returns TRUE on success and FALSE on failure.
3672- * Returns the guest's full OS name (osFullName)
3673- * Returns the guest's OS name in the same format as .vmx file (osName)
3674- *
3675- * Side effects:
3676- * None
3677- *
3678- *-----------------------------------------------------------------------------
3679- */
3680-
3681-Bool
3682-Hostinfo_GetOSName(uint32 outBufFullLen, // IN: length of osFullName buffer
3683- uint32 outBufLen, // IN: length of osName buffer
3684- char *osFullName, // OUT: Full OS name
3685- char *osName) // OUT: OS name
3686-{
3687- Bool retval;
3688-
3689- retval = HostinfoOSNameCacheValid ? TRUE : HostinfoOSData();
3690-
3691- if (retval) {
3692- Str_Strcpy(osFullName, HostinfoCachedOSFullName, outBufFullLen);
3693- Str_Strcpy(osName, HostinfoCachedOSName, outBufLen);
3694- }
3695-
3696- return retval;
3697+ * NULL Unable to obtain the OS name.
3698+ * !NULL The OS name. The caller is responsible for freeing it.
3699+ *
3700+ * Side effects:
3701+ * Memory is allocated.
3702+ *
3703+ *-----------------------------------------------------------------------------
3704+ */
3705+
3706+char *
3707+Hostinfo_GetOSName(void)
3708+{
3709+ char *name;
3710+ Bool data = HostinfoOSNameCacheValid ? TRUE : HostinfoOSData();
3711+
3712+ if (data) {
3713+ name = Util_SafeStrdup(HostinfoCachedOSFullName);
3714+ } else {
3715+ name = NULL;
3716+ }
3717+
3718+ return name;
3719+}
3720+
3721+
3722+
3723+/*
3724+ *-----------------------------------------------------------------------------
3725+ *
3726+ * Hostinfo_GetOSGuestString --
3727+ *
3728+ * Query the operating system and build a string to identify it. The
3729+ * returned string is the same as you'd see in a VM's .vmx file.
3730+ *
3731+ * Return value:
3732+ * NULL Unable to obtain the OS name.
3733+ * !NULL The OS name. The caller is responsible for freeing it.
3734+ *
3735+ * Side effects:
3736+ * Memory is allocated.
3737+ *
3738+ *-----------------------------------------------------------------------------
3739+ */
3740+
3741+char *
3742+Hostinfo_GetOSGuestString(void)
3743+{
3744+ char *name;
3745+ Bool data = HostinfoOSNameCacheValid ? TRUE : HostinfoOSData();
3746+
3747+ if (data) {
3748+ name = Util_SafeStrdup(HostinfoCachedOSName);
3749+ } else {
3750+ name = NULL;
3751+ }
3752+
3753+ return name;
3754 }
3755
3756
3757=== modified file 'lib/misc/hostinfoHV.c'
3758--- lib/misc/hostinfoHV.c 2011-07-22 16:41:03 +0000
3759+++ lib/misc/hostinfoHV.c 2011-10-31 00:22:23 +0000
3760@@ -489,7 +489,7 @@
3761 /*
3762 *----------------------------------------------------------------------
3763 *
3764- * Hostinfo_TouchBackDoor --
3765+ * Hostinfo_TouchBackDoor --
3766 *
3767 * Access the backdoor. This is used to determine if we are
3768 * running in a VM or on a physical host. On a physical host
3769@@ -505,7 +505,7 @@
3770 * if not.
3771 *
3772 * Side effects:
3773- * Exception if not in a VM.
3774+ * Exception if not in a VM.
3775 *
3776 *----------------------------------------------------------------------
3777 */
3778@@ -513,13 +513,7 @@
3779 Bool
3780 Hostinfo_TouchBackDoor(void)
3781 {
3782- /*
3783- * XXX: This can cause Apple's Crash Reporter to erroneously display
3784- * a crash, even though the process has caught the SIGILL and handled
3785- * it.
3786- */
3787-
3788-#if !defined(__APPLE__) && (defined(__i386__) || defined(__x86_64__))
3789+#if defined(__i386__) || defined(__x86_64__)
3790 uint32 eax;
3791 uint32 ebx;
3792 uint32 ecx;
3793
3794=== modified file 'lib/misc/hostinfoInt.h'
3795--- lib/misc/hostinfoInt.h 2010-01-24 09:55:47 +0000
3796+++ lib/misc/hostinfoInt.h 2011-10-31 00:22:23 +0000
3797@@ -26,8 +26,8 @@
3798 #define _HOSTINFOINT_H_
3799
3800
3801-#define MAX_OS_NAME_LEN 64
3802-#define MAX_OS_FULLNAME_LEN 192
3803+#define MAX_OS_NAME_LEN 128
3804+#define MAX_OS_FULLNAME_LEN 512
3805
3806
3807 /*
3808
3809=== modified file 'lib/misc/posixDlopen.c'
3810--- lib/misc/posixDlopen.c 2011-03-31 14:20:05 +0000
3811+++ lib/misc/posixDlopen.c 2011-10-31 00:22:23 +0000
3812@@ -21,7 +21,7 @@
3813 #include <stdlib.h>
3814 #include <errno.h>
3815
3816-#if defined(__APPLE__) || defined(linux) || defined(sun)
3817+#if !defined(_WIN32)
3818 #include <dlfcn.h>
3819 #endif
3820
3821@@ -29,7 +29,7 @@
3822 #include "posixInt.h"
3823
3824
3825-#if defined(__APPLE__) || defined(linux) || defined(sun)
3826+#if !defined(_WIN32)
3827 /*
3828 *----------------------------------------------------------------------
3829 *
3830
3831=== modified file 'lib/misc/posixPosix.c'
3832--- lib/misc/posixPosix.c 2011-07-22 16:41:03 +0000
3833+++ lib/misc/posixPosix.c 2011-10-31 00:22:23 +0000
3834@@ -3259,5 +3259,45 @@
3835
3836 return ret;
3837 }
3838-
3839 #endif // } !defined(sun)
3840+
3841+
3842+/*
3843+ *----------------------------------------------------------------------
3844+ *
3845+ * Posix_MkTemp --
3846+ *
3847+ * POSIX mktemp(). It is implemented via mkstemp() to avoid
3848+ * warning about using dangerous mktemp() API - but note that
3849+ * it suffers from all mktemp() problems - caller has to use
3850+ * O_EXCL when creating file, and retry if file already exists.
3851+ *
3852+ * Results:
3853+ * NULL Error
3854+ * !NULL Success (result must be freed by the caller)
3855+ *
3856+ * Side effects:
3857+ * errno is set on error
3858+ *
3859+ *----------------------------------------------------------------------
3860+ */
3861+
3862+Unicode
3863+Posix_MkTemp(ConstUnicode pathName) // IN:
3864+{
3865+ Unicode result = NULL;
3866+ char *path;
3867+ int fd;
3868+
3869+ if (!PosixConvertToCurrent(pathName, &path)) {
3870+ return NULL;
3871+ }
3872+ fd = mkstemp(path);
3873+ if (fd >= 0) {
3874+ close(fd);
3875+ unlink(path);
3876+ result = Unicode_Alloc(path, STRING_ENCODING_DEFAULT);
3877+ }
3878+ free(path);
3879+ return result;
3880+}
3881
3882=== modified file 'lib/procMgr/procMgrPosix.c'
3883--- lib/procMgr/procMgrPosix.c 2011-03-31 14:20:05 +0000
3884+++ lib/procMgr/procMgrPosix.c 2011-10-31 00:22:23 +0000
3885@@ -33,6 +33,8 @@
3886 #include <unistd.h>
3887 #if !defined(__FreeBSD__) && !defined(sun) && !defined(__APPLE__)
3888 #include <asm/param.h>
3889+#endif
3890+#if !defined(sun) && !defined(__APPLE__)
3891 #include <locale.h>
3892 #include <sys/stat.h>
3893 #endif
3894@@ -48,13 +50,18 @@
3895 #include <time.h>
3896 #include <grp.h>
3897 #include <sys/syscall.h>
3898-#if defined(linux) || defined(HAVE_SYS_USER_H)
3899+#if defined(linux) || defined(__FreeBSD__) || defined(HAVE_SYS_USER_H)
3900 // sys/param.h is required on FreeBSD before sys/user.h
3901 # include <sys/param.h>
3902 // Pull in PAGE_SIZE/PAGE_SHIFT defines ahead of vm_basic_defs.h
3903 # include <sys/user.h>
3904 #endif
3905-
3906+#if defined (__FreeBSD__)
3907+#include <kvm.h>
3908+#include <limits.h>
3909+#include <paths.h>
3910+#include <sys/sysctl.h>
3911+#endif
3912 #include "vmware.h"
3913 #include "procMgr.h"
3914 #include "vm_assert.h"
3915@@ -171,13 +178,13 @@
3916 *----------------------------------------------------------------------
3917 */
3918
3919-#if !defined(sun)
3920+#if !defined(sun) && !defined(__FreeBSD__)
3921 int
3922 ProcMgr_ReadProcFile(int fd, // IN
3923 char **contents) // OUT
3924 {
3925 int size = 0;
3926-#if !defined(__FreeBSD__) && !defined(__APPLE__)
3927+#if !defined(__APPLE__)
3928 char tmp[512];
3929 int numRead;
3930
3931@@ -227,7 +234,7 @@
3932 return size;
3933 }
3934
3935-#endif // !sun
3936+#endif // !sun && !FreeBSD
3937
3938 /*
3939 *----------------------------------------------------------------------
3940@@ -247,12 +254,12 @@
3941 *----------------------------------------------------------------------
3942 */
3943
3944-#if !defined(sun)
3945+#if !defined(sun) && !defined(__FreeBSD__)
3946 ProcMgr_ProcList *
3947 ProcMgr_ListProcesses(void)
3948 {
3949 ProcMgr_ProcList *procList = NULL;
3950-#if !defined(__FreeBSD__) && !defined(__APPLE__)
3951+#if !defined(__APPLE__)
3952 Bool failed = FALSE;
3953 DynBuf dbProcId;
3954 DynBuf dbProcCmd;
3955@@ -595,12 +602,211 @@
3956 ProcMgr_FreeProcList(procList);
3957 procList = NULL;
3958 }
3959-#endif // !defined(__FreeBSD__) && !defined(__APPLE__)
3960-
3961- return procList;
3962-}
3963-#endif // !defined(sun)
3964-
3965+#endif // !defined(__APPLE__)
3966+
3967+ return procList;
3968+}
3969+#endif // !defined(sun) & !defined(__FreeBSD__)
3970+
3971+
3972+/*
3973+ *----------------------------------------------------------------------
3974+ *
3975+ * ProcMgr_ListProcesses --
3976+ *
3977+ * List all the processes that the calling client has privilege to
3978+ * enumerate. The strings in the returned structure should be all
3979+ * UTF-8 encoded, although we do not enforce it right now.
3980+ *
3981+ * Results:
3982+ *
3983+ * A ProcMgr_ProcList.
3984+ *
3985+ * Side effects:
3986+ *
3987+ *----------------------------------------------------------------------
3988+ */
3989+
3990+#if defined(__FreeBSD__)
3991+ProcMgr_ProcList *
3992+ProcMgr_ListProcesses(void)
3993+{
3994+ ProcMgr_ProcList *procList = NULL;
3995+ Bool failed = TRUE;
3996+ static kvm_t *kd;
3997+ struct kinfo_proc *kp;
3998+ char errbuf[_POSIX2_LINE_MAX];
3999+ int i, nentries=-1, flag=0;
4000+ DynBuf dbProcId;
4001+ DynBuf dbProcCmd;
4002+ DynBuf dbProcStartTime;
4003+ DynBuf dbProcOwner;
4004+
4005+ DynBuf_Init(&dbProcId);
4006+ DynBuf_Init(&dbProcCmd);
4007+ DynBuf_Init(&dbProcStartTime);
4008+ DynBuf_Init(&dbProcOwner);
4009+
4010+ /*
4011+ * Get the handle to the Kernel Virtual Memory
4012+ */
4013+ kd = kvm_openfiles(NULL, _PATH_DEVNULL, NULL, O_RDONLY, errbuf);
4014+ if (kd == NULL) {
4015+ Warning("%s: failed to open kvm with error: %s\n", __FUNCTION__, errbuf);
4016+ goto abort;
4017+ }
4018+
4019+ /*
4020+ * Get the list of process info structs
4021+ */
4022+ kp = kvm_getprocs(kd, KERN_PROC_PROC, flag, &nentries);
4023+ if ((kp == NULL && nentries > 0) || (kp != NULL && nentries < 0)) {
4024+ Warning("%s: failed to get proc infos with error: %s\n",
4025+ __FUNCTION__, kvm_geterr(kd));
4026+ goto abort;
4027+ }
4028+
4029+ /*
4030+ * Iterate through the list of process entries
4031+ */
4032+ for (i = 0; i < nentries; ++i, ++kp) {
4033+ struct passwd *pwd;
4034+ char *userName = NULL;
4035+ char *cmdLine = NULL;
4036+ char **cmdLineTemp = NULL;
4037+ time_t processStartTime;
4038+
4039+ /*
4040+ * Store the pid of the process
4041+ */
4042+ if (!DynBuf_Append(&dbProcId, &(kp->ki_pid), sizeof(kp->ki_pid))) {
4043+ Warning("%s: failed to append pid in DynBuf - out of memory\n",
4044+ __FUNCTION__);
4045+ goto abort;
4046+ }
4047+
4048+ /*
4049+ * Store the owner of the process.
4050+ */
4051+ pwd = getpwuid(kp->ki_uid);
4052+ userName = (NULL == pwd)
4053+ ? Str_SafeAsprintf(NULL, "%d", (int) kp->ki_uid)
4054+ : Unicode_Alloc(pwd->pw_name, STRING_ENCODING_DEFAULT);
4055+ if (!DynBuf_Append(&dbProcOwner, &userName, sizeof userName)) {
4056+ Warning("%s: failed to append username in DynBuf - out of memory\n",
4057+ __FUNCTION__);
4058+ goto abort;
4059+ }
4060+
4061+ /*
4062+ * Store the command line string of the process
4063+ */
4064+ cmdLineTemp = kvm_getargv(kd, kp, 0);
4065+ if (cmdLineTemp != NULL) {
4066+ // flatten the argument list to get cmd & all params
4067+ DynBuf dbuf;
4068+
4069+ DynBuf_Init(&dbuf);
4070+ while (*cmdLineTemp != NULL) {
4071+ if (!DynBuf_Append(&dbuf, *cmdLineTemp, strlen(*cmdLineTemp))) {
4072+ Warning("%s: failed to append cmd/args in DynBuf - no memory\n",
4073+ __FUNCTION__);
4074+ goto abort;
4075+ }
4076+ cmdLineTemp++;
4077+ if (*cmdLineTemp != NULL) {
4078+ // add the whitespace between arguments
4079+ if (!DynBuf_Append(&dbuf, " ", 1)) {
4080+ Warning("%s: failed to append ' ' in DynBuf - no memory\n",
4081+ __FUNCTION__);
4082+ goto abort;
4083+ }
4084+ }
4085+ }
4086+ // add the NUL term
4087+ if (!DynBuf_Append(&dbuf, "", 1)) {
4088+ Warning("%s: failed to append NUL in DynBuf - out of memory\n",
4089+ __FUNCTION__);
4090+ goto abort;
4091+ }
4092+ DynBuf_Trim(&dbuf);
4093+ cmdLine = DynBuf_Detach(&dbuf);
4094+ DynBuf_Destroy(&dbuf);
4095+ } else {
4096+ cmdLine = Unicode_Alloc(kp->ki_comm, STRING_ENCODING_DEFAULT);
4097+ }
4098+ if (!DynBuf_Append(&dbProcCmd, &cmdLine, sizeof cmdLine)) {
4099+ Warning("%s: failed to append cmdline in DynBuf - out of memory\n",
4100+ __FUNCTION__);
4101+ goto abort;
4102+ }
4103+
4104+ /*
4105+ * Store the start time of the process
4106+ */
4107+ processStartTime = kp->ki_start.tv_sec;
4108+ if (!DynBuf_Append(&dbProcStartTime,
4109+ &processStartTime,
4110+ sizeof processStartTime)) {
4111+ Warning("%s: failed to append start time in DynBuf - out of memory\n",
4112+ __FUNCTION__);
4113+ goto abort;
4114+ }
4115+
4116+ } // for nentries
4117+
4118+ if (0 == DynBuf_GetSize(&dbProcId)) {
4119+ goto abort;
4120+ }
4121+
4122+ /*
4123+ * We're done adding to DynBuf. Trim off any unused allocated space.
4124+ * DynBuf_Trim() followed by DynBuf_Detach() avoids a memcpy().
4125+ */
4126+ DynBuf_Trim(&dbProcId);
4127+ DynBuf_Trim(&dbProcCmd);
4128+ DynBuf_Trim(&dbProcStartTime);
4129+ DynBuf_Trim(&dbProcOwner);
4130+
4131+ /*
4132+ * Create a ProcMgr_ProcList and populate its fields.
4133+ */
4134+ procList = (ProcMgr_ProcList *) Util_SafeCalloc(1, sizeof(ProcMgr_ProcList));
4135+ ASSERT_NOT_IMPLEMENTED(procList);
4136+
4137+ procList->procCount = DynBuf_GetSize(&dbProcId) / sizeof(pid_t);
4138+
4139+ procList->procIdList = (pid_t *) DynBuf_Detach(&dbProcId);
4140+ ASSERT_NOT_IMPLEMENTED(procList->procIdList);
4141+ procList->procCmdList = (char **) DynBuf_Detach(&dbProcCmd);
4142+ ASSERT_NOT_IMPLEMENTED(procList->procCmdList);
4143+ procList->startTime = (time_t *) DynBuf_Detach(&dbProcStartTime);
4144+ ASSERT_NOT_IMPLEMENTED(procList->startTime);
4145+ procList->procOwnerList = (char **) DynBuf_Detach(&dbProcOwner);
4146+ ASSERT_NOT_IMPLEMENTED(procList->procOwnerList);
4147+
4148+ failed = FALSE;
4149+abort:
4150+ DynBuf_Destroy(&dbProcId);
4151+ DynBuf_Destroy(&dbProcCmd);
4152+ DynBuf_Destroy(&dbProcStartTime);
4153+ DynBuf_Destroy(&dbProcOwner);
4154+
4155+ if (kd != NULL) {
4156+ /*
4157+ * Wrap up: also deallocates memory (if) allocated by kvm_getargv()
4158+ */
4159+ kvm_close(kd);
4160+ }
4161+
4162+ if (failed) {
4163+ ProcMgr_FreeProcList(procList);
4164+ procList = NULL;
4165+ }
4166+
4167+ return procList;
4168+}
4169+#endif // defined(__FreeBSD__)
4170
4171 /*
4172 *----------------------------------------------------------------------
4173@@ -1435,7 +1641,7 @@
4174 free(asyncProc);
4175 }
4176
4177-#ifdef linux
4178+#if defined(linux) || defined(__FreeBSD__)
4179
4180 /*
4181 *----------------------------------------------------------------------
4182@@ -1634,4 +1840,4 @@
4183 return TRUE;
4184 }
4185
4186-#endif // linux
4187+#endif // linux || __FreeBSD__
4188
4189=== modified file 'lib/wiper/wiperPosix.c'
4190--- lib/wiper/wiperPosix.c 2011-07-22 16:41:03 +0000
4191+++ lib/wiper/wiperPosix.c 2011-10-31 00:22:23 +0000
4192@@ -46,6 +46,7 @@
4193 #include "wiper.h"
4194 #include "util.h"
4195 #include "str.h"
4196+#include "strutil.h"
4197 #include "fileIO.h"
4198 #include "vmstdio.h"
4199 #include "mntinfo.h"
4200@@ -325,7 +326,7 @@
4201 return FALSE;
4202 }
4203
4204-#elif defined(__FreeBSD__) || defined(__APPLE__) /* } FreeBSD { */
4205+#elif defined(__FreeBSD__) /* } FreeBSD { */
4206
4207 static Bool
4208 WiperIsDiskDevice(MNTINFO *mnt, // IN: file system being considered
4209@@ -359,7 +360,7 @@
4210 (S_ISCHR(s->st_mode) && ((maj == 3) || (maj == 13)))) {
4211 retval = TRUE;
4212 }
4213-#else /* Also the Apple case */
4214+#else
4215 /*
4216 * Begin by testing whether file system source is really a character
4217 * device node. (FreeBSD killed off block devices long ago.) Next,
4218@@ -375,10 +376,27 @@
4219 retval = TRUE;
4220 }
4221 }
4222+#undef MASK_ATA_DISK
4223+#undef MASK_SCSI_DISK
4224 #endif /* __FreeBSD_version */
4225
4226 return retval;
4227 }
4228+
4229+#elif defined(__APPLE__) /* } { */
4230+
4231+static Bool
4232+WiperIsDiskDevice(MNTINFO *mnt, // IN
4233+ struct stat *s) // IN
4234+{
4235+ /*
4236+ * Differently from FreeBSD, Mac OS still lists disks as block devices,
4237+ * it seems. Disks devices also seem to start with "/dev/disk".
4238+ */
4239+ return S_ISBLK(s->st_mode) &&
4240+ StrUtil_StartsWith(MNTINFO_NAME(mnt), "/dev/disk");
4241+}
4242+
4243 #endif /* } */
4244
4245 /*
4246
4247=== modified file 'modules/freebsd/vmhgfs/vnopscommon.c'
4248--- modules/freebsd/vmhgfs/vnopscommon.c 2011-03-31 14:20:05 +0000
4249+++ modules/freebsd/vmhgfs/vnopscommon.c 2011-10-31 00:22:23 +0000
4250@@ -487,7 +487,7 @@
4251 HgfsAttrToBSD(vp, &hgfsAttrV2, vap);
4252 }
4253
4254- DEBUG(VM_DEBUG_LOG, "Exit %s.\n", HGFS_VP_TO_FILENAME(vp));
4255+ DEBUG(VM_DEBUG_LOG, "Exit %s -> %d.\n", HGFS_VP_TO_FILENAME(vp), ret);
4256 return ret;
4257 }
4258
4259@@ -701,7 +701,7 @@
4260 ret = HgfsDelete(sip, HGFS_VP_TO_FILENAME(vp), HGFS_OP_DELETE_FILE_V3);
4261
4262 out:
4263- DEBUG(VM_DEBUG_LOG, "Exit %s.\n", HGFS_VP_TO_FILENAME(vp));
4264+ DEBUG(VM_DEBUG_LOG, "Exit %s -> %d.\n", HGFS_VP_TO_FILENAME(vp), ret);
4265 return ret;
4266 }
4267
4268@@ -1115,8 +1115,9 @@
4269
4270 /* We can't read from directories, that's what readdir() is for. */
4271 if (HGFS_VP_TO_VTYPE(vp) != VREG) {
4272- DEBUG(VM_DEBUG_FAIL, "Can only read regular files.\n");
4273- return (HGFS_VP_TO_VTYPE(vp) == VDIR) ? EISDIR : EPERM;
4274+ ret = (HGFS_VP_TO_VTYPE(vp) == VDIR) ? EISDIR : EPERM;
4275+ DEBUG(VM_DEBUG_FAIL, "Read not a reg file type %d ret %d.\n", HGFS_VP_TO_VTYPE(vp), ret);
4276+ return ret;
4277 }
4278
4279 /* off_t is a signed quantity */
4280@@ -1163,15 +1164,21 @@
4281 do {
4282 uint32_t size;
4283
4284- DEBUG(VM_DEBUG_INFO, "offset=%"FMT64"d, uio_offset=%"FMT64"d\n",
4285- offset, HGFS_UIOP_TO_OFFSET(uiop));
4286- DEBUG(VM_DEBUG_HANDLE, "** handle=%d, file=%s\n",
4287- handle, HGFS_VP_TO_FILENAME(vp));
4288-
4289 /* Request at most HGFS_IO_MAX bytes */
4290 size = (HGFS_UIOP_TO_RESID(uiop) > HGFS_IO_MAX) ? HGFS_IO_MAX :
4291 HGFS_UIOP_TO_RESID(uiop);
4292
4293+ DEBUG(VM_DEBUG_INFO, "offset=%"FMT64"d, uio_offset=%"FMT64"d\n",
4294+ offset, HGFS_UIOP_TO_OFFSET(uiop));
4295+ DEBUG(VM_DEBUG_HANDLE, "** handle=%d, file=%s to read %u\n",
4296+ handle, HGFS_VP_TO_FILENAME(vp), size);
4297+
4298+ if (size == 0) {
4299+ /* For a zero byte length read we return success. */
4300+ DEBUG(VM_DEBUG_DONE, "size of 0 ret -> 0.\n");
4301+ return 0;
4302+ }
4303+
4304 /* Send one read request. */
4305 ret = HgfsDoRead(sip, handle, offset, size, uiop);
4306 if (ret == 0) {
4307@@ -1524,7 +1531,7 @@
4308 fp = HGFS_VP_TO_FP(vp);
4309 ASSERT(fp);
4310
4311- DEBUG(VM_DEBUG_ENTRY, "opening \"%s\"\n", HGFS_VP_TO_FILENAME(vp));
4312+ DEBUG(VM_DEBUG_ENTRY, "opening dir \"%s\"\n", HGFS_VP_TO_FILENAME(vp));
4313
4314 /*
4315 * If the directory is already opened then we are done.
4316@@ -1668,11 +1675,11 @@
4317 * again. Thus, returning ENOENT to the Mac OS puts the guest kernel into infinite
4318 * loop. In order to resolve this issue, before passing on the request to the
4319 * server, we validate if user is attempting to create a new share. If yes,
4320- * we return EPERM as the error code.
4321+ * we return EACCES as the error code.
4322 */
4323 if (HgfsAttemptToCreateShare(HGFS_VP_TO_FILENAME(vp), flag)) {
4324 DEBUG (VM_DEBUG_LOG, "An attempt to create a new share was made.\n");
4325- return EPERM;
4326+ return EACCES;
4327 }
4328
4329 /* Convert FreeBSD modes to Hgfs modes */
4330@@ -2977,7 +2984,7 @@
4331 hgfsAttrV2.ownerPerms | hgfsAttrV2.groupPerms | hgfsAttrV2.otherPerms;
4332 }
4333 if (!IsModeCompatible(mode, effectivePermissions)) {
4334- ret = EPERM;
4335+ ret = EACCES;
4336 DEBUG(VM_DEBUG_FAIL, "HgfsAccessInt denied access: %s (%d, %d)\n",
4337 HGFS_VP_TO_FILENAME(vp), mode, effectivePermissions);
4338 }
4339
4340=== modified file 'modules/linux/dkms.conf'
4341--- modules/linux/dkms.conf 2011-07-22 16:41:03 +0000
4342+++ modules/linux/dkms.conf 2011-10-31 00:22:23 +0000
4343@@ -1,5 +1,5 @@
4344 PACKAGE_NAME=open-vm-tools
4345-PACKAGE_VERSION=2011.07.19
4346+PACKAGE_VERSION=2011.08.21
4347 MAKE_CMD_TMPL="make VM_UNAME=\$kernelver \
4348 MODULEBUILDDIR=$dkms_tree/$PACKAGE_NAME/$PACKAGE_VERSION/build"
4349
4350
4351=== modified file 'modules/linux/dkms.sh'
4352--- modules/linux/dkms.sh 2011-07-22 16:41:03 +0000
4353+++ modules/linux/dkms.sh 2011-10-31 00:22:23 +0000
4354@@ -28,12 +28,12 @@
4355 echo " src: root of unpacked open-vm-tools package"
4356 echo " dst: where to create the dkms tree"
4357 echo
4358- echo "The script will create an 'open-vm-tools' module with version 2011.07.19."
4359+ echo "The script will create an 'open-vm-tools' module with version 2011.08.21."
4360 exit 1
4361 fi
4362
4363 src=$1
4364-dst=$2/open-vm-tools-2011.07.19
4365+dst=$2/open-vm-tools-2011.08.21
4366
4367 SHARED_HEADERS="backdoor_def.h"
4368 SHARED_HEADERS="$SHARED_HEADERS backdoor_types.h"
4369
4370=== modified file 'modules/linux/shared/compat_netdevice.h'
4371--- modules/linux/shared/compat_netdevice.h 2011-07-22 16:41:03 +0000
4372+++ modules/linux/shared/compat_netdevice.h 2011-10-31 00:22:23 +0000
4373@@ -196,7 +196,7 @@
4374 #define netdev_priv(dev) ((dev)->priv)
4375 #endif
4376
4377-#if defined(NETDEV_TX_OK)
4378+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 9)
4379 # define COMPAT_NETDEV_TX_OK NETDEV_TX_OK
4380 # define COMPAT_NETDEV_TX_BUSY NETDEV_TX_BUSY
4381 #else
4382@@ -392,4 +392,10 @@
4383 # endif
4384 #endif
4385
4386+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)
4387+# define compat_vlan_get_protocol(skb) vlan_get_protocol(skb)
4388+#else
4389+# define compat_vlan_get_protocol(skb) (skb->protocol)
4390+#endif
4391+
4392 #endif /* __COMPAT_NETDEVICE_H__ */
4393
4394=== modified file 'modules/linux/shared/vmci_defs.h'
4395--- modules/linux/shared/vmci_defs.h 2011-03-31 14:20:05 +0000
4396+++ modules/linux/shared/vmci_defs.h 2011-10-31 00:22:23 +0000
4397@@ -314,8 +314,10 @@
4398 #define VMCI_EVENT_QP_RESUMED 2 // Only applicable to guest endpoints
4399 #define VMCI_EVENT_QP_PEER_ATTACH 3 // Applicable to guest and host
4400 #define VMCI_EVENT_QP_PEER_DETACH 4 // Applicable to guest and host
4401-#define VMCI_EVENT_MEM_ACCESS_ON 5 // Only applicable to VMX endpoints
4402-#define VMCI_EVENT_MEM_ACCESS_OFF 6 // Only applicable to VMX endpoints
4403+#define VMCI_EVENT_MEM_ACCESS_ON 5 // Applicable to VMX and vmk. On vmk,
4404+ // this event has the Context payload type.
4405+#define VMCI_EVENT_MEM_ACCESS_OFF 6 // Applicable to VMX and vmk. Same as
4406+ // above for the payload type.
4407 #define VMCI_EVENT_MAX 7
4408
4409 /*
4410@@ -329,8 +331,12 @@
4411 #define VMCI_EVENT_VALID_VMX(_event) (_event == VMCI_EVENT_MEM_ACCESS_ON || \
4412 _event == VMCI_EVENT_MEM_ACCESS_OFF)
4413
4414+#if defined(VMX86_SERVER)
4415+#define VMCI_EVENT_VALID(_event) (_event < VMCI_EVENT_MAX)
4416+#else // VMX86_SERVER
4417 #define VMCI_EVENT_VALID(_event) (_event < VMCI_EVENT_MAX && \
4418 !VMCI_EVENT_VALID_VMX(_event))
4419+#endif // VMX86_SERVER
4420
4421 /* Reserved guest datagram resource ids. */
4422 #define VMCI_EVENT_HANDLER 0
4423
4424=== modified file 'modules/linux/shared/vmci_infrastructure.h'
4425--- modules/linux/shared/vmci_infrastructure.h 2011-03-31 14:20:05 +0000
4426+++ modules/linux/shared/vmci_infrastructure.h 2011-10-31 00:22:23 +0000
4427@@ -80,6 +80,7 @@
4428 #define VMCI_DEV_QP_BREAK_SHARING 0x05 // DEPRECATED
4429 #define VMCI_DEV_RESTORE_SYNC 0x06
4430 #define VMCI_DEV_BMASTER_OFF 0x07
4431+#define VMCI_DEV_BMASTER_ON 0x08
4432
4433
4434 /*
4435
4436=== modified file 'modules/linux/vmblock/Makefile'
4437--- modules/linux/vmblock/Makefile 2011-03-31 14:20:05 +0000
4438+++ modules/linux/vmblock/Makefile 2011-10-31 00:22:23 +0000
4439@@ -43,7 +43,7 @@
4440 endif
4441
4442
4443-VM_UNAME = $(shell uname -r)
4444+VM_UNAME = $(KVERS)
4445
4446 # Header directory for the running kernel
4447 ifdef LINUXINCLUDE
4448
4449=== modified file 'modules/linux/vmci/Makefile'
4450--- modules/linux/vmci/Makefile 2011-03-31 14:20:05 +0000
4451+++ modules/linux/vmci/Makefile 2011-10-31 00:22:23 +0000
4452@@ -43,7 +43,7 @@
4453 endif
4454
4455
4456-VM_UNAME = $(shell uname -r)
4457+VM_UNAME = $(KVERS)
4458
4459 # Header directory for the running kernel
4460 ifdef LINUXINCLUDE
4461
4462=== modified file 'modules/linux/vmci/common/vmciContext.c'
4463--- modules/linux/vmci/common/vmciContext.c 2011-07-22 16:41:03 +0000
4464+++ modules/linux/vmci/common/vmciContext.c 2011-10-31 00:22:23 +0000
4465@@ -2151,6 +2151,50 @@
4466 /*
4467 *----------------------------------------------------------------------
4468 *
4469+ * VMCIContext_SignalPendingDatagrams --
4470+ *
4471+ * Signals the guest if any datagrams are pending. This is used
4472+ * after the VMCI device is unquiesced to ensure that no pending
4473+ * datagrams go unnoticed, since signals may not be fully
4474+ * processed while the device is quiesced.
4475+ *
4476+ * Results:
4477+ * None.
4478+ *
4479+ * Side effects:
4480+ * None.
4481+ *
4482+ *----------------------------------------------------------------------
4483+ */
4484+
4485+void
4486+VMCIContext_SignalPendingDatagrams(VMCIId contextID)
4487+{
4488+ Bool pending;
4489+ VMCIContext *context;
4490+ VMCILockFlags flags;
4491+
4492+ context = VMCIContext_Get(contextID);
4493+ if (!context) {
4494+ ASSERT(FALSE);
4495+ return;
4496+ }
4497+
4498+ VMCI_GrabLock(&context->lock, &flags);
4499+ pending = context->pendingDatagrams;
4500+ VMCI_ReleaseLock(&context->lock, flags);
4501+
4502+ if (pending) {
4503+ VMCIHost_SignalCall(&context->hostContext);
4504+ }
4505+
4506+ VMCIContext_Release(context);
4507+}
4508+
4509+
4510+/*
4511+ *----------------------------------------------------------------------
4512+ *
4513 * VMCIContext_SetDomainName --
4514 *
4515 * Sets the domain name of the given context.
4516
4517=== modified file 'modules/linux/vmci/common/vmciContext.h'
4518--- modules/linux/vmci/common/vmciContext.h 2011-03-31 14:20:05 +0000
4519+++ modules/linux/vmci/common/vmciContext.h 2011-10-31 00:22:23 +0000
4520@@ -114,6 +114,7 @@
4521 Bool success);
4522 #if defined(VMKERNEL)
4523 void VMCIContext_SignalPendingDoorbells(VMCIId contextID);
4524+void VMCIContext_SignalPendingDatagrams(VMCIId contextID);
4525
4526 int VMCIContextID2HostVmID(VMCIId contextID, void *hostVmID, size_t hostVmIDLen);
4527 #endif
4528
4529=== modified file 'modules/linux/vmci/common/vmciEvent.c'
4530--- modules/linux/vmci/common/vmciEvent.c 2011-07-22 16:41:03 +0000
4531+++ modules/linux/vmci/common/vmciEvent.c 2011-10-31 00:22:23 +0000
4532@@ -535,9 +535,25 @@
4533 /*
4534 * In the vmkernel we defer delivery of events to a helper world. This
4535 * makes the event delivery more consistent across hosts and guests with
4536- * regard to which locks are held.
4537+ * regard to which locks are held. Memory access events are an exception
4538+ * to this, since clients need to know immediately that the device
4539+ * memory is disabled (if we delay such events, then clients may be
4540+ * notified too late).
4541 */
4542- sub->runDelayed = TRUE;
4543+ if (VMCI_EVENT_MEM_ACCESS_ON == event ||
4544+ VMCI_EVENT_MEM_ACCESS_OFF == event) {
4545+ /*
4546+ * Client must expect to get such events synchronously, and should
4547+ * perform its locking accordingly. If it can't handle this, then
4548+ * fail.
4549+ */
4550+ if (flags & VMCI_FLAG_EVENT_DELAYED_CB) {
4551+ return VMCI_ERROR_INVALID_ARGS;
4552+ }
4553+ sub->runDelayed = FALSE;
4554+ } else {
4555+ sub->runDelayed = TRUE;
4556+ }
4557 } else if (!VMCI_CanScheduleDelayedWork()) {
4558 /*
4559 * If the platform doesn't support delayed work callbacks then don't
4560
4561=== modified file 'modules/linux/vmhgfs/Makefile'
4562--- modules/linux/vmhgfs/Makefile 2011-03-31 14:20:05 +0000
4563+++ modules/linux/vmhgfs/Makefile 2011-10-31 00:22:23 +0000
4564@@ -43,7 +43,7 @@
4565 endif
4566
4567
4568-VM_UNAME = $(shell uname -r)
4569+VM_UNAME = $(KVERS)
4570
4571 # Header directory for the running kernel
4572 ifdef LINUXINCLUDE
4573
4574=== modified file 'modules/linux/vmsync/Makefile'
4575--- modules/linux/vmsync/Makefile 2011-03-31 14:20:05 +0000
4576+++ modules/linux/vmsync/Makefile 2011-10-31 00:22:23 +0000
4577@@ -43,7 +43,7 @@
4578 endif
4579
4580
4581-VM_UNAME = $(shell uname -r)
4582+VM_UNAME = $(KVERS)
4583
4584 # Header directory for the running kernel
4585 ifdef LINUXINCLUDE
4586
4587=== modified file 'modules/linux/vmxnet/Makefile'
4588--- modules/linux/vmxnet/Makefile 2011-03-31 14:20:05 +0000
4589+++ modules/linux/vmxnet/Makefile 2011-10-31 00:22:23 +0000
4590@@ -43,7 +43,7 @@
4591 endif
4592
4593
4594-VM_UNAME = $(shell uname -r)
4595+VM_UNAME = $(KVERS)
4596
4597 # Header directory for the running kernel
4598 ifdef LINUXINCLUDE
4599
4600=== modified file 'modules/linux/vsock/Makefile'
4601--- modules/linux/vsock/Makefile 2011-03-31 14:20:05 +0000
4602+++ modules/linux/vsock/Makefile 2011-10-31 00:22:23 +0000
4603@@ -43,7 +43,7 @@
4604 endif
4605
4606
4607-VM_UNAME = $(shell uname -r)
4608+VM_UNAME = $(KVERS)
4609
4610 # Header directory for the running kernel
4611 ifdef LINUXINCLUDE
4612
4613=== modified file 'modules/linux/vsock/linux/vsockSocketWrapper.h'
4614--- modules/linux/vsock/linux/vsockSocketWrapper.h 2011-07-22 16:41:03 +0000
4615+++ modules/linux/vsock/linux/vsockSocketWrapper.h 2011-10-31 00:22:23 +0000
4616@@ -156,6 +156,7 @@
4617 # define __ELOCALSHUTDOWN ESHUTDOWN
4618 # define __EPEERSHUTDOWN ECONNABORTED
4619 # define __ECONNINPROGRESS EWOULDBLOCK
4620+# define __ESNDRCVTIMEDOUT ETIMEDOUT
4621 # define ESYSNOTREADY WSASYSNOTREADY
4622 #elif defined(VMKERNEL)
4623 # define EINTR VMK_WAIT_INTERRUPTED
4624@@ -200,11 +201,13 @@
4625 # define __ELOCALSHUTDOWN EPIPE
4626 # define __EPEERSHUTDOWN EPIPE
4627 # define __ECONNINPROGRESS EINPROGRESS
4628+# define __ESNDRCVTIMEDOUT VMK_WOULD_BLOCK
4629 # define ESYSNOTREADY VMK_NOT_SUPPORTED
4630 #elif defined(__APPLE__)
4631 # define __ELOCALSHUTDOWN ESHUTDOWN
4632 # define __EPEERSHUTDOWN ECONNABORTED
4633 # define __ECONNINPROGRESS EINPROGRESS
4634+# define __ESNDRCVTIMEDOUT EAGAIN
4635 # define ESYSNOTREADY EOPNOTSUPP
4636 #elif defined(linux)
4637 # define ESYSNOTREADY EOPNOTSUPP
4638
4639=== modified file 'services/plugins/guestInfo/guestInfoServer.c'
4640--- services/plugins/guestInfo/guestInfoServer.c 2011-07-22 16:41:03 +0000
4641+++ services/plugins/guestInfo/guestInfoServer.c 2011-10-31 00:22:23 +0000
4642@@ -66,10 +66,6 @@
4643 VM_EMBED_VERSION(VMTOOLSD_VERSION_STRING);
4644 #endif
4645
4646-MY_ASSERTS(GI_SIZE_ASSERTS,
4647- ASSERT_ON_COMPILE(GUESTINFO_MAX_VALUE_SIZE >= MAX_VALUE_LEN);
4648-)
4649-
4650 /**
4651 * Default poll interval is 30s (in milliseconds).
4652 */
4653@@ -81,9 +77,9 @@
4654 * Stores information about all guest information sent to the vmx.
4655 */
4656
4657-typedef struct _GuestInfoCache{
4658+typedef struct _GuestInfoCache {
4659 /* Stores values of all key-value pairs. */
4660- char value[INFO_MAX][GUESTINFO_MAX_VALUE_SIZE];
4661+ char *value[INFO_MAX];
4662 NicInfoV3 *nicInfo;
4663 GuestDiskInfo *diskInfo;
4664 } GuestInfoCache;
4665@@ -232,9 +228,9 @@
4666 static gboolean
4667 GuestInfoGather(gpointer data)
4668 {
4669- char name[GUESTINFO_MAX_VALUE_SIZE];
4670- char osNameFull[GUESTINFO_MAX_VALUE_SIZE];
4671- char osName[GUESTINFO_MAX_VALUE_SIZE];
4672+ char name[256]; // Size is derived from the SUS2 specification
4673+ // "Host names are limited to 255 bytes"
4674+ char *osString = NULL;
4675 gboolean disableQueryDiskInfo;
4676 NicInfoV3 *nicInfo = NULL;
4677 GuestDiskInfo *diskInfo = NULL;
4678@@ -257,17 +253,25 @@
4679 }
4680
4681 /* Gather all the relevant guest information. */
4682- if (!Hostinfo_GetOSName(sizeof osNameFull, sizeof osName, osNameFull,
4683- osName)) {
4684- g_warning("Failed to get OS info.\n");
4685- } else {
4686- if (!GuestInfoUpdateVmdb(ctx, INFO_OS_NAME_FULL, osNameFull)) {
4687- g_warning("Failed to update VMDB\n");
4688- }
4689- if (!GuestInfoUpdateVmdb(ctx, INFO_OS_NAME, osName)) {
4690- g_warning("Failed to update VMDB\n");
4691- }
4692- }
4693+ osString = Hostinfo_GetOSName();
4694+ if (osString == NULL) {
4695+ g_warning("Failed to get OS info.\n");
4696+ } else {
4697+ if (!GuestInfoUpdateVmdb(ctx, INFO_OS_NAME_FULL, osString)) {
4698+ g_warning("Failed to update VMDB\n");
4699+ }
4700+ }
4701+ free(osString);
4702+
4703+ osString = Hostinfo_GetOSGuestString();
4704+ if (osString == NULL) {
4705+ g_warning("Failed to get OS info.\n");
4706+ } else {
4707+ if (!GuestInfoUpdateVmdb(ctx, INFO_OS_NAME, osString)) {
4708+ g_warning("Failed to update VMDB\n");
4709+ }
4710+ }
4711+ free(osString);
4712
4713 disableQueryDiskInfo =
4714 g_key_file_get_boolean(ctx->config, CONFGROUPNAME_GUESTINFO,
4715@@ -451,7 +455,8 @@
4716 * Above fall-through is intentional.
4717 */
4718
4719- if (strcmp(gInfoCache.value[infoType], (char *)info) == 0) {
4720+ if (gInfoCache.value[infoType] != NULL &&
4721+ strcmp(gInfoCache.value[infoType], (char *)info) == 0) {
4722 /* The value has not changed */
4723 g_debug("Value unchanged for infotype %d.\n", infoType);
4724 break;
4725@@ -463,9 +468,8 @@
4726 }
4727
4728 /* Update the value in the cache as well. */
4729- Str_Strcpy(gInfoCache.value[infoType],
4730- (char *)info,
4731- sizeof gInfoCache.value[infoType]);
4732+ free(gInfoCache.value[infoType]);
4733+ gInfoCache.value[infoType] = Util_SafeStrdup((char *) info);
4734 break;
4735
4736 case INFO_IPADDRESS:
4737@@ -914,7 +918,8 @@
4738 int i;
4739
4740 for (i = 0; i < INFO_MAX; i++) {
4741- gInfoCache.value[i][0] = 0;
4742+ free(gInfoCache.value[i]);
4743+ gInfoCache.value[i] = NULL;
4744 }
4745
4746 GuestInfo_FreeDiskInfo(gInfoCache.diskInfo);
4747
4748=== modified file 'services/plugins/unity/Makefile.am'
4749--- services/plugins/unity/Makefile.am 2011-07-22 16:41:03 +0000
4750+++ services/plugins/unity/Makefile.am 2011-10-31 00:22:23 +0000
4751@@ -70,14 +70,16 @@
4752 libunity_la_SOURCES += ghIntegration/pseudoAppMgr.cc
4753
4754 libunity_la_SOURCES += unitylib/unity.c
4755+libunity_la_SOURCES += unitylib/unityInt.h
4756 libunity_la_SOURCES += unitylib/unityPlatform.h
4757-libunity_la_SOURCES += unitylib/unityPlatformX11.cc
4758-libunity_la_SOURCES += unitylib/unityPlatformX11Settings.cc
4759-libunity_la_SOURCES += unitylib/unityPlatformX11Window.cc
4760-libunity_la_SOURCES += unitylib/unityX11.h
4761+libunity_la_SOURCES += unitylib/debug.c
4762+libunity_la_SOURCES += unitylib/event.cc
4763+libunity_la_SOURCES += unitylib/settings.cc
4764+libunity_la_SOURCES += unitylib/util.cc
4765+libunity_la_SOURCES += unitylib/window.cc
4766 libunity_la_SOURCES += unitylib/windowPathFactory.cc
4767-libunity_la_SOURCES += unitylib/x11Event.cc
4768-libunity_la_SOURCES += unitylib/x11Util.cc
4769+libunity_la_SOURCES += unitylib/x11Platform.cc
4770+libunity_la_SOURCES += unitylib/x11Platform.h
4771
4772 libunity_la_SOURCES += unityWindowTracker/unityWindowTracker.c
4773
4774
4775=== modified file 'services/plugins/unity/Makefile.in'
4776--- services/plugins/unity/Makefile.in 2011-07-22 16:41:03 +0000
4777+++ services/plugins/unity/Makefile.in 2011-10-31 00:22:23 +0000
4778@@ -107,11 +107,10 @@
4779 libunity_la-unityTclo.lo libunity_la-ghIntegration.lo \
4780 libunity_la-icon.lo libunity_la-platform.lo \
4781 libunity_la-pseudoAppMgr.lo libunity_la-unity.lo \
4782- libunity_la-unityPlatformX11.lo \
4783- libunity_la-unityPlatformX11Settings.lo \
4784- libunity_la-unityPlatformX11Window.lo \
4785- libunity_la-windowPathFactory.lo libunity_la-x11Event.lo \
4786- libunity_la-x11Util.lo libunity_la-unityWindowTracker.lo \
4787+ libunity_la-debug.lo libunity_la-event.lo \
4788+ libunity_la-settings.lo libunity_la-util.lo \
4789+ libunity_la-window.lo libunity_la-windowPathFactory.lo \
4790+ libunity_la-x11Platform.lo libunity_la-unityWindowTracker.lo \
4791 $(am__objects_1)
4792 libunity_la_OBJECTS = $(am_libunity_la_OBJECTS)
4793 libunity_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
4794@@ -359,12 +358,11 @@
4795 unityTclo.cpp ghIntegration/ghIntegration.cpp \
4796 ghIntegration/ghIntegrationInt.h ghIntegration/icon.cc \
4797 ghIntegration/platform.cc ghIntegration/pseudoAppMgr.cc \
4798- unitylib/unity.c unitylib/unityPlatform.h \
4799- unitylib/unityPlatformX11.cc \
4800- unitylib/unityPlatformX11Settings.cc \
4801- unitylib/unityPlatformX11Window.cc unitylib/unityX11.h \
4802- unitylib/windowPathFactory.cc unitylib/x11Event.cc \
4803- unitylib/x11Util.cc unityWindowTracker/unityWindowTracker.c \
4804+ unitylib/unity.c unitylib/unityInt.h unitylib/unityPlatform.h \
4805+ unitylib/debug.c unitylib/event.cc unitylib/settings.cc \
4806+ unitylib/util.cc unitylib/window.cc \
4807+ unitylib/windowPathFactory.cc unitylib/x11Platform.cc \
4808+ unitylib/x11Platform.h unityWindowTracker/unityWindowTracker.c \
4809 $(RPCGEN_SRCS)
4810 RPCGEN_SRCS = ghiGetBinaryHandlers_xdr.c ghiGetExecInfoHash_xdr.c \
4811 ghiProtocolHandler_xdr.c ghiStartMenu_xdr.c \
4812@@ -452,6 +450,8 @@
4813 distclean-compile:
4814 -rm -f *.tab.c
4815
4816+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunity_la-debug.Plo@am__quote@
4817+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunity_la-event.Plo@am__quote@
4818 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunity_la-ghIntegration.Plo@am__quote@
4819 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunity_la-ghiGetBinaryHandlers_xdr.Plo@am__quote@
4820 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunity_la-ghiGetExecInfoHash_xdr.Plo@am__quote@
4821@@ -466,21 +466,20 @@
4822 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunity_la-icon.Plo@am__quote@
4823 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunity_la-platform.Plo@am__quote@
4824 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunity_la-pseudoAppMgr.Plo@am__quote@
4825+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunity_la-settings.Plo@am__quote@
4826 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunity_la-toolsPlugin.Plo@am__quote@
4827 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunity_la-unity.Plo@am__quote@
4828 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunity_la-unityActive_xdr.Plo@am__quote@
4829-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunity_la-unityPlatformX11.Plo@am__quote@
4830-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunity_la-unityPlatformX11Settings.Plo@am__quote@
4831-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunity_la-unityPlatformX11Window.Plo@am__quote@
4832 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunity_la-unityPlugin.Plo@am__quote@
4833 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunity_la-unityPluginEntry.Plo@am__quote@
4834 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunity_la-unityPluginPosix.Plo@am__quote@
4835 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunity_la-unityTclo.Plo@am__quote@
4836 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunity_la-unityWindowTracker.Plo@am__quote@
4837 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunity_la-unity_xdr.Plo@am__quote@
4838+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunity_la-util.Plo@am__quote@
4839+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunity_la-window.Plo@am__quote@
4840 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunity_la-windowPathFactory.Plo@am__quote@
4841-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunity_la-x11Event.Plo@am__quote@
4842-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunity_la-x11Util.Plo@am__quote@
4843+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libunity_la-x11Platform.Plo@am__quote@
4844
4845 .c.o:
4846 @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
4847@@ -510,6 +509,13 @@
4848 @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
4849 @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
4850
4851+libunity_la-debug.lo: unitylib/debug.c
4852+@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
4853+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libunity_la-debug.Tpo $(DEPDIR)/libunity_la-debug.Plo
4854+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='unitylib/debug.c' object='libunity_la-debug.lo' libtool=yes @AMDEPBACKSLASH@
4855+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
4856+@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
4857+
4858 libunity_la-unityWindowTracker.lo: unityWindowTracker/unityWindowTracker.c
4859 @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
4860 @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libunity_la-unityWindowTracker.Tpo $(DEPDIR)/libunity_la-unityWindowTracker.Plo
4861@@ -685,26 +691,33 @@
4862 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
4863 @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
4864
4865-libunity_la-unityPlatformX11.lo: unitylib/unityPlatformX11.cc
4866-@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.cc
4867-@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libunity_la-unityPlatformX11.Tpo $(DEPDIR)/libunity_la-unityPlatformX11.Plo
4868-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='unitylib/unityPlatformX11.cc' object='libunity_la-unityPlatformX11.lo' libtool=yes @AMDEPBACKSLASH@
4869-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
4870-@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.cc
4871-
4872-libunity_la-unityPlatformX11Settings.lo: unitylib/unityPlatformX11Settings.cc
4873-@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.cc
4874-@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libunity_la-unityPlatformX11Settings.Tpo $(DEPDIR)/libunity_la-unityPlatformX11Settings.Plo
4875-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='unitylib/unityPlatformX11Settings.cc' object='libunity_la-unityPlatformX11Settings.lo' libtool=yes @AMDEPBACKSLASH@
4876-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
4877-@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.cc
4878-
4879-libunity_la-unityPlatformX11Window.lo: unitylib/unityPlatformX11Window.cc
4880-@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.cc
4881-@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libunity_la-unityPlatformX11Window.Tpo $(DEPDIR)/libunity_la-unityPlatformX11Window.Plo
4882-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='unitylib/unityPlatformX11Window.cc' object='libunity_la-unityPlatformX11Window.lo' libtool=yes @AMDEPBACKSLASH@
4883-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
4884-@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.cc
4885+libunity_la-event.lo: unitylib/event.cc
4886+@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
4887+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libunity_la-event.Tpo $(DEPDIR)/libunity_la-event.Plo
4888+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='unitylib/event.cc' object='libunity_la-event.lo' libtool=yes @AMDEPBACKSLASH@
4889+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
4890+@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
4891+
4892+libunity_la-settings.lo: unitylib/settings.cc
4893+@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
4894+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libunity_la-settings.Tpo $(DEPDIR)/libunity_la-settings.Plo
4895+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='unitylib/settings.cc' object='libunity_la-settings.lo' libtool=yes @AMDEPBACKSLASH@
4896+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
4897+@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
4898+
4899+libunity_la-util.lo: unitylib/util.cc
4900+@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
4901+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libunity_la-util.Tpo $(DEPDIR)/libunity_la-util.Plo
4902+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='unitylib/util.cc' object='libunity_la-util.lo' libtool=yes @AMDEPBACKSLASH@
4903+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
4904+@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
4905+
4906+libunity_la-window.lo: unitylib/window.cc
4907+@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
4908+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libunity_la-window.Tpo $(DEPDIR)/libunity_la-window.Plo
4909+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='unitylib/window.cc' object='libunity_la-window.lo' libtool=yes @AMDEPBACKSLASH@
4910+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
4911+@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
4912
4913 libunity_la-windowPathFactory.lo: unitylib/windowPathFactory.cc
4914 @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
4915@@ -713,19 +726,12 @@
4916 @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
4917 @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
4918
4919-libunity_la-x11Event.lo: unitylib/x11Event.cc
4920-@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.cc
4921-@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libunity_la-x11Event.Tpo $(DEPDIR)/libunity_la-x11Event.Plo
4922-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='unitylib/x11Event.cc' object='libunity_la-x11Event.lo' libtool=yes @AMDEPBACKSLASH@
4923-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
4924-@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.cc
4925-
4926-libunity_la-x11Util.lo: unitylib/x11Util.cc
4927-@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
4928-@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libunity_la-x11Util.Tpo $(DEPDIR)/libunity_la-x11Util.Plo
4929-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='unitylib/x11Util.cc' object='libunity_la-x11Util.lo' libtool=yes @AMDEPBACKSLASH@
4930-@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
4931-@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
4932+libunity_la-x11Platform.lo: unitylib/x11Platform.cc
4933+@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
4934+@am__fastdepCXX_TRUE@ $(am__mv) $(DEPDIR)/libunity_la-x11Platform.Tpo $(DEPDIR)/libunity_la-x11Platform.Plo
4935+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='unitylib/x11Platform.cc' object='libunity_la-x11Platform.lo' libtool=yes @AMDEPBACKSLASH@
4936+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
4937+@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
4938
4939 .cpp.o:
4940 @am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
4941
4942=== modified file 'services/plugins/unity/unityTclo.cpp'
4943--- services/plugins/unity/unityTclo.cpp 2011-03-31 14:20:05 +0000
4944+++ services/plugins/unity/unityTclo.cpp 2011-10-31 00:22:23 +0000
4945@@ -47,6 +47,7 @@
4946 #include "guestrpc/unityActive.h"
4947 #include "rpcin.h"
4948 #include "rpcout.h"
4949+ #include "str.h"
4950 #include "strutil.h"
4951 #if defined(OPEN_VM_TOOLS)
4952 #include "unitylib/unity.h"
4953
4954=== modified file 'services/plugins/unity/unitylib/unity.c'
4955--- services/plugins/unity/unitylib/unity.c 2011-07-22 16:41:03 +0000
4956+++ services/plugins/unity/unitylib/unity.c 2011-10-31 00:22:23 +0000
4957@@ -39,22 +39,14 @@
4958 * @li UnityRpcGH
4959 */
4960
4961+#include <glib.h>
4962+#include <glib-object.h>
4963 #include "vmware.h"
4964 #include "debug.h"
4965-#include "util.h"
4966-#include "strutil.h"
4967-#include "region.h"
4968-#include "unityWindowTracker.h"
4969-#include "unityCommon.h"
4970-#include "unity.h"
4971+#include "unityDebug.h"
4972 #include "unityInt.h"
4973 #include "unityPlatform.h"
4974-#include "unityDebug.h"
4975 #include "vmware/tools/unityevents.h"
4976-#include "vmware/tools/plugin.h"
4977-#include "appUtil.h"
4978-#include <stdio.h>
4979-#include <glib-object.h>
4980
4981 /*
4982 * Singleton object for tracking the state of the service.
4983@@ -64,9 +56,7 @@
4984 /*
4985 * Helper Functions
4986 */
4987-
4988 static void UnityUpdateCallbackFn(void *param, UnityUpdate *update);
4989-
4990 static void UnitySetAddHiddenWindows(Bool enabled);
4991 static void UnitySetInterlockMinimizeOperation(Bool enabled);
4992 static void UnitySetSendWindowContents(Bool enabled);
4993@@ -77,7 +67,6 @@
4994 * Dispatch table for Unity window commands. All commands performing actions on
4995 * guest unity windows go here.
4996 */
4997-
4998 typedef struct {
4999 const char *name;
5000 Bool (*exec)(UnityPlatform *up, UnityWindowId window);
The diff has been truncated for viewing.

Subscribers

People subscribed via source and target branches