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

Proposed by Nate Muench (Mink)
Status: Merged
Merged at revision: 27
Proposed branch: lp:~n-muench/ubuntu/precise/open-vm-tools/open-vm-tools-precise.sid-sync1a
Merge into: lp:ubuntu/precise/open-vm-tools
Diff against target: 84902 lines (+21087/-47781)
405 files modified
ChangeLog (+25/-0)
Makefile.in (+0/-8)
NEWS (+43/-0)
autom4te.cache/output.0 (+106/-1046)
autom4te.cache/output.1 (+106/-1046)
autom4te.cache/output.2 (+106/-1046)
autom4te.cache/traces.0 (+487/-503)
autom4te.cache/traces.1 (+1014/-1050)
autom4te.cache/traces.2 (+487/-503)
checkvm/Makefile.in (+0/-8)
configure (+123/-1063)
configure.ac (+44/-123)
debian/README.source (+0/-37)
debian/changelog (+226/-57)
debian/compat (+1/-1)
debian/control (+52/-32)
debian/control.modules.in (+0/-26)
debian/copyright (+69/-62)
debian/local/Makefile (+0/-25)
debian/manpages/libguestlib.3 (+1/-3)
debian/manpages/libvmtools.3 (+1/-3)
debian/manpages/vmblock.9 (+1/-3)
debian/manpages/vmci.9 (+1/-3)
debian/manpages/vmhgfs.9 (+2/-6)
debian/manpages/vmsock.9 (+1/-3)
debian/manpages/vmsync.9 (+1/-3)
debian/manpages/vmware-checkvm.1 (+1/-3)
debian/manpages/vmware-hgfsclient.1 (+1/-3)
debian/manpages/vmware-hgfsmounter.8 (+1/-3)
debian/manpages/vmware-toolbox-cmd.1 (+3/-3)
debian/manpages/vmware-user-suid-wrapper.8 (+1/-3)
debian/manpages/vmware-user.1 (+0/-69)
debian/manpages/vmware-xferlogs.1 (+1/-3)
debian/manpages/vmxnet.9 (+1/-3)
debian/open-vm-dkms.dkms (+26/-0)
debian/open-vm-source.README.Debian (+0/-18)
debian/open-vm-source.links (+0/-1)
debian/open-vm-toolbox.lintian-overrides (+2/-0)
debian/open-vm-toolbox.manpages (+1/-0)
debian/open-vm-tools.init (+4/-0)
debian/open-vm-tools.lintian-overrides (+0/-2)
debian/open-vm-tools.manpages (+0/-2)
debian/open-vm-tools.udev (+7/-0)
debian/patches/01-kvers.patch (+64/-70)
debian/patches/03-dkms.patch (+18/-0)
debian/patches/series (+1/-0)
debian/rules (+54/-220)
debian/source/format (+1/-1)
debian/source/options (+2/-0)
docs/Makefile.in (+0/-8)
docs/api/Makefile.in (+0/-8)
docs/api/services/main.doxy (+1/-0)
hgfsclient/Makefile.in (+0/-8)
hgfsmounter/Makefile.in (+0/-8)
hgfsmounter/hgfsmounter.c (+1/-1)
lib/Makefile.am (+1/-7)
lib/Makefile.in (+12/-22)
lib/appUtil/Makefile.in (+0/-8)
lib/auth/Makefile.in (+0/-8)
lib/auth/authPosix.c (+19/-2)
lib/backdoor/Makefile.in (+0/-8)
lib/backdoor/backdoorGcc64.c (+1/-1)
lib/dict/Makefile.in (+0/-8)
lib/dynxdr/Makefile.in (+0/-8)
lib/err/Makefile.in (+0/-8)
lib/file/Makefile.in (+0/-8)
lib/file/file.c (+72/-5)
lib/file/fileIO.c (+521/-15)
lib/file/fileIOPosix.c (+100/-83)
lib/file/fileInt.h (+8/-10)
lib/file/fileLockPosix.c (+93/-44)
lib/file/fileLockPrimitive.c (+366/-109)
lib/file/filePosix.c (+22/-8)
lib/file/fileStandAlone.c (+15/-0)
lib/foundryMsg/Makefile.in (+0/-8)
lib/foundryMsg/foundryMsg.c (+8/-12)
lib/foundryMsg/vixTranslateErrOpenSource.c (+1/-0)
lib/glibUtils/Makefile.am (+26/-0)
lib/glibUtils/Makefile.in (+581/-0)
lib/glibUtils/fileLogger.c (+418/-0)
lib/glibUtils/stdLogger.c (+241/-0)
lib/glibUtils/sysLogger.c (+209/-0)
lib/guestApp/Makefile.in (+0/-8)
lib/guestRpc/Makefile.in (+0/-8)
lib/hgfs/Makefile.in (+0/-8)
lib/hgfs/hgfsUtil.c (+7/-1)
lib/hgfsBd/Makefile.in (+0/-8)
lib/hgfsHelper/Makefile.in (+0/-8)
lib/hgfsServer/Makefile.in (+0/-8)
lib/hgfsServer/hgfsServer.c (+530/-102)
lib/hgfsServer/hgfsServerInt.h (+83/-21)
lib/hgfsServer/hgfsServerLinux.c (+24/-17)
lib/hgfsServer/hgfsServerPacketUtil.c (+34/-34)
lib/hgfsServer/hgfsServerParameters.c (+50/-13)
lib/hgfsServerManagerGuest/Makefile.in (+0/-8)
lib/hgfsServerManagerGuest/hgfsChannelGuest.c (+39/-0)
lib/hgfsServerManagerGuest/hgfsChannelGuestBd.c (+41/-0)
lib/hgfsServerManagerGuest/hgfsChannelGuestInt.h (+2/-0)
lib/hgfsServerManagerGuest/hgfsServerManagerGuest.c (+25/-0)
lib/hgfsServerPolicyGuest/Makefile.in (+0/-8)
lib/image/Makefile.am (+0/-25)
lib/image/Makefile.in (+0/-565)
lib/image/imageUtilPng.c (+0/-511)
lib/impersonate/Makefile.in (+0/-8)
lib/include/backdoor_def.h (+14/-2)
lib/include/base64.h (+3/-0)
lib/include/buildNumber.h (+6/-6)
lib/include/cpuid_info.h (+1/-82)
lib/include/dndGuest.h (+0/-52)
lib/include/file.h (+17/-0)
lib/include/fileIO.h (+34/-3)
lib/include/fileLock.h (+18/-7)
lib/include/glibUtils.h (+85/-0)
lib/include/guestInfo.h (+0/-10)
lib/include/guest_os.h (+28/-7)
lib/include/hashTable.h (+51/-2)
lib/include/hgfs.h (+1/-0)
lib/include/hgfsProto.h (+1/-1)
lib/include/hgfsServer.h (+1/-0)
lib/include/hgfsServerManager.h (+1/-0)
lib/include/hgfsUtil.h (+2/-0)
lib/include/hostinfo.h (+49/-34)
lib/include/imageUtil.h (+0/-67)
lib/include/imageUtilTypes.h (+0/-84)
lib/include/includeCheck.h (+9/-2)
lib/include/iovector.h (+2/-2)
lib/include/log.h (+27/-27)
lib/include/loglevel_defs.h (+0/-2)
lib/include/loglevel_user.h (+14/-0)
lib/include/memaligned.h (+122/-9)
lib/include/msg.h (+1/-0)
lib/include/msgList.h (+7/-5)
lib/include/msgfmt.h (+6/-2)
lib/include/msgid.h (+1/-26)
lib/include/msgidDefs.h (+60/-0)
lib/include/mutexRankLib.h (+30/-22)
lib/include/posix.h (+4/-1)
lib/include/preference.h (+2/-1)
lib/include/procMgr.h (+17/-10)
lib/include/rasterConv.h (+0/-88)
lib/include/region.h (+0/-278)
lib/include/str.h (+1/-1)
lib/include/strutil.h (+1/-0)
lib/include/syncDriver.h (+3/-10)
lib/include/system.h (+0/-1)
lib/include/unityCommon.h (+0/-1039)
lib/include/userlock.h (+8/-5)
lib/include/util.h (+3/-0)
lib/include/vix.h (+1/-0)
lib/include/vixCommands.h (+22/-100)
lib/include/vm_assert.h (+7/-18)
lib/include/vm_atomic.h (+134/-82)
lib/include/vm_basic_asm.h (+12/-11)
lib/include/vm_basic_defs.h (+8/-0)
lib/include/vm_basic_types.h (+3/-3)
lib/include/vm_product.h (+29/-9)
lib/include/vm_tools_version.h (+9/-2)
lib/include/vm_version.h (+46/-19)
lib/include/vmci_defs.h (+38/-7)
lib/include/vmci_sockets.h (+1/-0)
lib/include/vmware/tools/unityevents.h (+0/-44)
lib/include/win32util.h (+2/-0)
lib/include/x86cpuid.h (+143/-20)
lib/lock/Makefile.in (+0/-8)
lib/lock/ul.c (+511/-220)
lib/lock/ulBarrier.c (+9/-9)
lib/lock/ulCondVar.c (+17/-15)
lib/lock/ulExcl.c (+25/-15)
lib/lock/ulInt.h (+82/-37)
lib/lock/ulRW.c (+14/-11)
lib/lock/ulRec.c (+181/-40)
lib/lock/ulSema.c (+18/-14)
lib/message/Makefile.in (+0/-8)
lib/misc/Makefile.am (+3/-4)
lib/misc/Makefile.in (+14/-27)
lib/misc/base64.c (+64/-16)
lib/misc/codeset.c (+27/-27)
lib/misc/codesetBase.c (+26/-0)
lib/misc/codesetOld.h (+0/-32)
lib/misc/dynbuf.c (+4/-18)
lib/misc/hostinfo.c (+59/-30)
lib/misc/hostinfoHV.c (+3/-9)
lib/misc/hostinfoInt.h (+2/-2)
lib/misc/hostinfoPosix.c (+137/-29)
lib/misc/iovector.c (+36/-25)
lib/misc/msgList.c (+530/-0)
lib/misc/msgfmt.c (+2838/-0)
lib/misc/posixDlopen.c (+2/-2)
lib/misc/posixPosix.c (+41/-1)
lib/misc/random.c (+84/-73)
lib/misc/strutil.c (+40/-0)
lib/misc/utilMem.c (+84/-0)
lib/misc/vthreadBase.c (+9/-6)
lib/netUtil/Makefile.in (+0/-8)
lib/panic/Makefile.in (+0/-8)
lib/panicDefault/Makefile.in (+0/-8)
lib/printer/Makefile.in (+0/-8)
lib/procMgr/Makefile.in (+0/-8)
lib/procMgr/procMgrPosix.c (+580/-125)
lib/procMgr/procMgrSolaris.c (+46/-78)
lib/raster/Makefile.am (+0/-21)
lib/raster/Makefile.in (+0/-564)
lib/raster/rasterConv.c (+0/-1509)
lib/region/Makefile.am (+0/-21)
lib/region/Makefile.in (+0/-564)
lib/region/region.c (+0/-3102)
lib/rpcChannel/Makefile.in (+0/-8)
lib/rpcChannel/rpcChannel.c (+2/-1)
lib/rpcIn/Makefile.in (+0/-8)
lib/rpcIn/rpcin.c (+9/-0)
lib/rpcOut/Makefile.in (+0/-8)
lib/rpcVmx/Makefile.in (+0/-8)
lib/slashProc/Makefile.in (+0/-8)
lib/string/Makefile.am (+7/-3)
lib/string/Makefile.in (+9/-13)
lib/stubs/Makefile.am (+5/-0)
lib/stubs/Makefile.in (+9/-11)
lib/stubs/stub-log.c (+18/-4)
lib/stubs/stub-msgfmt-fbsd.c (+55/-0)
lib/syncDriver/Makefile.am (+7/-0)
lib/syncDriver/Makefile.in (+12/-11)
lib/syncDriver/nullDriver.c (+86/-0)
lib/syncDriver/syncDriverInt.h (+65/-0)
lib/syncDriver/syncDriverLinux.c (+239/-0)
lib/syncDriver/syncDriverPosix.c (+45/-153)
lib/syncDriver/vmSyncDriver.c (+138/-0)
lib/system/Makefile.in (+0/-8)
lib/unicode/Makefile.in (+0/-8)
lib/user/Makefile.in (+0/-8)
lib/vmCheck/Makefile.in (+0/-8)
lib/vmCheck/vmcheck.c (+0/-20)
lib/vmSignal/Makefile.in (+0/-8)
lib/wiper/Makefile.in (+0/-8)
lib/wiper/wiperPosix.c (+20/-2)
lib/xdg/Makefile.am (+2/-0)
lib/xdg/Makefile.in (+10/-10)
lib/xdg/xdg.c (+16/-7)
libguestlib/Makefile.in (+0/-8)
libhgfs/Makefile.in (+0/-8)
libvmtools/Makefile.am (+1/-3)
libvmtools/Makefile.in (+15/-49)
libvmtools/fileLogger.c (+0/-479)
libvmtools/i18n.c (+1/-1)
libvmtools/signalSource.c (+2/-2)
libvmtools/stdLogger.c (+0/-147)
libvmtools/sysLogger.c (+0/-223)
libvmtools/vmtoolsInt.h (+3/-79)
libvmtools/vmtoolsLog.c (+215/-303)
libvmtools/vmxLogger.c (+22/-39)
modules/Makefile.in (+0/-8)
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 (+14/-75)
modules/linux/shared/compat_version.h (+16/-0)
modules/linux/shared/vmci_call_defs.h (+12/-4)
modules/linux/shared/vmci_defs.h (+38/-7)
modules/linux/shared/vmci_infrastructure.h (+1/-0)
modules/linux/shared/vmci_iocontrols.h (+51/-21)
modules/linux/shared/vmci_kernel_if.h (+124/-84)
modules/linux/vmblock/Makefile (+2/-2)
modules/linux/vmci/Makefile (+3/-3)
modules/linux/vmci/Makefile.normal (+3/-2)
modules/linux/vmci/common/vmciCommonInt.h (+8/-40)
modules/linux/vmci/common/vmciContext.c (+427/-257)
modules/linux/vmci/common/vmciContext.h (+13/-14)
modules/linux/vmci/common/vmciDatagram.c (+29/-267)
modules/linux/vmci/common/vmciDatagram.h (+0/-5)
modules/linux/vmci/common/vmciDoorbell.c (+31/-35)
modules/linux/vmci/common/vmciEvent.c (+78/-34)
modules/linux/vmci/common/vmciHashtable.c (+38/-52)
modules/linux/vmci/common/vmciPageChannel.c (+1472/-0)
modules/linux/vmci/common/vmciQPair.c (+561/-189)
modules/linux/vmci/common/vmciQueuePair.c (+1360/-1011)
modules/linux/vmci/common/vmciQueuePair.h (+17/-80)
modules/linux/vmci/common/vmciResource.c (+25/-2)
modules/linux/vmci/common/vmciResource.h (+1/-1)
modules/linux/vmci/common/vmciRoute.c (+16/-15)
modules/linux/vmci/linux/driver.c (+258/-268)
modules/linux/vmci/linux/vmciKernelIf.c (+580/-110)
modules/linux/vmci/linux/vmci_version.h (+4/-4)
modules/linux/vmci/shared/vmciQueue.h (+60/-7)
modules/linux/vmci/shared/vmci_page_channel.h (+240/-0)
modules/linux/vmhgfs/Makefile (+2/-2)
modules/linux/vmhgfs/file.c (+6/-0)
modules/linux/vmhgfs/filesystem.c (+81/-19)
modules/linux/vmhgfs/fsutil.c (+26/-1)
modules/linux/vmhgfs/tcp.c (+1/-0)
modules/linux/vmsync/Makefile (+2/-2)
modules/linux/vmxnet/Makefile (+2/-2)
modules/linux/vmxnet/vmxnet.c (+41/-13)
modules/linux/vmxnet/vmxnet_version.h (+3/-3)
modules/linux/vsock/Makefile (+2/-2)
modules/linux/vsock/linux/af_vsock.c (+89/-85)
modules/linux/vsock/linux/notify.c (+7/-7)
modules/linux/vsock/linux/notify.h (+7/-7)
modules/linux/vsock/linux/notifyQState.c (+6/-6)
modules/linux/vsock/linux/vsockAddr.c (+7/-2)
modules/linux/vsock/linux/vsockSocketWrapper.h (+11/-1)
modules/linux/vsock/linux/vsock_version.h (+3/-3)
modules/shared/vmblock/block.c (+249/-244)
modules/shared/vmxnet/eth_public.h (+24/-1)
modules/shared/vmxnet/vmnet_def.h (+1/-0)
rpctool/Makefile.in (+0/-8)
scripts/Makefile.in (+0/-8)
scripts/common/vm-support (+1/-0)
scripts/common/vmware-xdg-detect-de (+51/-9)
scripts/linux/network (+82/-36)
scripts/linux/pam.d/vmtoolsd (+1/-1)
services/Makefile.am (+0/-4)
services/Makefile.in (+9/-21)
services/plugins/Makefile.am (+0/-3)
services/plugins/Makefile.in (+2/-11)
services/plugins/desktopEvents/Makefile.in (+0/-8)
services/plugins/dndcp/Makefile.in (+0/-8)
services/plugins/dndcp/copyPasteDnDX11.cpp (+0/-39)
services/plugins/dndcp/dnd/dndLinux.c (+19/-3)
services/plugins/dndcp/dndUIX11.cpp (+0/-1)
services/plugins/dndcp/stringxx/string.cc (+24/-0)
services/plugins/dndcp/stringxx/string.hh (+1/-0)
services/plugins/guestInfo/Makefile.in (+0/-8)
services/plugins/guestInfo/getlib/Makefile.in (+0/-8)
services/plugins/guestInfo/getlib/guestInfo.c (+28/-0)
services/plugins/guestInfo/guestInfoServer.c (+30/-25)
services/plugins/hgfsServer/Makefile.in (+0/-8)
services/plugins/powerOps/Makefile.in (+0/-8)
services/plugins/resolutionSet/Makefile.in (+0/-8)
services/plugins/resolutionSet/resolutionRandR12.c (+0/-2)
services/plugins/resolutionSet/resolutionRandR12.h (+1/-2)
services/plugins/resolutionSet/resolutionX11.c (+55/-9)
services/plugins/timeSync/Makefile.in (+0/-8)
services/plugins/unity/Makefile.am (+0/-201)
services/plugins/unity/Makefile.in (+0/-1048)
services/plugins/unity/ghIntegration/ghIntegration.cpp (+0/-587)
services/plugins/unity/ghIntegration/ghIntegration.h (+0/-117)
services/plugins/unity/ghIntegration/ghIntegrationInt.h (+0/-137)
services/plugins/unity/ghIntegration/ghiX11icon.h (+0/-40)
services/plugins/unity/ghIntegration/icon.cc (+0/-464)
services/plugins/unity/ghIntegration/platform.cc (+0/-1533)
services/plugins/unity/ghIntegration/pseudoAppMgr.cc (+0/-270)
services/plugins/unity/ghIntegration/vmware/tools/ghi/pseudoAppMgr.hh (+0/-83)
services/plugins/unity/ghiCommonDefines.h (+0/-46)
services/plugins/unity/ghiGetBinaryHandlers.x (+0/-133)
services/plugins/unity/ghiGetExecInfoHash.x (+0/-69)
services/plugins/unity/ghiProtocolHandler.x (+0/-69)
services/plugins/unity/ghiSetFocusedWindow.x (+0/-56)
services/plugins/unity/ghiSetGuestHandler.x (+0/-103)
services/plugins/unity/ghiSetOutlookTempFolder.x (+0/-57)
services/plugins/unity/ghiShellAction.x (+0/-89)
services/plugins/unity/ghiStartMenu.x (+0/-64)
services/plugins/unity/ghiTclo.cpp (+0/-1635)
services/plugins/unity/ghiTclo.h (+0/-57)
services/plugins/unity/ghiTrayIcon.x (+0/-104)
services/plugins/unity/toolsPlugin.cpp (+0/-206)
services/plugins/unity/unity.x (+0/-254)
services/plugins/unity/unityActive.x (+0/-33)
services/plugins/unity/unityPlugin.cpp (+0/-301)
services/plugins/unity/unityPlugin.h (+0/-236)
services/plugins/unity/unityPluginEntry.cpp (+0/-112)
services/plugins/unity/unityPluginPosix.cpp (+0/-276)
services/plugins/unity/unityPluginPosix.h (+0/-64)
services/plugins/unity/unityTclo.cpp (+0/-2436)
services/plugins/unity/unityTclo.h (+0/-71)
services/plugins/unity/unityWindowTracker/unityWindowTracker.c (+0/-1814)
services/plugins/unity/unityWindowTracker/unityWindowTracker.h (+0/-397)
services/plugins/unity/unitylib/unity.c (+0/-1321)
services/plugins/unity/unitylib/unity.h (+0/-243)
services/plugins/unity/unitylib/unityDebug.h (+0/-41)
services/plugins/unity/unitylib/unityInt.h (+0/-59)
services/plugins/unity/unitylib/unityPlatform.h (+0/-141)
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/vmware/tools/unity/windowPathFactory.hh (+0/-79)
services/plugins/unity/unitylib/windowPathFactory.cc (+0/-531)
services/plugins/unity/unitylib/x11Event.cc (+0/-352)
services/plugins/unity/unitylib/x11Util.cc (+0/-77)
services/plugins/vix/Makefile.in (+0/-8)
services/plugins/vix/foundryToolsDaemon.c (+11/-90)
services/plugins/vix/vixPlugin.c (+0/-2)
services/plugins/vix/vixPluginInt.h (+0/-3)
services/plugins/vix/vixTools.c (+416/-201)
services/plugins/vix/vixToolsEnvVars.c (+4/-8)
services/plugins/vix/vixToolsInt.h (+5/-1)
services/plugins/vmbackup/Makefile.in (+0/-8)
services/plugins/vmbackup/stateMachine.c (+1/-1)
services/vmtoolsd/Makefile.in (+0/-8)
services/vmtoolsd/mainLoop.c (+8/-0)
tests/Makefile.in (+0/-8)
tests/testDebug/Makefile.in (+0/-8)
tests/testPlugin/Makefile.in (+0/-8)
tests/testVmblock/Makefile.in (+0/-8)
tests/vmrpcdbg/Makefile.in (+0/-8)
toolbox/Makefile.in (+0/-8)
toolbox/l10n/de.vmsg (+5/-3)
toolbox/l10n/ja.vmsg (+2/-0)
toolbox/l10n/zh_CN.vmsg (+2/-2)
toolbox/toolboxcmd-shrink.c (+29/-7)
vmblock-fuse/Makefile.in (+0/-8)
vmblock-fuse/os.h (+1/-0)
vmblockmounter/Makefile.in (+0/-8)
vmware-user-suid-wrapper/Makefile.in (+0/-8)
vmware-user-suid-wrapper/wrapper-solaris.c (+3/-3)
xferlogs/Makefile.in (+0/-8)
To merge this branch: bzr merge lp:~n-muench/ubuntu/precise/open-vm-tools/open-vm-tools-precise.sid-sync1a
Reviewer Review Type Date Requested Status
Ubuntu Sponsors Team Pending
Review via email: mp+89824@code.launchpad.net

Description of the change

Hopefully, everything is in order this time.

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

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ChangeLog'
2--- ChangeLog 2011-07-22 16:41:03 +0000
3+++ ChangeLog 2012-01-24 04:56:25 +0000
4@@ -1,3 +1,28 @@
5+2011.12.20 Marcelo Vanzin <mvanzin@vmware.com>
6+ This release tag contains commits up to the following id:
7+ dfca5cf9d1c2335c5d001deedd9266c84956b508
8+
9+
10+2011.11.20 Marcelo Vanzin <mvanzin@vmware.com>
11+ This release tag contains commits up to the following id:
12+ 6c197b8e5eccf32bfee0e2452d8926968182aada
13+
14+
15+2011.10.26 Marcelo Vanzin <mvanzin@vmware.com>
16+ This release tag contains commits up to the following id:
17+ 6271fde90248a4fd49e38aa61498db9e1dbf37c3
18+
19+
20+2011.09.23 Marcelo Vanzin <mvanzin@vmware.com>
21+ This release tag contains commits up to the following id:
22+ 05baddbed1c5e47e9789a44d30bb217d7184232a
23+
24+
25+2011.08.21 Marcelo Vanzin <mvanzin@vmware.com>
26+ This release tag contains commits up to the following id:
27+ 2b3d76ba776f55d06fb5b62499b189ebd6bc1c75
28+
29+
30 2011.07.19 Marcelo Vanzin <mvanzin@vmware.com>
31 This release tag contains commits up to the following id:
32 5bed6f1369ca6e9c2c7fbaf4205d86e50f219c5f
33
34=== modified file 'Makefile.in'
35--- Makefile.in 2011-07-22 16:41:03 +0000
36+++ Makefile.in 2012-01-24 04:56:25 +0000
37@@ -170,8 +170,6 @@
38 FGREP = @FGREP@
39 FUSE_CPPFLAGS = @FUSE_CPPFLAGS@
40 FUSE_LIBS = @FUSE_LIBS@
41-GIO_CPPFLAGS = @GIO_CPPFLAGS@
42-GIO_LIBS = @GIO_LIBS@
43 GLIB2_CPPFLAGS = @GLIB2_CPPFLAGS@
44 GLIB2_LIBS = @GLIB2_LIBS@
45 GMODULE_CPPFLAGS = @GMODULE_CPPFLAGS@
46@@ -200,8 +198,6 @@
47 LD = @LD@
48 LDFLAGS = @LDFLAGS@
49 LIBOBJS = @LIBOBJS@
50-LIBPNG_CPPFLAGS = @LIBPNG_CPPFLAGS@
51-LIBPNG_LIBS = @LIBPNG_LIBS@
52 LIBS = @LIBS@
53 LIBTOOL = @LIBTOOL@
54 LIBVMTOOLS_LIBADD = @LIBVMTOOLS_LIBADD@
55@@ -252,8 +248,6 @@
56 TARGET_OS = @TARGET_OS@
57 TEST_PLUGIN_INSTALLDIR = @TEST_PLUGIN_INSTALLDIR@
58 TOOLS_VERSION = @TOOLS_VERSION@
59-URIPARSER_CPPFLAGS = @URIPARSER_CPPFLAGS@
60-URIPARSER_LIBS = @URIPARSER_LIBS@
61 VERSION = @VERSION@
62 VIX_LIBADD = @VIX_LIBADD@
63 VMSVC_PLUGIN_INSTALLDIR = @VMSVC_PLUGIN_INSTALLDIR@
64@@ -268,8 +262,6 @@
65 X_EXTRA_LIBS = @X_EXTRA_LIBS@
66 X_LIBS = @X_LIBS@
67 X_PRE_LIBS = @X_PRE_LIBS@
68-ZLIB_CPPFLAGS = @ZLIB_CPPFLAGS@
69-ZLIB_LIBS = @ZLIB_LIBS@
70 abs_builddir = @abs_builddir@
71 abs_srcdir = @abs_srcdir@
72 abs_top_builddir = @abs_top_builddir@
73
74=== modified file 'NEWS'
75--- NEWS 2011-07-22 16:41:03 +0000
76+++ NEWS 2012-01-24 04:56:25 +0000
77@@ -1,3 +1,46 @@
78+open-vm-tools 2011.12.20 changes:
79+ * Updates for new Linux kernel releases, including some fixes for
80+ Fedora's re-versioned 3.x kernels.
81+
82+ * VMCI sockets has some changes for a new socket type, targeted
83+ at replacing the "backdoor" communication used by the tools services.
84+
85+ * HGFS has better session support.
86+
87+ * Miscelaneous bug fixes and small enhancements in other parts
88+ of the code.
89+
90+open-vm-tools 2011.11.20 changes:
91+ * Updates for new Linux kernel releases.
92+
93+ * Better Unity and DnD compatibility with newer Linux distros.
94+
95+ * Other minor fixes and cleanups.
96+
97+open-vm-tools 2011.10.26 changes:
98+ * Mostly cleanups and bug fixes.
99+
100+ * Code can now compile with uClibc, with some caveats.
101+
102+open-vm-tools 2011.09.23 changes:
103+ * open-vm-tools now can use the built in Linux freeze / thaw
104+ support for block devices, making the vmsync driver unnecessary
105+ in kernels supporting that feature.
106+
107+ * The VMCI driver has been simplified, removing VM-to-VM
108+ communication support (which is being removed from VMware products).
109+
110+ * The Unity team decided to remove the Unity plugin from open-vm-tools,
111+ given its partial brokenness due to reliance on internally-modified
112+ version of GNOME libraries, among other reasons.
113+
114+ * Other bug fixes and code cleanup.
115+
116+open-vm-tools 2011.08.21 changes:
117+ * Enabled several VIX APIs on FreeBSD.
118+
119+ * Minor bug fixes and code cleanup.
120+
121 open-vm-tools 2011.07.19 changes:
122 * Fix an issue in the HGFS driver that could lead to a kernel
123 panic.
124
125=== modified file 'autom4te.cache/output.0'
126--- autom4te.cache/output.0 2011-07-22 16:41:03 +0000
127+++ autom4te.cache/output.0 2012-01-24 04:56:25 +0000
128@@ -1,6 +1,6 @@
129 @%:@! /bin/sh
130 @%:@ Guess values for system-dependent variables and create Makefiles.
131-@%:@ Generated by GNU Autoconf 2.67 for open-vm-tools 2011.07.19.
132+@%:@ Generated by GNU Autoconf 2.67 for open-vm-tools 2011.12.20.
133 @%:@
134 @%:@ Report bugs to <open-vm-tools-devel@lists.sourceforge.net>.
135 @%:@
136@@ -701,8 +701,8 @@
137 # Identity of this package.
138 PACKAGE_NAME='open-vm-tools'
139 PACKAGE_TARNAME='open-vm-tools'
140-PACKAGE_VERSION='2011.07.19'
141-PACKAGE_STRING='open-vm-tools 2011.07.19'
142+PACKAGE_VERSION='2011.12.20'
143+PACKAGE_STRING='open-vm-tools 2011.12.20'
144 PACKAGE_BUGREPORT='open-vm-tools-devel@lists.sourceforge.net'
145 PACKAGE_URL=''
146
147@@ -777,6 +777,8 @@
148 TARGET_OS
149 TOOLS_VERSION
150 HGFS_LIBS
151+USE_PRINTF_WRAPPERS_FALSE
152+USE_PRINTF_WRAPPERS_TRUE
153 USE_SLASH_PROC_FALSE
154 USE_SLASH_PROC_TRUE
155 HAVE_PAM_FALSE
156@@ -795,8 +797,6 @@
157 WITH_ROOT_PRIVILEGES_TRUE
158 ENABLE_TESTS_FALSE
159 ENABLE_TESTS_TRUE
160-ENABLE_UNITY_FALSE
161-ENABLE_UNITY_TRUE
162 HAVE_XCOMPOSITE_FALSE
163 HAVE_XCOMPOSITE_TRUE
164 HAVE_XSM_FALSE
165@@ -836,14 +836,6 @@
166 GTKMM_CPPFLAGS
167 GTK_LIBS
168 GTK_CPPFLAGS
169-GIO_LIBS
170-GIO_CPPFLAGS
171-ZLIB_LIBS
172-ZLIB_CPPFLAGS
173-LIBPNG_LIBS
174-LIBPNG_CPPFLAGS
175-URIPARSER_LIBS
176-URIPARSER_CPPFLAGS
177 CUNIT_LIBS
178 CUNIT_CPPFLAGS
179 PAM_LIBS
180@@ -986,7 +978,6 @@
181 with_kernel_release
182 with_linuxdir
183 enable_multimon
184-enable_unity
185 with_gtk2
186 with_gtkmm
187 enable_docs
188@@ -1561,7 +1552,7 @@
189 # Omit some internal or obsolete options to make the list less imposing.
190 # This message is too long to be a string in the A/UX 3.1 sh.
191 cat <<_ACEOF
192-\`configure' configures open-vm-tools 2011.07.19 to adapt to many kinds of systems.
193+\`configure' configures open-vm-tools 2011.12.20 to adapt to many kinds of systems.
194
195 Usage: $0 [OPTION]... [VAR=VALUE]...
196
197@@ -1635,7 +1626,7 @@
198
199 if test -n "$ac_init_help"; then
200 case $ac_init_help in
201- short | recursive ) echo "Configuration of open-vm-tools 2011.07.19:";;
202+ short | recursive ) echo "Configuration of open-vm-tools 2011.12.20:";;
203 esac
204 cat <<\_ACEOF
205
206@@ -1644,7 +1635,6 @@
207 --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
208 --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
209 --disable-multimon disables multimon, enabled by default
210- --disable-unity disables Unity, enabled by default
211 --disable-docs disables generation of API documentation; by
212 default, docs are built if doxygen is available.
213 --disable-tests disable compilation of test code.
214@@ -1762,7 +1752,7 @@
215 test -n "$ac_init_help" && exit $ac_status
216 if $ac_init_version; then
217 cat <<\_ACEOF
218-open-vm-tools configure 2011.07.19
219+open-vm-tools configure 2011.12.20
220 generated by GNU Autoconf 2.67
221
222 Copyright (C) 2010 Free Software Foundation, Inc.
223@@ -2454,7 +2444,7 @@
224 This file contains any messages produced by compilers while
225 running configure, to aid debugging if configure makes a mistake.
226
227-It was created by open-vm-tools $as_me 2011.07.19, which was
228+It was created by open-vm-tools $as_me 2011.12.20, which was
229 generated by GNU Autoconf 2.67. Invocation command line was
230
231 $ $0 $@
232@@ -3044,14 +3034,6 @@
233 fi
234
235
236-@%:@ Check whether --enable-unity was given.
237-if test "${enable_unity+set}" = set; then :
238- enableval=$enable_unity; enable_unity="$enableval"
239-else
240- enable_unity="yes"
241-fi
242-
243-
244
245 @%:@ Check whether --with-gtk2 was given.
246 if test "${with_gtk2+set}" = set; then :
247@@ -3086,11 +3068,6 @@
248 fi
249
250
251-# If we're not going to use Gtk 2.0, disable Unity.
252-if test "$with_gtk2" != "yes"; then
253- enable_unity="no"
254-fi
255-
256 am__api_version='1.11'
257
258 # Find a good install program. We prefer a C program (faster),
259@@ -3529,7 +3506,7 @@
260
261 # Define the identity of the package.
262 PACKAGE='open-vm-tools'
263- VERSION='2011.07.19'
264+ VERSION='2011.12.20'
265
266
267 cat >>confdefs.h <<_ACEOF
268@@ -17819,8 +17796,7 @@
269 #
270 # Check for PAM.
271 #
272-if test "$os" = "linux"; then
273-
274+
275 @%:@ Check whether --with-pam was given.
276 if test "${with_pam+set}" = set; then :
277 withval=$with_pam;
278@@ -17829,8 +17805,8 @@
279 fi
280
281
282- if test "$with_pam" = "yes"; then
283-
284+if test "$with_pam" = "yes"; then
285+
286 if test -z "$CUSTOM_PAM_CPPFLAGS"; then
287 if test "$os" = freebsd; then
288 CUSTOM_PAM_CPPFLAGS="-I/usr/local/include"
289@@ -17842,7 +17818,7 @@
290 fi
291 fi
292
293-
294+
295
296 if test -z "pam"; then
297 as_fn_error $? "'library' parameter is required.'" "$LINENO" 5
298@@ -18054,7 +18030,6 @@
299
300 fi
301
302- fi
303 fi
304
305 #
306@@ -18298,7 +18273,6 @@
307 # If the user explicitly disables X11, then don't try to detect the X-related libraries
308 if test "$have_x" = "disabled"; then
309 enable_multimon="no"
310- enable_unity="no"
311 elif test "$have_x" != "yes"; then
312 as_fn_error $? "The X11 libraries were not found. Please configure without X11 (using --without-x), or install the libX11 devel package(s)." "$LINENO" 5
313 else
314@@ -18402,12 +18376,6 @@
315 as_fn_error $? "libXinerama not found. Please configure without multimon (using --disable-multimon), configure without X11 (using --without-x), or install the libXinerama devel package(s)." "$LINENO" 5
316 fi
317
318- else
319- if test "$enable_unity" != "no"; then
320- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Disabling Unity due to --disable-multimon." >&5
321-$as_echo "$as_me: WARNING: Disabling Unity due to --disable-multimon." >&2;}
322- enable_unity="no"
323- fi
324 fi
325
326 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XOpenDevice in -lXi" >&5
327@@ -18704,939 +18672,6 @@
328 have_xcomposite="yes"
329 fi
330
331- # If we're building with support for Unity, we'll need a few additional
332- # libraries.
333- if test "$enable_unity" != "no"; then
334- # Unity needs the X11 Screen Saver extension library. It should be
335- # in the same place as the X11 libraries, so no need for any fancy
336- # path checking.
337-
338- have_header=1
339- if test -n "X11/extensions/scrnsaver.h"; then
340- ac_fn_c_check_header_mongrel "$LINENO" "X11/extensions/scrnsaver.h" "ac_cv_header_X11_extensions_scrnsaver_h" "$ac_includes_default"
341-if test "x$ac_cv_header_X11_extensions_scrnsaver_h" = x""yes; then :
342-
343-else
344-
345- have_header=0;
346- as_fn_error $? "libXss or headers not found. Please configure without Unity (using --disable-unity) or install the libXss devel package." "$LINENO" 5
347-
348-fi
349-
350-
351- fi
352-
353- if test $have_header = 1; then
354- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XScreenSaverQueryExtension in -lXss" >&5
355-$as_echo_n "checking for XScreenSaverQueryExtension in -lXss... " >&6; }
356-if test "${ac_cv_lib_Xss_XScreenSaverQueryExtension+set}" = set; then :
357- $as_echo_n "(cached) " >&6
358-else
359- ac_check_lib_save_LIBS=$LIBS
360-LIBS="-lXss $COMMON_XLIBS $LIBS"
361-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
362-/* end confdefs.h. */
363-
364-/* Override any GCC internal prototype to avoid an error.
365- Use char because int might match the return type of a GCC
366- builtin and then its argument prototype would still apply. */
367-#ifdef __cplusplus
368-extern "C"
369-#endif
370-char XScreenSaverQueryExtension ();
371-int
372-main ()
373-{
374-return XScreenSaverQueryExtension ();
375- ;
376- return 0;
377-}
378-_ACEOF
379-if ac_fn_c_try_link "$LINENO"; then :
380- ac_cv_lib_Xss_XScreenSaverQueryExtension=yes
381-else
382- ac_cv_lib_Xss_XScreenSaverQueryExtension=no
383-fi
384-rm -f core conftest.err conftest.$ac_objext \
385- conftest$ac_exeext conftest.$ac_ext
386-LIBS=$ac_check_lib_save_LIBS
387-fi
388-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xss_XScreenSaverQueryExtension" >&5
389-$as_echo "$ac_cv_lib_Xss_XScreenSaverQueryExtension" >&6; }
390-if test "x$ac_cv_lib_Xss_XScreenSaverQueryExtension" = x""yes; then :
391- COMMON_XLIBS="-lXss $COMMON_XLIBS"
392-else
393- as_fn_error $? "libXss or headers not found. Please configure without Unity (using --disable-unity) or install the libXss devel package." "$LINENO" 5
394-fi
395-
396- fi
397-
398-
399- # Check for the uriparser library and headers. The upstream uriparser
400- # doesn't appear to ship with either a pkg-config file or a
401- # uriparser-config binary, so we'll look for it the old-fashioned
402- # way.
403- #
404- # Note that we look for uriFreeQueryListA because it's a relatively
405- # new symbol that our code needs (it isn't present in the uriparser
406- # that shipped with Ubuntu Hardy).
407-
408- if test -z "$CUSTOM_URIPARSER_CPPFLAGS"; then
409- if test "$os" = freebsd; then
410- CUSTOM_URIPARSER_CPPFLAGS="-I/usr/local/include"
411- else
412- CUSTOM_URIPARSER_CPPFLAGS="-I/usr/include"
413- fi
414- if test -n "uriparser"; then
415- CUSTOM_URIPARSER_CPPFLAGS="${CUSTOM_URIPARSER_CPPFLAGS}/uriparser"
416- fi
417- fi
418-
419-
420-
421- if test -z "uriparser"; then
422- as_fn_error $? "'library' parameter is required.'" "$LINENO" 5
423- fi
424- if test -z "URIPARSER"; then
425- as_fn_error $? "'lvar' parameter is required.'" "$LINENO" 5
426- fi
427-
428- ac_vmw_have_lib=0
429- ac_vmw_have_lib_func=0
430- ac_vmw_have_lib_header=0
431- ac_vmw_custom_libs=
432-
433- #
434- # First, try any user-defined CUSTOM_* flags.
435- #
436- if test -n "${CUSTOM_URIPARSER_CPPFLAGS}" || test -n "${CUSTOM_URIPARSER_LIBS}"; then
437- ac_vmw_custom_libs="${CUSTOM_URIPARSER_LIBS} -luriparser"
438- if test -n "Uri.h"; then
439- ORIGINAL_CPPFLAGS="$CPPFLAGS"
440- CPPFLAGS="${CUSTOM_URIPARSER_CPPFLAGS} $CPPFLAGS"
441-
442- ac_fn_c_check_header_mongrel "$LINENO" "Uri.h" "ac_cv_header_Uri_h" "$ac_includes_default"
443-if test "x$ac_cv_header_Uri_h" = x""yes; then :
444- ac_vmw_have_lib_header=1
445-fi
446-
447-
448-
449- CPPFLAGS="$ORIGINAL_CPPFLAGS"
450- else
451- ac_vmw_have_lib_header=1
452- fi
453-
454- # Check a specific function in the library if requested.
455- # If it hasn't, just pick a random function from libc, just to make
456- # sure the linker can find the library being tested.
457- if test $ac_vmw_have_lib_header -eq 1; then
458- if test -n "uriFreeQueryListA"; then
459- ac_vmw_function=uriFreeQueryListA
460- else
461- ac_vmw_function=strlen
462- fi
463- as_ac_Lib=`$as_echo "ac_cv_lib_uriparser_$ac_vmw_function" | $as_tr_sh`
464-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_vmw_function in -luriparser" >&5
465-$as_echo_n "checking for $ac_vmw_function in -luriparser... " >&6; }
466-if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
467- $as_echo_n "(cached) " >&6
468-else
469- ac_check_lib_save_LIBS=$LIBS
470-LIBS="-luriparser $ac_vmw_custom_libs $LIBS"
471-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
472-/* end confdefs.h. */
473-
474-/* Override any GCC internal prototype to avoid an error.
475- Use char because int might match the return type of a GCC
476- builtin and then its argument prototype would still apply. */
477-#ifdef __cplusplus
478-extern "C"
479-#endif
480-char $ac_vmw_function ();
481-int
482-main ()
483-{
484-return $ac_vmw_function ();
485- ;
486- return 0;
487-}
488-_ACEOF
489-if ac_fn_c_try_link "$LINENO"; then :
490- eval "$as_ac_Lib=yes"
491-else
492- eval "$as_ac_Lib=no"
493-fi
494-rm -f core conftest.err conftest.$ac_objext \
495- conftest$ac_exeext conftest.$ac_ext
496-LIBS=$ac_check_lib_save_LIBS
497-fi
498-eval ac_res=\$$as_ac_Lib
499- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
500-$as_echo "$ac_res" >&6; }
501-if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
502- ac_vmw_have_lib_func=1
503-fi
504-
505- fi
506-
507- if test $ac_vmw_have_lib_func -eq 1 && test $ac_vmw_have_lib_header -eq 1; then
508- URIPARSER_CPPFLAGS="${CUSTOM_URIPARSER_CPPFLAGS}"
509- URIPARSER_LIBS="$ac_vmw_custom_libs"
510- ac_vmw_have_lib=1
511- fi
512- fi
513-
514- # If that didn't work, try with pkg-config.
515- if test $ac_vmw_have_lib -eq 0 && test "$HAVE_PKG_CONFIG" = "yes" && test -n ""; then
516- if test -n ""; then
517- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for >= (via pkg-config)" >&5
518-$as_echo_n "checking for >= (via pkg-config)... " >&6; }
519- if pkg-config --exists ' >= '; then
520- ac_vmw_have_lib=1
521- fi
522- else
523- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for (via pkg-config)" >&5
524-$as_echo_n "checking for (via pkg-config)... " >&6; }
525- if pkg-config --exists ''; then
526- ac_vmw_have_lib=1
527- fi
528- fi
529-
530- if test $ac_vmw_have_lib -eq 1; then
531- # Sometimes pkg-config might fail; for example, "pkg-config gtk+-2.0 --cflags"
532- # fails on OpenSolaris B71. So be pessimistic.
533- ac_vmw_cppflags="`pkg-config --cflags `"
534- ac_vmw_ret1=$?
535- ac_vmw_libs="`pkg-config --libs `"
536- ac_vmw_ret2=$?
537- if test $ac_vmw_ret1 -eq 0 && test $ac_vmw_ret2 -eq 0; then
538- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
539-$as_echo "yes" >&6; }
540- URIPARSER_CPPFLAGS="$ac_vmw_cppflags"
541- URIPARSER_LIBS="$ac_vmw_libs"
542- else
543- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
544-$as_echo "no" >&6; }
545- fi
546- else
547- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
548-$as_echo "no" >&6; }
549- fi
550- fi
551-
552- # If we still haven't found the lib, try with the library's custom "config" script.
553- # Before checking, flush the AC_PATH_PROG cached variable.
554- unset ac_cv_path_ac_vmw_lib_cfg
555- unset ac_vmw_lib_cfg
556- if test $ac_vmw_have_lib -eq 0 && test -n ""; then
557- # Extract the first word of "", so it can be a program name with args.
558-set dummy ; ac_word=$2
559-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
560-$as_echo_n "checking for $ac_word... " >&6; }
561-if test "${ac_cv_path_ac_vmw_lib_cfg+set}" = set; then :
562- $as_echo_n "(cached) " >&6
563-else
564- case $ac_vmw_lib_cfg in
565- [\\/]* | ?:[\\/]*)
566- ac_cv_path_ac_vmw_lib_cfg="$ac_vmw_lib_cfg" # Let the user override the test with a path.
567- ;;
568- *)
569- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
570-for as_dir in $PATH
571-do
572- IFS=$as_save_IFS
573- test -z "$as_dir" && as_dir=.
574- for ac_exec_ext in '' $ac_executable_extensions; do
575- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
576- ac_cv_path_ac_vmw_lib_cfg="$as_dir/$ac_word$ac_exec_ext"
577- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
578- break 2
579- fi
580-done
581- done
582-IFS=$as_save_IFS
583-
584- test -z "$ac_cv_path_ac_vmw_lib_cfg" && ac_cv_path_ac_vmw_lib_cfg="no"
585- ;;
586-esac
587-fi
588-ac_vmw_lib_cfg=$ac_cv_path_ac_vmw_lib_cfg
589-if test -n "$ac_vmw_lib_cfg"; then
590- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_vmw_lib_cfg" >&5
591-$as_echo "$ac_vmw_lib_cfg" >&6; }
592-else
593- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
594-$as_echo "no" >&6; }
595-fi
596-
597-
598- if test "$ac_vmw_lib_cfg" != "no"; then
599- # XXX: icu-config does not follow the "--cflags" and "--libs" convention,
600- # so single it out here to avoid having to replicate all the rest of the
601- # logic elsewhere.
602- if test `basename "$ac_vmw_lib_cfg"` = "icu-config"; then
603- URIPARSER_CPPFLAGS="`$ac_vmw_lib_cfg --cppflags`"
604- URIPARSER_LIBS="`$ac_vmw_lib_cfg --ldflags`"
605- else
606- URIPARSER_CPPFLAGS="`$ac_vmw_lib_cfg --cflags`"
607- URIPARSER_LIBS="`$ac_vmw_lib_cfg --libs`"
608- fi
609- ac_vmw_have_lib=1
610- fi
611- fi
612-
613- # Finish by executing the user provided action. The call to "true" is needed
614- # because the actions are optional, and we need something inside the block.
615- if test $ac_vmw_have_lib -eq 1; then
616-
617-
618- true
619-
620- else
621- true
622- as_fn_error $? "uriparser library not found or is too old. Please configure without Unity (using --disable-unity) or install the liburiparser devel package." "$LINENO" 5
623- fi
624-
625-
626- # Check for libpng.
627-
628-
629- if test -z "png12"; then
630- as_fn_error $? "'library' parameter is required.'" "$LINENO" 5
631- fi
632- if test -z "LIBPNG"; then
633- as_fn_error $? "'lvar' parameter is required.'" "$LINENO" 5
634- fi
635-
636- ac_vmw_have_lib=0
637- ac_vmw_have_lib_func=0
638- ac_vmw_have_lib_header=0
639- ac_vmw_custom_libs=
640-
641- #
642- # First, try any user-defined CUSTOM_* flags.
643- #
644- if test -n "${CUSTOM_LIBPNG_CPPFLAGS}" || test -n "${CUSTOM_LIBPNG_LIBS}"; then
645- ac_vmw_custom_libs="${CUSTOM_LIBPNG_LIBS} -lpng12"
646- if test -n "png.h"; then
647- ORIGINAL_CPPFLAGS="$CPPFLAGS"
648- CPPFLAGS="${CUSTOM_LIBPNG_CPPFLAGS} $CPPFLAGS"
649-
650- ac_fn_c_check_header_mongrel "$LINENO" "png.h" "ac_cv_header_png_h" "$ac_includes_default"
651-if test "x$ac_cv_header_png_h" = x""yes; then :
652- ac_vmw_have_lib_header=1
653-fi
654-
655-
656-
657- CPPFLAGS="$ORIGINAL_CPPFLAGS"
658- else
659- ac_vmw_have_lib_header=1
660- fi
661-
662- # Check a specific function in the library if requested.
663- # If it hasn't, just pick a random function from libc, just to make
664- # sure the linker can find the library being tested.
665- if test $ac_vmw_have_lib_header -eq 1; then
666- if test -n "png_access_version_number"; then
667- ac_vmw_function=png_access_version_number
668- else
669- ac_vmw_function=strlen
670- fi
671- as_ac_Lib=`$as_echo "ac_cv_lib_png12_$ac_vmw_function" | $as_tr_sh`
672-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_vmw_function in -lpng12" >&5
673-$as_echo_n "checking for $ac_vmw_function in -lpng12... " >&6; }
674-if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
675- $as_echo_n "(cached) " >&6
676-else
677- ac_check_lib_save_LIBS=$LIBS
678-LIBS="-lpng12 $ac_vmw_custom_libs $LIBS"
679-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
680-/* end confdefs.h. */
681-
682-/* Override any GCC internal prototype to avoid an error.
683- Use char because int might match the return type of a GCC
684- builtin and then its argument prototype would still apply. */
685-#ifdef __cplusplus
686-extern "C"
687-#endif
688-char $ac_vmw_function ();
689-int
690-main ()
691-{
692-return $ac_vmw_function ();
693- ;
694- return 0;
695-}
696-_ACEOF
697-if ac_fn_c_try_link "$LINENO"; then :
698- eval "$as_ac_Lib=yes"
699-else
700- eval "$as_ac_Lib=no"
701-fi
702-rm -f core conftest.err conftest.$ac_objext \
703- conftest$ac_exeext conftest.$ac_ext
704-LIBS=$ac_check_lib_save_LIBS
705-fi
706-eval ac_res=\$$as_ac_Lib
707- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
708-$as_echo "$ac_res" >&6; }
709-if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
710- ac_vmw_have_lib_func=1
711-fi
712-
713- fi
714-
715- if test $ac_vmw_have_lib_func -eq 1 && test $ac_vmw_have_lib_header -eq 1; then
716- LIBPNG_CPPFLAGS="${CUSTOM_LIBPNG_CPPFLAGS}"
717- LIBPNG_LIBS="$ac_vmw_custom_libs"
718- ac_vmw_have_lib=1
719- fi
720- fi
721-
722- # If that didn't work, try with pkg-config.
723- if test $ac_vmw_have_lib -eq 0 && test "$HAVE_PKG_CONFIG" = "yes" && test -n "libpng12"; then
724- if test -n ""; then
725- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libpng12 >= (via pkg-config)" >&5
726-$as_echo_n "checking for libpng12 >= (via pkg-config)... " >&6; }
727- if pkg-config --exists 'libpng12 >= '; then
728- ac_vmw_have_lib=1
729- fi
730- else
731- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libpng12 (via pkg-config)" >&5
732-$as_echo_n "checking for libpng12 (via pkg-config)... " >&6; }
733- if pkg-config --exists 'libpng12'; then
734- ac_vmw_have_lib=1
735- fi
736- fi
737-
738- if test $ac_vmw_have_lib -eq 1; then
739- # Sometimes pkg-config might fail; for example, "pkg-config gtk+-2.0 --cflags"
740- # fails on OpenSolaris B71. So be pessimistic.
741- ac_vmw_cppflags="`pkg-config --cflags libpng12`"
742- ac_vmw_ret1=$?
743- ac_vmw_libs="`pkg-config --libs libpng12`"
744- ac_vmw_ret2=$?
745- if test $ac_vmw_ret1 -eq 0 && test $ac_vmw_ret2 -eq 0; then
746- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
747-$as_echo "yes" >&6; }
748- LIBPNG_CPPFLAGS="$ac_vmw_cppflags"
749- LIBPNG_LIBS="$ac_vmw_libs"
750- else
751- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
752-$as_echo "no" >&6; }
753- fi
754- else
755- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
756-$as_echo "no" >&6; }
757- fi
758- fi
759-
760- # If we still haven't found the lib, try with the library's custom "config" script.
761- # Before checking, flush the AC_PATH_PROG cached variable.
762- unset ac_cv_path_ac_vmw_lib_cfg
763- unset ac_vmw_lib_cfg
764- if test $ac_vmw_have_lib -eq 0 && test -n "libpng-config"; then
765- # Extract the first word of "libpng-config", so it can be a program name with args.
766-set dummy libpng-config; ac_word=$2
767-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
768-$as_echo_n "checking for $ac_word... " >&6; }
769-if test "${ac_cv_path_ac_vmw_lib_cfg+set}" = set; then :
770- $as_echo_n "(cached) " >&6
771-else
772- case $ac_vmw_lib_cfg in
773- [\\/]* | ?:[\\/]*)
774- ac_cv_path_ac_vmw_lib_cfg="$ac_vmw_lib_cfg" # Let the user override the test with a path.
775- ;;
776- *)
777- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
778-for as_dir in $PATH
779-do
780- IFS=$as_save_IFS
781- test -z "$as_dir" && as_dir=.
782- for ac_exec_ext in '' $ac_executable_extensions; do
783- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
784- ac_cv_path_ac_vmw_lib_cfg="$as_dir/$ac_word$ac_exec_ext"
785- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
786- break 2
787- fi
788-done
789- done
790-IFS=$as_save_IFS
791-
792- test -z "$ac_cv_path_ac_vmw_lib_cfg" && ac_cv_path_ac_vmw_lib_cfg="no"
793- ;;
794-esac
795-fi
796-ac_vmw_lib_cfg=$ac_cv_path_ac_vmw_lib_cfg
797-if test -n "$ac_vmw_lib_cfg"; then
798- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_vmw_lib_cfg" >&5
799-$as_echo "$ac_vmw_lib_cfg" >&6; }
800-else
801- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
802-$as_echo "no" >&6; }
803-fi
804-
805-
806- if test "$ac_vmw_lib_cfg" != "no"; then
807- # XXX: icu-config does not follow the "--cflags" and "--libs" convention,
808- # so single it out here to avoid having to replicate all the rest of the
809- # logic elsewhere.
810- if test `basename "$ac_vmw_lib_cfg"` = "icu-config"; then
811- LIBPNG_CPPFLAGS="`$ac_vmw_lib_cfg --cppflags`"
812- LIBPNG_LIBS="`$ac_vmw_lib_cfg --ldflags`"
813- else
814- LIBPNG_CPPFLAGS="`$ac_vmw_lib_cfg --cflags`"
815- LIBPNG_LIBS="`$ac_vmw_lib_cfg --libs`"
816- fi
817- ac_vmw_have_lib=1
818- fi
819- fi
820-
821- # Finish by executing the user provided action. The call to "true" is needed
822- # because the actions are optional, and we need something inside the block.
823- if test $ac_vmw_have_lib -eq 1; then
824-
825-
826- true
827-
828- else
829- true
830- as_fn_error $? "libpng not found. Please configure without Unity (using --disable-unity) or install the libpng devel package" "$LINENO" 5
831- fi
832-
833-
834- # Check for the zlib library and headers. Like uriparser, there
835- # isn't a pkg-config or zlib-config file.
836-
837- if test -z "$CUSTOM_ZLIB_CPPFLAGS"; then
838- if test "$os" = freebsd; then
839- CUSTOM_ZLIB_CPPFLAGS="-I/usr/local/include"
840- else
841- CUSTOM_ZLIB_CPPFLAGS="-I/usr/include"
842- fi
843- if test -n ""; then
844- CUSTOM_ZLIB_CPPFLAGS="${CUSTOM_ZLIB_CPPFLAGS}/"
845- fi
846- fi
847-
848-
849-
850- if test -z "z"; then
851- as_fn_error $? "'library' parameter is required.'" "$LINENO" 5
852- fi
853- if test -z "ZLIB"; then
854- as_fn_error $? "'lvar' parameter is required.'" "$LINENO" 5
855- fi
856-
857- ac_vmw_have_lib=0
858- ac_vmw_have_lib_func=0
859- ac_vmw_have_lib_header=0
860- ac_vmw_custom_libs=
861-
862- #
863- # First, try any user-defined CUSTOM_* flags.
864- #
865- if test -n "${CUSTOM_ZLIB_CPPFLAGS}" || test -n "${CUSTOM_ZLIB_LIBS}"; then
866- ac_vmw_custom_libs="${CUSTOM_ZLIB_LIBS} -lz"
867- if test -n "zlib.h"; then
868- ORIGINAL_CPPFLAGS="$CPPFLAGS"
869- CPPFLAGS="${CUSTOM_ZLIB_CPPFLAGS} $CPPFLAGS"
870-
871- ac_fn_c_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default"
872-if test "x$ac_cv_header_zlib_h" = x""yes; then :
873- ac_vmw_have_lib_header=1
874-fi
875-
876-
877-
878- CPPFLAGS="$ORIGINAL_CPPFLAGS"
879- else
880- ac_vmw_have_lib_header=1
881- fi
882-
883- # Check a specific function in the library if requested.
884- # If it hasn't, just pick a random function from libc, just to make
885- # sure the linker can find the library being tested.
886- if test $ac_vmw_have_lib_header -eq 1; then
887- if test -n "zlibVersion"; then
888- ac_vmw_function=zlibVersion
889- else
890- ac_vmw_function=strlen
891- fi
892- as_ac_Lib=`$as_echo "ac_cv_lib_z_$ac_vmw_function" | $as_tr_sh`
893-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_vmw_function in -lz" >&5
894-$as_echo_n "checking for $ac_vmw_function in -lz... " >&6; }
895-if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
896- $as_echo_n "(cached) " >&6
897-else
898- ac_check_lib_save_LIBS=$LIBS
899-LIBS="-lz $ac_vmw_custom_libs $LIBS"
900-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
901-/* end confdefs.h. */
902-
903-/* Override any GCC internal prototype to avoid an error.
904- Use char because int might match the return type of a GCC
905- builtin and then its argument prototype would still apply. */
906-#ifdef __cplusplus
907-extern "C"
908-#endif
909-char $ac_vmw_function ();
910-int
911-main ()
912-{
913-return $ac_vmw_function ();
914- ;
915- return 0;
916-}
917-_ACEOF
918-if ac_fn_c_try_link "$LINENO"; then :
919- eval "$as_ac_Lib=yes"
920-else
921- eval "$as_ac_Lib=no"
922-fi
923-rm -f core conftest.err conftest.$ac_objext \
924- conftest$ac_exeext conftest.$ac_ext
925-LIBS=$ac_check_lib_save_LIBS
926-fi
927-eval ac_res=\$$as_ac_Lib
928- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
929-$as_echo "$ac_res" >&6; }
930-if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
931- ac_vmw_have_lib_func=1
932-fi
933-
934- fi
935-
936- if test $ac_vmw_have_lib_func -eq 1 && test $ac_vmw_have_lib_header -eq 1; then
937- ZLIB_CPPFLAGS="${CUSTOM_ZLIB_CPPFLAGS}"
938- ZLIB_LIBS="$ac_vmw_custom_libs"
939- ac_vmw_have_lib=1
940- fi
941- fi
942-
943- # If that didn't work, try with pkg-config.
944- if test $ac_vmw_have_lib -eq 0 && test "$HAVE_PKG_CONFIG" = "yes" && test -n ""; then
945- if test -n ""; then
946- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for >= (via pkg-config)" >&5
947-$as_echo_n "checking for >= (via pkg-config)... " >&6; }
948- if pkg-config --exists ' >= '; then
949- ac_vmw_have_lib=1
950- fi
951- else
952- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for (via pkg-config)" >&5
953-$as_echo_n "checking for (via pkg-config)... " >&6; }
954- if pkg-config --exists ''; then
955- ac_vmw_have_lib=1
956- fi
957- fi
958-
959- if test $ac_vmw_have_lib -eq 1; then
960- # Sometimes pkg-config might fail; for example, "pkg-config gtk+-2.0 --cflags"
961- # fails on OpenSolaris B71. So be pessimistic.
962- ac_vmw_cppflags="`pkg-config --cflags `"
963- ac_vmw_ret1=$?
964- ac_vmw_libs="`pkg-config --libs `"
965- ac_vmw_ret2=$?
966- if test $ac_vmw_ret1 -eq 0 && test $ac_vmw_ret2 -eq 0; then
967- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
968-$as_echo "yes" >&6; }
969- ZLIB_CPPFLAGS="$ac_vmw_cppflags"
970- ZLIB_LIBS="$ac_vmw_libs"
971- else
972- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
973-$as_echo "no" >&6; }
974- fi
975- else
976- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
977-$as_echo "no" >&6; }
978- fi
979- fi
980-
981- # If we still haven't found the lib, try with the library's custom "config" script.
982- # Before checking, flush the AC_PATH_PROG cached variable.
983- unset ac_cv_path_ac_vmw_lib_cfg
984- unset ac_vmw_lib_cfg
985- if test $ac_vmw_have_lib -eq 0 && test -n ""; then
986- # Extract the first word of "", so it can be a program name with args.
987-set dummy ; ac_word=$2
988-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
989-$as_echo_n "checking for $ac_word... " >&6; }
990-if test "${ac_cv_path_ac_vmw_lib_cfg+set}" = set; then :
991- $as_echo_n "(cached) " >&6
992-else
993- case $ac_vmw_lib_cfg in
994- [\\/]* | ?:[\\/]*)
995- ac_cv_path_ac_vmw_lib_cfg="$ac_vmw_lib_cfg" # Let the user override the test with a path.
996- ;;
997- *)
998- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
999-for as_dir in $PATH
1000-do
1001- IFS=$as_save_IFS
1002- test -z "$as_dir" && as_dir=.
1003- for ac_exec_ext in '' $ac_executable_extensions; do
1004- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1005- ac_cv_path_ac_vmw_lib_cfg="$as_dir/$ac_word$ac_exec_ext"
1006- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1007- break 2
1008- fi
1009-done
1010- done
1011-IFS=$as_save_IFS
1012-
1013- test -z "$ac_cv_path_ac_vmw_lib_cfg" && ac_cv_path_ac_vmw_lib_cfg="no"
1014- ;;
1015-esac
1016-fi
1017-ac_vmw_lib_cfg=$ac_cv_path_ac_vmw_lib_cfg
1018-if test -n "$ac_vmw_lib_cfg"; then
1019- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_vmw_lib_cfg" >&5
1020-$as_echo "$ac_vmw_lib_cfg" >&6; }
1021-else
1022- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1023-$as_echo "no" >&6; }
1024-fi
1025-
1026-
1027- if test "$ac_vmw_lib_cfg" != "no"; then
1028- # XXX: icu-config does not follow the "--cflags" and "--libs" convention,
1029- # so single it out here to avoid having to replicate all the rest of the
1030- # logic elsewhere.
1031- if test `basename "$ac_vmw_lib_cfg"` = "icu-config"; then
1032- ZLIB_CPPFLAGS="`$ac_vmw_lib_cfg --cppflags`"
1033- ZLIB_LIBS="`$ac_vmw_lib_cfg --ldflags`"
1034- else
1035- ZLIB_CPPFLAGS="`$ac_vmw_lib_cfg --cflags`"
1036- ZLIB_LIBS="`$ac_vmw_lib_cfg --libs`"
1037- fi
1038- ac_vmw_have_lib=1
1039- fi
1040- fi
1041-
1042- # Finish by executing the user provided action. The call to "true" is needed
1043- # because the actions are optional, and we need something inside the block.
1044- if test $ac_vmw_have_lib -eq 1; then
1045-
1046-
1047- true
1048-
1049- else
1050- true
1051- as_fn_error $? "zlib library not found. Please configure without Unity (using --disable-unity) or install the zlib devel package." "$LINENO" 5
1052- fi
1053-
1054-
1055- # Check for gio 2.24.
1056-
1057-
1058- if test -z "gio-2.0"; then
1059- as_fn_error $? "'library' parameter is required.'" "$LINENO" 5
1060- fi
1061- if test -z "GIO"; then
1062- as_fn_error $? "'lvar' parameter is required.'" "$LINENO" 5
1063- fi
1064-
1065- ac_vmw_have_lib=0
1066- ac_vmw_have_lib_func=0
1067- ac_vmw_have_lib_header=0
1068- ac_vmw_custom_libs=
1069-
1070- #
1071- # First, try any user-defined CUSTOM_* flags.
1072- #
1073- if test -n "${CUSTOM_GIO_CPPFLAGS}" || test -n "${CUSTOM_GIO_LIBS}"; then
1074- ac_vmw_custom_libs="${CUSTOM_GIO_LIBS} -lgio-2.0"
1075- if test -n "gio/gio.h"; then
1076- ORIGINAL_CPPFLAGS="$CPPFLAGS"
1077- CPPFLAGS="${CUSTOM_GIO_CPPFLAGS} $CPPFLAGS"
1078-
1079- ac_fn_c_check_header_mongrel "$LINENO" "gio/gio.h" "ac_cv_header_gio_gio_h" "$ac_includes_default"
1080-if test "x$ac_cv_header_gio_gio_h" = x""yes; then :
1081- ac_vmw_have_lib_header=1
1082-fi
1083-
1084-
1085-
1086- CPPFLAGS="$ORIGINAL_CPPFLAGS"
1087- else
1088- ac_vmw_have_lib_header=1
1089- fi
1090-
1091- # Check a specific function in the library if requested.
1092- # If it hasn't, just pick a random function from libc, just to make
1093- # sure the linker can find the library being tested.
1094- if test $ac_vmw_have_lib_header -eq 1; then
1095- if test -n "g_desktop_app_info_get_filename"; then
1096- ac_vmw_function=g_desktop_app_info_get_filename
1097- else
1098- ac_vmw_function=strlen
1099- fi
1100- as_ac_Lib=`$as_echo "ac_cv_lib_gio-2.0_$ac_vmw_function" | $as_tr_sh`
1101-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_vmw_function in -lgio-2.0" >&5
1102-$as_echo_n "checking for $ac_vmw_function in -lgio-2.0... " >&6; }
1103-if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
1104- $as_echo_n "(cached) " >&6
1105-else
1106- ac_check_lib_save_LIBS=$LIBS
1107-LIBS="-lgio-2.0 $ac_vmw_custom_libs $LIBS"
1108-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1109-/* end confdefs.h. */
1110-
1111-/* Override any GCC internal prototype to avoid an error.
1112- Use char because int might match the return type of a GCC
1113- builtin and then its argument prototype would still apply. */
1114-#ifdef __cplusplus
1115-extern "C"
1116-#endif
1117-char $ac_vmw_function ();
1118-int
1119-main ()
1120-{
1121-return $ac_vmw_function ();
1122- ;
1123- return 0;
1124-}
1125-_ACEOF
1126-if ac_fn_c_try_link "$LINENO"; then :
1127- eval "$as_ac_Lib=yes"
1128-else
1129- eval "$as_ac_Lib=no"
1130-fi
1131-rm -f core conftest.err conftest.$ac_objext \
1132- conftest$ac_exeext conftest.$ac_ext
1133-LIBS=$ac_check_lib_save_LIBS
1134-fi
1135-eval ac_res=\$$as_ac_Lib
1136- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
1137-$as_echo "$ac_res" >&6; }
1138-if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
1139- ac_vmw_have_lib_func=1
1140-fi
1141-
1142- fi
1143-
1144- if test $ac_vmw_have_lib_func -eq 1 && test $ac_vmw_have_lib_header -eq 1; then
1145- GIO_CPPFLAGS="${CUSTOM_GIO_CPPFLAGS}"
1146- GIO_LIBS="$ac_vmw_custom_libs"
1147- ac_vmw_have_lib=1
1148- fi
1149- fi
1150-
1151- # If that didn't work, try with pkg-config.
1152- if test $ac_vmw_have_lib -eq 0 && test "$HAVE_PKG_CONFIG" = "yes" && test -n "gio-unix-2.0"; then
1153- if test -n "2.24.0"; then
1154- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gio-unix-2.0 >= 2.24.0 (via pkg-config)" >&5
1155-$as_echo_n "checking for gio-unix-2.0 >= 2.24.0 (via pkg-config)... " >&6; }
1156- if pkg-config --exists 'gio-unix-2.0 >= 2.24.0'; then
1157- ac_vmw_have_lib=1
1158- fi
1159- else
1160- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gio-unix-2.0 (via pkg-config)" >&5
1161-$as_echo_n "checking for gio-unix-2.0 (via pkg-config)... " >&6; }
1162- if pkg-config --exists 'gio-unix-2.0'; then
1163- ac_vmw_have_lib=1
1164- fi
1165- fi
1166-
1167- if test $ac_vmw_have_lib -eq 1; then
1168- # Sometimes pkg-config might fail; for example, "pkg-config gtk+-2.0 --cflags"
1169- # fails on OpenSolaris B71. So be pessimistic.
1170- ac_vmw_cppflags="`pkg-config --cflags gio-unix-2.0`"
1171- ac_vmw_ret1=$?
1172- ac_vmw_libs="`pkg-config --libs gio-unix-2.0`"
1173- ac_vmw_ret2=$?
1174- if test $ac_vmw_ret1 -eq 0 && test $ac_vmw_ret2 -eq 0; then
1175- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
1176-$as_echo "yes" >&6; }
1177- GIO_CPPFLAGS="$ac_vmw_cppflags"
1178- GIO_LIBS="$ac_vmw_libs"
1179- else
1180- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1181-$as_echo "no" >&6; }
1182- fi
1183- else
1184- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1185-$as_echo "no" >&6; }
1186- fi
1187- fi
1188-
1189- # If we still haven't found the lib, try with the library's custom "config" script.
1190- # Before checking, flush the AC_PATH_PROG cached variable.
1191- unset ac_cv_path_ac_vmw_lib_cfg
1192- unset ac_vmw_lib_cfg
1193- if test $ac_vmw_have_lib -eq 0 && test -n ""; then
1194- # Extract the first word of "", so it can be a program name with args.
1195-set dummy ; ac_word=$2
1196-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1197-$as_echo_n "checking for $ac_word... " >&6; }
1198-if test "${ac_cv_path_ac_vmw_lib_cfg+set}" = set; then :
1199- $as_echo_n "(cached) " >&6
1200-else
1201- case $ac_vmw_lib_cfg in
1202- [\\/]* | ?:[\\/]*)
1203- ac_cv_path_ac_vmw_lib_cfg="$ac_vmw_lib_cfg" # Let the user override the test with a path.
1204- ;;
1205- *)
1206- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1207-for as_dir in $PATH
1208-do
1209- IFS=$as_save_IFS
1210- test -z "$as_dir" && as_dir=.
1211- for ac_exec_ext in '' $ac_executable_extensions; do
1212- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1213- ac_cv_path_ac_vmw_lib_cfg="$as_dir/$ac_word$ac_exec_ext"
1214- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1215- break 2
1216- fi
1217-done
1218- done
1219-IFS=$as_save_IFS
1220-
1221- test -z "$ac_cv_path_ac_vmw_lib_cfg" && ac_cv_path_ac_vmw_lib_cfg="no"
1222- ;;
1223-esac
1224-fi
1225-ac_vmw_lib_cfg=$ac_cv_path_ac_vmw_lib_cfg
1226-if test -n "$ac_vmw_lib_cfg"; then
1227- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_vmw_lib_cfg" >&5
1228-$as_echo "$ac_vmw_lib_cfg" >&6; }
1229-else
1230- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1231-$as_echo "no" >&6; }
1232-fi
1233-
1234-
1235- if test "$ac_vmw_lib_cfg" != "no"; then
1236- # XXX: icu-config does not follow the "--cflags" and "--libs" convention,
1237- # so single it out here to avoid having to replicate all the rest of the
1238- # logic elsewhere.
1239- if test `basename "$ac_vmw_lib_cfg"` = "icu-config"; then
1240- GIO_CPPFLAGS="`$ac_vmw_lib_cfg --cppflags`"
1241- GIO_LIBS="`$ac_vmw_lib_cfg --ldflags`"
1242- else
1243- GIO_CPPFLAGS="`$ac_vmw_lib_cfg --cflags`"
1244- GIO_LIBS="`$ac_vmw_lib_cfg --libs`"
1245- fi
1246- ac_vmw_have_lib=1
1247- fi
1248- fi
1249-
1250- # Finish by executing the user provided action. The call to "true" is needed
1251- # because the actions are optional, and we need something inside the block.
1252- if test $ac_vmw_have_lib -eq 1; then
1253-
1254-
1255- true
1256-
1257- else
1258- true
1259- as_fn_error $? "GLib/GIO 2.24+ not found. Please configure without Unity (using --disable-unity) or upgrade the Glib devel package." "$LINENO" 5
1260- fi
1261-
1262- fi # End of library checks for Unity.
1263-
1264 # Check whether we have gtk+ 2.0.
1265 if test "$with_gtk2" != "no"; then
1266 # gdk_display_get_default_group (added in gtk+ 2.4.0) is function currently
1267@@ -19847,53 +18882,6 @@
1268 as_fn_error $? "Gtk+ 2.0 library not found or too old. Please configure without Gtk+ support (using --without-gtk2) or install the Gtk+ 2.0 devel package." "$LINENO" 5
1269 fi
1270
1271-
1272- # Unity requires libgdk_pixbuf_xlib, which most systems don't seem to
1273- # provide via "pkg-config --libs gtk+-2.0".
1274- if test "$enable_unity" != "no"; then
1275- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdk_pixbuf_xlib_init in -lgdk_pixbuf_xlib-2.0" >&5
1276-$as_echo_n "checking for gdk_pixbuf_xlib_init in -lgdk_pixbuf_xlib-2.0... " >&6; }
1277-if test "${ac_cv_lib_gdk_pixbuf_xlib_2_0_gdk_pixbuf_xlib_init+set}" = set; then :
1278- $as_echo_n "(cached) " >&6
1279-else
1280- ac_check_lib_save_LIBS=$LIBS
1281-LIBS="-lgdk_pixbuf_xlib-2.0 $GTK_LIBS $LIBS"
1282-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1283-/* end confdefs.h. */
1284-
1285-/* Override any GCC internal prototype to avoid an error.
1286- Use char because int might match the return type of a GCC
1287- builtin and then its argument prototype would still apply. */
1288-#ifdef __cplusplus
1289-extern "C"
1290-#endif
1291-char gdk_pixbuf_xlib_init ();
1292-int
1293-main ()
1294-{
1295-return gdk_pixbuf_xlib_init ();
1296- ;
1297- return 0;
1298-}
1299-_ACEOF
1300-if ac_fn_c_try_link "$LINENO"; then :
1301- ac_cv_lib_gdk_pixbuf_xlib_2_0_gdk_pixbuf_xlib_init=yes
1302-else
1303- ac_cv_lib_gdk_pixbuf_xlib_2_0_gdk_pixbuf_xlib_init=no
1304-fi
1305-rm -f core conftest.err conftest.$ac_objext \
1306- conftest$ac_exeext conftest.$ac_ext
1307-LIBS=$ac_check_lib_save_LIBS
1308-fi
1309-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gdk_pixbuf_xlib_2_0_gdk_pixbuf_xlib_init" >&5
1310-$as_echo "$ac_cv_lib_gdk_pixbuf_xlib_2_0_gdk_pixbuf_xlib_init" >&6; }
1311-if test "x$ac_cv_lib_gdk_pixbuf_xlib_2_0_gdk_pixbuf_xlib_init" = x""yes; then :
1312- GTK_LIBS="$GTK_LIBS -lgdk_pixbuf_xlib-2.0"
1313-else
1314- as_fn_error $? "gdk_pixbuf_xlib-2.0 not found. Make sure your Gtk 2.0 installation is sane, or configure without Unity (using --disable-unity)." "$LINENO" 5
1315-fi
1316-
1317- fi
1318 fi
1319
1320 #
1321@@ -21834,6 +20822,8 @@
1322
1323 # Easier to give all modules the ICU defines/includes...
1324 CPPFLAGS="$CPPFLAGS $ICU_CPPFLAGS"
1325+else
1326+ CPPFLAGS="$CPPFLAGS -DNO_ICU"
1327 fi
1328
1329 # Extract the first word of "rpcgen", so it can be a program name with args.
1330@@ -22090,6 +21080,50 @@
1331
1332 fi
1333
1334+bsdPrintfWrappers=no
1335+if test "$os" = "linux"; then
1336+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ecvt in -lc" >&5
1337+$as_echo_n "checking for ecvt in -lc... " >&6; }
1338+if test "${ac_cv_lib_c_ecvt+set}" = set; then :
1339+ $as_echo_n "(cached) " >&6
1340+else
1341+ ac_check_lib_save_LIBS=$LIBS
1342+LIBS="-lc $LIBS"
1343+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1344+/* end confdefs.h. */
1345+
1346+/* Override any GCC internal prototype to avoid an error.
1347+ Use char because int might match the return type of a GCC
1348+ builtin and then its argument prototype would still apply. */
1349+#ifdef __cplusplus
1350+extern "C"
1351+#endif
1352+char ecvt ();
1353+int
1354+main ()
1355+{
1356+return ecvt ();
1357+ ;
1358+ return 0;
1359+}
1360+_ACEOF
1361+if ac_fn_c_try_link "$LINENO"; then :
1362+ ac_cv_lib_c_ecvt=yes
1363+else
1364+ ac_cv_lib_c_ecvt=no
1365+fi
1366+rm -f core conftest.err conftest.$ac_objext \
1367+ conftest$ac_exeext conftest.$ac_ext
1368+LIBS=$ac_check_lib_save_LIBS
1369+fi
1370+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_ecvt" >&5
1371+$as_echo "$ac_cv_lib_c_ecvt" >&6; }
1372+if test "x$ac_cv_lib_c_ecvt" = x""yes; then :
1373+ bsdPrintfWrappers=yes
1374+fi
1375+
1376+fi
1377+
1378 ###
1379 ### Typdefs, structs, and compiler quarks.
1380 ###
1381@@ -22555,7 +21589,7 @@
1382 CFLAGS="$ORIGINAL_CFLAGS$NEW_CFLAG"
1383 done
1384 CPPFLAGS="$CPPFLAGS -DVMX86_TOOLS"
1385-CPPFLAGS="$CPPFLAGS -DNO_CORE_ICU"
1386+CPPFLAGS="$CPPFLAGS"
1387
1388 # -fvisibility is used by "core service" plugins, but not required.
1389 ORIGINAL_CFLAGS="$CFLAGS"
1390@@ -22584,6 +21618,34 @@
1391 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
1392 CFLAGS="$ORIGINAL_CFLAGS"
1393
1394+# Detect "unused-but-set-variable" gcc warning and disable it.
1395+ORIGINAL_CFLAGS="$CFLAGS"
1396+CFLAGS="$CFLAGS -Wno-unused-but-set-variable"
1397+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GCC flag -Wno-unused-but-set-variable" >&5
1398+$as_echo_n "checking for GCC flag -Wno-unused-but-set-variable... " >&6; }
1399+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1400+/* end confdefs.h. */
1401+
1402+int
1403+main ()
1404+{
1405+return 0;
1406+ ;
1407+ return 0;
1408+}
1409+_ACEOF
1410+if ac_fn_c_try_compile "$LINENO"; then :
1411+ ORIGINAL_CFLAGS="$ORIGINAL_CFLAGS -Wno-unused-but-set-variable";
1412+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
1413+$as_echo "yes" >&6; }
1414+else
1415+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1416+$as_echo "no" >&6; }
1417+fi
1418+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
1419+CFLAGS="$ORIGINAL_CFLAGS"
1420+
1421+
1422 BUILDDIR="`pwd`"
1423
1424 INCLUDE_DIR="`cd $srcdir; pwd`/lib/include"
1425@@ -22767,6 +21829,7 @@
1426 fi
1427
1428 if test "$os" = "freebsd"; then
1429+ LIBVMTOOLS_LIBADD="$LIBVMTOOLS_LIBADD -lkvm"
1430 MODULES_DIR="/boot/modules"
1431
1432 if test "$osVersion" -ge 302000; then
1433@@ -22924,14 +21987,6 @@
1434 HAVE_XCOMPOSITE_FALSE=
1435 fi
1436
1437- if test "$enable_unity" = "yes"; then
1438- ENABLE_UNITY_TRUE=
1439- ENABLE_UNITY_FALSE='#'
1440-else
1441- ENABLE_UNITY_TRUE='#'
1442- ENABLE_UNITY_FALSE=
1443-fi
1444-
1445 if test "$have_cunit" = "yes"; then
1446 ENABLE_TESTS_TRUE=
1447 ENABLE_TESTS_FALSE='#'
1448@@ -23004,6 +22059,14 @@
1449 USE_SLASH_PROC_FALSE=
1450 fi
1451
1452+ if test "$bsdPrintfWrappers" = "yes"; then
1453+ USE_PRINTF_WRAPPERS_TRUE=
1454+ USE_PRINTF_WRAPPERS_FALSE='#'
1455+else
1456+ USE_PRINTF_WRAPPERS_TRUE='#'
1457+ USE_PRINTF_WRAPPERS_FALSE=
1458+fi
1459+
1460
1461 if test "$have_xsm" != "yes"; then
1462 $as_echo "@%:@define NO_XSM 1" >>confdefs.h
1463@@ -23113,7 +22176,7 @@
1464 ###
1465 ### Create the Makefiles
1466 ###
1467-ac_config_files="$ac_config_files Makefile lib/Makefile lib/appUtil/Makefile lib/auth/Makefile lib/backdoor/Makefile lib/dict/Makefile lib/dynxdr/Makefile lib/err/Makefile lib/file/Makefile lib/foundryMsg/Makefile lib/guestApp/Makefile lib/guestRpc/Makefile lib/hgfs/Makefile lib/hgfsBd/Makefile lib/hgfsHelper/Makefile lib/hgfsServer/Makefile lib/hgfsServerManagerGuest/Makefile lib/hgfsServerPolicyGuest/Makefile lib/image/Makefile lib/impersonate/Makefile lib/lock/Makefile lib/message/Makefile lib/misc/Makefile lib/netUtil/Makefile lib/panic/Makefile lib/panicDefault/Makefile lib/printer/Makefile lib/procMgr/Makefile lib/raster/Makefile lib/region/Makefile lib/rpcChannel/Makefile lib/rpcIn/Makefile lib/rpcOut/Makefile lib/rpcVmx/Makefile lib/slashProc/Makefile lib/string/Makefile lib/stubs/Makefile lib/syncDriver/Makefile lib/system/Makefile lib/unicode/Makefile lib/user/Makefile lib/vmCheck/Makefile lib/vmSignal/Makefile lib/wiper/Makefile lib/xdg/Makefile services/Makefile services/vmtoolsd/Makefile services/plugins/Makefile services/plugins/desktopEvents/Makefile services/plugins/dndcp/Makefile services/plugins/guestInfo/Makefile services/plugins/guestInfo/getlib/Makefile services/plugins/hgfsServer/Makefile services/plugins/powerOps/Makefile services/plugins/resolutionSet/Makefile services/plugins/timeSync/Makefile services/plugins/unity/Makefile services/plugins/vix/Makefile services/plugins/vmbackup/Makefile vmware-user-suid-wrapper/Makefile toolbox/Makefile hgfsclient/Makefile hgfsmounter/Makefile checkvm/Makefile rpctool/Makefile libguestlib/Makefile libguestlib/vmguestlib.pc libhgfs/Makefile libvmtools/Makefile xferlogs/Makefile modules/Makefile vmblock-fuse/Makefile vmblockmounter/Makefile tests/Makefile tests/vmrpcdbg/Makefile tests/testDebug/Makefile tests/testPlugin/Makefile tests/testVmblock/Makefile docs/Makefile docs/api/Makefile scripts/Makefile scripts/build/rpcgen_wrapper.sh"
1468+ac_config_files="$ac_config_files Makefile lib/Makefile lib/appUtil/Makefile lib/auth/Makefile lib/backdoor/Makefile lib/dict/Makefile lib/dynxdr/Makefile lib/err/Makefile lib/file/Makefile lib/foundryMsg/Makefile lib/glibUtils/Makefile lib/guestApp/Makefile lib/guestRpc/Makefile lib/hgfs/Makefile lib/hgfsBd/Makefile lib/hgfsHelper/Makefile lib/hgfsServer/Makefile lib/hgfsServerManagerGuest/Makefile lib/hgfsServerPolicyGuest/Makefile lib/impersonate/Makefile lib/lock/Makefile lib/message/Makefile lib/misc/Makefile lib/netUtil/Makefile lib/panic/Makefile lib/panicDefault/Makefile lib/printer/Makefile lib/procMgr/Makefile lib/rpcChannel/Makefile lib/rpcIn/Makefile lib/rpcOut/Makefile lib/rpcVmx/Makefile lib/slashProc/Makefile lib/string/Makefile lib/stubs/Makefile lib/syncDriver/Makefile lib/system/Makefile lib/unicode/Makefile lib/user/Makefile lib/vmCheck/Makefile lib/vmSignal/Makefile lib/wiper/Makefile lib/xdg/Makefile services/Makefile services/vmtoolsd/Makefile services/plugins/Makefile services/plugins/desktopEvents/Makefile services/plugins/dndcp/Makefile services/plugins/guestInfo/Makefile services/plugins/guestInfo/getlib/Makefile services/plugins/hgfsServer/Makefile services/plugins/powerOps/Makefile services/plugins/resolutionSet/Makefile services/plugins/timeSync/Makefile services/plugins/vix/Makefile services/plugins/vmbackup/Makefile vmware-user-suid-wrapper/Makefile toolbox/Makefile hgfsclient/Makefile hgfsmounter/Makefile checkvm/Makefile rpctool/Makefile libguestlib/Makefile libguestlib/vmguestlib.pc libhgfs/Makefile libvmtools/Makefile xferlogs/Makefile modules/Makefile vmblock-fuse/Makefile vmblockmounter/Makefile tests/Makefile tests/vmrpcdbg/Makefile tests/testDebug/Makefile tests/testPlugin/Makefile tests/testVmblock/Makefile docs/Makefile docs/api/Makefile scripts/Makefile scripts/build/rpcgen_wrapper.sh"
1469
1470
1471 ###
1472@@ -23325,10 +22388,6 @@
1473 as_fn_error $? "conditional \"HAVE_XCOMPOSITE\" was never defined.
1474 Usually this means the macro was only invoked conditionally." "$LINENO" 5
1475 fi
1476-if test -z "${ENABLE_UNITY_TRUE}" && test -z "${ENABLE_UNITY_FALSE}"; then
1477- as_fn_error $? "conditional \"ENABLE_UNITY\" was never defined.
1478-Usually this means the macro was only invoked conditionally." "$LINENO" 5
1479-fi
1480 if test -z "${ENABLE_TESTS_TRUE}" && test -z "${ENABLE_TESTS_FALSE}"; then
1481 as_fn_error $? "conditional \"ENABLE_TESTS\" was never defined.
1482 Usually this means the macro was only invoked conditionally." "$LINENO" 5
1483@@ -23365,6 +22424,10 @@
1484 as_fn_error $? "conditional \"USE_SLASH_PROC\" was never defined.
1485 Usually this means the macro was only invoked conditionally." "$LINENO" 5
1486 fi
1487+if test -z "${USE_PRINTF_WRAPPERS_TRUE}" && test -z "${USE_PRINTF_WRAPPERS_FALSE}"; then
1488+ as_fn_error $? "conditional \"USE_PRINTF_WRAPPERS\" was never defined.
1489+Usually this means the macro was only invoked conditionally." "$LINENO" 5
1490+fi
1491
1492 : ${CONFIG_STATUS=./config.status}
1493 ac_write_fail=0
1494@@ -23773,7 +22836,7 @@
1495 # report actual input values of CONFIG_FILES etc. instead of their
1496 # values after options handling.
1497 ac_log="
1498-This file was extended by open-vm-tools $as_me 2011.07.19, which was
1499+This file was extended by open-vm-tools $as_me 2011.12.20, which was
1500 generated by GNU Autoconf 2.67. Invocation command line was
1501
1502 CONFIG_FILES = $CONFIG_FILES
1503@@ -23830,7 +22893,7 @@
1504 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
1505 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
1506 ac_cs_version="\\
1507-open-vm-tools config.status 2011.07.19
1508+open-vm-tools config.status 2011.12.20
1509 configured by $0, generated by GNU Autoconf 2.67,
1510 with options \\"\$ac_cs_config\\"
1511
1512@@ -24311,6 +23374,7 @@
1513 "lib/err/Makefile") CONFIG_FILES="$CONFIG_FILES lib/err/Makefile" ;;
1514 "lib/file/Makefile") CONFIG_FILES="$CONFIG_FILES lib/file/Makefile" ;;
1515 "lib/foundryMsg/Makefile") CONFIG_FILES="$CONFIG_FILES lib/foundryMsg/Makefile" ;;
1516+ "lib/glibUtils/Makefile") CONFIG_FILES="$CONFIG_FILES lib/glibUtils/Makefile" ;;
1517 "lib/guestApp/Makefile") CONFIG_FILES="$CONFIG_FILES lib/guestApp/Makefile" ;;
1518 "lib/guestRpc/Makefile") CONFIG_FILES="$CONFIG_FILES lib/guestRpc/Makefile" ;;
1519 "lib/hgfs/Makefile") CONFIG_FILES="$CONFIG_FILES lib/hgfs/Makefile" ;;
1520@@ -24319,7 +23383,6 @@
1521 "lib/hgfsServer/Makefile") CONFIG_FILES="$CONFIG_FILES lib/hgfsServer/Makefile" ;;
1522 "lib/hgfsServerManagerGuest/Makefile") CONFIG_FILES="$CONFIG_FILES lib/hgfsServerManagerGuest/Makefile" ;;
1523 "lib/hgfsServerPolicyGuest/Makefile") CONFIG_FILES="$CONFIG_FILES lib/hgfsServerPolicyGuest/Makefile" ;;
1524- "lib/image/Makefile") CONFIG_FILES="$CONFIG_FILES lib/image/Makefile" ;;
1525 "lib/impersonate/Makefile") CONFIG_FILES="$CONFIG_FILES lib/impersonate/Makefile" ;;
1526 "lib/lock/Makefile") CONFIG_FILES="$CONFIG_FILES lib/lock/Makefile" ;;
1527 "lib/message/Makefile") CONFIG_FILES="$CONFIG_FILES lib/message/Makefile" ;;
1528@@ -24329,8 +23392,6 @@
1529 "lib/panicDefault/Makefile") CONFIG_FILES="$CONFIG_FILES lib/panicDefault/Makefile" ;;
1530 "lib/printer/Makefile") CONFIG_FILES="$CONFIG_FILES lib/printer/Makefile" ;;
1531 "lib/procMgr/Makefile") CONFIG_FILES="$CONFIG_FILES lib/procMgr/Makefile" ;;
1532- "lib/raster/Makefile") CONFIG_FILES="$CONFIG_FILES lib/raster/Makefile" ;;
1533- "lib/region/Makefile") CONFIG_FILES="$CONFIG_FILES lib/region/Makefile" ;;
1534 "lib/rpcChannel/Makefile") CONFIG_FILES="$CONFIG_FILES lib/rpcChannel/Makefile" ;;
1535 "lib/rpcIn/Makefile") CONFIG_FILES="$CONFIG_FILES lib/rpcIn/Makefile" ;;
1536 "lib/rpcOut/Makefile") CONFIG_FILES="$CONFIG_FILES lib/rpcOut/Makefile" ;;
1537@@ -24357,7 +23418,6 @@
1538 "services/plugins/powerOps/Makefile") CONFIG_FILES="$CONFIG_FILES services/plugins/powerOps/Makefile" ;;
1539 "services/plugins/resolutionSet/Makefile") CONFIG_FILES="$CONFIG_FILES services/plugins/resolutionSet/Makefile" ;;
1540 "services/plugins/timeSync/Makefile") CONFIG_FILES="$CONFIG_FILES services/plugins/timeSync/Makefile" ;;
1541- "services/plugins/unity/Makefile") CONFIG_FILES="$CONFIG_FILES services/plugins/unity/Makefile" ;;
1542 "services/plugins/vix/Makefile") CONFIG_FILES="$CONFIG_FILES services/plugins/vix/Makefile" ;;
1543 "services/plugins/vmbackup/Makefile") CONFIG_FILES="$CONFIG_FILES services/plugins/vmbackup/Makefile" ;;
1544 "vmware-user-suid-wrapper/Makefile") CONFIG_FILES="$CONFIG_FILES vmware-user-suid-wrapper/Makefile" ;;
1545
1546=== modified file 'autom4te.cache/output.1'
1547--- autom4te.cache/output.1 2011-07-22 16:41:03 +0000
1548+++ autom4te.cache/output.1 2012-01-24 04:56:25 +0000
1549@@ -1,6 +1,6 @@
1550 @%:@! /bin/sh
1551 @%:@ Guess values for system-dependent variables and create Makefiles.
1552-@%:@ Generated by GNU Autoconf 2.67 for open-vm-tools 2011.07.19.
1553+@%:@ Generated by GNU Autoconf 2.67 for open-vm-tools 2011.12.20.
1554 @%:@
1555 @%:@ Report bugs to <open-vm-tools-devel@lists.sourceforge.net>.
1556 @%:@
1557@@ -701,8 +701,8 @@
1558 # Identity of this package.
1559 PACKAGE_NAME='open-vm-tools'
1560 PACKAGE_TARNAME='open-vm-tools'
1561-PACKAGE_VERSION='2011.07.19'
1562-PACKAGE_STRING='open-vm-tools 2011.07.19'
1563+PACKAGE_VERSION='2011.12.20'
1564+PACKAGE_STRING='open-vm-tools 2011.12.20'
1565 PACKAGE_BUGREPORT='open-vm-tools-devel@lists.sourceforge.net'
1566 PACKAGE_URL=''
1567
1568@@ -777,6 +777,8 @@
1569 TARGET_OS
1570 TOOLS_VERSION
1571 HGFS_LIBS
1572+USE_PRINTF_WRAPPERS_FALSE
1573+USE_PRINTF_WRAPPERS_TRUE
1574 USE_SLASH_PROC_FALSE
1575 USE_SLASH_PROC_TRUE
1576 HAVE_PAM_FALSE
1577@@ -795,8 +797,6 @@
1578 WITH_ROOT_PRIVILEGES_TRUE
1579 ENABLE_TESTS_FALSE
1580 ENABLE_TESTS_TRUE
1581-ENABLE_UNITY_FALSE
1582-ENABLE_UNITY_TRUE
1583 HAVE_XCOMPOSITE_FALSE
1584 HAVE_XCOMPOSITE_TRUE
1585 HAVE_XSM_FALSE
1586@@ -836,14 +836,6 @@
1587 GTKMM_CPPFLAGS
1588 GTK_LIBS
1589 GTK_CPPFLAGS
1590-GIO_LIBS
1591-GIO_CPPFLAGS
1592-ZLIB_LIBS
1593-ZLIB_CPPFLAGS
1594-LIBPNG_LIBS
1595-LIBPNG_CPPFLAGS
1596-URIPARSER_LIBS
1597-URIPARSER_CPPFLAGS
1598 CUNIT_LIBS
1599 CUNIT_CPPFLAGS
1600 PAM_LIBS
1601@@ -986,7 +978,6 @@
1602 with_kernel_release
1603 with_linuxdir
1604 enable_multimon
1605-enable_unity
1606 with_gtk2
1607 with_gtkmm
1608 enable_docs
1609@@ -1561,7 +1552,7 @@
1610 # Omit some internal or obsolete options to make the list less imposing.
1611 # This message is too long to be a string in the A/UX 3.1 sh.
1612 cat <<_ACEOF
1613-\`configure' configures open-vm-tools 2011.07.19 to adapt to many kinds of systems.
1614+\`configure' configures open-vm-tools 2011.12.20 to adapt to many kinds of systems.
1615
1616 Usage: $0 [OPTION]... [VAR=VALUE]...
1617
1618@@ -1635,7 +1626,7 @@
1619
1620 if test -n "$ac_init_help"; then
1621 case $ac_init_help in
1622- short | recursive ) echo "Configuration of open-vm-tools 2011.07.19:";;
1623+ short | recursive ) echo "Configuration of open-vm-tools 2011.12.20:";;
1624 esac
1625 cat <<\_ACEOF
1626
1627@@ -1644,7 +1635,6 @@
1628 --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
1629 --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
1630 --disable-multimon disables multimon, enabled by default
1631- --disable-unity disables Unity, enabled by default
1632 --disable-docs disables generation of API documentation; by
1633 default, docs are built if doxygen is available.
1634 --disable-tests disable compilation of test code.
1635@@ -1762,7 +1752,7 @@
1636 test -n "$ac_init_help" && exit $ac_status
1637 if $ac_init_version; then
1638 cat <<\_ACEOF
1639-open-vm-tools configure 2011.07.19
1640+open-vm-tools configure 2011.12.20
1641 generated by GNU Autoconf 2.67
1642
1643 Copyright (C) 2010 Free Software Foundation, Inc.
1644@@ -2454,7 +2444,7 @@
1645 This file contains any messages produced by compilers while
1646 running configure, to aid debugging if configure makes a mistake.
1647
1648-It was created by open-vm-tools $as_me 2011.07.19, which was
1649+It was created by open-vm-tools $as_me 2011.12.20, which was
1650 generated by GNU Autoconf 2.67. Invocation command line was
1651
1652 $ $0 $@
1653@@ -3044,14 +3034,6 @@
1654 fi
1655
1656
1657-@%:@ Check whether --enable-unity was given.
1658-if test "${enable_unity+set}" = set; then :
1659- enableval=$enable_unity; enable_unity="$enableval"
1660-else
1661- enable_unity="yes"
1662-fi
1663-
1664-
1665
1666 @%:@ Check whether --with-gtk2 was given.
1667 if test "${with_gtk2+set}" = set; then :
1668@@ -3086,11 +3068,6 @@
1669 fi
1670
1671
1672-# If we're not going to use Gtk 2.0, disable Unity.
1673-if test "$with_gtk2" != "yes"; then
1674- enable_unity="no"
1675-fi
1676-
1677 am__api_version='1.11'
1678
1679 # Find a good install program. We prefer a C program (faster),
1680@@ -3529,7 +3506,7 @@
1681
1682 # Define the identity of the package.
1683 PACKAGE='open-vm-tools'
1684- VERSION='2011.07.19'
1685+ VERSION='2011.12.20'
1686
1687
1688 cat >>confdefs.h <<_ACEOF
1689@@ -17819,8 +17796,7 @@
1690 #
1691 # Check for PAM.
1692 #
1693-if test "$os" = "linux"; then
1694-
1695+
1696 @%:@ Check whether --with-pam was given.
1697 if test "${with_pam+set}" = set; then :
1698 withval=$with_pam;
1699@@ -17829,8 +17805,8 @@
1700 fi
1701
1702
1703- if test "$with_pam" = "yes"; then
1704-
1705+if test "$with_pam" = "yes"; then
1706+
1707 if test -z "$CUSTOM_PAM_CPPFLAGS"; then
1708 if test "$os" = freebsd; then
1709 CUSTOM_PAM_CPPFLAGS="-I/usr/local/include"
1710@@ -17842,7 +17818,7 @@
1711 fi
1712 fi
1713
1714-
1715+
1716
1717 if test -z "pam"; then
1718 as_fn_error $? "'library' parameter is required.'" "$LINENO" 5
1719@@ -18054,7 +18030,6 @@
1720
1721 fi
1722
1723- fi
1724 fi
1725
1726 #
1727@@ -18298,7 +18273,6 @@
1728 # If the user explicitly disables X11, then don't try to detect the X-related libraries
1729 if test "$have_x" = "disabled"; then
1730 enable_multimon="no"
1731- enable_unity="no"
1732 elif test "$have_x" != "yes"; then
1733 as_fn_error $? "The X11 libraries were not found. Please configure without X11 (using --without-x), or install the libX11 devel package(s)." "$LINENO" 5
1734 else
1735@@ -18402,12 +18376,6 @@
1736 as_fn_error $? "libXinerama not found. Please configure without multimon (using --disable-multimon), configure without X11 (using --without-x), or install the libXinerama devel package(s)." "$LINENO" 5
1737 fi
1738
1739- else
1740- if test "$enable_unity" != "no"; then
1741- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Disabling Unity due to --disable-multimon." >&5
1742-$as_echo "$as_me: WARNING: Disabling Unity due to --disable-multimon." >&2;}
1743- enable_unity="no"
1744- fi
1745 fi
1746
1747 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XOpenDevice in -lXi" >&5
1748@@ -18704,939 +18672,6 @@
1749 have_xcomposite="yes"
1750 fi
1751
1752- # If we're building with support for Unity, we'll need a few additional
1753- # libraries.
1754- if test "$enable_unity" != "no"; then
1755- # Unity needs the X11 Screen Saver extension library. It should be
1756- # in the same place as the X11 libraries, so no need for any fancy
1757- # path checking.
1758-
1759- have_header=1
1760- if test -n "X11/extensions/scrnsaver.h"; then
1761- ac_fn_c_check_header_mongrel "$LINENO" "X11/extensions/scrnsaver.h" "ac_cv_header_X11_extensions_scrnsaver_h" "$ac_includes_default"
1762-if test "x$ac_cv_header_X11_extensions_scrnsaver_h" = x""yes; then :
1763-
1764-else
1765-
1766- have_header=0;
1767- as_fn_error $? "libXss or headers not found. Please configure without Unity (using --disable-unity) or install the libXss devel package." "$LINENO" 5
1768-
1769-fi
1770-
1771-
1772- fi
1773-
1774- if test $have_header = 1; then
1775- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XScreenSaverQueryExtension in -lXss" >&5
1776-$as_echo_n "checking for XScreenSaverQueryExtension in -lXss... " >&6; }
1777-if test "${ac_cv_lib_Xss_XScreenSaverQueryExtension+set}" = set; then :
1778- $as_echo_n "(cached) " >&6
1779-else
1780- ac_check_lib_save_LIBS=$LIBS
1781-LIBS="-lXss $COMMON_XLIBS $LIBS"
1782-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1783-/* end confdefs.h. */
1784-
1785-/* Override any GCC internal prototype to avoid an error.
1786- Use char because int might match the return type of a GCC
1787- builtin and then its argument prototype would still apply. */
1788-#ifdef __cplusplus
1789-extern "C"
1790-#endif
1791-char XScreenSaverQueryExtension ();
1792-int
1793-main ()
1794-{
1795-return XScreenSaverQueryExtension ();
1796- ;
1797- return 0;
1798-}
1799-_ACEOF
1800-if ac_fn_c_try_link "$LINENO"; then :
1801- ac_cv_lib_Xss_XScreenSaverQueryExtension=yes
1802-else
1803- ac_cv_lib_Xss_XScreenSaverQueryExtension=no
1804-fi
1805-rm -f core conftest.err conftest.$ac_objext \
1806- conftest$ac_exeext conftest.$ac_ext
1807-LIBS=$ac_check_lib_save_LIBS
1808-fi
1809-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xss_XScreenSaverQueryExtension" >&5
1810-$as_echo "$ac_cv_lib_Xss_XScreenSaverQueryExtension" >&6; }
1811-if test "x$ac_cv_lib_Xss_XScreenSaverQueryExtension" = x""yes; then :
1812- COMMON_XLIBS="-lXss $COMMON_XLIBS"
1813-else
1814- as_fn_error $? "libXss or headers not found. Please configure without Unity (using --disable-unity) or install the libXss devel package." "$LINENO" 5
1815-fi
1816-
1817- fi
1818-
1819-
1820- # Check for the uriparser library and headers. The upstream uriparser
1821- # doesn't appear to ship with either a pkg-config file or a
1822- # uriparser-config binary, so we'll look for it the old-fashioned
1823- # way.
1824- #
1825- # Note that we look for uriFreeQueryListA because it's a relatively
1826- # new symbol that our code needs (it isn't present in the uriparser
1827- # that shipped with Ubuntu Hardy).
1828-
1829- if test -z "$CUSTOM_URIPARSER_CPPFLAGS"; then
1830- if test "$os" = freebsd; then
1831- CUSTOM_URIPARSER_CPPFLAGS="-I/usr/local/include"
1832- else
1833- CUSTOM_URIPARSER_CPPFLAGS="-I/usr/include"
1834- fi
1835- if test -n "uriparser"; then
1836- CUSTOM_URIPARSER_CPPFLAGS="${CUSTOM_URIPARSER_CPPFLAGS}/uriparser"
1837- fi
1838- fi
1839-
1840-
1841-
1842- if test -z "uriparser"; then
1843- as_fn_error $? "'library' parameter is required.'" "$LINENO" 5
1844- fi
1845- if test -z "URIPARSER"; then
1846- as_fn_error $? "'lvar' parameter is required.'" "$LINENO" 5
1847- fi
1848-
1849- ac_vmw_have_lib=0
1850- ac_vmw_have_lib_func=0
1851- ac_vmw_have_lib_header=0
1852- ac_vmw_custom_libs=
1853-
1854- #
1855- # First, try any user-defined CUSTOM_* flags.
1856- #
1857- if test -n "${CUSTOM_URIPARSER_CPPFLAGS}" || test -n "${CUSTOM_URIPARSER_LIBS}"; then
1858- ac_vmw_custom_libs="${CUSTOM_URIPARSER_LIBS} -luriparser"
1859- if test -n "Uri.h"; then
1860- ORIGINAL_CPPFLAGS="$CPPFLAGS"
1861- CPPFLAGS="${CUSTOM_URIPARSER_CPPFLAGS} $CPPFLAGS"
1862-
1863- ac_fn_c_check_header_mongrel "$LINENO" "Uri.h" "ac_cv_header_Uri_h" "$ac_includes_default"
1864-if test "x$ac_cv_header_Uri_h" = x""yes; then :
1865- ac_vmw_have_lib_header=1
1866-fi
1867-
1868-
1869-
1870- CPPFLAGS="$ORIGINAL_CPPFLAGS"
1871- else
1872- ac_vmw_have_lib_header=1
1873- fi
1874-
1875- # Check a specific function in the library if requested.
1876- # If it hasn't, just pick a random function from libc, just to make
1877- # sure the linker can find the library being tested.
1878- if test $ac_vmw_have_lib_header -eq 1; then
1879- if test -n "uriFreeQueryListA"; then
1880- ac_vmw_function=uriFreeQueryListA
1881- else
1882- ac_vmw_function=strlen
1883- fi
1884- as_ac_Lib=`$as_echo "ac_cv_lib_uriparser_$ac_vmw_function" | $as_tr_sh`
1885-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_vmw_function in -luriparser" >&5
1886-$as_echo_n "checking for $ac_vmw_function in -luriparser... " >&6; }
1887-if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
1888- $as_echo_n "(cached) " >&6
1889-else
1890- ac_check_lib_save_LIBS=$LIBS
1891-LIBS="-luriparser $ac_vmw_custom_libs $LIBS"
1892-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1893-/* end confdefs.h. */
1894-
1895-/* Override any GCC internal prototype to avoid an error.
1896- Use char because int might match the return type of a GCC
1897- builtin and then its argument prototype would still apply. */
1898-#ifdef __cplusplus
1899-extern "C"
1900-#endif
1901-char $ac_vmw_function ();
1902-int
1903-main ()
1904-{
1905-return $ac_vmw_function ();
1906- ;
1907- return 0;
1908-}
1909-_ACEOF
1910-if ac_fn_c_try_link "$LINENO"; then :
1911- eval "$as_ac_Lib=yes"
1912-else
1913- eval "$as_ac_Lib=no"
1914-fi
1915-rm -f core conftest.err conftest.$ac_objext \
1916- conftest$ac_exeext conftest.$ac_ext
1917-LIBS=$ac_check_lib_save_LIBS
1918-fi
1919-eval ac_res=\$$as_ac_Lib
1920- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
1921-$as_echo "$ac_res" >&6; }
1922-if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
1923- ac_vmw_have_lib_func=1
1924-fi
1925-
1926- fi
1927-
1928- if test $ac_vmw_have_lib_func -eq 1 && test $ac_vmw_have_lib_header -eq 1; then
1929- URIPARSER_CPPFLAGS="${CUSTOM_URIPARSER_CPPFLAGS}"
1930- URIPARSER_LIBS="$ac_vmw_custom_libs"
1931- ac_vmw_have_lib=1
1932- fi
1933- fi
1934-
1935- # If that didn't work, try with pkg-config.
1936- if test $ac_vmw_have_lib -eq 0 && test "$HAVE_PKG_CONFIG" = "yes" && test -n ""; then
1937- if test -n ""; then
1938- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for >= (via pkg-config)" >&5
1939-$as_echo_n "checking for >= (via pkg-config)... " >&6; }
1940- if pkg-config --exists ' >= '; then
1941- ac_vmw_have_lib=1
1942- fi
1943- else
1944- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for (via pkg-config)" >&5
1945-$as_echo_n "checking for (via pkg-config)... " >&6; }
1946- if pkg-config --exists ''; then
1947- ac_vmw_have_lib=1
1948- fi
1949- fi
1950-
1951- if test $ac_vmw_have_lib -eq 1; then
1952- # Sometimes pkg-config might fail; for example, "pkg-config gtk+-2.0 --cflags"
1953- # fails on OpenSolaris B71. So be pessimistic.
1954- ac_vmw_cppflags="`pkg-config --cflags `"
1955- ac_vmw_ret1=$?
1956- ac_vmw_libs="`pkg-config --libs `"
1957- ac_vmw_ret2=$?
1958- if test $ac_vmw_ret1 -eq 0 && test $ac_vmw_ret2 -eq 0; then
1959- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
1960-$as_echo "yes" >&6; }
1961- URIPARSER_CPPFLAGS="$ac_vmw_cppflags"
1962- URIPARSER_LIBS="$ac_vmw_libs"
1963- else
1964- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1965-$as_echo "no" >&6; }
1966- fi
1967- else
1968- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1969-$as_echo "no" >&6; }
1970- fi
1971- fi
1972-
1973- # If we still haven't found the lib, try with the library's custom "config" script.
1974- # Before checking, flush the AC_PATH_PROG cached variable.
1975- unset ac_cv_path_ac_vmw_lib_cfg
1976- unset ac_vmw_lib_cfg
1977- if test $ac_vmw_have_lib -eq 0 && test -n ""; then
1978- # Extract the first word of "", so it can be a program name with args.
1979-set dummy ; ac_word=$2
1980-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
1981-$as_echo_n "checking for $ac_word... " >&6; }
1982-if test "${ac_cv_path_ac_vmw_lib_cfg+set}" = set; then :
1983- $as_echo_n "(cached) " >&6
1984-else
1985- case $ac_vmw_lib_cfg in
1986- [\\/]* | ?:[\\/]*)
1987- ac_cv_path_ac_vmw_lib_cfg="$ac_vmw_lib_cfg" # Let the user override the test with a path.
1988- ;;
1989- *)
1990- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1991-for as_dir in $PATH
1992-do
1993- IFS=$as_save_IFS
1994- test -z "$as_dir" && as_dir=.
1995- for ac_exec_ext in '' $ac_executable_extensions; do
1996- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1997- ac_cv_path_ac_vmw_lib_cfg="$as_dir/$ac_word$ac_exec_ext"
1998- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1999- break 2
2000- fi
2001-done
2002- done
2003-IFS=$as_save_IFS
2004-
2005- test -z "$ac_cv_path_ac_vmw_lib_cfg" && ac_cv_path_ac_vmw_lib_cfg="no"
2006- ;;
2007-esac
2008-fi
2009-ac_vmw_lib_cfg=$ac_cv_path_ac_vmw_lib_cfg
2010-if test -n "$ac_vmw_lib_cfg"; then
2011- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_vmw_lib_cfg" >&5
2012-$as_echo "$ac_vmw_lib_cfg" >&6; }
2013-else
2014- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
2015-$as_echo "no" >&6; }
2016-fi
2017-
2018-
2019- if test "$ac_vmw_lib_cfg" != "no"; then
2020- # XXX: icu-config does not follow the "--cflags" and "--libs" convention,
2021- # so single it out here to avoid having to replicate all the rest of the
2022- # logic elsewhere.
2023- if test `basename "$ac_vmw_lib_cfg"` = "icu-config"; then
2024- URIPARSER_CPPFLAGS="`$ac_vmw_lib_cfg --cppflags`"
2025- URIPARSER_LIBS="`$ac_vmw_lib_cfg --ldflags`"
2026- else
2027- URIPARSER_CPPFLAGS="`$ac_vmw_lib_cfg --cflags`"
2028- URIPARSER_LIBS="`$ac_vmw_lib_cfg --libs`"
2029- fi
2030- ac_vmw_have_lib=1
2031- fi
2032- fi
2033-
2034- # Finish by executing the user provided action. The call to "true" is needed
2035- # because the actions are optional, and we need something inside the block.
2036- if test $ac_vmw_have_lib -eq 1; then
2037-
2038-
2039- true
2040-
2041- else
2042- true
2043- as_fn_error $? "uriparser library not found or is too old. Please configure without Unity (using --disable-unity) or install the liburiparser devel package." "$LINENO" 5
2044- fi
2045-
2046-
2047- # Check for libpng.
2048-
2049-
2050- if test -z "png12"; then
2051- as_fn_error $? "'library' parameter is required.'" "$LINENO" 5
2052- fi
2053- if test -z "LIBPNG"; then
2054- as_fn_error $? "'lvar' parameter is required.'" "$LINENO" 5
2055- fi
2056-
2057- ac_vmw_have_lib=0
2058- ac_vmw_have_lib_func=0
2059- ac_vmw_have_lib_header=0
2060- ac_vmw_custom_libs=
2061-
2062- #
2063- # First, try any user-defined CUSTOM_* flags.
2064- #
2065- if test -n "${CUSTOM_LIBPNG_CPPFLAGS}" || test -n "${CUSTOM_LIBPNG_LIBS}"; then
2066- ac_vmw_custom_libs="${CUSTOM_LIBPNG_LIBS} -lpng12"
2067- if test -n "png.h"; then
2068- ORIGINAL_CPPFLAGS="$CPPFLAGS"
2069- CPPFLAGS="${CUSTOM_LIBPNG_CPPFLAGS} $CPPFLAGS"
2070-
2071- ac_fn_c_check_header_mongrel "$LINENO" "png.h" "ac_cv_header_png_h" "$ac_includes_default"
2072-if test "x$ac_cv_header_png_h" = x""yes; then :
2073- ac_vmw_have_lib_header=1
2074-fi
2075-
2076-
2077-
2078- CPPFLAGS="$ORIGINAL_CPPFLAGS"
2079- else
2080- ac_vmw_have_lib_header=1
2081- fi
2082-
2083- # Check a specific function in the library if requested.
2084- # If it hasn't, just pick a random function from libc, just to make
2085- # sure the linker can find the library being tested.
2086- if test $ac_vmw_have_lib_header -eq 1; then
2087- if test -n "png_access_version_number"; then
2088- ac_vmw_function=png_access_version_number
2089- else
2090- ac_vmw_function=strlen
2091- fi
2092- as_ac_Lib=`$as_echo "ac_cv_lib_png12_$ac_vmw_function" | $as_tr_sh`
2093-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_vmw_function in -lpng12" >&5
2094-$as_echo_n "checking for $ac_vmw_function in -lpng12... " >&6; }
2095-if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
2096- $as_echo_n "(cached) " >&6
2097-else
2098- ac_check_lib_save_LIBS=$LIBS
2099-LIBS="-lpng12 $ac_vmw_custom_libs $LIBS"
2100-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
2101-/* end confdefs.h. */
2102-
2103-/* Override any GCC internal prototype to avoid an error.
2104- Use char because int might match the return type of a GCC
2105- builtin and then its argument prototype would still apply. */
2106-#ifdef __cplusplus
2107-extern "C"
2108-#endif
2109-char $ac_vmw_function ();
2110-int
2111-main ()
2112-{
2113-return $ac_vmw_function ();
2114- ;
2115- return 0;
2116-}
2117-_ACEOF
2118-if ac_fn_c_try_link "$LINENO"; then :
2119- eval "$as_ac_Lib=yes"
2120-else
2121- eval "$as_ac_Lib=no"
2122-fi
2123-rm -f core conftest.err conftest.$ac_objext \
2124- conftest$ac_exeext conftest.$ac_ext
2125-LIBS=$ac_check_lib_save_LIBS
2126-fi
2127-eval ac_res=\$$as_ac_Lib
2128- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
2129-$as_echo "$ac_res" >&6; }
2130-if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
2131- ac_vmw_have_lib_func=1
2132-fi
2133-
2134- fi
2135-
2136- if test $ac_vmw_have_lib_func -eq 1 && test $ac_vmw_have_lib_header -eq 1; then
2137- LIBPNG_CPPFLAGS="${CUSTOM_LIBPNG_CPPFLAGS}"
2138- LIBPNG_LIBS="$ac_vmw_custom_libs"
2139- ac_vmw_have_lib=1
2140- fi
2141- fi
2142-
2143- # If that didn't work, try with pkg-config.
2144- if test $ac_vmw_have_lib -eq 0 && test "$HAVE_PKG_CONFIG" = "yes" && test -n "libpng12"; then
2145- if test -n ""; then
2146- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libpng12 >= (via pkg-config)" >&5
2147-$as_echo_n "checking for libpng12 >= (via pkg-config)... " >&6; }
2148- if pkg-config --exists 'libpng12 >= '; then
2149- ac_vmw_have_lib=1
2150- fi
2151- else
2152- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libpng12 (via pkg-config)" >&5
2153-$as_echo_n "checking for libpng12 (via pkg-config)... " >&6; }
2154- if pkg-config --exists 'libpng12'; then
2155- ac_vmw_have_lib=1
2156- fi
2157- fi
2158-
2159- if test $ac_vmw_have_lib -eq 1; then
2160- # Sometimes pkg-config might fail; for example, "pkg-config gtk+-2.0 --cflags"
2161- # fails on OpenSolaris B71. So be pessimistic.
2162- ac_vmw_cppflags="`pkg-config --cflags libpng12`"
2163- ac_vmw_ret1=$?
2164- ac_vmw_libs="`pkg-config --libs libpng12`"
2165- ac_vmw_ret2=$?
2166- if test $ac_vmw_ret1 -eq 0 && test $ac_vmw_ret2 -eq 0; then
2167- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
2168-$as_echo "yes" >&6; }
2169- LIBPNG_CPPFLAGS="$ac_vmw_cppflags"
2170- LIBPNG_LIBS="$ac_vmw_libs"
2171- else
2172- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
2173-$as_echo "no" >&6; }
2174- fi
2175- else
2176- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
2177-$as_echo "no" >&6; }
2178- fi
2179- fi
2180-
2181- # If we still haven't found the lib, try with the library's custom "config" script.
2182- # Before checking, flush the AC_PATH_PROG cached variable.
2183- unset ac_cv_path_ac_vmw_lib_cfg
2184- unset ac_vmw_lib_cfg
2185- if test $ac_vmw_have_lib -eq 0 && test -n "libpng-config"; then
2186- # Extract the first word of "libpng-config", so it can be a program name with args.
2187-set dummy libpng-config; ac_word=$2
2188-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2189-$as_echo_n "checking for $ac_word... " >&6; }
2190-if test "${ac_cv_path_ac_vmw_lib_cfg+set}" = set; then :
2191- $as_echo_n "(cached) " >&6
2192-else
2193- case $ac_vmw_lib_cfg in
2194- [\\/]* | ?:[\\/]*)
2195- ac_cv_path_ac_vmw_lib_cfg="$ac_vmw_lib_cfg" # Let the user override the test with a path.
2196- ;;
2197- *)
2198- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
2199-for as_dir in $PATH
2200-do
2201- IFS=$as_save_IFS
2202- test -z "$as_dir" && as_dir=.
2203- for ac_exec_ext in '' $ac_executable_extensions; do
2204- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2205- ac_cv_path_ac_vmw_lib_cfg="$as_dir/$ac_word$ac_exec_ext"
2206- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2207- break 2
2208- fi
2209-done
2210- done
2211-IFS=$as_save_IFS
2212-
2213- test -z "$ac_cv_path_ac_vmw_lib_cfg" && ac_cv_path_ac_vmw_lib_cfg="no"
2214- ;;
2215-esac
2216-fi
2217-ac_vmw_lib_cfg=$ac_cv_path_ac_vmw_lib_cfg
2218-if test -n "$ac_vmw_lib_cfg"; then
2219- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_vmw_lib_cfg" >&5
2220-$as_echo "$ac_vmw_lib_cfg" >&6; }
2221-else
2222- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
2223-$as_echo "no" >&6; }
2224-fi
2225-
2226-
2227- if test "$ac_vmw_lib_cfg" != "no"; then
2228- # XXX: icu-config does not follow the "--cflags" and "--libs" convention,
2229- # so single it out here to avoid having to replicate all the rest of the
2230- # logic elsewhere.
2231- if test `basename "$ac_vmw_lib_cfg"` = "icu-config"; then
2232- LIBPNG_CPPFLAGS="`$ac_vmw_lib_cfg --cppflags`"
2233- LIBPNG_LIBS="`$ac_vmw_lib_cfg --ldflags`"
2234- else
2235- LIBPNG_CPPFLAGS="`$ac_vmw_lib_cfg --cflags`"
2236- LIBPNG_LIBS="`$ac_vmw_lib_cfg --libs`"
2237- fi
2238- ac_vmw_have_lib=1
2239- fi
2240- fi
2241-
2242- # Finish by executing the user provided action. The call to "true" is needed
2243- # because the actions are optional, and we need something inside the block.
2244- if test $ac_vmw_have_lib -eq 1; then
2245-
2246-
2247- true
2248-
2249- else
2250- true
2251- as_fn_error $? "libpng not found. Please configure without Unity (using --disable-unity) or install the libpng devel package" "$LINENO" 5
2252- fi
2253-
2254-
2255- # Check for the zlib library and headers. Like uriparser, there
2256- # isn't a pkg-config or zlib-config file.
2257-
2258- if test -z "$CUSTOM_ZLIB_CPPFLAGS"; then
2259- if test "$os" = freebsd; then
2260- CUSTOM_ZLIB_CPPFLAGS="-I/usr/local/include"
2261- else
2262- CUSTOM_ZLIB_CPPFLAGS="-I/usr/include"
2263- fi
2264- if test -n ""; then
2265- CUSTOM_ZLIB_CPPFLAGS="${CUSTOM_ZLIB_CPPFLAGS}/"
2266- fi
2267- fi
2268-
2269-
2270-
2271- if test -z "z"; then
2272- as_fn_error $? "'library' parameter is required.'" "$LINENO" 5
2273- fi
2274- if test -z "ZLIB"; then
2275- as_fn_error $? "'lvar' parameter is required.'" "$LINENO" 5
2276- fi
2277-
2278- ac_vmw_have_lib=0
2279- ac_vmw_have_lib_func=0
2280- ac_vmw_have_lib_header=0
2281- ac_vmw_custom_libs=
2282-
2283- #
2284- # First, try any user-defined CUSTOM_* flags.
2285- #
2286- if test -n "${CUSTOM_ZLIB_CPPFLAGS}" || test -n "${CUSTOM_ZLIB_LIBS}"; then
2287- ac_vmw_custom_libs="${CUSTOM_ZLIB_LIBS} -lz"
2288- if test -n "zlib.h"; then
2289- ORIGINAL_CPPFLAGS="$CPPFLAGS"
2290- CPPFLAGS="${CUSTOM_ZLIB_CPPFLAGS} $CPPFLAGS"
2291-
2292- ac_fn_c_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default"
2293-if test "x$ac_cv_header_zlib_h" = x""yes; then :
2294- ac_vmw_have_lib_header=1
2295-fi
2296-
2297-
2298-
2299- CPPFLAGS="$ORIGINAL_CPPFLAGS"
2300- else
2301- ac_vmw_have_lib_header=1
2302- fi
2303-
2304- # Check a specific function in the library if requested.
2305- # If it hasn't, just pick a random function from libc, just to make
2306- # sure the linker can find the library being tested.
2307- if test $ac_vmw_have_lib_header -eq 1; then
2308- if test -n "zlibVersion"; then
2309- ac_vmw_function=zlibVersion
2310- else
2311- ac_vmw_function=strlen
2312- fi
2313- as_ac_Lib=`$as_echo "ac_cv_lib_z_$ac_vmw_function" | $as_tr_sh`
2314-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_vmw_function in -lz" >&5
2315-$as_echo_n "checking for $ac_vmw_function in -lz... " >&6; }
2316-if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
2317- $as_echo_n "(cached) " >&6
2318-else
2319- ac_check_lib_save_LIBS=$LIBS
2320-LIBS="-lz $ac_vmw_custom_libs $LIBS"
2321-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
2322-/* end confdefs.h. */
2323-
2324-/* Override any GCC internal prototype to avoid an error.
2325- Use char because int might match the return type of a GCC
2326- builtin and then its argument prototype would still apply. */
2327-#ifdef __cplusplus
2328-extern "C"
2329-#endif
2330-char $ac_vmw_function ();
2331-int
2332-main ()
2333-{
2334-return $ac_vmw_function ();
2335- ;
2336- return 0;
2337-}
2338-_ACEOF
2339-if ac_fn_c_try_link "$LINENO"; then :
2340- eval "$as_ac_Lib=yes"
2341-else
2342- eval "$as_ac_Lib=no"
2343-fi
2344-rm -f core conftest.err conftest.$ac_objext \
2345- conftest$ac_exeext conftest.$ac_ext
2346-LIBS=$ac_check_lib_save_LIBS
2347-fi
2348-eval ac_res=\$$as_ac_Lib
2349- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
2350-$as_echo "$ac_res" >&6; }
2351-if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
2352- ac_vmw_have_lib_func=1
2353-fi
2354-
2355- fi
2356-
2357- if test $ac_vmw_have_lib_func -eq 1 && test $ac_vmw_have_lib_header -eq 1; then
2358- ZLIB_CPPFLAGS="${CUSTOM_ZLIB_CPPFLAGS}"
2359- ZLIB_LIBS="$ac_vmw_custom_libs"
2360- ac_vmw_have_lib=1
2361- fi
2362- fi
2363-
2364- # If that didn't work, try with pkg-config.
2365- if test $ac_vmw_have_lib -eq 0 && test "$HAVE_PKG_CONFIG" = "yes" && test -n ""; then
2366- if test -n ""; then
2367- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for >= (via pkg-config)" >&5
2368-$as_echo_n "checking for >= (via pkg-config)... " >&6; }
2369- if pkg-config --exists ' >= '; then
2370- ac_vmw_have_lib=1
2371- fi
2372- else
2373- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for (via pkg-config)" >&5
2374-$as_echo_n "checking for (via pkg-config)... " >&6; }
2375- if pkg-config --exists ''; then
2376- ac_vmw_have_lib=1
2377- fi
2378- fi
2379-
2380- if test $ac_vmw_have_lib -eq 1; then
2381- # Sometimes pkg-config might fail; for example, "pkg-config gtk+-2.0 --cflags"
2382- # fails on OpenSolaris B71. So be pessimistic.
2383- ac_vmw_cppflags="`pkg-config --cflags `"
2384- ac_vmw_ret1=$?
2385- ac_vmw_libs="`pkg-config --libs `"
2386- ac_vmw_ret2=$?
2387- if test $ac_vmw_ret1 -eq 0 && test $ac_vmw_ret2 -eq 0; then
2388- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
2389-$as_echo "yes" >&6; }
2390- ZLIB_CPPFLAGS="$ac_vmw_cppflags"
2391- ZLIB_LIBS="$ac_vmw_libs"
2392- else
2393- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
2394-$as_echo "no" >&6; }
2395- fi
2396- else
2397- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
2398-$as_echo "no" >&6; }
2399- fi
2400- fi
2401-
2402- # If we still haven't found the lib, try with the library's custom "config" script.
2403- # Before checking, flush the AC_PATH_PROG cached variable.
2404- unset ac_cv_path_ac_vmw_lib_cfg
2405- unset ac_vmw_lib_cfg
2406- if test $ac_vmw_have_lib -eq 0 && test -n ""; then
2407- # Extract the first word of "", so it can be a program name with args.
2408-set dummy ; ac_word=$2
2409-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2410-$as_echo_n "checking for $ac_word... " >&6; }
2411-if test "${ac_cv_path_ac_vmw_lib_cfg+set}" = set; then :
2412- $as_echo_n "(cached) " >&6
2413-else
2414- case $ac_vmw_lib_cfg in
2415- [\\/]* | ?:[\\/]*)
2416- ac_cv_path_ac_vmw_lib_cfg="$ac_vmw_lib_cfg" # Let the user override the test with a path.
2417- ;;
2418- *)
2419- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
2420-for as_dir in $PATH
2421-do
2422- IFS=$as_save_IFS
2423- test -z "$as_dir" && as_dir=.
2424- for ac_exec_ext in '' $ac_executable_extensions; do
2425- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2426- ac_cv_path_ac_vmw_lib_cfg="$as_dir/$ac_word$ac_exec_ext"
2427- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2428- break 2
2429- fi
2430-done
2431- done
2432-IFS=$as_save_IFS
2433-
2434- test -z "$ac_cv_path_ac_vmw_lib_cfg" && ac_cv_path_ac_vmw_lib_cfg="no"
2435- ;;
2436-esac
2437-fi
2438-ac_vmw_lib_cfg=$ac_cv_path_ac_vmw_lib_cfg
2439-if test -n "$ac_vmw_lib_cfg"; then
2440- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_vmw_lib_cfg" >&5
2441-$as_echo "$ac_vmw_lib_cfg" >&6; }
2442-else
2443- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
2444-$as_echo "no" >&6; }
2445-fi
2446-
2447-
2448- if test "$ac_vmw_lib_cfg" != "no"; then
2449- # XXX: icu-config does not follow the "--cflags" and "--libs" convention,
2450- # so single it out here to avoid having to replicate all the rest of the
2451- # logic elsewhere.
2452- if test `basename "$ac_vmw_lib_cfg"` = "icu-config"; then
2453- ZLIB_CPPFLAGS="`$ac_vmw_lib_cfg --cppflags`"
2454- ZLIB_LIBS="`$ac_vmw_lib_cfg --ldflags`"
2455- else
2456- ZLIB_CPPFLAGS="`$ac_vmw_lib_cfg --cflags`"
2457- ZLIB_LIBS="`$ac_vmw_lib_cfg --libs`"
2458- fi
2459- ac_vmw_have_lib=1
2460- fi
2461- fi
2462-
2463- # Finish by executing the user provided action. The call to "true" is needed
2464- # because the actions are optional, and we need something inside the block.
2465- if test $ac_vmw_have_lib -eq 1; then
2466-
2467-
2468- true
2469-
2470- else
2471- true
2472- as_fn_error $? "zlib library not found. Please configure without Unity (using --disable-unity) or install the zlib devel package." "$LINENO" 5
2473- fi
2474-
2475-
2476- # Check for gio 2.24.
2477-
2478-
2479- if test -z "gio-2.0"; then
2480- as_fn_error $? "'library' parameter is required.'" "$LINENO" 5
2481- fi
2482- if test -z "GIO"; then
2483- as_fn_error $? "'lvar' parameter is required.'" "$LINENO" 5
2484- fi
2485-
2486- ac_vmw_have_lib=0
2487- ac_vmw_have_lib_func=0
2488- ac_vmw_have_lib_header=0
2489- ac_vmw_custom_libs=
2490-
2491- #
2492- # First, try any user-defined CUSTOM_* flags.
2493- #
2494- if test -n "${CUSTOM_GIO_CPPFLAGS}" || test -n "${CUSTOM_GIO_LIBS}"; then
2495- ac_vmw_custom_libs="${CUSTOM_GIO_LIBS} -lgio-2.0"
2496- if test -n "gio/gio.h"; then
2497- ORIGINAL_CPPFLAGS="$CPPFLAGS"
2498- CPPFLAGS="${CUSTOM_GIO_CPPFLAGS} $CPPFLAGS"
2499-
2500- ac_fn_c_check_header_mongrel "$LINENO" "gio/gio.h" "ac_cv_header_gio_gio_h" "$ac_includes_default"
2501-if test "x$ac_cv_header_gio_gio_h" = x""yes; then :
2502- ac_vmw_have_lib_header=1
2503-fi
2504-
2505-
2506-
2507- CPPFLAGS="$ORIGINAL_CPPFLAGS"
2508- else
2509- ac_vmw_have_lib_header=1
2510- fi
2511-
2512- # Check a specific function in the library if requested.
2513- # If it hasn't, just pick a random function from libc, just to make
2514- # sure the linker can find the library being tested.
2515- if test $ac_vmw_have_lib_header -eq 1; then
2516- if test -n "g_desktop_app_info_get_filename"; then
2517- ac_vmw_function=g_desktop_app_info_get_filename
2518- else
2519- ac_vmw_function=strlen
2520- fi
2521- as_ac_Lib=`$as_echo "ac_cv_lib_gio-2.0_$ac_vmw_function" | $as_tr_sh`
2522-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_vmw_function in -lgio-2.0" >&5
2523-$as_echo_n "checking for $ac_vmw_function in -lgio-2.0... " >&6; }
2524-if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
2525- $as_echo_n "(cached) " >&6
2526-else
2527- ac_check_lib_save_LIBS=$LIBS
2528-LIBS="-lgio-2.0 $ac_vmw_custom_libs $LIBS"
2529-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
2530-/* end confdefs.h. */
2531-
2532-/* Override any GCC internal prototype to avoid an error.
2533- Use char because int might match the return type of a GCC
2534- builtin and then its argument prototype would still apply. */
2535-#ifdef __cplusplus
2536-extern "C"
2537-#endif
2538-char $ac_vmw_function ();
2539-int
2540-main ()
2541-{
2542-return $ac_vmw_function ();
2543- ;
2544- return 0;
2545-}
2546-_ACEOF
2547-if ac_fn_c_try_link "$LINENO"; then :
2548- eval "$as_ac_Lib=yes"
2549-else
2550- eval "$as_ac_Lib=no"
2551-fi
2552-rm -f core conftest.err conftest.$ac_objext \
2553- conftest$ac_exeext conftest.$ac_ext
2554-LIBS=$ac_check_lib_save_LIBS
2555-fi
2556-eval ac_res=\$$as_ac_Lib
2557- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
2558-$as_echo "$ac_res" >&6; }
2559-if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
2560- ac_vmw_have_lib_func=1
2561-fi
2562-
2563- fi
2564-
2565- if test $ac_vmw_have_lib_func -eq 1 && test $ac_vmw_have_lib_header -eq 1; then
2566- GIO_CPPFLAGS="${CUSTOM_GIO_CPPFLAGS}"
2567- GIO_LIBS="$ac_vmw_custom_libs"
2568- ac_vmw_have_lib=1
2569- fi
2570- fi
2571-
2572- # If that didn't work, try with pkg-config.
2573- if test $ac_vmw_have_lib -eq 0 && test "$HAVE_PKG_CONFIG" = "yes" && test -n "gio-unix-2.0"; then
2574- if test -n "2.24.0"; then
2575- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gio-unix-2.0 >= 2.24.0 (via pkg-config)" >&5
2576-$as_echo_n "checking for gio-unix-2.0 >= 2.24.0 (via pkg-config)... " >&6; }
2577- if pkg-config --exists 'gio-unix-2.0 >= 2.24.0'; then
2578- ac_vmw_have_lib=1
2579- fi
2580- else
2581- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gio-unix-2.0 (via pkg-config)" >&5
2582-$as_echo_n "checking for gio-unix-2.0 (via pkg-config)... " >&6; }
2583- if pkg-config --exists 'gio-unix-2.0'; then
2584- ac_vmw_have_lib=1
2585- fi
2586- fi
2587-
2588- if test $ac_vmw_have_lib -eq 1; then
2589- # Sometimes pkg-config might fail; for example, "pkg-config gtk+-2.0 --cflags"
2590- # fails on OpenSolaris B71. So be pessimistic.
2591- ac_vmw_cppflags="`pkg-config --cflags gio-unix-2.0`"
2592- ac_vmw_ret1=$?
2593- ac_vmw_libs="`pkg-config --libs gio-unix-2.0`"
2594- ac_vmw_ret2=$?
2595- if test $ac_vmw_ret1 -eq 0 && test $ac_vmw_ret2 -eq 0; then
2596- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
2597-$as_echo "yes" >&6; }
2598- GIO_CPPFLAGS="$ac_vmw_cppflags"
2599- GIO_LIBS="$ac_vmw_libs"
2600- else
2601- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
2602-$as_echo "no" >&6; }
2603- fi
2604- else
2605- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
2606-$as_echo "no" >&6; }
2607- fi
2608- fi
2609-
2610- # If we still haven't found the lib, try with the library's custom "config" script.
2611- # Before checking, flush the AC_PATH_PROG cached variable.
2612- unset ac_cv_path_ac_vmw_lib_cfg
2613- unset ac_vmw_lib_cfg
2614- if test $ac_vmw_have_lib -eq 0 && test -n ""; then
2615- # Extract the first word of "", so it can be a program name with args.
2616-set dummy ; ac_word=$2
2617-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2618-$as_echo_n "checking for $ac_word... " >&6; }
2619-if test "${ac_cv_path_ac_vmw_lib_cfg+set}" = set; then :
2620- $as_echo_n "(cached) " >&6
2621-else
2622- case $ac_vmw_lib_cfg in
2623- [\\/]* | ?:[\\/]*)
2624- ac_cv_path_ac_vmw_lib_cfg="$ac_vmw_lib_cfg" # Let the user override the test with a path.
2625- ;;
2626- *)
2627- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
2628-for as_dir in $PATH
2629-do
2630- IFS=$as_save_IFS
2631- test -z "$as_dir" && as_dir=.
2632- for ac_exec_ext in '' $ac_executable_extensions; do
2633- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2634- ac_cv_path_ac_vmw_lib_cfg="$as_dir/$ac_word$ac_exec_ext"
2635- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2636- break 2
2637- fi
2638-done
2639- done
2640-IFS=$as_save_IFS
2641-
2642- test -z "$ac_cv_path_ac_vmw_lib_cfg" && ac_cv_path_ac_vmw_lib_cfg="no"
2643- ;;
2644-esac
2645-fi
2646-ac_vmw_lib_cfg=$ac_cv_path_ac_vmw_lib_cfg
2647-if test -n "$ac_vmw_lib_cfg"; then
2648- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_vmw_lib_cfg" >&5
2649-$as_echo "$ac_vmw_lib_cfg" >&6; }
2650-else
2651- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
2652-$as_echo "no" >&6; }
2653-fi
2654-
2655-
2656- if test "$ac_vmw_lib_cfg" != "no"; then
2657- # XXX: icu-config does not follow the "--cflags" and "--libs" convention,
2658- # so single it out here to avoid having to replicate all the rest of the
2659- # logic elsewhere.
2660- if test `basename "$ac_vmw_lib_cfg"` = "icu-config"; then
2661- GIO_CPPFLAGS="`$ac_vmw_lib_cfg --cppflags`"
2662- GIO_LIBS="`$ac_vmw_lib_cfg --ldflags`"
2663- else
2664- GIO_CPPFLAGS="`$ac_vmw_lib_cfg --cflags`"
2665- GIO_LIBS="`$ac_vmw_lib_cfg --libs`"
2666- fi
2667- ac_vmw_have_lib=1
2668- fi
2669- fi
2670-
2671- # Finish by executing the user provided action. The call to "true" is needed
2672- # because the actions are optional, and we need something inside the block.
2673- if test $ac_vmw_have_lib -eq 1; then
2674-
2675-
2676- true
2677-
2678- else
2679- true
2680- as_fn_error $? "GLib/GIO 2.24+ not found. Please configure without Unity (using --disable-unity) or upgrade the Glib devel package." "$LINENO" 5
2681- fi
2682-
2683- fi # End of library checks for Unity.
2684-
2685 # Check whether we have gtk+ 2.0.
2686 if test "$with_gtk2" != "no"; then
2687 # gdk_display_get_default_group (added in gtk+ 2.4.0) is function currently
2688@@ -19847,53 +18882,6 @@
2689 as_fn_error $? "Gtk+ 2.0 library not found or too old. Please configure without Gtk+ support (using --without-gtk2) or install the Gtk+ 2.0 devel package." "$LINENO" 5
2690 fi
2691
2692-
2693- # Unity requires libgdk_pixbuf_xlib, which most systems don't seem to
2694- # provide via "pkg-config --libs gtk+-2.0".
2695- if test "$enable_unity" != "no"; then
2696- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdk_pixbuf_xlib_init in -lgdk_pixbuf_xlib-2.0" >&5
2697-$as_echo_n "checking for gdk_pixbuf_xlib_init in -lgdk_pixbuf_xlib-2.0... " >&6; }
2698-if test "${ac_cv_lib_gdk_pixbuf_xlib_2_0_gdk_pixbuf_xlib_init+set}" = set; then :
2699- $as_echo_n "(cached) " >&6
2700-else
2701- ac_check_lib_save_LIBS=$LIBS
2702-LIBS="-lgdk_pixbuf_xlib-2.0 $GTK_LIBS $LIBS"
2703-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
2704-/* end confdefs.h. */
2705-
2706-/* Override any GCC internal prototype to avoid an error.
2707- Use char because int might match the return type of a GCC
2708- builtin and then its argument prototype would still apply. */
2709-#ifdef __cplusplus
2710-extern "C"
2711-#endif
2712-char gdk_pixbuf_xlib_init ();
2713-int
2714-main ()
2715-{
2716-return gdk_pixbuf_xlib_init ();
2717- ;
2718- return 0;
2719-}
2720-_ACEOF
2721-if ac_fn_c_try_link "$LINENO"; then :
2722- ac_cv_lib_gdk_pixbuf_xlib_2_0_gdk_pixbuf_xlib_init=yes
2723-else
2724- ac_cv_lib_gdk_pixbuf_xlib_2_0_gdk_pixbuf_xlib_init=no
2725-fi
2726-rm -f core conftest.err conftest.$ac_objext \
2727- conftest$ac_exeext conftest.$ac_ext
2728-LIBS=$ac_check_lib_save_LIBS
2729-fi
2730-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gdk_pixbuf_xlib_2_0_gdk_pixbuf_xlib_init" >&5
2731-$as_echo "$ac_cv_lib_gdk_pixbuf_xlib_2_0_gdk_pixbuf_xlib_init" >&6; }
2732-if test "x$ac_cv_lib_gdk_pixbuf_xlib_2_0_gdk_pixbuf_xlib_init" = x""yes; then :
2733- GTK_LIBS="$GTK_LIBS -lgdk_pixbuf_xlib-2.0"
2734-else
2735- as_fn_error $? "gdk_pixbuf_xlib-2.0 not found. Make sure your Gtk 2.0 installation is sane, or configure without Unity (using --disable-unity)." "$LINENO" 5
2736-fi
2737-
2738- fi
2739 fi
2740
2741 #
2742@@ -21834,6 +20822,8 @@
2743
2744 # Easier to give all modules the ICU defines/includes...
2745 CPPFLAGS="$CPPFLAGS $ICU_CPPFLAGS"
2746+else
2747+ CPPFLAGS="$CPPFLAGS -DNO_ICU"
2748 fi
2749
2750 # Extract the first word of "rpcgen", so it can be a program name with args.
2751@@ -22090,6 +21080,50 @@
2752
2753 fi
2754
2755+bsdPrintfWrappers=no
2756+if test "$os" = "linux"; then
2757+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ecvt in -lc" >&5
2758+$as_echo_n "checking for ecvt in -lc... " >&6; }
2759+if test "${ac_cv_lib_c_ecvt+set}" = set; then :
2760+ $as_echo_n "(cached) " >&6
2761+else
2762+ ac_check_lib_save_LIBS=$LIBS
2763+LIBS="-lc $LIBS"
2764+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
2765+/* end confdefs.h. */
2766+
2767+/* Override any GCC internal prototype to avoid an error.
2768+ Use char because int might match the return type of a GCC
2769+ builtin and then its argument prototype would still apply. */
2770+#ifdef __cplusplus
2771+extern "C"
2772+#endif
2773+char ecvt ();
2774+int
2775+main ()
2776+{
2777+return ecvt ();
2778+ ;
2779+ return 0;
2780+}
2781+_ACEOF
2782+if ac_fn_c_try_link "$LINENO"; then :
2783+ ac_cv_lib_c_ecvt=yes
2784+else
2785+ ac_cv_lib_c_ecvt=no
2786+fi
2787+rm -f core conftest.err conftest.$ac_objext \
2788+ conftest$ac_exeext conftest.$ac_ext
2789+LIBS=$ac_check_lib_save_LIBS
2790+fi
2791+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_ecvt" >&5
2792+$as_echo "$ac_cv_lib_c_ecvt" >&6; }
2793+if test "x$ac_cv_lib_c_ecvt" = x""yes; then :
2794+ bsdPrintfWrappers=yes
2795+fi
2796+
2797+fi
2798+
2799 ###
2800 ### Typdefs, structs, and compiler quarks.
2801 ###
2802@@ -22555,7 +21589,7 @@
2803 CFLAGS="$ORIGINAL_CFLAGS$NEW_CFLAG"
2804 done
2805 CPPFLAGS="$CPPFLAGS -DVMX86_TOOLS"
2806-CPPFLAGS="$CPPFLAGS -DNO_CORE_ICU"
2807+CPPFLAGS="$CPPFLAGS"
2808
2809 # -fvisibility is used by "core service" plugins, but not required.
2810 ORIGINAL_CFLAGS="$CFLAGS"
2811@@ -22584,6 +21618,34 @@
2812 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
2813 CFLAGS="$ORIGINAL_CFLAGS"
2814
2815+# Detect "unused-but-set-variable" gcc warning and disable it.
2816+ORIGINAL_CFLAGS="$CFLAGS"
2817+CFLAGS="$CFLAGS -Wno-unused-but-set-variable"
2818+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GCC flag -Wno-unused-but-set-variable" >&5
2819+$as_echo_n "checking for GCC flag -Wno-unused-but-set-variable... " >&6; }
2820+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
2821+/* end confdefs.h. */
2822+
2823+int
2824+main ()
2825+{
2826+return 0;
2827+ ;
2828+ return 0;
2829+}
2830+_ACEOF
2831+if ac_fn_c_try_compile "$LINENO"; then :
2832+ ORIGINAL_CFLAGS="$ORIGINAL_CFLAGS -Wno-unused-but-set-variable";
2833+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
2834+$as_echo "yes" >&6; }
2835+else
2836+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
2837+$as_echo "no" >&6; }
2838+fi
2839+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
2840+CFLAGS="$ORIGINAL_CFLAGS"
2841+
2842+
2843 BUILDDIR="`pwd`"
2844
2845 INCLUDE_DIR="`cd $srcdir; pwd`/lib/include"
2846@@ -22767,6 +21829,7 @@
2847 fi
2848
2849 if test "$os" = "freebsd"; then
2850+ LIBVMTOOLS_LIBADD="$LIBVMTOOLS_LIBADD -lkvm"
2851 MODULES_DIR="/boot/modules"
2852
2853 if test "$osVersion" -ge 302000; then
2854@@ -22924,14 +21987,6 @@
2855 HAVE_XCOMPOSITE_FALSE=
2856 fi
2857
2858- if test "$enable_unity" = "yes"; then
2859- ENABLE_UNITY_TRUE=
2860- ENABLE_UNITY_FALSE='#'
2861-else
2862- ENABLE_UNITY_TRUE='#'
2863- ENABLE_UNITY_FALSE=
2864-fi
2865-
2866 if test "$have_cunit" = "yes"; then
2867 ENABLE_TESTS_TRUE=
2868 ENABLE_TESTS_FALSE='#'
2869@@ -23004,6 +22059,14 @@
2870 USE_SLASH_PROC_FALSE=
2871 fi
2872
2873+ if test "$bsdPrintfWrappers" = "yes"; then
2874+ USE_PRINTF_WRAPPERS_TRUE=
2875+ USE_PRINTF_WRAPPERS_FALSE='#'
2876+else
2877+ USE_PRINTF_WRAPPERS_TRUE='#'
2878+ USE_PRINTF_WRAPPERS_FALSE=
2879+fi
2880+
2881
2882 if test "$have_xsm" != "yes"; then
2883 $as_echo "@%:@define NO_XSM 1" >>confdefs.h
2884@@ -23113,7 +22176,7 @@
2885 ###
2886 ### Create the Makefiles
2887 ###
2888-ac_config_files="$ac_config_files Makefile lib/Makefile lib/appUtil/Makefile lib/auth/Makefile lib/backdoor/Makefile lib/dict/Makefile lib/dynxdr/Makefile lib/err/Makefile lib/file/Makefile lib/foundryMsg/Makefile lib/guestApp/Makefile lib/guestRpc/Makefile lib/hgfs/Makefile lib/hgfsBd/Makefile lib/hgfsHelper/Makefile lib/hgfsServer/Makefile lib/hgfsServerManagerGuest/Makefile lib/hgfsServerPolicyGuest/Makefile lib/image/Makefile lib/impersonate/Makefile lib/lock/Makefile lib/message/Makefile lib/misc/Makefile lib/netUtil/Makefile lib/panic/Makefile lib/panicDefault/Makefile lib/printer/Makefile lib/procMgr/Makefile lib/raster/Makefile lib/region/Makefile lib/rpcChannel/Makefile lib/rpcIn/Makefile lib/rpcOut/Makefile lib/rpcVmx/Makefile lib/slashProc/Makefile lib/string/Makefile lib/stubs/Makefile lib/syncDriver/Makefile lib/system/Makefile lib/unicode/Makefile lib/user/Makefile lib/vmCheck/Makefile lib/vmSignal/Makefile lib/wiper/Makefile lib/xdg/Makefile services/Makefile services/vmtoolsd/Makefile services/plugins/Makefile services/plugins/desktopEvents/Makefile services/plugins/dndcp/Makefile services/plugins/guestInfo/Makefile services/plugins/guestInfo/getlib/Makefile services/plugins/hgfsServer/Makefile services/plugins/powerOps/Makefile services/plugins/resolutionSet/Makefile services/plugins/timeSync/Makefile services/plugins/unity/Makefile services/plugins/vix/Makefile services/plugins/vmbackup/Makefile vmware-user-suid-wrapper/Makefile toolbox/Makefile hgfsclient/Makefile hgfsmounter/Makefile checkvm/Makefile rpctool/Makefile libguestlib/Makefile libguestlib/vmguestlib.pc libhgfs/Makefile libvmtools/Makefile xferlogs/Makefile modules/Makefile vmblock-fuse/Makefile vmblockmounter/Makefile tests/Makefile tests/vmrpcdbg/Makefile tests/testDebug/Makefile tests/testPlugin/Makefile tests/testVmblock/Makefile docs/Makefile docs/api/Makefile scripts/Makefile scripts/build/rpcgen_wrapper.sh"
2889+ac_config_files="$ac_config_files Makefile lib/Makefile lib/appUtil/Makefile lib/auth/Makefile lib/backdoor/Makefile lib/dict/Makefile lib/dynxdr/Makefile lib/err/Makefile lib/file/Makefile lib/foundryMsg/Makefile lib/glibUtils/Makefile lib/guestApp/Makefile lib/guestRpc/Makefile lib/hgfs/Makefile lib/hgfsBd/Makefile lib/hgfsHelper/Makefile lib/hgfsServer/Makefile lib/hgfsServerManagerGuest/Makefile lib/hgfsServerPolicyGuest/Makefile lib/impersonate/Makefile lib/lock/Makefile lib/message/Makefile lib/misc/Makefile lib/netUtil/Makefile lib/panic/Makefile lib/panicDefault/Makefile lib/printer/Makefile lib/procMgr/Makefile lib/rpcChannel/Makefile lib/rpcIn/Makefile lib/rpcOut/Makefile lib/rpcVmx/Makefile lib/slashProc/Makefile lib/string/Makefile lib/stubs/Makefile lib/syncDriver/Makefile lib/system/Makefile lib/unicode/Makefile lib/user/Makefile lib/vmCheck/Makefile lib/vmSignal/Makefile lib/wiper/Makefile lib/xdg/Makefile services/Makefile services/vmtoolsd/Makefile services/plugins/Makefile services/plugins/desktopEvents/Makefile services/plugins/dndcp/Makefile services/plugins/guestInfo/Makefile services/plugins/guestInfo/getlib/Makefile services/plugins/hgfsServer/Makefile services/plugins/powerOps/Makefile services/plugins/resolutionSet/Makefile services/plugins/timeSync/Makefile services/plugins/vix/Makefile services/plugins/vmbackup/Makefile vmware-user-suid-wrapper/Makefile toolbox/Makefile hgfsclient/Makefile hgfsmounter/Makefile checkvm/Makefile rpctool/Makefile libguestlib/Makefile libguestlib/vmguestlib.pc libhgfs/Makefile libvmtools/Makefile xferlogs/Makefile modules/Makefile vmblock-fuse/Makefile vmblockmounter/Makefile tests/Makefile tests/vmrpcdbg/Makefile tests/testDebug/Makefile tests/testPlugin/Makefile tests/testVmblock/Makefile docs/Makefile docs/api/Makefile scripts/Makefile scripts/build/rpcgen_wrapper.sh"
2890
2891
2892 ###
2893@@ -23325,10 +22388,6 @@
2894 as_fn_error $? "conditional \"HAVE_XCOMPOSITE\" was never defined.
2895 Usually this means the macro was only invoked conditionally." "$LINENO" 5
2896 fi
2897-if test -z "${ENABLE_UNITY_TRUE}" && test -z "${ENABLE_UNITY_FALSE}"; then
2898- as_fn_error $? "conditional \"ENABLE_UNITY\" was never defined.
2899-Usually this means the macro was only invoked conditionally." "$LINENO" 5
2900-fi
2901 if test -z "${ENABLE_TESTS_TRUE}" && test -z "${ENABLE_TESTS_FALSE}"; then
2902 as_fn_error $? "conditional \"ENABLE_TESTS\" was never defined.
2903 Usually this means the macro was only invoked conditionally." "$LINENO" 5
2904@@ -23365,6 +22424,10 @@
2905 as_fn_error $? "conditional \"USE_SLASH_PROC\" was never defined.
2906 Usually this means the macro was only invoked conditionally." "$LINENO" 5
2907 fi
2908+if test -z "${USE_PRINTF_WRAPPERS_TRUE}" && test -z "${USE_PRINTF_WRAPPERS_FALSE}"; then
2909+ as_fn_error $? "conditional \"USE_PRINTF_WRAPPERS\" was never defined.
2910+Usually this means the macro was only invoked conditionally." "$LINENO" 5
2911+fi
2912
2913 : ${CONFIG_STATUS=./config.status}
2914 ac_write_fail=0
2915@@ -23773,7 +22836,7 @@
2916 # report actual input values of CONFIG_FILES etc. instead of their
2917 # values after options handling.
2918 ac_log="
2919-This file was extended by open-vm-tools $as_me 2011.07.19, which was
2920+This file was extended by open-vm-tools $as_me 2011.12.20, which was
2921 generated by GNU Autoconf 2.67. Invocation command line was
2922
2923 CONFIG_FILES = $CONFIG_FILES
2924@@ -23830,7 +22893,7 @@
2925 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
2926 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
2927 ac_cs_version="\\
2928-open-vm-tools config.status 2011.07.19
2929+open-vm-tools config.status 2011.12.20
2930 configured by $0, generated by GNU Autoconf 2.67,
2931 with options \\"\$ac_cs_config\\"
2932
2933@@ -24311,6 +23374,7 @@
2934 "lib/err/Makefile") CONFIG_FILES="$CONFIG_FILES lib/err/Makefile" ;;
2935 "lib/file/Makefile") CONFIG_FILES="$CONFIG_FILES lib/file/Makefile" ;;
2936 "lib/foundryMsg/Makefile") CONFIG_FILES="$CONFIG_FILES lib/foundryMsg/Makefile" ;;
2937+ "lib/glibUtils/Makefile") CONFIG_FILES="$CONFIG_FILES lib/glibUtils/Makefile" ;;
2938 "lib/guestApp/Makefile") CONFIG_FILES="$CONFIG_FILES lib/guestApp/Makefile" ;;
2939 "lib/guestRpc/Makefile") CONFIG_FILES="$CONFIG_FILES lib/guestRpc/Makefile" ;;
2940 "lib/hgfs/Makefile") CONFIG_FILES="$CONFIG_FILES lib/hgfs/Makefile" ;;
2941@@ -24319,7 +23383,6 @@
2942 "lib/hgfsServer/Makefile") CONFIG_FILES="$CONFIG_FILES lib/hgfsServer/Makefile" ;;
2943 "lib/hgfsServerManagerGuest/Makefile") CONFIG_FILES="$CONFIG_FILES lib/hgfsServerManagerGuest/Makefile" ;;
2944 "lib/hgfsServerPolicyGuest/Makefile") CONFIG_FILES="$CONFIG_FILES lib/hgfsServerPolicyGuest/Makefile" ;;
2945- "lib/image/Makefile") CONFIG_FILES="$CONFIG_FILES lib/image/Makefile" ;;
2946 "lib/impersonate/Makefile") CONFIG_FILES="$CONFIG_FILES lib/impersonate/Makefile" ;;
2947 "lib/lock/Makefile") CONFIG_FILES="$CONFIG_FILES lib/lock/Makefile" ;;
2948 "lib/message/Makefile") CONFIG_FILES="$CONFIG_FILES lib/message/Makefile" ;;
2949@@ -24329,8 +23392,6 @@
2950 "lib/panicDefault/Makefile") CONFIG_FILES="$CONFIG_FILES lib/panicDefault/Makefile" ;;
2951 "lib/printer/Makefile") CONFIG_FILES="$CONFIG_FILES lib/printer/Makefile" ;;
2952 "lib/procMgr/Makefile") CONFIG_FILES="$CONFIG_FILES lib/procMgr/Makefile" ;;
2953- "lib/raster/Makefile") CONFIG_FILES="$CONFIG_FILES lib/raster/Makefile" ;;
2954- "lib/region/Makefile") CONFIG_FILES="$CONFIG_FILES lib/region/Makefile" ;;
2955 "lib/rpcChannel/Makefile") CONFIG_FILES="$CONFIG_FILES lib/rpcChannel/Makefile" ;;
2956 "lib/rpcIn/Makefile") CONFIG_FILES="$CONFIG_FILES lib/rpcIn/Makefile" ;;
2957 "lib/rpcOut/Makefile") CONFIG_FILES="$CONFIG_FILES lib/rpcOut/Makefile" ;;
2958@@ -24357,7 +23418,6 @@
2959 "services/plugins/powerOps/Makefile") CONFIG_FILES="$CONFIG_FILES services/plugins/powerOps/Makefile" ;;
2960 "services/plugins/resolutionSet/Makefile") CONFIG_FILES="$CONFIG_FILES services/plugins/resolutionSet/Makefile" ;;
2961 "services/plugins/timeSync/Makefile") CONFIG_FILES="$CONFIG_FILES services/plugins/timeSync/Makefile" ;;
2962- "services/plugins/unity/Makefile") CONFIG_FILES="$CONFIG_FILES services/plugins/unity/Makefile" ;;
2963 "services/plugins/vix/Makefile") CONFIG_FILES="$CONFIG_FILES services/plugins/vix/Makefile" ;;
2964 "services/plugins/vmbackup/Makefile") CONFIG_FILES="$CONFIG_FILES services/plugins/vmbackup/Makefile" ;;
2965 "vmware-user-suid-wrapper/Makefile") CONFIG_FILES="$CONFIG_FILES vmware-user-suid-wrapper/Makefile" ;;
2966
2967=== modified file 'autom4te.cache/output.2'
2968--- autom4te.cache/output.2 2011-07-22 16:41:03 +0000
2969+++ autom4te.cache/output.2 2012-01-24 04:56:25 +0000
2970@@ -1,6 +1,6 @@
2971 @%:@! /bin/sh
2972 @%:@ Guess values for system-dependent variables and create Makefiles.
2973-@%:@ Generated by GNU Autoconf 2.67 for open-vm-tools 2011.07.19.
2974+@%:@ Generated by GNU Autoconf 2.67 for open-vm-tools 2011.12.20.
2975 @%:@
2976 @%:@ Report bugs to <open-vm-tools-devel@lists.sourceforge.net>.
2977 @%:@
2978@@ -701,8 +701,8 @@
2979 # Identity of this package.
2980 PACKAGE_NAME='open-vm-tools'
2981 PACKAGE_TARNAME='open-vm-tools'
2982-PACKAGE_VERSION='2011.07.19'
2983-PACKAGE_STRING='open-vm-tools 2011.07.19'
2984+PACKAGE_VERSION='2011.12.20'
2985+PACKAGE_STRING='open-vm-tools 2011.12.20'
2986 PACKAGE_BUGREPORT='open-vm-tools-devel@lists.sourceforge.net'
2987 PACKAGE_URL=''
2988
2989@@ -777,6 +777,8 @@
2990 TARGET_OS
2991 TOOLS_VERSION
2992 HGFS_LIBS
2993+USE_PRINTF_WRAPPERS_FALSE
2994+USE_PRINTF_WRAPPERS_TRUE
2995 USE_SLASH_PROC_FALSE
2996 USE_SLASH_PROC_TRUE
2997 HAVE_PAM_FALSE
2998@@ -795,8 +797,6 @@
2999 WITH_ROOT_PRIVILEGES_TRUE
3000 ENABLE_TESTS_FALSE
3001 ENABLE_TESTS_TRUE
3002-ENABLE_UNITY_FALSE
3003-ENABLE_UNITY_TRUE
3004 HAVE_XCOMPOSITE_FALSE
3005 HAVE_XCOMPOSITE_TRUE
3006 HAVE_XSM_FALSE
3007@@ -836,14 +836,6 @@
3008 GTKMM_CPPFLAGS
3009 GTK_LIBS
3010 GTK_CPPFLAGS
3011-GIO_LIBS
3012-GIO_CPPFLAGS
3013-ZLIB_LIBS
3014-ZLIB_CPPFLAGS
3015-LIBPNG_LIBS
3016-LIBPNG_CPPFLAGS
3017-URIPARSER_LIBS
3018-URIPARSER_CPPFLAGS
3019 CUNIT_LIBS
3020 CUNIT_CPPFLAGS
3021 PAM_LIBS
3022@@ -986,7 +978,6 @@
3023 with_kernel_release
3024 with_linuxdir
3025 enable_multimon
3026-enable_unity
3027 with_gtk2
3028 with_gtkmm
3029 enable_docs
3030@@ -1561,7 +1552,7 @@
3031 # Omit some internal or obsolete options to make the list less imposing.
3032 # This message is too long to be a string in the A/UX 3.1 sh.
3033 cat <<_ACEOF
3034-\`configure' configures open-vm-tools 2011.07.19 to adapt to many kinds of systems.
3035+\`configure' configures open-vm-tools 2011.12.20 to adapt to many kinds of systems.
3036
3037 Usage: $0 [OPTION]... [VAR=VALUE]...
3038
3039@@ -1635,7 +1626,7 @@
3040
3041 if test -n "$ac_init_help"; then
3042 case $ac_init_help in
3043- short | recursive ) echo "Configuration of open-vm-tools 2011.07.19:";;
3044+ short | recursive ) echo "Configuration of open-vm-tools 2011.12.20:";;
3045 esac
3046 cat <<\_ACEOF
3047
3048@@ -1644,7 +1635,6 @@
3049 --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
3050 --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
3051 --disable-multimon disables multimon, enabled by default
3052- --disable-unity disables Unity, enabled by default
3053 --disable-docs disables generation of API documentation; by
3054 default, docs are built if doxygen is available.
3055 --disable-tests disable compilation of test code.
3056@@ -1762,7 +1752,7 @@
3057 test -n "$ac_init_help" && exit $ac_status
3058 if $ac_init_version; then
3059 cat <<\_ACEOF
3060-open-vm-tools configure 2011.07.19
3061+open-vm-tools configure 2011.12.20
3062 generated by GNU Autoconf 2.67
3063
3064 Copyright (C) 2010 Free Software Foundation, Inc.
3065@@ -2454,7 +2444,7 @@
3066 This file contains any messages produced by compilers while
3067 running configure, to aid debugging if configure makes a mistake.
3068
3069-It was created by open-vm-tools $as_me 2011.07.19, which was
3070+It was created by open-vm-tools $as_me 2011.12.20, which was
3071 generated by GNU Autoconf 2.67. Invocation command line was
3072
3073 $ $0 $@
3074@@ -3044,14 +3034,6 @@
3075 fi
3076
3077
3078-@%:@ Check whether --enable-unity was given.
3079-if test "${enable_unity+set}" = set; then :
3080- enableval=$enable_unity; enable_unity="$enableval"
3081-else
3082- enable_unity="yes"
3083-fi
3084-
3085-
3086
3087 @%:@ Check whether --with-gtk2 was given.
3088 if test "${with_gtk2+set}" = set; then :
3089@@ -3086,11 +3068,6 @@
3090 fi
3091
3092
3093-# If we're not going to use Gtk 2.0, disable Unity.
3094-if test "$with_gtk2" != "yes"; then
3095- enable_unity="no"
3096-fi
3097-
3098 am__api_version='1.11'
3099
3100 # Find a good install program. We prefer a C program (faster),
3101@@ -3529,7 +3506,7 @@
3102
3103 # Define the identity of the package.
3104 PACKAGE='open-vm-tools'
3105- VERSION='2011.07.19'
3106+ VERSION='2011.12.20'
3107
3108
3109 cat >>confdefs.h <<_ACEOF
3110@@ -17819,8 +17796,7 @@
3111 #
3112 # Check for PAM.
3113 #
3114-if test "$os" = "linux"; then
3115-
3116+
3117 @%:@ Check whether --with-pam was given.
3118 if test "${with_pam+set}" = set; then :
3119 withval=$with_pam;
3120@@ -17829,8 +17805,8 @@
3121 fi
3122
3123
3124- if test "$with_pam" = "yes"; then
3125-
3126+if test "$with_pam" = "yes"; then
3127+
3128 if test -z "$CUSTOM_PAM_CPPFLAGS"; then
3129 if test "$os" = freebsd; then
3130 CUSTOM_PAM_CPPFLAGS="-I/usr/local/include"
3131@@ -17842,7 +17818,7 @@
3132 fi
3133 fi
3134
3135-
3136+
3137
3138 if test -z "pam"; then
3139 as_fn_error $? "'library' parameter is required.'" "$LINENO" 5
3140@@ -18054,7 +18030,6 @@
3141
3142 fi
3143
3144- fi
3145 fi
3146
3147 #
3148@@ -18298,7 +18273,6 @@
3149 # If the user explicitly disables X11, then don't try to detect the X-related libraries
3150 if test "$have_x" = "disabled"; then
3151 enable_multimon="no"
3152- enable_unity="no"
3153 elif test "$have_x" != "yes"; then
3154 as_fn_error $? "The X11 libraries were not found. Please configure without X11 (using --without-x), or install the libX11 devel package(s)." "$LINENO" 5
3155 else
3156@@ -18402,12 +18376,6 @@
3157 as_fn_error $? "libXinerama not found. Please configure without multimon (using --disable-multimon), configure without X11 (using --without-x), or install the libXinerama devel package(s)." "$LINENO" 5
3158 fi
3159
3160- else
3161- if test "$enable_unity" != "no"; then
3162- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Disabling Unity due to --disable-multimon." >&5
3163-$as_echo "$as_me: WARNING: Disabling Unity due to --disable-multimon." >&2;}
3164- enable_unity="no"
3165- fi
3166 fi
3167
3168 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XOpenDevice in -lXi" >&5
3169@@ -18704,939 +18672,6 @@
3170 have_xcomposite="yes"
3171 fi
3172
3173- # If we're building with support for Unity, we'll need a few additional
3174- # libraries.
3175- if test "$enable_unity" != "no"; then
3176- # Unity needs the X11 Screen Saver extension library. It should be
3177- # in the same place as the X11 libraries, so no need for any fancy
3178- # path checking.
3179-
3180- have_header=1
3181- if test -n "X11/extensions/scrnsaver.h"; then
3182- ac_fn_c_check_header_mongrel "$LINENO" "X11/extensions/scrnsaver.h" "ac_cv_header_X11_extensions_scrnsaver_h" "$ac_includes_default"
3183-if test "x$ac_cv_header_X11_extensions_scrnsaver_h" = x""yes; then :
3184-
3185-else
3186-
3187- have_header=0;
3188- as_fn_error $? "libXss or headers not found. Please configure without Unity (using --disable-unity) or install the libXss devel package." "$LINENO" 5
3189-
3190-fi
3191-
3192-
3193- fi
3194-
3195- if test $have_header = 1; then
3196- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XScreenSaverQueryExtension in -lXss" >&5
3197-$as_echo_n "checking for XScreenSaverQueryExtension in -lXss... " >&6; }
3198-if test "${ac_cv_lib_Xss_XScreenSaverQueryExtension+set}" = set; then :
3199- $as_echo_n "(cached) " >&6
3200-else
3201- ac_check_lib_save_LIBS=$LIBS
3202-LIBS="-lXss $COMMON_XLIBS $LIBS"
3203-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
3204-/* end confdefs.h. */
3205-
3206-/* Override any GCC internal prototype to avoid an error.
3207- Use char because int might match the return type of a GCC
3208- builtin and then its argument prototype would still apply. */
3209-#ifdef __cplusplus
3210-extern "C"
3211-#endif
3212-char XScreenSaverQueryExtension ();
3213-int
3214-main ()
3215-{
3216-return XScreenSaverQueryExtension ();
3217- ;
3218- return 0;
3219-}
3220-_ACEOF
3221-if ac_fn_c_try_link "$LINENO"; then :
3222- ac_cv_lib_Xss_XScreenSaverQueryExtension=yes
3223-else
3224- ac_cv_lib_Xss_XScreenSaverQueryExtension=no
3225-fi
3226-rm -f core conftest.err conftest.$ac_objext \
3227- conftest$ac_exeext conftest.$ac_ext
3228-LIBS=$ac_check_lib_save_LIBS
3229-fi
3230-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xss_XScreenSaverQueryExtension" >&5
3231-$as_echo "$ac_cv_lib_Xss_XScreenSaverQueryExtension" >&6; }
3232-if test "x$ac_cv_lib_Xss_XScreenSaverQueryExtension" = x""yes; then :
3233- COMMON_XLIBS="-lXss $COMMON_XLIBS"
3234-else
3235- as_fn_error $? "libXss or headers not found. Please configure without Unity (using --disable-unity) or install the libXss devel package." "$LINENO" 5
3236-fi
3237-
3238- fi
3239-
3240-
3241- # Check for the uriparser library and headers. The upstream uriparser
3242- # doesn't appear to ship with either a pkg-config file or a
3243- # uriparser-config binary, so we'll look for it the old-fashioned
3244- # way.
3245- #
3246- # Note that we look for uriFreeQueryListA because it's a relatively
3247- # new symbol that our code needs (it isn't present in the uriparser
3248- # that shipped with Ubuntu Hardy).
3249-
3250- if test -z "$CUSTOM_URIPARSER_CPPFLAGS"; then
3251- if test "$os" = freebsd; then
3252- CUSTOM_URIPARSER_CPPFLAGS="-I/usr/local/include"
3253- else
3254- CUSTOM_URIPARSER_CPPFLAGS="-I/usr/include"
3255- fi
3256- if test -n "uriparser"; then
3257- CUSTOM_URIPARSER_CPPFLAGS="${CUSTOM_URIPARSER_CPPFLAGS}/uriparser"
3258- fi
3259- fi
3260-
3261-
3262-
3263- if test -z "uriparser"; then
3264- as_fn_error $? "'library' parameter is required.'" "$LINENO" 5
3265- fi
3266- if test -z "URIPARSER"; then
3267- as_fn_error $? "'lvar' parameter is required.'" "$LINENO" 5
3268- fi
3269-
3270- ac_vmw_have_lib=0
3271- ac_vmw_have_lib_func=0
3272- ac_vmw_have_lib_header=0
3273- ac_vmw_custom_libs=
3274-
3275- #
3276- # First, try any user-defined CUSTOM_* flags.
3277- #
3278- if test -n "${CUSTOM_URIPARSER_CPPFLAGS}" || test -n "${CUSTOM_URIPARSER_LIBS}"; then
3279- ac_vmw_custom_libs="${CUSTOM_URIPARSER_LIBS} -luriparser"
3280- if test -n "Uri.h"; then
3281- ORIGINAL_CPPFLAGS="$CPPFLAGS"
3282- CPPFLAGS="${CUSTOM_URIPARSER_CPPFLAGS} $CPPFLAGS"
3283-
3284- ac_fn_c_check_header_mongrel "$LINENO" "Uri.h" "ac_cv_header_Uri_h" "$ac_includes_default"
3285-if test "x$ac_cv_header_Uri_h" = x""yes; then :
3286- ac_vmw_have_lib_header=1
3287-fi
3288-
3289-
3290-
3291- CPPFLAGS="$ORIGINAL_CPPFLAGS"
3292- else
3293- ac_vmw_have_lib_header=1
3294- fi
3295-
3296- # Check a specific function in the library if requested.
3297- # If it hasn't, just pick a random function from libc, just to make
3298- # sure the linker can find the library being tested.
3299- if test $ac_vmw_have_lib_header -eq 1; then
3300- if test -n "uriFreeQueryListA"; then
3301- ac_vmw_function=uriFreeQueryListA
3302- else
3303- ac_vmw_function=strlen
3304- fi
3305- as_ac_Lib=`$as_echo "ac_cv_lib_uriparser_$ac_vmw_function" | $as_tr_sh`
3306-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_vmw_function in -luriparser" >&5
3307-$as_echo_n "checking for $ac_vmw_function in -luriparser... " >&6; }
3308-if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
3309- $as_echo_n "(cached) " >&6
3310-else
3311- ac_check_lib_save_LIBS=$LIBS
3312-LIBS="-luriparser $ac_vmw_custom_libs $LIBS"
3313-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
3314-/* end confdefs.h. */
3315-
3316-/* Override any GCC internal prototype to avoid an error.
3317- Use char because int might match the return type of a GCC
3318- builtin and then its argument prototype would still apply. */
3319-#ifdef __cplusplus
3320-extern "C"
3321-#endif
3322-char $ac_vmw_function ();
3323-int
3324-main ()
3325-{
3326-return $ac_vmw_function ();
3327- ;
3328- return 0;
3329-}
3330-_ACEOF
3331-if ac_fn_c_try_link "$LINENO"; then :
3332- eval "$as_ac_Lib=yes"
3333-else
3334- eval "$as_ac_Lib=no"
3335-fi
3336-rm -f core conftest.err conftest.$ac_objext \
3337- conftest$ac_exeext conftest.$ac_ext
3338-LIBS=$ac_check_lib_save_LIBS
3339-fi
3340-eval ac_res=\$$as_ac_Lib
3341- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
3342-$as_echo "$ac_res" >&6; }
3343-if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
3344- ac_vmw_have_lib_func=1
3345-fi
3346-
3347- fi
3348-
3349- if test $ac_vmw_have_lib_func -eq 1 && test $ac_vmw_have_lib_header -eq 1; then
3350- URIPARSER_CPPFLAGS="${CUSTOM_URIPARSER_CPPFLAGS}"
3351- URIPARSER_LIBS="$ac_vmw_custom_libs"
3352- ac_vmw_have_lib=1
3353- fi
3354- fi
3355-
3356- # If that didn't work, try with pkg-config.
3357- if test $ac_vmw_have_lib -eq 0 && test "$HAVE_PKG_CONFIG" = "yes" && test -n ""; then
3358- if test -n ""; then
3359- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for >= (via pkg-config)" >&5
3360-$as_echo_n "checking for >= (via pkg-config)... " >&6; }
3361- if pkg-config --exists ' >= '; then
3362- ac_vmw_have_lib=1
3363- fi
3364- else
3365- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for (via pkg-config)" >&5
3366-$as_echo_n "checking for (via pkg-config)... " >&6; }
3367- if pkg-config --exists ''; then
3368- ac_vmw_have_lib=1
3369- fi
3370- fi
3371-
3372- if test $ac_vmw_have_lib -eq 1; then
3373- # Sometimes pkg-config might fail; for example, "pkg-config gtk+-2.0 --cflags"
3374- # fails on OpenSolaris B71. So be pessimistic.
3375- ac_vmw_cppflags="`pkg-config --cflags `"
3376- ac_vmw_ret1=$?
3377- ac_vmw_libs="`pkg-config --libs `"
3378- ac_vmw_ret2=$?
3379- if test $ac_vmw_ret1 -eq 0 && test $ac_vmw_ret2 -eq 0; then
3380- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
3381-$as_echo "yes" >&6; }
3382- URIPARSER_CPPFLAGS="$ac_vmw_cppflags"
3383- URIPARSER_LIBS="$ac_vmw_libs"
3384- else
3385- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
3386-$as_echo "no" >&6; }
3387- fi
3388- else
3389- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
3390-$as_echo "no" >&6; }
3391- fi
3392- fi
3393-
3394- # If we still haven't found the lib, try with the library's custom "config" script.
3395- # Before checking, flush the AC_PATH_PROG cached variable.
3396- unset ac_cv_path_ac_vmw_lib_cfg
3397- unset ac_vmw_lib_cfg
3398- if test $ac_vmw_have_lib -eq 0 && test -n ""; then
3399- # Extract the first word of "", so it can be a program name with args.
3400-set dummy ; ac_word=$2
3401-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
3402-$as_echo_n "checking for $ac_word... " >&6; }
3403-if test "${ac_cv_path_ac_vmw_lib_cfg+set}" = set; then :
3404- $as_echo_n "(cached) " >&6
3405-else
3406- case $ac_vmw_lib_cfg in
3407- [\\/]* | ?:[\\/]*)
3408- ac_cv_path_ac_vmw_lib_cfg="$ac_vmw_lib_cfg" # Let the user override the test with a path.
3409- ;;
3410- *)
3411- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
3412-for as_dir in $PATH
3413-do
3414- IFS=$as_save_IFS
3415- test -z "$as_dir" && as_dir=.
3416- for ac_exec_ext in '' $ac_executable_extensions; do
3417- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3418- ac_cv_path_ac_vmw_lib_cfg="$as_dir/$ac_word$ac_exec_ext"
3419- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3420- break 2
3421- fi
3422-done
3423- done
3424-IFS=$as_save_IFS
3425-
3426- test -z "$ac_cv_path_ac_vmw_lib_cfg" && ac_cv_path_ac_vmw_lib_cfg="no"
3427- ;;
3428-esac
3429-fi
3430-ac_vmw_lib_cfg=$ac_cv_path_ac_vmw_lib_cfg
3431-if test -n "$ac_vmw_lib_cfg"; then
3432- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_vmw_lib_cfg" >&5
3433-$as_echo "$ac_vmw_lib_cfg" >&6; }
3434-else
3435- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
3436-$as_echo "no" >&6; }
3437-fi
3438-
3439-
3440- if test "$ac_vmw_lib_cfg" != "no"; then
3441- # XXX: icu-config does not follow the "--cflags" and "--libs" convention,
3442- # so single it out here to avoid having to replicate all the rest of the
3443- # logic elsewhere.
3444- if test `basename "$ac_vmw_lib_cfg"` = "icu-config"; then
3445- URIPARSER_CPPFLAGS="`$ac_vmw_lib_cfg --cppflags`"
3446- URIPARSER_LIBS="`$ac_vmw_lib_cfg --ldflags`"
3447- else
3448- URIPARSER_CPPFLAGS="`$ac_vmw_lib_cfg --cflags`"
3449- URIPARSER_LIBS="`$ac_vmw_lib_cfg --libs`"
3450- fi
3451- ac_vmw_have_lib=1
3452- fi
3453- fi
3454-
3455- # Finish by executing the user provided action. The call to "true" is needed
3456- # because the actions are optional, and we need something inside the block.
3457- if test $ac_vmw_have_lib -eq 1; then
3458-
3459-
3460- true
3461-
3462- else
3463- true
3464- as_fn_error $? "uriparser library not found or is too old. Please configure without Unity (using --disable-unity) or install the liburiparser devel package." "$LINENO" 5
3465- fi
3466-
3467-
3468- # Check for libpng.
3469-
3470-
3471- if test -z "png12"; then
3472- as_fn_error $? "'library' parameter is required.'" "$LINENO" 5
3473- fi
3474- if test -z "LIBPNG"; then
3475- as_fn_error $? "'lvar' parameter is required.'" "$LINENO" 5
3476- fi
3477-
3478- ac_vmw_have_lib=0
3479- ac_vmw_have_lib_func=0
3480- ac_vmw_have_lib_header=0
3481- ac_vmw_custom_libs=
3482-
3483- #
3484- # First, try any user-defined CUSTOM_* flags.
3485- #
3486- if test -n "${CUSTOM_LIBPNG_CPPFLAGS}" || test -n "${CUSTOM_LIBPNG_LIBS}"; then
3487- ac_vmw_custom_libs="${CUSTOM_LIBPNG_LIBS} -lpng12"
3488- if test -n "png.h"; then
3489- ORIGINAL_CPPFLAGS="$CPPFLAGS"
3490- CPPFLAGS="${CUSTOM_LIBPNG_CPPFLAGS} $CPPFLAGS"
3491-
3492- ac_fn_c_check_header_mongrel "$LINENO" "png.h" "ac_cv_header_png_h" "$ac_includes_default"
3493-if test "x$ac_cv_header_png_h" = x""yes; then :
3494- ac_vmw_have_lib_header=1
3495-fi
3496-
3497-
3498-
3499- CPPFLAGS="$ORIGINAL_CPPFLAGS"
3500- else
3501- ac_vmw_have_lib_header=1
3502- fi
3503-
3504- # Check a specific function in the library if requested.
3505- # If it hasn't, just pick a random function from libc, just to make
3506- # sure the linker can find the library being tested.
3507- if test $ac_vmw_have_lib_header -eq 1; then
3508- if test -n "png_access_version_number"; then
3509- ac_vmw_function=png_access_version_number
3510- else
3511- ac_vmw_function=strlen
3512- fi
3513- as_ac_Lib=`$as_echo "ac_cv_lib_png12_$ac_vmw_function" | $as_tr_sh`
3514-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_vmw_function in -lpng12" >&5
3515-$as_echo_n "checking for $ac_vmw_function in -lpng12... " >&6; }
3516-if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
3517- $as_echo_n "(cached) " >&6
3518-else
3519- ac_check_lib_save_LIBS=$LIBS
3520-LIBS="-lpng12 $ac_vmw_custom_libs $LIBS"
3521-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
3522-/* end confdefs.h. */
3523-
3524-/* Override any GCC internal prototype to avoid an error.
3525- Use char because int might match the return type of a GCC
3526- builtin and then its argument prototype would still apply. */
3527-#ifdef __cplusplus
3528-extern "C"
3529-#endif
3530-char $ac_vmw_function ();
3531-int
3532-main ()
3533-{
3534-return $ac_vmw_function ();
3535- ;
3536- return 0;
3537-}
3538-_ACEOF
3539-if ac_fn_c_try_link "$LINENO"; then :
3540- eval "$as_ac_Lib=yes"
3541-else
3542- eval "$as_ac_Lib=no"
3543-fi
3544-rm -f core conftest.err conftest.$ac_objext \
3545- conftest$ac_exeext conftest.$ac_ext
3546-LIBS=$ac_check_lib_save_LIBS
3547-fi
3548-eval ac_res=\$$as_ac_Lib
3549- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
3550-$as_echo "$ac_res" >&6; }
3551-if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
3552- ac_vmw_have_lib_func=1
3553-fi
3554-
3555- fi
3556-
3557- if test $ac_vmw_have_lib_func -eq 1 && test $ac_vmw_have_lib_header -eq 1; then
3558- LIBPNG_CPPFLAGS="${CUSTOM_LIBPNG_CPPFLAGS}"
3559- LIBPNG_LIBS="$ac_vmw_custom_libs"
3560- ac_vmw_have_lib=1
3561- fi
3562- fi
3563-
3564- # If that didn't work, try with pkg-config.
3565- if test $ac_vmw_have_lib -eq 0 && test "$HAVE_PKG_CONFIG" = "yes" && test -n "libpng12"; then
3566- if test -n ""; then
3567- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libpng12 >= (via pkg-config)" >&5
3568-$as_echo_n "checking for libpng12 >= (via pkg-config)... " >&6; }
3569- if pkg-config --exists 'libpng12 >= '; then
3570- ac_vmw_have_lib=1
3571- fi
3572- else
3573- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libpng12 (via pkg-config)" >&5
3574-$as_echo_n "checking for libpng12 (via pkg-config)... " >&6; }
3575- if pkg-config --exists 'libpng12'; then
3576- ac_vmw_have_lib=1
3577- fi
3578- fi
3579-
3580- if test $ac_vmw_have_lib -eq 1; then
3581- # Sometimes pkg-config might fail; for example, "pkg-config gtk+-2.0 --cflags"
3582- # fails on OpenSolaris B71. So be pessimistic.
3583- ac_vmw_cppflags="`pkg-config --cflags libpng12`"
3584- ac_vmw_ret1=$?
3585- ac_vmw_libs="`pkg-config --libs libpng12`"
3586- ac_vmw_ret2=$?
3587- if test $ac_vmw_ret1 -eq 0 && test $ac_vmw_ret2 -eq 0; then
3588- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
3589-$as_echo "yes" >&6; }
3590- LIBPNG_CPPFLAGS="$ac_vmw_cppflags"
3591- LIBPNG_LIBS="$ac_vmw_libs"
3592- else
3593- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
3594-$as_echo "no" >&6; }
3595- fi
3596- else
3597- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
3598-$as_echo "no" >&6; }
3599- fi
3600- fi
3601-
3602- # If we still haven't found the lib, try with the library's custom "config" script.
3603- # Before checking, flush the AC_PATH_PROG cached variable.
3604- unset ac_cv_path_ac_vmw_lib_cfg
3605- unset ac_vmw_lib_cfg
3606- if test $ac_vmw_have_lib -eq 0 && test -n "libpng-config"; then
3607- # Extract the first word of "libpng-config", so it can be a program name with args.
3608-set dummy libpng-config; ac_word=$2
3609-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
3610-$as_echo_n "checking for $ac_word... " >&6; }
3611-if test "${ac_cv_path_ac_vmw_lib_cfg+set}" = set; then :
3612- $as_echo_n "(cached) " >&6
3613-else
3614- case $ac_vmw_lib_cfg in
3615- [\\/]* | ?:[\\/]*)
3616- ac_cv_path_ac_vmw_lib_cfg="$ac_vmw_lib_cfg" # Let the user override the test with a path.
3617- ;;
3618- *)
3619- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
3620-for as_dir in $PATH
3621-do
3622- IFS=$as_save_IFS
3623- test -z "$as_dir" && as_dir=.
3624- for ac_exec_ext in '' $ac_executable_extensions; do
3625- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3626- ac_cv_path_ac_vmw_lib_cfg="$as_dir/$ac_word$ac_exec_ext"
3627- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3628- break 2
3629- fi
3630-done
3631- done
3632-IFS=$as_save_IFS
3633-
3634- test -z "$ac_cv_path_ac_vmw_lib_cfg" && ac_cv_path_ac_vmw_lib_cfg="no"
3635- ;;
3636-esac
3637-fi
3638-ac_vmw_lib_cfg=$ac_cv_path_ac_vmw_lib_cfg
3639-if test -n "$ac_vmw_lib_cfg"; then
3640- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_vmw_lib_cfg" >&5
3641-$as_echo "$ac_vmw_lib_cfg" >&6; }
3642-else
3643- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
3644-$as_echo "no" >&6; }
3645-fi
3646-
3647-
3648- if test "$ac_vmw_lib_cfg" != "no"; then
3649- # XXX: icu-config does not follow the "--cflags" and "--libs" convention,
3650- # so single it out here to avoid having to replicate all the rest of the
3651- # logic elsewhere.
3652- if test `basename "$ac_vmw_lib_cfg"` = "icu-config"; then
3653- LIBPNG_CPPFLAGS="`$ac_vmw_lib_cfg --cppflags`"
3654- LIBPNG_LIBS="`$ac_vmw_lib_cfg --ldflags`"
3655- else
3656- LIBPNG_CPPFLAGS="`$ac_vmw_lib_cfg --cflags`"
3657- LIBPNG_LIBS="`$ac_vmw_lib_cfg --libs`"
3658- fi
3659- ac_vmw_have_lib=1
3660- fi
3661- fi
3662-
3663- # Finish by executing the user provided action. The call to "true" is needed
3664- # because the actions are optional, and we need something inside the block.
3665- if test $ac_vmw_have_lib -eq 1; then
3666-
3667-
3668- true
3669-
3670- else
3671- true
3672- as_fn_error $? "libpng not found. Please configure without Unity (using --disable-unity) or install the libpng devel package" "$LINENO" 5
3673- fi
3674-
3675-
3676- # Check for the zlib library and headers. Like uriparser, there
3677- # isn't a pkg-config or zlib-config file.
3678-
3679- if test -z "$CUSTOM_ZLIB_CPPFLAGS"; then
3680- if test "$os" = freebsd; then
3681- CUSTOM_ZLIB_CPPFLAGS="-I/usr/local/include"
3682- else
3683- CUSTOM_ZLIB_CPPFLAGS="-I/usr/include"
3684- fi
3685- if test -n ""; then
3686- CUSTOM_ZLIB_CPPFLAGS="${CUSTOM_ZLIB_CPPFLAGS}/"
3687- fi
3688- fi
3689-
3690-
3691-
3692- if test -z "z"; then
3693- as_fn_error $? "'library' parameter is required.'" "$LINENO" 5
3694- fi
3695- if test -z "ZLIB"; then
3696- as_fn_error $? "'lvar' parameter is required.'" "$LINENO" 5
3697- fi
3698-
3699- ac_vmw_have_lib=0
3700- ac_vmw_have_lib_func=0
3701- ac_vmw_have_lib_header=0
3702- ac_vmw_custom_libs=
3703-
3704- #
3705- # First, try any user-defined CUSTOM_* flags.
3706- #
3707- if test -n "${CUSTOM_ZLIB_CPPFLAGS}" || test -n "${CUSTOM_ZLIB_LIBS}"; then
3708- ac_vmw_custom_libs="${CUSTOM_ZLIB_LIBS} -lz"
3709- if test -n "zlib.h"; then
3710- ORIGINAL_CPPFLAGS="$CPPFLAGS"
3711- CPPFLAGS="${CUSTOM_ZLIB_CPPFLAGS} $CPPFLAGS"
3712-
3713- ac_fn_c_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default"
3714-if test "x$ac_cv_header_zlib_h" = x""yes; then :
3715- ac_vmw_have_lib_header=1
3716-fi
3717-
3718-
3719-
3720- CPPFLAGS="$ORIGINAL_CPPFLAGS"
3721- else
3722- ac_vmw_have_lib_header=1
3723- fi
3724-
3725- # Check a specific function in the library if requested.
3726- # If it hasn't, just pick a random function from libc, just to make
3727- # sure the linker can find the library being tested.
3728- if test $ac_vmw_have_lib_header -eq 1; then
3729- if test -n "zlibVersion"; then
3730- ac_vmw_function=zlibVersion
3731- else
3732- ac_vmw_function=strlen
3733- fi
3734- as_ac_Lib=`$as_echo "ac_cv_lib_z_$ac_vmw_function" | $as_tr_sh`
3735-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_vmw_function in -lz" >&5
3736-$as_echo_n "checking for $ac_vmw_function in -lz... " >&6; }
3737-if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
3738- $as_echo_n "(cached) " >&6
3739-else
3740- ac_check_lib_save_LIBS=$LIBS
3741-LIBS="-lz $ac_vmw_custom_libs $LIBS"
3742-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
3743-/* end confdefs.h. */
3744-
3745-/* Override any GCC internal prototype to avoid an error.
3746- Use char because int might match the return type of a GCC
3747- builtin and then its argument prototype would still apply. */
3748-#ifdef __cplusplus
3749-extern "C"
3750-#endif
3751-char $ac_vmw_function ();
3752-int
3753-main ()
3754-{
3755-return $ac_vmw_function ();
3756- ;
3757- return 0;
3758-}
3759-_ACEOF
3760-if ac_fn_c_try_link "$LINENO"; then :
3761- eval "$as_ac_Lib=yes"
3762-else
3763- eval "$as_ac_Lib=no"
3764-fi
3765-rm -f core conftest.err conftest.$ac_objext \
3766- conftest$ac_exeext conftest.$ac_ext
3767-LIBS=$ac_check_lib_save_LIBS
3768-fi
3769-eval ac_res=\$$as_ac_Lib
3770- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
3771-$as_echo "$ac_res" >&6; }
3772-if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
3773- ac_vmw_have_lib_func=1
3774-fi
3775-
3776- fi
3777-
3778- if test $ac_vmw_have_lib_func -eq 1 && test $ac_vmw_have_lib_header -eq 1; then
3779- ZLIB_CPPFLAGS="${CUSTOM_ZLIB_CPPFLAGS}"
3780- ZLIB_LIBS="$ac_vmw_custom_libs"
3781- ac_vmw_have_lib=1
3782- fi
3783- fi
3784-
3785- # If that didn't work, try with pkg-config.
3786- if test $ac_vmw_have_lib -eq 0 && test "$HAVE_PKG_CONFIG" = "yes" && test -n ""; then
3787- if test -n ""; then
3788- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for >= (via pkg-config)" >&5
3789-$as_echo_n "checking for >= (via pkg-config)... " >&6; }
3790- if pkg-config --exists ' >= '; then
3791- ac_vmw_have_lib=1
3792- fi
3793- else
3794- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for (via pkg-config)" >&5
3795-$as_echo_n "checking for (via pkg-config)... " >&6; }
3796- if pkg-config --exists ''; then
3797- ac_vmw_have_lib=1
3798- fi
3799- fi
3800-
3801- if test $ac_vmw_have_lib -eq 1; then
3802- # Sometimes pkg-config might fail; for example, "pkg-config gtk+-2.0 --cflags"
3803- # fails on OpenSolaris B71. So be pessimistic.
3804- ac_vmw_cppflags="`pkg-config --cflags `"
3805- ac_vmw_ret1=$?
3806- ac_vmw_libs="`pkg-config --libs `"
3807- ac_vmw_ret2=$?
3808- if test $ac_vmw_ret1 -eq 0 && test $ac_vmw_ret2 -eq 0; then
3809- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
3810-$as_echo "yes" >&6; }
3811- ZLIB_CPPFLAGS="$ac_vmw_cppflags"
3812- ZLIB_LIBS="$ac_vmw_libs"
3813- else
3814- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
3815-$as_echo "no" >&6; }
3816- fi
3817- else
3818- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
3819-$as_echo "no" >&6; }
3820- fi
3821- fi
3822-
3823- # If we still haven't found the lib, try with the library's custom "config" script.
3824- # Before checking, flush the AC_PATH_PROG cached variable.
3825- unset ac_cv_path_ac_vmw_lib_cfg
3826- unset ac_vmw_lib_cfg
3827- if test $ac_vmw_have_lib -eq 0 && test -n ""; then
3828- # Extract the first word of "", so it can be a program name with args.
3829-set dummy ; ac_word=$2
3830-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
3831-$as_echo_n "checking for $ac_word... " >&6; }
3832-if test "${ac_cv_path_ac_vmw_lib_cfg+set}" = set; then :
3833- $as_echo_n "(cached) " >&6
3834-else
3835- case $ac_vmw_lib_cfg in
3836- [\\/]* | ?:[\\/]*)
3837- ac_cv_path_ac_vmw_lib_cfg="$ac_vmw_lib_cfg" # Let the user override the test with a path.
3838- ;;
3839- *)
3840- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
3841-for as_dir in $PATH
3842-do
3843- IFS=$as_save_IFS
3844- test -z "$as_dir" && as_dir=.
3845- for ac_exec_ext in '' $ac_executable_extensions; do
3846- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
3847- ac_cv_path_ac_vmw_lib_cfg="$as_dir/$ac_word$ac_exec_ext"
3848- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3849- break 2
3850- fi
3851-done
3852- done
3853-IFS=$as_save_IFS
3854-
3855- test -z "$ac_cv_path_ac_vmw_lib_cfg" && ac_cv_path_ac_vmw_lib_cfg="no"
3856- ;;
3857-esac
3858-fi
3859-ac_vmw_lib_cfg=$ac_cv_path_ac_vmw_lib_cfg
3860-if test -n "$ac_vmw_lib_cfg"; then
3861- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_vmw_lib_cfg" >&5
3862-$as_echo "$ac_vmw_lib_cfg" >&6; }
3863-else
3864- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
3865-$as_echo "no" >&6; }
3866-fi
3867-
3868-
3869- if test "$ac_vmw_lib_cfg" != "no"; then
3870- # XXX: icu-config does not follow the "--cflags" and "--libs" convention,
3871- # so single it out here to avoid having to replicate all the rest of the
3872- # logic elsewhere.
3873- if test `basename "$ac_vmw_lib_cfg"` = "icu-config"; then
3874- ZLIB_CPPFLAGS="`$ac_vmw_lib_cfg --cppflags`"
3875- ZLIB_LIBS="`$ac_vmw_lib_cfg --ldflags`"
3876- else
3877- ZLIB_CPPFLAGS="`$ac_vmw_lib_cfg --cflags`"
3878- ZLIB_LIBS="`$ac_vmw_lib_cfg --libs`"
3879- fi
3880- ac_vmw_have_lib=1
3881- fi
3882- fi
3883-
3884- # Finish by executing the user provided action. The call to "true" is needed
3885- # because the actions are optional, and we need something inside the block.
3886- if test $ac_vmw_have_lib -eq 1; then
3887-
3888-
3889- true
3890-
3891- else
3892- true
3893- as_fn_error $? "zlib library not found. Please configure without Unity (using --disable-unity) or install the zlib devel package." "$LINENO" 5
3894- fi
3895-
3896-
3897- # Check for gio 2.24.
3898-
3899-
3900- if test -z "gio-2.0"; then
3901- as_fn_error $? "'library' parameter is required.'" "$LINENO" 5
3902- fi
3903- if test -z "GIO"; then
3904- as_fn_error $? "'lvar' parameter is required.'" "$LINENO" 5
3905- fi
3906-
3907- ac_vmw_have_lib=0
3908- ac_vmw_have_lib_func=0
3909- ac_vmw_have_lib_header=0
3910- ac_vmw_custom_libs=
3911-
3912- #
3913- # First, try any user-defined CUSTOM_* flags.
3914- #
3915- if test -n "${CUSTOM_GIO_CPPFLAGS}" || test -n "${CUSTOM_GIO_LIBS}"; then
3916- ac_vmw_custom_libs="${CUSTOM_GIO_LIBS} -lgio-2.0"
3917- if test -n "gio/gio.h"; then
3918- ORIGINAL_CPPFLAGS="$CPPFLAGS"
3919- CPPFLAGS="${CUSTOM_GIO_CPPFLAGS} $CPPFLAGS"
3920-
3921- ac_fn_c_check_header_mongrel "$LINENO" "gio/gio.h" "ac_cv_header_gio_gio_h" "$ac_includes_default"
3922-if test "x$ac_cv_header_gio_gio_h" = x""yes; then :
3923- ac_vmw_have_lib_header=1
3924-fi
3925-
3926-
3927-
3928- CPPFLAGS="$ORIGINAL_CPPFLAGS"
3929- else
3930- ac_vmw_have_lib_header=1
3931- fi
3932-
3933- # Check a specific function in the library if requested.
3934- # If it hasn't, just pick a random function from libc, just to make
3935- # sure the linker can find the library being tested.
3936- if test $ac_vmw_have_lib_header -eq 1; then
3937- if test -n "g_desktop_app_info_get_filename"; then
3938- ac_vmw_function=g_desktop_app_info_get_filename
3939- else
3940- ac_vmw_function=strlen
3941- fi
3942- as_ac_Lib=`$as_echo "ac_cv_lib_gio-2.0_$ac_vmw_function" | $as_tr_sh`
3943-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_vmw_function in -lgio-2.0" >&5
3944-$as_echo_n "checking for $ac_vmw_function in -lgio-2.0... " >&6; }
3945-if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
3946- $as_echo_n "(cached) " >&6
3947-else
3948- ac_check_lib_save_LIBS=$LIBS
3949-LIBS="-lgio-2.0 $ac_vmw_custom_libs $LIBS"
3950-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
3951-/* end confdefs.h. */
3952-
3953-/* Override any GCC internal prototype to avoid an error.
3954- Use char because int might match the return type of a GCC
3955- builtin and then its argument prototype would still apply. */
3956-#ifdef __cplusplus
3957-extern "C"
3958-#endif
3959-char $ac_vmw_function ();
3960-int
3961-main ()
3962-{
3963-return $ac_vmw_function ();
3964- ;
3965- return 0;
3966-}
3967-_ACEOF
3968-if ac_fn_c_try_link "$LINENO"; then :
3969- eval "$as_ac_Lib=yes"
3970-else
3971- eval "$as_ac_Lib=no"
3972-fi
3973-rm -f core conftest.err conftest.$ac_objext \
3974- conftest$ac_exeext conftest.$ac_ext
3975-LIBS=$ac_check_lib_save_LIBS
3976-fi
3977-eval ac_res=\$$as_ac_Lib
3978- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
3979-$as_echo "$ac_res" >&6; }
3980-if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
3981- ac_vmw_have_lib_func=1
3982-fi
3983-
3984- fi
3985-
3986- if test $ac_vmw_have_lib_func -eq 1 && test $ac_vmw_have_lib_header -eq 1; then
3987- GIO_CPPFLAGS="${CUSTOM_GIO_CPPFLAGS}"
3988- GIO_LIBS="$ac_vmw_custom_libs"
3989- ac_vmw_have_lib=1
3990- fi
3991- fi
3992-
3993- # If that didn't work, try with pkg-config.
3994- if test $ac_vmw_have_lib -eq 0 && test "$HAVE_PKG_CONFIG" = "yes" && test -n "gio-unix-2.0"; then
3995- if test -n "2.24.0"; then
3996- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gio-unix-2.0 >= 2.24.0 (via pkg-config)" >&5
3997-$as_echo_n "checking for gio-unix-2.0 >= 2.24.0 (via pkg-config)... " >&6; }
3998- if pkg-config --exists 'gio-unix-2.0 >= 2.24.0'; then
3999- ac_vmw_have_lib=1
4000- fi
4001- else
4002- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gio-unix-2.0 (via pkg-config)" >&5
4003-$as_echo_n "checking for gio-unix-2.0 (via pkg-config)... " >&6; }
4004- if pkg-config --exists 'gio-unix-2.0'; then
4005- ac_vmw_have_lib=1
4006- fi
4007- fi
4008-
4009- if test $ac_vmw_have_lib -eq 1; then
4010- # Sometimes pkg-config might fail; for example, "pkg-config gtk+-2.0 --cflags"
4011- # fails on OpenSolaris B71. So be pessimistic.
4012- ac_vmw_cppflags="`pkg-config --cflags gio-unix-2.0`"
4013- ac_vmw_ret1=$?
4014- ac_vmw_libs="`pkg-config --libs gio-unix-2.0`"
4015- ac_vmw_ret2=$?
4016- if test $ac_vmw_ret1 -eq 0 && test $ac_vmw_ret2 -eq 0; then
4017- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
4018-$as_echo "yes" >&6; }
4019- GIO_CPPFLAGS="$ac_vmw_cppflags"
4020- GIO_LIBS="$ac_vmw_libs"
4021- else
4022- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4023-$as_echo "no" >&6; }
4024- fi
4025- else
4026- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4027-$as_echo "no" >&6; }
4028- fi
4029- fi
4030-
4031- # If we still haven't found the lib, try with the library's custom "config" script.
4032- # Before checking, flush the AC_PATH_PROG cached variable.
4033- unset ac_cv_path_ac_vmw_lib_cfg
4034- unset ac_vmw_lib_cfg
4035- if test $ac_vmw_have_lib -eq 0 && test -n ""; then
4036- # Extract the first word of "", so it can be a program name with args.
4037-set dummy ; ac_word=$2
4038-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4039-$as_echo_n "checking for $ac_word... " >&6; }
4040-if test "${ac_cv_path_ac_vmw_lib_cfg+set}" = set; then :
4041- $as_echo_n "(cached) " >&6
4042-else
4043- case $ac_vmw_lib_cfg in
4044- [\\/]* | ?:[\\/]*)
4045- ac_cv_path_ac_vmw_lib_cfg="$ac_vmw_lib_cfg" # Let the user override the test with a path.
4046- ;;
4047- *)
4048- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
4049-for as_dir in $PATH
4050-do
4051- IFS=$as_save_IFS
4052- test -z "$as_dir" && as_dir=.
4053- for ac_exec_ext in '' $ac_executable_extensions; do
4054- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4055- ac_cv_path_ac_vmw_lib_cfg="$as_dir/$ac_word$ac_exec_ext"
4056- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4057- break 2
4058- fi
4059-done
4060- done
4061-IFS=$as_save_IFS
4062-
4063- test -z "$ac_cv_path_ac_vmw_lib_cfg" && ac_cv_path_ac_vmw_lib_cfg="no"
4064- ;;
4065-esac
4066-fi
4067-ac_vmw_lib_cfg=$ac_cv_path_ac_vmw_lib_cfg
4068-if test -n "$ac_vmw_lib_cfg"; then
4069- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_vmw_lib_cfg" >&5
4070-$as_echo "$ac_vmw_lib_cfg" >&6; }
4071-else
4072- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4073-$as_echo "no" >&6; }
4074-fi
4075-
4076-
4077- if test "$ac_vmw_lib_cfg" != "no"; then
4078- # XXX: icu-config does not follow the "--cflags" and "--libs" convention,
4079- # so single it out here to avoid having to replicate all the rest of the
4080- # logic elsewhere.
4081- if test `basename "$ac_vmw_lib_cfg"` = "icu-config"; then
4082- GIO_CPPFLAGS="`$ac_vmw_lib_cfg --cppflags`"
4083- GIO_LIBS="`$ac_vmw_lib_cfg --ldflags`"
4084- else
4085- GIO_CPPFLAGS="`$ac_vmw_lib_cfg --cflags`"
4086- GIO_LIBS="`$ac_vmw_lib_cfg --libs`"
4087- fi
4088- ac_vmw_have_lib=1
4089- fi
4090- fi
4091-
4092- # Finish by executing the user provided action. The call to "true" is needed
4093- # because the actions are optional, and we need something inside the block.
4094- if test $ac_vmw_have_lib -eq 1; then
4095-
4096-
4097- true
4098-
4099- else
4100- true
4101- as_fn_error $? "GLib/GIO 2.24+ not found. Please configure without Unity (using --disable-unity) or upgrade the Glib devel package." "$LINENO" 5
4102- fi
4103-
4104- fi # End of library checks for Unity.
4105-
4106 # Check whether we have gtk+ 2.0.
4107 if test "$with_gtk2" != "no"; then
4108 # gdk_display_get_default_group (added in gtk+ 2.4.0) is function currently
4109@@ -19847,53 +18882,6 @@
4110 as_fn_error $? "Gtk+ 2.0 library not found or too old. Please configure without Gtk+ support (using --without-gtk2) or install the Gtk+ 2.0 devel package." "$LINENO" 5
4111 fi
4112
4113-
4114- # Unity requires libgdk_pixbuf_xlib, which most systems don't seem to
4115- # provide via "pkg-config --libs gtk+-2.0".
4116- if test "$enable_unity" != "no"; then
4117- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdk_pixbuf_xlib_init in -lgdk_pixbuf_xlib-2.0" >&5
4118-$as_echo_n "checking for gdk_pixbuf_xlib_init in -lgdk_pixbuf_xlib-2.0... " >&6; }
4119-if test "${ac_cv_lib_gdk_pixbuf_xlib_2_0_gdk_pixbuf_xlib_init+set}" = set; then :
4120- $as_echo_n "(cached) " >&6
4121-else
4122- ac_check_lib_save_LIBS=$LIBS
4123-LIBS="-lgdk_pixbuf_xlib-2.0 $GTK_LIBS $LIBS"
4124-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4125-/* end confdefs.h. */
4126-
4127-/* Override any GCC internal prototype to avoid an error.
4128- Use char because int might match the return type of a GCC
4129- builtin and then its argument prototype would still apply. */
4130-#ifdef __cplusplus
4131-extern "C"
4132-#endif
4133-char gdk_pixbuf_xlib_init ();
4134-int
4135-main ()
4136-{
4137-return gdk_pixbuf_xlib_init ();
4138- ;
4139- return 0;
4140-}
4141-_ACEOF
4142-if ac_fn_c_try_link "$LINENO"; then :
4143- ac_cv_lib_gdk_pixbuf_xlib_2_0_gdk_pixbuf_xlib_init=yes
4144-else
4145- ac_cv_lib_gdk_pixbuf_xlib_2_0_gdk_pixbuf_xlib_init=no
4146-fi
4147-rm -f core conftest.err conftest.$ac_objext \
4148- conftest$ac_exeext conftest.$ac_ext
4149-LIBS=$ac_check_lib_save_LIBS
4150-fi
4151-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gdk_pixbuf_xlib_2_0_gdk_pixbuf_xlib_init" >&5
4152-$as_echo "$ac_cv_lib_gdk_pixbuf_xlib_2_0_gdk_pixbuf_xlib_init" >&6; }
4153-if test "x$ac_cv_lib_gdk_pixbuf_xlib_2_0_gdk_pixbuf_xlib_init" = x""yes; then :
4154- GTK_LIBS="$GTK_LIBS -lgdk_pixbuf_xlib-2.0"
4155-else
4156- as_fn_error $? "gdk_pixbuf_xlib-2.0 not found. Make sure your Gtk 2.0 installation is sane, or configure without Unity (using --disable-unity)." "$LINENO" 5
4157-fi
4158-
4159- fi
4160 fi
4161
4162 #
4163@@ -21834,6 +20822,8 @@
4164
4165 # Easier to give all modules the ICU defines/includes...
4166 CPPFLAGS="$CPPFLAGS $ICU_CPPFLAGS"
4167+else
4168+ CPPFLAGS="$CPPFLAGS -DNO_ICU"
4169 fi
4170
4171 # Extract the first word of "rpcgen", so it can be a program name with args.
4172@@ -22090,6 +21080,50 @@
4173
4174 fi
4175
4176+bsdPrintfWrappers=no
4177+if test "$os" = "linux"; then
4178+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ecvt in -lc" >&5
4179+$as_echo_n "checking for ecvt in -lc... " >&6; }
4180+if test "${ac_cv_lib_c_ecvt+set}" = set; then :
4181+ $as_echo_n "(cached) " >&6
4182+else
4183+ ac_check_lib_save_LIBS=$LIBS
4184+LIBS="-lc $LIBS"
4185+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4186+/* end confdefs.h. */
4187+
4188+/* Override any GCC internal prototype to avoid an error.
4189+ Use char because int might match the return type of a GCC
4190+ builtin and then its argument prototype would still apply. */
4191+#ifdef __cplusplus
4192+extern "C"
4193+#endif
4194+char ecvt ();
4195+int
4196+main ()
4197+{
4198+return ecvt ();
4199+ ;
4200+ return 0;
4201+}
4202+_ACEOF
4203+if ac_fn_c_try_link "$LINENO"; then :
4204+ ac_cv_lib_c_ecvt=yes
4205+else
4206+ ac_cv_lib_c_ecvt=no
4207+fi
4208+rm -f core conftest.err conftest.$ac_objext \
4209+ conftest$ac_exeext conftest.$ac_ext
4210+LIBS=$ac_check_lib_save_LIBS
4211+fi
4212+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_ecvt" >&5
4213+$as_echo "$ac_cv_lib_c_ecvt" >&6; }
4214+if test "x$ac_cv_lib_c_ecvt" = x""yes; then :
4215+ bsdPrintfWrappers=yes
4216+fi
4217+
4218+fi
4219+
4220 ###
4221 ### Typdefs, structs, and compiler quarks.
4222 ###
4223@@ -22555,7 +21589,7 @@
4224 CFLAGS="$ORIGINAL_CFLAGS$NEW_CFLAG"
4225 done
4226 CPPFLAGS="$CPPFLAGS -DVMX86_TOOLS"
4227-CPPFLAGS="$CPPFLAGS -DNO_CORE_ICU"
4228+CPPFLAGS="$CPPFLAGS"
4229
4230 # -fvisibility is used by "core service" plugins, but not required.
4231 ORIGINAL_CFLAGS="$CFLAGS"
4232@@ -22584,6 +21618,34 @@
4233 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
4234 CFLAGS="$ORIGINAL_CFLAGS"
4235
4236+# Detect "unused-but-set-variable" gcc warning and disable it.
4237+ORIGINAL_CFLAGS="$CFLAGS"
4238+CFLAGS="$CFLAGS -Wno-unused-but-set-variable"
4239+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GCC flag -Wno-unused-but-set-variable" >&5
4240+$as_echo_n "checking for GCC flag -Wno-unused-but-set-variable... " >&6; }
4241+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4242+/* end confdefs.h. */
4243+
4244+int
4245+main ()
4246+{
4247+return 0;
4248+ ;
4249+ return 0;
4250+}
4251+_ACEOF
4252+if ac_fn_c_try_compile "$LINENO"; then :
4253+ ORIGINAL_CFLAGS="$ORIGINAL_CFLAGS -Wno-unused-but-set-variable";
4254+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
4255+$as_echo "yes" >&6; }
4256+else
4257+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4258+$as_echo "no" >&6; }
4259+fi
4260+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
4261+CFLAGS="$ORIGINAL_CFLAGS"
4262+
4263+
4264 BUILDDIR="`pwd`"
4265
4266 INCLUDE_DIR="`cd $srcdir; pwd`/lib/include"
4267@@ -22767,6 +21829,7 @@
4268 fi
4269
4270 if test "$os" = "freebsd"; then
4271+ LIBVMTOOLS_LIBADD="$LIBVMTOOLS_LIBADD -lkvm"
4272 MODULES_DIR="/boot/modules"
4273
4274 if test "$osVersion" -ge 302000; then
4275@@ -22924,14 +21987,6 @@
4276 HAVE_XCOMPOSITE_FALSE=
4277 fi
4278
4279- if test "$enable_unity" = "yes"; then
4280- ENABLE_UNITY_TRUE=
4281- ENABLE_UNITY_FALSE='#'
4282-else
4283- ENABLE_UNITY_TRUE='#'
4284- ENABLE_UNITY_FALSE=
4285-fi
4286-
4287 if test "$have_cunit" = "yes"; then
4288 ENABLE_TESTS_TRUE=
4289 ENABLE_TESTS_FALSE='#'
4290@@ -23004,6 +22059,14 @@
4291 USE_SLASH_PROC_FALSE=
4292 fi
4293
4294+ if test "$bsdPrintfWrappers" = "yes"; then
4295+ USE_PRINTF_WRAPPERS_TRUE=
4296+ USE_PRINTF_WRAPPERS_FALSE='#'
4297+else
4298+ USE_PRINTF_WRAPPERS_TRUE='#'
4299+ USE_PRINTF_WRAPPERS_FALSE=
4300+fi
4301+
4302
4303 if test "$have_xsm" != "yes"; then
4304 $as_echo "@%:@define NO_XSM 1" >>confdefs.h
4305@@ -23113,7 +22176,7 @@
4306 ###
4307 ### Create the Makefiles
4308 ###
4309-ac_config_files="$ac_config_files Makefile lib/Makefile lib/appUtil/Makefile lib/auth/Makefile lib/backdoor/Makefile lib/dict/Makefile lib/dynxdr/Makefile lib/err/Makefile lib/file/Makefile lib/foundryMsg/Makefile lib/guestApp/Makefile lib/guestRpc/Makefile lib/hgfs/Makefile lib/hgfsBd/Makefile lib/hgfsHelper/Makefile lib/hgfsServer/Makefile lib/hgfsServerManagerGuest/Makefile lib/hgfsServerPolicyGuest/Makefile lib/image/Makefile lib/impersonate/Makefile lib/lock/Makefile lib/message/Makefile lib/misc/Makefile lib/netUtil/Makefile lib/panic/Makefile lib/panicDefault/Makefile lib/printer/Makefile lib/procMgr/Makefile lib/raster/Makefile lib/region/Makefile lib/rpcChannel/Makefile lib/rpcIn/Makefile lib/rpcOut/Makefile lib/rpcVmx/Makefile lib/slashProc/Makefile lib/string/Makefile lib/stubs/Makefile lib/syncDriver/Makefile lib/system/Makefile lib/unicode/Makefile lib/user/Makefile lib/vmCheck/Makefile lib/vmSignal/Makefile lib/wiper/Makefile lib/xdg/Makefile services/Makefile services/vmtoolsd/Makefile services/plugins/Makefile services/plugins/desktopEvents/Makefile services/plugins/dndcp/Makefile services/plugins/guestInfo/Makefile services/plugins/guestInfo/getlib/Makefile services/plugins/hgfsServer/Makefile services/plugins/powerOps/Makefile services/plugins/resolutionSet/Makefile services/plugins/timeSync/Makefile services/plugins/unity/Makefile services/plugins/vix/Makefile services/plugins/vmbackup/Makefile vmware-user-suid-wrapper/Makefile toolbox/Makefile hgfsclient/Makefile hgfsmounter/Makefile checkvm/Makefile rpctool/Makefile libguestlib/Makefile libguestlib/vmguestlib.pc libhgfs/Makefile libvmtools/Makefile xferlogs/Makefile modules/Makefile vmblock-fuse/Makefile vmblockmounter/Makefile tests/Makefile tests/vmrpcdbg/Makefile tests/testDebug/Makefile tests/testPlugin/Makefile tests/testVmblock/Makefile docs/Makefile docs/api/Makefile scripts/Makefile scripts/build/rpcgen_wrapper.sh"
4310+ac_config_files="$ac_config_files Makefile lib/Makefile lib/appUtil/Makefile lib/auth/Makefile lib/backdoor/Makefile lib/dict/Makefile lib/dynxdr/Makefile lib/err/Makefile lib/file/Makefile lib/foundryMsg/Makefile lib/glibUtils/Makefile lib/guestApp/Makefile lib/guestRpc/Makefile lib/hgfs/Makefile lib/hgfsBd/Makefile lib/hgfsHelper/Makefile lib/hgfsServer/Makefile lib/hgfsServerManagerGuest/Makefile lib/hgfsServerPolicyGuest/Makefile lib/impersonate/Makefile lib/lock/Makefile lib/message/Makefile lib/misc/Makefile lib/netUtil/Makefile lib/panic/Makefile lib/panicDefault/Makefile lib/printer/Makefile lib/procMgr/Makefile lib/rpcChannel/Makefile lib/rpcIn/Makefile lib/rpcOut/Makefile lib/rpcVmx/Makefile lib/slashProc/Makefile lib/string/Makefile lib/stubs/Makefile lib/syncDriver/Makefile lib/system/Makefile lib/unicode/Makefile lib/user/Makefile lib/vmCheck/Makefile lib/vmSignal/Makefile lib/wiper/Makefile lib/xdg/Makefile services/Makefile services/vmtoolsd/Makefile services/plugins/Makefile services/plugins/desktopEvents/Makefile services/plugins/dndcp/Makefile services/plugins/guestInfo/Makefile services/plugins/guestInfo/getlib/Makefile services/plugins/hgfsServer/Makefile services/plugins/powerOps/Makefile services/plugins/resolutionSet/Makefile services/plugins/timeSync/Makefile services/plugins/vix/Makefile services/plugins/vmbackup/Makefile vmware-user-suid-wrapper/Makefile toolbox/Makefile hgfsclient/Makefile hgfsmounter/Makefile checkvm/Makefile rpctool/Makefile libguestlib/Makefile libguestlib/vmguestlib.pc libhgfs/Makefile libvmtools/Makefile xferlogs/Makefile modules/Makefile vmblock-fuse/Makefile vmblockmounter/Makefile tests/Makefile tests/vmrpcdbg/Makefile tests/testDebug/Makefile tests/testPlugin/Makefile tests/testVmblock/Makefile docs/Makefile docs/api/Makefile scripts/Makefile scripts/build/rpcgen_wrapper.sh"
4311
4312
4313 ###
4314@@ -23325,10 +22388,6 @@
4315 as_fn_error $? "conditional \"HAVE_XCOMPOSITE\" was never defined.
4316 Usually this means the macro was only invoked conditionally." "$LINENO" 5
4317 fi
4318-if test -z "${ENABLE_UNITY_TRUE}" && test -z "${ENABLE_UNITY_FALSE}"; then
4319- as_fn_error $? "conditional \"ENABLE_UNITY\" was never defined.
4320-Usually this means the macro was only invoked conditionally." "$LINENO" 5
4321-fi
4322 if test -z "${ENABLE_TESTS_TRUE}" && test -z "${ENABLE_TESTS_FALSE}"; then
4323 as_fn_error $? "conditional \"ENABLE_TESTS\" was never defined.
4324 Usually this means the macro was only invoked conditionally." "$LINENO" 5
4325@@ -23365,6 +22424,10 @@
4326 as_fn_error $? "conditional \"USE_SLASH_PROC\" was never defined.
4327 Usually this means the macro was only invoked conditionally." "$LINENO" 5
4328 fi
4329+if test -z "${USE_PRINTF_WRAPPERS_TRUE}" && test -z "${USE_PRINTF_WRAPPERS_FALSE}"; then
4330+ as_fn_error $? "conditional \"USE_PRINTF_WRAPPERS\" was never defined.
4331+Usually this means the macro was only invoked conditionally." "$LINENO" 5
4332+fi
4333
4334 : ${CONFIG_STATUS=./config.status}
4335 ac_write_fail=0
4336@@ -23773,7 +22836,7 @@
4337 # report actual input values of CONFIG_FILES etc. instead of their
4338 # values after options handling.
4339 ac_log="
4340-This file was extended by open-vm-tools $as_me 2011.07.19, which was
4341+This file was extended by open-vm-tools $as_me 2011.12.20, which was
4342 generated by GNU Autoconf 2.67. Invocation command line was
4343
4344 CONFIG_FILES = $CONFIG_FILES
4345@@ -23830,7 +22893,7 @@
4346 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
4347 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
4348 ac_cs_version="\\
4349-open-vm-tools config.status 2011.07.19
4350+open-vm-tools config.status 2011.12.20
4351 configured by $0, generated by GNU Autoconf 2.67,
4352 with options \\"\$ac_cs_config\\"
4353
4354@@ -24311,6 +23374,7 @@
4355 "lib/err/Makefile") CONFIG_FILES="$CONFIG_FILES lib/err/Makefile" ;;
4356 "lib/file/Makefile") CONFIG_FILES="$CONFIG_FILES lib/file/Makefile" ;;
4357 "lib/foundryMsg/Makefile") CONFIG_FILES="$CONFIG_FILES lib/foundryMsg/Makefile" ;;
4358+ "lib/glibUtils/Makefile") CONFIG_FILES="$CONFIG_FILES lib/glibUtils/Makefile" ;;
4359 "lib/guestApp/Makefile") CONFIG_FILES="$CONFIG_FILES lib/guestApp/Makefile" ;;
4360 "lib/guestRpc/Makefile") CONFIG_FILES="$CONFIG_FILES lib/guestRpc/Makefile" ;;
4361 "lib/hgfs/Makefile") CONFIG_FILES="$CONFIG_FILES lib/hgfs/Makefile" ;;
4362@@ -24319,7 +23383,6 @@
4363 "lib/hgfsServer/Makefile") CONFIG_FILES="$CONFIG_FILES lib/hgfsServer/Makefile" ;;
4364 "lib/hgfsServerManagerGuest/Makefile") CONFIG_FILES="$CONFIG_FILES lib/hgfsServerManagerGuest/Makefile" ;;
4365 "lib/hgfsServerPolicyGuest/Makefile") CONFIG_FILES="$CONFIG_FILES lib/hgfsServerPolicyGuest/Makefile" ;;
4366- "lib/image/Makefile") CONFIG_FILES="$CONFIG_FILES lib/image/Makefile" ;;
4367 "lib/impersonate/Makefile") CONFIG_FILES="$CONFIG_FILES lib/impersonate/Makefile" ;;
4368 "lib/lock/Makefile") CONFIG_FILES="$CONFIG_FILES lib/lock/Makefile" ;;
4369 "lib/message/Makefile") CONFIG_FILES="$CONFIG_FILES lib/message/Makefile" ;;
4370@@ -24329,8 +23392,6 @@
4371 "lib/panicDefault/Makefile") CONFIG_FILES="$CONFIG_FILES lib/panicDefault/Makefile" ;;
4372 "lib/printer/Makefile") CONFIG_FILES="$CONFIG_FILES lib/printer/Makefile" ;;
4373 "lib/procMgr/Makefile") CONFIG_FILES="$CONFIG_FILES lib/procMgr/Makefile" ;;
4374- "lib/raster/Makefile") CONFIG_FILES="$CONFIG_FILES lib/raster/Makefile" ;;
4375- "lib/region/Makefile") CONFIG_FILES="$CONFIG_FILES lib/region/Makefile" ;;
4376 "lib/rpcChannel/Makefile") CONFIG_FILES="$CONFIG_FILES lib/rpcChannel/Makefile" ;;
4377 "lib/rpcIn/Makefile") CONFIG_FILES="$CONFIG_FILES lib/rpcIn/Makefile" ;;
4378 "lib/rpcOut/Makefile") CONFIG_FILES="$CONFIG_FILES lib/rpcOut/Makefile" ;;
4379@@ -24357,7 +23418,6 @@
4380 "services/plugins/powerOps/Makefile") CONFIG_FILES="$CONFIG_FILES services/plugins/powerOps/Makefile" ;;
4381 "services/plugins/resolutionSet/Makefile") CONFIG_FILES="$CONFIG_FILES services/plugins/resolutionSet/Makefile" ;;
4382 "services/plugins/timeSync/Makefile") CONFIG_FILES="$CONFIG_FILES services/plugins/timeSync/Makefile" ;;
4383- "services/plugins/unity/Makefile") CONFIG_FILES="$CONFIG_FILES services/plugins/unity/Makefile" ;;
4384 "services/plugins/vix/Makefile") CONFIG_FILES="$CONFIG_FILES services/plugins/vix/Makefile" ;;
4385 "services/plugins/vmbackup/Makefile") CONFIG_FILES="$CONFIG_FILES services/plugins/vmbackup/Makefile" ;;
4386 "vmware-user-suid-wrapper/Makefile") CONFIG_FILES="$CONFIG_FILES vmware-user-suid-wrapper/Makefile" ;;
4387
4388=== modified file 'autom4te.cache/traces.0'
4389--- autom4te.cache/traces.0 2011-07-22 16:41:03 +0000
4390+++ autom4te.cache/traces.0 2012-01-24 04:56:25 +0000
4391@@ -2330,61 +2330,61 @@
4392 m4trace:configure.ac:74: -1- m4_pattern_allow([^host_cpu$])
4393 m4trace:configure.ac:74: -1- m4_pattern_allow([^host_vendor$])
4394 m4trace:configure.ac:74: -1- m4_pattern_allow([^host_os$])
4395-m4trace:configure.ac:223: -1- AM_INIT_AUTOMAKE
4396-m4trace:configure.ac:223: -1- m4_pattern_allow([^AM_[A-Z]+FLAGS$])
4397-m4trace:configure.ac:223: -1- AM_SET_CURRENT_AUTOMAKE_VERSION
4398-m4trace:configure.ac:223: -1- AM_AUTOMAKE_VERSION([1.11.1])
4399-m4trace:configure.ac:223: -1- _AM_AUTOCONF_VERSION([2.67])
4400-m4trace:configure.ac:223: -1- m4_pattern_allow([^INSTALL_PROGRAM$])
4401-m4trace:configure.ac:223: -1- m4_pattern_allow([^INSTALL_SCRIPT$])
4402-m4trace:configure.ac:223: -1- m4_pattern_allow([^INSTALL_DATA$])
4403-m4trace:configure.ac:223: -1- m4_pattern_allow([^am__isrc$])
4404-m4trace:configure.ac:223: -1- _AM_SUBST_NOTMAKE([am__isrc])
4405-m4trace:configure.ac:223: -1- m4_pattern_allow([^CYGPATH_W$])
4406-m4trace:configure.ac:223: -1- _AM_SET_OPTIONS([])
4407-m4trace:configure.ac:223: -1- m4_pattern_allow([^PACKAGE$])
4408-m4trace:configure.ac:223: -1- m4_pattern_allow([^VERSION$])
4409-m4trace:configure.ac:223: -1- _AM_IF_OPTION([no-define], [], [AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
4410+m4trace:configure.ac:210: -1- AM_INIT_AUTOMAKE
4411+m4trace:configure.ac:210: -1- m4_pattern_allow([^AM_[A-Z]+FLAGS$])
4412+m4trace:configure.ac:210: -1- AM_SET_CURRENT_AUTOMAKE_VERSION
4413+m4trace:configure.ac:210: -1- AM_AUTOMAKE_VERSION([1.11.1])
4414+m4trace:configure.ac:210: -1- _AM_AUTOCONF_VERSION([2.67])
4415+m4trace:configure.ac:210: -1- m4_pattern_allow([^INSTALL_PROGRAM$])
4416+m4trace:configure.ac:210: -1- m4_pattern_allow([^INSTALL_SCRIPT$])
4417+m4trace:configure.ac:210: -1- m4_pattern_allow([^INSTALL_DATA$])
4418+m4trace:configure.ac:210: -1- m4_pattern_allow([^am__isrc$])
4419+m4trace:configure.ac:210: -1- _AM_SUBST_NOTMAKE([am__isrc])
4420+m4trace:configure.ac:210: -1- m4_pattern_allow([^CYGPATH_W$])
4421+m4trace:configure.ac:210: -1- _AM_SET_OPTIONS([])
4422+m4trace:configure.ac:210: -1- m4_pattern_allow([^PACKAGE$])
4423+m4trace:configure.ac:210: -1- m4_pattern_allow([^VERSION$])
4424+m4trace:configure.ac:210: -1- _AM_IF_OPTION([no-define], [], [AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
4425 AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])
4426-m4trace:configure.ac:223: -2- _AM_MANGLE_OPTION([no-define])
4427-m4trace:configure.ac:223: -1- m4_pattern_allow([^PACKAGE$])
4428-m4trace:configure.ac:223: -1- m4_pattern_allow([^VERSION$])
4429-m4trace:configure.ac:223: -1- AM_SANITY_CHECK
4430-m4trace:configure.ac:223: -1- AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}])
4431-m4trace:configure.ac:223: -1- AM_MISSING_HAS_RUN
4432-m4trace:configure.ac:223: -1- AM_AUX_DIR_EXPAND
4433-m4trace:configure.ac:223: -1- m4_pattern_allow([^ACLOCAL$])
4434-m4trace:configure.ac:223: -1- AM_MISSING_PROG([AUTOCONF], [autoconf])
4435-m4trace:configure.ac:223: -1- m4_pattern_allow([^AUTOCONF$])
4436-m4trace:configure.ac:223: -1- AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}])
4437-m4trace:configure.ac:223: -1- m4_pattern_allow([^AUTOMAKE$])
4438-m4trace:configure.ac:223: -1- AM_MISSING_PROG([AUTOHEADER], [autoheader])
4439-m4trace:configure.ac:223: -1- m4_pattern_allow([^AUTOHEADER$])
4440-m4trace:configure.ac:223: -1- AM_MISSING_PROG([MAKEINFO], [makeinfo])
4441-m4trace:configure.ac:223: -1- m4_pattern_allow([^MAKEINFO$])
4442-m4trace:configure.ac:223: -1- AM_PROG_INSTALL_SH
4443-m4trace:configure.ac:223: -1- m4_pattern_allow([^install_sh$])
4444-m4trace:configure.ac:223: -1- AM_PROG_INSTALL_STRIP
4445-m4trace:configure.ac:223: -1- m4_pattern_allow([^STRIP$])
4446-m4trace:configure.ac:223: -1- m4_pattern_allow([^INSTALL_STRIP_PROGRAM$])
4447-m4trace:configure.ac:223: -1- AM_PROG_MKDIR_P
4448-m4trace:configure.ac:223: -1- m4_pattern_allow([^MKDIR_P$])
4449-m4trace:configure.ac:223: -1- m4_pattern_allow([^mkdir_p$])
4450-m4trace:configure.ac:223: -1- m4_pattern_allow([^AWK$])
4451-m4trace:configure.ac:223: -1- m4_pattern_allow([^SET_MAKE$])
4452-m4trace:configure.ac:223: -1- AM_SET_LEADING_DOT
4453-m4trace:configure.ac:223: -1- m4_pattern_allow([^am__leading_dot$])
4454-m4trace:configure.ac:223: -1- _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
4455+m4trace:configure.ac:210: -2- _AM_MANGLE_OPTION([no-define])
4456+m4trace:configure.ac:210: -1- m4_pattern_allow([^PACKAGE$])
4457+m4trace:configure.ac:210: -1- m4_pattern_allow([^VERSION$])
4458+m4trace:configure.ac:210: -1- AM_SANITY_CHECK
4459+m4trace:configure.ac:210: -1- AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}])
4460+m4trace:configure.ac:210: -1- AM_MISSING_HAS_RUN
4461+m4trace:configure.ac:210: -1- AM_AUX_DIR_EXPAND
4462+m4trace:configure.ac:210: -1- m4_pattern_allow([^ACLOCAL$])
4463+m4trace:configure.ac:210: -1- AM_MISSING_PROG([AUTOCONF], [autoconf])
4464+m4trace:configure.ac:210: -1- m4_pattern_allow([^AUTOCONF$])
4465+m4trace:configure.ac:210: -1- AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}])
4466+m4trace:configure.ac:210: -1- m4_pattern_allow([^AUTOMAKE$])
4467+m4trace:configure.ac:210: -1- AM_MISSING_PROG([AUTOHEADER], [autoheader])
4468+m4trace:configure.ac:210: -1- m4_pattern_allow([^AUTOHEADER$])
4469+m4trace:configure.ac:210: -1- AM_MISSING_PROG([MAKEINFO], [makeinfo])
4470+m4trace:configure.ac:210: -1- m4_pattern_allow([^MAKEINFO$])
4471+m4trace:configure.ac:210: -1- AM_PROG_INSTALL_SH
4472+m4trace:configure.ac:210: -1- m4_pattern_allow([^install_sh$])
4473+m4trace:configure.ac:210: -1- AM_PROG_INSTALL_STRIP
4474+m4trace:configure.ac:210: -1- m4_pattern_allow([^STRIP$])
4475+m4trace:configure.ac:210: -1- m4_pattern_allow([^INSTALL_STRIP_PROGRAM$])
4476+m4trace:configure.ac:210: -1- AM_PROG_MKDIR_P
4477+m4trace:configure.ac:210: -1- m4_pattern_allow([^MKDIR_P$])
4478+m4trace:configure.ac:210: -1- m4_pattern_allow([^mkdir_p$])
4479+m4trace:configure.ac:210: -1- m4_pattern_allow([^AWK$])
4480+m4trace:configure.ac:210: -1- m4_pattern_allow([^SET_MAKE$])
4481+m4trace:configure.ac:210: -1- AM_SET_LEADING_DOT
4482+m4trace:configure.ac:210: -1- m4_pattern_allow([^am__leading_dot$])
4483+m4trace:configure.ac:210: -1- _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
4484 [_AM_PROG_TAR([v7])])])
4485-m4trace:configure.ac:223: -2- _AM_MANGLE_OPTION([tar-ustar])
4486-m4trace:configure.ac:223: -1- _AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], [_AM_PROG_TAR([v7])])
4487-m4trace:configure.ac:223: -2- _AM_MANGLE_OPTION([tar-pax])
4488-m4trace:configure.ac:223: -1- _AM_PROG_TAR([v7])
4489-m4trace:configure.ac:223: -1- AM_MISSING_PROG([AMTAR], [tar])
4490-m4trace:configure.ac:223: -1- m4_pattern_allow([^AMTAR$])
4491-m4trace:configure.ac:223: -1- m4_pattern_allow([^am__tar$])
4492-m4trace:configure.ac:223: -1- m4_pattern_allow([^am__untar$])
4493-m4trace:configure.ac:223: -1- _AM_IF_OPTION([no-dependencies], [], [AC_PROVIDE_IFELSE([AC_PROG_CC],
4494+m4trace:configure.ac:210: -2- _AM_MANGLE_OPTION([tar-ustar])
4495+m4trace:configure.ac:210: -1- _AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], [_AM_PROG_TAR([v7])])
4496+m4trace:configure.ac:210: -2- _AM_MANGLE_OPTION([tar-pax])
4497+m4trace:configure.ac:210: -1- _AM_PROG_TAR([v7])
4498+m4trace:configure.ac:210: -1- AM_MISSING_PROG([AMTAR], [tar])
4499+m4trace:configure.ac:210: -1- m4_pattern_allow([^AMTAR$])
4500+m4trace:configure.ac:210: -1- m4_pattern_allow([^am__tar$])
4501+m4trace:configure.ac:210: -1- m4_pattern_allow([^am__untar$])
4502+m4trace:configure.ac:210: -1- _AM_IF_OPTION([no-dependencies], [], [AC_PROVIDE_IFELSE([AC_PROG_CC],
4503 [_AM_DEPENDENCIES(CC)],
4504 [define([AC_PROG_CC],
4505 defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
4506@@ -2397,472 +2397,456 @@
4507 [define([AC_PROG_OBJC],
4508 defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
4509 ])
4510-m4trace:configure.ac:223: -2- _AM_MANGLE_OPTION([no-dependencies])
4511-m4trace:configure.ac:223: -1- _AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])
4512-m4trace:configure.ac:223: -2- _AM_MANGLE_OPTION([silent-rules])
4513-m4trace:configure.ac:246: -1- m4_pattern_allow([^CC$])
4514-m4trace:configure.ac:246: -1- m4_pattern_allow([^CFLAGS$])
4515-m4trace:configure.ac:246: -1- m4_pattern_allow([^LDFLAGS$])
4516-m4trace:configure.ac:246: -1- m4_pattern_allow([^LIBS$])
4517-m4trace:configure.ac:246: -1- m4_pattern_allow([^CPPFLAGS$])
4518-m4trace:configure.ac:246: -1- m4_pattern_allow([^CC$])
4519-m4trace:configure.ac:246: -1- m4_pattern_allow([^CC$])
4520-m4trace:configure.ac:246: -1- m4_pattern_allow([^CC$])
4521-m4trace:configure.ac:246: -1- m4_pattern_allow([^CC$])
4522-m4trace:configure.ac:246: -1- m4_pattern_allow([^ac_ct_CC$])
4523-m4trace:configure.ac:246: -1- m4_pattern_allow([^EXEEXT$])
4524-m4trace:configure.ac:246: -1- m4_pattern_allow([^OBJEXT$])
4525-m4trace:configure.ac:246: -1- _AM_DEPENDENCIES([CC])
4526-m4trace:configure.ac:246: -1- AM_SET_DEPDIR
4527-m4trace:configure.ac:246: -1- m4_pattern_allow([^DEPDIR$])
4528-m4trace:configure.ac:246: -1- AM_OUTPUT_DEPENDENCY_COMMANDS
4529-m4trace:configure.ac:246: -1- AM_MAKE_INCLUDE
4530-m4trace:configure.ac:246: -1- m4_pattern_allow([^am__include$])
4531-m4trace:configure.ac:246: -1- m4_pattern_allow([^am__quote$])
4532-m4trace:configure.ac:246: -1- AM_DEP_TRACK
4533-m4trace:configure.ac:246: -1- AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
4534-m4trace:configure.ac:246: -1- m4_pattern_allow([^AMDEP_TRUE$])
4535-m4trace:configure.ac:246: -1- m4_pattern_allow([^AMDEP_FALSE$])
4536-m4trace:configure.ac:246: -1- _AM_SUBST_NOTMAKE([AMDEP_TRUE])
4537-m4trace:configure.ac:246: -1- _AM_SUBST_NOTMAKE([AMDEP_FALSE])
4538-m4trace:configure.ac:246: -1- m4_pattern_allow([^AMDEPBACKSLASH$])
4539-m4trace:configure.ac:246: -1- _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])
4540-m4trace:configure.ac:246: -1- m4_pattern_allow([^CCDEPMODE$])
4541-m4trace:configure.ac:246: -1- AM_CONDITIONAL([am__fastdepCC], [
4542- test "x$enable_dependency_tracking" != xno \
4543- && test "$am_cv_CC_dependencies_compiler_type" = gcc3])
4544-m4trace:configure.ac:246: -1- m4_pattern_allow([^am__fastdepCC_TRUE$])
4545-m4trace:configure.ac:246: -1- m4_pattern_allow([^am__fastdepCC_FALSE$])
4546-m4trace:configure.ac:246: -1- _AM_SUBST_NOTMAKE([am__fastdepCC_TRUE])
4547-m4trace:configure.ac:246: -1- _AM_SUBST_NOTMAKE([am__fastdepCC_FALSE])
4548-m4trace:configure.ac:246: -1- m4_pattern_allow([^CPP$])
4549-m4trace:configure.ac:246: -1- m4_pattern_allow([^CPPFLAGS$])
4550-m4trace:configure.ac:246: -1- m4_pattern_allow([^CPP$])
4551-m4trace:configure.ac:247: -1- m4_pattern_allow([^CC$])
4552-m4trace:configure.ac:247: -1- m4_pattern_allow([^CFLAGS$])
4553-m4trace:configure.ac:247: -1- m4_pattern_allow([^LDFLAGS$])
4554-m4trace:configure.ac:247: -1- m4_pattern_allow([^LIBS$])
4555-m4trace:configure.ac:247: -1- m4_pattern_allow([^CPPFLAGS$])
4556-m4trace:configure.ac:247: -1- m4_pattern_allow([^CC$])
4557-m4trace:configure.ac:247: -1- m4_pattern_allow([^CC$])
4558-m4trace:configure.ac:247: -1- m4_pattern_allow([^CC$])
4559-m4trace:configure.ac:247: -1- m4_pattern_allow([^CC$])
4560-m4trace:configure.ac:247: -1- m4_pattern_allow([^ac_ct_CC$])
4561-m4trace:configure.ac:247: -1- _AM_DEPENDENCIES([CC])
4562-m4trace:configure.ac:247: -1- m4_pattern_allow([^CCDEPMODE$])
4563-m4trace:configure.ac:247: -1- AM_CONDITIONAL([am__fastdepCC], [
4564- test "x$enable_dependency_tracking" != xno \
4565- && test "$am_cv_CC_dependencies_compiler_type" = gcc3])
4566-m4trace:configure.ac:247: -1- m4_pattern_allow([^am__fastdepCC_TRUE$])
4567-m4trace:configure.ac:247: -1- m4_pattern_allow([^am__fastdepCC_FALSE$])
4568-m4trace:configure.ac:247: -1- _AM_SUBST_NOTMAKE([am__fastdepCC_TRUE])
4569-m4trace:configure.ac:247: -1- _AM_SUBST_NOTMAKE([am__fastdepCC_FALSE])
4570-m4trace:configure.ac:251: -1- m4_pattern_allow([^CXX$])
4571-m4trace:configure.ac:251: -1- m4_pattern_allow([^CXXFLAGS$])
4572-m4trace:configure.ac:251: -1- m4_pattern_allow([^LDFLAGS$])
4573-m4trace:configure.ac:251: -1- m4_pattern_allow([^LIBS$])
4574-m4trace:configure.ac:251: -1- m4_pattern_allow([^CPPFLAGS$])
4575-m4trace:configure.ac:251: -1- m4_pattern_allow([^CXX$])
4576-m4trace:configure.ac:251: -1- m4_pattern_allow([^ac_ct_CXX$])
4577-m4trace:configure.ac:251: -1- _AM_DEPENDENCIES([CXX])
4578-m4trace:configure.ac:251: -1- m4_pattern_allow([^CXXDEPMODE$])
4579-m4trace:configure.ac:251: -1- AM_CONDITIONAL([am__fastdepCXX], [
4580+m4trace:configure.ac:210: -2- _AM_MANGLE_OPTION([no-dependencies])
4581+m4trace:configure.ac:210: -1- _AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])
4582+m4trace:configure.ac:210: -2- _AM_MANGLE_OPTION([silent-rules])
4583+m4trace:configure.ac:233: -1- m4_pattern_allow([^CC$])
4584+m4trace:configure.ac:233: -1- m4_pattern_allow([^CFLAGS$])
4585+m4trace:configure.ac:233: -1- m4_pattern_allow([^LDFLAGS$])
4586+m4trace:configure.ac:233: -1- m4_pattern_allow([^LIBS$])
4587+m4trace:configure.ac:233: -1- m4_pattern_allow([^CPPFLAGS$])
4588+m4trace:configure.ac:233: -1- m4_pattern_allow([^CC$])
4589+m4trace:configure.ac:233: -1- m4_pattern_allow([^CC$])
4590+m4trace:configure.ac:233: -1- m4_pattern_allow([^CC$])
4591+m4trace:configure.ac:233: -1- m4_pattern_allow([^CC$])
4592+m4trace:configure.ac:233: -1- m4_pattern_allow([^ac_ct_CC$])
4593+m4trace:configure.ac:233: -1- m4_pattern_allow([^EXEEXT$])
4594+m4trace:configure.ac:233: -1- m4_pattern_allow([^OBJEXT$])
4595+m4trace:configure.ac:233: -1- _AM_DEPENDENCIES([CC])
4596+m4trace:configure.ac:233: -1- AM_SET_DEPDIR
4597+m4trace:configure.ac:233: -1- m4_pattern_allow([^DEPDIR$])
4598+m4trace:configure.ac:233: -1- AM_OUTPUT_DEPENDENCY_COMMANDS
4599+m4trace:configure.ac:233: -1- AM_MAKE_INCLUDE
4600+m4trace:configure.ac:233: -1- m4_pattern_allow([^am__include$])
4601+m4trace:configure.ac:233: -1- m4_pattern_allow([^am__quote$])
4602+m4trace:configure.ac:233: -1- AM_DEP_TRACK
4603+m4trace:configure.ac:233: -1- AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
4604+m4trace:configure.ac:233: -1- m4_pattern_allow([^AMDEP_TRUE$])
4605+m4trace:configure.ac:233: -1- m4_pattern_allow([^AMDEP_FALSE$])
4606+m4trace:configure.ac:233: -1- _AM_SUBST_NOTMAKE([AMDEP_TRUE])
4607+m4trace:configure.ac:233: -1- _AM_SUBST_NOTMAKE([AMDEP_FALSE])
4608+m4trace:configure.ac:233: -1- m4_pattern_allow([^AMDEPBACKSLASH$])
4609+m4trace:configure.ac:233: -1- _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])
4610+m4trace:configure.ac:233: -1- m4_pattern_allow([^CCDEPMODE$])
4611+m4trace:configure.ac:233: -1- AM_CONDITIONAL([am__fastdepCC], [
4612+ test "x$enable_dependency_tracking" != xno \
4613+ && test "$am_cv_CC_dependencies_compiler_type" = gcc3])
4614+m4trace:configure.ac:233: -1- m4_pattern_allow([^am__fastdepCC_TRUE$])
4615+m4trace:configure.ac:233: -1- m4_pattern_allow([^am__fastdepCC_FALSE$])
4616+m4trace:configure.ac:233: -1- _AM_SUBST_NOTMAKE([am__fastdepCC_TRUE])
4617+m4trace:configure.ac:233: -1- _AM_SUBST_NOTMAKE([am__fastdepCC_FALSE])
4618+m4trace:configure.ac:233: -1- m4_pattern_allow([^CPP$])
4619+m4trace:configure.ac:233: -1- m4_pattern_allow([^CPPFLAGS$])
4620+m4trace:configure.ac:233: -1- m4_pattern_allow([^CPP$])
4621+m4trace:configure.ac:234: -1- m4_pattern_allow([^CC$])
4622+m4trace:configure.ac:234: -1- m4_pattern_allow([^CFLAGS$])
4623+m4trace:configure.ac:234: -1- m4_pattern_allow([^LDFLAGS$])
4624+m4trace:configure.ac:234: -1- m4_pattern_allow([^LIBS$])
4625+m4trace:configure.ac:234: -1- m4_pattern_allow([^CPPFLAGS$])
4626+m4trace:configure.ac:234: -1- m4_pattern_allow([^CC$])
4627+m4trace:configure.ac:234: -1- m4_pattern_allow([^CC$])
4628+m4trace:configure.ac:234: -1- m4_pattern_allow([^CC$])
4629+m4trace:configure.ac:234: -1- m4_pattern_allow([^CC$])
4630+m4trace:configure.ac:234: -1- m4_pattern_allow([^ac_ct_CC$])
4631+m4trace:configure.ac:234: -1- _AM_DEPENDENCIES([CC])
4632+m4trace:configure.ac:234: -1- m4_pattern_allow([^CCDEPMODE$])
4633+m4trace:configure.ac:234: -1- AM_CONDITIONAL([am__fastdepCC], [
4634+ test "x$enable_dependency_tracking" != xno \
4635+ && test "$am_cv_CC_dependencies_compiler_type" = gcc3])
4636+m4trace:configure.ac:234: -1- m4_pattern_allow([^am__fastdepCC_TRUE$])
4637+m4trace:configure.ac:234: -1- m4_pattern_allow([^am__fastdepCC_FALSE$])
4638+m4trace:configure.ac:234: -1- _AM_SUBST_NOTMAKE([am__fastdepCC_TRUE])
4639+m4trace:configure.ac:234: -1- _AM_SUBST_NOTMAKE([am__fastdepCC_FALSE])
4640+m4trace:configure.ac:238: -1- m4_pattern_allow([^CXX$])
4641+m4trace:configure.ac:238: -1- m4_pattern_allow([^CXXFLAGS$])
4642+m4trace:configure.ac:238: -1- m4_pattern_allow([^LDFLAGS$])
4643+m4trace:configure.ac:238: -1- m4_pattern_allow([^LIBS$])
4644+m4trace:configure.ac:238: -1- m4_pattern_allow([^CPPFLAGS$])
4645+m4trace:configure.ac:238: -1- m4_pattern_allow([^CXX$])
4646+m4trace:configure.ac:238: -1- m4_pattern_allow([^ac_ct_CXX$])
4647+m4trace:configure.ac:238: -1- _AM_DEPENDENCIES([CXX])
4648+m4trace:configure.ac:238: -1- m4_pattern_allow([^CXXDEPMODE$])
4649+m4trace:configure.ac:238: -1- AM_CONDITIONAL([am__fastdepCXX], [
4650 test "x$enable_dependency_tracking" != xno \
4651 && test "$am_cv_CXX_dependencies_compiler_type" = gcc3])
4652-m4trace:configure.ac:251: -1- m4_pattern_allow([^am__fastdepCXX_TRUE$])
4653-m4trace:configure.ac:251: -1- m4_pattern_allow([^am__fastdepCXX_FALSE$])
4654-m4trace:configure.ac:251: -1- _AM_SUBST_NOTMAKE([am__fastdepCXX_TRUE])
4655-m4trace:configure.ac:251: -1- _AM_SUBST_NOTMAKE([am__fastdepCXX_FALSE])
4656-m4trace:configure.ac:256: -1- AM_PROG_CC_C_O
4657-m4trace:configure.ac:256: -1- m4_pattern_allow([^NO_MINUS_C_MINUS_O$])
4658-m4trace:configure.ac:260: -1- m4_pattern_allow([^SED$])
4659-m4trace:configure.ac:261: -1- m4_pattern_allow([^LN_S$])
4660-m4trace:configure.ac:265: -1- AC_PROG_LIBTOOL
4661-m4trace:configure.ac:265: -1- _m4_warn([obsolete], [The macro `AC_PROG_LIBTOOL' is obsolete.
4662+m4trace:configure.ac:238: -1- m4_pattern_allow([^am__fastdepCXX_TRUE$])
4663+m4trace:configure.ac:238: -1- m4_pattern_allow([^am__fastdepCXX_FALSE$])
4664+m4trace:configure.ac:238: -1- _AM_SUBST_NOTMAKE([am__fastdepCXX_TRUE])
4665+m4trace:configure.ac:238: -1- _AM_SUBST_NOTMAKE([am__fastdepCXX_FALSE])
4666+m4trace:configure.ac:243: -1- AM_PROG_CC_C_O
4667+m4trace:configure.ac:243: -1- m4_pattern_allow([^NO_MINUS_C_MINUS_O$])
4668+m4trace:configure.ac:247: -1- m4_pattern_allow([^SED$])
4669+m4trace:configure.ac:248: -1- m4_pattern_allow([^LN_S$])
4670+m4trace:configure.ac:252: -1- AC_PROG_LIBTOOL
4671+m4trace:configure.ac:252: -1- _m4_warn([obsolete], [The macro `AC_PROG_LIBTOOL' is obsolete.
4672 You should run autoupdate.], [/usr/share/aclocal/libtool.m4:102: AC_PROG_LIBTOOL is expanded from...
4673-configure.ac:265: the top level])
4674-m4trace:configure.ac:265: -1- LT_INIT
4675-m4trace:configure.ac:265: -1- m4_pattern_forbid([^_?LT_[A-Z_]+$])
4676-m4trace:configure.ac:265: -1- m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])
4677-m4trace:configure.ac:265: -1- LTOPTIONS_VERSION
4678-m4trace:configure.ac:265: -1- LTSUGAR_VERSION
4679-m4trace:configure.ac:265: -1- LTVERSION_VERSION
4680-m4trace:configure.ac:265: -1- LTOBSOLETE_VERSION
4681-m4trace:configure.ac:265: -1- _LT_PROG_LTMAIN
4682-m4trace:configure.ac:265: -1- m4_pattern_allow([^LIBTOOL$])
4683-m4trace:configure.ac:265: -1- LT_PATH_LD
4684-m4trace:configure.ac:265: -1- m4_pattern_allow([^SED$])
4685-m4trace:configure.ac:265: -1- AC_PROG_EGREP
4686-m4trace:configure.ac:265: -1- m4_pattern_allow([^GREP$])
4687-m4trace:configure.ac:265: -1- m4_pattern_allow([^EGREP$])
4688-m4trace:configure.ac:265: -1- m4_pattern_allow([^FGREP$])
4689-m4trace:configure.ac:265: -1- m4_pattern_allow([^GREP$])
4690-m4trace:configure.ac:265: -1- m4_pattern_allow([^LD$])
4691-m4trace:configure.ac:265: -1- LT_PATH_NM
4692-m4trace:configure.ac:265: -1- m4_pattern_allow([^DUMPBIN$])
4693-m4trace:configure.ac:265: -1- m4_pattern_allow([^ac_ct_DUMPBIN$])
4694-m4trace:configure.ac:265: -1- m4_pattern_allow([^DUMPBIN$])
4695-m4trace:configure.ac:265: -1- m4_pattern_allow([^NM$])
4696-m4trace:configure.ac:265: -1- LT_CMD_MAX_LEN
4697-m4trace:configure.ac:265: -1- m4_pattern_allow([^OBJDUMP$])
4698-m4trace:configure.ac:265: -1- m4_pattern_allow([^OBJDUMP$])
4699-m4trace:configure.ac:265: -1- m4_pattern_allow([^AR$])
4700-m4trace:configure.ac:265: -1- m4_pattern_allow([^STRIP$])
4701-m4trace:configure.ac:265: -1- m4_pattern_allow([^RANLIB$])
4702-m4trace:configure.ac:265: -1- m4_pattern_allow([LT_OBJDIR])
4703-m4trace:configure.ac:265: -1- m4_pattern_allow([^LT_OBJDIR$])
4704-m4trace:configure.ac:265: -1- m4_pattern_allow([^lt_ECHO$])
4705-m4trace:configure.ac:265: -1- _LT_CC_BASENAME([$compiler])
4706-m4trace:configure.ac:265: -1- _LT_PATH_TOOL_PREFIX([${ac_tool_prefix}file], [/usr/bin$PATH_SEPARATOR$PATH])
4707-m4trace:configure.ac:265: -1- _LT_PATH_TOOL_PREFIX([file], [/usr/bin$PATH_SEPARATOR$PATH])
4708-m4trace:configure.ac:265: -1- LT_SUPPORTED_TAG([CC])
4709-m4trace:configure.ac:265: -1- _LT_COMPILER_BOILERPLATE
4710-m4trace:configure.ac:265: -1- _LT_LINKER_BOILERPLATE
4711-m4trace:configure.ac:265: -1- _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], [lt_cv_prog_compiler_rtti_exceptions], [-fno-rtti -fno-exceptions], [], [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, )="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, ) -fno-rtti -fno-exceptions"])
4712-m4trace:configure.ac:265: -1- _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, ) works], [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, )], [$_LT_TAGVAR(lt_prog_compiler_pic, )@&t@m4_if([],[],[ -DPIC],[m4_if([],[CXX],[ -DPIC],[])])], [], [case $_LT_TAGVAR(lt_prog_compiler_pic, ) in
4713+configure.ac:252: the top level])
4714+m4trace:configure.ac:252: -1- LT_INIT
4715+m4trace:configure.ac:252: -1- m4_pattern_forbid([^_?LT_[A-Z_]+$])
4716+m4trace:configure.ac:252: -1- m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])
4717+m4trace:configure.ac:252: -1- LTOPTIONS_VERSION
4718+m4trace:configure.ac:252: -1- LTSUGAR_VERSION
4719+m4trace:configure.ac:252: -1- LTVERSION_VERSION
4720+m4trace:configure.ac:252: -1- LTOBSOLETE_VERSION
4721+m4trace:configure.ac:252: -1- _LT_PROG_LTMAIN
4722+m4trace:configure.ac:252: -1- m4_pattern_allow([^LIBTOOL$])
4723+m4trace:configure.ac:252: -1- LT_PATH_LD
4724+m4trace:configure.ac:252: -1- m4_pattern_allow([^SED$])
4725+m4trace:configure.ac:252: -1- AC_PROG_EGREP
4726+m4trace:configure.ac:252: -1- m4_pattern_allow([^GREP$])
4727+m4trace:configure.ac:252: -1- m4_pattern_allow([^EGREP$])
4728+m4trace:configure.ac:252: -1- m4_pattern_allow([^FGREP$])
4729+m4trace:configure.ac:252: -1- m4_pattern_allow([^GREP$])
4730+m4trace:configure.ac:252: -1- m4_pattern_allow([^LD$])
4731+m4trace:configure.ac:252: -1- LT_PATH_NM
4732+m4trace:configure.ac:252: -1- m4_pattern_allow([^DUMPBIN$])
4733+m4trace:configure.ac:252: -1- m4_pattern_allow([^ac_ct_DUMPBIN$])
4734+m4trace:configure.ac:252: -1- m4_pattern_allow([^DUMPBIN$])
4735+m4trace:configure.ac:252: -1- m4_pattern_allow([^NM$])
4736+m4trace:configure.ac:252: -1- LT_CMD_MAX_LEN
4737+m4trace:configure.ac:252: -1- m4_pattern_allow([^OBJDUMP$])
4738+m4trace:configure.ac:252: -1- m4_pattern_allow([^OBJDUMP$])
4739+m4trace:configure.ac:252: -1- m4_pattern_allow([^AR$])
4740+m4trace:configure.ac:252: -1- m4_pattern_allow([^STRIP$])
4741+m4trace:configure.ac:252: -1- m4_pattern_allow([^RANLIB$])
4742+m4trace:configure.ac:252: -1- m4_pattern_allow([LT_OBJDIR])
4743+m4trace:configure.ac:252: -1- m4_pattern_allow([^LT_OBJDIR$])
4744+m4trace:configure.ac:252: -1- m4_pattern_allow([^lt_ECHO$])
4745+m4trace:configure.ac:252: -1- _LT_CC_BASENAME([$compiler])
4746+m4trace:configure.ac:252: -1- _LT_PATH_TOOL_PREFIX([${ac_tool_prefix}file], [/usr/bin$PATH_SEPARATOR$PATH])
4747+m4trace:configure.ac:252: -1- _LT_PATH_TOOL_PREFIX([file], [/usr/bin$PATH_SEPARATOR$PATH])
4748+m4trace:configure.ac:252: -1- LT_SUPPORTED_TAG([CC])
4749+m4trace:configure.ac:252: -1- _LT_COMPILER_BOILERPLATE
4750+m4trace:configure.ac:252: -1- _LT_LINKER_BOILERPLATE
4751+m4trace:configure.ac:252: -1- _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], [lt_cv_prog_compiler_rtti_exceptions], [-fno-rtti -fno-exceptions], [], [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, )="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, ) -fno-rtti -fno-exceptions"])
4752+m4trace:configure.ac:252: -1- _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, ) works], [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, )], [$_LT_TAGVAR(lt_prog_compiler_pic, )@&t@m4_if([],[],[ -DPIC],[m4_if([],[CXX],[ -DPIC],[])])], [], [case $_LT_TAGVAR(lt_prog_compiler_pic, ) in
4753 "" | " "*) ;;
4754 *) _LT_TAGVAR(lt_prog_compiler_pic, )=" $_LT_TAGVAR(lt_prog_compiler_pic, )" ;;
4755 esac], [_LT_TAGVAR(lt_prog_compiler_pic, )=
4756 _LT_TAGVAR(lt_prog_compiler_can_build_shared, )=no])
4757-m4trace:configure.ac:265: -1- _LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], [lt_cv_prog_compiler_static_works], [$lt_tmp_static_flag], [], [_LT_TAGVAR(lt_prog_compiler_static, )=])
4758-m4trace:configure.ac:265: -1- m4_pattern_allow([^DSYMUTIL$])
4759-m4trace:configure.ac:265: -1- m4_pattern_allow([^NMEDIT$])
4760-m4trace:configure.ac:265: -1- m4_pattern_allow([^LIPO$])
4761-m4trace:configure.ac:265: -1- m4_pattern_allow([^OTOOL$])
4762-m4trace:configure.ac:265: -1- m4_pattern_allow([^OTOOL64$])
4763-m4trace:configure.ac:265: -1- LT_SYS_DLOPEN_SELF
4764-m4trace:configure.ac:265: -1- m4_pattern_allow([^STDC_HEADERS$])
4765-m4trace:configure.ac:265: -1- m4_pattern_allow([^HAVE_DLFCN_H$])
4766-m4trace:configure.ac:265: -1- LT_LANG([CXX])
4767-m4trace:configure.ac:265: -1- LT_SUPPORTED_TAG([CXX])
4768-m4trace:configure.ac:265: -1- m4_pattern_allow([^CXX$])
4769-m4trace:configure.ac:265: -1- m4_pattern_allow([^CXXFLAGS$])
4770-m4trace:configure.ac:265: -1- m4_pattern_allow([^LDFLAGS$])
4771-m4trace:configure.ac:265: -1- m4_pattern_allow([^LIBS$])
4772-m4trace:configure.ac:265: -1- m4_pattern_allow([^CPPFLAGS$])
4773-m4trace:configure.ac:265: -1- m4_pattern_allow([^CXX$])
4774-m4trace:configure.ac:265: -1- m4_pattern_allow([^ac_ct_CXX$])
4775-m4trace:configure.ac:265: -1- _AM_DEPENDENCIES([CXX])
4776-m4trace:configure.ac:265: -1- m4_pattern_allow([^CXXDEPMODE$])
4777-m4trace:configure.ac:265: -1- AM_CONDITIONAL([am__fastdepCXX], [
4778+m4trace:configure.ac:252: -1- _LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], [lt_cv_prog_compiler_static_works], [$lt_tmp_static_flag], [], [_LT_TAGVAR(lt_prog_compiler_static, )=])
4779+m4trace:configure.ac:252: -1- m4_pattern_allow([^DSYMUTIL$])
4780+m4trace:configure.ac:252: -1- m4_pattern_allow([^NMEDIT$])
4781+m4trace:configure.ac:252: -1- m4_pattern_allow([^LIPO$])
4782+m4trace:configure.ac:252: -1- m4_pattern_allow([^OTOOL$])
4783+m4trace:configure.ac:252: -1- m4_pattern_allow([^OTOOL64$])
4784+m4trace:configure.ac:252: -1- LT_SYS_DLOPEN_SELF
4785+m4trace:configure.ac:252: -1- m4_pattern_allow([^STDC_HEADERS$])
4786+m4trace:configure.ac:252: -1- m4_pattern_allow([^HAVE_DLFCN_H$])
4787+m4trace:configure.ac:252: -1- LT_LANG([CXX])
4788+m4trace:configure.ac:252: -1- LT_SUPPORTED_TAG([CXX])
4789+m4trace:configure.ac:252: -1- m4_pattern_allow([^CXX$])
4790+m4trace:configure.ac:252: -1- m4_pattern_allow([^CXXFLAGS$])
4791+m4trace:configure.ac:252: -1- m4_pattern_allow([^LDFLAGS$])
4792+m4trace:configure.ac:252: -1- m4_pattern_allow([^LIBS$])
4793+m4trace:configure.ac:252: -1- m4_pattern_allow([^CPPFLAGS$])
4794+m4trace:configure.ac:252: -1- m4_pattern_allow([^CXX$])
4795+m4trace:configure.ac:252: -1- m4_pattern_allow([^ac_ct_CXX$])
4796+m4trace:configure.ac:252: -1- _AM_DEPENDENCIES([CXX])
4797+m4trace:configure.ac:252: -1- m4_pattern_allow([^CXXDEPMODE$])
4798+m4trace:configure.ac:252: -1- AM_CONDITIONAL([am__fastdepCXX], [
4799 test "x$enable_dependency_tracking" != xno \
4800 && test "$am_cv_CXX_dependencies_compiler_type" = gcc3])
4801-m4trace:configure.ac:265: -1- m4_pattern_allow([^am__fastdepCXX_TRUE$])
4802-m4trace:configure.ac:265: -1- m4_pattern_allow([^am__fastdepCXX_FALSE$])
4803-m4trace:configure.ac:265: -1- _AM_SUBST_NOTMAKE([am__fastdepCXX_TRUE])
4804-m4trace:configure.ac:265: -1- _AM_SUBST_NOTMAKE([am__fastdepCXX_FALSE])
4805-m4trace:configure.ac:265: -1- m4_pattern_allow([^CXXCPP$])
4806-m4trace:configure.ac:265: -1- m4_pattern_allow([^CPPFLAGS$])
4807-m4trace:configure.ac:265: -1- m4_pattern_allow([^CXXCPP$])
4808-m4trace:configure.ac:265: -1- _LT_COMPILER_BOILERPLATE
4809-m4trace:configure.ac:265: -1- _LT_LINKER_BOILERPLATE
4810-m4trace:configure.ac:265: -1- _LT_CC_BASENAME([$compiler])
4811-m4trace:configure.ac:265: -1- LT_PATH_LD
4812-m4trace:configure.ac:265: -1- m4_pattern_allow([^LD$])
4813-m4trace:configure.ac:265: -1- _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, CXX) works], [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, CXX)], [$_LT_TAGVAR(lt_prog_compiler_pic, CXX)@&t@m4_if([CXX],[],[ -DPIC],[m4_if([CXX],[CXX],[ -DPIC],[])])], [], [case $_LT_TAGVAR(lt_prog_compiler_pic, CXX) in
4814+m4trace:configure.ac:252: -1- m4_pattern_allow([^am__fastdepCXX_TRUE$])
4815+m4trace:configure.ac:252: -1- m4_pattern_allow([^am__fastdepCXX_FALSE$])
4816+m4trace:configure.ac:252: -1- _AM_SUBST_NOTMAKE([am__fastdepCXX_TRUE])
4817+m4trace:configure.ac:252: -1- _AM_SUBST_NOTMAKE([am__fastdepCXX_FALSE])
4818+m4trace:configure.ac:252: -1- m4_pattern_allow([^CXXCPP$])
4819+m4trace:configure.ac:252: -1- m4_pattern_allow([^CPPFLAGS$])
4820+m4trace:configure.ac:252: -1- m4_pattern_allow([^CXXCPP$])
4821+m4trace:configure.ac:252: -1- _LT_COMPILER_BOILERPLATE
4822+m4trace:configure.ac:252: -1- _LT_LINKER_BOILERPLATE
4823+m4trace:configure.ac:252: -1- _LT_CC_BASENAME([$compiler])
4824+m4trace:configure.ac:252: -1- LT_PATH_LD
4825+m4trace:configure.ac:252: -1- m4_pattern_allow([^LD$])
4826+m4trace:configure.ac:252: -1- _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, CXX) works], [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, CXX)], [$_LT_TAGVAR(lt_prog_compiler_pic, CXX)@&t@m4_if([CXX],[],[ -DPIC],[m4_if([CXX],[CXX],[ -DPIC],[])])], [], [case $_LT_TAGVAR(lt_prog_compiler_pic, CXX) in
4827 "" | " "*) ;;
4828 *) _LT_TAGVAR(lt_prog_compiler_pic, CXX)=" $_LT_TAGVAR(lt_prog_compiler_pic, CXX)" ;;
4829 esac], [_LT_TAGVAR(lt_prog_compiler_pic, CXX)=
4830 _LT_TAGVAR(lt_prog_compiler_can_build_shared, CXX)=no])
4831-m4trace:configure.ac:265: -1- _LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], [lt_cv_prog_compiler_static_works_CXX], [$lt_tmp_static_flag], [], [_LT_TAGVAR(lt_prog_compiler_static, CXX)=])
4832-m4trace:configure.ac:271: -1- m4_pattern_allow([^HAVE_PKG_CONFIG$])
4833-m4trace:configure.ac:285: -1- m4_pattern_allow([^XMKMF$])
4834-m4trace:configure.ac:285: -1- m4_pattern_allow([^X_DISPLAY_MISSING$])
4835-m4trace:configure.ac:285: -1- m4_pattern_allow([^X_CFLAGS$])
4836-m4trace:configure.ac:285: -1- m4_pattern_allow([^X_PRE_LIBS$])
4837-m4trace:configure.ac:285: -1- m4_pattern_allow([^X_LIBS$])
4838-m4trace:configure.ac:285: -1- m4_pattern_allow([^X_EXTRA_LIBS$])
4839-m4trace:configure.ac:308: -1- AC_VMW_CHECK_LIB([glib-2.0], [GLIB2], [glib-2.0], [], [2.6.0], [glib.h], [g_key_file_new], [], [AC_MSG_ERROR([glib >= 2.6.0 is required.])])
4840-m4trace:configure.ac:308: -1- m4_pattern_allow([^ac_vmw_lib_cfg$])
4841-m4trace:configure.ac:308: -1- m4_pattern_allow([^GLIB2_CPPFLAGS$])
4842-m4trace:configure.ac:308: -1- m4_pattern_allow([^GLIB2_LIBS$])
4843-m4trace:configure.ac:317: -1- AC_VMW_CHECK_LIB([gmodule-2.0], [GMODULE], [gmodule-2.0], [], [2.6.0], [], [], [], [AC_MSG_ERROR([gmodule >= 2.6.0 is required.])])
4844-m4trace:configure.ac:317: -1- m4_pattern_allow([^ac_vmw_lib_cfg$])
4845-m4trace:configure.ac:317: -1- m4_pattern_allow([^GMODULE_CPPFLAGS$])
4846-m4trace:configure.ac:317: -1- m4_pattern_allow([^GMODULE_LIBS$])
4847-m4trace:configure.ac:326: -1- AC_VMW_CHECK_LIB([gobject-2.0], [GOBJECT], [gobject-2.0], [], [2.6.0], [glib-object.h], [], [], [AC_MSG_ERROR([gobject >= 2.6.0 is required.])])
4848-m4trace:configure.ac:326: -1- m4_pattern_allow([^ac_vmw_lib_cfg$])
4849-m4trace:configure.ac:326: -1- m4_pattern_allow([^GOBJECT_CPPFLAGS$])
4850-m4trace:configure.ac:326: -1- m4_pattern_allow([^GOBJECT_LIBS$])
4851-m4trace:configure.ac:335: -1- AC_VMW_CHECK_LIB([gthread-2.0], [GTHREAD], [gthread-2.0], [], [2.6.0], [], [], [], [AC_MSG_ERROR([glib >= 2.6.0 is required.])])
4852-m4trace:configure.ac:335: -1- m4_pattern_allow([^ac_vmw_lib_cfg$])
4853-m4trace:configure.ac:335: -1- m4_pattern_allow([^GTHREAD_CPPFLAGS$])
4854-m4trace:configure.ac:335: -1- m4_pattern_allow([^GTHREAD_LIBS$])
4855-m4trace:configure.ac:344: -1- m4_pattern_allow([^have_genmarshal$])
4856-m4trace:configure.ac:357: -1- AC_VMW_CHECK_LIB([glib-2.0], [GLIB2], [glib-2.0], [], [2.14.0], [glib.h], [g_regex_new], [have_glib_2_14=yes], [AC_MSG_WARN([glib is not recent enough, some features will be disabled.])])
4857-m4trace:configure.ac:357: -1- m4_pattern_allow([^ac_vmw_lib_cfg$])
4858-m4trace:configure.ac:357: -1- m4_pattern_allow([^GLIB2_CPPFLAGS$])
4859-m4trace:configure.ac:357: -1- m4_pattern_allow([^GLIB2_LIBS$])
4860-m4trace:configure.ac:371: -1- AC_VMW_CHECK_LIB([fuse], [FUSE], [fuse], [], [], [fuse.h], [fuse_main], [have_fuse=yes], [have_fuse=no;
4861+m4trace:configure.ac:252: -1- _LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], [lt_cv_prog_compiler_static_works_CXX], [$lt_tmp_static_flag], [], [_LT_TAGVAR(lt_prog_compiler_static, CXX)=])
4862+m4trace:configure.ac:258: -1- m4_pattern_allow([^HAVE_PKG_CONFIG$])
4863+m4trace:configure.ac:272: -1- m4_pattern_allow([^XMKMF$])
4864+m4trace:configure.ac:272: -1- m4_pattern_allow([^X_DISPLAY_MISSING$])
4865+m4trace:configure.ac:272: -1- m4_pattern_allow([^X_CFLAGS$])
4866+m4trace:configure.ac:272: -1- m4_pattern_allow([^X_PRE_LIBS$])
4867+m4trace:configure.ac:272: -1- m4_pattern_allow([^X_LIBS$])
4868+m4trace:configure.ac:272: -1- m4_pattern_allow([^X_EXTRA_LIBS$])
4869+m4trace:configure.ac:295: -1- AC_VMW_CHECK_LIB([glib-2.0], [GLIB2], [glib-2.0], [], [2.6.0], [glib.h], [g_key_file_new], [], [AC_MSG_ERROR([glib >= 2.6.0 is required.])])
4870+m4trace:configure.ac:295: -1- m4_pattern_allow([^ac_vmw_lib_cfg$])
4871+m4trace:configure.ac:295: -1- m4_pattern_allow([^GLIB2_CPPFLAGS$])
4872+m4trace:configure.ac:295: -1- m4_pattern_allow([^GLIB2_LIBS$])
4873+m4trace:configure.ac:304: -1- AC_VMW_CHECK_LIB([gmodule-2.0], [GMODULE], [gmodule-2.0], [], [2.6.0], [], [], [], [AC_MSG_ERROR([gmodule >= 2.6.0 is required.])])
4874+m4trace:configure.ac:304: -1- m4_pattern_allow([^ac_vmw_lib_cfg$])
4875+m4trace:configure.ac:304: -1- m4_pattern_allow([^GMODULE_CPPFLAGS$])
4876+m4trace:configure.ac:304: -1- m4_pattern_allow([^GMODULE_LIBS$])
4877+m4trace:configure.ac:313: -1- AC_VMW_CHECK_LIB([gobject-2.0], [GOBJECT], [gobject-2.0], [], [2.6.0], [glib-object.h], [], [], [AC_MSG_ERROR([gobject >= 2.6.0 is required.])])
4878+m4trace:configure.ac:313: -1- m4_pattern_allow([^ac_vmw_lib_cfg$])
4879+m4trace:configure.ac:313: -1- m4_pattern_allow([^GOBJECT_CPPFLAGS$])
4880+m4trace:configure.ac:313: -1- m4_pattern_allow([^GOBJECT_LIBS$])
4881+m4trace:configure.ac:322: -1- AC_VMW_CHECK_LIB([gthread-2.0], [GTHREAD], [gthread-2.0], [], [2.6.0], [], [], [], [AC_MSG_ERROR([glib >= 2.6.0 is required.])])
4882+m4trace:configure.ac:322: -1- m4_pattern_allow([^ac_vmw_lib_cfg$])
4883+m4trace:configure.ac:322: -1- m4_pattern_allow([^GTHREAD_CPPFLAGS$])
4884+m4trace:configure.ac:322: -1- m4_pattern_allow([^GTHREAD_LIBS$])
4885+m4trace:configure.ac:331: -1- m4_pattern_allow([^have_genmarshal$])
4886+m4trace:configure.ac:344: -1- AC_VMW_CHECK_LIB([glib-2.0], [GLIB2], [glib-2.0], [], [2.14.0], [glib.h], [g_regex_new], [have_glib_2_14=yes], [AC_MSG_WARN([glib is not recent enough, some features will be disabled.])])
4887+m4trace:configure.ac:344: -1- m4_pattern_allow([^ac_vmw_lib_cfg$])
4888+m4trace:configure.ac:344: -1- m4_pattern_allow([^GLIB2_CPPFLAGS$])
4889+m4trace:configure.ac:344: -1- m4_pattern_allow([^GLIB2_LIBS$])
4890+m4trace:configure.ac:358: -1- AC_VMW_CHECK_LIB([fuse], [FUSE], [fuse], [], [], [fuse.h], [fuse_main], [have_fuse=yes], [have_fuse=no;
4891 AC_MSG_WARN([Fuse is missing, vmblock-fuse will be disabled.])])
4892-m4trace:configure.ac:371: -1- m4_pattern_allow([^ac_vmw_lib_cfg$])
4893-m4trace:configure.ac:371: -1- m4_pattern_allow([^FUSE_CPPFLAGS$])
4894-m4trace:configure.ac:371: -1- m4_pattern_allow([^FUSE_LIBS$])
4895-m4trace:configure.ac:393: -1- AC_VMW_DEFAULT_FLAGS([PAM])
4896-m4trace:configure.ac:394: -1- AC_VMW_CHECK_LIB([pam], [PAM], [], [], [], [security/pam_appl.h], [pam_start], [PAM_CPPFLAGS="$PAM_CPPFLAGS -DUSE_PAM"], [AC_VMW_LIB_ERROR([PAM], [pam])])
4897-m4trace:configure.ac:394: -1- m4_pattern_allow([^ac_vmw_lib_cfg$])
4898-m4trace:configure.ac:394: -1- m4_pattern_allow([^PAM_CPPFLAGS$])
4899-m4trace:configure.ac:394: -1- m4_pattern_allow([^PAM_LIBS$])
4900-m4trace:configure.ac:394: -1- AC_VMW_LIB_ERROR([PAM], [pam])
4901-m4trace:configure.ac:410: -1- AC_VMW_DEFAULT_FLAGS([CUNIT])
4902-m4trace:configure.ac:411: -1- AC_VMW_CHECK_LIB([cunit], [CUNIT], [], [], [], [CUnit/CUnit.h], [CU_initialize_registry], [have_cunit=yes], [have_cunit=no])
4903-m4trace:configure.ac:411: -1- m4_pattern_allow([^ac_vmw_lib_cfg$])
4904-m4trace:configure.ac:411: -1- m4_pattern_allow([^CUNIT_CPPFLAGS$])
4905-m4trace:configure.ac:411: -1- m4_pattern_allow([^CUNIT_LIBS$])
4906-m4trace:configure.ac:422: -1- AC_VMW_LIB_ERROR([CUNIT], [cunit])
4907-m4trace:configure.ac:524: -1- m4_pattern_allow([^HAVE_X11_EXTENSIONS_XCOMPOSITE_H$])
4908-m4trace:configure.ac:538: -1- AC_VMW_CHECK_X11_LIB([Xss], [X11/extensions/scrnsaver.h], [XScreenSaverQueryExtension], [AC_MSG_ERROR([libXss or headers not found. Please configure without Unity (using --disable-unity) or install the libXss devel package.])])
4909-m4trace:configure.ac:552: -1- AC_VMW_DEFAULT_FLAGS([URIPARSER], [uriparser])
4910-m4trace:configure.ac:553: -1- AC_VMW_CHECK_LIB([uriparser], [URIPARSER], [], [], [], [Uri.h], [uriFreeQueryListA], [], [AC_MSG_ERROR([uriparser library not found or is too old. Please configure without Unity (using --disable-unity) or install the liburiparser devel package.])])
4911-m4trace:configure.ac:553: -1- m4_pattern_allow([^ac_vmw_lib_cfg$])
4912-m4trace:configure.ac:553: -1- m4_pattern_allow([^URIPARSER_CPPFLAGS$])
4913-m4trace:configure.ac:553: -1- m4_pattern_allow([^URIPARSER_LIBS$])
4914-m4trace:configure.ac:564: -1- AC_VMW_CHECK_LIB([png12], [LIBPNG], [libpng12], [libpng-config], [], [png.h], [png_access_version_number], [], [AC_MSG_ERROR([libpng not found. Please configure without Unity (using --disable-unity) or install the libpng devel package])])
4915-m4trace:configure.ac:564: -1- m4_pattern_allow([^ac_vmw_lib_cfg$])
4916-m4trace:configure.ac:564: -1- m4_pattern_allow([^LIBPNG_CPPFLAGS$])
4917-m4trace:configure.ac:564: -1- m4_pattern_allow([^LIBPNG_LIBS$])
4918-m4trace:configure.ac:576: -1- AC_VMW_DEFAULT_FLAGS([ZLIB])
4919-m4trace:configure.ac:577: -1- AC_VMW_CHECK_LIB([z], [ZLIB], [], [], [], [zlib.h], [zlibVersion], [], [AC_MSG_ERROR([zlib library not found. Please configure without Unity (using --disable-unity) or install the zlib devel package.])])
4920-m4trace:configure.ac:577: -1- m4_pattern_allow([^ac_vmw_lib_cfg$])
4921-m4trace:configure.ac:577: -1- m4_pattern_allow([^ZLIB_CPPFLAGS$])
4922-m4trace:configure.ac:577: -1- m4_pattern_allow([^ZLIB_LIBS$])
4923-m4trace:configure.ac:588: -1- AC_VMW_CHECK_LIB([gio-2.0], [GIO], [gio-unix-2.0], [], [2.24.0], [gio/gio.h], [g_desktop_app_info_get_filename], [], [AC_MSG_ERROR([GLib/GIO 2.24+ not found. Please configure without Unity (using --disable-unity) or upgrade the Glib devel package.])])
4924-m4trace:configure.ac:588: -1- m4_pattern_allow([^ac_vmw_lib_cfg$])
4925-m4trace:configure.ac:588: -1- m4_pattern_allow([^GIO_CPPFLAGS$])
4926-m4trace:configure.ac:588: -1- m4_pattern_allow([^GIO_LIBS$])
4927-m4trace:configure.ac:603: -1- AC_VMW_CHECK_LIB([gtk-x11-2.0], [GTK], [gtk+-2.0], [], [2.4.0], [gtk/gtk.h], [gdk_display_get_default_group], [GTK_CPPFLAGS="$GTK_CPPFLAGS -DGTK2"], [AC_MSG_ERROR([Gtk+ 2.0 library not found or too old. Please configure without Gtk+ support (using --without-gtk2) or install the Gtk+ 2.0 devel package.])])
4928-m4trace:configure.ac:603: -1- m4_pattern_allow([^ac_vmw_lib_cfg$])
4929-m4trace:configure.ac:603: -1- m4_pattern_allow([^GTK_CPPFLAGS$])
4930-m4trace:configure.ac:603: -1- m4_pattern_allow([^GTK_LIBS$])
4931-m4trace:configure.ac:631: -1- AC_VMW_CHECK_LIBXX([gtkmm-2.4], [GTKMM], [gtkmm-2.4], [], [2.4.0], [gtkmm.h], [], [GTKMM_CPPFLAGS="$GTKMM_CPPFLAGS -DHAVE_GTKMM"], [AC_MSG_ERROR([gtkmm library not found. Please install the libgtkmm devel package(s), or re-configure using --without-gtkmm.])])
4932-m4trace:configure.ac:631: -1- AC_VMW_CHECK_LIB([gtkmm-2.4], [GTKMM], [gtkmm-2.4], [], [2.4.0], [gtkmm.h], [], [GTKMM_CPPFLAGS="$GTKMM_CPPFLAGS -DHAVE_GTKMM"], [AC_MSG_ERROR([gtkmm library not found. Please install the libgtkmm devel package(s), or re-configure using --without-gtkmm.])])
4933-m4trace:configure.ac:631: -1- m4_pattern_allow([^ac_vmw_lib_cfg$])
4934-m4trace:configure.ac:631: -1- m4_pattern_allow([^GTKMM_CPPFLAGS$])
4935-m4trace:configure.ac:631: -1- m4_pattern_allow([^GTKMM_LIBS$])
4936-m4trace:configure.ac:650: -1- m4_pattern_allow([^HAVE_DLOPEN$])
4937-m4trace:configure.ac:661: -1- m4_pattern_allow([^HAVE_ECVT$])
4938-m4trace:configure.ac:662: -1- m4_pattern_allow([^HAVE_FCVT$])
4939-m4trace:configure.ac:716: -1- AC_VMW_CHECK_LIB([$CUSTOM_PROCPS_NAME], [PROCPS], [], [], [], [], [getstat], [
4940+m4trace:configure.ac:358: -1- m4_pattern_allow([^ac_vmw_lib_cfg$])
4941+m4trace:configure.ac:358: -1- m4_pattern_allow([^FUSE_CPPFLAGS$])
4942+m4trace:configure.ac:358: -1- m4_pattern_allow([^FUSE_LIBS$])
4943+m4trace:configure.ac:379: -1- AC_VMW_DEFAULT_FLAGS([PAM])
4944+m4trace:configure.ac:380: -1- AC_VMW_CHECK_LIB([pam], [PAM], [], [], [], [security/pam_appl.h], [pam_start], [PAM_CPPFLAGS="$PAM_CPPFLAGS -DUSE_PAM"], [AC_VMW_LIB_ERROR([PAM], [pam])])
4945+m4trace:configure.ac:380: -1- m4_pattern_allow([^ac_vmw_lib_cfg$])
4946+m4trace:configure.ac:380: -1- m4_pattern_allow([^PAM_CPPFLAGS$])
4947+m4trace:configure.ac:380: -1- m4_pattern_allow([^PAM_LIBS$])
4948+m4trace:configure.ac:380: -1- AC_VMW_LIB_ERROR([PAM], [pam])
4949+m4trace:configure.ac:395: -1- AC_VMW_DEFAULT_FLAGS([CUNIT])
4950+m4trace:configure.ac:396: -1- AC_VMW_CHECK_LIB([cunit], [CUNIT], [], [], [], [CUnit/CUnit.h], [CU_initialize_registry], [have_cunit=yes], [have_cunit=no])
4951+m4trace:configure.ac:396: -1- m4_pattern_allow([^ac_vmw_lib_cfg$])
4952+m4trace:configure.ac:396: -1- m4_pattern_allow([^CUNIT_CPPFLAGS$])
4953+m4trace:configure.ac:396: -1- m4_pattern_allow([^CUNIT_LIBS$])
4954+m4trace:configure.ac:407: -1- AC_VMW_LIB_ERROR([CUNIT], [cunit])
4955+m4trace:configure.ac:503: -1- m4_pattern_allow([^HAVE_X11_EXTENSIONS_XCOMPOSITE_H$])
4956+m4trace:configure.ac:515: -1- AC_VMW_CHECK_LIB([gtk-x11-2.0], [GTK], [gtk+-2.0], [], [2.4.0], [gtk/gtk.h], [gdk_display_get_default_group], [GTK_CPPFLAGS="$GTK_CPPFLAGS -DGTK2"], [AC_MSG_ERROR([Gtk+ 2.0 library not found or too old. Please configure without Gtk+ support (using --without-gtk2) or install the Gtk+ 2.0 devel package.])])
4957+m4trace:configure.ac:515: -1- m4_pattern_allow([^ac_vmw_lib_cfg$])
4958+m4trace:configure.ac:515: -1- m4_pattern_allow([^GTK_CPPFLAGS$])
4959+m4trace:configure.ac:515: -1- m4_pattern_allow([^GTK_LIBS$])
4960+m4trace:configure.ac:532: -1- AC_VMW_CHECK_LIBXX([gtkmm-2.4], [GTKMM], [gtkmm-2.4], [], [2.4.0], [gtkmm.h], [], [GTKMM_CPPFLAGS="$GTKMM_CPPFLAGS -DHAVE_GTKMM"], [AC_MSG_ERROR([gtkmm library not found. Please install the libgtkmm devel package(s), or re-configure using --without-gtkmm.])])
4961+m4trace:configure.ac:532: -1- AC_VMW_CHECK_LIB([gtkmm-2.4], [GTKMM], [gtkmm-2.4], [], [2.4.0], [gtkmm.h], [], [GTKMM_CPPFLAGS="$GTKMM_CPPFLAGS -DHAVE_GTKMM"], [AC_MSG_ERROR([gtkmm library not found. Please install the libgtkmm devel package(s), or re-configure using --without-gtkmm.])])
4962+m4trace:configure.ac:532: -1- m4_pattern_allow([^ac_vmw_lib_cfg$])
4963+m4trace:configure.ac:532: -1- m4_pattern_allow([^GTKMM_CPPFLAGS$])
4964+m4trace:configure.ac:532: -1- m4_pattern_allow([^GTKMM_LIBS$])
4965+m4trace:configure.ac:551: -1- m4_pattern_allow([^HAVE_DLOPEN$])
4966+m4trace:configure.ac:562: -1- m4_pattern_allow([^HAVE_ECVT$])
4967+m4trace:configure.ac:563: -1- m4_pattern_allow([^HAVE_FCVT$])
4968+m4trace:configure.ac:617: -1- AC_VMW_CHECK_LIB([$CUSTOM_PROCPS_NAME], [PROCPS], [], [], [], [], [getstat], [
4969 have_procps=yes;
4970 ], [])
4971-m4trace:configure.ac:716: -1- m4_pattern_allow([^ac_vmw_lib_cfg$])
4972-m4trace:configure.ac:716: -1- m4_pattern_allow([^PROCPS_CPPFLAGS$])
4973-m4trace:configure.ac:716: -1- m4_pattern_allow([^PROCPS_LIBS$])
4974-m4trace:configure.ac:729: -1- AC_VMW_CHECK_LIB([proc-3.2.8], [PROCPS], [], [], [], [], [getstat], [
4975+m4trace:configure.ac:617: -1- m4_pattern_allow([^ac_vmw_lib_cfg$])
4976+m4trace:configure.ac:617: -1- m4_pattern_allow([^PROCPS_CPPFLAGS$])
4977+m4trace:configure.ac:617: -1- m4_pattern_allow([^PROCPS_LIBS$])
4978+m4trace:configure.ac:630: -1- AC_VMW_CHECK_LIB([proc-3.2.8], [PROCPS], [], [], [], [], [getstat], [
4979 have_procps=yes;
4980 ], [])
4981-m4trace:configure.ac:729: -1- m4_pattern_allow([^ac_vmw_lib_cfg$])
4982-m4trace:configure.ac:729: -1- m4_pattern_allow([^PROCPS_CPPFLAGS$])
4983-m4trace:configure.ac:729: -1- m4_pattern_allow([^PROCPS_LIBS$])
4984-m4trace:configure.ac:743: -1- AC_VMW_CHECK_LIB([proc-3.2.7], [PROCPS], [], [], [], [], [getstat], [], [AC_MSG_ERROR([libproc not found. Please configure without procps (using --without-procps) or install procps - http://procps.sourceforge.net])])
4985-m4trace:configure.ac:743: -1- m4_pattern_allow([^ac_vmw_lib_cfg$])
4986-m4trace:configure.ac:743: -1- m4_pattern_allow([^PROCPS_CPPFLAGS$])
4987-m4trace:configure.ac:743: -1- m4_pattern_allow([^PROCPS_LIBS$])
4988-m4trace:configure.ac:756: -1- m4_pattern_allow([^NO_PROCPS$])
4989-m4trace:configure.ac:770: -1- AC_VMW_CHECK_LIB([dumbnet], [DNET], [], [dumbnet-config], [], [dumbnet.h], [intf_open], [have_dnet="yes";
4990+m4trace:configure.ac:630: -1- m4_pattern_allow([^ac_vmw_lib_cfg$])
4991+m4trace:configure.ac:630: -1- m4_pattern_allow([^PROCPS_CPPFLAGS$])
4992+m4trace:configure.ac:630: -1- m4_pattern_allow([^PROCPS_LIBS$])
4993+m4trace:configure.ac:644: -1- AC_VMW_CHECK_LIB([proc-3.2.7], [PROCPS], [], [], [], [], [getstat], [], [AC_MSG_ERROR([libproc not found. Please configure without procps (using --without-procps) or install procps - http://procps.sourceforge.net])])
4994+m4trace:configure.ac:644: -1- m4_pattern_allow([^ac_vmw_lib_cfg$])
4995+m4trace:configure.ac:644: -1- m4_pattern_allow([^PROCPS_CPPFLAGS$])
4996+m4trace:configure.ac:644: -1- m4_pattern_allow([^PROCPS_LIBS$])
4997+m4trace:configure.ac:657: -1- m4_pattern_allow([^NO_PROCPS$])
4998+m4trace:configure.ac:671: -1- AC_VMW_CHECK_LIB([dumbnet], [DNET], [], [dumbnet-config], [], [dumbnet.h], [intf_open], [have_dnet="yes";
4999 AC_DEFINE([DNET_IS_DUMBNET], 1, [Define to 1 if substituting Debian's libdumbnet for libdnet.])], [])
5000-m4trace:configure.ac:770: -1- m4_pattern_allow([^ac_vmw_lib_cfg$])
The diff has been truncated for viewing.

Subscribers

People subscribed via source and target branches