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